clippy

Author: Mathieu Morrissette

uniffi/devolutions-crypto-uniffi/src/argon2parameters.rs

@@ -97,18 +97,29 @@ impl Argon2ParametersBuilder {
         let salt = self.salt.lock().unwrap().clone();
 
         // Build by chaining all fields together (typed-builder requires all fields to be set)
-        let inner = devolutions_crypto::Argon2Parameters::builder()
-            .length(length.unwrap_or(32))
-            .lanes(lanes.unwrap_or(1))
-            .memory(memory.unwrap_or(4096))
-            .iterations(iterations.unwrap_or(3))
-            .variant(variant.map(|v| v.into()).unwrap_or(argon2::Variant::Argon2id))
-            .version(version.map(|v| v.into()).unwrap_or(argon2::Version::Version13))
-            .dc_version(dc_version.unwrap_or(1))
-            .associated_data(associated_data.unwrap_or_default())
-            .secret_key(secret_key.unwrap_or_default())
-            .salt(salt.unwrap_or_else(|| devolutions_crypto::argon2parameters_defaults::salt().unwrap()))
-            .build();
+        let inner =
+            devolutions_crypto::Argon2Parameters::builder()
+                .length(length.unwrap_or(32))
+                .lanes(lanes.unwrap_or(1))
+                .memory(memory.unwrap_or(4096))
+                .iterations(iterations.unwrap_or(3))
+                .variant(
+                    variant
+                        .map(|v| v.into())
+                        .unwrap_or(argon2::Variant::Argon2id),
+                )
+                .version(
+                    version
+                        .map(|v| v.into())
+                        .unwrap_or(argon2::Version::Version13),
+                )
+                .dc_version(dc_version.unwrap_or(1))
+                .associated_data(associated_data.unwrap_or_default())
+                .secret_key(secret_key.unwrap_or_default())
+                .salt(salt.unwrap_or_else(|| {
+                    devolutions_crypto::argon2parameters_defaults::salt().unwrap()
+                }))
+                .build();
 
         Arc::new(Argon2Parameters { inner })
     }

uniffi/devolutions-crypto-uniffi/src/ciphertext.rs

@@ -31,7 +31,11 @@ fn decrypt_with_aad(data: &[u8], key: &[u8], aad: &[u8]) -> Result<Vec<u8>> {
 }
 
 #[uniffi::export(default(version = None))]
-pub fn encrypt_asymmetric(data: &[u8], key: &[u8], version: Option<CiphertextVersion>) -> Result<Vec<u8>> {
+pub fn encrypt_asymmetric(
+    data: &[u8],
+    key: &[u8],
+    version: Option<CiphertextVersion>,
+) -> Result<Vec<u8>> {
     let version = version.unwrap_or(CiphertextVersion::Latest);
     let key = key.try_into()?;
     Ok(devolutions_crypto::ciphertext::encrypt_asymmetric(data, &key, version)?.into())