Merge branch 'run-clippy-fix'

10 files changed, 27 insertions, 27 deletions

diff --git a/mullvad-cli/src/cmds/account.rs b/mullvad-cli/src/cmds/account.rs
index 9cbfd6cbb2..77859990ea 100644
--- a/mullvad-cli/src/cmds/account.rs
+++ b/mullvad-cli/src/cmds/account.rs
@@ -123,7 +123,7 @@ impl Account {
         rpc.login_account(token.clone())
             .await
             .map_err(map_device_error)?;
-        println!("Mullvad account \"{}\" set", token);
+        println!("Mullvad account \"{token}\" set");
         Ok(())
     }
 
@@ -161,7 +161,7 @@ impl Account {
                         inner_device.created.with_timezone(&chrono::Local)
                     );
                     for port in inner_device.ports {
-                        println!("Device port    : {}", port);
+                        println!("Device port    : {port}");
                     }
                 }
                 let expiry = rpc
@@ -175,10 +175,10 @@ impl Account {
                 );
             }
             State::LoggedOut => {
-                println!("{}", NOT_LOGGED_IN_MESSAGE);
+                println!("{NOT_LOGGED_IN_MESSAGE}");
             }
             State::Revoked => {
-                println!("{}", REVOKED_MESSAGE);
+                println!("{REVOKED_MESSAGE}");
             }
         }
 
@@ -212,7 +212,7 @@ impl Account {
                     device.created.with_timezone(&chrono::Local)
                 );
                 for port in device.ports {
-                    println!("Port      : {}", port);
+                    println!("Port      : {port}");
                 }
             } else {
                 println!("{}", device.pretty_name());
diff --git a/mullvad-cli/src/cmds/beta_program.rs b/mullvad-cli/src/cmds/beta_program.rs
index 3fdcdb30f4..e211fe9698 100644
--- a/mullvad-cli/src/cmds/beta_program.rs
+++ b/mullvad-cli/src/cmds/beta_program.rs
@@ -34,7 +34,7 @@ impl Command for BetaProgram {
                 } else {
                     "off"
                 };
-                println!("Beta program: {}", enabled_str);
+                println!("Beta program: {enabled_str}");
                 Ok(())
             }
             Some(("set", matches)) => {
@@ -50,7 +50,7 @@ impl Command for BetaProgram {
                 let mut rpc = new_rpc_client().await?;
                 rpc.set_show_beta_releases(enable).await?;
 
-                println!("Beta program: {}", enable_str);
+                println!("Beta program: {enable_str}");
                 Ok(())
             }
             _ => {
diff --git a/mullvad-cli/src/cmds/bridge.rs b/mullvad-cli/src/cmds/bridge.rs
index e283dc96ed..d7291a810d 100644
--- a/mullvad-cli/src/cmds/bridge.rs
+++ b/mullvad-cli/src/cmds/bridge.rs
@@ -229,7 +229,7 @@ impl Bridge {
                 }
             },
             BridgeSettings::Normal(constraints) => {
-                println!("Bridge constraints: {}", constraints)
+                println!("Bridge constraints: {constraints}")
             }
         };
         Ok(())
