Fix clippy complaints

19 files changed, 43 insertions, 38 deletions

diff --git a/android/translations-converter/src/main.rs b/android/translations-converter/src/main.rs
index fdd384200d..584d6c1a92 100644
--- a/android/translations-converter/src/main.rs
+++ b/android/translations-converter/src/main.rs
@@ -76,7 +76,7 @@ fn main() {
         .collect();
 
     let locale_dir = Path::new("../../gui/locales");
-    let locale_files = fs::read_dir(&locale_dir)
+    let locale_files = fs::read_dir(locale_dir)
         .expect("Failed to open root locale directory")
         .filter_map(|dir_entry_result| dir_entry_result.ok().map(|dir_entry| dir_entry.path()))
         .filter(|dir_entry_path| dir_entry_path.is_dir())
diff --git a/mullvad-cli/src/cmds/auto_connect.rs b/mullvad-cli/src/cmds/auto_connect.rs
index 244968dcd7..067dff9a6b 100644
--- a/mullvad-cli/src/cmds/auto_connect.rs
+++ b/mullvad-cli/src/cmds/auto_connect.rs
@@ -18,7 +18,7 @@ impl Command for AutoConnect {
                     .arg(
                         clap::Arg::new("policy")
                             .required(true)
-                            .possible_values(&["on", "off"]),
+                            .possible_values(["on", "off"]),
                     ),
             )
             .subcommand(clap::App::new("get").about("Display the current auto-connect setting"))
diff --git a/mullvad-cli/src/cmds/beta_program.rs b/mullvad-cli/src/cmds/beta_program.rs
index 871b28324e..8f659ec9b9 100644
--- a/mullvad-cli/src/cmds/beta_program.rs
+++ b/mullvad-cli/src/cmds/beta_program.rs
@@ -18,7 +18,7 @@ impl Command for BetaProgram {
                     .arg(
                         clap::Arg::new("policy")
                             .required(true)
-                            .possible_values(&["on", "off"]),
+                            .possible_values(["on", "off"]),
                     ),
             )
             .subcommand(clap::App::new("get").about("Get beta notifications setting"))
diff --git a/mullvad-cli/src/cmds/block_when_disconnected.rs b/mullvad-cli/src/cmds/block_when_disconnected.rs
index 3f7ebeef22..e2d032530a 100644
--- a/mullvad-cli/src/cmds/block_when_disconnected.rs
+++ b/mullvad-cli/src/cmds/block_when_disconnected.rs
@@ -18,7 +18,7 @@ impl Command for BlockWhenDisconnected {
                     .arg(
                         clap::Arg::new("policy")
                             .required(true)
-                            .possible_values(&["on", "off"]),
+                            .possible_values(["on", "off"]),
                     ),
             )
             .subcommand(
diff --git a/mullvad-cli/src/cmds/bridge.rs b/mullvad-cli/src/cmds/bridge.rs
index 6e09b75084..a8a3e2de7c 100644
--- a/mullvad-cli/src/cmds/bridge.rs
+++ b/mullvad-cli/src/cmds/bridge.rs
@@ -68,7 +68,7 @@ fn create_bridge_set_subcommand() -> clap::App<'static> {
                 .arg(
                     clap::Arg::new("ownership")
                         .help("Ownership preference, or 'any' for no preference.")
-                        .possible_values(&["any", "owned", "rented"])
+                        .possible_values(["any", "owned", "rented"])
                         .required(true),
                 ),
         )
@@ -186,7 +186,7 @@ fn create_set_state_subcommand() -> clap::App<'static> {
             .help("Specifies whether a bridge should be used")
             .required(true)
             .index(1)
-            .possible_values(&["auto", "on", "off"]),
+            .possible_values(["auto", "on", "off"]),
     )
 }
 
