From 05d4004aef56fabee5f15449044e07cb99125be0 Mon Sep 17 00:00:00 2001 From: Chris Holcombe Date: Sat, 18 Aug 2018 09:03:45 -0700 Subject: [PATCH] rustfmt --- src/lib/dht.rs | 3 +-- src/lib/layout/disperse.rs | 2 +- src/lib/layout/mod.rs | 2 +- src/lib/layout/replicate.rs | 4 ++-- src/lib/mod.rs | 1 - src/pipeline/cluster/replicate.rs | 1 - src/pipeline/features/access-control.rs | 1 + src/pipeline/features/locks.rs | 1 + src/pipeline/performance/io-threads.rs | 1 + src/pipeline/protocols/client.rs | 13 +++++++++---- src/pipeline/protocols/server.rs | 2 +- 11 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/lib/dht.rs b/src/lib/dht.rs index a08d242..169ee04 100644 --- a/src/lib/dht.rs +++ b/src/lib/dht.rs @@ -23,5 +23,4 @@ impl Dht { hasher: RendezvousNodes::default(), } } - -} \ No newline at end of file +} diff --git a/src/lib/layout/disperse.rs b/src/lib/layout/disperse.rs index 9505c7c..bf2602b 100644 --- a/src/lib/layout/disperse.rs +++ b/src/lib/layout/disperse.rs @@ -6,7 +6,7 @@ use std::path::PathBuf; use self::rendezvous_hash::{Node, NodeHasher}; use super::super::config::Peer; -/// Store files across a set of servers and paths. Disperse +/// Store files across a set of servers and paths. Disperse /// will erasure code a file and distribute it across X Peers /// and Paths while also storing redundancy pieces of the file /// on X Peers and Paths diff --git a/src/lib/layout/mod.rs b/src/lib/layout/mod.rs index a3a2470..0f011aa 100644 --- a/src/lib/layout/mod.rs +++ b/src/lib/layout/mod.rs @@ -1,4 +1,4 @@ -extern crate rendezvous_hash; +extern crate rendezvous_hash; use self::rendezvous_hash::Node; diff --git a/src/lib/layout/replicate.rs b/src/lib/layout/replicate.rs index f7759b3..d3d5550 100644 --- a/src/lib/layout/replicate.rs +++ b/src/lib/layout/replicate.rs @@ -96,7 +96,7 @@ fn test_replicate() { vec![ e1.entry[0].clone(), e1.entry[1].clone(), - e1.entry[2].clone() + e1.entry[2].clone(), ], ); } @@ -110,7 +110,7 @@ fn test_replicate() { vec![ e2.entry[0].clone(), e2.entry[1].clone(), - e2.entry[2].clone() + e2.entry[2].clone(), ], ); } diff --git a/src/lib/mod.rs b/src/lib/mod.rs index 32f52eb..dab3f24 100644 --- a/src/lib/mod.rs +++ b/src/lib/mod.rs @@ -1,4 +1,3 @@ pub mod config; pub mod layout; pub mod peer; - diff --git a/src/pipeline/cluster/replicate.rs b/src/pipeline/cluster/replicate.rs index 9c95f23..9549d83 100644 --- a/src/pipeline/cluster/replicate.rs +++ b/src/pipeline/cluster/replicate.rs @@ -15,7 +15,6 @@ impl PipelinePlugin for Replicate { fn init(&self, options: HashMap, subvolumes: Vec) {} fn process(&self, name: &str, data: &mut [u8]) -> Result<(&str, &mut [u8]), String> { - Err("Foo".to_string()) } fn stop(&self) {} diff --git a/src/pipeline/features/access-control.rs b/src/pipeline/features/access-control.rs index e69de29..8b13789 100644 --- a/src/pipeline/features/access-control.rs +++ b/src/pipeline/features/access-control.rs @@ -0,0 +1 @@ + diff --git a/src/pipeline/features/locks.rs b/src/pipeline/features/locks.rs index e69de29..8b13789 100644 --- a/src/pipeline/features/locks.rs +++ b/src/pipeline/features/locks.rs @@ -0,0 +1 @@ + diff --git a/src/pipeline/performance/io-threads.rs b/src/pipeline/performance/io-threads.rs index e69de29..8b13789 100644 --- a/src/pipeline/performance/io-threads.rs +++ b/src/pipeline/performance/io-threads.rs @@ -0,0 +1 @@ + diff --git a/src/pipeline/protocols/client.rs b/src/pipeline/protocols/client.rs index fde5cac..5f5c4ac 100644 --- a/src/pipeline/protocols/client.rs +++ b/src/pipeline/protocols/client.rs @@ -11,8 +11,8 @@ use std::thread::JoinHandle; use self::api::service::*; use self::futures::Future; use self::futures_cpupool::CpuPool; -use lib::config::Peer; use super::super::Value; +use lib::config::Peer; pub struct Client { pub peer_name: String, @@ -21,16 +21,21 @@ pub struct Client { // Client sends an RPC request to one or more servers impl Client { - fn new(&self, name: &str, options: &HashMap, subvolumes: Vec) -> Client{ + fn new(&self, name: &str, options: &HashMap, subvolumes: Vec) -> Client { let pool = CpuPool::new_num_cpus(); Client { - peer_name: name.to_string(), + peer_name: name.to_string(), pool: pool, } } // The FOP should be processed before being sent by the client - fn process_fop(&self, layout: Vec<(Peer, PathBuf)>, io_type: &Fop, data: &mut FileOperation) -> Result<(), String> { + fn process_fop( + &self, + layout: Vec<(Peer, PathBuf)>, + io_type: &Fop, + data: &mut FileOperation, + ) -> Result<(), String> { // Client is the end of the pipeline. // send the Fop over to the server(s) let context = zmq::Context::new(); diff --git a/src/pipeline/protocols/server.rs b/src/pipeline/protocols/server.rs index 955d9c7..0ca2f98 100644 --- a/src/pipeline/protocols/server.rs +++ b/src/pipeline/protocols/server.rs @@ -11,7 +11,7 @@ use self::futures::Future; use self::futures_cpupool::CpuPool; use super::super::Value; -pub struct Server{ +pub struct Server { // Worker pool pool: CpuPool, }