Merge #451

451: Fix clippy errors r=kpp a=kpcyrd See #450 Co-authored-by: kpcyrd <git@rxv.cc> Co-authored-by: Michael Howell <michael@notriddle.com>
sodiumoxide · Jan 1, 2021 · 10faca2 · 10faca2
2 parents ffd9626 + 7e1defe
commit 10faca2
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -142,16 +142,3 @@ jobs:
     steps:
     - name: Mark the job as successful
       run: exit 0
-
-  end-failure:
-    name: bors build finished
-    if: "!success()"
-    runs-on: ubuntu-latest
-    needs:
-    - test
-    - fmt
-    - clippy
-    - cross
-    steps:
-    - name: Mark the job as a failure
-      run: exit 1
diff --git a/src/crypto/generichash/mod.rs b/src/crypto/generichash/mod.rs
@@ -42,13 +42,13 @@ impl State {
     /// a custom key can be used for the computation of the hash.
     /// The size of the key must be in the interval [`KEY_MIN`, `KEY_MAX`].
     pub fn new(out_len: usize, key: Option<&[u8]>) -> Result<State, ()> {
-        if out_len < DIGEST_MIN || out_len > DIGEST_MAX {
+        if !(DIGEST_MIN..=DIGEST_MAX).contains(&out_len) {
             return Err(());
         }
 
         if let Some(key) = key {
             let len = key.len();
-            if len < KEY_MIN || len > KEY_MAX {
+            if !(KEY_MIN..=KEY_MAX).contains(&len) {
                 return Err(());
             }
         }
@@ -194,7 +194,27 @@ mod test {
     }
 
     #[test]
-    fn test_digest_equality() {
+    fn test_digest_equal() {
+        let data1 = [1, 2];
+        let data2 = [1, 2];
+
+        let h1 = {
+            let mut hasher = State::new(32, None).unwrap();
+            hasher.update(&data1).unwrap();
+            hasher.finalize().unwrap()
+        };
+
+        let h2 = {
+            let mut hasher = State::new(32, None).unwrap();
+            hasher.update(&data2).unwrap();
+            hasher.finalize().unwrap()
+        };
+
+        assert_eq!(h1, h2);
+    }
+
+    #[test]
+    fn test_digest_not_equal() {
         let data1 = [1, 2];
         let data2 = [3, 4];
 
@@ -210,7 +230,6 @@ mod test {
             hasher.finalize().unwrap()
         };
 
-        assert_eq!(h1, h1);
         assert_ne!(h1, h2);
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
@@ -60,6 +60,8 @@
 #![warn(unused_qualifications)]
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(clippy::all)]
+// Remove this after https://github.com/sodiumoxide/sodiumoxide/issues/221 is done
+#![allow(clippy::result_unit_err)]
 
 extern crate libsodium_sys as ffi;