add method to request

28 files changed, 152 insertions, 73 deletions

diff --git a/README.md b/README.md
index 5087cee..3218b82 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Rust library for connecting to the IPFS HTTP API using tokio.
 
 ```toml
 [dependencies]
-ipfs-api = "0.4.0-alpha.2"
+ipfs-api = "0.4.0-alpha.3"
 ```
 
 ### Examples
diff --git a/ipfs-api/Cargo.toml b/ipfs-api/Cargo.toml
index aa2796d..c01d5dd 100644
--- a/ipfs-api/Cargo.toml
+++ b/ipfs-api/Cargo.toml
@@ -6,7 +6,7 @@ documentation             = "https://docs.rs/ipfs-api"
 repository                = "https://github.com/ferristseng/rust-ipfs-api"
 keywords                  = ["ipfs"]
 categories                = ["filesystem", "web-programming"]
-version                   = "0.4.0-alpha.2"
+version                   = "0.4.0-alpha.3"
 readme                    = "../README.md"
 license                   = "MIT OR Apache-2.0"
 
diff --git a/ipfs-api/src/client.rs b/ipfs-api/src/client.rs
index 5b02f95..da68919 100644
--- a/ipfs-api/src/client.rs
+++ b/ipfs-api/src/client.rs
@@ -12,7 +12,7 @@ use header::Trailer;
 use read::{JsonLineDecoder, LineDecoder, StreamReader};
 use request::{self, ApiRequest};
 use response::{self, Error, ErrorKind};
-use hyper::{self, Chunk, Method, Request, Response, StatusCode, Uri};
+use hyper::{self, Chunk, Request, Response, StatusCode, Uri};
 use hyper::client::{Client, Config, HttpConnector};
 use hyper_multipart::client::multipart;
 use serde::{Deserialize, Serialize};
