fix(clippy): appease the paperclip

zkat · Sep 16, 2021 · 0b1eb50 · 0b1eb50
1 parent 2c1b212
commit 0b1eb50
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/checker.rs b/src/checker.rs
@@ -48,7 +48,7 @@ impl IntegrityChecker {
             .take_while(|h| h.algorithm == algo)
             .find(|&h| *h == sri.hashes[0])
             .map(|_| algo)
-            .ok_or_else(|| Error::IntegrityCheckError(wanted, sri))
+            .ok_or(Error::IntegrityCheckError(wanted, sri))
     }
 }
 

diff --git a/src/hash.rs b/src/hash.rs
@@ -40,9 +40,13 @@ impl std::str::FromStr for Hash {
         let mut parsed = s.trim().split(|c| c == '-');
         let algorithm = parsed
             .next()
-            .ok_or(Error::ParseIntegrityError(s.into()))?
+            .ok_or_else(|| Error::ParseIntegrityError(s.into()))?
             .parse()?;
-        let digest = String::from(parsed.next().ok_or(Error::ParseIntegrityError(s.into()))?);
+        let digest = String::from(
+            parsed
+                .next()
+                .ok_or_else(|| Error::ParseIntegrityError(s.into()))?,
+        );
         Ok(Hash { algorithm, digest })
     }
 }

diff --git a/src/opts.rs b/src/opts.rs
@@ -2,10 +2,7 @@ use crate::algorithm::Algorithm;
 use crate::hash::Hash;
 use crate::integrity::Integrity;
 
-use base64;
 use digest::Digest;
-use sha1;
-use sha2;
 
 #[allow(clippy::enum_variant_names)]
 #[derive(Clone)]