Fix clippy warnings

Author: bilelmoussaoui

client/src/file/api/mod.rs

@@ -260,9 +260,9 @@ impl Keyring {
         if let Some(mut path) = data_dir() {
             path.push("keyrings");
             if version > 0 {
-                path.push(format!("v{}", version));
+                path.push(format!("v{version}"));
             }
-            path.push(format!("{}.keyring", name));
+            path.push(format!("{name}.keyring"));
             Ok(path)
         } else {
             Err(Error::NoDataDir)

client/src/secret.rs

@@ -37,7 +37,7 @@ impl FromStr for ContentType {
         match s {
             "text/plain" => Ok(Self::Text),
             "application/octet-stream" => Ok(Self::Blob),
-            e => Err(format!("Invalid content type: {}", e)),
+            e => Err(format!("Invalid content type: {e}")),
         }
     }
 }

server/src/capability.rs

@@ -13,11 +13,11 @@ pub enum Error {
 impl std::fmt::Display for Error {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Self::CapsRead(e) => write!(f, "Failed to read process capabilities: {}", e),
-            Self::CapsUpdate(e) => write!(f, "Failed updating process capabilities: {}", e),
-            Self::DropGroups(e) => write!(f, "Failed to drop supplementary groups: {}", e),
-            Self::SetGid(e) => write!(f, "Failed to setgid: {}", e),
-            Self::SetUid(e) => write!(f, "Failed to setuid: {}", e),
+            Self::CapsRead(e) => write!(f, "Failed to read process capabilities: {e}"),
+            Self::CapsUpdate(e) => write!(f, "Failed updating process capabilities: {e}"),
+            Self::DropGroups(e) => write!(f, "Failed to drop supplementary groups: {e}"),
+            Self::SetGid(e) => write!(f, "Failed to setgid: {e}"),
+            Self::SetUid(e) => write!(f, "Failed to setuid: {e}"),
         }
     }
 }

server/src/collection.rs

@@ -93,8 +93,7 @@ impl Collection {
         let Some(session) = self.service.session(&session).await else {
             tracing::error!("The session `{}` does not exist.", session);
             return Err(ServiceError::NoSession(format!(
-                "The session `{}` does not exist.",
-                session
+                "The session `{session}` does not exist."
             )));
         };
 
@@ -201,8 +200,7 @@ impl Collection {
             alias: Arc::new(Mutex::new(alias.to_owned())),
             item_index: Arc::new(RwLock::new(0)),
             path: OwnedObjectPath::try_from(format!(
-                "/org/freedesktop/secrets/collection/{}",
-                label
+                "/org/freedesktop/secrets/collection/{label}"
             ))
             .unwrap(),
             created,
@@ -312,15 +310,13 @@ impl Collection {
     pub async fn delete_item(&self, path: &OwnedObjectPath) -> Result<(), ServiceError> {
         let Some(item) = self.item_from_path(path).await else {
             return Err(ServiceError::NoSuchObject(format!(
-                "Item `{}` does not exist.",
-                path
+                "Item `{path}` does not exist."
             )));
         };
 
         if item.is_locked().await {
             return Err(ServiceError::IsLocked(format!(
-                "Cannot delete a locked item `{}`",
-                path
+                "Cannot delete a locked item `{path}`"
             )));
         }
 

server/src/gnome/prompter.rs

@@ -48,7 +48,7 @@ impl Properties {
         Self {
             title: None,
             message: Some("Lock Keyring".to_owned()),
-            description: Some(format!("Confirm locking '{}' Keyring", keyring)),
+            description: Some(format!("Confirm locking '{keyring}' Keyring")),
             warning: None,
             password_new: None,
             password_strength: None,
@@ -69,8 +69,7 @@ impl Properties {
             title: Some("Unlock Keyring".to_owned()),
             message: Some("Authentication required".to_owned()),
             description: Some(format!(
-                "An application wants access to the keyring '{}', but it is locked",
-                keyring
+                "An application wants access to the keyring '{keyring}', but it is locked"
             )),
             warning: warning.map(ToOwned::to_owned),
             password_new: None,

server/src/gnome/secret_exchange.rs

@@ -135,7 +135,7 @@ iv=8e3N+gx553PgQlfTKRK3JA==";
         let peer_1_aes_key = handshake(&peer_1_private_key, &peer_2_exchange).unwrap();
         let peer_2_aes_key = handshake(&peer_2_private_key, &peer_1_exchange).unwrap();
         let iv = crypto::generate_iv().unwrap();
-        let encrypted = crypto::encrypt(b"password".to_vec(), &peer_1_aes_key, &iv).unwrap();
+        let encrypted = crypto::encrypt(b"password", &peer_1_aes_key, &iv).unwrap();
 
         let map = HashMap::from([
             (PUBLIC, peer_1_public_key.as_ref()),

server/src/item.rs

@@ -62,8 +62,7 @@ impl Item {
         let Some(session) = self.service.session(&session).await else {
             tracing::error!("The session `{}` does not exist.", session);
             return Err(ServiceError::NoSession(format!(
-                "The session `{}` does not exist.",
-                session
+                "The session `{session}` does not exist."
             )));
         };
 
@@ -112,8 +111,7 @@ impl Item {
         let Some(session) = self.service.session(&session).await else {
             tracing::error!("The session `{}` does not exist.", session);
             return Err(ServiceError::NoSession(format!(
-                "The session `{}` does not exist.",
-                session
+                "The session `{session}` does not exist."
             )));
         };
 
@@ -188,7 +186,7 @@ impl Item {
             locked: Arc::new(AtomicBool::new(locked)),
             inner: Arc::new(Mutex::new(item)),
             collection_path: collection_path.clone(),
-            path: OwnedObjectPath::try_from(format!("{}/{}", collection_path, item_index)).unwrap(),
+            path: OwnedObjectPath::try_from(format!("{collection_path}/{item_index}")).unwrap(),
             service,
         }
     }

server/src/service.rs

@@ -255,8 +255,7 @@ impl Service {
         tracing::info!("Collection: {} does not exist.", collection);
 
         Err(ServiceError::NoSuchObject(format!(
-            "The collection: {} does not exist.",
-            collection,
+            "The collection: {collection} does not exist.",
         )))
     }