Skip to content

password-hash: rename Error::B64 => Error::B64Encoding #721

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
tarcieri merged 1 commit into from
Aug 27, 2021
Merged

password-hash: rename Error::B64 => Error::B64Encoding #721

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
8 changes: 4 additions & 4 deletions password-hash/src/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub enum Error {
Algorithm,

/// "B64" encoding error.
B64(B64Error),
B64Encoding(B64Error),

/// Cryptographic error.
Crypto,
Expand Down Expand Up @@ -61,7 +61,7 @@ impl fmt::Display for Error {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> core::result::Result<(), fmt::Error> {
match self {
Self::Algorithm => write!(f, "unsupported algorithm"),
Self::B64(err) => write!(f, "{}", err),
Self::B64Encoding(err) => write!(f, "{}", err),
Self::Crypto => write!(f, "cryptographic error"),
Self::OutputTooShort => f.write_str("PHF output too short (min 10-bytes)"),
Self::OutputTooLong => f.write_str("PHF output too long (max 64-bytes)"),
Expand All @@ -84,13 +84,13 @@ impl std::error::Error for Error {}

impl From<B64Error> for Error {
fn from(err: B64Error) -> Error {
Error::B64(err)
Error::B64Encoding(err)
}
}

impl From<base64ct::InvalidLengthError> for Error {
fn from(_: base64ct::InvalidLengthError) -> Error {
Error::B64(B64Error::InvalidLength)
Error::B64Encoding(B64Error::InvalidLength)
}
}

Expand Down