diff options
| author | Emīls <emils@mullvad.net> | 2022-12-21 13:05:51 +0100 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2022-12-21 13:05:51 +0100 |
| commit | 5d727aede31dd89eb3801bc2abb3b786e5b22b23 (patch) | |
| tree | ca2d4a07fbea192131e9abc4ba7488b6f76415f2 | |
| parent | 35a5aaa69c1d8514e3eea4dfdb1bcb28d013459b (diff) | |
| download | mullvadvpn-5d727aede31dd89eb3801bc2abb3b786e5b22b23.tar.xz mullvadvpn-5d727aede31dd89eb3801bc2abb3b786e5b22b23.zip | |
Apply more clippy fixes.
4 files changed, 5 insertions, 7 deletions
diff --git a/android/translations-converter/src/gettext/parser.rs b/android/translations-converter/src/gettext/parser.rs index 749922a7aa..b95f99fb64 100644 --- a/android/translations-converter/src/gettext/parser.rs +++ b/android/translations-converter/src/gettext/parser.rs @@ -523,9 +523,7 @@ fn collect_variants( } } - Ok(variant_map - .into_iter() - .map(|(_, variant)| variant) + Ok(variant_map.into_values() .collect()) } diff --git a/android/translations-converter/src/main.rs b/android/translations-converter/src/main.rs index 584d6c1a92..f955e99389 100644 --- a/android/translations-converter/src/main.rs +++ b/android/translations-converter/src/main.rs @@ -91,7 +91,7 @@ fn main() { .unwrap() .to_str() .unwrap(); - let destination_dir = resources_dir.join(&android_locale_directory(locale)); + let destination_dir = resources_dir.join(android_locale_directory(locale)); if !destination_dir.exists() { fs::create_dir(&destination_dir).expect("Failed to create Android locale directory"); diff --git a/talpid-core/src/dns/linux/static_resolv_conf.rs b/talpid-core/src/dns/linux/static_resolv_conf.rs index c079d2db80..b00886b193 100644 --- a/talpid-core/src/dns/linux/static_resolv_conf.rs +++ b/talpid-core/src/dns/linux/static_resolv_conf.rs @@ -200,7 +200,7 @@ fn read_config() -> Result<Config> { let contents = fs::read_to_string(RESOLV_CONF_PATH) .map_err(|e| Error::ReadResolvConf(RESOLV_CONF_PATH, e))?; - let config = Config::parse(&contents).map_err(|e| Error::Parse(RESOLV_CONF_PATH, e))?; + let config = Config::parse(contents).map_err(|e| Error::Parse(RESOLV_CONF_PATH, e))?; Ok(config) } @@ -220,7 +220,7 @@ fn restore_from_backup() -> Result<()> { Ok(backup) => { log::info!("Restoring DNS state from backup"); let config = - Config::parse(&backup).map_err(|e| Error::Parse(RESOLV_CONF_BACKUP_PATH, e))?; + Config::parse(backup).map_err(|e| Error::Parse(RESOLV_CONF_BACKUP_PATH, e))?; write_config(&config)?; diff --git a/talpid-wireguard/src/wireguard_kernel/nm_tunnel.rs b/talpid-wireguard/src/wireguard_kernel/nm_tunnel.rs index 7428952585..3f2661a4dc 100644 --- a/talpid-wireguard/src/wireguard_kernel/nm_tunnel.rs +++ b/talpid-wireguard/src/wireguard_kernel/nm_tunnel.rs @@ -121,7 +121,7 @@ fn convert_config_to_dbus(config: &Config) -> DeviceConfig { wireguard_config.insert("mtu".into(), Variant(Box::new(config.mtu as u32))); if let Some(fwmark) = config.fwmark { - wireguard_config.insert("fwmark".into(), Variant(Box::new(fwmark as u32))); + wireguard_config.insert("fwmark".into(), Variant(Box::new(fwmark))); } wireguard_config.insert("peer-routes".into(), Variant(Box::new(false))); wireguard_config.insert( |