summaryrefslogtreecommitdiffhomepage
path: root/mullvad-daemon/src/lib.rs
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-09-27 15:36:13 +0200
committerLinus Färnstrand <linus@mullvad.net>2018-09-27 15:36:13 +0200
commite830dad2b1e00a2ef46382dfe71c80b0406686e8 (patch)
treeeb7db04951974780a61c0c4ad948c5e1c3b360fa /mullvad-daemon/src/lib.rs
parent00b0ba04092e97f3724260b943f3b138e8eb7b01 (diff)
parent763d5e200947d616865ec3292c27347739d2d386 (diff)
downloadmullvadvpn-e830dad2b1e00a2ef46382dfe71c80b0406686e8.tar.xz
mullvadvpn-e830dad2b1e00a2ef46382dfe71c80b0406686e8.zip
Merge branch 'update-rustfmt'
Diffstat (limited to 'mullvad-daemon/src/lib.rs')
-rw-r--r--mullvad-daemon/src/lib.rs6
1 files changed, 4 insertions, 2 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());