summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2025-03-18 10:21:07 +0100
committerLinus Färnstrand <linus@mullvad.net>2025-03-18 14:30:05 +0100
commit9c001488fea5b1595d64dcf9c26bd65b866ea6d9 (patch)
treed054943a0284f2523c7ade307ef92f33aa0f5f3b
parent31308e7e05ea498124ec9c32c5430c44092b94c3 (diff)
downloadmullvadvpn-9c001488fea5b1595d64dcf9c26bd65b866ea6d9.tar.xz
mullvadvpn-9c001488fea5b1595d64dcf9c26bd65b866ea6d9.zip
Replace to_owned with clone where that's implicitly what was going on
-rw-r--r--mullvad-cli/src/cmds/proxies.rs4
-rw-r--r--mullvad-daemon/src/lib.rs2
-rw-r--r--mullvad-relay-selector/src/relay_selector/parsed_relays.rs5
-rw-r--r--mullvad-version/build.rs2
-rw-r--r--talpid-core/src/split_tunnel/macos/default.rs4
-rw-r--r--talpid-core/src/split_tunnel/macos/process.rs4
-rw-r--r--talpid-openvpn/src/wintun.rs2
-rw-r--r--test/test-manager/src/tests/helpers.rs2
-rw-r--r--test/test-manager/src/vm/network/macos.rs2
9 files changed, 12 insertions, 15 deletions
diff --git a/mullvad-cli/src/cmds/proxies.rs b/mullvad-cli/src/cmds/proxies.rs
index 37512f3a35..ce8145b9d0 100644
--- a/mullvad-cli/src/cmds/proxies.rs
+++ b/mullvad-cli/src/cmds/proxies.rs
@@ -168,8 +168,8 @@ impl ProxyEditParams {
pub fn merge_shadowsocks(self, shadowsocks: &Shadowsocks) -> Shadowsocks {
let ip = self.ip.unwrap_or(shadowsocks.endpoint.ip());
let port = self.port.unwrap_or(shadowsocks.endpoint.port());
- let password = self.password.unwrap_or(shadowsocks.password.to_owned());
- let cipher = self.cipher.unwrap_or(shadowsocks.cipher.to_owned());
+ let password = self.password.unwrap_or(shadowsocks.password.clone());
+ let cipher = self.cipher.unwrap_or(shadowsocks.cipher.clone());
Shadowsocks::new((ip, port), cipher, password)
}
}
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index 068e1fbdae..68e2e57285 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -809,7 +809,7 @@ impl Daemon {
}
});
settings.register_change_listener(move |settings| {
- let _ = param_gen_tx.unbounded_send(settings.tunnel_options.to_owned());
+ let _ = param_gen_tx.unbounded_send(settings.tunnel_options.clone());
});
// Register a listener for generic settings changes.
diff --git a/mullvad-relay-selector/src/relay_selector/parsed_relays.rs b/mullvad-relay-selector/src/relay_selector/parsed_relays.rs
index 3a1663d9dd..7695686761 100644
--- a/mullvad-relay-selector/src/relay_selector/parsed_relays.rs
+++ b/mullvad-relay-selector/src/relay_selector/parsed_relays.rs
@@ -150,10 +150,7 @@ impl ParsedRelays {
fn parse_relay_list(relay_list: &RelayList, overrides: &[RelayOverride]) -> RelayList {
let mut remaining_overrides = HashMap::new();
for relay_override in overrides {
- remaining_overrides.insert(
- relay_override.hostname.to_owned(),
- relay_override.to_owned(),
- );
+ remaining_overrides.insert(relay_override.hostname.clone(), relay_override.to_owned());
}
let mut parsed_list = relay_list.clone();
diff --git a/mullvad-version/build.rs b/mullvad-version/build.rs
index 72ebf588a0..b2cd98db77 100644
--- a/mullvad-version/build.rs
+++ b/mullvad-version/build.rs
@@ -62,7 +62,7 @@ fn get_product_version(target: Target) -> String {
// Compute the expected tag name for the release named `product_version`
let release_tag = match target {
Target::Android => format!("android/{release_version}"),
- Target::Desktop => release_version.to_owned(),
+ Target::Desktop => release_version.clone(),
};
format!("{release_version}{}", get_suffix(&release_tag))
diff --git a/talpid-core/src/split_tunnel/macos/default.rs b/talpid-core/src/split_tunnel/macos/default.rs
index ce5415e769..c4b9c39d88 100644
--- a/talpid-core/src/split_tunnel/macos/default.rs
+++ b/talpid-core/src/split_tunnel/macos/default.rs
@@ -57,9 +57,9 @@ pub async fn get_default_interface(
if v4_default.interface != v6_default.interface {
return Err(Error::DefaultInterfaceMismatch);
}
- v4_default.interface.to_owned()
+ v4_default.interface.clone()
}
- (Some(default), None) | (None, Some(default)) => default.interface.to_owned(),
+ (Some(default), None) | (None, Some(default)) => default.interface.clone(),
(None, None) => return Err(Error::NoDefaultInterface),
};
diff --git a/talpid-core/src/split_tunnel/macos/process.rs b/talpid-core/src/split_tunnel/macos/process.rs
index 7b3d644cd5..2da65a6b8f 100644
--- a/talpid-core/src/split_tunnel/macos/process.rs
+++ b/talpid-core/src/split_tunnel/macos/process.rs
@@ -332,7 +332,7 @@ impl ProcessStates {
// Check if own path is excluded
if paths.contains(&info.exec_path) && !new_exclude_paths.contains(&info.exec_path) {
- new_exclude_paths.insert(info.exec_path.to_owned());
+ new_exclude_paths.insert(info.exec_path.clone());
}
info.excluded_by_paths = new_exclude_paths;
@@ -413,7 +413,7 @@ impl InnerProcessStates {
// Exclude if path is excluded
if self.exclude_paths.contains(&info.exec_path) {
- info.excluded_by_paths.insert(info.exec_path.to_owned());
+ info.excluded_by_paths.insert(info.exec_path.clone());
log::trace!("Excluding {pid} by path: {}", info.exec_path.display());
}
}
diff --git a/talpid-openvpn/src/wintun.rs b/talpid-openvpn/src/wintun.rs
index ef5ebd5482..f8592ef94c 100644
--- a/talpid-openvpn/src/wintun.rs
+++ b/talpid-openvpn/src/wintun.rs
@@ -108,7 +108,7 @@ impl WintunAdapter {
}
pub fn name(&self) -> U16CString {
- self.name.to_owned()
+ self.name.clone()
}
pub fn luid(&self) -> NET_LUID_LH {
diff --git a/test/test-manager/src/tests/helpers.rs b/test/test-manager/src/tests/helpers.rs
index dcfbc8d0ff..1ad7c9931a 100644
--- a/test/test-manager/src/tests/helpers.rs
+++ b/test/test-manager/src/tests/helpers.rs
@@ -568,7 +568,7 @@ pub async fn geoip_lookup_with_retries(rpc: &ServiceClient) -> Result<AmIMullvad
loop {
let result = rpc
- .geoip_lookup(TEST_CONFIG.mullvad_host.to_owned())
+ .geoip_lookup(TEST_CONFIG.mullvad_host.clone())
.await
.map_err(Error::GeoipLookup);
diff --git a/test/test-manager/src/vm/network/macos.rs b/test/test-manager/src/vm/network/macos.rs
index fab648c338..792f7d9a77 100644
--- a/test/test-manager/src/vm/network/macos.rs
+++ b/test/test-manager/src/vm/network/macos.rs
@@ -67,7 +67,7 @@ pub(crate) fn find_vm_bridge(guest_ip: &Ipv4Addr) -> Result<(String, Ipv4Addr)>
ipnetwork::Ipv4Network::with_netmask(address, netmask)
.ok()
.filter(|ip_v4_network| ip_v4_network.contains(*guest_ip))
- .map(|_| (interface_name.to_owned(), address))
+ .map(|_| (interface_name.clone(), address))
})
.ok_or_else(|| anyhow!("Failed to identify bridge used by tart -- not running?"))
}