diff --git a/mullvad-cli/src/cmds/lan.rs b/mullvad-cli/src/cmds/lan.rs
index bd43f88a6b..d1c3635c43 100644
--- a/mullvad-cli/src/cmds/lan.rs
+++ b/mullvad-cli/src/cmds/lan.rs
@@ -16,7 +16,7 @@ impl Command for Lan {
                 clap::App::new("set").about("Change allow LAN setting").arg(
                     clap::Arg::new("policy")
                         .required(true)
-                        .possible_values(&["allow", "block"]),
+                        .possible_values(["allow", "block"]),
                 ),
             )
             .subcommand(
diff --git a/mullvad-cli/src/cmds/obfuscation.rs b/mullvad-cli/src/cmds/obfuscation.rs
index 3f015c896e..5a8b908340 100644
--- a/mullvad-cli/src/cmds/obfuscation.rs
+++ b/mullvad-cli/src/cmds/obfuscation.rs
@@ -116,7 +116,7 @@ fn create_obfuscation_set_subcommand() -> clap::App<'static> {
                     )
                     .required(true)
                     .index(1)
-                    .possible_values(&["auto", "off", "udp2tcp"]),
+                    .possible_values(["auto", "off", "udp2tcp"]),
             ),
         )
         .subcommand(
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index e48c4681f9..5d8583098f 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -93,7 +93,7 @@ impl Command for Relay {
                                         .help("Transport protocol")
                                         .long("protocol")
                                         .default_value("udp")
-                                        .possible_values(&["udp", "tcp"]),
+                                        .possible_values(["udp", "tcp"]),
                                 )
                             )
                     )
@@ -130,7 +130,7 @@ impl Command for Relay {
                             .arg(
                                 clap::Arg::new("ownership")
                                 .help("Ownership preference, or 'any' for no preference.")
-                                .possible_values(&["any", "owned", "rented"])
+                                .possible_values(["any", "owned", "rented"])
                                 .required(true)
                             )
                     )
@@ -152,7 +152,7 @@ impl Command for Relay {
                                         clap::Arg::new("transport protocol")
                                             .help("Transport protocol")
                                             .long("protocol")
-                                            .possible_values(&["any", "udp", "tcp"])
+                                            .possible_values(["any", "udp", "tcp"])
                                             .takes_value(true),
                                     )
                             )
@@ -169,7 +169,7 @@ impl Command for Relay {
                                     .arg(
                                         clap::Arg::new("ip version")
                                             .long("ipv")
-                                            .possible_values(&["any", "4", "6"])
+                                            .possible_values(["any", "4", "6"])
                                             .takes_value(true),
                                     )
                                     .arg(
@@ -189,7 +189,7 @@ impl Command for Relay {
                                     clap::Arg::new("tunnel protocol")
                                     .required(true)
                                     .index(1)
-                                    .possible_values(&["any", "wireguard", "openvpn", ]),
+                                    .possible_values(["any", "wireguard", "openvpn", ]),
                                     )
                                 ),
             )
diff --git a/mullvad-cli/src/cmds/tunnel.rs b/mullvad-cli/src/cmds/tunnel.rs
index 8d2c5e596e..8e6a03d3d7 100644
--- a/mullvad-cli/src/cmds/tunnel.rs
+++ b/mullvad-cli/src/cmds/tunnel.rs
@@ -125,7 +125,7 @@ fn create_ipv6_subcommand() -> clap::App<'static> {
                 clap::Arg::new("policy")
                     .required(true)
                     .takes_value(true)
-                    .possible_values(&["on", "off"]),
+                    .possible_values(["on", "off"]),
             ),
         )
 }
