From f2d843f97dc648e65a8d9636b65484569c1f902e Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Fri, 27 Aug 2021 14:30:30 -0600 Subject: [PATCH] password-hash: rename `Error::B64` => `Error::B64Encoding` --- password-hash/src/errors.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/password-hash/src/errors.rs b/password-hash/src/errors.rs index 552fab5ef..48ff66b0b 100644 --- a/password-hash/src/errors.rs +++ b/password-hash/src/errors.rs @@ -15,7 +15,7 @@ pub enum Error { Algorithm, /// "B64" encoding error. - B64(B64Error), + B64Encoding(B64Error), /// Cryptographic error. Crypto, @@ -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)"), @@ -84,13 +84,13 @@ impl std::error::Error for Error {} impl From for Error { fn from(err: B64Error) -> Error { - Error::B64(err) + Error::B64Encoding(err) } } impl From for Error { fn from(_: base64ct::InvalidLengthError) -> Error { - Error::B64(B64Error::InvalidLength) + Error::B64Encoding(B64Error::InvalidLength) } }