Fmt and clip

Author: Bennett Hardwick

cryptonamo-derive/src/encryptable.rs

@@ -108,6 +108,7 @@ pub(crate) fn derive_encryptable(input: DeriveInput) -> Result<TokenStream, syn:
                 vec![#(#plaintext_attributes,)*]
             }
 
+            #[allow(clippy::needless_question_mark)]
             fn into_sealer(self) -> Result<cryptonamo::crypto::Sealer<Self>, cryptonamo::crypto::SealError> {
                 Ok(cryptonamo::crypto::Sealer::new_with_descriptor(self, Self::type_name())
                     #(#into_unsealed_impl?)*)

src/crypto/mod.rs

@@ -56,10 +56,7 @@ pub(crate) fn all_index_keys<E: Searchable + Encryptable>(sort_key: &str) -> Vec
         .collect()
 }
 
-pub(crate) fn hmac<C>(
-    value: &str,
-    cipher: &Encryption<C>,
-) -> Result<String, EncryptionError>
+pub(crate) fn hmac<C>(value: &str, cipher: &Encryption<C>) -> Result<String, EncryptionError>
 where
     C: Credentials<Token = ViturToken>,
 {

src/crypto/sealer.rs

@@ -142,7 +142,7 @@ impl<T> Sealer<T> {
                         .clone()
                         .set_term(hex::encode(term))
                         // TODO: HMAC the sort key, too (users#index_name#pk)
-                        .set_sk(hmac(&format!("{}#{}#{}", &sk, index_name, i), &cipher)?),
+                        .set_sk(hmac(&format!("{}#{}#{}", &sk, index_name, i), cipher)?),
                 ))
             })
             .chain(once(Ok(Sealed(table_entry.clone()))))

src/encrypted_table/table_entry.rs

@@ -231,7 +231,7 @@ impl From<TableAttribute> for AttributeValue {
 
             TableAttribute::Bytes(x) => AttributeValue::B(Blob::new(x)),
             TableAttribute::ByteVec(x) => {
-                AttributeValue::Bs(x.into_iter().map(|x| Blob::new(x)).collect())
+                AttributeValue::Bs(x.into_iter().map(Blob::new).collect())
             }
 
             TableAttribute::Bool(x) => AttributeValue::Bool(x),