diff options
55 files changed, 74 insertions, 11 deletions
diff --git a/ipfs-api/Cargo.toml b/ipfs-api/Cargo.toml index 7482376..393322f 100644 --- a/ipfs-api/Cargo.toml +++ b/ipfs-api/Cargo.toml @@ -2,6 +2,7 @@ name = "ipfs-api" description = "Implementation of an IPFS HTTP API client" authors = ["Ferris Tseng <ferristseng@fastmail.fm>"] +edition = "2018" documentation = "https://docs.rs/ipfs-api" repository = "https://github.com/ferristseng/rust-ipfs-api" keywords = ["ipfs"] @@ -29,8 +30,7 @@ http = "0.1" hyper = { version = "0.12", optional = true } hyper-tls = { version = "0.3.2", optional = true } hyper-multipart-rfc7578 = { version = "0.3", optional = true } -serde = "1.0" -serde_derive = "1.0" +serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" serde_urlencoded = "0.5" tokio = "0.1" diff --git a/ipfs-api/src/lib.rs b/ipfs-api/src/lib.rs index 40a1f3f..f61d60f 100644 --- a/ipfs-api/src/lib.rs +++ b/ipfs-api/src/lib.rs @@ -188,13 +188,11 @@ extern crate derive_more; #[macro_use] #[cfg(feature = "hyper")] extern crate failure; +extern crate dirs; extern crate futures; extern crate http; -extern crate serde; -#[macro_use] -extern crate serde_derive; -extern crate dirs; extern crate multiaddr; +extern crate serde; extern crate serde_json; extern crate serde_urlencoded; extern crate tokio; diff --git a/ipfs-api/src/request/bitswap.rs b/ipfs-api/src/request/bitswap.rs index e231a33..1767f2a 100644 --- a/ipfs-api/src/request/bitswap.rs +++ b/ipfs-api/src/request/bitswap.rs @@ -7,6 +7,7 @@ // use crate::request::ApiRequest; +use crate::serde::Serialize; #[derive(Serialize)] pub struct BitswapLedger<'a> { diff --git a/ipfs-api/src/request/block.rs b/ipfs-api/src/request/block.rs index a8c19f2..377dc51 100644 --- a/ipfs-api/src/request/block.rs +++ b/ipfs-api/src/request/block.rs @@ -7,6 +7,7 @@ // use crate::request::ApiRequest; +use crate::serde::Serialize; use http::Method; #[derive(Serialize)] diff --git a/ipfs-api/src/request/cat.rs b/ipfs-api/src/request/cat.rs index 8db84c0..f7e7e06 100644 --- a/ipfs-api/src/request/cat.rs +++ b/ipfs-api/src/request/cat.rs @@ -7,6 +7,7 @@ // use crate::request::ApiRequest; +use crate::serde::Serialize; #[derive(Serialize)] pub struct Cat<'a> { diff --git a/ipfs-api/src/request/dag.rs b/ipfs-api/src/request/dag.rs index a62a5c0..630a93a 100644 --- a/ipfs-api/src/request/dag.rs +++ b/ipfs-api/src/request/dag.rs @@ -7,6 +7,7 @@ // use crate::request::ApiRequest; +use crate::serde::Serialize; use http::Method; #[derive(Serialize)] diff --git a/ipfs-api/src/request/dht.rs b/ipfs-api/src/request/dht.rs index a484e6f..76d7820 100644 --- a/ipfs-api/src/request/dht.rs +++ b/ipfs-api/src/request/dht.rs @@ -7,6 +7,7 @@ // use crate::request::ApiRequest; +use crate::serde::Serialize; #[derive(Serialize)] pub struct DhtFindPeer<'a> { diff --git a/ipfs-api/src/request/diag.rs b/ipfs-api/src/request/diag.rs index 0123396..93e4c5c 100644 --- a/ipfs-api/src/request/diag.rs +++ b/ipfs-api/src/request/diag.rs @@ -7,6 +7,7 @@ // use crate::request::ApiRequest; +use crate::serde::Serialize; pub struct DiagCmdsClear; diff --git a/ipfs-api/src/request/dns.rs b/ipfs-api/src/request/dns.rs index f680a5f..61702cc 100644 --- a/ipfs-api/src/request/dns.rs +++ b/ipfs-api/src/request/dns.rs @@ -7,6 +7,7 @@ // use crate::request::ApiRequest; +use crate::serde::Serialize; #[derive(Serialize)] pub struct Dns<'a> { diff --git a/ipfs-api/src/request/file.rs b/ipfs-api/src/request/file.rs index 3e56da4..4381f80 100644 --- a/ipfs-api/src/request/file.rs +++ b/ipfs-api/src/request/file.rs @@ -7,6 +7,7 @@ // use crate::request::ApiRequest; +use crate::serde::Serialize; #[derive(Serialize)] pub struct FileLs<'a> { diff --git a/ipfs-api/src/request/files.rs b/ipfs-api/src/request/files.rs index 5fb4da6..0233021 100644 --- a/ipfs-api/src/request/files.rs +++ b/ipfs-api/src/request/files.rs @@ -7,6 +7,7 @@ // use crate::request::ApiRequest; +use crate::serde::Serialize; use http::Method; #[derive(Serialize)] diff --git a/ipfs-api/src/request/filestore.rs b/ipfs-api/src/request/filestore.rs index 4dafab4..06f3c88 100644 --- a/ipfs-api/src/request/filestore.rs +++ b/ipfs-api/src/request/filestore.rs @@ -7,6 +7,7 @@ // use crate::request::ApiRequest; +use crate::serde::Serialize; pub struct FilestoreDups; diff --git a/ipfs-api/src/request/get.rs b/ipfs-api/src/request/get.rs index 6b89fb5..4e97dcf 100644 --- a/ipfs-api/src/request/get.rs +++ b/ipfs-api/src/request/get.rs @@ -7,6 +7,7 @@ // use crate::request::ApiRequest; +use crate::serde::Serialize; #[derive(Serialize)] pub struct Get<'a> { diff --git a/ipfs-api/src/request/id.rs b/ipfs-api/src/request/id.rs index f3ad24a..999ad3b 100644 --- a/ipfs-api/src/request/id.rs +++ b/ipfs-api/src/request/id.rs @@ -7,6 +7,7 @@ // use crate::request::ApiRequest; +use crate::serde::Serialize; #[derive(Serialize)] pub struct Id<'a> { diff --git a/ipfs-api/src/request/key.rs b/ipfs-api/src/request/key.rs index 6b9a726..8e447db 100644 --- a/ipfs-api/src/request/key.rs +++ b/ipfs-api/src/request/key.rs @@ -7,7 +7,7 @@ // use crate::request::ApiRequest; -use serde::ser::{Serialize, Serializer}; +use crate::serde::{Serialize, Serializer}; #[derive(Copy, Clone)] pub enum KeyType { diff --git a/ipfs-api/src/request/log.rs b/ipfs-api/src/request/log.rs index d4e8812..16470e0 100644 --- a/ipfs-api/src/request/log.rs +++ b/ipfs-api/src/request/log.rs @@ -7,7 +7,7 @@ // use crate::request::ApiRequest; -use serde::ser::{Serialize, Serializer}; +use crate::serde::{Serialize, Serializer}; use std::borrow::Cow; #[derive(Copy, Clone)] diff --git a/ipfs-api/src/request/ls.rs b/ipfs-api/src/request/ls.rs index c1cc933..69e456a 100644 --- a/ipfs-api/src/request/ls.rs +++ b/ipfs-api/src/request/ls.rs @@ -7,6 +7,7 @@ // use crate::request::ApiRequest; +use crate::serde::Serialize; #[derive(Serialize)] pub struct Ls<'a> { diff --git a/ipfs-api/src/request/name.rs b/ipfs-api/src/request/name.rs index a2d724e..f09fe51 100644 --- a/ipfs-api/src/request/name.rs +++ b/ipfs-api/src/request/name.rs @@ -7,6 +7,7 @@ // use crate::request::ApiRequest; +use crate::serde::Serialize; #[derive(Serialize)] pub struct NamePublish<'a, 'b, 'c, 'd> { diff --git a/ipfs-api/src/request/object.rs b/ipfs-api/src/request/object.rs index 8b57f69..ce0faff 100644 --- a/ipfs-api/src/request/object.rs +++ b/ipfs-api/src/request/object.rs @@ -7,7 +7,7 @@ // use crate::request::ApiRequest; -use serde::ser::{Serialize, Serializer}; +use crate::serde::{Serialize, Serializer}; #[derive(Serialize)] pub struct ObjectData<'a> { diff --git a/ipfs-api/src/request/pin.rs b/ipfs-api/src/request/pin.rs index b23d40e..332abf6 100644 --- a/ipfs-api/src/request/pin.rs +++ b/ipfs-api/src/request/pin.rs @@ -7,6 +7,7 @@ // use crate::request::ApiRequest; +use crate::serde::Serialize; #[derive(Serialize)] pub struct PinAdd<'a> { diff --git a/ipfs-api/src/request/ping.rs b/ipfs-api/src/request/ping.rs index 2bb0339..50046f6 100644 --- a/ipfs-api/src/request/ping.rs +++ b/ipfs-api/src/request/ping.rs @@ -7,6 +7,7 @@ // use crate::request::ApiRequest; +use crate::serde::Serialize; #[derive(Serialize)] pub struct Ping<'a> { diff --git a/ipfs-api/src/request/pubsub.rs b/ipfs-api/src/request/pubsub.rs index d3e4ce5..b2a46bc 100644 --- a/ipfs-api/src/request/pubsub.rs +++ b/ipfs-api/src/request/pubsub.rs @@ -7,6 +7,7 @@ // use crate::request::ApiRequest; +use crate::serde::Serialize; pub struct PubsubLs; diff --git a/ipfs-api/src/request/tar.rs b/ipfs-api/src/request/tar.rs index 6aab27c..6129521 100644 --- a/ipfs-api/src/request/tar.rs +++ b/ipfs-api/src/request/tar.rs @@ -7,6 +7,7 @@ // use crate::request::ApiRequest; +use crate::serde::Serialize; use http::Method; pub struct TarAdd; diff --git a/ipfs-api/src/response/add.rs b/ipfs-api/src/response/add.rs index 24c82ac..e9a923d 100644 --- a/ipfs-api/src/response/add.rs +++ b/ipfs-api/src/response/add.rs @@ -6,6 +6,8 @@ // copied, modified, or distributed except according to those terms. // +use crate::serde::Deserialize; + #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct AddResponse { diff --git a/ipfs-api/src/response/bitswap.rs b/ipfs-api/src/response/bitswap.rs index 143680c..95af909 100644 --- a/ipfs-api/src/response/bitswap.rs +++ b/ipfs-api/src/response/bitswap.rs @@ -7,6 +7,7 @@ // use crate::response::serde; +use crate::serde::Deserialize; #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] diff --git a/ipfs-api/src/response/block.rs b/ipfs-api/src/response/block.rs index c04bd89..7ec9e3d 100644 --- a/ipfs-api/src/response/block.rs +++ b/ipfs-api/src/response/block.rs @@ -6,6 +6,8 @@ // copied, modified, or distributed except according to those terms. // +use crate::serde::Deserialize; + #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct BlockPutResponse { diff --git a/ipfs-api/src/response/bootstrap.rs b/ipfs-api/src/response/bootstrap.rs index 6700073..838cdbb 100644 --- a/ipfs-api/src/response/bootstrap.rs +++ b/ipfs-api/src/response/bootstrap.rs @@ -7,6 +7,7 @@ // use crate::response::serde; +use crate::serde::Deserialize; #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] diff --git a/ipfs-api/src/response/commands.rs b/ipfs-api/src/response/commands.rs index b3d5f86..b23d830 100644 --- a/ipfs-api/src/response/commands.rs +++ b/ipfs-api/src/response/commands.rs @@ -7,6 +7,7 @@ // use crate::response::serde; +use crate::serde::Deserialize; #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] diff --git a/ipfs-api/src/response/dag.rs b/ipfs-api/src/response/dag.rs index 2efc0f6..c53a282 100644 --- a/ipfs-api/src/response/dag.rs +++ b/ipfs-api/src/response/dag.rs @@ -7,6 +7,7 @@ // use crate::response::serde; +use crate::serde::Deserialize; use std::collections::HashMap; #[derive(Debug, Deserialize)] diff --git a/ipfs-api/src/response/dht.rs b/ipfs-api/src/response/dht.rs index 31f64f5..f2207aa 100644 --- a/ipfs-api/src/response/dht.rs +++ b/ipfs-api/src/response/dht.rs @@ -7,7 +7,10 @@ // use crate::response::serde; -use serde::de::{Deserialize, Deserializer, Error}; +use crate::serde::{ + de::{Deserializer, Error}, + Deserialize, +}; /// See /// [libp2p](https://github.com/libp2p/go-libp2p-routing/blob/master/notifications/query.go#L16). diff --git a/ipfs-api/src/response/dns.rs b/ipfs-api/src/response/dns.rs index 69f79d2..8142c0f 100644 --- a/ipfs-api/src/response/dns.rs +++ b/ipfs-api/src/response/dns.rs @@ -6,6 +6,8 @@ // copied, modified, or distributed except according to those terms. // +use crate::serde::Deserialize; + #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct DnsResponse { diff --git a/ipfs-api/src/response/error.rs b/ipfs-api/src/response/error.rs index e816673..5287a3d 100644 --- a/ipfs-api/src/response/error.rs +++ b/ipfs-api/src/response/error.rs @@ -5,6 +5,9 @@ // http://opensource.org/licenses/MIT>, at your option. This file may not be // copied, modified, or distributed except according to those terms. // + +use crate::serde::Deserialize; + #[cfg(feature = "actix")] use awc; use http; diff --git a/ipfs-api/src/response/file.rs b/ipfs-api/src/response/file.rs index 5804b78..7853249 100644 --- a/ipfs-api/src/response/file.rs +++ b/ipfs-api/src/response/file.rs @@ -7,6 +7,7 @@ // use crate::response::{serde, IpfsHeader}; +use crate::serde::Deserialize; use std::collections::HashMap; #[derive(Debug, Deserialize)] diff --git a/ipfs-api/src/response/files.rs b/ipfs-api/src/response/files.rs index eafc234..069ba32 100644 --- a/ipfs-api/src/response/files.rs +++ b/ipfs-api/src/response/files.rs @@ -7,6 +7,7 @@ // use crate::response::serde; +use crate::serde::Deserialize; pub type FilesCpResponse = (); diff --git a/ipfs-api/src/response/filestore.rs b/ipfs-api/src/response/filestore.rs index 0ad0474..fe898f5 100644 --- a/ipfs-api/src/response/filestore.rs +++ b/ipfs-api/src/response/filestore.rs @@ -6,6 +6,8 @@ // copied, modified, or distributed except according to those terms. // +use crate::serde::Deserialize; + #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct FilestoreDupsResponse { diff --git a/ipfs-api/src/response/id.rs b/ipfs-api/src/response/id.rs index 40cfff7..d8eaf98 100644 --- a/ipfs-api/src/response/id.rs +++ b/ipfs-api/src/response/id.rs @@ -7,6 +7,7 @@ // use crate::response::serde; +use crate::serde::Deserialize; #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] diff --git a/ipfs-api/src/response/key.rs b/ipfs-api/src/response/key.rs index d9d604a..6c7099e 100644 --- a/ipfs-api/src/response/key.rs +++ b/ipfs-api/src/response/key.rs @@ -7,6 +7,7 @@ // use crate::response::serde; +use crate::serde::Deserialize; #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] diff --git a/ipfs-api/src/response/log.rs b/ipfs-api/src/response/log.rs index 1c096e0..0d37510 100644 --- a/ipfs-api/src/response/log.rs +++ b/ipfs-api/src/response/log.rs @@ -7,6 +7,7 @@ // use crate::response::serde; +use crate::serde::Deserialize; #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] diff --git a/ipfs-api/src/response/ls.rs b/ipfs-api/src/response/ls.rs index 5977328..5e6fd2f 100644 --- a/ipfs-api/src/response/ls.rs +++ b/ipfs-api/src/response/ls.rs @@ -7,6 +7,7 @@ // use crate::response::serde; +use crate::serde::Deserialize; #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] diff --git a/ipfs-api/src/response/mod.rs b/ipfs-api/src/response/mod.rs index 0f00a80..8aa6f14 100644 --- a/ipfs-api/src/response/mod.rs +++ b/ipfs-api/src/response/mod.rs @@ -8,6 +8,8 @@ //! This module contains structures returned by the IPFS API. +use crate::serde::Deserialize; + pub use self::add::*; pub use self::bitswap::*; pub use self::block::*; diff --git a/ipfs-api/src/response/mount.rs b/ipfs-api/src/response/mount.rs index 59f2bf3..9757bd3 100644 --- a/ipfs-api/src/response/mount.rs +++ b/ipfs-api/src/response/mount.rs @@ -6,6 +6,8 @@ // copied, modified, or distributed except according to those terms. // +use crate::serde::Deserialize; + #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct MountResponse { diff --git a/ipfs-api/src/response/name.rs b/ipfs-api/src/response/name.rs index de142db..600f83d 100644 --- a/ipfs-api/src/response/name.rs +++ b/ipfs-api/src/response/name.rs @@ -6,6 +6,8 @@ // copied, modified, or distributed except according to those terms. // +use crate::serde::Deserialize; + #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct NamePublishResponse { diff --git a/ipfs-api/src/response/object.rs b/ipfs-api/src/response/object.rs index c16038a..c616165 100644 --- a/ipfs-api/src/response/object.rs +++ b/ipfs-api/src/response/object.rs @@ -7,6 +7,7 @@ // use crate::response::{serde, IpfsHeader}; +use crate::serde::Deserialize; use std::collections::HashMap; #[derive(Debug, Deserialize)] diff --git a/ipfs-api/src/response/pin.rs b/ipfs-api/src/response/pin.rs index 7e03e91..3a303ba 100644 --- a/ipfs-api/src/response/pin.rs +++ b/ipfs-api/src/response/pin.rs @@ -7,6 +7,7 @@ // use crate::response::serde; +use crate::serde::Deserialize; use std::collections::HashMap; #[derive(Debug, Deserialize)] diff --git a/ipfs-api/src/response/ping.rs b/ipfs-api/src/response/ping.rs index 977ef90..b094c8c 100644 --- a/ipfs-api/src/response/ping.rs +++ b/ipfs-api/src/response/ping.rs @@ -6,6 +6,8 @@ // copied, modified, or distributed except according to those terms. // +use crate::serde::Deserialize; + #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct PingResponse { diff --git a/ipfs-api/src/response/pubsub.rs b/ipfs-api/src/response/pubsub.rs index a5f6249..c645fb6 100644 --- a/ipfs-api/src/response/pubsub.rs +++ b/ipfs-api/src/response/pubsub.rs @@ -7,6 +7,7 @@ // use crate::response::serde; +use crate::serde::Deserialize; #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] diff --git a/ipfs-api/src/response/refs.rs b/ipfs-api/src/response/refs.rs index 6f66cf0..52061ba 100644 --- a/ipfs-api/src/response/refs.rs +++ b/ipfs-api/src/response/refs.rs @@ -6,6 +6,8 @@ // copied, modified, or distributed except according to those terms. // +use crate::serde::Deserialize; + #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct RefsLocalResponse { diff --git a/ipfs-api/src/response/repo.rs b/ipfs-api/src/response/repo.rs index 82e3e96.. |