8 files changed, 16 insertions, 15 deletions
diff --git a/ipfs-api/src/request/files.rs b/ipfs-api/src/request/files.rs
index f40c434..7663505 100644
--- a/ipfs-api/src/request/files.rs
+++ b/ipfs-api/src/request/files.rs
@@ -21,7 +21,7 @@ impl<'a> ApiRequest for FilesCp<'a> {
 
 #[derive(Serialize)]
 pub struct FilesFlush<'a> {
-    #[serde(rename = "arg")] pub path: &'a Option<&'a str>,
+    #[serde(rename = "arg")] pub path: Option<&'a str>,
 }
 
 impl<'a> ApiRequest for FilesFlush<'a> {
@@ -30,7 +30,7 @@ impl<'a> ApiRequest for FilesFlush<'a> {
 
 #[derive(Serialize)]
 pub struct FilesLs<'a> {
-    #[serde(rename = "arg")] pub path: &'a Option<&'a str>,
+    #[serde(rename = "arg")] pub path: Option<&'a str>,
 }
 
 impl<'a> ApiRequest for FilesLs<'a> {
diff --git a/ipfs-api/src/request/filestore.rs b/ipfs-api/src/request/filestore.rs
index 63e9c2d..07f9854 100644
--- a/ipfs-api/src/request/filestore.rs
+++ b/ipfs-api/src/request/filestore.rs
@@ -18,7 +18,7 @@ impl ApiRequest for FilestoreDups {
 
 #[derive(Serialize)]
 pub struct FilestoreLs<'a> {
-    #[serde(rename = "arg")] pub cid: &'a Option<&'a str>,
+    #[serde(rename = "arg")] pub cid: Option<&'a str>,
 }
 
 impl<'a> ApiRequest for FilestoreLs<'a> {
@@ -27,7 +27,7 @@ impl<'a> ApiRequest for FilestoreLs<'a> {
 
 #[derive(Serialize)]
 pub struct FilestoreVerify<'a> {
-    #[serde(rename = "arg")] pub cid: &'a Option<&'a str>,
+    #[serde(rename = "arg")] pub cid: Option<&'a str>,
 }
 
 impl<'a> ApiRequest for FilestoreVerify<'a> {
diff --git a/ipfs-api/src/request/id.rs b/ipfs-api/src/request/id.rs
index d5657c8..2e07d59 100644
--- a/ipfs-api/src/request/id.rs
+++ b/ipfs-api/src/request/id.rs
@@ -10,7 +10,7 @@ use request::ApiRequest;
 
 #[derive(Serialize)]
 pub struct Id<'a> {
-    #[serde(rename = "arg")] pub peer: &'a 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 763285d..0fda26c 100644
--- a/ipfs-api/src/request/key.rs
+++ b/ipfs-api/src/request/key.rs
@@ -30,15 +30,15 @@ impl Serialize for KeyType {
 }
 
 #[derive(Serialize)]
-pub struct KeyGen<'a, 'b> {
+pub struct KeyGen<'a> {
     #[serde(rename = "arg")] pub name: &'a str,
 
     #[serde(rename = "type")] pub kind: KeyType,
 
-    pub size: &'b Option<i32>,
+    pub size: i32,
 }
 
-impl<'a, 'b> ApiRequest for KeyGen<'a, 'b> {
+impl<'a> ApiRequest for KeyGen<'a> {
     const PATH: &'static str = "/key/gen";
 }
 
diff --git a/ipfs-api/src/request/ls.rs b/ipfs-api/src/request/ls.rs
index e3c78fd..4f4855e 100644
--- a/ipfs-api/src/request/ls.rs
+++ b/ipfs-api/src/request/ls.rs
@@ -10,7 +10,7 @@ use request::ApiRequest;
 
 #[derive(Serialize)]
 pub struct Ls<'a> {
-    #[serde(rename = "arg")] pub path: &'a Option<&'a str>,
+    #[serde(rename = "arg")] pub path: Option<&'a str>,
 }
 
 impl<'a> ApiRequest for Ls<'a> {
diff --git a/ipfs-api/src/request/pin.rs b/ipfs-api/src/request/pin.rs
index 938104b..43afdf4 100644
--- a/ipfs-api/src/request/pin.rs
+++ b/ipfs-api/src/request/pin.rs
@@ -11,6 +11,7 @@ use request::ApiRequest;
 #[derive(Serialize)]
 pub struct PinAdd<'a> {
     #[serde(rename = "arg")] pub key: &'a str,
+
     pub recursive: Option<bool>,
     pub progress: bool,
 }
@@ -21,9 +22,9 @@ impl<'a> ApiRequest for PinAdd<'a> {
 
 #[derive(Serialize)]
 pub struct PinLs<'a> {
-    #[serde(rename = "arg")] pub key: &'a Option<&'a str>,
+    #[serde(rename = "arg")] pub key: Option<&'a str>,
 
-    #[serde(rename = "type")] pub typ: &'a Option<&'a str>,
+    #[serde(rename = "type")] pub typ: Option<&'a str>,
 }
 
 impl<'a> ApiRequest for PinLs<'a> {
diff --git a/ipfs-api/src/request/ping.rs b/ipfs-api/src/request/ping.rs
index 5adf1d0..6c7d08b 100644
--- a/ipfs-api/src/request/ping.rs
+++ b/ipfs-api/src/request/ping.rs
@@ -9,12 +9,12 @@
 use request::ApiRequest;
 
 #[derive(Serialize)]
-pub struct Ping<'a, 'b> {
+pub struct Ping<'a> {
     #[serde(rename = "arg")] pub peer: &'a str,
 
-    pub count: &'b Option<i32>,
+    pub count: Option<i32>,
 }
 
-impl<'a, 'b> ApiRequest for Ping<'a, 'b> {
+impl<'a> ApiRequest for Ping<'a> {
     const PATH: &'static str = "/ping";
 }
diff --git a/ipfs-api/src/request/pubsub.rs b/ipfs-api/src/request/pubsub.rs
index ac3a046..0a90d7b 100644
--- a/ipfs-api/src/request/pubsub.rs
+++ b/ipfs-api/src/request/pubsub.rs
@@ -18,7 +18,7 @@ impl ApiRequest for PubsubLs {
 
 #[derive(Serialize)]
 pub struct PubsubPeers<'a> {
-    #[serde(rename = "arg")] pub topic: &'a Option<&'a str>,
+    #[serde(rename = "arg")] pub topic: Option<&'a str>,
 }
 
 impl<'a> ApiRequest for PubsubPeers<'a> {