fix(clippy): resolve linting issues

zkat · Feb 9, 2023 · 354f686 · 354f686
1 parent a37dfc9
commit 354f686
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/algorithm.rs b/src/algorithm.rs
@@ -20,7 +20,7 @@ pub enum Algorithm {
 
 impl fmt::Display for Algorithm {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", format!("{:?}", self).to_lowercase())
+        write!(f, "{}", format!("{self:?}").to_lowercase())
     }
 }
 
@@ -44,10 +44,10 @@ mod tests {
 
     #[test]
     fn algorithm_formatting() {
-        assert_eq!(format!("{}", Sha1), "sha1");
-        assert_eq!(format!("{}", Sha256), "sha256");
-        assert_eq!(format!("{}", Sha384), "sha384");
-        assert_eq!(format!("{}", Sha512), "sha512");
+        assert_eq!(format!("{Sha1}"), "sha1");
+        assert_eq!(format!("{Sha256}"), "sha256");
+        assert_eq!(format!("{Sha384}"), "sha384");
+        assert_eq!(format!("{Sha512}"), "sha512");
     }
 
     #[test]

diff --git a/src/checker.rs b/src/checker.rs
@@ -70,7 +70,7 @@ mod tests {
             .parse::<Integrity>()
             .unwrap()
             .concat(Integrity::from(b"hello world"));
-        eprintln!("\n{}", sri);
+        eprintln!("\n{sri}");
         let result = IntegrityChecker::new(sri).chain(b"hello world").result();
         assert_eq!(result.unwrap(), Algorithm::Sha256)
     }

diff --git a/src/opts.rs b/src/opts.rs
@@ -2,6 +2,8 @@ use crate::algorithm::Algorithm;
 use crate::hash::Hash;
 use crate::integrity::Integrity;
 
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
 use digest::Digest;
 
 #[allow(clippy::enum_variant_names)]
@@ -90,10 +92,10 @@ impl IntegrityOpts {
             .into_iter()
             .map(|h| {
                 let (algorithm, data) = match h {
-                    Hasher::Sha1(h) => (Algorithm::Sha1, base64::encode(&h.finalize())),
-                    Hasher::Sha256(h) => (Algorithm::Sha256, base64::encode(&h.finalize())),
-                    Hasher::Sha384(h) => (Algorithm::Sha384, base64::encode(&h.finalize())),
-                    Hasher::Sha512(h) => (Algorithm::Sha512, base64::encode(&h.finalize())),
+                    Hasher::Sha1(h) => (Algorithm::Sha1, BASE64_STANDARD.encode(h.finalize())),
+                    Hasher::Sha256(h) => (Algorithm::Sha256, BASE64_STANDARD.encode(h.finalize())),
+                    Hasher::Sha384(h) => (Algorithm::Sha384, BASE64_STANDARD.encode(h.finalize())),
+                    Hasher::Sha512(h) => (Algorithm::Sha512, BASE64_STANDARD.encode(h.finalize())),
                 };
                 Hash {
                     algorithm,