Fix Rust nightly errors

4 files changed, 5 insertions, 30 deletions

diff --git a/mullvad-rpc/src/https_client_with_sni.rs b/mullvad-rpc/src/https_client_with_sni.rs
index 7259617b72..fc1cac4f55 100644
--- a/mullvad-rpc/src/https_client_with_sni.rs
+++ b/mullvad-rpc/src/https_client_with_sni.rs
@@ -225,7 +225,7 @@ impl Service<Uri> for HttpsConnectorWithSni {
 
 
             let (tcp_stream, socket_handle) =
-                TcpStream::new(tokio_connection, socket_id, Some(socket_shutdown_tx));
+                TcpStream::new(tokio_connection, Some(socket_shutdown_tx));
             if let Some(mut service_tx) = service_tx {
                 if service_tx
                     .send(RequestCommand::SocketOpened(socket_id, socket_handle))
diff --git a/mullvad-rpc/src/tcp_stream.rs b/mullvad-rpc/src/tcp_stream.rs
index 4930777541..2cbce65a2d 100644
--- a/mullvad-rpc/src/tcp_stream.rs
+++ b/mullvad-rpc/src/tcp_stream.rs
@@ -45,11 +45,9 @@ pub struct TcpStream {
 impl TcpStream {
     pub fn new(
         stream: TokioTcpStream,
-        id: usize,
         shutdown_tx: Option<oneshot::Sender<()>>,
     ) -> (Self, TcpStreamHandle) {
         let inner = Arc::new(Mutex::new(Some(StreamInner {
-            id,
             stream,
             shutdown_tx,
         })));
@@ -138,7 +136,6 @@ impl Connection for TcpStream {
 
 #[derive(Debug)]
 struct StreamInner {
-    id: usize,
     stream: TokioTcpStream,
     shutdown_tx: Option<oneshot::Sender<()>>,
 }
diff --git a/talpid-core/src/tunnel/wireguard/wireguard_kernel/mod.rs b/talpid-core/src/tunnel/wireguard/wireguard_kernel/mod.rs
index 04f34011ff..5e22adb2df 100644
--- a/talpid-core/src/tunnel/wireguard/wireguard_kernel/mod.rs
+++ b/talpid-core/src/tunnel/wireguard/wireguard_kernel/mod.rs
@@ -93,7 +93,6 @@ pub struct Handle {
     route_handle: rtnetlink::Handle,
     wg_abort_handle: AbortHandle,
     route_abort_handle: AbortHandle,
-    message_type: u16,
 }
 
 
@@ -117,7 +116,6 @@ impl Handle {
         Ok(Self {
             wg_handle,
             route_handle,
-            message_type,
             wg_abort_handle,
             route_abort_handle,
         })
diff --git a/talpid-dbus/src/network_manager.rs b/talpid-dbus/src/network_manager.rs
index 160b2f3e5f..0edf764e26 100644
--- a/talpid-dbus/src/network_manager.rs
+++ b/talpid-dbus/src/network_manager.rs
@@ -27,7 +27,6 @@ const CONNECTIVITY_CHECK_KEY: &str = "ConnectivityCheckEnabled";
 const NM_DNS_MANAGER: &str = "org.freedesktop.NetworkManager.DnsManager";
 const NM_DNS_MANAGER_PATH: &str = "/org/freedesktop/NetworkManager/DnsManager";
 const NM_DEVICE: &str = "org.freedesktop.NetworkManager.Device";
-const NM_DEVICE_STATISTICS: &str = "org.freedesktop.NetworkManager.Device.Statistics";
 
 const NM_IP4_CONFIG: &str = "org.freedesktop.NetworkManager.IP4Config";
 const NM_IP6_CONFIG: &str = "org.freedesktop.NetworkManager.IP6Config";
@@ -276,25 +275,6 @@ impl NetworkManager {
             .map_err(Error::Dbus)
     }
 
-    pub fn set_stats_refresh_rate(
-        &self,
-        tunnel: &WireguardTunnel,
-        refresh_rate: u32,
-    ) -> Result<()> {
-        tunnel
-            .device_proxy(&*self.connection)
-            .set(NM_DEVICE_STATISTICS, "RefreshRateMs", refresh_rate)
-            .map_err(Error::Dbus)
-    }
-
-    pub fn get_tunnel_stats(&self, tunnel: &WireguardTunnel) -> Result<(u64, u64)> {
-        let device = tunnel.device_proxy(&*self.connection);
-        let tx_bytes = device.get(NM_DEVICE_STATISTICS, "TxBytes")?;
-        let rx_bytes = device.get(NM_DEVICE_STATISTICS, "RxBytes")?;
-
-        Ok((tx_bytes, rx_bytes))
-    }
-
     fn wait_until_device_is_ready(&self, device: &dbus::Path<'_>) -> Result<()> {
         let device_state = self.get_device_state(device)?;
 
@@ -676,16 +656,16 @@ impl NetworkManager {
 #[derive(Debug)]
 struct DeviceStateChange {
     new_state: u32,
-    old_state: u32,
-    reason: u32,
+    _old_state: u32,
+    _reason: u32,
 }
 
 impl arg::ReadAll for DeviceStateChange {
     fn read(i: &mut arg::Iter<'_>) -> std::result::Result<Self, arg::TypeMismatchError> {
         Ok(DeviceStateChange {
             new_state: i.read()?,
-            old_state: i.read()?,
-            reason: i.read()?,
+            _old_state: i.read()?,
+            _reason: i.read()?,
         })
     }
 }