gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-09 14:49:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve all Clippy warnings across codebase - Fixed field reassignment warnings in ecstore/src/file_meta.rs by using struct initialization instead of default + field assignment - Fixed overly complex boolean expression in ecstore/src/utils/os/mod.rs by removing meaningless assertion - Replaced manual Default implementation with derive in crates/zip/src/lib.rs - Updated io::Error usage to use io::Error::other() instead of deprecated pattern - Removed useless assertions and clone-on-copy warnings - Fixed unwrap usage by replacing with expect() providing meaningful error messages - Fixed useless vec usage by using array repeat instead - All code now passes comprehensive Clippy check with --all-targets --all-features -- -D warnings

Browse Source
This commit is contained in:
安正超
2025-05-28 11:00:07 +08:00
parent 96d0155bcc
commit a1f4abf6c3
37 changed files with 309 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crypto/src/encdec/id.rs
+15 -15
View File
@@ -89,7 +89,7 @@ mod tests {
fn test_id_clone_and_copy() {
// Test Clone and Copy traits
let original = ID::Argon2idAESGCM;
let cloned = original.clone();
let cloned = original;
let copied = original;
assert!(matches!(cloned, ID::Argon2idAESGCM));
@@ -106,13 +106,13 @@ mod tests {
let result = id.get_key(password, salt);
assert!(result.is_ok());
let key = result.unwrap();
let key = result.expect("PBKDF2 key generation should succeed");
assert_eq!(key.len(), 32);
// Verify deterministic behavior - same inputs should produce same output
let result2 = id.get_key(password, salt);
assert!(result2.is_ok());
assert_eq!(key, result2.unwrap());
assert_eq!(key, result2.expect("PBKDF2 key generation should succeed"));
}
#[test]
@@ -125,13 +125,13 @@ mod tests {
let result = id.get_key(password, salt);
assert!(result.is_ok());
let key = result.unwrap();
let key = result.expect("Argon2id key generation should succeed");
assert_eq!(key.len(), 32);
// Verify deterministic behavior
let result2 = id.get_key(password, salt);
assert!(result2.is_ok());
assert_eq!(key, result2.unwrap());
assert_eq!(key, result2.expect("Argon2id key generation should succeed"));
}
#[test]
@@ -144,7 +144,7 @@ mod tests {
let result = id.get_key(password, salt);
assert!(result.is_ok());
let key = result.unwrap();
let key = result.expect("Argon2id ChaCha20Poly1305 key generation should succeed");
assert_eq!(key.len(), 32);
}
@@ -154,8 +154,8 @@ mod tests {
let id = ID::Pbkdf2AESGCM;
let salt = b"same_salt_for_all";
let key1 = id.get_key(b"password1", salt).unwrap();
let key2 = id.get_key(b"password2", salt).unwrap();
let key1 = id.get_key(b"password1", salt).expect("Key generation with password1 should succeed");
let key2 = id.get_key(b"password2", salt).expect("Key generation with password2 should succeed");
assert_ne!(key1, key2);
}
@@ -166,8 +166,8 @@ mod tests {
let id = ID::Pbkdf2AESGCM;
let password = b"same_password";
let key1 = id.get_key(password, b"salt1_16_bytes__").unwrap();
let key2 = id.get_key(password, b"salt2_16_bytes__").unwrap();
let key1 = id.get_key(password, b"salt1_16_bytes__").expect("Key generation with salt1 should succeed");
let key2 = id.get_key(password, b"salt2_16_bytes__").expect("Key generation with salt2 should succeed");
assert_ne!(key1, key2);
}
@@ -199,7 +199,7 @@ mod tests {
let result = algorithm.get_key(password, salt);
assert!(result.is_ok(), "Algorithm {:?} should generate valid key", algorithm);
let key = result.unwrap();
let key = result.expect("Key generation should succeed for all algorithms");
assert_eq!(key.len(), 32, "Key length should be 32 bytes for {:?}", algorithm);
// Verify key is not all zeros (very unlikely with proper implementation)
@@ -214,7 +214,7 @@ mod tests {
for original in &original_ids {
let as_u8 = *original as u8;
let converted_back = ID::try_from(as_u8).unwrap();
let converted_back = ID::try_from(as_u8).expect("Round-trip conversion should succeed");
assert!(matches!(
(original, converted_back),
@@ -231,9 +231,9 @@ mod tests {
let password = b"consistent_password";
let salt = b"consistent_salt_";
let key_argon2_aes = ID::Argon2idAESGCM.get_key(password, salt).unwrap();
let key_argon2_chacha = ID::Argon2idChaCHa20Poly1305.get_key(password, salt).unwrap();
let key_pbkdf2 = ID::Pbkdf2AESGCM.get_key(password, salt).unwrap();
let key_argon2_aes = ID::Argon2idAESGCM.get_key(password, salt).expect("Argon2id AES key generation should succeed");
let key_argon2_chacha = ID::Argon2idChaCHa20Poly1305.get_key(password, salt).expect("Argon2id ChaCha key generation should succeed");
let key_pbkdf2 = ID::Pbkdf2AESGCM.get_key(password, salt).expect("PBKDF2 key generation should succeed");
// Different algorithms should produce different keys
assert_ne!(key_argon2_aes, key_pbkdf2);
crypto/src/encdec/tests.rs
+1 -1
View File
@@ -78,7 +78,7 @@ fn test_encrypt_decrypt_binary_data() -> Result<(), crate::Error> {
vec![0x00; 100], // All zeros
vec![0xFF; 100], // All ones
(0..=255u8).cycle().take(1000).collect::<Vec<u8>>(), // Sequential pattern
vec![0xAA, 0x55].repeat(500), // Alternating pattern
[0xAA, 0x55].repeat(500), // Alternating pattern
];
for pattern in &binary_patterns {
crypto/src/jwt/tests.rs
+2 -2
View File
@@ -143,10 +143,10 @@ fn test_jwt_with_different_secret_lengths() {
for secret in &secrets {
let jwt_token = encode(secret, &claims)
.expect(&format!("Failed to encode JWT with secret length {}", secret.len()));
.unwrap_or_else(|_| panic!("Failed to encode JWT with secret length {}", secret.len()));
let decoded = decode(&jwt_token, secret)
.expect(&format!("Failed to decode JWT with secret length {}", secret.len()));
.unwrap_or_else(|_| panic!("Failed to decode JWT with secret length {}", secret.len()));
assert_eq!(decoded.claims, claims);
}