Run `cargo +nightly clippy --fix`

7 files changed, 20 insertions, 37 deletions

diff --git a/mullvad-cli/src/cmds/proxies.rs b/mullvad-cli/src/cmds/proxies.rs
index dbbb82afcc..37512f3a35 100644
--- a/mullvad-cli/src/cmds/proxies.rs
+++ b/mullvad-cli/src/cmds/proxies.rs
@@ -194,12 +194,9 @@ pub mod pp {
                 CustomProxy::Socks5Remote(remote) => {
                     print_option!("Protocol", "Socks5");
                     print_option!("Peer", remote.endpoint);
-                    match &remote.auth {
-                        Some(credentials) => {
-                            print_option!("Username", credentials.username());
-                            print_option!("Password", credentials.password());
-                        }
-                        None => (),
+                    if let Some(credentials) = &remote.auth {
+                        print_option!("Username", credentials.username());
+                        print_option!("Password", credentials.password());
                     }
                     Ok(())
                 }
diff --git a/mullvad-daemon/src/api.rs b/mullvad-daemon/src/api.rs
index 1a427701e9..acfdbb7664 100644
--- a/mullvad-daemon/src/api.rs
+++ b/mullvad-daemon/src/api.rs
@@ -153,43 +153,38 @@ impl AccessModeSelectorHandle {
     }
 
     pub async fn get_current(&self) -> Result<ResolvedConnectionMode> {
-        self.send_command(Message::Get).await.map_err(|err| {
+        self.send_command(Message::Get).await.inspect_err(|_| {
             log::debug!("Failed to get current access method!");
-            err
         })
     }
 
     pub async fn use_access_method(&self, value: Id) -> Result<()> {
         self.send_command(|tx| Message::Use(tx, value))
             .await
-            .map_err(|err| {
+            .inspect_err(|_| {
                 log::debug!("Failed to set new access method!");
-                err
             })
     }
 
     pub async fn update_access_methods(&self, access_methods: Settings) -> Result<()> {
         self.send_command(|tx| Message::Update(tx, access_methods))
             .await
-            .map_err(|err| {
+            .inspect_err(|_| {
                 log::debug!("Failed to switch to a new set of access methods");
-                err
             })
     }
 
     pub async fn resolve(&self, setting: AccessMethodSetting) -> Result<ResolvedConnectionMode> {
         self.send_command(|tx| Message::Resolve(tx, setting))
             .await
-            .map_err(|err| {
+            .inspect_err(|_| {
                 log::error!("Failed to update new access methods!");
-                err
             })
     }
 
     pub async fn rotate(&self) -> Result<ApiConnectionMode> {
-        self.send_command(Message::Rotate).await.map_err(|err| {
+        self.send_command(Message::Rotate).await.inspect_err(|_| {
             log::debug!("Failed while getting the next access method");
-            err
         })
     }
 }
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index 16a455ed79..a25a835227 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -1796,18 +1796,16 @@ impl Daemon {
 
     #[cfg(target_os = "linux")]
     fn on_get_split_tunnel_processes(&mut self, tx: ResponseTx<Vec<i32>, split_tunnel::Error>) {
-        let result = self.exclude_pids.list().map_err(|error| {
+        let result = self.exclude_pids.list().inspect_err(|error| {
             log::error!("{}", error.display_chain_with_msg("Unable to obtain PIDs"));
-            error
         });
         Self::oneshot_send(tx, result, "get_split_tunnel_processes response");
     }
 
     #[cfg(target_os = "linux")]
     fn on_add_split_tunnel_process(&mut self, tx: ResponseTx<(), split_tunnel::Error>, pid: i32) {
-        let result = self.exclude_pids.add(pid).map_err(|error| {
+        let result = self.exclude_pids.add(pid).inspect_err(|error| {
             log::error!("{}", error.display_chain_with_msg("Unable to add PID"));
-            error
         });
         Self::oneshot_send(tx, result, "add_split_tunnel_process response");
     }
@@ -1818,18 +1816,16 @@ impl Daemon {
         tx: ResponseTx<(), split_tunnel::Error>,
         pid: i32,
     ) {
-        let result = self.exclude_pids.remove(pid).map_err(|error| {
+        let result = self.exclude_pids.remove(pid).inspect_err(|error| {
             log::error!("{}", error.display_chain_with_msg("Unable to remove PID"));
-            error
         });
         Self::oneshot_send(tx, result, "remove_split_tunnel_process response");
     }
 
     #[cfg(target_os = "linux")]
     fn on_clear_split_tunnel_processes(&mut self, tx: ResponseTx<(), split_tunnel::Error>) {
-        let result = self.exclude_pids.clear().map_err(|error| {
+        let result = self.exclude_pids.clear().inspect_err(|error| {
             log::error!("{}", error.display_chain_with_msg("Unable to clear PIDs"));
-            error
         });
         Self::oneshot_send(tx, result, "clear_split_tunnel_processes response");
     }
@@ -2960,9 +2956,8 @@ fn oneshot_map<T1: Send + 'static, T2: Send + 'static>(
 ) -> oneshot::Sender<T2> {
     let (new_tx, new_rx) = oneshot::channel();
     tokio::spawn(async move {
-        match new_rx.await {
-            Ok(result) => forwarder(tx, result),
-            Err(oneshot::Canceled) => (),
+        if let Ok(result) = new_rx.await {
+            forwarder(tx, result)
         }
     });
     new_tx
diff --git a/mullvad-daemon/src/migrations/device.rs b/mullvad-daemon/src/migrations/device.rs
index faa4e15047..e2cc25eacb 100644
--- a/mullvad-daemon/src/migrations/device.rs
+++ b/mullvad-daemon/src/migrations/device.rs
@@ -69,12 +69,11 @@ async fn cache_from_wireguard_key(
         log::error!("Failed to enumerate devices for account: timed out");
         device::Error::Cancelled
     })?
-    .map_err(|error| {
+    .inspect_err(|error| {
         log::error!(
             "{}",
             error.display_chain_with_msg("Failed to enumerate devices for account")
         );
-        error
     })?;
 
     for device in devices.into_iter() {
@@ -102,11 +101,10 @@ async fn cache_from_account(
         log::error!("Failed to generate new device for account: timed out");
         device::Error::Cancelled
     })?
-    .map_err(|error| {
+    .inspect_err(|error| {
         log::error!(
             "{}",
             error.display_chain_with_msg("Failed to generate new device for account")
         );
-        error
     })
 }
diff --git a/mullvad-problem-report/src/main.rs b/mullvad-problem-report/src/main.rs
index ee1bfc7c6a..bc3e680cdf 100644
--- a/mullvad-problem-report/src/main.rs
+++ b/mullvad-problem-report/src/main.rs
@@ -90,9 +90,8 @@ fn send_problem_report(
 ) -> Result<(), Error> {
     let cache_dir = mullvad_paths::get_cache_dir().map_err(Error::ObtainCacheDirectory)?;
     mullvad_problem_report::send_problem_report(user_email, user_message, report_path, &cache_dir)
-        .map_err(|error| {
+        .inspect_err(|error| {
             eprintln!("{}", error.display_chain());
-            error
         })?;
 
     println!("Problem report sent");
diff --git a/talpid-openvpn/src/lib.rs b/talpid-openvpn/src/lib.rs
index f9d9393994..421c2076ef 100644
--- a/talpid-openvpn/src/lib.rs
+++ b/talpid-openvpn/src/lib.rs
@@ -996,9 +996,8 @@ mod event_server {
             &self,
             request: Request<EventDetails>,
         ) -> std::result::Result<Response<()>, tonic::Status> {
-            self.up_inner(request).await.map_err(|error| {
+            self.up_inner(request).await.inspect_err(|_| {
                 self.abort_server_tx.trigger();
-                error
             })
         }
 
@@ -1006,9 +1005,8 @@ mod event_server {
             &self,
             request: Request<EventDetails>,
         ) -> std::result::Result<Response<()>, tonic::Status> {
-            self.route_up_inner(request).await.map_err(|error| {
+            self.route_up_inner(request).await.inspect_err(|_| {
                 self.abort_server_tx.trigger();
-                error
             })
         }
 
diff --git a/talpid-tunnel/src/tun_provider/mod.rs b/talpid-tunnel/src/tun_provider/mod.rs
index 4eca1c3245..da7baf9889 100644
--- a/talpid-tunnel/src/tun_provider/mod.rs
+++ b/talpid-tunnel/src/tun_provider/mod.rs
@@ -72,6 +72,7 @@ impl TunConfig {
 }
 
 /// Return a tunnel configuration that routes all traffic inside the tunnel.
+///
 /// Most values except the routes are nonsensical. This is mostly used as a reasonable default on
 /// Android to route all traffic inside the tunnel.
 pub fn blocking_config() -> TunConfig {