Version 1.6.6: No changes, just applied clippy fixes

CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.6.6] - 2023-04-22
+
+### Changed
+
+- No changes, just applied clippy fixes.
+
 ## [1.6.5] - 2023-04-03
 
 ### Changed

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "djangohashers"
-version = "1.6.5"
+version = "1.6.6"
 authors = ["Ronaldo Racum <[email protected]>"]
 documentation = "https://docs.rs/djangohashers/"
 license = "BSD-3-Clause"

src/crypto_utils.rs

@@ -32,12 +32,12 @@ pub fn hash_pbkdf2_sha256(password: &str, salt: &str, iterations: u32) -> String
     use core::num::NonZeroU32;
     ring::pbkdf2::derive(
         ring::pbkdf2::PBKDF2_HMAC_SHA256,
-        NonZeroU32::new(iterations as u32).unwrap(),
-        &salt.as_bytes(),
+        NonZeroU32::new(iterations).unwrap(),
+        salt.as_bytes(),
         password.as_bytes(),
         &mut result,
     );
-    general_purpose::STANDARD.encode(&result)
+    general_purpose::STANDARD.encode(result)
 }
 
 #[cfg(feature = "with_pbkdf2")]
@@ -60,12 +60,12 @@ pub fn hash_pbkdf2_sha1(password: &str, salt: &str, iterations: u32) -> String {
     use core::num::NonZeroU32;
     ring::pbkdf2::derive(
         ring::pbkdf2::PBKDF2_HMAC_SHA1,
-        NonZeroU32::new(iterations as u32).unwrap(),
-        &salt.as_bytes(),
+        NonZeroU32::new(iterations).unwrap(),
+        salt.as_bytes(),
         password.as_bytes(),
         &mut result,
     );
-    general_purpose::STANDARD.encode(&result)
+    general_purpose::STANDARD.encode(result)
 }
 
 #[cfg(feature = "with_pbkdf2")]
@@ -138,7 +138,7 @@ pub fn hash_argon2(
     };
     let salt_bytes = general_purpose::URL_SAFE_NO_PAD.decode(salt).unwrap();
     let result = argon2::hash_raw(password.as_bytes(), &salt_bytes, &config).unwrap();
-    general_purpose::URL_SAFE_NO_PAD.encode(&result)
+    general_purpose::URL_SAFE_NO_PAD.encode(result)
 }
 
 #[cfg(feature = "with_scrypt")]
@@ -156,5 +156,5 @@ pub fn hash_scrypt(
     let mut buf = [0u8; KEY_SIZE];
     let params = Params::new(work_factor, block_size, parallelism, KEY_SIZE).unwrap();
     scrypt(password.as_bytes(), salt.as_bytes(), &params, &mut buf).unwrap();
-    general_purpose::STANDARD.encode(&buf)
+    general_purpose::STANDARD.encode(buf)
 }

src/hashers.rs

@@ -238,12 +238,12 @@ impl Hasher for BCryptSHA256Hasher {
         }
         let hash = bcrypt_encoded_part[1];
         let hashed_password = crypto_utils::hash_sha256(password);
-        Ok(bcrypt::verify(&hashed_password, hash).unwrap_or(false))
+        Ok(bcrypt::verify(hashed_password, hash).unwrap_or(false))
     }
 
     fn encode(&self, password: &str, _: &str, iterations: u32) -> String {
         let hashed_password = crypto_utils::hash_sha256(password);
-        let hash = bcrypt::hash(&hashed_password, iterations).unwrap();
+        let hash = bcrypt::hash(hashed_password, iterations).unwrap();
         format!("{}${}", "bcrypt_sha256", hash)
     }
 }

tests/django19.rs

@@ -194,12 +194,12 @@ fn test_bcrypt() {
 fn test_unusable() {
     let encoded = "!Q24gQu9Sy3X1PJPCaEMTRrw5eLFWY8htI2FsqCbC"; // From make_password(None)
     assert!(encoded.len() == 41);
-    assert!(!is_password_usable(&encoded));
-    assert!(check_password(&encoded, &encoded).is_err());
-    assert!(check_password("!", &encoded).is_err());
-    assert!(check_password("", &encoded).is_err());
-    assert!(check_password("lètmein", &encoded).is_err());
-    assert!(check_password("lètmeinz", &encoded).is_err());
+    assert!(!is_password_usable(encoded));
+    assert!(check_password(encoded, encoded).is_err());
+    assert!(check_password("!", encoded).is_err());
+    assert!(check_password("", encoded).is_err());
+    assert!(check_password("lètmein", encoded).is_err());
+    assert!(check_password("lètmeinz", encoded).is_err());
 }
 
 // Scenario not possible during run time:

tests/django32.rs

@@ -73,10 +73,10 @@ fn test_argon2() {
     assert_eq!(check_password(" ", &blank_encoded), Ok(false));
     // Old hashes without version attribute
     let encoded = "argon2$argon2i$m=8,t=1,p=1$c29tZXNhbHQ$gwQOXSNhxiOxPOA0+PY10P9QFO4NAYysnqRt1GSQLE55m+2GYDt9FEjPMHhP2Cuf0nOEXXMocVrsJAtNSsKyfg";
-    assert_eq!(check_password("secret", &encoded), Ok(true));
-    assert_eq!(check_password("wrong", &encoded), Ok(false));
+    assert_eq!(check_password("secret", encoded), Ok(true));
+    assert_eq!(check_password("wrong", encoded), Ok(false));
     // Old hashes with version attribute.
     let encoded = "argon2$argon2i$v=19$m=8,t=1,p=1$c2FsdHNhbHQ$YC9+jJCrQhs5R6db7LlN8Q";
-    assert_eq!(check_password("secret", &encoded), Ok(true));
-    assert_eq!(check_password("wrong", &encoded), Ok(false));
+    assert_eq!(check_password("secret", encoded), Ok(true));
+    assert_eq!(check_password("wrong", encoded), Ok(false));
 }

tests/lib.rs

@@ -1,7 +1,7 @@
 use djangohashers::*;
 
-static PASSWORD: &'static str = "ExjGmyUT73bFoT";
-static SALT: &'static str = "KQ8zeK6wKRuR";
+static PASSWORD: &str = "ExjGmyUT73bFoT";
+static SALT: &str = "KQ8zeK6wKRuR";
 
 #[test]
 #[cfg(feature = "with_pbkdf2")]