diff --git a/mullvad-daemon/build.rs b/mullvad-daemon/build.rs
index 5e09506171..a0d50577e7 100644
--- a/mullvad-daemon/build.rs
+++ b/mullvad-daemon/build.rs
@@ -36,7 +36,7 @@ fn main() {
 
 fn commit_date() -> String {
     let output = Command::new("git")
-        .args(&["log", "-1", "--date=short", "--pretty=format:%cd"])
+        .args(["log", "-1", "--date=short", "--pretty=format:%cd"])
         .output()
         .expect("Unable to get git commit date");
     std::str::from_utf8(&output.stdout)
diff --git a/mullvad-daemon/src/cli.rs b/mullvad-daemon/src/cli.rs
index 9a6e8eec50..22adf4427c 100644
--- a/mullvad-daemon/src/cli.rs
+++ b/mullvad-daemon/src/cli.rs
@@ -17,7 +17,7 @@ pub fn get_config() -> &'static Config {
     lazy_static::lazy_static! {
         static ref CONFIG: Config = create_config();
     }
-    &*CONFIG
+    &CONFIG
 }
 
 pub fn create_config() -> Config {
diff --git a/mullvad-daemon/src/version_check.rs b/mullvad-daemon/src/version_check.rs
index aec9ef9073..4afa7ab44b 100644
--- a/mullvad-daemon/src/version_check.rs
+++ b/mullvad-daemon/src/version_check.rs
@@ -275,7 +275,7 @@ impl VersionUpdater {
         response: mullvad_api::AppVersionResponse,
     ) -> AppVersionInfo {
         let suggested_upgrade = Self::suggested_upgrade(
-            &*APP_VERSION,
+            &APP_VERSION,
             &response.latest_stable,
             &response.latest_beta,
             self.show_beta_releases || is_beta_version(),
@@ -373,7 +373,7 @@ impl VersionUpdater {
                                 .clone()
                             {
                                 let suggested_upgrade = Self::suggested_upgrade(
-                                    &*APP_VERSION,
+                                    &APP_VERSION,
                                     &Some(last_app_version_info.latest_stable.clone()),
                                     &last_app_version_info.latest_beta,
                                     self.show_beta_releases || is_beta_version(),
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());
diff --git a/talpid-dbus/src/network_manager.rs b/talpid-dbus/src/network_manager.rs
index 5d89a69035..a04870d615 100644
--- a/talpid-dbus/src/network_manager.rs
+++ b/talpid-dbus/src/network_manager.rs
@@ -144,7 +144,7 @@ impl NetworkManager {
 
     pub fn get_interface_name(&self, tunnel: &WireguardTunnel) -> Result<String> {
         tunnel
-            .device_proxy(&*self.connection)
+            .device_proxy(&self.connection)
             .get(NM_DEVICE, "Interface")
             .map_err(Error::Dbus)
     }
@@ -334,7 +334,7 @@ impl NetworkManager {
             .map_err(Error::Dbus);
 
         let config_result: Result<()> = tunnel
-            .config_proxy(&*self.connection)
+            .config_proxy(&self.connection)
             .method_call(NM_SETTINGS_CONNECTION_INTERFACE, "Delete", ())
             .map_err(Error::Dbus);
         deactivation_result?;
@@ -430,11 +430,11 @@ impl NetworkManager {
         Ok(())
     }
 
-    fn as_manager<'a>(&'a self) -> Proxy<'a, &SyncConnection> {
+    fn as_manager(&'_ self) -> Proxy<'_, &SyncConnection> {
         Proxy::new(NM_BUS, NM_MANAGER_PATH, RPC_TIMEOUT, &*self.connection)
     }
 
-    fn as_dns_manager<'a>(&'a self) -> Proxy<'a, &SyncConnection> {
+    fn as_dns_manager(&'_ self) -> Proxy<'_, &SyncConnection> {
         Proxy::new(NM_BUS, NM_DNS_MANAGER_PATH, RPC_TIMEOUT, &*self.connection)
     }
 
diff --git a/talpid-types/src/net/wireguard.rs b/talpid-types/src/net/wireguard.rs
index 6a8bbfd521..8306c773a1 100644
--- a/talpid-types/src/net/wireguard.rs
+++ b/talpid-types/src/net/wireguard.rs
@@ -118,7 +118,7 @@ impl PrivateKey {
     }
 
     pub fn new_from_random() -> Self {
-        PrivateKey(x25519_dalek::StaticSecret::new(&mut OsRng))
+        PrivateKey(x25519_dalek::StaticSecret::new(OsRng))
     }
 
     /// Generate public key from private key
@@ -153,7 +153,7 @@ impl fmt::Debug for PrivateKey {
 
 impl fmt::Display for PrivateKey {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", &base64::encode(&(self.0).to_bytes()))
+        write!(f, "{}", &base64::encode((self.0).to_bytes()))
     }
 }
 
@@ -298,7 +298,7 @@ fn serialize_key<S>(key: &[u8; 32], serializer: S) -> Result<S::Ok, S::Error>
 where
     S: Serializer,
 {
-    serializer.serialize_str(&base64::encode(&key))
+    serializer.serialize_str(&base64::encode(key))
 }
 
 fn deserialize_key<'de, D, K>(deserializer: D) -> Result<K, D::Error>