Merge pull request #729 from xtqqczze/clippy/manual_assert

clippy: fix assert lints

Author: clarfonthey

Cargo.toml

@@ -36,6 +36,8 @@ must_use_candidate = "allow"
 option_if_let_else = "allow"
 
 borrow_as_ptr = "warn"
+manual_assert = "warn"
+manual_assert_eq = "warn"
 manual_let_else = "warn"
 needless_continue = "warn"
 ptr_as_ptr = "warn"

src/map.rs

@@ -5615,7 +5615,7 @@ mod test_map {
         m2.insert(1, 2);
         m2.insert(2, 3);
 
-        assert!(m1 != m2);
+        assert_ne!(m1, m2);
 
         m2.insert(3, 4);
 
@@ -6418,9 +6418,7 @@ mod test_map {
                     self.dropped = true;
                     panic!("panic in drop");
                 }
-                if self.dropped {
-                    panic!("double drop");
-                }
+                assert!(!self.dropped, "double drop");
                 self.dropped = true;
             }
         }
@@ -6459,9 +6457,7 @@ mod test_map {
         }
         impl Clone for CheckedClone {
             fn clone(&self) -> Self {
-                if self.panic_in_clone {
-                    panic!("panic in clone")
-                }
+                assert!(!self.panic_in_clone, "panic in clone");
                 Self {
                     panic_in_clone: self.panic_in_clone,
                     need_drop: self.need_drop.clone(),
@@ -6571,9 +6567,7 @@ mod test_map {
 
     impl<T: Clone> Clone for CheckedCloneDrop<T> {
         fn clone(&self) -> Self {
-            if self.panic_in_clone {
-                panic!("panic in clone")
-            }
+            assert!(!self.panic_in_clone, "panic in clone");
             Self {
                 panic_in_clone: self.panic_in_clone,
                 panic_in_drop: self.panic_in_drop,
@@ -6589,9 +6583,7 @@ mod test_map {
                 self.dropped = true;
                 panic!("panic in drop");
             }
-            if self.dropped {
-                panic!("double drop");
-            }
+            assert!(!self.dropped, "double drop");
             self.dropped = true;
         }
     }

src/raw.rs

@@ -1285,9 +1285,10 @@ impl<T, A: Allocator> RawTable<T, A> {
             let ptrs = self.get_disjoint_mut_pointers(hashes, eq);
 
             for (i, cur) in ptrs.iter().enumerate() {
-                if cur.is_some() && ptrs[..i].contains(cur) {
-                    panic!("duplicate keys found");
-                }
+                assert!(
+                    !(cur.is_some() && ptrs[..i].contains(cur)),
+                    "duplicate keys found"
+                );
             }
             // All bucket are distinct from all previous buckets so we're clear to return the result
             // of the lookup.
@@ -4530,9 +4531,7 @@ mod test_map {
 
         impl Clone for CheckedCloneDrop {
             fn clone(&self) -> Self {
-                if self.panic_in_clone {
-                    panic!("panic in clone")
-                }
+                assert!(!self.panic_in_clone, "panic in clone");
                 Self {
                     panic_in_clone: self.panic_in_clone,
                     dropped: self.dropped,
@@ -4543,9 +4542,7 @@ mod test_map {
 
         impl Drop for CheckedCloneDrop {
             fn drop(&mut self) {
-                if self.dropped {
-                    panic!("double drop");
-                }
+                assert!(!self.dropped, "double drop");
                 self.dropped = true;
             }
         }

src/set.rs

@@ -2829,7 +2829,7 @@ mod test_set {
         s2.insert(1);
         s2.insert(2);
 
-        assert!(s1 != s2);
+        assert_ne!(s1, s2);
 
         s2.insert(3);
 
@@ -2880,9 +2880,7 @@ mod test_set {
                 assert_eq!(last_i, 49);
             }
 
-            if !s.is_empty() {
-                panic!("s should be empty!");
-            }
+            assert!(s.is_empty(), "s should be empty!");
 
             // reset to try again.
             s.extend(1..100);

tests/hasher_unwind.rs

@@ -49,9 +49,10 @@ impl BuildHasher for PanicBuildHasher {
     type Hasher = ZeroHasher;
 
     fn build_hasher(&self) -> Self::Hasher {
-        if PANIC_COUNTER.fetch_sub(1, Ordering::SeqCst) == 0 {
-            panic!("panic in BuildHasher::build_hasher");
-        }
+        assert!(
+            PANIC_COUNTER.fetch_sub(1, Ordering::SeqCst) != 0,
+            "panic in BuildHasher::build_hasher"
+        );
         ZeroHasher
     }
 }