diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2022-09-26 18:12:36 +0200 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2022-09-27 10:19:43 +0200 |
| commit | 6ff370bffbb08e75019cfa862717a7908fa4d4b6 (patch) | |
| tree | bd43940c567e327d95cd8ea1d5e68374f2da491d /talpid-core/src | |
| parent | 693f63ec46a6e372f0ddd6eca65cacea23cb1892 (diff) | |
| download | mullvadvpn-6ff370bffbb08e75019cfa862717a7908fa4d4b6.tar.xz mullvadvpn-6ff370bffbb08e75019cfa862717a7908fa4d4b6.zip | |
Fix clippy complaints
Diffstat (limited to 'talpid-core/src')
| -rw-r--r-- | talpid-core/src/dns/linux/static_resolv_conf.rs | 2 | ||||
| -rw-r--r-- | talpid-core/src/firewall/mod.rs | 2 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/openvpn/mod.rs | 18 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/wireguard/config.rs | 6 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/wireguard/connectivity_check.rs | 3 |
5 files changed, 18 insertions, 13 deletions
diff --git a/talpid-core/src/dns/linux/static_resolv_conf.rs b/talpid-core/src/dns/linux/static_resolv_conf.rs index 613a995db2..c079d2db80 100644 --- a/talpid-core/src/dns/linux/static_resolv_conf.rs +++ b/talpid-core/src/dns/linux/static_resolv_conf.rs @@ -125,7 +125,7 @@ impl DnsWatcher { mask.insert(WatchMask::MOVE_SELF); watcher - .add_watch(&RESOLV_CONF_PATH, mask) + .add_watch(RESOLV_CONF_PATH, mask) .map_err(Error::WatchResolvConf)?; let (cancel_trigger, cancel_listener) = trigger(); diff --git a/talpid-core/src/firewall/mod.rs b/talpid-core/src/firewall/mod.rs index 1f99fc2692..5aea81cc90 100644 --- a/talpid-core/src/firewall/mod.rs +++ b/talpid-core/src/firewall/mod.rs @@ -85,7 +85,7 @@ const ROOT_UID: u32 = 0; /// Returns whether an address belongs to a private subnet. pub fn is_local_address(address: &IpAddr) -> bool { let address = *address; - (&*ALLOWED_LAN_NETS) + (*ALLOWED_LAN_NETS) .iter() .chain(&*LOOPBACK_NETS) .any(|net| net.contains(address)) diff --git a/talpid-core/src/tunnel/openvpn/mod.rs b/talpid-core/src/tunnel/openvpn/mod.rs index 7c0277d3b7..9643c83cc2 100644 --- a/talpid-core/src/tunnel/openvpn/mod.rs +++ b/talpid-core/src/tunnel/openvpn/mod.rs @@ -1287,8 +1287,10 @@ mod tests { #[test] fn exit_successfully() { - let mut builder = TestOpenVpnBuilder::default(); - builder.process_handle = Some(TestProcessHandle(0)); + let builder = TestOpenVpnBuilder { + process_handle: Some(TestProcessHandle(0)), + ..Default::default() + }; let runtime = new_runtime().unwrap(); let openvpn_init_args = create_init_args(); let testee = runtime @@ -1305,8 +1307,10 @@ mod tests { #[test] fn exit_error() { - let mut builder = TestOpenVpnBuilder::default(); - builder.process_handle = Some(TestProcessHandle(1)); + let builder = TestOpenVpnBuilder { + process_handle: Some(TestProcessHandle(1)), + ..Default::default() + }; let runtime = new_runtime().unwrap(); let openvpn_init_args = create_init_args(); let testee = runtime @@ -1323,8 +1327,10 @@ mod tests { #[test] fn wait_closed() { - let mut builder = TestOpenVpnBuilder::default(); - builder.process_handle = Some(TestProcessHandle(1)); + let builder = TestOpenVpnBuilder { + process_handle: Some(TestProcessHandle(1)), + ..Default::default() + }; let runtime = new_runtime().unwrap(); let openvpn_init_args = create_init_args(); let testee = runtime diff --git a/talpid-core/src/tunnel/wireguard/config.rs b/talpid-core/src/tunnel/wireguard/config.rs index ed285742c4..89cab4865a 100644 --- a/talpid-core/src/tunnel/wireguard/config.rs +++ b/talpid-core/src/tunnel/wireguard/config.rs @@ -101,11 +101,9 @@ impl Config { if tunnel.addresses.is_empty() { return Err(Error::InvalidTunnelIpError); } - tunnel.addresses = tunnel + tunnel .addresses - .into_iter() - .filter(|ip| ip.is_ipv4() || generic_options.enable_ipv6) - .collect(); + .retain(|ip| ip.is_ipv4() || generic_options.enable_ipv6); let ipv6_gateway = if generic_options.enable_ipv6 { connection_config.ipv6_gateway diff --git a/talpid-core/src/tunnel/wireguard/connectivity_check.rs b/talpid-core/src/tunnel/wireguard/connectivity_check.rs index c48f816f2e..cce8b53ec4 100644 --- a/talpid-core/src/tunnel/wireguard/connectivity_check.rs +++ b/talpid-core/src/tunnel/wireguard/connectivity_check.rs @@ -574,6 +574,7 @@ mod test { } } + #[allow(clippy::type_complexity)] fn into_locked( self, ) -> ( @@ -711,7 +712,7 @@ mod test { }); std::thread::sleep(Duration::from_secs(1)); - assert_eq!(true, result_rx.try_recv().unwrap().unwrap()); + assert!(result_rx.try_recv().unwrap().unwrap()); stop_tx.send(()).unwrap(); std::thread::sleep(Duration::from_secs(1)); assert!(result_rx.try_recv().unwrap().is_ok()); |
