Fix warnings pointed out by Clippy

8 files changed, 42 insertions, 42 deletions

diff --git a/mullvad-api/src/https_client_with_sni.rs b/mullvad-api/src/https_client_with_sni.rs
index dbe71203ec..e8f7fb889c 100644
--- a/mullvad-api/src/https_client_with_sni.rs
+++ b/mullvad-api/src/https_client_with_sni.rs
@@ -207,7 +207,7 @@ impl HttpsConnectorWithSni {
         if let Some(mut tx) = socket_bypass_tx {
             let (done_tx, done_rx) = oneshot::channel();
             let _ = tx.send((socket.as_raw_fd(), done_tx)).await;
-            if let Err(_) = done_rx.await {
+            if done_rx.await.is_err() {
                 log::error!("Failed to bypass socket, connection might fail");
             }
         }
diff --git a/mullvad-daemon/src/api.rs b/mullvad-daemon/src/api.rs
index fe718c441a..67f80ca235 100644
--- a/mullvad-daemon/src/api.rs
+++ b/mullvad-daemon/src/api.rs
@@ -205,7 +205,10 @@ pub(crate) fn create_bypass_tx(
     let daemon_tx = event_sender.to_specialized_sender();
     tokio::spawn(async move {
         while let Some((raw_fd, done_tx)) = bypass_rx.next().await {
-            if let Err(_) = daemon_tx.send(DaemonCommand::BypassSocket(raw_fd, done_tx)) {
+            if daemon_tx
+                .send(DaemonCommand::BypassSocket(raw_fd, done_tx))
+                .is_err()
+            {
                 log::error!("Can't send socket bypass request to daemon");
                 break;
             }
diff --git a/mullvad-jni/src/daemon_interface.rs b/mullvad-jni/src/daemon_interface.rs
index ca4c27fb25..78e50c3d86 100644
--- a/mullvad-jni/src/daemon_interface.rs
+++ b/mullvad-jni/src/daemon_interface.rs
@@ -25,10 +25,10 @@ pub enum Error {
     NoSender,
 
     #[error(display = "Error performing RPC with the remote API")]
-    RpcError(#[error(source)] mullvad_api::rest::Error),
+    Api(#[error(source)] mullvad_api::rest::Error),
 
     #[error(display = "Failed to update settings")]
-    SettingsError,
+    UpdateSettings,
 
     #[error(display = "Daemon returned an error")]
     OtherError(#[error(source)] mullvad_daemon::Error),
@@ -37,12 +37,12 @@ pub enum Error {
 impl From<mullvad_daemon::Error> for Error {
     fn from(error: mullvad_daemon::Error) -> Error {
         match error {
-            mullvad_daemon::Error::RestError(error) => Error::RpcError(error),
+            mullvad_daemon::Error::RestError(error) => Error::Api(error),
             mullvad_daemon::Error::LoginError(device::Error::OtherRestError(error)) => {
-                Error::RpcError(error)
+                Error::Api(error)
             }
             mullvad_daemon::Error::ListDevicesError(device::Error::OtherRestError(error)) => {
-                Error::RpcError(error)
+                Error::Api(error)
             }
             error => Error::OtherError(error),
         }
@@ -93,7 +93,7 @@ impl DaemonInterface {
 
         block_on(rx)
             .map_err(|_| Error::NoResponse)?
-            .map_err(Error::RpcError)
+            .map_err(Error::Api)
     }
 
     pub fn get_account_history(&self) -> Result<Option<AccountToken>> {
@@ -119,7 +119,7 @@ impl DaemonInterface {
 
         self.send_command(DaemonCommand::GetCurrentLocation(tx))?;
 
-        Ok(block_on(rx).map_err(|_| Error::NoResponse)?)
+        block_on(rx).map_err(|_| Error::NoResponse)
     }
 
     pub fn get_current_version(&self) -> Result<String> {
@@ -127,7 +127,7 @@ impl DaemonInterface {
 
         self.send_command(DaemonCommand::GetCurrentVersion(tx))?;
 
-        Ok(block_on(rx).map_err(|_| Error::NoResponse)?)
+        block_on(rx).map_err(|_| Error::NoResponse)
     }
 
     pub fn get_relay_locations(&self) -> Result<RelayList> {
@@ -135,7 +135,7 @@ impl DaemonInterface {
 
         self.send_command(DaemonCommand::GetRelayLocations(tx))?;
 
-        Ok(block_on(rx).map_err(|_| Error::NoResponse)?)
+        block_on(rx).map_err(|_| Error::NoResponse)
     }
 
     pub fn get_settings(&self) -> Result<Settings> {
@@ -143,7 +143,7 @@ impl DaemonInterface {
 
         self.send_command(DaemonCommand::GetSettings(tx))?;
 
-        Ok(block_on(rx).map_err(|_| Error::NoResponse)?)
+        block_on(rx).map_err(|_| Error::NoResponse)
     }
 
     pub fn get_state(&self) -> Result<TunnelState> {
@@ -151,7 +151,7 @@ impl DaemonInterface {
 
         self.send_command(DaemonCommand::GetState(tx))?;
 
-        Ok(block_on(rx).map_err(|_| Error::NoResponse)?)
+        block_on(rx).map_err(|_| Error::NoResponse)
     }
 
     pub fn get_version_info(&self) -> Result<AppVersionInfo> {
@@ -259,7 +259,7 @@ impl DaemonInterface {
 
         block_on(rx)
             .map_err(|_| Error::NoResponse)?
-            .map_err(|_| Error::SettingsError)
+            .map_err(|_| Error::UpdateSettings)
     }
 
     pub fn set_auto_connect(&self, auto_connect: bool) -> Result<()> {
@@ -269,7 +269,7 @@ impl DaemonInterface {
 
         block_on(rx)
             .map_err(|_| Error::NoResponse)?
-            .map_err(|_| Error::SettingsError)
+            .map_err(|_| Error::UpdateSettings)
     }
 
     pub fn set_dns_options(&self, dns_options: DnsOptions) -> Result<()> {
@@ -279,7 +279,7 @@ impl DaemonInterface {
 
         block_on(rx)
             .map_err(|_| Error::NoResponse)?
-            .map_err(|_| Error::SettingsError)
+            .map_err(|_| Error::UpdateSettings)
     }
 
     pub fn set_wireguard_mtu(&self, wireguard_mtu: Option<u16>) -> Result<()> {
@@ -289,7 +289,7 @@ impl DaemonInterface {
 
         block_on(rx)
             .map_err(|_| Error::NoResponse)?
-            .map_err(|_| Error::SettingsError)
+            .map_err(|_| Error::UpdateSettings)
     }
 
     pub fn shutdown(&self) -> Result<()> {
@@ -313,7 +313,7 @@ impl DaemonInterface {
 
         block_on(rx)
             .map_err(|_| Error::NoResponse)?
-            .map_err(|_| Error::SettingsError)
+            .map_err(|_| Error::UpdateSettings)
     }
 
     pub fn set_obfuscation_settings(&self, settings: ObfuscationSettings) -> Result<()> {
@@ -323,7 +323,7 @@ impl DaemonInterface {
 
         block_on(rx)
             .map_err(|_| Error::NoResponse)?
-            .map_err(|_| Error::SettingsError)
+            .map_err(|_| Error::UpdateSettings)
     }
 
     fn send_command(&self, command: DaemonCommand) -> Result<()> {
diff --git a/mullvad-jni/src/jni_event_listener.rs b/mullvad-jni/src/jni_event_listener.rs
index 553f3f48f3..4e1dcff630 100644
--- a/mullvad-jni/src/jni_event_listener.rs
+++ b/mullvad-jni/src/jni_event_listener.rs
@@ -98,7 +98,7 @@ impl JniEventHandler<'_> {
 
         thread::spawn(move || match jvm.attach_current_thread() {
             Ok(attach_guard) => {
-                let env = JnixEnv::from(attach_guard.clone());
+                let env = JnixEnv::from(*attach_guard);
 
                 match JniEventHandler::new(env, mullvad_ipc_client.as_obj(), rx) {
                     Ok(mut listener) => listener.run(),
diff --git a/mullvad-jni/src/lib.rs b/mullvad-jni/src/lib.rs
index 35db9a6766..15794eccf4 100644
--- a/mullvad-jni/src/lib.rs
+++ b/mullvad-jni/src/lib.rs
@@ -30,7 +30,6 @@ use mullvad_types::{
 use std::{
     io,
     path::{Path, PathBuf},
-    ptr,
     sync::{
         atomic::{AtomicUsize, Ordering},
         mpsc, Arc, Once,
@@ -82,12 +81,12 @@ impl From<Result<AccountData, daemon_interface::Error>> for GetAccountDataResult
         match result {
             Ok(account_data) => GetAccountDataResult::Ok(account_data),
             Err(error) => match error {
-                daemon_interface::Error::RpcError(RestError::ApiError(status, _code))
+                daemon_interface::Error::Api(RestError::ApiError(status, _code))
                     if status == StatusCode::UNAUTHORIZED || status == StatusCode::FORBIDDEN =>
                 {
                     GetAccountDataResult::InvalidAccount
                 }
-                daemon_interface::Error::RpcError(_) => GetAccountDataResult::RpcError,
+                daemon_interface::Error::Api(_) => GetAccountDataResult::RpcError,
                 _ => GetAccountDataResult::OtherError,
             },
         }
@@ -117,7 +116,7 @@ impl From<Result<(), daemon_interface::Error>> for LoginResult {
                         _ => LoginResult::OtherError,
                     }
                 }
-                daemon_interface::Error::RpcError(_) => LoginResult::RpcError,
+                daemon_interface::Error::Api(_) => LoginResult::RpcError,
                 _ => LoginResult::OtherError,
             },
         }
@@ -146,7 +145,7 @@ impl From<Result<(), daemon_interface::Error>> for RemoveDeviceResult {
                         _ => RemoveDeviceResult::OtherError,
                     }
                 }
-                daemon_interface::Error::RpcError(_) => RemoveDeviceResult::RpcError,
+                daemon_interface::Error::Api(_) => RemoveDeviceResult::RpcError,
                 _ => RemoveDeviceResult::OtherError,
             },
         }
@@ -181,14 +180,12 @@ impl From<Result<VoucherSubmission, daemon_interface::Error>> for VoucherSubmiss
 impl From<daemon_interface::Error> for VoucherSubmissionError {
     fn from(error: daemon_interface::Error) -> Self {
         match error {
-            daemon_interface::Error::RpcError(RestError::ApiError(_, code)) => {
-                match code.as_str() {
-                    mullvad_api::INVALID_VOUCHER => VoucherSubmissionError::InvalidVoucher,
-                    mullvad_api::VOUCHER_USED => VoucherSubmissionError::VoucherAlreadyUsed,
-                    _ => VoucherSubmissionError::RpcError,
-                }
-            }
-            daemon_interface::Error::RpcError(_) => VoucherSubmissionError::RpcError,
+            daemon_interface::Error::Api(RestError::ApiError(_, code)) => match code.as_str() {
+                mullvad_api::INVALID_VOUCHER => VoucherSubmissionError::InvalidVoucher,
+                mullvad_api::VOUCHER_USED => VoucherSubmissionError::VoucherAlreadyUsed,
+                _ => VoucherSubmissionError::RpcError,
+            },
+            daemon_interface::Error::Api(_) => VoucherSubmissionError::RpcError,
             _ => VoucherSubmissionError::OtherError,
         }
     }
@@ -559,7 +556,7 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_deiniti
 
     set_daemon_interface_address(&env, &this, 0);
 
-    if daemon_interface_address != ptr::null_mut() {
+    if !daemon_interface_address.is_null() {
         let _ = unsafe { Box::from_raw(daemon_interface_address) };
     }
 }
@@ -567,7 +564,7 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_deiniti
 fn get_daemon_interface<'a>(address: jlong) -> Option<&'a mut DaemonInterface> {
     let pointer = address as *mut DaemonInterface;
 
-    if pointer != ptr::null_mut() {
+    if !pointer.is_null() {
         Some(Box::leak(unsafe { Box::from_raw(pointer) }))
     } else {
         log::error!("Attempt to get daemon interface while it is null");
@@ -1206,7 +1203,7 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_setObfu
 
 fn log_request_error(request: &str, error: &daemon_interface::Error) {
     match error {
-        daemon_interface::Error::RpcError(RestError::Aborted) => {
+        daemon_interface::Error::Api(RestError::Aborted) => {
             log::debug!("Request to {} cancelled", request);
         }
         error => {
diff --git a/mullvad-jni/src/talpid_vpn_service.rs b/mullvad-jni/src/talpid_vpn_service.rs
index 554313b8e4..ba4f8a3470 100644
--- a/mullvad-jni/src/talpid_vpn_service.rs
+++ b/mullvad-jni/src/talpid_vpn_service.rs
@@ -101,7 +101,7 @@ fn try_sending_random_udp(is_ipv6_enabled: bool) -> Result<(), SendRandomDataErr
         // pick any random route to select between Ipv4 and Ipv6
         // TODO: if we are to allow LAN on Android by changing the routes that are stuffed in
         // TunConfig, then this should be revisited to be fair between IPv4 and IPv6
-        let should_generate_ipv4 = is_ipv6_enabled == false || thread_rng().gen();
+        let should_generate_ipv4 = !is_ipv6_enabled || thread_rng().gen();
 
         let rand_port = thread_rng().gen();
         let (local_addr, rand_dest_addr) = if should_generate_ipv4 || tried_ipv6 {
@@ -109,7 +109,7 @@ fn try_sending_random_udp(is_ipv6_enabled: bool) -> Result<(), SendRandomDataErr
             thread_rng().fill(&mut ipv4_bytes);
             (
                 SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), 0),
-                SocketAddr::new(IpAddr::from(ipv4_bytes).into(), rand_port),
+                SocketAddr::new(IpAddr::from(ipv4_bytes), rand_port),
             )
         } else {
             let mut ipv6_bytes = [0u8; 16];
@@ -117,7 +117,7 @@ fn try_sending_random_udp(is_ipv6_enabled: bool) -> Result<(), SendRandomDataErr
             thread_rng().fill(&mut ipv6_bytes);
             (
                 SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 0),
-                SocketAddr::new(IpAddr::from(ipv6_bytes).into(), rand_port),
+                SocketAddr::new(IpAddr::from(ipv6_bytes), rand_port),
             )
         };
 
diff --git a/talpid-tunnel/src/tun_provider/android/mod.rs b/talpid-tunnel/src/tun_provider/android/mod.rs
index 1cb6a49de4..06ffac9aa9 100644
--- a/talpid-tunnel/src/tun_provider/android/mod.rs
+++ b/talpid-tunnel/src/tun_provider/android/mod.rs
@@ -280,7 +280,7 @@ impl AndroidTunProvider {
         let env = JnixEnv::from(
             self.jvm
                 .attach_current_thread_as_daemon()
-                .map_err(|cause| Error::AttachJvmToThread(cause))?,
+                .map_err(Error::AttachJvmToThread)?,
         );
         let create_tun_method = env
             .get_method_id(&self.class, "bypass", "(I)Z")
@@ -351,7 +351,7 @@ impl VpnServiceTun {
         let env = JnixEnv::from(
             self.jvm
                 .attach_current_thread_as_daemon()
-                .map_err(|cause| Error::AttachJvmToThread(cause))?,
+                .map_err(Error::AttachJvmToThread)?,
         );
         let create_tun_method = env
             .get_method_id(&self.class, "bypass", "(I)Z")
diff --git a/talpid-wireguard/src/ping_monitor/android.rs b/talpid-wireguard/src/ping_monitor/android.rs
index 9263dbac79..036db93563 100644
--- a/talpid-wireguard/src/ping_monitor/android.rs
+++ b/talpid-wireguard/src/ping_monitor/android.rs
@@ -50,7 +50,7 @@ impl super::Pinger for Pinger {
     }
 
     fn reset(&mut self) {
-        let processes = std::mem::replace(&mut self.processes, vec![]);
+        let processes = std::mem::take(&mut self.processes);
         for proc in processes {
             if proc
                 .try_wait()