diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-05-17 01:05:28 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-05-17 01:05:28 +0200 |
| commit | 5fa19db3f3d2e4ce4ba0259dca406a42bce3ff8f (patch) | |
| tree | af0034a7cededca4f6eae68923d5c868382a1b03 /talpid-core/src | |
| parent | 1884ed932e634e749d9b17ccca5e6231351a8b62 (diff) | |
| download | mullvadvpn-5fa19db3f3d2e4ce4ba0259dca406a42bce3ff8f.tar.xz mullvadvpn-5fa19db3f3d2e4ce4ba0259dca406a42bce3ff8f.zip | |
Format with rustfmt 0.7.0
Diffstat (limited to 'talpid-core/src')
| -rw-r--r-- | talpid-core/src/firewall/linux/dns.rs | 3 | ||||
| -rw-r--r-- | talpid-core/src/firewall/macos/mod.rs | 3 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/mod.rs | 9 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/openvpn.rs | 3 |
4 files changed, 12 insertions, 6 deletions
diff --git a/talpid-core/src/firewall/linux/dns.rs b/talpid-core/src/firewall/linux/dns.rs index 1dd582afa1..8507a0decb 100644 --- a/talpid-core/src/firewall/linux/dns.rs +++ b/talpid-core/src/firewall/linux/dns.rs @@ -95,7 +95,8 @@ impl State { fn desired_config(&self) -> Config { let mut config = self.backup.clone(); - config.nameservers = self.desired_dns + config.nameservers = self + .desired_dns .iter() .map(|&address| ScopedIp::from(address)) .collect(); diff --git a/talpid-core/src/firewall/macos/mod.rs b/talpid-core/src/firewall/macos/mod.rs index cb90074938..5cacf9a2dc 100644 --- a/talpid-core/src/firewall/macos/mod.rs +++ b/talpid-core/src/firewall/macos/mod.rs @@ -240,7 +240,8 @@ impl PacketFilter { fn remove_rules(&mut self) -> Result<()> { // remove_anchor() does not deactivate active rules - Ok(self.pf + Ok(self + .pf .flush_rules(ANCHOR_NAME, pfctl::RulesetKind::Filter)?) } diff --git a/talpid-core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs index 640f020fbd..3cc21b47be 100644 --- a/talpid-core/src/tunnel/mod.rs +++ b/talpid-core/src/tunnel/mod.rs @@ -79,14 +79,17 @@ impl TunnelEvent { ) -> Option<TunnelEvent> { match *event { OpenVpnPluginEvent::Up => { - let interface = env.get("dev") + let interface = env + .get("dev") .expect("No \"dev\" in tunnel up event") .to_owned(); - let ip = env.get("ifconfig_local") + let ip = env + .get("ifconfig_local") .expect("No \"ifconfig_local\" in tunnel up event") .parse() .expect("Tunnel IP not in valid format"); - let gateway = env.get("route_vpn_gateway") + let gateway = env + .get("route_vpn_gateway") .expect("No \"route_vpn_gateway\" in tunnel up event") .parse() .expect("Tunnel gateway IP not in valid format"); diff --git a/talpid-core/src/tunnel/openvpn.rs b/talpid-core/src/tunnel/openvpn.rs index 55441da6df..34b6979d77 100644 --- a/talpid-core/src/tunnel/openvpn.rs +++ b/talpid-core/src/tunnel/openvpn.rs @@ -66,7 +66,8 @@ impl<C: OpenVpnBuilder> OpenVpnMonitor<C> { event_server::start(on_event).chain_err(|| ErrorKind::EventDispatcherError)?; cmd.plugin(plugin_path, vec![event_dispatcher.address().to_owned()]); - let child = cmd.start() + let child = cmd + .start() .chain_err(|| ErrorKind::ChildProcessError("Failed to start"))?; Ok(OpenVpnMonitor { |