Cargo fmt

holochain · Oct 21, 2019 · eae08db · eae08db
1 parent eb018f0
commit eae08db
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/crates/conductor_lib/src/conductor/broadcaster.rs b/crates/conductor_lib/src/conductor/broadcaster.rs
@@ -28,9 +28,7 @@ impl Broadcaster {
         match self {
             Broadcaster::Ws(sender) => sender
                 .send(ws::Message::Text(msg.into().to_string()))
-                .map_err(|e| {
-                    HolochainError::ErrorGeneric(format!("Broadcaster::Ws -- {}", e))
-                })?,
+                .map_err(|e| HolochainError::ErrorGeneric(format!("Broadcaster::Ws -- {}", e)))?,
             Broadcaster::Noop => (),
         }
         Ok(())

diff --git a/crates/conductor_lib/src/config.rs b/crates/conductor_lib/src/config.rs
@@ -884,9 +884,8 @@ pub fn load_configuration<'a, T>(toml: &'a str) -> HcResult<T>
 where
     T: Deserialize<'a>,
 {
-    toml::from_str::<T>(toml).map_err(|e| {
-        HolochainError::IoError(format!("Error loading configuration: {}", e))
-    })
+    toml::from_str::<T>(toml)
+        .map_err(|e| HolochainError::IoError(format!("Error loading configuration: {}", e)))
 }
 
 pub fn serialize_configuration(config: &Configuration) -> HcResult<String> {

diff --git a/crates/net/src/connection/protocol.rs b/crates/net/src/connection/protocol.rs
@@ -94,9 +94,7 @@ impl<'a> From<&'a NamedBinaryData> for Protocol {
                 let sub: NamedBinaryData = rmp_serde::from_slice(&nb.data).unwrap();
                 Protocol::NamedBinary(sub)
             }
-            b"json" => Protocol::Json(JsonString::from_json(
-                &String::from_utf8_lossy(&nb.data),
-            )),
+            b"json" => Protocol::Json(JsonString::from_json(&String::from_utf8_lossy(&nb.data))),
             b"ping" => {
                 let sub: PingData = rmp_serde::from_slice(&nb.data).unwrap();
                 Protocol::Ping(sub)