5 files changed, 14 insertions, 7 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index 9856ee5856..1c7f17c4e0 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -205,7 +205,8 @@ impl Daemon {
                 let https_handle = mullvad_rpc::rest::create_https_client(&ca_path, &handle);
                 let remote = core.remote();
                 (rpc, https_handle, remote)
-            }).chain_err(|| "Unable to initialize network event loop")?;
+            })
+            .chain_err(|| "Unable to initialize network event loop")?;
         let rpc_handle = rpc_handle.chain_err(|| "Unable to create RPC client")?;
         let https_handle = https_handle.chain_err(|| "Unable to create am.i.mullvad client")?;
 
@@ -603,7 +604,8 @@ impl Daemon {
                     self.current_relay = Some(relay);
                     endpoint
                 }),
-        }.map(|endpoint| self.build_tunnel_parameters(account_token, endpoint))
+        }
+        .map(|endpoint| self.build_tunnel_parameters(account_token, endpoint))
         .map(|parameters| TunnelCommand::Connect(parameters))
         .unwrap_or_else(|error| {
             error!("{}", error.display_chain());
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index e8bd24ccc1..60f3b9a878 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -81,7 +81,8 @@ fn run() -> Result<()> {
         config.log_level,
         log_file.as_ref(),
         config.log_stdout_timestamps,
-    ).chain_err(|| ErrorKind::LogError("Unable to initialize logger"))?;
+    )
+    .chain_err(|| ErrorKind::LogError("Unable to initialize logger"))?;
     log_panics::init();
     log_version();
     if let Some(ref log_dir) = log_dir {
@@ -146,7 +147,8 @@ fn create_daemon(config: cli::Config) -> Result<Daemon> {
         resource_dir,
         cache_dir,
         version::CURRENT.to_owned(),
-    ).chain_err(|| "Unable to initialize daemon")
+    )
+    .chain_err(|| "Unable to initialize daemon")
 }
 
 fn log_version() {
diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs
index db5c3fedc1..318d0a6210 100644
--- a/mullvad-daemon/src/management_interface.rs
+++ b/mullvad-daemon/src/management_interface.rs
@@ -469,7 +469,8 @@ impl<T: From<ManagementCommand> + 'static + Send> ManagementInterfaceApi
             .send_command_to_daemon(ManagementCommand::SetTargetState(
                 tx,
                 TargetState::Unsecured,
-            )).then(|_| future::ok(()));
+            ))
+            .then(|_| future::ok(()));
         Box::new(future)
     }
 
diff --git a/mullvad-daemon/src/relays.rs b/mullvad-daemon/src/relays.rs
index b55cfad22b..d325ca7163 100644
--- a/mullvad-daemon/src/relays.rs
+++ b/mullvad-daemon/src/relays.rs
@@ -330,7 +330,8 @@ impl RelaySelector {
                     .find(|relay| {
                         i = i.saturating_sub(relay.weight);
                         i == 0
-                    }).unwrap(),
+                    })
+                    .unwrap(),
             )
         }
     }
diff --git a/mullvad-daemon/src/shutdown.rs b/mullvad-daemon/src/shutdown.rs
index ac41381e1e..41b454bab5 100644
--- a/mullvad-daemon/src/shutdown.rs
+++ b/mullvad-daemon/src/shutdown.rs
@@ -32,7 +32,8 @@ mod platform {
         ctrlc::set_handler(move || {
             debug!("Process received Ctrl-c");
             f();
-        }).chain_err(|| "Unable to attach ctrl-c handler")
+        })
+        .chain_err(|| "Unable to attach ctrl-c handler")
     }
 }