From 06a3776548b8c81226ef61715e5a2e98e29799c9 Mon Sep 17 00:00:00 2001 From: Ferris Tseng Date: Sat, 30 Dec 2017 20:07:29 -0500 Subject: clippy and formatting --- ipfs-api/examples/add_tar.rs | 4 +-- ipfs-api/examples/bootstrap_default.rs | 4 +-- ipfs-api/examples/dns.rs | 2 +- ipfs-api/examples/get_stats.rs | 4 +-- ipfs-api/examples/get_swarm.rs | 6 ++--- ipfs-api/examples/mfs.rs | 12 ++++----- ipfs-api/examples/ping_peer.rs | 8 +++--- ipfs-api/examples/pubsub.rs | 8 +++--- ipfs-api/src/client.rs | 21 ++++++++------- ipfs-api/src/request/object.rs | 2 +- ipfs-api/src/request/refs.rs | 2 +- ipfs-api/src/request/swarm.rs | 2 +- ipfs-api/src/response/files.rs | 3 ++- ipfs-cli/src/command/add.rs | 4 +-- ipfs-cli/src/command/bitswap.rs | 20 +++++++------- ipfs-cli/src/command/block.rs | 12 ++++----- ipfs-cli/src/command/bootstrap.rs | 6 ++--- ipfs-cli/src/command/cat.rs | 2 +- ipfs-cli/src/command/commands.rs | 4 +-- ipfs-cli/src/command/dag.rs | 4 +-- ipfs-cli/src/command/dht.rs | 19 +++++++------- ipfs-cli/src/command/diag.rs | 14 +++++----- ipfs-cli/src/command/dns.rs | 6 ++--- ipfs-cli/src/command/file.rs | 10 +++---- ipfs-cli/src/command/files.rs | 48 +++++++++++++++++----------------- ipfs-cli/src/command/filestore.rs | 28 +++++++++++--------- ipfs-cli/src/command/mod.rs | 4 +-- ipfs-cli/src/command/version.rs | 4 +-- ipfs-cli/src/main.rs | 26 +++++++++--------- 29 files changed, 147 insertions(+), 142 deletions(-) diff --git a/ipfs-api/examples/add_tar.rs b/ipfs-api/examples/add_tar.rs index fac6e4c..0a1582c 100644 --- a/ipfs-api/examples/add_tar.rs +++ b/ipfs-api/examples/add_tar.rs @@ -44,11 +44,11 @@ fn main() { let add = core.run(req).expect("expected a valid response"); println!("added tar file: {:?}", add); - println!(""); + println!(); let req = client.tar_cat(&add.hash[..]).concat2(); let cat = core.run(req).expect("expected a valid response"); println!("{}", String::from_utf8_lossy(&cat[..])); - println!(""); + println!(); } diff --git a/ipfs-api/examples/bootstrap_default.rs b/ipfs-api/examples/bootstrap_default.rs index 739167d..d236716 100644 --- a/ipfs-api/examples/bootstrap_default.rs +++ b/ipfs-api/examples/bootstrap_default.rs @@ -29,7 +29,7 @@ fn main() { println!(" {}", peer); } - println!(""); + println!(); println!("dropping all bootstrap peers..."); let drop = client.bootstrap_rm_all(); @@ -40,7 +40,7 @@ fn main() { println!(" {}", peer); } - println!(""); + println!(); println!("adding default peers..."); let add = client.bootstrap_add_default(); diff --git a/ipfs-api/examples/dns.rs b/ipfs-api/examples/dns.rs index a4e0450..ec574ab 100644 --- a/ipfs-api/examples/dns.rs +++ b/ipfs-api/examples/dns.rs @@ -24,7 +24,7 @@ fn main() { let dns = core.run(req).expect("dns should resolve"); println!("dns resolves to ({})", &dns.path); - println!(""); + println!(); let req = client.file_ls(&dns.path[..]); let contents = core.run(req).expect("api should return path contents"); diff --git a/ipfs-api/examples/get_stats.rs b/ipfs-api/examples/get_stats.rs index 3895de6..fe9f84f 100644 --- a/ipfs-api/examples/get_stats.rs +++ b/ipfs-api/examples/get_stats.rs @@ -42,13 +42,13 @@ fn main() { " wantlist: {}", bitswap_stats.wantlist.join("\n ") ); - println!(""); + println!(); println!("bandwidth stats:"); println!(" total in: {}", bw_stats.total_in); println!(" total out: {}", bw_stats.total_out); println!(" rate in: {}", bw_stats.rate_in); println!(" rate out: {}", bw_stats.rate_out); - println!(""); + println!(); println!("repo stats:"); println!(" num objs: {}", repo_stats.num_objects); println!(" repo size: {}", repo_stats.repo_size); diff --git a/ipfs-api/examples/get_swarm.rs b/ipfs-api/examples/get_swarm.rs index 207642b..52e547a 100644 --- a/ipfs-api/examples/get_swarm.rs +++ b/ipfs-api/examples/get_swarm.rs @@ -24,7 +24,7 @@ fn main() { let local = client.swarm_addrs_local(); let local = core.run(local).expect("expected a valid response"); - println!(""); + println!(); println!("your addrs:"); for addr in local.strings { println!(" {}", addr); @@ -33,7 +33,7 @@ fn main() { let connected = client.swarm_peers(); let connected = core.run(connected).expect("expected a valid response"); - println!(""); + println!(); println!("connected:"); for peer in connected.peers { let streams: Vec<&str> = peer.streams.iter().map(|s| &s.protocol[..]).collect(); @@ -42,6 +42,6 @@ fn main() { println!(" latency: {}", peer.latency); println!(" muxer: {}", peer.muxer); println!(" streams: {}", streams.join(", ")); - println!(""); + println!(); } } diff --git a/ipfs-api/examples/mfs.rs b/ipfs-api/examples/mfs.rs index 7c17738..c92e212 100644 --- a/ipfs-api/examples/mfs.rs +++ b/ipfs-api/examples/mfs.rs @@ -19,7 +19,7 @@ fn print_stat(stat: response::FilesStatResponse) { println!(" size : {}", stat.size); println!(" cum. size: {}", stat.cumulative_size); println!(" blocks : {}", stat.blocks); - println!(""); + println!(); } // Creates an Ipfs client, and makes some calls to the Mfs Api. @@ -32,19 +32,19 @@ fn main() { let client = IpfsClient::default(&core.handle()); println!("making /test..."); - println!(""); + println!(); let req = client.files_mkdir("/test", false); core.run(req).expect("expected mkdir to succeed"); println!("making dirs /test/does/not/exist/yet..."); - println!(""); + println!(); let req = client.files_mkdir("/test/does/not/exist/yet", true); core.run(req).expect("expected mkdir -p to succeed"); println!("getting status of /test/does..."); - println!(""); + println!(); let req = client.files_stat("/test/does"); let stat = core.run(req).expect("expected stat to succeed"); @@ -52,7 +52,7 @@ fn main() { print_stat(stat); println!("writing source file to /test/mfs.rs"); - println!(""); + println!(); let src = File::open(file!()).expect("could not read source file"); let req = client.files_write("/test/mfs.rs", true, true, src); @@ -65,7 +65,7 @@ fn main() { print_stat(stat); println!("removing /test..."); - println!(""); + println!(); let req = client.files_rm("/test", true); core.run(req).expect("expected rm to succeed"); diff --git a/ipfs-api/examples/ping_peer.rs b/ipfs-api/examples/ping_peer.rs index 611bd21..36713ee 100644 --- a/ipfs-api/examples/ping_peer.rs +++ b/ipfs-api/examples/ping_peer.rs @@ -23,7 +23,7 @@ fn main() { let mut core = Core::new().expect("expected event loop"); let client = IpfsClient::default(&core.handle()); - println!(""); + println!(); println!("discovering connected peers..."); let connected = client.swarm_peers(); @@ -33,9 +33,9 @@ fn main() { "expected at least one peer", ); - println!(""); + println!(); println!("discovered peer ({})", peer.peer); - println!(""); + println!(); println!("streaming 10 pings..."); let req = client.ping(&peer.peer[..], &Some(10)); @@ -44,7 +44,7 @@ fn main() { Ok(()) })).expect("expected a valid response"); - println!(""); + println!(); println!("gathering 15 pings..."); let req = client.ping(&peer.peer[..], &Some(15)); diff --git a/ipfs-api/examples/pubsub.rs b/ipfs-api/examples/pubsub.rs index 59f8ce7..9d37c04 100644 --- a/ipfs-api/examples/pubsub.rs +++ b/ipfs-api/examples/pubsub.rs @@ -41,13 +41,13 @@ fn main() { .interval(Duration::from_secs(1)) .map_err(|_| response::Error::from("timeout error")) .for_each(move |_| { - println!(""); + println!(); println!("publishing message..."); client.pubsub_pub(TOPIC, "Hello World!") }); - println!(""); + println!(); println!("starting task to publish messages to ({})...", TOPIC); event_loop.run(publish).expect( "expected the publish task to start", @@ -62,11 +62,11 @@ fn main() { let client = get_client(&event_loop.handle()); let req = client.pubsub_sub(TOPIC, false); - println!(""); + println!(); println!("waiting for messages on ({})...", TOPIC); event_loop .run(req.take(5).for_each(|msg| { - println!(""); + println!(); println!("received ({:?})", msg); Ok(()) diff --git a/ipfs-api/src/client.rs b/ipfs-api/src/client.rs index dee4a24..4cfcaf1 100644 --- a/ipfs-api/src/client.rs +++ b/ipfs-api/src/client.rs @@ -1605,11 +1605,11 @@ impl IpfsClient { /// Pins a new object. /// - /// The "recursive" option tells the server whether to - /// pin just the top-level object, or all sub-objects + /// The "recursive" option tells the server whether to + /// pin just the top-level object, or all sub-objects /// it depends on. For most cases you want it to be `true`. /// - /// Does not yet implement the "progress" agument because + /// Does not yet implement the "progress" agument because /// reading it is kinda squirrelly. /// /// # Examples @@ -1628,12 +1628,15 @@ impl IpfsClient { /// # } /// ``` #[inline] - pub fn pin_add( - &self, - key: &str, - recursive: bool - ) -> AsyncResponse { - self.request(&request::PinAdd { key, recursive: Some(recursive), progress: false }, None) + pub fn pin_add(&self, key: &str, recursive: bool) -> AsyncResponse { + self.request( + &request::PinAdd { + key, + recursive: Some(recursive), + progress: false, + }, + None, + ) } /// Returns a list of pinned objects in local storage. diff --git a/ipfs-api/src/request/object.rs b/ipfs-api/src/request/object.rs index 3e4da29..c9b3a51 100644 --- a/ipfs-api/src/request/object.rs +++ b/ipfs-api/src/request/object.rs @@ -41,7 +41,7 @@ pub struct ObjectLinks<'a> { } impl<'a> ApiRequest for ObjectLinks<'a> { - const PATH: &'static str = "/object/links"; + const PATH: &'static str = "/object/links"; } diff --git a/ipfs-api/src/request/refs.rs b/ipfs-api/src/request/refs.rs index 484869f..1e7c6f4 100644 --- a/ipfs-api/src/request/refs.rs +++ b/ipfs-api/src/request/refs.rs @@ -14,5 +14,5 @@ pub struct RefsLocal; impl_skip_serialize!(RefsLocal); impl ApiRequest for RefsLocal { - const PATH: &'static str = "/refs/local"; + const PATH: &'static str = "/refs/local"; } diff --git a/ipfs-api/src/request/swarm.rs b/ipfs-api/src/request/swarm.rs index 3953fdb..c9a8da7 100644 --- a/ipfs-api/src/request/swarm.rs +++ b/ipfs-api/src/request/swarm.rs @@ -23,5 +23,5 @@ pub struct SwarmPeers; impl_skip_serialize!(SwarmPeers); impl ApiRequest for SwarmPeers { - const PATH: &'static str = "/swarm/peers"; + const PATH: &'static str = "/swarm/peers"; } diff --git a/ipfs-api/src/response/files.rs b/ipfs-api/src/response/files.rs index 1b073de..ae0c7d8 100644 --- a/ipfs-api/src/response/files.rs +++ b/ipfs-api/src/response/files.rs @@ -20,7 +20,8 @@ pub type FilesFlushResponse = (); pub struct FilesEntry { pub name: String, - // This is a protocol buffer enum type defined in https://github.com/ipfs/go-ipfs/blob/master/unixfs/pb/unixfs.proto ... + // 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, diff --git a/ipfs-cli/src/command/add.rs b/ipfs-cli/src/command/add.rs index 0ff592d..40eeb3c 100644 --- a/ipfs-cli/src/command/add.rs +++ b/ipfs-cli/src/command/add.rs @@ -27,9 +27,9 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { let file = File::open(path).expect(EXPECTED_FILE); let response = core.run(client.add(file)).expect(EXPECTED_API); - println!(""); + println!(); println!(" name : {}", response.name); println!(" hash : {}", response.hash); println!(" size : {}", response.size); - println!(""); + println!(); } diff --git a/ipfs-cli/src/command/bitswap.rs b/ipfs-cli/src/command/bitswap.rs index 798670b..ed76107 100644 --- a/ipfs-cli/src/command/bitswap.rs +++ b/ipfs-cli/src/command/bitswap.rs @@ -38,20 +38,20 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { match args.subcommand() { ("ledger", Some(args)) => { let peer = args.value_of("PEER").unwrap(); - let ledger = core.run(client.bitswap_ledger(&peer)).expect(EXPECTED_API); + let ledger = core.run(client.bitswap_ledger(peer)).expect(EXPECTED_API); - println!(""); + println!(); println!(" peer : {}", ledger.peer); println!(" value : {}", ledger.value); println!(" sent : {}", ledger.sent); println!(" recv : {}", ledger.recv); println!(" exchanged : {}", ledger.exchanged); - println!(""); + println!(); } ("stat", _) => { let stat = core.run(client.bitswap_stat()).expect(EXPECTED_API); - println!(""); + println!(); println!(" provide_buf_len : {}", stat.provide_buf_len); println!(" wantlist :"); for want in stat.wantlist { @@ -67,27 +67,27 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { println!(" data_sent : {}", stat.data_sent); println!(" dup_blks_received : {}", stat.dup_blks_received); println!(" dup_data_received : {}", stat.dup_data_received); - println!(""); + println!(); } ("unwant", Some(args)) => { let key = args.value_of("KEY").unwrap(); - core.run(client.bitswap_unwant(&key)).expect(EXPECTED_API); + core.run(client.bitswap_unwant(key)).expect(EXPECTED_API); - println!(""); + println!(); println!(" OK"); - println!(""); + println!(); } ("wantlist", Some(args)) => { let peer = args.value_of("PEER"); let wantlist = core.run(client.bitswap_wantlist(peer)).expect(EXPECTED_API); - println!(""); + println!(); println!(" wantlist :"); for key in wantlist.keys { println!(" {}", key); } - println!(""); + println!(); } _ => unreachable!(), } diff --git a/ipfs-cli/src/command/block.rs b/ipfs-cli/src/command/block.rs index 24fa4eb..09bc660 100644 --- a/ipfs-cli/src/command/block.rs +++ b/ipfs-cli/src/command/block.rs @@ -54,30 +54,30 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { let file = File::open(path).expect(EXPECTED_FILE); let block = core.run(client.block_put(file)).expect(EXPECTED_API); - println!(""); + println!(); println!(" key : {}", block.key); println!(" size : {}", block.size); - println!(""); + println!(); } ("rm", Some(args)) => { let key = args.value_of("KEY").unwrap(); let rm = core.run(client.block_rm(key)).expect(EXPECTED_API); - println!(""); + println!(); println!(" hash : {}", rm.hash); if let Some(error) = rm.error { println!(" error : {}", error); } - println!(""); + println!(); } ("stat", Some(args)) => { let key = args.value_of("KEY").unwrap(); let stat = core.run(client.block_stat(key)).expect(EXPECTED_API); - println!(""); + println!(); println!(" key : {}", stat.key); println!(" size : {}", stat.size); - println!(""); + println!(); } _ => unreachable!(), } diff --git a/ipfs-cli/src/command/bootstrap.rs b/ipfs-cli/src/command/bootstrap.rs index 63c5925..fea60de 100644 --- a/ipfs-cli/src/command/bootstrap.rs +++ b/ipfs-cli/src/command/bootstrap.rs @@ -35,13 +35,13 @@ pub fn signature<'a, 'b>() -> App<'a, 'b> { } -fn print_peers(peers: &Vec) { - println!(""); +fn print_peers(peers: &[String]) { + println!(); println!(" peers :"); for peer in peers { println!(" {}", peer); } - println!(""); + println!(); } diff --git a/ipfs-cli/src/command/cat.rs b/ipfs-cli/src/command/cat.rs index 6216bc7..5bab711 100644 --- a/ipfs-cli/src/command/cat.rs +++ b/ipfs-cli/src/command/cat.rs @@ -25,7 +25,7 @@ pub fn signature<'a, 'b>() -> App<'a, 'b> { pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { let path = args.value_of("PATH").unwrap(); - let req = client.cat(&path).for_each(|chunk| { + let req = client.cat(path).for_each(|chunk| { io::stdout().write_all(&chunk).map_err(From::from) }); diff --git a/ipfs-cli/src/command/commands.rs b/ipfs-cli/src/command/commands.rs index 481b5a0..05f787c 100644 --- a/ipfs-cli/src/command/commands.rs +++ b/ipfs-cli/src/command/commands.rs @@ -41,7 +41,7 @@ fn recursive_print_commands(cmd: CommandsResponse, stack: &mut Vec) { pub fn handle(core: &mut Core, client: &IpfsClient) { let commands = core.run(client.commands()).expect(EXPECTED_API); - println!(""); + println!(); recursive_print_commands(commands, &mut Vec::new()); - println!(""); + println!(); } diff --git a/ipfs-cli/src/command/dag.rs b/ipfs-cli/src/command/dag.rs index e27375f..81250a5 100644 --- a/ipfs-cli/src/command/dag.rs +++ b/ipfs-cli/src/command/dag.rs @@ -30,7 +30,7 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { let key = args.value_of("KEY").unwrap(); let dag = core.run(client.dag_get(key)).expect(EXPECTED_API); - println!(""); + println!(); if let Some(data) = dag.data { println!(" data :"); println!("{}", data); @@ -39,7 +39,7 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { for link in dag.links { println!(" {} ({}) ({:?})", link.name, link.size, link.cid); } - println!(""); + println!(); } _ => unreachable!(), } diff --git a/ipfs-cli/src/command/dht.rs b/ipfs-cli/src/command/dht.rs index 44d4aa0..ede7858 100644 --- a/ipfs-cli/src/command/dht.rs +++ b/ipfs-cli/src/command/dht.rs @@ -48,7 +48,7 @@ pub fn signature<'a, 'b>() -> App<'a, 'b> { fn print_dht_response(res: DhtMessage) -> Result<(), E> { - println!(""); + println!(); println!(" id : {}", res.id); println!(" type : {:?}", res.typ); println!(" responses :"); @@ -58,10 +58,10 @@ fn print_dht_response(res: DhtMessage) -> Result<(), E> { for addr in peer_res.addrs { println!(" {}", addr); } - println!(""); + println!(); } println!(" extra : {}", res.extra); - println!(""); + println!(); Ok(()) } @@ -72,34 +72,33 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { ("findpeer", Some(args)) => { let peer = args.value_of("PEER").unwrap(); - client.dht_findpeer(&peer) + client.dht_findpeer(peer) } ("findprovs", Some(args)) => { let key = args.value_of("KEY").unwrap(); - client.dht_findprovs(&key) + client.dht_findprovs(key) } ("get", Some(args)) => { let key = args.value_of("KEY").unwrap(); - client.dht_get(&key) + client.dht_get(key) } ("provide", Some(args)) => { let key = args.value_of("KEY").unwrap(); - client.dht_provide(&key) - + client.dht_provide(key) } ("put", Some(args)) => { let key = args.value_of("KEY").unwrap(); let val = args.value_of("VALUE").unwrap(); - client.dht_put(&key, &val) + client.dht_put(key, val) } ("query", Some(args)) => { let peer = args.value_of("PEER").unwrap(); - client.dht_query(&peer) + client.dht_query(peer) } _ => unreachable!(), }; diff --git a/ipfs-cli/src/command/diag.rs b/ipfs-cli/src/command/diag.rs index 24f65aa..644de19 100644 --- a/ipfs-cli/src/command/diag.rs +++ b/ipfs-cli/src/command/diag.rs @@ -46,20 +46,20 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { ("clear", _) => { core.run(client.diag_cmds_clear()).expect(EXPECTED_API); - println!(""); + println!(); println!(" OK"); - println!(""); + println!(); } ("set-time", Some(args)) => { let time = args.value_of("TIME").unwrap(); - core.run(client.diag_cmds_set_time(&time)).expect( + core.run(client.diag_cmds_set_time(time)).expect( EXPECTED_API, ); - println!(""); + println!(); println!(" OK"); - println!(""); + println!(); } _ => unreachable!(), } @@ -67,9 +67,9 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { ("sys", _) => { let sys = core.run(client.diag_sys()).expect(EXPECTED_API); - println!(""); + println!(); println!(" {}", sys); - println!(""); + println!(); } _ => unreachable!(), } diff --git a/ipfs-cli/src/command/dns.rs b/ipfs-cli/src/command/dns.rs index e9ab0fa..c40f61b 100644 --- a/ipfs-cli/src/command/dns.rs +++ b/ipfs-cli/src/command/dns.rs @@ -24,10 +24,10 @@ pub fn signature<'a, 'b>() -> App<'a, 'b> { pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { let path = args.value_of("PATH").unwrap(); - let req = client.dns(&path, args.is_present("recursive")); + let req = client.dns(path, args.is_present("recursive")); let res = core.run(req).expect(EXPECTED_API); - println!(""); + println!(); println!(" path : {}", res.path); - println!(""); + println!(); } diff --git a/ipfs-cli/src/command/file.rs b/ipfs-cli/src/command/file.rs index 9a007a3..1d7da87 100644 --- a/ipfs-cli/src/command/file.rs +++ b/ipfs-cli/src/command/file.rs @@ -28,14 +28,14 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { match args.subcommand() { ("ls", Some(args)) => { let path = args.value_of("PATH").unwrap(); - let ls = core.run(client.file_ls(&path)).expect(EXPECTED_API); + let ls = core.run(client.file_ls(path)).expect(EXPECTED_API); - println!(""); + println!(); println!(" arguments :"); for (k, arg) in ls.arguments { println!(" arg : {}", k); println!(" value : {}", arg); - println!(""); + println!(); } println!(" objects :"); for (k, obj) in ls.objects { @@ -51,10 +51,10 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { if let Some(ref typ) = link.typ { println!(" type : {}", typ); } - println!(""); + println!(); } } - println!(""); + println!(); } _ => unreachable!(), } diff --git a/ipfs-cli/src/command/files.rs b/ipfs-cli/src/command/files.rs index 00329a9..1f1564e 100644 --- a/ipfs-cli/src/command/files.rs +++ b/ipfs-cli/src/command/files.rs @@ -73,59 +73,59 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { let src = args.value_of("SRC").unwrap(); let dest = args.value_of("DEST").unwrap(); - core.run(client.files_cp(&src, &dest)).expect(EXPECTED_API); + core.run(client.files_cp(src, dest)).expect(EXPECTED_API); - println!(""); + println!(); println!(" OK"); - println!(""); + println!(); } ("flush", Some(args)) => { let path = args.value_of("PATH"); core.run(client.files_flush(&path)).expect(EXPECTED_API); - println!(""); + println!(); println!(" OK"); - println!(""); + println!(); } ("ls", Some(args)) => { let path = args.value_of("PATH"); let ls = core.run(client.files_ls(&path)).expect(EXPECTED_API); - println!(""); + println!(); println!(" entries :"); for entry in ls.entries { println!(" name : {}", entry.name); println!(" type : {}", entry.typ); println!(" size : {}", entry.size); println!(" hash : {}", entry.hash); - println!(""); + println!(); } - println!(""); + println!(); } ("mkdir", Some(args)) => { let path = args.value_of("PATH").unwrap(); - core.run(client.files_mkdir(&path, args.is_present("parents"))) + core.run(client.files_mkdir(path, args.is_present("parents"))) .expect(EXPECTED_API); - println!(""); + println!(); println!(" OK"); - println!(""); + println!(); } ("mv", Some(args)) => { let src = args.value_of("SRC").unwrap(); let dest = args.value_of("DEST").unwrap(); - core.run(client.files_mv(&src, &dest)).expect(EXPECTED_API); + core.run(client.files_mv(src, dest)).expect(EXPECTED_API); - println!(""); + println!(); println!(" OK"); - println!(""); + println!(); } ("read", Some(args)) => { let path = args.value_of("PATH").unwrap(); - let req = client.files_read(&path).for_each(|chunk| { + let req = client.files_read(path).for_each(|chunk| { io::stdout().write_all(&chunk).map_err(From::from) }); @@ -133,32 +133,32 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { } ("rm", Some(args)) => { let path = args.value_of("PATH").unwrap(); - let req = client.files_rm(&path, args.is_present("recursive")); + let req = client.files_rm(path, args.is_present("recursive")); core.run(req).expect(EXPECTED_API); - println!(""); + println!(); println!(" OK"); - println!(""); + println!(); } ("stat", Some(args)) => { let path = args.value_of("PATH").unwrap(); - let stat = core.run(client.files_stat(&path)).expect(EXPECTED_API); + let stat = core.run(client.files_stat(path)).expect(EXPECTED_API); - println!(""); + println!(); println!(" hash : {}", stat.hash); println!(" size : {}", stat.size); println!(" cumulative_size : {}", stat.cumulative_size); println!(" blocks : {}", stat.blocks); println!(" type : {}", stat.typ); - println!(""); + println!(); } ("write", Some(args)) => { let dest = args.value_of("DEST").unwrap(); let path = args.value_of("INPUT").unwrap(); let file = File::open(path).expect(EXPECTED_FILE); let req = client.files_write( - &dest, + dest, args.is_present("create"), args.is_present("truncate"), file, @@ -166,9 +166,9 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { core.run(req).expect(EXPECTED_API); - println!(""); + println!(); println!(" OK"); - println!(""); + println!(); } _ => unreachable!(), } diff --git a/ipfs-cli/src/command/filestore.rs b/ipfs-cli/src/command/filestore.rs index b24da2c..a14b055 100644 --- a/ipfs-cli/src/command/filestore.rs +++ b/ipfs-cli/src/command/filestore.rs @@ -32,14 +32,14 @@ pub fn signature<'a, 'b>() -> App<'a, 'b> { } -fn print_filestore_object(obj: response::FilestoreObject) -> Result<(), E> { +fn print_filestore_object(obj: &response::FilestoreObject) -> Result<(), E> { println!(" status : {}", obj.status); println!(" error_msg : {}", obj.error_msg); println!(" key : {}", obj.key); println!(" file_path : {}", obj.file_path); println!(" offset : {}", obj.offset); println!(" size : {}", obj.size); - println!(""); + println!(); Ok(()) } @@ -51,32 +51,34 @@ pub fn handle(core: &mut Core, client: &IpfsClient, args: &ArgMatches) { let req = client.filestore_dups().for_each(|dup| { println!(" ref : {}", dup.reference); println!(" err : {}", dup.err); - println!(""); + println!(); Ok(()) }); - println!(""); + println!(); core.run(req).expect(EXPECTED_API); - println!(""); + println!(); } ("ls", Some(args)) => { let cid = args.value_of("CID"); - let req = client.filestore_ls(&cid).for_each(print_filestore_object); + let req = client.filestore_ls(&cid).for_each( + |res| print_filestore_object(&res), + ); - println!(""); + println!(); core.run(req).expect(EXPECTED_API); - println!(""); + println!(); } ("verify", Some(args)) => { let cid = args.value_of("CID"); - let req = client.filestore_verify(&cid).for_each( - print_filestore_object, - ); + let req = client.filestore_verify(&cid).for_each(|res| { + print_filestore_object(&res) + }); - println!(""); + println!(); core.run(req).expect(EXPECTED_API); - println!(""); + println!(); } _ => unreachable!(), } diff --git a/ipfs-cli/src/command/mod.rs b/ipfs-cli/src/command/mod.rs index b260902..7d12053 100644 --- a/ipfs-cli/src/command/mod.rs +++ b/ipfs-cli/src/command/mod.rs @@ -10,8 +10,8 @@ use std::error::Error; use std::fs; -pub const EXPECTED_API: &'static str = "expected response from API"; -pub const EXPECTED_FILE: &'static str = "expected to read input file"; +pub const EXPECTED_API: &str = "expected response from API"; +pub const EXPECTED_FILE: &str = "expected to read input file"; /// Verifies that a path points to a file that exists, and not a directory. diff --git a/ipfs-cli/src/command/version.rs b/ipfs-cli/src/command/version.rs index 380cd8b..d8fbafa 100644 --- a/ipfs-cli/src/command/version.rs +++ b/ipfs-cli/src/command/version.rs @@ -24,11 +24,11 @@ pub fn handle(core: &mut Core, client: &IpfsClient) { "expected response from API", ); - println!(""); + println!(); println!(" version : {}", version.version); println!(" commit : {}", version.commit); println!(" repo : {}", version.repo); println!(" system : {}", version.system); println!(" golang : {}", version.golang); - println!(""); + println!(); } diff --git a/ipfs-cli/src/main.rs b/ipfs-cli/src/main.rs index e373910..b0262aa 100644 --- a/ipfs-cli/src/main.rs +++ b/ipfs-cli/src/main.rs @@ -46,20 +46,20 @@ fn main() { let client = IpfsClient::default(&core.handle()); match matches.subcommand() { - ("add", Some(args)) => command::add::handle(&mut core, &client, &args), - ("bitswap", Some(args)) => command::bitswap::handle(&mut core, &client, &args), - ("block", Some(args)) => command::block::handle(&mut core, &client, &args), - ("bootstrap", Some(args)) => command::bootstrap::handle(&mut core, &client, &args), - ("cat", Some(args)) => command::cat::handle(&mut core, &client, &args), + ("add", Some(args)) => command::add::handle(&mut core, &client, args), + ("bitswap", Some(args)) => command::bitswap::handle(&mut core, &client, args), + ("block", Some(args)) => command::block::handle(&mut core, &client, args), + ("bootstrap", Some(args)) => command::bootstrap::handle(&mut core, &client, args), + ("cat", Some(args)) => command::cat::handle(&mut core, &client, args), ("commands", _) => command::commands::handle(&mut core, &client), - ("config", Some(args)) => command::config::handle(&mut core, &client, &args), - ("dag", Some(args)) => command::dag::handle(&mut core, &client, &args), - ("dht", Some(args)) => command::dht::handle(&mut core, &client, &args), - ("diag", Some(args)) => command::diag::handle(&mut core, &client, &args), - ("dns", Some(args)) => command::dns::handle(&mut core, &client, &args), - ("file", Some(args)) => command::file::handle(&mut core, &client, &args), - ("files", Some(args)) => command::files::handle(&mut core, &client, &args), - ("filestore", Some(args)) => command::filestore::handle(&mut core, &client, &args), + ("config", Some(args)) => command::config::handle(&mut core, &client, args), + ("dag", Some(args)) => command::dag::handle(&mut core, &client, args), + ("dht", Some(args)) => command::dht::handle(&mut core, &client, args), + ("diag", Some(args)) => command::diag::handle(&mut core, &client, args), + ("dns", Some(args)) => command::dns::handle(&mut core, &client, args), + ("file", Some(args)) => command::file::handle(&mut core, &client, args), + ("files", Some(args)) => command::files::handle(&mut core, &client, args), + ("filestore", Some(args)) => command::filestore::handle(&mut core, &client, args), ("version", _) => command::version::handle(&mut core, &client), _ => unreachable!(), } -- cgit v1.2.3