diff --git a/mullvad-cli/src/cmds/dns.rs b/mullvad-cli/src/cmds/dns.rs
index 300e1c3955..28a48a5614 100644
--- a/mullvad-cli/src/cmds/dns.rs
+++ b/mullvad-cli/src/cmds/dns.rs
@@ -172,7 +172,7 @@ impl Dns {
             DnsState::Custom => {
                 println!("Custom DNS: yes\nServers:");
                 for server in &options.custom_options.addresses {
-                    println!("{}", server);
+                    println!("{server}");
                 }
             }
         }
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index 5d8583098f..981f0fffdd 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -350,7 +350,7 @@ impl Relay {
 
     fn validate_wireguard_key(key_str: &str) -> [u8; 32] {
         let key_bytes = base64::decode(key_str.trim()).unwrap_or_else(|e| {
-            eprintln!("Failed to decode wireguard key: {}", e);
+            eprintln!("Failed to decode wireguard key: {e}");
             std::process::exit(1);
         });
 
diff --git a/mullvad-cli/src/cmds/reset.rs b/mullvad-cli/src/cmds/reset.rs
index c4cd3a8625..d3e3ec3e62 100644
--- a/mullvad-cli/src/cmds/reset.rs
+++ b/mullvad-cli/src/cmds/reset.rs
@@ -31,7 +31,7 @@ impl Reset {
         loop {
             let mut buf = String::new();
             if let Err(e) = stdin().read_line(&mut buf) {
-                eprintln!("Couldn't read from STDIN: {}", e);
+                eprintln!("Couldn't read from STDIN: {e}");
                 return false;
             }
             match buf.trim() {
diff --git a/mullvad-cli/src/cmds/split_tunnel/linux.rs b/mullvad-cli/src/cmds/split_tunnel/linux.rs
index 03ee913b3e..c42b6ae56e 100644
--- a/mullvad-cli/src/cmds/split_tunnel/linux.rs
+++ b/mullvad-cli/src/cmds/split_tunnel/linux.rs
@@ -71,7 +71,7 @@ impl SplitTunnel {
                 println!("Excluded PIDs:");
 
                 while let Some(pid) = pids_stream.message().await? {
-                    println!("    {}", pid);
+                    println!("    {pid}");
                 }
 
                 Ok(())
diff --git a/mullvad-cli/src/cmds/status.rs b/mullvad-cli/src/cmds/status.rs
index 80eb91db68..828d17af0e 100644
--- a/mullvad-cli/src/cmds/status.rs
+++ b/mullvad-cli/src/cmds/status.rs
@@ -44,7 +44,7 @@ impl Command for Status {
         let state = rpc.get_tunnel_state(()).await?.into_inner();
 
         if debug {
-            println!("Tunnel state: {:#?}", state);
+            println!("Tunnel state: {state:#?}");
         } else {
             let state = TunnelState::try_from(state).expect("invalid tunnel state");
             format::print_state(&state, verbose);
@@ -64,7 +64,7 @@ impl Command for Status {
                             TunnelState::try_from(new_state).expect("invalid tunnel state");
 
                         if debug {
-                            println!("New tunnel state: {:#?}", new_state);
+                            println!("New tunnel state: {new_state:#?}");
                         } else {
                             format::print_state(&new_state, verbose);
                         }
@@ -80,27 +80,27 @@ impl Command for Status {
                     }
                     EventType::Settings(settings) => {
                         if debug {
-                            println!("New settings: {:#?}", settings);
+                            println!("New settings: {settings:#?}");
                         }
                     }
                     EventType::RelayList(relay_list) => {
                         if debug {
-                            println!("New relay list: {:#?}", relay_list);
+                            println!("New relay list: {relay_list:#?}");
                         }
                     }
                     EventType::VersionInfo(app_version_info) => {
                         if debug {
-                            println!("New app version info: {:#?}", app_version_info);
+                            println!("New app version info: {app_version_info:#?}");
                         }
                     }
                     EventType::Device(device) => {
                         if debug {
-                            println!("Device event: {:#?}", device);
+                            println!("Device event: {device:#?}");
                         }
                     }
                     EventType::RemoveDevice(device) => {
                         if debug {
-                            println!("Remove device event: {:#?}", device);
+                            println!("Remove device event: {device:#?}");
                         }
                     }
                 }
@@ -124,10 +124,10 @@ async fn print_location(rpc: &mut ManagementServiceClient) -> Result<()> {
         }
     };
     if let Some(ipv4) = location.ipv4 {
-        println!("IPv4: {}", ipv4);
+        println!("IPv4: {ipv4}");
     }
     if let Some(ipv6) = location.ipv6 {
-        println!("IPv6: {}", ipv6);
+        println!("IPv6: {ipv6}");
     }
 
     println!(
diff --git a/mullvad-cli/src/cmds/tunnel.rs b/mullvad-cli/src/cmds/tunnel.rs
index d86dfa19bd..e47ac5afe5 100644
--- a/mullvad-cli/src/cmds/tunnel.rs
+++ b/mullvad-cli/src/cmds/tunnel.rs
@@ -319,7 +319,7 @@ impl Tunnel {
         match tunnel_options.wireguard.unwrap().rotation_interval {
             Some(interval) => {
                 let hours = duration_hours(&Duration::try_from(interval).unwrap());
-                println!("Rotation interval: {} hour(s)", hours);
+                println!("Rotation interval: {hours} hour(s)");
             }
             None => println!(
                 "Rotation interval: default ({} hours)",
@@ -337,7 +337,7 @@ impl Tunnel {
                 .expect("Failed to convert rotation interval to prost_types::Duration"),
         )
         .await?;
-        println!("Set key rotation interval: {} hour(s)", rotate_interval);
+        println!("Set key rotation interval: {rotate_interval} hour(s)");
         Ok(())
     }
 
diff --git a/mullvad-cli/src/format.rs b/mullvad-cli/src/format.rs
index b4aa96a719..8f8201814f 100644
--- a/mullvad-cli/src/format.rs
+++ b/mullvad-cli/src/format.rs
@@ -58,14 +58,14 @@ fn format_relay_connection(
                 city: Some(city),
                 ..
             }) => {
-                format!("{exit} in {}, {}", city, country)
+                format!("{exit} in {city}, {country}")
             }
             Some(GeoIpLocation {
                 country,
                 city: None,
                 ..
             }) => {
-                format!("{exit} in {}", country)
+                format!("{exit} in {country}")
             }
             None => exit,
         }
@@ -163,7 +163,7 @@ fn print_error_state(error_state: &ErrorState) {
     match error_state.cause() {
         #[cfg(target_os = "linux")]
         cause @ talpid_types::tunnel::ErrorStateCause::SetFirewallPolicyError(_) => {
-            println!("Blocked: {}", cause);
+            println!("Blocked: {cause}");
             println!("Your kernel might be terribly out of date or missing nftables");
         }
         talpid_types::tunnel::ErrorStateCause::AuthFailed(Some(auth_failed)) => {
@@ -172,7 +172,7 @@ fn print_error_state(error_state: &ErrorState) {
                 get_auth_failed_message(AuthFailed::from(auth_failed.as_str()))
             );
         }
-        cause => println!("Blocked: {}", cause),
+        cause => println!("Blocked: {cause}"),
     }
 }