Skip to content

fix clippy warning in latest rust #13802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 4, 2025
+7 −5
Merged

fix clippy warning in latest rust #13802

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/rust/src/backend/kdf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,15 +545,17 @@ impl BaseArgon2 {
_ => None,
};

if requested_variant.is_none() {
return Err(CryptographyError::from(exceptions::InvalidKey::new_err(
let requested_variant = requested_variant.ok_or_else(|| {
CryptographyError::from(exceptions::InvalidKey::new_err(
"Invalid PHC string format.",
)));
} else if requested_variant.unwrap() != variant {
))
})?;

if requested_variant != variant {
return Err(CryptographyError::from(exceptions::InvalidKey::new_err(
format!(
"Incorrect variant in PHC string, did you mean to use {:?}?",
requested_variant.unwrap()
requested_variant
),
)));
}
Expand Down
Loading