diff options
Diffstat (limited to 'talpid-dbus/src')
| -rw-r--r-- | talpid-dbus/src/network_manager.rs | 9 | ||||
| -rw-r--r-- | talpid-dbus/src/systemd_resolved.rs | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/talpid-dbus/src/network_manager.rs b/talpid-dbus/src/network_manager.rs index 87566891d1..5d89a69035 100644 --- a/talpid-dbus/src/network_manager.rs +++ b/talpid-dbus/src/network_manager.rs @@ -59,6 +59,7 @@ const MAXIMUM_SUPPORTED_MINOR_VERSION: u32 = 26; const NM_DEVICE_STATE_CHANGED: &str = "StateChanged"; pub type Result<T> = std::result::Result<T, Error>; +type NetworkSettings<'a> = HashMap<String, HashMap<String, Variant<Box<dyn RefArg + 'a>>>>; #[derive(err_derive::Error, Debug)] pub enum Error { @@ -447,10 +448,8 @@ impl NetworkManager { let device = self.as_path(&device_path); // Get the last applied connection - let (mut settings, version_id): ( - HashMap<String, HashMap<String, Variant<Box<dyn RefArg>>>>, - u64, - ) = device.method_call(NM_DEVICE, "GetAppliedConnection", (0u32,))?; + let (mut settings, version_id): (NetworkSettings, u64) = + device.method_call(NM_DEVICE, "GetAppliedConnection", (0u32,))?; // Keep changed routes. // These routes were modified outside NM, likely by RouteManager. @@ -576,7 +575,7 @@ impl NetworkManager { } fn update_dns_config<'a, T>( - settings: &mut HashMap<String, HashMap<String, Variant<Box<dyn RefArg + 'a>>>>, + settings: &mut NetworkSettings<'a>, ip_protocol: &'static str, servers: T, ) where diff --git a/talpid-dbus/src/systemd_resolved.rs b/talpid-dbus/src/systemd_resolved.rs index d664872557..6ba8603508 100644 --- a/talpid-dbus/src/systemd_resolved.rs +++ b/talpid-dbus/src/systemd_resolved.rs @@ -349,7 +349,7 @@ impl SystemdResolved { .map_err(Error::DBusRpcError) } - fn link_disable_dns_over_tls<'a, 'b: 'a>(&'a self, interface_index: u32) -> Result<()> { + fn link_disable_dns_over_tls(&self, interface_index: u32) -> Result<()> { let link_object_path = self .fetch_link(interface_index) .map_err(|e| Error::GetLinkError(Box::new(e)))?; |