@@ -87,7 +87,7 @@ impl IpfsClient {
 
         url.parse::<Uri>()
             .map(move |url| {
-                let mut req = Request::new(Method::Get, url);
+                let mut req = Request::new(Req::METHOD.clone(), url);
 
                 if let Some(form) = form {
                     form.set_body(&mut req);
diff --git a/ipfs-api/src/lib.rs b/ipfs-api/src/lib.rs
index a8fca59..2aeebae 100644
--- a/ipfs-api/src/lib.rs
+++ b/ipfs-api/src/lib.rs
@@ -12,7 +12,7 @@
 //!
 //! ```toml
 //! [dependencies]
-//! ipfs-api = "0.4.0-alpha.2"
+//! ipfs-api = "0.4.0-alpha.3"
 //! ```
 //!
 //! ## Examples
diff --git a/ipfs-api/src/request/add.rs b/ipfs-api/src/request/add.rs
index 666041d..08ac3b7 100644
--- a/ipfs-api/src/request/add.rs
+++ b/ipfs-api/src/request/add.rs
@@ -6,6 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
+use hyper::Method;
 use request::ApiRequest;
 
 pub struct Add;
@@ -14,4 +15,6 @@ impl_skip_serialize!(Add);
 
 impl ApiRequest for Add {
     const PATH: &'static str = "/add";
+
+    const METHOD: &'static Method = &Method::Post;
 }
diff --git a/ipfs-api/src/request/bitswap.rs b/ipfs-api/src/request/bitswap.rs
index 326778e..01d4162 100644
--- a/ipfs-api/src/request/bitswap.rs
+++ b/ipfs-api/src/request/bitswap.rs
@@ -10,7 +10,8 @@ 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> {
@@ -35,7 +36,8 @@ impl ApiRequest for BitswapStat {
 
 #[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> {
diff --git a/ipfs-api/src/request/block.rs b/ipfs-api/src/request/block.rs
index 4dca973..a021f61 100644
--- a/ipfs-api/src/request/block.rs
+++ b/ipfs-api/src/request/block.rs
@@ -6,11 +6,13 @@
 // copied, modified, or distributed except according to those terms.
 //
 
+use hyper::Method;
 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> {
@@ -23,11 +25,14 @@ impl_skip_serialize!(BlockPut);
 
 impl ApiRequest for BlockPut {
     const PATH: &'static str = "/block/put";
+
+    const METHOD: &'static Method = &Method::Post;
 }
 
 #[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> {
@@ -36,7 +41,8 @@ impl<'a> ApiRequest for BlockRm<'a> {
 
 #[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/cat.rs b/ipfs-api/src/request/cat.rs
index f672fed..4fd1195 100644
--- a/ipfs-api/src/request/cat.rs
+++ b/ipfs-api/src/request/cat.rs
@@ -10,7 +10,8 @@ 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/config.rs b/ipfs-api/src/request/config.rs
index 41f9ba7..ee6d1c8 100644
--- a/ipfs-api/src/request/config.rs
+++ b/ipfs-api/src/request/config.rs
@@ -6,6 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
+use hyper::Method;
 use request::ApiRequest;
 
 pub struct ConfigEdit;
@@ -22,6 +23,8 @@ impl_skip_serialize!(ConfigReplace);
 
 impl ApiRequest for ConfigReplace {
     const PATH: &'static str = "/config/replace";
+
+    const METHOD: &'static Method = &Method::Post;
 }
 
 pub struct ConfigShow;
diff --git a/ipfs-api/src/request/dag.rs b/ipfs-api/src/request/dag.rs
index fc39872..c1a6d0c 100644
--- a/ipfs-api/src/request/dag.rs
+++ b/ipfs-api/src/request/dag.rs
@@ -6,11 +6,13 @@
 // copied, modified, or distributed except according to those terms.
 //
 
+use hyper::Method;
 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> {
@@ -23,4 +25,6 @@ impl_skip_serialize!(DagPut);
 
 impl ApiRequest for DagPut {
     const PATH: &'static str = "/dag/put";
+
+    const METHOD: &'static Method = &Method::Post;
 }
diff --git a/ipfs-api/src/request/dht.rs b/ipfs-api/src/request/dht.rs
index 5d772a9..53c52f8 100644
--- a/ipfs-api/src/request/dht.rs
+++ b/ipfs-api/src/request/dht.rs
@@ -10,7 +10,8 @@ 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> {
@@ -19,7 +20,8 @@ impl<'a> ApiRequest for DhtFindPeer<'a> {
 
 #[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> {
@@ -28,7 +30,8 @@ impl<'a> ApiRequest for DhtFindProvs<'a> {
 
 #[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> {
@@ -37,7 +40,8 @@ impl<'a> ApiRequest for DhtGet<'a> {
 
 #[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> {
@@ -46,9 +50,11 @@ impl<'a> ApiRequest for DhtProvide<'a> {
 
 #[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> {
@@ -57,7 +63,8 @@ impl<'a> ApiRequest for DhtPut<'a> {
 
 #[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 d3fda10..430ff38 100644
--- a/ipfs-api/src/request/diag.rs
+++ b/ipfs-api/src/request/diag.rs
@@ -18,7 +18,8 @@ impl ApiRequest for DiagCmdsClear {
 
 #[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> {
diff --git a/ipfs-api/src/request/dns.rs b/ipfs-api/src/request/dns.rs
index 90870bf..9011a6a 100644
--- a/ipfs-api/src/request/dns.rs
+++ b/ipfs-api/src/request/dns.rs
@@ -10,7 +10,8 @@ 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 ff55e02..57058d7 100644
--- a/ipfs-api/src/request/file.rs
+++ b/ipfs-api/src/request/file.rs
@@ -10,7 +10,8 @@ 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 7663505..08aa500 100644
--- a/ipfs-api/src/request/files.rs
+++ b/ipfs-api/src/request/files.rs
@@ -6,13 +6,16 @@
 // copied, modified, or distributed except according to those terms.
 //
 
+use hyper::Method;
 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> {
@@ -21,7 +24,8 @@ impl<'a> ApiRequest for FilesCp<'a> {
 
 #[derive(Serialize)]
 pub struct FilesFlush<'a> {
-    #[serde(rename = "arg")] pub path: Option<&'a str>,
+    #[serde(rename = "arg")]
+    pub path: Option<&'a str>,
 }
 
 impl<'a> ApiRequest for FilesFlush<'a> {
@@ -30,7 +34,8 @@ impl<'a> ApiRequest for FilesFlush<'a> {
 
 #[derive(Serialize)]
 pub struct FilesLs<'a> {
-    #[serde(rename = "arg")] pub path: Option<&'a str>,
+    #[serde(rename = "arg")]
+    pub path: Option<&'a str>,
 }
 
 impl<'a> ApiRequest for FilesLs<'a> {
@@ -39,7 +44,8 @@ impl<'a> ApiRequest for FilesLs<'a> {
 
 #[derive(Serialize)]
 pub struct FilesMkdir<'a> {
-    #[serde(rename = "arg")] pub path: &'a str,
+    #[serde(rename = "arg")]
+    pub path: &'a str,
 
     pub parents: bool,
 }
@@ -50,9 +56,11 @@ impl<'a> ApiRequest for FilesMkdir<'a> {
 
 #[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> {
@@ -61,7 +69,8 @@ impl<'a> ApiRequest for FilesMv<'a> {
 
 #[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> {
@@ -70,7 +79,8 @@ impl<'a> ApiRequest for FilesRead<'a> {
 
 #[derive(Serialize)]
 pub struct FilesRm<'a> {
-    #[serde(rename = "arg")] pub path: &'a str,
+    #[serde(rename = "arg")]
+    pub path: &'a str,
 
     pub recursive: bool,
 }
@@ -81,7 +91,8 @@ impl<'a> ApiRequest for FilesRm<'a> {
 
 #[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> {
@@ -90,7 +101,8 @@ impl<'a> ApiRequest for FilesStat<'a> {
 
 #[derive(Serialize)]
 pub struct FilesWrite<'a> {
-    #[serde(rename = "arg")] pub path: &'a str,
+    #[serde(rename = "arg")]
+    pub path: &'a str,
 
     pub create: bool,
 
@@ -99,4 +111,6 @@ pub struct FilesWrite<'a> {
 
 impl<'a> ApiRequest for FilesWrite<'a> {
     const PATH: &'static str = "/files/write";
+
+    const METHOD: &'static Method = &Method::Post;
 }
diff --git a/ipfs-api/src/request/filestore.rs b/ipfs-api/src/request/filestore.rs
index 07f9854..9f982ec 100644
--- a/ipfs-api/src/request/filestore.rs
+++ b/ipfs-api/src/request/filestore.rs
@@ -18,7 +18,8 @@ impl ApiRequest for FilestoreDups {
 
 #[derive(Serialize)]
 pub struct FilestoreLs<'a> {
-    #[serde(rename = "arg")] pub cid: Option<&'a str>,
+    #[serde(rename = "arg")]
+    pub cid: Option<&'a str>,
 }
 
 impl<'a> ApiRequest for FilestoreLs<'a> {
@@ -27,7 +28,8 @@ impl<'a> ApiRequest for FilestoreLs<'a> {
 
 #[derive(Serialize)]
 pub struct FilestoreVerify<'a> {
-    #[serde(rename = "arg")] pub cid: Option<&'a str>,
+    #[serde(rename = "arg")]
+    pub cid: 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 65fef0f..4c930ef 100644
--- a/ipfs-api/src/request/get.rs
+++ b/ipfs-api/src/request/get.rs
@@ -10,7 +10,8 @@ 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 2e07d59..0876549 100644
--- a/ipfs-api/src/request/id.rs
+++ b/ipfs-api/src/request/id.rs
@@ -10,7 +10,8 @@ use request::ApiRequest;
 
 #[derive(Serialize)]
 pub struct Id<'a> {
-    #[serde(rename = "arg")] pub peer: Option<&'a str>,
+    #[serde(rename = "arg")]
+    pub peer: Option<&'a str>,
 }
 
 impl<'a> ApiRequest for Id<'a> {
diff --git a/ipfs-api/src/request/key.rs b/ipfs-api/src/request/key.rs
index 0fda26c..d2e81f8 100644
--- a/ipfs-api/src/request/key.rs
+++ b/ipfs-api/src/request/key.rs
@@ -31,9 +31,11 @@ impl Serialize for KeyType {
 
 #[derive(Serialize)]
 pub struct KeyGen<'a> {
-    #[serde(rename = "arg")] pub name: &'a str,
+    #[serde(rename = "arg")]
+    pub name: &'a str,
 
-    #[serde(rename = "type")] pub kind: KeyType,
+    #[serde(rename = "type")]
+    pub kind: KeyType,
 
     pub size: i32,
 }
@@ -52,9 +54,11 @@ impl ApiRequest for KeyList {
 
 #[derive(Serialize)]
 pub struct KeyRename<'a, 'b> {
-    #[serde(rename = "arg")] pub name: &'a str,
+    #[serde(rename = "arg")]
+    pub name: &'a str,
 
-    #[serde(rename = "arg")] pub new: &'b str,
+    #[serde(rename = "arg")]
+    pub new: &'b str,
 
     pub force: bool,
 }
@@ -65,7 +69,8 @@ impl<'a, 'b> ApiRequest for KeyRename<'a, 'b> {
 
 #[derive(Serialize)]
 pub struct KeyRm<'a> {
-    #[serde(rename = "arg")] pub name: &'a str,
+    #[serde(rename = "arg")]
+    pub name: &'a str,
 }
 
 impl<'a> ApiRequest for KeyRm<'a> {
diff --git a/ipfs-api/src/request/log.rs b/ipfs-api/src/request/log.rs
index aab9ce5..6f9ca49 100644
--- a/ipfs-api/src/request/log.rs
+++ b/ipfs-api/src/request/log.rs
@@ -57,9 +57,11 @@ 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> {
diff --git a/ipfs-api/src/request/ls.rs b/ipfs-api/src/request/ls.rs
index ee9f7d2..bd7330d 100644
--- a/ipfs-api/src/request/ls.rs
+++ b/ipfs-api/src/request/ls.rs
@@ -10,7 +10,8 @@ use request::ApiRequest;
 
 #[derive(Serialize)]
 pub struct Ls<'a> {
-    #[serde(rename = "arg")] pub path: Option<&'a str>,
+    #[serde(rename = "arg")]
+    pub path: Option<&'a str>,
 }
 
 impl<'a> ApiRequest for Ls<'a> {
diff --git a/ipfs-api/src/request/mod.rs b/ipfs-api/src/request/mod.rs
index 03e2801..dd86757 100644
--- a/ipfs-api/src/request/mod.rs
+++ b/ipfs-api/src/request/mod.rs
@@ -42,15 +42,12 @@ pub use self::version::*;
 ///
 #[cfg(test)]
 macro_rules! serialize_url_test {
-    ($f:ident, $obj:expr, $exp:expr) => (
+    ($f: ident, $obj: expr, $exp: expr) => {
         #[test]
         fn $f() {
-            assert_eq!(
-                ::serde_urlencoded::to_string($obj),
-                Ok($exp.to_string())
-            )
+            assert_eq!(::serde_urlencoded::to_string($obj), Ok($exp.to_string()))
         }
-    )
+    };
 }
 
 /// Implements the `Serialize` trait for types that do not require
@@ -58,15 +55,16 @@ macro_rules! serialize_url_test {
 /// `serde_urlencoded`, that prevents unit structs from being serialized.
 ///
 macro_rules! impl_skip_serialize {
-    ($ty:ty) => (
+    ($ty: ty) => {
         impl ::serde::Serialize for $ty {
             fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-                where S: ::serde::Serializer
+            where
+                S: ::serde::Serializer,
             {
                 serializer.serialize_none()
             }
         }
-    )
+    };
 }
 
 mod add;
@@ -108,4 +106,8 @@ pub trait ApiRequest {
     /// All paths should begin with '/'.
     ///
     const PATH: &'static str;
+
+    /// Method used to make the request.
+    ///
+    const METHOD: &'static ::hyper::Method = &::hyper::Method::Get;
 }
diff --git a/ipfs-api/src/request/name.rs b/ipfs-api/src/request/name.rs
index 5def7b7..ac6a190 100644
--- a/ipfs-api/src/request/name.rs
+++ b/ipfs-api/src/request/name.rs
@@ -10,7 +10,8 @@ use request::ApiRequest;
 
 #[derive(Serialize)]
 pub struct NamePublish<'a, 'b, 'c, 'd> {
-    #[serde(rename = "arg")] pub path: &'a str,
+    #[serde(rename = "arg")]
+    pub path: &'a str,
 
     pub resolve: bool,
 
@@ -27,7 +28,8 @@ impl<'a, 'b, 'c, 'd> ApiRequest for NamePublish<'a, 'b, 'c, 'd> {
 
 #[derive(Serialize)]
 pub struct NameResolve<'a> {
-    #[serde(rename = "arg")] pub name: Option<&'a str>,
+    #[serde(rename = "arg")]
+    pub name: Option<&'a str>,
 
     pub recursive: bool,
 
diff --git a/ipfs-api/src/request/object.rs b/ipfs-api/src/request/object.rs
index acfab61..f28bfa5 100644
--- a/ipfs-api/src/request/object.rs
+++ b/ipfs-api/src/request/object.rs
@@ -11,7 +11,8 @@ use serde::ser::{Serialize, Serializer};
 
 #[derive(Serialize)]
 pub struct ObjectData<'a> {
-    #[serde(rename = "arg")] pub key: &'a str,
+    #[serde(rename = "arg")]
+    pub key: &'a str,
 }
 
 impl<'a> ApiRequest for ObjectData<'a> {
@@ -20,9 +21,11 @@ impl<'a> ApiRequest for ObjectData<'a> {
 
 #[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> {
@@ -31,7 +34,8 @@ impl<'a> ApiRequest for ObjectDiff<'a> {
 
 #[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> {
@@ -40,7 +44,8 @@ impl<'a> ApiRequest for ObjectGet<'a> {
 
 #[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> {
@@ -67,7 +72,8 @@ impl Serialize for ObjectTemplate {
 
 #[derive(Serialize)]
 pub struct ObjectNew {
-    #[serde(rename = "arg")] pub template: Option<ObjectTemplate>,
+    #[serde(rename = "arg")]
+    pub template: Option<ObjectTemplate>,
 }
 
 impl ApiRequest for ObjectNew {
@@ -76,7 +82,8 @@ impl ApiRequest for ObjectNew {
 
 #[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> {
diff --git a/ipfs-api/src/request/pin.rs b/ipfs-api/src/request/pin.rs
index 43afdf4..872b377 100644
--- a/ipfs-api/src/request/pin.rs
+++ b/ipfs-api/src/request/pin.rs
@@ -10,7 +10,8 @@ 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<bool>,
     pub progress: bool,
@@ -22,9 +23,11 @@ impl<'a> ApiRequest for PinAdd<'a> {
 
 #[derive(Serialize)]
 pub struct PinLs<'a> {
-    #[serde(rename = "arg")] pub key: Option<&'a str>,
+    #[serde(rename = "arg")]
+    pub key: Option<&'a str>,
 
-    #[serde(rename = "type")] pub typ: Option<&'a str>,
+    #[serde(rename = "type")]
+    pub typ: Option<&'a str>,
 }
 
 impl<'a> ApiRequest for PinLs<'a> {
@@ -33,7 +36,8 @@ impl<'a> ApiRequest for PinLs<'a> {
 
 #[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 6c7d08b..20718e8 100644
--- a/ipfs-api/src/request/ping.rs
+++ b/ipfs-api/src/request/ping.rs
@@ -10,7 +10,8 @@ use request::ApiRequest;
 
 #[derive(Serialize)]
 pub struct Ping<'a> {
-    #[serde(rename = "arg")] pub peer: &'a str,
+    #[serde(rename = "arg")]
+    pub peer: &'a str,
 
     pub count: Option<i32>,
 }
diff --git a/ipfs-api/src/request/pubsub.rs b/ipfs-api/src/request/pubsub.rs
index 0a90d7b..27f1c16 100644
--- a/ipfs-api/src/request/pubsub.rs
+++ b/ipfs-api/src/request/pubsub.rs
@@ -18,7 +18,8 @@ impl ApiRequest for PubsubLs {
 
 #[derive(Serialize)]
 pub struct PubsubPeers<'a> {
-    #[serde(rename = "arg")] pub topic: Option<&'a str>,
+    #[serde(rename = "arg")]
+    pub topic: Option<&'a str>,
 }
 
 impl<'a> ApiRequest for PubsubPeers<'a> {
@@ -27,9 +28,11 @@ impl<'a> ApiRequest for PubsubPeers<'a> {
 
 #[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> {
@@ -38,7 +41,8 @@ impl<'a> ApiRequest for PubsubPub<'a> {
 
 #[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/sr