Use formatted strings

Co-authored-by: mematthias <[email protected]>

Author: hug-dev

cryptoki/src/context/mod.rs

@@ -93,8 +93,8 @@ impl Pkcs11Impl {
 
 impl Drop for Pkcs11Impl {
     fn drop(&mut self) {
-        if let Err(e) = self.finalize() {
-            error!("Failed to finalize: {}", e);
+        if let Err(err) = self.finalize() {
+            error!("Failed to finalize: {err}");
         }
     }
 }

cryptoki/src/error/rv.rs

@@ -120,8 +120,7 @@ impl From<CK_RV> for Rv {
             CKR_VENDOR_DEFINED..=CK_ULONG::MAX => Rv::Error(RvError::VendorDefined(ck_rv)),
             other => {
                 error!(
-                    "Can not find a corresponding error for {}, converting to UnknownErrorCode.",
-                    other
+                    "Can not find a corresponding error for {other}, converting to UnknownErrorCode."
                 );
                 Rv::Error(RvError::UnknownErrorCode(other))
             }

cryptoki/src/mechanism/mod.rs

@@ -1020,7 +1020,7 @@ impl TryFrom<CK_MECHANISM_TYPE> for MechanismType {
             CKM_HASH_SLH_DSA_SHA3_512 => Ok(MechanismType::HASH_SLH_DSA_SHA3_512),
             CKM_HASH_SLH_DSA_SHAKE128 => Ok(MechanismType::HASH_SLH_DSA_SHAKE128),
             other => {
-                error!("Mechanism type {} is not supported.", other);
+                error!("Mechanism type {other} is not supported.");
                 Err(Error::NotSupported)
             }
         }

cryptoki/src/mechanism/rsa.rs

@@ -66,10 +66,7 @@ impl TryFrom<CK_RSA_PKCS_MGF_TYPE> for PkcsMgfType {
             CKG_MGF1_SHA384 => Ok(PkcsMgfType::MGF1_SHA384),
             CKG_MGF1_SHA512 => Ok(PkcsMgfType::MGF1_SHA512),
             other => {
-                error!(
-                    "Mask Generation Function type {} is not one of the valid values.",
-                    other
-                );
+                error!("Mask Generation Function type {other} is not one of the valid values.");
                 Err(Error::InvalidValue)
             }
         }

cryptoki/src/object.rs

@@ -501,7 +501,7 @@ impl TryFrom<CK_ATTRIBUTE_TYPE> for AttributeType {
             CKA_WRAP_WITH_TRUSTED => Ok(AttributeType::WrapWithTrusted),
             CKA_VENDOR_DEFINED..=CK_ULONG::MAX => Ok(AttributeType::VendorDefined(attribute_type)),
             attr_type => {
-                error!("Attribute type {} not supported.", attr_type);
+                error!("Attribute type {attr_type} not supported.");
                 Err(Error::NotSupported)
             }
         }
@@ -1347,7 +1347,7 @@ impl TryFrom<CK_ML_KEM_PARAMETER_SET_TYPE> for MlKemParameterSetType {
             CKP_ML_KEM_768 => Ok(MlKemParameterSetType::ML_KEM_768),
             CKP_ML_KEM_1024 => Ok(MlKemParameterSetType::ML_KEM_1024),
             _ => {
-                error!("ML-KEM parameter set {} is not supported.", val);
+                error!("ML-KEM parameter set {val} is not supported.");
                 Err(Error::NotSupported)
             }
         }
@@ -1414,7 +1414,7 @@ impl TryFrom<CK_ML_DSA_PARAMETER_SET_TYPE> for MlDsaParameterSetType {
             CKP_ML_DSA_65 => Ok(MlDsaParameterSetType::ML_DSA_65),
             CKP_ML_DSA_87 => Ok(MlDsaParameterSetType::ML_DSA_87),
             _ => {
-                error!("ML-DSA parameter set {} is not supported.", val);
+                error!("ML-DSA parameter set {val} is not supported.");
                 Err(Error::NotSupported)
             }
         }
@@ -1657,7 +1657,7 @@ impl TryFrom<CK_OBJECT_CLASS> for ObjectClass {
             CKO_VALIDATION => Ok(ObjectClass::VALIDATION),
 
             _ => {
-                error!("Object class {} is not supported.", object_class);
+                error!("Object class {object_class} is not supported.");
                 Err(Error::NotSupported)
             }
         }
@@ -1957,7 +1957,7 @@ impl TryFrom<CK_KEY_TYPE> for KeyType {
             CKK_SLH_DSA => Ok(KeyType::SLH_DSA),
             CKK_VENDOR_DEFINED..=CK_ULONG::MAX => KeyType::new_vendor_defined(key_type),
             _ => {
-                error!("Key type {} is not supported.", key_type);
+                error!("Key type {key_type} is not supported.");
                 Err(Error::NotSupported)
             }
         }
@@ -2033,7 +2033,7 @@ impl TryFrom<CK_CERTIFICATE_TYPE> for CertificateType {
             CKC_X_509_ATTR_CERT => Ok(CertificateType::X_509_ATTR),
             CKC_WTLS => Ok(CertificateType::WTLS),
             _ => {
-                error!("Certificate type {} is not supported.", certificate_type);
+                error!("Certificate type {certificate_type} is not supported.");
                 Err(Error::NotSupported)
             }
         }

cryptoki/src/session/object_management.rs

@@ -197,8 +197,8 @@ impl Drop for ObjectHandleIterator<'_> {
         if let Some(f) = get_pkcs11_func!(self.session.client(), C_FindObjectsFinal) {
             // swallow the return value, as we can't do anything about it,
             // but log the error
-            if let Rv::Error(error) = Rv::from(unsafe { f(self.session.handle()) }) {
-                log::error!("C_FindObjectsFinal() failed with error: {:?}", error);
+            if let Rv::Error(err) = Rv::from(unsafe { f(self.session.handle()) }) {
+                log::error!("C_FindObjectsFinal() failed with error: {err:?}");
             }
         } else {
             // bark but pass if C_FindObjectsFinal() is not implemented

cryptoki/src/session/session_management.rs

@@ -26,8 +26,8 @@ impl Drop for Session {
             }
         }
 
-        if let Err(e) = close(self) {
-            error!("Failed to close session: {}", e);
+        if let Err(err) = close(self) {
+            error!("Failed to close session: {err}");
         }
     }
 }