From c2f1199de55897cc98d7663f171329a04e63b230 Mon Sep 17 00:00:00 2001 From: Ferris Tseng Date: Tue, 23 Jan 2018 18:30:11 -0500 Subject: formatting --- ipfs-api/examples/add_tar.rs | 8 +++---- ipfs-api/examples/ping_peer.rs | 8 ++++--- ipfs-api/examples/pubsub.rs | 6 ++--- ipfs-api/src/header.rs | 6 ++--- ipfs-api/src/read.rs | 17 +++++-------- ipfs-api/src/request/add.rs | 1 - ipfs-api/src/request/bitswap.rs | 10 ++------ ipfs-api/src/request/block.rs | 13 +++------- ipfs-api/src/request/bootstrap.rs | 3 --- ipfs-api/src/request/cat.rs | 4 +--- ipfs-api/src/request/commands.rs | 1 - ipfs-api/src/request/config.rs | 3 --- ipfs-api/src/request/dag.rs | 5 +--- ipfs-api/src/request/dht.rs | 27 ++++++--------------- ipfs-api/src/request/diag.rs | 6 +---- ipfs-api/src/request/dns.rs | 4 +--- ipfs-api/src/request/file.rs | 4 +--- ipfs-api/src/request/files.rs | 42 +++++++++----------------------- ipfs-api/src/request/filestore.rs | 9 ++----- ipfs-api/src/request/get.rs | 4 +--- ipfs-api/src/request/id.rs | 4 +--- ipfs-api/src/request/log.rs | 11 ++------- ipfs-api/src/request/ls.rs | 13 ++++++---- ipfs-api/src/request/mod.rs | 4 ---- ipfs-api/src/request/object.rs | 20 ++++------------ ipfs-api/src/request/pin.rs | 15 ++++-------- ipfs-api/src/request/ping.rs | 4 +--- ipfs-api/src/request/pubsub.rs | 16 ++++--------- ipfs-api/src/request/refs.rs | 1 - ipfs-api/src/request/stats.rs | 3 --- ipfs-api/src/request/swarm.rs | 2 -- ipfs-api/src/request/tar.rs | 5 +--- ipfs-api/src/request/version.rs | 1 - ipfs-api/src/response/bitswap.rs | 14 +++-------- ipfs-api/src/response/block.rs | 3 --- ipfs-api/src/response/bootstrap.rs | 13 +++------- ipfs-api/src/response/commands.rs | 12 +++------- ipfs-api/src/response/config.rs | 2 -- ipfs-api/src/response/dag.rs | 10 ++------ ipfs-api/src/response/dht.rs | 19 ++++----------- ipfs-api/src/response/diag.rs | 2 -- ipfs-api/src/response/error.rs | 2 -- ipfs-api/src/response/file.rs | 9 ++----- ipfs-api/src/response/files.rs | 19 +++------------ ipfs-api/src/response/filestore.rs | 6 +---- ipfs-api/src/response/id.rs | 8 ++----- ipfs-api/src/response/log.rs | 6 +---- ipfs-api/src/response/ls.rs | 13 +++------- ipfs-api/src/response/mod.rs | 6 +---- ipfs-api/src/response/mount.rs | 7 ++---- ipfs-api/src/response/name.rs | 2 -- ipfs-api/src/response/object.rs | 49 ++++++++++---------------------------- ipfs-api/src/response/pin.rs | 18 ++++---------- ipfs-api/src/response/ping.rs | 1 - ipfs-api/src/response/pubsub.rs | 17 ++++--------- ipfs-api/src/response/refs.rs | 4 +--- ipfs-api/src/response/repo.rs | 9 +------ ipfs-api/src/response/resolve.rs | 1 - ipfs-api/src/response/serde.rs | 3 --- ipfs-api/src/response/stats.rs | 4 ---- ipfs-api/src/response/swarm.rs | 30 ++++++----------------- ipfs-api/src/response/tar.rs | 1 - ipfs-api/src/response/version.rs | 1 - ipfs-cli/src/command/add.rs | 2 -- ipfs-cli/src/command/bitswap.rs | 2 -- ipfs-cli/src/command/block.rs | 9 +++---- ipfs-cli/src/command/bootstrap.rs | 34 ++++++++++---------------- ipfs-cli/src/command/cat.rs | 8 +++---- ipfs-cli/src/command/commands.rs | 3 --- ipfs-cli/src/command/config.rs | 2 -- ipfs-cli/src/command/dag.rs | 2 -- ipfs-cli/src/command/dht.rs | 10 +++----- ipfs-cli/src/command/diag.rs | 46 +++++++++++++++++------------------ ipfs-cli/src/command/dns.rs | 2 -- ipfs-cli/src/command/file.rs | 2 -- ipfs-cli/src/command/files.rs | 8 +++---- ipfs-cli/src/command/filestore.rs | 9 +++---- ipfs-cli/src/command/mod.rs | 3 --- ipfs-cli/src/command/version.rs | 7 ++---- 79 files changed, 190 insertions(+), 530 deletions(-) diff --git a/ipfs-api/examples/add_tar.rs b/ipfs-api/examples/add_tar.rs index 0a1582c..401c61d 100644 --- a/ipfs-api/examples/add_tar.rs +++ b/ipfs-api/examples/add_tar.rs @@ -6,8 +6,8 @@ // copied, modified, or distributed except according to those terms. // -extern crate ipfs_api; extern crate futures; +extern crate ipfs_api; extern crate tar; extern crate tokio_core; @@ -33,9 +33,9 @@ fn main() { { let mut builder = Builder::new(&mut buf); - builder.append_path(file!()).expect( - "failed to create tar file", - ); + builder + .append_path(file!()) + .expect("failed to create tar file"); builder.finish().expect("failed to create tar file"); } diff --git a/ipfs-api/examples/ping_peer.rs b/ipfs-api/examples/ping_peer.rs index 36713ee..922aab8 100644 --- a/ipfs-api/examples/ping_peer.rs +++ b/ipfs-api/examples/ping_peer.rs @@ -29,9 +29,11 @@ fn main() { let connected = client.swarm_peers(); let connected = core.run(connected).expect("expected a valid response"); - let peer = connected.peers.iter().next().expect( - "expected at least one peer", - ); + let peer = connected + .peers + .iter() + .next() + .expect("expected at least one peer"); println!(); println!("discovered peer ({})", peer.peer); diff --git a/ipfs-api/examples/pubsub.rs b/ipfs-api/examples/pubsub.rs index 9d37c04..54a07ac 100644 --- a/ipfs-api/examples/pubsub.rs +++ b/ipfs-api/examples/pubsub.rs @@ -49,9 +49,9 @@ fn main() { println!(); println!("starting task to publish messages to ({})...", TOPIC); - event_loop.run(publish).expect( - "expected the publish task to start", - ); + event_loop + .run(publish) + .expect("expected the publish task to start"); }); // This block will execute a future that suscribes to a topic, diff --git a/ipfs-api/src/header.rs b/ipfs-api/src/header.rs index 460af2b..aec3c0a 100644 --- a/ipfs-api/src/header.rs +++ b/ipfs-api/src/header.rs @@ -10,7 +10,6 @@ use hyper; use hyper::header::{self, Header, Raw}; use std::fmt; - /// Header that is returned for streaming calls. /// /// A `Trailer` header indicates that after a streaming call, there will @@ -51,7 +50,6 @@ impl Header for Trailer { } } - /// This header is included while streaming if an error occured /// while streaming the data. /// @@ -69,7 +67,9 @@ impl Header for XStreamError { if let Some(bytes) = raw.one() { let value = String::from_utf8_lossy(bytes); - Ok(XStreamError { error: value.into_owned() }) + Ok(XStreamError { + error: value.into_owned(), + }) } else { Err(hyper::Error::Header) } diff --git a/ipfs-api/src/read.rs b/ipfs-api/src/read.rs index 5f60c69..5a37b08 100644 --- a/ipfs-api/src/read.rs +++ b/ipfs-api/src/read.rs @@ -20,7 +20,6 @@ use std::marker::PhantomData; use tokio_io::AsyncRead; use tokio_io::codec::Decoder; - /// A decoder for a response where each line is a full json object. /// pub struct JsonLineDecoder { @@ -71,14 +70,14 @@ where if self.parse_stream_error { match slice.iter().position(|&x| x == b':') { Some(colon) - if &slice[..colon] == XStreamError::header_name().as_bytes() => { + if &slice[..colon] == XStreamError::header_name().as_bytes() => + { let raw = Raw::from(&slice[colon + 2..]); match XStreamError::parse_header(&raw) { - Ok(stream_error) => Err( - ErrorKind::StreamError(stream_error.error) - .into(), - ), + Ok(stream_error) => { + Err(ErrorKind::StreamError(stream_error.error).into()) + } Err(_) => Err(e.into()), } } @@ -95,7 +94,6 @@ where } } - /// A decoder that reads a line at a time. /// pub struct LineDecoder; @@ -115,8 +113,7 @@ impl Decoder for LineDecoder { let slice = src.split_to(pos + 1); Ok(Some( - String::from_utf8_lossy(&slice[..slice.len() - 1]) - .into_owned(), + String::from_utf8_lossy(&slice[..slice.len() - 1]).into_owned(), )) } else { Ok(None) @@ -124,7 +121,6 @@ impl Decoder for LineDecoder { } } - /// The state of a stream returning Chunks. /// enum ReadState { @@ -137,7 +133,6 @@ enum ReadState { NotReady, } - /// Reads from a stream of chunks asynchronously. /// pub struct StreamReader { diff --git a/ipfs-api/src/request/add.rs b/ipfs-api/src/request/add.rs index 037e57a..666041d 100644 --- a/ipfs-api/src/request/add.rs +++ b/ipfs-api/src/request/add.rs @@ -8,7 +8,6 @@ use request::ApiRequest; - pub struct Add; impl_skip_serialize!(Add); diff --git a/ipfs-api/src/request/bitswap.rs b/ipfs-api/src/request/bitswap.rs index 45230cb..1f795bb 100644 --- a/ipfs-api/src/request/bitswap.rs +++ b/ipfs-api/src/request/bitswap.rs @@ -8,18 +8,15 @@ use request::ApiRequest; - #[derive(Serialize)] pub struct BitswapLedger<'a> { - #[serde(rename = "arg")] - pub peer: &'a str, + #[serde(rename = "arg")] pub peer: &'a str, } impl<'a> ApiRequest for BitswapLedger<'a> { const PATH: &'static str = "/bitswap/ledger"; } - pub struct BitswapStat; impl_skip_serialize!(BitswapStat); @@ -28,18 +25,15 @@ impl ApiRequest for BitswapStat { const PATH: &'static str = "/bitswap/stat"; } - #[derive(Serialize)] pub struct BitswapUnwant<'a> { - #[serde(rename = "arg")] - pub key: &'a str, + #[serde(rename = "arg")] pub key: &'a str, } impl<'a> ApiRequest for BitswapUnwant<'a> { const PATH: &'static str = "/bitswap/stat"; } - #[derive(Serialize)] pub struct BitswapWantlist<'a> { pub peer: Option<&'a str>, diff --git a/ipfs-api/src/request/block.rs b/ipfs-api/src/request/block.rs index b525109..4dca973 100644 --- a/ipfs-api/src/request/block.rs +++ b/ipfs-api/src/request/block.rs @@ -8,18 +8,15 @@ use request::ApiRequest; - #[derive(Serialize)] pub struct BlockGet<'a> { - #[serde(rename = "arg")] - pub hash: &'a str, + #[serde(rename = "arg")] pub hash: &'a str, } impl<'a> ApiRequest for BlockGet<'a> { const PATH: &'static str = "/block/get"; } - pub struct BlockPut; impl_skip_serialize!(BlockPut); @@ -28,22 +25,18 @@ impl ApiRequest for BlockPut { const PATH: &'static str = "/block/put"; } - #[derive(Serialize)] pub struct BlockRm<'a> { - #[serde(rename = "arg")] - pub hash: &'a str, + #[serde(rename = "arg")] pub hash: &'a str, } impl<'a> ApiRequest for BlockRm<'a> { const PATH: &'static str = "/block/rm"; } - #[derive(Serialize)] pub struct BlockStat<'a> { - #[serde(rename = "arg")] - pub hash: &'a str, + #[serde(rename = "arg")] pub hash: &'a str, } impl<'a> ApiRequest for BlockStat<'a> { diff --git a/ipfs-api/src/request/bootstrap.rs b/ipfs-api/src/request/bootstrap.rs index c60072a..bc632f4 100644 --- a/ipfs-api/src/request/bootstrap.rs +++ b/ipfs-api/src/request/bootstrap.rs @@ -8,7 +8,6 @@ use request::ApiRequest; - pub struct BootstrapAddDefault; impl_skip_serialize!(BootstrapAddDefault); @@ -17,7 +16,6 @@ impl ApiRequest for BootstrapAddDefault { const PATH: &'static str = "/bootstrap/add/default"; } - pub struct BootstrapList; impl_skip_serialize!(BootstrapList); @@ -26,7 +24,6 @@ impl ApiRequest for BootstrapList { const PATH: &'static str = "/bootstrap/list"; } - pub struct BootstrapRmAll; impl_skip_serialize!(BootstrapRmAll); diff --git a/ipfs-api/src/request/cat.rs b/ipfs-api/src/request/cat.rs index 6b958d4..f672fed 100644 --- a/ipfs-api/src/request/cat.rs +++ b/ipfs-api/src/request/cat.rs @@ -8,11 +8,9 @@ use request::ApiRequest; - #[derive(Serialize)] pub struct Cat<'a> { - #[serde(rename = "arg")] - pub path: &'a str, + #[serde(rename = "arg")] pub path: &'a str, } impl<'a> ApiRequest for Cat<'a> { diff --git a/ipfs-api/src/request/commands.rs b/ipfs-api/src/request/commands.rs index 8dcfdee..11879f2 100644 --- a/ipfs-api/src/request/commands.rs +++ b/ipfs-api/src/request/commands.rs @@ -8,7 +8,6 @@ use request::ApiRequest; - pub struct Commands; impl_skip_serialize!(Commands); diff --git a/ipfs-api/src/request/config.rs b/ipfs-api/src/request/config.rs index 13e0670..41f9ba7 100644 --- a/ipfs-api/src/request/config.rs +++ b/ipfs-api/src/request/config.rs @@ -8,7 +8,6 @@ use request::ApiRequest; - pub struct ConfigEdit; impl_skip_serialize!(ConfigEdit); @@ -17,7 +16,6 @@ impl ApiRequest for ConfigEdit { const PATH: &'static str = "/config/edit"; } - pub struct ConfigReplace; impl_skip_serialize!(ConfigReplace); @@ -26,7 +24,6 @@ impl ApiRequest for ConfigReplace { const PATH: &'static str = "/config/replace"; } - pub struct ConfigShow; impl_skip_serialize!(ConfigShow); diff --git a/ipfs-api/src/request/dag.rs b/ipfs-api/src/request/dag.rs index cc5cf08..fc39872 100644 --- a/ipfs-api/src/request/dag.rs +++ b/ipfs-api/src/request/dag.rs @@ -8,18 +8,15 @@ use request::ApiRequest; - #[derive(Serialize)] pub struct DagGet<'a> { - #[serde(rename = "arg")] - pub path: &'a str, + #[serde(rename = "arg")] pub path: &'a str, } impl<'a> ApiRequest for DagGet<'a> { const PATH: &'static str = "/dag/get"; } - pub struct DagPut; impl_skip_serialize!(DagPut); diff --git a/ipfs-api/src/request/dht.rs b/ipfs-api/src/request/dht.rs index dfafbc4..5d772a9 100644 --- a/ipfs-api/src/request/dht.rs +++ b/ipfs-api/src/request/dht.rs @@ -8,69 +8,56 @@ use request::ApiRequest; - #[derive(Serialize)] pub struct DhtFindPeer<'a> { - #[serde(rename = "arg")] - pub peer: &'a str, + #[serde(rename = "arg")] pub peer: &'a str, } impl<'a> ApiRequest for DhtFindPeer<'a> { const PATH: &'static str = "/dht/findpeer"; } - #[derive(Serialize)] pub struct DhtFindProvs<'a> { - #[serde(rename = "arg")] - pub key: &'a str, + #[serde(rename = "arg")] pub key: &'a str, } impl<'a> ApiRequest for DhtFindProvs<'a> { const PATH: &'static str = "/dht/findprovs"; } - #[derive(Serialize)] pub struct DhtGet<'a> { - #[serde(rename = "arg")] - pub key: &'a str, + #[serde(rename = "arg")] pub key: &'a str, } impl<'a> ApiRequest for DhtGet<'a> { const PATH: &'static str = "/dht/get"; } - #[derive(Serialize)] pub struct DhtProvide<'a> { - #[serde(rename = "arg")] - pub key: &'a str, + #[serde(rename = "arg")] pub key: &'a str, } impl<'a> ApiRequest for DhtProvide<'a> { const PATH: &'static str = "/dht/provide"; } - #[derive(Serialize)] pub struct DhtPut<'a> { - #[serde(rename = "arg")] - pub key: &'a str, + #[serde(rename = "arg")] pub key: &'a str, - #[serde(rename = "arg")] - pub value: &'a str, + #[serde(rename = "arg")] pub value: &'a str, } impl<'a> ApiRequest for DhtPut<'a> { const PATH: &'static str = "/dht/put"; } - #[derive(Serialize)] pub struct DhtQuery<'a> { - #[serde(rename = "arg")] - pub peer: &'a str, + #[serde(rename = "arg")] pub peer: &'a str, } impl<'a> ApiRequest for DhtQuery<'a> { diff --git a/ipfs-api/src/request/diag.rs b/ipfs-api/src/request/diag.rs index 2091e0d..d3fda10 100644 --- a/ipfs-api/src/request/diag.rs +++ b/ipfs-api/src/request/diag.rs @@ -8,7 +8,6 @@ use request::ApiRequest; - pub struct DiagCmdsClear; impl_skip_serialize!(DiagCmdsClear); @@ -17,18 +16,15 @@ impl ApiRequest for DiagCmdsClear { const PATH: &'static str = "/diag/cmds/clear"; } - #[derive(Serialize)] pub struct DiagCmdsSetTime<'a> { - #[serde(rename = "arg")] - pub time: &'a str, + #[serde(rename = "arg")] pub time: &'a str, } impl<'a> ApiRequest for DiagCmdsSetTime<'a> { const PATH: &'static str = "/diag/cmds/set-time"; } - pub struct DiagSys; impl_skip_serialize!(DiagSys); diff --git a/ipfs-api/src/request/dns.rs b/ipfs-api/src/request/dns.rs index 8657e7d..90870bf 100644 --- a/ipfs-api/src/request/dns.rs +++ b/ipfs-api/src/request/dns.rs @@ -8,11 +8,9 @@ use request::ApiRequest; - #[derive(Serialize)] pub struct Dns<'a> { - #[serde(rename = "arg")] - pub link: &'a str, + #[serde(rename = "arg")] pub link: &'a str, pub recursive: bool, } diff --git a/ipfs-api/src/request/file.rs b/ipfs-api/src/request/file.rs index ff995fc..ff55e02 100644 --- a/ipfs-api/src/request/file.rs +++ b/ipfs-api/src/request/file.rs @@ -8,11 +8,9 @@ use request::ApiRequest; - #[derive(Serialize)] pub struct FileLs<'a> { - #[serde(rename = "arg")] - pub path: &'a str, + #[serde(rename = "arg")] pub path: &'a str, } impl<'a> ApiRequest for FileLs<'a> { diff --git a/ipfs-api/src/request/files.rs b/ipfs-api/src/request/files.rs index cbe07d7..f40c434 100644 --- a/ipfs-api/src/request/files.rs +++ b/ipfs-api/src/request/files.rs @@ -8,47 +8,38 @@ use request::ApiRequest; - #[derive(Serialize)] pub struct FilesCp<'a> { - #[serde(rename = "arg")] - pub path: &'a str, + #[serde(rename = "arg")] pub path: &'a str, - #[serde(rename = "arg")] - pub dest: &'a str, + #[serde(rename = "arg")] pub dest: &'a str, } impl<'a> ApiRequest for FilesCp<'a> { const PATH: &'static str = "/files/cp"; } - #[derive(Serialize)] pub struct FilesFlush<'a> { - #[serde(rename = "arg")] - pub path: &'a Option<&'a str>, + #[serde(rename = "arg")] pub path: &'a Option<&'a str>, } impl<'a> ApiRequest for FilesFlush<'a> { const PATH: &'static str = "/files/flush"; } - #[derive(Serialize)] pub struct FilesLs<'a> { - #[serde(rename = "arg")] - pub path: &'a Option<&'a str>, + #[serde(rename = "arg")] pub path: &'a Option<&'a str>, } impl<'a> ApiRequest for FilesLs<'a> { const PATH: &'static str = "/files/ls"; } - #[derive(Serialize)] pub struct FilesMkdir<'a> { - #[serde(rename = "arg")] - pub path: &'a str, + #[serde(rename = "arg")] pub path: &'a str, pub parents: bool, } @@ -57,36 +48,29 @@ impl<'a> ApiRequest for FilesMkdir<'a> { const PATH: &'static str = "/files/mkdir"; } - #[derive(Serialize)] pub struct FilesMv<'a> { - #[serde(rename = "arg")] - pub path: &'a str, + #[serde(rename = "arg")] pub path: &'a str, - #[serde(rename = "arg")] - pub dest: &'a str, + #[serde(rename = "arg")] pub dest: &'a str, } impl<'a> ApiRequest for FilesMv<'a> { const PATH: &'static str = "/files/mv"; } - #[derive(Serialize)] pub struct FilesRead<'a> { - #[serde(rename = "arg")] - pub path: &'a str, + #[serde(rename = "arg")] pub path: &'a str, } impl<'a> ApiRequest for FilesRead<'a> { const PATH: &'static str = "/files/read"; } - #[derive(Serialize)] pub struct FilesRm<'a> { - #[serde(rename = "arg")] - pub path: &'a str, + #[serde(rename = "arg")] pub path: &'a str, pub recursive: bool, } @@ -95,22 +79,18 @@ impl<'a> ApiRequest for FilesRm<'a> { const PATH: &'static str = "/files/rm"; } - #[derive(Serialize)] pub struct FilesStat<'a> { - #[serde(rename = "arg")] - pub path: &'a str, + #[serde(rename = "arg")] pub path: &'a str, } impl<'a> ApiRequest for FilesStat<'a> { const PATH: &'static str = "/files/stat"; } - #[derive(Serialize)] pub struct FilesWrite<'a> { - #[serde(rename = "arg")] - pub path: &'a str, + #[serde(rename = "arg")] pub path: &'a str, pub create: bool, diff --git a/ipfs-api/src/request/filestore.rs b/ipfs-api/src/request/filestore.rs index 082b999..63e9c2d 100644 --- a/ipfs-api/src/request/filestore.rs +++ b/ipfs-api/src/request/filestore.rs @@ -8,7 +8,6 @@ use request::ApiRequest; - pub struct FilestoreDups; impl_skip_serialize!(FilestoreDups); @@ -17,22 +16,18 @@ impl ApiRequest for FilestoreDups { const PATH: &'static str = "/filestore/dups"; } - #[derive(Serialize)] pub struct FilestoreLs<'a> { - #[serde(rename = "arg")] - pub cid: &'a Option<&'a str>, + #[serde(rename = "arg")] pub cid: &'a Option<&'a str>, } impl<'a> ApiRequest for FilestoreLs<'a> { const PATH: &'static str = "/filestore/ls"; } - #[derive(Serialize)] pub struct FilestoreVerify<'a> { - #[serde(rename = "arg")] - pub cid: &'a Option<&'a str>, + #[serde(rename = "arg")] pub cid: &'a Option<&'a str>, } impl<'a> ApiRequest for FilestoreVerify<'a> { diff --git a/ipfs-api/src/request/get.rs b/ipfs-api/src/request/get.rs index 959e70a..65fef0f 100644 --- a/ipfs-api/src/request/get.rs +++ b/ipfs-api/src/request/get.rs @@ -8,11 +8,9 @@ use request::ApiRequest; - #[derive(Serialize)] pub struct Get<'a> { - #[serde(rename = "arg")] - pub path: &'a str, + #[serde(rename = "arg")] pub path: &'a str, } impl<'a> ApiRequest for Get<'a> { diff --git a/ipfs-api/src/request/id.rs b/ipfs-api/src/request/id.rs index 144a9ed..d5657c8 100644 --- a/ipfs-api/src/request/id.rs +++ b/ipfs-api/src/request/id.rs @@ -8,11 +8,9 @@ use request::ApiRequest; - #[derive(Serialize)] pub struct Id<'a> { - #[serde(rename = "arg")] - pub peer: &'a Option<&'a str>, + #[serde(rename = "arg")] pub peer: &'a Option<&'a str>, } impl<'a> ApiRequest for Id<'a> { diff --git a/ipfs-api/src/request/log.rs b/ipfs-api/src/request/log.rs index 04746c1..aab9ce5 100644 --- a/ipfs-api/src/request/log.rs +++ b/ipfs-api/src/request/log.rs @@ -10,7 +10,6 @@ use request::ApiRequest; use serde::ser::{Serialize, Serializer}; use std::borrow::Cow; - #[derive(Copy, Clone)] pub enum LoggingLevel { Debug, @@ -37,7 +36,6 @@ impl Serialize for LoggingLevel { } } - pub enum Logger<'a> { All, Specific(Cow<'a, str>), @@ -57,21 +55,17 @@ impl<'a> Serialize for Logger<'a> { } } - #[derive(Serialize)] pub struct LogLevel<'a> { - #[serde(rename = "arg")] - pub logger: Logger<'a>, + #[serde(rename = "arg")] pub logger: Logger<'a>, - #[serde(rename = "arg")] - pub level: LoggingLevel, + #[serde(rename = "arg")] pub level: LoggingLevel, } impl<'a> ApiRequest for LogLevel<'a> { const PATH: &'static str = "/log/level"; } - pub struct LogLs; impl_skip_serialize!(LogLs); @@ -80,7 +74,6 @@ impl ApiRequest for LogLs { const PATH: &'static str = "/log/ls"; } - pub struct LogTail; impl_skip_serialize!(LogTail); diff --git a/ipfs-api/src/request/ls.rs b/ipfs-api/src/request/ls.rs index 90ebd30..e3c78fd 100644 --- a/ipfs-api/src/request/ls.rs +++ b/ipfs-api/src/request/ls.rs @@ -8,22 +8,25 @@ use request::ApiRequest; - #[derive(Serialize)] pub struct Ls<'a> { - #[serde(rename = "arg")] - pub path: &'a Option<&'a str>, + #[serde(rename = "arg")] pub path: &'a Option<&'a str>, } impl<'a> ApiRequest for Ls<'a> { const PATH: &'static str = "/ls"; } - #[cfg(test)] mod tests { use super::Ls; - serialize_url_test!(test_serializes_0, Ls { path: &Some("test") }, "arg=test"); + serialize_url_test!( + test_serializes_0, + Ls { + path: &Some("test"), + }, + "arg=test" + ); serialize_url_test!(test_serializes_1, Ls { path: &None }, ""); } diff --git a/ipfs-api/src/request/mod.rs b/ipfs-api/src/request/mod.rs index 30705f8..7e57b64 100644 --- a/ipfs-api/src/request/mod.rs +++ b/ipfs-api/src/request/mod.rs @@ -35,7 +35,6 @@ pub use self::swarm::*; pub use self::tar::*; pub use self::version::*; - /// Create a test to verify that serializing a `ApiRequest` returns the expected /// url encoded string. /// @@ -52,7 +51,6 @@ macro_rules! serialize_url_test { ) } - /// Implements the `Serialize` trait for types that do not require /// serialization. This provides a workaround for a limitation in /// `serde_urlencoded`, that prevents unit structs from being serialized. @@ -69,7 +67,6 @@ macro_rules! impl_skip_serialize { ) } - mod add; mod bitswap; mod block; @@ -99,7 +96,6 @@ mod swarm; mod tar; mod version; - /// A request that can be made against the Ipfs API. /// pub trait ApiRequest { diff --git a/ipfs-api/src/request/object.rs b/ipfs-api/src/request/object.rs index c9b3a51..a13cfaa 100644 --- a/ipfs-api/src/request/object.rs +++ b/ipfs-api/src/request/object.rs @@ -8,54 +8,44 @@ use request::ApiRequest; - #[derive(Serialize)] pub struct ObjectDiff<'a> { - #[serde(rename = "arg")] - pub key0: &'a str, + #[serde(rename = "arg")] pub key0: &'a str, - #[serde(rename = "arg")] - pub key1: &'a str, + #[serde(rename = "arg")] pub key1: &'a str, } impl<'a> ApiRequest for ObjectDiff<'a> { const PATH: &'static str = "/object/diff"; } - #[derive(Serialize)] pub struct ObjectGet<'a> { - #[serde(rename = "arg")] - pub key: &'a str, + #[serde(rename = "arg")] pub key: &'a str, } impl<'a> ApiRequest for ObjectGet<'a> { const PATH: &'static str = "/object/get"; } - #[derive(Serialize)] pub struct ObjectLinks<'a> { - #[serde(rename = "arg")] - pub key: &'a str, + #[serde(rename = "arg")] pub key: &'a str, } impl<'a> ApiRequest for ObjectLinks<'a> { const PATH: &'static str = "/object/links"; } - #[derive(Serialize)] pub struct ObjectStat<'a> { - #[serde(rename = "arg")] - pub key: &'a str, + #[serde(rename = "arg")] pub key: &'a str, } impl<'a> ApiRequest for ObjectStat<'a> { const PATH: &'static str = "/object/stat"; } - #[cfg(test)] mod tests { use super::ObjectDiff; diff --git a/ipfs-api/src/request/pin.rs b/ipfs-api/src/request/pin.rs index 362453f..938104b 100644 --- a/ipfs-api/src/request/pin.rs +++ b/ipfs-api/src/request/pin.rs @@ -8,11 +8,9 @@ use request::ApiRequest; - #[derive(Serialize)] pub struct PinAdd<'a> { - #[serde(rename = "arg")] - pub key: &'a str, + #[serde(rename = "arg")] pub key: &'a str, pub recursive: Option, pub progress: bool, } @@ -21,25 +19,20 @@ impl<'a> ApiRequest for PinAdd<'a> { const PATH: &'static str = "/pin/add"; } - #[derive(Serialize)] pub struct PinLs<'a> { - #[serde(rename = "arg")] - pub key: &'a Option<&'a str>, + #[serde(rename = "arg")] pub key: &'a Option<&'a str>, - #[serde(rename = "type")] - pub typ: &'a Option<&'a str>, + #[serde(rename = "type")] pub typ: &'a Option<&'a str>, } impl<'a> ApiRequest for PinLs<'a> { const PATH: &'static str = "/pin/ls"; } - #[derive(Serialize)] pub struct PinRm<'a> { - #[serde(rename = "arg")] - pub key: &'a str, + #[serde(rename = "arg")] pub key: &'a str, pub recursive: bool, } diff --git a/ipfs-api/src/request/ping.rs b/ipfs-api/src/request/ping.rs index e5bfd83..5adf1d0 100644 --- a/ipfs-api/src/request/ping.rs +++ b/ipfs-api/src/request/ping.rs @@ -8,11 +8,9 @@ use request::ApiRequest; - #[derive(Serialize)] pub struct Ping<'a, 'b> { - #[serde(rename = "arg")] - pub peer: &'a str, + #[serde(rename = "arg")] pub peer: &'a str, pub count: &'b Option, } diff --git a/ipfs-api/src/request/pubsub.rs b/ipfs-api/src/request/pubsub.rs index 41adf28..ac3a046 100644 --- a/ipfs-api/src/request/pubsub.rs +++ b/ipfs-api/src/request/pubsub.rs @@ -8,7 +8,6 @@ use request::ApiRequest; - pub struct PubsubLs; impl_skip_serialize!(PubsubLs); @@ -17,36 +16,29 @@ impl ApiRequest for PubsubLs { const PATH: &'static str = "/pubsub/ls"; } - #[derive(Serialize)] pub struct PubsubPeers<'a> { - #[serde(rename = "arg")] - pub topic: &'a Option<&'a str>, + #[serde(rename = "arg")] pub topic: &'a Option<&'a str>, } impl<'a> ApiRequest for PubsubPeers<'a> { const PATH: &'static str = "/pubsub/peers"; } - #[derive(Serialize)] pub struct PubsubPub<'a> { - #[serde(rename = "arg")] - pub topic: &'a str, + #[serde(rename = "arg")] pub topic: &'a str, - #[serde(rename = "arg")] - pub payload: &'a str, + #[serde(rename = "arg")] pub payload: &'a str, } impl<'a> ApiRequest for PubsubPub<'a> { const PATH: &'static str = "/pubsub/pub"; } - #[derive(Serialize)] pub struct PubsubSub<'a> { - #[serde(rename = "arg")] - pub topic: &'a str, + #[serde(rename = "arg")] pub topic: &'a str, pub discover: bool, } diff --git a/ipfs-api/src/request/refs.rs b/ipfs-api/src/request/refs.rs index 1e7c6f4..c2b237f 100644 --- a/ipfs-api/src/request/refs.rs +++ b/ipfs-api/src/request/refs.rs @@ -8,7 +8,6 @@ use request::ApiRequest; - pub struct RefsLocal; impl_skip_serialize!(RefsLocal); diff --git a/ipfs-api/src/request/stats.rs b/ipfs-api/src/request/stats.rs index 523de0f..7cbc735 100644 --- a/ipfs-api/src/request/stats.rs +++ b/ipfs-api/src/request/stats.rs @@ -8,7 +8,6 @@ use request::ApiRequest; - pub struct StatsBitswap; impl_skip_serialize!(StatsBitswap); @@ -17,7 +16,6 @@ impl ApiRequest for StatsBitswap { const PATH: &'static str = "/stats/bitswap"; } - pub struct StatsBw; impl_skip_serialize!(StatsBw); @@ -26,7 +24,6 @@ impl ApiRequest for StatsBw { const PATH: &'static str = "/stats/bw"; } - pub struct StatsRepo; impl_skip_serialize!(StatsRepo); diff --git a/ipfs-api/src/request/swarm.rs b/ipfs-api/src/request/swarm.rs index c9a8da7..37ef7a6 100644 --- a/ipfs-api/src/request/swarm.rs +++ b/ipfs-api/src/request/swarm.rs @@ -8,7 +8,6 @@ use request::ApiRequest; - pub struct SwarmAddrsLocal; impl_skip_serialize!(SwarmAddrsLocal); @@ -17,7 +16,6 @@ impl ApiRequest for SwarmAddrsLocal { const PATH: &'static str = "/swarm/addrs/local"; } - pub struct SwarmPeers; impl_skip_serialize!(SwarmPeers); diff --git a/ipfs-api/src/request/tar.rs b/ipfs-api/src/request/tar.rs index c634068..203aab0 100644 --- a/ipfs-api/src/request/tar.rs +++ b/ipfs-api/src/request/tar.rs @@ -8,7 +8,6 @@ use request::ApiRequest; - pub struct TarAdd; impl_skip_serialize!(TarAdd); @@ -17,11 +16,9 @@ impl ApiRequest for TarAdd { const PATH: &'static str = "/tar/add"; } - #[derive(Serialize)] pub struct TarCat<'a> { - #[serde(rename = "arg")] - pub path: &'a str, + #[serde(rename = "arg")] pub path: &'a str, } impl<'a> ApiRequest for TarCat<'a> { diff --git a/ipfs-api/src/request/version.rs b/ipfs-api/src/request/version.rs index 0c21c1c..26d83da 100644 --- a/ipfs-api/src/request/version.rs +++ b/ipfs-api/src/request/version.rs @@ -8,7 +8,6 @@ use request::ApiRequest; - pub struct Version; impl_skip_serialize!(Version); diff --git a/ipfs-api/src/response/bitswap.rs b/ipfs-api/src/response/bitswap.rs index 6280bfb..69b9705 100644 --- a/ipfs-api/src/response/bitswap.rs +++ b/ipfs-api/src/response/bitswap.rs @@ -8,7 +8,6 @@ use response::serde; - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct BitswapLedgerResponse { @@ -19,17 +18,14 @@ pub struct BitswapLedgerResponse { pub exchanged: u64, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct BitswapStatResponse { pub provide_buf_len: i32, - #[serde(deserialize_with = "serde::deserialize_vec")] - pub wantlist: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub wantlist: Vec, - #[serde(deserialize_with = "serde::deserialize_vec")] - pub peers: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub peers: Vec, pub blocks_received: u64, pub data_received: u64, @@ -39,18 +35,14 @@ pub struct BitswapStatResponse { pub dup_data_received: u64, } - pub type BitswapUnwantResponse = (); - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct BitswapWantlistResponse { - #[serde(deserialize_with = "serde::deserialize_vec")] - pub keys: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub keys: Vec, } - #[cfg(test)] mod tests { deserialize_test!(v0_bitswap_stat_0, BitswapStatResponse); diff --git a/ipfs-api/src/response/block.rs b/ipfs-api/src/response/block.rs index 34855e2..c04bd89 100644 --- a/ipfs-api/src/response/block.rs +++ b/ipfs-api/src/response/block.rs @@ -13,7 +13,6 @@ pub struct BlockPutResponse { pub size: u64, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct BlockRmResponse { @@ -21,7 +20,6 @@ pub struct BlockRmResponse { pub error: Option, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct BlockStatResponse { @@ -29,7 +27,6 @@ pub struct BlockStatResponse { pub size: u64, } - #[cfg(test)] mod tests { deserialize_test!(v0_block_stat_0, BlockStatResponse); diff --git a/ipfs-api/src/response/bootstrap.rs b/ipfs-api/src/response/bootstrap.rs index 480e519..a8477ce 100644 --- a/ipfs-api/src/response/bootstrap.rs +++ b/ipfs-api/src/response/bootstrap.rs @@ -8,31 +8,24 @@ use response::serde; - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct BootstrapAddDefaultResponse { - #[serde(deserialize_with = "serde::deserialize_vec")] - pub peers: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub peers: Vec, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct BootstrapListResponse { - #[serde(deserialize_with = "serde::deserialize_vec")] - pub peers: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub peers: Vec, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct BootstrapRmAllResponse { - #[serde(deserialize_with = "serde::deserialize_vec")] - pub peers: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub peers: Vec, } - #[cfg(test)] mod tests { deserialize_test!(v0_bootstrap_list_0, BootstrapListResponse); diff --git a/ipfs-api/src/response/commands.rs b/ipfs-api/src/response/commands.rs index bbdeaaa..261d0c5 100644 --- a/ipfs-api/src/response/commands.rs +++ b/ipfs-api/src/response/commands.rs @@ -8,28 +8,22 @@ use response::serde; - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct CommandsResponseOptions { - #[serde(deserialize_with = "serde::deserialize_vec")] - pub names: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub names: Vec, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct CommandsResponse { pub name: String, - #[serde(deserialize_with = "serde::deserialize_vec")] - pub subcommands: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub subcommands: Vec, - #[serde(deserialize_with = "serde::deserialize_vec")] - pub options: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub options: Vec, } - #[cfg(test)] mod tests { deserialize_test!(v0_commands_0, CommandsResponse); diff --git a/ipfs-api/src/response/config.rs b/ipfs-api/src/response/config.rs index 84da149..81e8caf 100644 --- a/ipfs-api/src/response/config.rs +++ b/ipfs-api/src/response/config.rs @@ -8,8 +8,6 @@ pub type ConfigEditResponse = (); - pub type ConfigReplaceResponse = (); - pub type ConfigShowResponse = String; diff --git a/ipfs-api/src/response/dag.rs b/ipfs-api/src/response/dag.rs index 6d5e25b..3f801da 100644 --- a/ipfs-api/src/response/dag.rs +++ b/ipfs-api/src/response/dag.rs @@ -9,34 +9,28 @@ use response::serde; use std::collections::HashMap; - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct DagIpfsHeader { pub name: String, pub size: u64, - #[serde(deserialize_with = "serde::deserialize_hashmap")] - pub cid: HashMap, + #[serde(deserialize_with = "serde::deserialize_hashmap")] pub cid: HashMap, } - #[derive(Debug, Deserialize)] pub struct DagGetResponse { pub data: Option, - #[serde(deserialize_with = "serde::deserialize_vec")] - pub links: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub links: Vec, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct DagPutResponse { pub cid: String, } - #[cfg(test)] mod tests { deserialize_test!(v0_dag_get_0, DagGetResponse); diff --git a/ipfs-api/src/response/dht.rs b/ipfs-api/src/response/dht.rs index 5279299..44de85d 100644 --- a/ipfs-api/src/response/dht.rs +++ b/ipfs-api/src/response/dht.rs @@ -9,7 +9,6 @@ use response::serde; use serde::de::{Deserialize, Deserializer, Error}; - /// See /// [libp2p](https://github.com/libp2p/go-libp2p-routing/blob/master/notifications/query.go#L16). /// @@ -45,34 +44,26 @@ impl<'de> Deserialize<'de> for DhtType { } } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct DhtPeerResponse { - #[serde(rename = "ID")] - pub id: String, + #[serde(rename = "ID")] pub id: String, - #[serde(deserialize_with = "serde::deserialize_vec")] - pub addrs: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub addrs: Vec, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct DhtMessage { - #[serde(rename = "ID")] - pub id: String, + #[serde(rename = "ID")] pub id: String, - #[serde(rename = "Type")] - pub typ: DhtType, + #[serde(rename = "Type")] pub typ: DhtType, - #[serde(deserialize_with = "serde::deserialize_vec")] - pub responses: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub responses: Vec, pub extra: String, } - pub type DhtFindPeerResponse = DhtMessage; pub type DhtFindProvsResponse = DhtMessage; diff --git a/ipfs-api/src/response/diag.rs b/ipfs-api/src/response/diag.rs index e445ee9..382fe66 100644 --- a/ipfs-api/src/response/diag.rs +++ b/ipfs-api/src/response/diag.rs @@ -8,8 +8,6 @@ pub type DiagCmdsClearResponse = (); - pub type DiagCmdsSetTimeResponse = (); - pub type DiagSysResponse = String; diff --git a/ipfs-api/src/response/error.rs b/ipfs-api/src/response/error.rs index 5f67eec..7075def 100644 --- a/ipfs-api/src/response/error.rs +++ b/ipfs-api/src/response/error.rs @@ -11,7 +11,6 @@ use serde_json; use serde_urlencoded; use std::string::FromUtf8Error; - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ApiError { @@ -19,7 +18,6 @@ pub struct ApiError { pub code: u8, } - error_chain! { foreign_links { Http(hyper::error::Error); diff --git a/ipfs-api/src/response/file.rs b/ipfs-api/src/response/file.rs index 7623135..3b670f7 100644 --- a/ipfs-api/src/response/file.rs +++ b/ipfs-api/src/response/file.rs @@ -9,21 +9,17 @@ use response::{serde, IpfsHeader}; use std::collections::HashMap; - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct IpfsDetailedFile { pub hash: String, pub size: u64, - #[serde(rename = "Type")] - pub typ: String, + #[serde(rename = "Type")] pub typ: String, - #[serde(default)] - pub links: Vec, + #[serde(default)] pub links: Vec, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct FileLsResponse { @@ -34,7 +30,6 @@ pub struct FileLsResponse { pub objects: HashMap, } - #[cfg(test)] mod tests { deserialize_test!(v0_file_ls_0, FileLsResponse); diff --git a/ipfs-api/src/response/files.rs b/ipfs-api/src/response/files.rs index ae0c7d8..087c0ba 100644 --- a/ipfs-api/src/response/files.rs +++ b/ipfs-api/src/response/files.rs @@ -8,13 +8,10 @@ use response::serde; - pub type FilesCpResponse = (); - pub type FilesFlushResponse = (); - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct FilesEntry { @@ -23,30 +20,23 @@ pub struct FilesEntry { // This is a protocol buffer enum type defined in // https://github.com/ipfs/go-ipfs/blob/master/unixfs/pb/unixfs.proto ... // So it might be some other type than u64, but certainly shouldn't be *bigger* than u64. - #[serde(rename = "Type")] - pub typ: u64, + #[serde(rename = "Type")] pub typ: u64, pub size: u64, pub hash: String, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct FilesLsResponse { - #[serde(deserialize_with = "serde::deserialize_vec")] - pub entries: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub entries: Vec, } - pub type FilesMkdirResponse = (); - pub type FilesMvResponse = (); - pub type FilesRmResponse = (); - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct FilesStatResponse { @@ -55,14 +45,11 @@ pub struct FilesStatResponse { pub cumulative_size: u64, pub blocks: u64, - #[serde(rename = "Type")] - pub typ: String, + #[serde(rename = "Type")] pub typ: String, } - pub type FilesWriteResponse = (); - #[cfg(test)] mod tests { deserialize_test!(v0_files_ls_0, FilesLsResponse); diff --git a/ipfs-api/src/response/filestore.rs b/ipfs-api/src/response/filestore.rs index f2f62e5..5b369bc 100644 --- a/ipfs-api/src/response/filestore.rs +++ b/ipfs-api/src/response/filestore.rs @@ -9,13 +9,11 @@ #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct FilestoreDupsResponse { - #[serde(rename = "Ref")] - pub reference: String, + #[serde(rename = "Ref")] pub reference: String, pub err: String, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct FilestoreObject { @@ -27,8 +25,6 @@ pub struct FilestoreObject { pub size: u64, } - pub type FilestoreLsResponse = FilestoreObject; - pub type FilestoreVerifyResponse = FilestoreObject; diff --git a/ipfs-api/src/response/id.rs b/ipfs-api/src/response/id.rs index 72a0569..4aca2f6 100644 --- a/ipfs-api/src/response/id.rs +++ b/ipfs-api/src/response/id.rs @@ -8,23 +8,19 @@ use response::serde; - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct IdResponse { - #[serde(rename = "ID")] - pub id: String, + #[serde(rename = "ID")] pub id: String, pub public_key: String, - #[serde(deserialize_with = "serde::deserialize_vec")] - pub addresses: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub addresses: Vec, pub agent_version: String, pub protocol_version: String, } - #[cfg(test)] mod tests { deserialize_test!(v0_id_0, IdResponse); diff --git a/ipfs-api/src/response/log.rs b/ipfs-api/src/response/log.rs index 643d341..da3fb34 100644 --- a/ipfs-api/src/response/log.rs +++ b/ipfs-api/src/response/log.rs @@ -8,22 +8,18 @@ use response::serde; - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct LogLevelResponse { pub message: String, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct LogLsResponse { - #[serde(deserialize_with = "serde::deserialize_vec")] - pub strings: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub strings: Vec, } - #[cfg(test)] mod tests { deserialize_test!(v0_log_ls_0, LogLsResponse); diff --git a/ipfs-api/src/response/ls.rs b/ipfs-api/src/response/ls.rs index fa9a26b..8508a37 100644 --- a/ipfs-api/src/response/ls.rs +++ b/ipfs-api/src/response/ls.rs @@ -8,17 +8,14 @@ use response::serde; - #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct IpfsFile { pub hash: String, - #[serde(deserialize_with = "serde::deserialize_vec")] - pub links: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub links: Vec, } - #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct IpfsFileHeader { @@ -26,19 +23,15 @@ pub struct IpfsFileHeader { pub hash: String, pub size: u64, - #[serde(rename = "Type")] - pub typ: u32, + #[serde(rename = "Type")] pub typ: u32, } - #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct LsResponse { - #[serde(deserialize_with = "serde::deserialize_vec")] - pub objects: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub objects: Vec, } - #[cfg(test)] mod tests { deserialize_test!(v0_ls_0, LsResponse); diff --git a/ipfs-api/src/response/mod.rs b/ipfs-api/src/response/mod.rs index e42c067..f08b6dc 100644 --- a/ipfs-api/src/response/mod.rs +++ b/ipfs-api/src/response/mod.rs @@ -40,7 +40,6 @@ pub use self::swarm::*; pub use self::tar::*; pub use self::version::*; - /// Create a test to deserialize a file to the given instance. /// #[cfg(test)] @@ -58,7 +57,6 @@ macro_rules! deserialize_test { ) } - mod add; mod bitswap; mod block; @@ -92,7 +90,6 @@ mod swarm; mod tar; mod version; - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct IpfsHeader { @@ -100,6 +97,5 @@ pub struct IpfsHeader { pub hash: String, pub size: u64, - #[serde(rename = "Type")] - pub typ: Option, + #[serde(rename = "Type")] pub typ: Option, } diff --git a/ipfs-api/src/response/mount.rs b/ipfs-api/src/response/mount.rs index 1479aa3..94517a2 100644 --- a/ipfs-api/src/response/mount.rs +++ b/ipfs-api/src/response/mount.rs @@ -9,16 +9,13 @@ #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct MountResponse { - #[serde(rename = "IPFS")] - pub ipfs: String, + #[serde(rename = "IPFS")] pub ipfs: String, - #[serde(rename = "IPNS")] - pub ipns: String, + #[serde(rename = "IPNS")] pub ipns: String, pub fuse_allow_other: bool, } - #[cfg(test)] mod tests { deserialize_test!(v0_mount_0, MountResponse); diff --git a/ipfs-api/src/response/name.rs b/ipfs-api/src/response/name.rs index 00d8cda..de142db 100644 --- a/ipfs-api/src/response/name.rs +++ b/ipfs-api/src/response/name.rs @@ -13,14 +13,12 @@ pub struct NamePublishResponse { pub value: String, } - #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct NameResolveResponse { pub path: String, } - #[cfg(test)] mod tests { deserialize_test!(v0_name_resolve_0, NameResolveResponse); diff --git a/ipfs-api/src/response/object.rs b/ipfs-api/src/response/object.rs index de5923c..78fd271 100644 --- a/ipfs-api/src/response/object.rs +++ b/ipfs-api/src/response/object.rs @@ -9,114 +9,90 @@ use response::{serde, IpfsHeader}; use std::collections::HashMap; - pub type ObjectDataResponse = Vec; - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectDiff { - #[serde(rename = "Type")] - pub typ: u64, + #[serde(rename = "Type")] pub typ: u64, pub path: String, - #[serde(deserialize_with = "serde::deserialize_hashmap")] - pub before: HashMap, + #[serde(deserialize_with = "serde::deserialize_hashmap")] pub before: HashMap, - #[serde(deserialize_with = "serde::deserialize_hashmap")] - pub after: HashMap, + #[serde(deserialize_with = "serde::deserialize_hashmap")] pub after: HashMap, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectDiffResponse { - #[serde(deserialize_with = "serde::deserialize_vec")] - pub changes: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub changes: Vec, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectGetResponse { pub data: String, - #[serde(deserialize_with = "serde::deserialize_vec")] - pub links: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub links: Vec, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectLinksResponse { pub hash: String, - #[serde(deserialize_with = "serde::deserialize_vec")] - pub links: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub links: Vec, } - #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectNewResponse { pub hash: String, - #[serde(deserialize_with = "serde::deserialize_vec")] - pub links: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub links: Vec, } - #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectPatchAddLinkResponse { pub hash: String, - #[serde(deserialize_with = "serde::deserialize_vec")] - pub links: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub links: Vec, } - #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectPatchAppendDataResponse { pub hash: String, - #[serde(deserialize_with = "serde::deserialize_vec")] - pub links: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub links: Vec, } - #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectPatchRmLinkResponse { pub hash: String, - #[serde(deserialize_with = "serde::deserialize_vec")] - pub links: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub links: Vec, } - #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectPatchSetDataResponse { pub hash: String, - #[serde(deserialize_with = "serde::deserialize_vec")] - pub links: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub links: Vec, } - #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectPutResponse { pub hash: String, - #[serde(deserialize_with = "serde::deserialize_vec")] - pub links: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub links: Vec, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectStatResponse { @@ -128,7 +104,6 @@ pub struct ObjectStatResponse { pub cumulative_size: u64, } - #[cfg(test)] mod tests { deserialize_test!(v0_object_diff_0, ObjectDiffResponse); diff --git a/ipfs-api/src/response/pin.rs b/ipfs-api/src/response/pin.rs index 2b8b4ef..4a9ff6e 100644 --- a/ipfs-api/src/response/pin.rs +++ b/ipfs-api/src/response/pin.rs @@ -9,42 +9,32 @@ use response::serde; use std::collections::HashMap; - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct PinAddResponse { - #[serde(deserialize_with = "serde::deserialize_vec")] - pub pins: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub pins: Vec, pub progress: Option, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct PinType { - #[serde(rename = "Type")] - pub typ: String, + #[serde(rename = "Type")] pub typ: String, } - - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct PinLsResponse { - #[serde(deserialize_with = "serde::deserialize_hashmap")] - pub keys: HashMap, + #[serde(deserialize_with = "serde::deserialize_hashmap")] pub keys: HashMap, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct PinRmResponse { - #[serde(deserialize_with = "serde::deserialize_vec")] - pub pins: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub pins: Vec, } - #[cfg(test)] mod tests { deserialize_test!(v0_pin_ls_0, PinLsResponse); diff --git a/ipfs-api/src/response/ping.rs b/ipfs-api/src/response/ping.rs index 165ed39..977ef90 100644 --- a/ipfs-api/src/response/ping.rs +++ b/ipfs-api/src/response/ping.rs @@ -14,7 +14,6 @@ pub struct PingResponse { pub text: String, } - #[cfg(test)] mod tests { deserialize_test!(v0_ping_0, PingResponse); diff --git a/ipfs-api/src/response/pubsub.rs b/ipfs-api/src/response/pubsub.rs index e35b30f..20621e1 100644 --- a/ipfs-api/src/response/pubsub.rs +++ b/ipfs-api/src/response/pubsub.rs @@ -8,40 +8,31 @@ use response::serde; - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct PubsubLsResponse { - #[serde(deserialize_with = "serde::deserialize_vec")] - pub strings: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub strings: Vec, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct PubsubPeersResponse { - #[serde(deserialize_with = "serde::deserialize_vec")] - pub strings: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub strings: Vec, } - pub type PubsubPubResponse = (); - #[derive(Debug, Deserialize)] pub struct PubsubSubResponse { pub from: Option, pub data: Option, pub seqno: Option, - #[serde(rename = "topicIDs")] - pub topic_ids: Option>, + #[serde(rename = "topicIDs")] pub topic_ids: Option>, - #[serde(rename = "XXX_unrecognized")] - pub unrecognized: Option>, + #[serde(rename = "XXX_unrecognized")] pub unrecognized: Option>, } - #[cfg(test)] mod tests { deserialize_test!(v0_pubsub_ls_0, PubsubLsResponse); diff --git a/ipfs-api/src/response/refs.rs b/ipfs-api/src/response/refs.rs index 457a9f7..c54dd53 100644 --- a/ipfs-api/src/response/refs.rs +++ b/ipfs-api/src/response/refs.rs @@ -9,13 +9,11 @@ #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct RefsLocalResponse { - #[serde(rename = "Ref")] - pub reference: String, + #[serde(rename = "Ref")] pub reference: String, pub err: String, } - #[cfg(test)] mod tests { deserialize_test!(v0_refs_local_0, RefsLocalResponse); diff --git a/ipfs-api/src/response/repo.rs b/ipfs-api/src/response/repo.rs index fb82936..9e31eb1 100644 --- a/ipfs-api/src/response/repo.rs +++ b/ipfs-api/src/response/repo.rs @@ -9,23 +9,19 @@ use response::serde; use std::collections::HashMap; - #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct RepoFsckResponse { pub message: String, } - #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct RepoGcResponse { - #[serde(deserialize_with = "serde::deserialize_hashmap")] - pub key: HashMap, + #[serde(deserialize_with = "serde::deserialize_hashmap")] pub key: HashMap, pub error: Option, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct RepoStatResponse { @@ -35,7 +31,6 @@ pub struct RepoStatResponse { pub version: String, } - // Defined in go-ipfs:master core/commands/repo.go #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] @@ -45,14 +40,12 @@ pub struct RepoVerifyResponse { pub progress: i32, } - #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct RepoVersionResponse { pub version: String, } - #[cfg(test)] mod tests { deserialize_test!(v0_repo_gc_0, RepoGcResponse); diff --git a/ipfs-api/src/response/resolve.rs b/ipfs-api/src/response/resolve.rs index 6f78205..a691391 100644 --- a/ipfs-api/src/response/resolve.rs +++ b/ipfs-api/src/response/resolve.rs @@ -12,7 +12,6 @@ pub struct ResolveResponse { pub path: String, } - #[cfg(test)] mod tests { deserialize_test!(v0_resolve_0, ResolveResponse); diff --git a/ipfs-api/src/response/serde.rs b/ipfs-api/src/response/serde.rs index cb96ba2..8cfd818 100644 --- a/ipfs-api/src/response/serde.rs +++ b/ipfs-api/src/response/serde.rs @@ -12,7 +12,6 @@ use std::error::Error; use std::fmt; use std::marker::PhantomData; - pub struct IntegerVisitor; impl<'de> Visitor<'de> for IntegerVisitor { @@ -65,7 +64,6 @@ impl<'de> Visitor<'de> for IntegerVisitor { } } - /// Deserializes a sequence or null values as a vec. /// pub fn deserialize_vec<'de, T, D>(deserializer: D) -> Result, D::Error> @@ -119,7 +117,6 @@ where deserializer.deserialize_option(VecVisitor(PhantomData)) } - /// Deserializes a map or null values as a HashMap. /// pub fn deserialize_hashmap<'de, T, D>(deserializer: D) -> Result, D::Error> diff --git a/ipfs-api/src/response/stats.rs b/ipfs-api/src/response/stats.rs index 931f6e5..261db9b 100644 --- a/ipfs-api/src/response/stats.rs +++ b/ipfs-api/src/response/stats.rs @@ -8,10 +8,8 @@ use response::{BitswapStatResponse, RepoStatResponse}; - pub type StatsBitswapResponse = BitswapStatResponse; - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct StatsBwResponse { @@ -21,10 +19,8 @@ pub struct StatsBwResponse { pub rate_out: f64, } - pub type StatsRepoResponse = RepoStatResponse; - #[cfg(test)] mod tests { deserialize_test!(v0_stats_bw_0, StatsBwResponse); diff --git a/ipfs-api/src/response/swarm.rs b/ipfs-api/src/response/swarm.rs index 5bdc8da..ba79614 100644 --- a/ipfs-api/src/response/swarm.rs +++ b/ipfs-api/src/response/swarm.rs @@ -8,54 +8,42 @@ use response::serde; - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct SwarmAddrsLocalResponse { - #[serde(deserialize_with = "serde::deserialize_vec")] - pub strings: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub strings: Vec, } - #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct SwarmAddrsConnectResponse { - #[serde(deserialize_with = "serde::deserialize_vec")] - pub strings: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub strings: Vec, } - #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct SwarmAddrsDisconnectResponse { - #[serde(deserialize_with = "serde::deserialize_vec")] - pub strings: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub strings: Vec, } - #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct SwarmFiltersAddResponse { - #[serde(deserialize_with = "serde::deserialize_vec")] - pub strings: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub strings: Vec, } - #[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct SwarmFiltersRmResponse { - #[serde(deserialize_with = "serde::deserialize_vec")] - pub strings: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub strings: Vec, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct SwarmPeerStream { pub protocol: String, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct SwarmPeer { @@ -64,19 +52,15 @@ pub struct SwarmPeer { pub latency: String, pub muxer: String, - #[serde(deserialize_with = "serde::deserialize_vec")] - pub streams: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub streams: Vec, } - #[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct SwarmPeersResponse { - #[serde(deserialize_with = "serde::deserialize_vec")] - pub peers: Vec, + #[serde(deserialize_with = "serde::deserialize_vec")] pub peers: Vec, } - #[cfg(test)] mod tests { deserialize_test!(v0_swarm_addrs_local_0, SwarmAddrsLocalResponse); diff --git a/ipfs-api/src/response/tar.rs b/ipfs-api/src/response/tar.rs index bb78d37..08a0089 100644 --- a/ipfs-api/src/response/tar.rs +++ b/ipfs-api/src/response/tar.rs @@ -13,7 +13,6 @@ pub struct TarAddResponse { pub hash: String, } - #[cfg(test)] mod tests { deserialize_test!(v0_tar_add_0, TarAddResponse); diff --git a/ipfs-api/src/response/version.rs b/ipfs-api/src/response/version.rs index 9f6b5f2..b35511d 100644 --- a/ipfs-api/src/response/version.rs +++ b/ipfs-api/src/response/version.rs @@ -16,7 +16,6 @@ pub struct VersionResponse { pub golang: String, } - #[cfg(test)] mod tests { deserialize_test!(v0_version_0, VersionResponse); diff --git a/ipfs-cli/src/command/add.rs b/ipfs-cli/src/command/add.rs index 40eeb3c..d732091 100644 --- a/ipfs-cli/src/command/add.rs +++ b/ipfs-cli/src/command/add.rs @@ -12,7 +12,6 @@ use ipfs_api::IpfsClient; use std::fs::File; use tokio_core::reactor::Core; - pub fn signature<'a, 'b>() -> App<'a, 'b> { clap_app!( @subcommand add => @@ -21,7 +20,6 @@ pub fn signature<'a, 'b>() -> App<'a, 'b> { ) } - pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { let path = args.value_of("INPUT").unwrap(); let file = File::open(path).expect(EXPECTED_FILE); diff --git a/ipfs-cli/src/command/bitswap.rs b/ipfs-cli/src/command/bitswap.rs index ed76107..33f88ef 100644 --- a/ipfs-cli/src/command/bitswap.rs +++ b/ipfs-cli/src/command/bitswap.rs @@ -11,7 +11,6 @@ use command::EXPECTED_API; use ipfs_api::IpfsClient; use tokio_core::reactor::Core; - pub fn signature<'a, 'b>() -> App<'a, 'b> { clap_app!( @subcommand bitswap => @@ -33,7 +32,6 @@ pub fn signature<'a, 'b>() -> App<'a, 'b> { ) } - pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { match args.subcommand() { ("ledger", Some(args)) => { diff --git a/ipfs-cli/src/command/block.rs b/ipfs-cli/src/command/block.rs index 09bc660..7cccb5b 100644 --- a/ipfs-cli/src/command/block.rs +++ b/ipfs-cli/src/command/block.rs @@ -14,7 +14,6 @@ use std::fs::File; use std::io::{self, Write}; use tokio_core::reactor::Core; - pub fn signature<'a, 'b>() -> App<'a, 'b> { clap_app!( @subcommand block => @@ -38,14 +37,13 @@ pub fn signature<'a, 'b>() -> App<'a, 'b> { ) } - pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { match args.subcommand() { ("get", Some(args)) => { let key = args.value_of("KEY").unwrap(); - let req = client.block_get(key).for_each(|chunk| { - io::stdout().write_all(&chunk).map_err(From::from) - }); + let req = client + .block_get(key) + .for_each(|chunk| io::stdout().write_all(&chunk).map_err(From::from)); core.run(req).expect(EXPECTED_API); } @@ -81,5 +79,4 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { } _ => unreachable!(), } - } diff --git a/ipfs-cli/src/command/bootstrap.rs b/ipfs-cli/src/command/bootstrap.rs index fea60de..dc3014e 100644 --- a/ipfs-cli/src/command/bootstrap.rs +++ b/ipfs-cli/src/command/bootstrap.rs @@ -11,7 +11,6 @@ use command::EXPECTED_API; use ipfs_api::IpfsClient; use tokio_core::reactor::Core; - pub fn signature<'a, 'b>() -> App<'a, 'b> { clap_app!( @subcommand bootstrap => @@ -34,7 +33,6 @@ pub fn signature<'a, 'b>() -> App<'a, 'b> { ) } - fn print_peers(peers: &[String]) { println!(); println!(" peers :"); @@ -44,36 +42,30 @@ fn print_peers(peers: &[String]) { println!(); } - pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { match args.subcommand() { - ("add", Some(add)) => { - match add.subcommand() { - ("default", _) => { - let peers = core.run(client.bootstrap_add_default()).expect( - EXPECTED_API, - ); + ("add", Some(add)) => match add.subcommand() { + ("default", _) => { + let peers = core.run(client.bootstrap_add_default()) + .expect(EXPECTED_API); - print_peers(&peers.peers); - } - _ => unreachable!(), + print_peers(&peers.peers); } - } + _ => unreachable!(), + }, ("list", _) => { let peers = core.run(client.bootstrap_list()).expect(EXPECTED_API); print_peers(&peers.peers); } - ("rm", Some(rm)) => { - match rm.subcom