Run `cargo clippy --fix` with the new Rust 1.67 preferred format

6 files changed, 17 insertions, 18 deletions

diff --git a/mullvad-api/src/access.rs b/mullvad-api/src/access.rs
index b60b74220d..a3bec3f725 100644
--- a/mullvad-api/src/access.rs
+++ b/mullvad-api/src/access.rs
@@ -102,7 +102,7 @@ impl AccessTokenProxy {
 
         let rest_request = self
             .factory
-            .post_json(&format!("{}/token", AUTH_URL_PREFIX), &request)?;
+            .post_json(&format!("{AUTH_URL_PREFIX}/token"), &request)?;
         let response = service.request(rest_request).await?;
         let response = rest::parse_rest_response(response, &[StatusCode::OK]).await?;
         rest::deserialize_body(response).await
diff --git a/mullvad-api/src/device.rs b/mullvad-api/src/device.rs
index af7cbd0a8e..d48e1245b6 100644
--- a/mullvad-api/src/device.rs
+++ b/mullvad-api/src/device.rs
@@ -58,7 +58,7 @@ impl DevicesProxy {
             let response = rest::send_json_request(
                 &factory,
                 service,
-                &format!("{}/devices", ACCOUNTS_URL_PREFIX),
+                &format!("{ACCOUNTS_URL_PREFIX}/devices"),
                 Method::POST,
                 &submission,
                 Some((access_proxy, account)),
@@ -108,7 +108,7 @@ impl DevicesProxy {
             let response = rest::send_request(
                 &factory,
                 service,
-                &format!("{}/devices/{}", ACCOUNTS_URL_PREFIX, id),
+                &format!("{ACCOUNTS_URL_PREFIX}/devices/{id}"),
                 Method::GET,
                 Some((access_proxy, account)),
                 &[StatusCode::OK],
@@ -129,7 +129,7 @@ impl DevicesProxy {
             let response = rest::send_request(
                 &factory,
                 service,
-                &format!("{}/devices", ACCOUNTS_URL_PREFIX),
+                &format!("{ACCOUNTS_URL_PREFIX}/devices"),
                 Method::GET,
                 Some((access_proxy, account)),
                 &[StatusCode::OK],
@@ -151,7 +151,7 @@ impl DevicesProxy {
             let response = rest::send_request(
                 &factory,
                 service,
-                &format!("{}/devices/{}", ACCOUNTS_URL_PREFIX, id),
+                &format!("{ACCOUNTS_URL_PREFIX}/devices/{id}"),
                 Method::DELETE,
                 Some((access_proxy, account)),
                 &[StatusCode::NO_CONTENT],
@@ -184,7 +184,7 @@ impl DevicesProxy {
             let response = rest::send_json_request(
                 &factory,
                 service,
-                &format!("{}/devices/{}/pubkey", ACCOUNTS_URL_PREFIX, id),
+                &format!("{ACCOUNTS_URL_PREFIX}/devices/{id}/pubkey"),
                 Method::PUT,
                 &req_body,
                 Some((access_proxy, account)),
diff --git a/mullvad-api/src/lib.rs b/mullvad-api/src/lib.rs
index 5872f3af71..68b582910a 100644
--- a/mullvad-api/src/lib.rs
+++ b/mullvad-api/src/lib.rs
@@ -130,7 +130,7 @@ impl ApiEndpoint {
             match env::var(key) {
                 Ok(v) => Some(v),
                 Err(env::VarError::NotPresent) => None,
-                Err(env::VarError::NotUnicode(_)) => panic!("{} does not contain valid UTF-8", key),
+                Err(env::VarError::NotUnicode(_)) => panic!("{key} does not contain valid UTF-8"),
             }
         }
 
@@ -394,7 +394,7 @@ impl AccountsProxy {
             let response = rest::send_request(
                 &factory,
                 service,
-                &format!("{}/accounts/me", ACCOUNTS_URL_PREFIX),
+                &format!("{ACCOUNTS_URL_PREFIX}/accounts/me"),
                 Method::GET,
                 Some((access_proxy, account)),
                 &[StatusCode::OK],
@@ -416,7 +416,7 @@ impl AccountsProxy {
         let response = rest::send_request(
             &self.handle.factory,
             service,
-            &format!("{}/accounts", ACCOUNTS_URL_PREFIX),
+            &format!("{ACCOUNTS_URL_PREFIX}/accounts"),
             Method::POST,
             None,
             &[StatusCode::CREATED],
@@ -447,7 +447,7 @@ impl AccountsProxy {
             let response = rest::send_json_request(
                 &factory,
                 service,
-                &format!("{}/submit-voucher", APP_URL_PREFIX),
+                &format!("{APP_URL_PREFIX}/submit-voucher"),
                 Method::POST,
                 &submission,
                 Some((access_proxy, account_token)),
@@ -475,7 +475,7 @@ impl AccountsProxy {
             let response = rest::send_request(
                 &factory,
                 service,
-                &format!("{}/www-auth-token", APP_URL_PREFIX),
+                &format!("{APP_URL_PREFIX}/www-auth-token"),
                 Method::POST,
                 Some((access_proxy, account)),
                 &[StatusCode::OK],
@@ -523,7 +523,7 @@ impl ProblemReportProxy {
         let request = rest::send_json_request(
             &self.handle.factory,
             service,
-            &format!("{}/problem-report", APP_URL_PREFIX),
+            &format!("{APP_URL_PREFIX}/problem-report"),
             Method::POST,
             &report,
             None,
@@ -573,7 +573,7 @@ impl AppVersionProxy {
     ) -> impl Future<Output = Result<AppVersionResponse, rest::Error>> {
         let service = self.handle.service.clone();
 
-        let path = format!("{}/releases/{}/{}", APP_URL_PREFIX, platform, app_version);
+        let path = format!("{APP_URL_PREFIX}/releases/{platform}/{app_version}");
         let request = self.handle.factory.request(&path, Method::GET);
 
         async move {
@@ -603,7 +603,7 @@ impl ApiProxy {
         let response = rest::send_request(
             &self.handle.factory,
             service,
-            &format!("{}/api-addrs", APP_URL_PREFIX),
+            &format!("{APP_URL_PREFIX}/api-addrs"),
             Method::GET,
             None,
             &[StatusCode::OK],
diff --git a/mullvad-api/src/proxy.rs b/mullvad-api/src/proxy.rs
index fa1da913ba..9a9a20d411 100644
--- a/mullvad-api/src/proxy.rs
+++ b/mullvad-api/src/proxy.rs
@@ -69,8 +69,7 @@ impl ApiConnectionMode {
                 log::error!(
                     "{}",
                     error.display_chain_with_msg(&format!(
-                        "Failed to deserialize \"{}\"",
-                        CURRENT_CONFIG_FILENAME
+                        "Failed to deserialize \"{CURRENT_CONFIG_FILENAME}\""
                     ))
                 );
                 io::Error::new(io::ErrorKind::Other, "deserialization failed")
diff --git a/mullvad-api/src/rest.rs b/mullvad-api/src/rest.rs
index 1aaba487a7..a1a6b28b0a 100644
--- a/mullvad-api/src/rest.rs
+++ b/mullvad-api/src/rest.rs
@@ -328,7 +328,7 @@ impl RestRequest {
     pub fn set_auth(&mut self, auth: Option<String>) -> Result<()> {
         let header = match auth {
             Some(auth) => Some(
-                HeaderValue::from_str(&format!("Bearer {}", auth))
+                HeaderValue::from_str(&format!("Bearer {auth}"))
                     .map_err(Error::InvalidHeaderError)?,
             ),
             None => None,
diff --git a/mullvad-api/src/tls_stream.rs b/mullvad-api/src/tls_stream.rs
index ac3b4c2e24..74b6e9b27d 100644
--- a/mullvad-api/src/tls_stream.rs
+++ b/mullvad-api/src/tls_stream.rs
@@ -43,7 +43,7 @@ where
             Err(_) => {
                 return Err(io::Error::new(
                     ErrorKind::InvalidInput,
-                    format!("invalid hostname \"{}\"", domain),
+                    format!("invalid hostname \"{domain}\""),
                 ));
             }
         };