From 9f6a7cabd903b4361746ce2e689b4d6f8e47e2cb Mon Sep 17 00:00:00 2001 From: Ferris Tseng Date: Tue, 23 Jan 2018 18:50:54 -0500 Subject: use Option instead of &Option --- ipfs-api/examples/ping_peer.rs | 4 +-- ipfs-api/src/client.rs | 58 +++++++++++++++++++-------------------- ipfs-api/src/request/files.rs | 4 +-- ipfs-api/src/request/filestore.rs | 4 +-- ipfs-api/src/request/id.rs | 2 +- ipfs-api/src/request/key.rs | 6 ++-- ipfs-api/src/request/ls.rs | 2 +- ipfs-api/src/request/pin.rs | 5 ++-- ipfs-api/src/request/ping.rs | 6 ++-- ipfs-api/src/request/pubsub.rs | 2 +- ipfs-cli/src/command/files.rs | 6 ++-- ipfs-cli/src/command/filestore.rs | 6 ++-- 12 files changed, 53 insertions(+), 52 deletions(-) diff --git a/ipfs-api/examples/ping_peer.rs b/ipfs-api/examples/ping_peer.rs index 922aab8..3deb1e1 100644 --- a/ipfs-api/examples/ping_peer.rs +++ b/ipfs-api/examples/ping_peer.rs @@ -39,7 +39,7 @@ fn main() { println!("discovered peer ({})", peer.peer); println!(); println!("streaming 10 pings..."); - let req = client.ping(&peer.peer[..], &Some(10)); + let req = client.ping(&peer.peer[..], Some(10)); core.run(req.for_each(|ping| { println!("{:?}", ping); @@ -49,7 +49,7 @@ fn main() { println!(); println!("gathering 15 pings..."); - let req = client.ping(&peer.peer[..], &Some(15)); + let req = client.ping(&peer.peer[..], Some(15)); let pings: Vec<_> = core.run(req.collect()).expect("expected a valid response"); for ping in pings.iter() { diff --git a/ipfs-api/src/client.rs b/ipfs-api/src/client.rs index ba48ff3..3278eb2 100644 --- a/ipfs-api/src/client.rs +++ b/ipfs-api/src/client.rs @@ -1058,13 +1058,13 @@ impl IpfsClient { /// # fn main() { /// let mut core = Core::new().unwrap(); /// let client = IpfsClient::default(&core.handle()); - /// let req = client.files_flush(&None); - /// let req = client.files_flush(&Some("/tmp")); + /// let req = client.files_flush(None); + /// let req = client.files_flush(Some("/tmp")); /// # } /// ``` /// #[inline] - pub fn files_flush(&self, path: &Option<&str>) -> AsyncResponse { + pub fn files_flush(&self, path: Option<&str>) -> AsyncResponse { self.request_empty(&request::FilesFlush { path }, None) } @@ -1080,13 +1080,13 @@ impl IpfsClient { /// # fn main() { /// let mut core = Core::new().unwrap(); /// let client = IpfsClient::default(&core.handle()); - /// let req = client.files_ls(&None); - /// let req = client.files_ls(&Some("/tmp")); + /// let req = client.files_ls(None); + /// let req = client.files_ls(Some("/tmp")); /// # } /// ``` /// #[inline] - pub fn files_ls(&self, path: &Option<&str>) -> AsyncResponse { + pub fn files_ls(&self, path: Option<&str>) -> AsyncResponse { self.request(&request::FilesLs { path }, None) } @@ -1281,14 +1281,14 @@ impl IpfsClient { /// # fn main() { /// let mut core = Core::new().unwrap(); /// let client = IpfsClient::default(&core.handle()); - /// let req = client.filestore_ls(&Some("QmYPP3BovR2m8UqCZxFbdXSit6SKgExxDkFAPLqiGsap4X")); + /// let req = client.filestore_ls(Some("QmYPP3BovR2m8UqCZxFbdXSit6SKgExxDkFAPLqiGsap4X")); /// # } /// ``` /// #[inline] pub fn filestore_ls( &self, - cid: &Option<&str>, + cid: Option<&str>, ) -> AsyncStreamResponse { self.request_stream_json(&request::FilestoreLs { cid }, None) } @@ -1305,14 +1305,14 @@ impl IpfsClient { /// # fn main() { /// let mut core = Core::new().unwrap(); /// let client = IpfsClient::default(&core.handle()); - /// let req = client.filestore_verify(&None); + /// let req = client.filestore_verify(None); /// # } /// ``` /// #[inline] pub fn filestore_verify( &self, - cid: &Option<&str>, + cid: Option<&str>, ) -> AsyncStreamResponse { self.request_stream_json(&request::FilestoreVerify { cid }, None) } @@ -1352,13 +1352,13 @@ impl IpfsClient { /// # fn main() { /// let mut core = Core::new().unwrap(); /// let client = IpfsClient::default(&core.handle()); - /// let req = client.id(&None); - /// let req = client.id(&Some("QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM")); + /// let req = client.id(None); + /// let req = client.id(Some("QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM")); /// # } /// ``` /// #[inline] - pub fn id(&self, peer: &Option<&str>) -> AsyncResponse { + pub fn id(&self, peer: Option<&str>) -> AsyncResponse { self.request(&request::Id { peer }, None) } @@ -1374,7 +1374,7 @@ impl IpfsClient { /// # fn main() { /// let mut core = Core::new().unwrap(); /// let client = IpfsClient::default(&core.handle()); - /// let req = client.key_gen("test", KeyType::Rsa, &Some(64)); + /// let req = client.key_gen("test", KeyType::Rsa, 64); /// # } /// ``` /// @@ -1383,7 +1383,7 @@ impl IpfsClient { &self, name: &str, kind: request::KeyType, - size: &Option, + size: i32, ) -> AsyncResponse { self.request(&request::KeyGen { name, kind, size }, None) } @@ -1545,13 +1545,13 @@ impl IpfsClient { /// # fn main() { /// let mut core = Core::new().unwrap(); /// let client = IpfsClient::default(&core.handle()); - /// let req = client.ls(&None); - /// let req = client.ls(&Some("/ipfs/QmVrLsEDn27sScp3k23sgZNefVTjSAL3wpgW1iWPi4MgoY")); + /// let req = client.ls(None); + /// let req = client.ls(Some("/ipfs/QmVrLsEDn27sScp3k23sgZNefVTjSAL3wpgW1iWPi4MgoY")); /// # } /// ``` /// #[inline] - pub fn ls(&self, path: &Option<&str>) -> AsyncResponse { + pub fn ls(&self, path: Option<&str>) -> AsyncResponse { self.request(&request::Ls { path }, None) } @@ -1727,17 +1727,17 @@ impl IpfsClient { /// let client = IpfsClient::default(&core.handle()); /// let req = client.pin_ls(&None, &None); /// let req = client.pin_ls( - /// &Some("/ipfs/QmVrLsEDn27sScp3k23sgZNefVTjSAL3wpgW1iWPi4MgoY"), - /// &None); - /// let req = client.pin_ls(&None, &Some("direct")); + /// Some("/ipfs/QmVrLsEDn27sScp3k23sgZNefVTjSAL3wpgW1iWPi4MgoY"), + /// None); + /// let req = client.pin_ls(None, Some("direct")); /// # } /// ``` /// #[inline] pub fn pin_ls( &self, - key: &Option<&str>, - typ: &Option<&str>, + key: Option<&str>, + typ: Option<&str>, ) -> AsyncResponse { self.request(&request::PinLs { key, typ }, None) } @@ -1784,8 +1784,8 @@ impl IpfsClient { /// # fn main() { /// let mut core = Core::new().unwrap(); /// let client = IpfsClient::default(&core.handle()); - /// let req = client.ping("QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64", &None); - /// let req = client.ping("QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64", &Some(15)); + /// let req = client.ping("QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64", None); + /// let req = client.ping("QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64", Some(15)); /// # } /// ``` /// @@ -1793,7 +1793,7 @@ impl IpfsClient { pub fn ping( &self, peer: &str, - count: &Option, + count: Option, ) -> AsyncStreamResponse { self.request_stream_json(&request::Ping { peer, count }, None) } @@ -1831,15 +1831,15 @@ impl IpfsClient { /// # fn main() { /// let mut core = Core::new().unwrap(); /// let client = IpfsClient::default(&core.handle()); - /// let req = client.pubsub_peers(&None); - /// let req = client.pubsub_peers(&Some("feed")); + /// let req = client.pubsub_peers(None); + /// let req = client.pubsub_peers(Some("feed")); /// # } /// ``` /// #[inline] pub fn pubsub_peers( &self, - topic: &Option<&str>, + topic: Option<&str>, ) -> AsyncResponse { self.request(&request::PubsubPeers { topic }, None) } 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, + 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, 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, + pub count: Option, } -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> { diff --git a/ipfs-cli/src/command/files.rs b/ipfs-cli/src/command/files.rs index 9b109c7..d3d0d75 100644 --- a/ipfs-cli/src/command/files.rs +++ b/ipfs-cli/src/command/files.rs @@ -80,7 +80,7 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { ("flush", Some(args)) => { let path = args.value_of("PATH"); - core.run(client.files_flush(&path)).expect(EXPECTED_API); + core.run(client.files_flush(path)).expect(EXPECTED_API); println!(); println!(" OK"); @@ -88,7 +88,7 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { } ("ls", Some(args)) => { let path = args.value_of("PATH"); - let ls = core.run(client.files_ls(&path)).expect(EXPECTED_API); + let ls = core.run(client.files_ls(path)).expect(EXPECTED_API); println!(); println!(" entries :"); @@ -124,7 +124,7 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { ("read", Some(args)) => { let path = args.value_of("PATH").unwrap(); let req = client - .files_read(&path) + .files_read(path) .for_each(|chunk| io::stdout().write_all(&chunk).map_err(From::from)); core.run(req).expect(EXPECTED_API); diff --git a/ipfs-cli/src/command/filestore.rs b/ipfs-cli/src/command/filestore.rs index c60e0ce..bf49c09 100644 --- a/ipfs-cli/src/command/filestore.rs +++ b/ipfs-cli/src/command/filestore.rs @@ -60,7 +60,7 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { ("ls", Some(args)) => { let cid = args.value_of("CID"); let req = client - .filestore_ls(&cid) + .filestore_ls(cid) .for_each(|res| print_filestore_object(&res)); println!(); @@ -70,8 +70,8 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { ("verify", Some(args)) => { let cid = args.value_of("CID"); let req = client - .filestore_verify(&cid) - .for_each(print_filestore_object); + .filestore_verify(cid) + .for_each(|obj| print_filestore_object(&obj)); println!(); core.run(req).expect(EXPECTED_API); -- cgit v1.2.3