fmt and clippy fixes. Algorithm enum functions now take self by value (it's Copy and only 2 bytes).

pull/4/head
Ondřej Hruška 5 years ago
parent 12f158a3d6
commit 8f9cc6a660
Signed by: MightyPork
GPG Key ID: 2C5FD5035250423D
  1. 8
      src/digest.rs
  2. 4
      src/enums.rs

@ -32,7 +32,7 @@ impl QuoteForDigest for String {
} }
/// Join a Vec of Display items using a separator /// Join a Vec of Display items using a separator
fn join_vec<T: ToString>(vec: &Vec<T>, sep: &str) -> String { fn join_vec<T: ToString>(vec: &[T], sep: &str) -> String {
vec.iter() vec.iter()
.map(ToString::to_string) .map(ToString::to_string)
.collect::<Vec<_>>() .collect::<Vec<_>>()
@ -507,8 +507,8 @@ impl AuthorizationHeader {
None => { None => {
let mut rng = rand::thread_rng(); let mut rng = rand::thread_rng();
let nonce_bytes: [u8; 16] = rng.gen(); let nonce_bytes: [u8; 16] = rng.gen();
let cnonce = hex::encode(nonce_bytes);
cnonce hex::encode(nonce_bytes)
} }
} }
}; };
@ -654,7 +654,7 @@ impl AuthorizationHeader {
}; };
if auth.qop.is_some() { if auth.qop.is_some() {
if !auth.cnonce.is_some() { if auth.cnonce.is_none() {
return Err(MissingRequired("cnonce", input.into())); return Err(MissingRequired("cnonce", input.into()));
} }
} else { } else {

@ -30,7 +30,7 @@ impl Algorithm {
} }
/// Calculate a hash of bytes using the selected algorithm /// Calculate a hash of bytes using the selected algorithm
pub fn hash(&self, bytes: &[u8]) -> String { pub fn hash(self, bytes: &[u8]) -> String {
let mut hash: Box<dyn DynDigest> = match self.algo { let mut hash: Box<dyn DynDigest> = match self.algo {
AlgorithmType::MD5 => Box::new(Md5::new()), AlgorithmType::MD5 => Box::new(Md5::new()),
AlgorithmType::SHA2_256 => Box::new(Sha256::new()), AlgorithmType::SHA2_256 => Box::new(Sha256::new()),
@ -42,7 +42,7 @@ impl Algorithm {
} }
/// Calculate a hash of string's bytes using the selected algorithm /// Calculate a hash of string's bytes using the selected algorithm
pub fn hash_str(&self, bytes: &str) -> String { pub fn hash_str(self, bytes: &str) -> String {
self.hash(bytes.as_bytes()) self.hash(bytes.as_bytes())
} }
} }

Loading…
Cancel
Save