Skip to content

Commit 8bb3381

Browse files
authored
password-hash: fix needless_as_bytes Clippy lint (#1715)
1 parent f5266b8 commit 8bb3381

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

password-hash/src/params.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ impl FromStr for ParamsString {
173173
type Err = Error;
174174

175175
fn from_str(s: &str) -> Result<Self> {
176-
if s.as_bytes().len() > MAX_LENGTH {
176+
if s.len() > MAX_LENGTH {
177177
return Err(Error::ParamsMaxExceeded);
178178
}
179179

@@ -201,11 +201,11 @@ impl FromStr for ParamsString {
201201
}
202202

203203
let mut bytes = [0u8; MAX_LENGTH];
204-
bytes[..s.as_bytes().len()].copy_from_slice(s.as_bytes());
204+
bytes[..s.len()].copy_from_slice(s.as_bytes());
205205

206206
Ok(Self(Buffer {
207207
bytes,
208-
length: s.as_bytes().len() as u8,
208+
length: s.len() as u8,
209209
}))
210210
}
211211
}

password-hash/src/salt.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ impl<'a> Salt<'a> {
103103
/// Create a [`Salt`] from the given B64-encoded input string, validating
104104
/// [`Salt::MIN_LENGTH`] and [`Salt::MAX_LENGTH`] restrictions.
105105
pub fn from_b64(input: &'a str) -> Result<Self> {
106-
let length = input.as_bytes().len();
106+
let length = input.len();
107107

108108
if length < Self::MIN_LENGTH {
109109
return Err(Error::SaltInvalid(InvalidValue::TooShort));
@@ -215,7 +215,7 @@ impl SaltString {
215215
// Assert `s` parses successfully as a `Salt`
216216
Salt::from_b64(s)?;
217217

218-
let len = s.as_bytes().len();
218+
let len = s.len();
219219

220220
let mut bytes = [0u8; Salt::MAX_LENGTH];
221221
bytes[..len].copy_from_slice(s.as_bytes());

password-hash/src/value.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ impl<'a> Value<'a> {
5050
/// Parse a [`Value`] from the provided `str`, validating it according to
5151
/// the PHC string format's rules.
5252
pub fn new(input: &'a str) -> Result<Self> {
53-
if input.as_bytes().len() > Self::MAX_LENGTH {
53+
if input.len() > Self::MAX_LENGTH {
5454
return Err(Error::ParamValueInvalid(InvalidValue::TooLong));
5555
}
5656

0 commit comments

Comments
 (0)