diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-12-15 14:21:38 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-12-18 09:21:05 +0100 |
| commit | e6fbde01fcdfc6181015f71ce753a038a48509df (patch) | |
| tree | 98997c8bd1e3e36b477df0ff8aa5112153e26eca | |
| parent | 85a3555d71d95d85b6950d5c77568fa601609729 (diff) | |
| download | mullvadvpn-e6fbde01fcdfc6181015f71ce753a038a48509df.tar.xz mullvadvpn-e6fbde01fcdfc6181015f71ce753a038a48509df.zip | |
Reformat with new rustfmt
| -rw-r--r-- | mullvad-daemon/src/relays.rs | 3 | ||||
| -rw-r--r-- | mullvad-daemon/src/settings.rs | 3 | ||||
| -rw-r--r-- | talpid-core/src/firewall/mod.rs | 1 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/openvpn.rs | 1 | ||||
| -rw-r--r-- | talpid-ipc/src/lib.rs | 8 |
5 files changed, 5 insertions, 11 deletions
diff --git a/mullvad-daemon/src/relays.rs b/mullvad-daemon/src/relays.rs index db443f2ea6..299a0f940b 100644 --- a/mullvad-daemon/src/relays.rs +++ b/mullvad-daemon/src/relays.rs @@ -136,8 +136,7 @@ impl RelaySelector { .and_then(|selected_relay| { info!( "Selected relay {} at {}", - selected_relay.hostname, - selected_relay.ipv4_addr_in + selected_relay.hostname, selected_relay.ipv4_addr_in ); self.get_random_tunnel(&selected_relay.tunnels) .map(|tunnel_parameters| { diff --git a/mullvad-daemon/src/settings.rs b/mullvad-daemon/src/settings.rs index 3bb120c544..9d2c77f991 100644 --- a/mullvad-daemon/src/settings.rs +++ b/mullvad-daemon/src/settings.rs @@ -126,8 +126,7 @@ impl Settings { if self.relay_settings != new_settings { debug!( "changing relay settings from {:?} to {:?}", - self.relay_settings, - new_settings + self.relay_settings, new_settings ); self.relay_settings = new_settings; diff --git a/talpid-core/src/firewall/mod.rs b/talpid-core/src/firewall/mod.rs index 17ba65b88d..c3115339f1 100644 --- a/talpid-core/src/firewall/mod.rs +++ b/talpid-core/src/firewall/mod.rs @@ -19,7 +19,6 @@ pub mod windows; use self::windows as imp; - error_chain!{ errors { /// Initialization error diff --git a/talpid-core/src/tunnel/openvpn.rs b/talpid-core/src/tunnel/openvpn.rs index f2cc1da7da..f52240a3af 100644 --- a/talpid-core/src/tunnel/openvpn.rs +++ b/talpid-core/src/tunnel/openvpn.rs @@ -223,7 +223,6 @@ impl ProcessHandle for duct::Handle { } - mod event_server { use super::OpenVpnPluginEvent; use jsonrpc_core::{Error, IoHandler}; diff --git a/talpid-ipc/src/lib.rs b/talpid-ipc/src/lib.rs index 668c54aef3..e47de09cba 100644 --- a/talpid-ipc/src/lib.rs +++ b/talpid-ipc/src/lib.rs @@ -61,11 +61,9 @@ impl IpcServer { ServerBuilder::new(handler) .session_meta_extractor(meta_extractor) .start(&listen_addr) - .map(|server| { - IpcServer { - address: format!("ws://{}", server.addr()), - server: server, - } + .map(|server| IpcServer { + address: format!("ws://{}", server.addr()), + server: server, }) .chain_err(|| ErrorKind::IpcServerError) } |