clippy

crates/crypto/src/header/file.rs

@@ -108,7 +108,7 @@ impl FileHeader {
 			return Err(Error::NoKeyslots);
 		}
 
-		for v in self.keyslots.iter() {
+		for v in &self.keyslots {
 			if let Some(key) = v
 				.decrypt_master_key(password.clone())
 				.await
@@ -146,7 +146,7 @@ impl FileHeader {
 		}
 
 		for hashed_key in hashed_keys {
-			for v in self.keyslots.iter() {
+			for v in &self.keyslots {
 				if let Some(key) = v
 					.decrypt_master_key_from_prehashed(hashed_key.clone())
 					.await

crates/crypto/src/header/metadata.rs

@@ -76,7 +76,7 @@ impl FileHeader {
 		metadata: &T,
 	) -> Result<()>
 	where
-		T: ?Sized + serde::Serialize,
+		T: ?Sized + serde::Serialize + Sync + Send,
 	{
 		let metadata_nonce = generate_nonce(algorithm);
 
@@ -89,14 +89,12 @@ impl FileHeader {
 		)
 		.await?;
 
-		let metadata = Metadata {
+		self.metadata = Some(Metadata {
 			version,
 			algorithm,
 			metadata_nonce,
 			metadata: encrypted_metadata,
-		};
-
-		self.metadata = Some(metadata);
+		});
 
 		Ok(())
 	}

crates/crypto/src/header/preview_media.rs

@@ -70,14 +70,12 @@ impl FileHeader {
 			StreamEncryption::encrypt_bytes(master_key, &media_nonce, algorithm, media, &[])
 				.await?;
 
-		let pvm = PreviewMedia {
+		self.preview_media = Some(PreviewMedia {
 			version,
 			algorithm,
 			media_nonce,
 			media: encrypted_media,
-		};
-
-		self.preview_media = Some(pvm);
+		});
 
 		Ok(())
 	}

crates/crypto/src/keys/keymanager.rs

@@ -443,7 +443,7 @@ impl KeyManager {
 		invalidate: F,
 	) -> Result<()>
 	where
-		F: Fn(),
+		F: Fn() + Send,
 	{
 		let uuid = Uuid::nil();