5 files changed, 7 insertions, 7 deletions
diff --git a/mullvad-cli/src/cmds/account.rs b/mullvad-cli/src/cmds/account.rs
index 8432f1da0a..9cbfd6cbb2 100644
--- a/mullvad-cli/src/cmds/account.rs
+++ b/mullvad-cli/src/cmds/account.rs
@@ -241,7 +241,7 @@ impl Account {
                     || dev.id.eq_ignore_ascii_case(&device_to_revoke)
             })
             .map(|dev| dev.id)
-            .ok_or_else(|| Error::Other(DEVICE_NOT_FOUND_ERROR))?;
+            .ok_or(Error::Other(DEVICE_NOT_FOUND_ERROR))?;
 
         rpc.remove_device(types::DeviceRemoval {
             account_token: token,
diff --git a/mullvad-cli/src/cmds/bridge.rs b/mullvad-cli/src/cmds/bridge.rs
index 3f00a7f69a..b253ae63a9 100644
--- a/mullvad-cli/src/cmds/bridge.rs
+++ b/mullvad-cli/src/cmds/bridge.rs
@@ -246,7 +246,7 @@ impl Bridge {
 
     async fn handle_set_bridge_provider(matches: &clap::ArgMatches) -> Result<()> {
         let providers: Vec<String> = matches.values_of_t_or_exit("provider");
-        let providers = if providers.iter().next().map(String::as_str) == Some("any") {
+        let providers = if providers.get(0).map(String::as_str) == Some("any") {
             vec![]
         } else {
             providers
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index d0d75dea20..c624c2a25b 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -479,7 +479,7 @@ impl Relay {
 
     async fn set_providers(&self, matches: &clap::ArgMatches) -> Result<()> {
         let providers: Vec<String> = matches.values_of_t_or_exit("provider");
-        let providers = if providers.iter().next().map(String::as_str) == Some("any") {
+        let providers = if providers.get(0).map(String::as_str) == Some("any") {
             vec![]
         } else {
             providers
diff --git a/mullvad-cli/src/format.rs b/mullvad-cli/src/format.rs
index a43307a789..74630166d2 100644
--- a/mullvad-cli/src/format.rs
+++ b/mullvad-cli/src/format.rs
@@ -128,9 +128,9 @@ fn format_relay_connection(relay_info: &TunnelStateRelayInfo, verbose: bool) ->
 
     format!(
         "{exit_endpoint}{first_hop}{bridge}{obfuscator}{tunnel_type}{bridge_type}{obfuscator_type}",
-        first_hop = first_hop.unwrap_or(String::new()),
-        bridge = bridge.unwrap_or(String::new()),
-        obfuscator = obfuscator.unwrap_or(String::new()),
+        first_hop = first_hop.unwrap_or_default(),
+        bridge = bridge.unwrap_or_default(),
+        obfuscator = obfuscator.unwrap_or_default(),
     )
 }
 
diff --git a/mullvad-cli/src/state.rs b/mullvad-cli/src/state.rs
index 4cf826214f..f237689a3b 100644
--- a/mullvad-cli/src/state.rs
+++ b/mullvad-cli/src/state.rs
@@ -26,7 +26,7 @@ pub fn state_listen(mut rpc: ManagementServiceClient) -> Receiver<Result<TunnelS
                         Err(status) => Err(Error::RpcFailed(status)),
                     };
 
-                    if let Err(_) = sender.send(forward).await {
+                    if sender.send(forward).await.is_err() {
                         break;
                     }
                 }