Fix clippy suggestions

sharkdp · May 22, 2022 · 1fb5263 · 1fb5263
1 parent 0ae8916
commit 1fb5263
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 37 deletions.
diff --git a/src/bin/hexyl.rs b/src/bin/hexyl.rs
@@ -612,16 +612,8 @@ fn test_process_sign() {
 fn test_parse_as_hex() {
     assert_eq!(try_parse_as_hex_number("73"), None);
     assert_eq!(try_parse_as_hex_number("0x1337"), Some(Ok(0x1337)));
-    assert!(if let Some(Err(_)) = try_parse_as_hex_number("0xnope") {
-        true
-    } else {
-        false
-    });
-    assert!(if let Some(Err(_)) = try_parse_as_hex_number("0x-1") {
-        true
-    } else {
-        false
-    });
+    assert!(matches!(try_parse_as_hex_number("0xnope"), Some(Err(_))));
+    assert!(matches!(try_parse_as_hex_number("0x-1"), Some(Err(_))));
 }
 
 #[test]

diff --git a/src/squeezer.rs b/src/squeezer.rs
@@ -128,17 +128,15 @@ mod tests {
             SqueezeAction::Delete, // delete reoccurring line
         ];
 
-        let mut line = 0;
         let mut idx = 1;
-        for z in v.chunks(LSIZE_USIZE) {
+        for (line, z) in v.chunks(LSIZE_USIZE).enumerate() {
             for i in z {
                 s.process(*i, idx);
                 idx += 1;
             }
             let action = s.action();
             s.advance();
             assert_eq!(action, exp[line]);
-            line += 1;
         }
     }
 
@@ -158,16 +156,14 @@ mod tests {
             SqueezeAction::Ignore, // last line only 12 bytes, print it
         ];
 
-        let mut line = 0;
         let mut idx = 1;
-        for z in v.chunks(LSIZE_USIZE) {
+        for (line, z) in v.chunks(LSIZE_USIZE).enumerate() {
             for i in z {
                 s.process(*i, idx);
                 idx += 1;
             }
             assert_eq!(s.action(), exp[line]);
             s.advance();
-            line += 1;
         }
     }
 
@@ -190,17 +186,15 @@ mod tests {
             SqueezeAction::Ignore, // different
         ];
 
-        let mut line = 0;
         let mut idx = 1;
-        for z in v.chunks(LSIZE_USIZE) {
+        for (line, z) in v.chunks(LSIZE_USIZE).enumerate() {
             for i in z {
                 s.process(*i, idx);
                 idx += 1;
             }
             let action = s.action();
             assert_eq!(action, exp[line]);
             s.advance();
-            line += 1;
         }
     }
 
@@ -223,17 +217,15 @@ mod tests {
             SqueezeAction::Ignore, // different lines, print again
         ];
 
-        let mut line = 0;
         let mut idx = 1;
-        for z in v.chunks(LSIZE_USIZE) {
+        for (line, z) in v.chunks(LSIZE_USIZE).enumerate() {
             for i in z {
                 s.process(*i, idx);
                 idx += 1;
             }
             let action = s.action();
             s.advance();
             assert_eq!(action, exp[line]);
-            line += 1;
         }
     }
 
@@ -255,17 +247,15 @@ mod tests {
             SqueezeAction::Ignore, // print squeeze symbol
         ];
 
-        let mut line = 0;
         let mut idx = 1;
-        for z in v.chunks(LSIZE_USIZE) {
+        for (line, z) in v.chunks(LSIZE_USIZE).enumerate() {
             for i in z {
                 s.process(*i, idx);
                 idx += 1;
             }
             let action = s.action();
             s.advance();
             assert_eq!(action, exp[line]);
-            line += 1;
         }
     }
 
@@ -291,17 +281,15 @@ mod tests {
             SqueezeAction::Ignore, // print squeeze symbol
         ];
 
-        let mut line = 0;
         let mut idx = 1;
-        for z in v.chunks(LSIZE_USIZE) {
+        for (line, z) in v.chunks(LSIZE_USIZE).enumerate() {
             for i in z {
                 s.process(*i, idx);
                 idx += 1;
             }
             let action = s.action();
             s.advance();
             assert_eq!(action, exp[line]);
-            line += 1;
         }
     }
 
@@ -341,17 +329,15 @@ mod tests {
             SqueezeAction::Ignore,
         ];
 
-        let mut line = 0;
         let mut idx = 1;
-        for z in v.chunks(LSIZE_USIZE) {
+        for (line, z) in v.chunks(LSIZE_USIZE).enumerate() {
             for i in z {
                 s.process(*i, idx);
                 idx += 1;
             }
             let action = s.action();
             s.advance();
             assert_eq!(action, exp[line]);
-            line += 1;
         }
     }
 
@@ -377,16 +363,14 @@ mod tests {
             SqueezeAction::Print,  // print '*' char
         ];
 
-        let mut line = 0;
         let mut idx = 1;
-        for z in v.chunks(LSIZE_USIZE) {
+        for (line, z) in v.chunks(LSIZE_USIZE).enumerate() {
             for i in z {
                 s.process(*i, idx);
                 idx += 1;
             }
             assert_eq!(s.action(), exp[line]);
             s.advance();
-            line += 1;
         }
     }
 
@@ -410,16 +394,14 @@ mod tests {
             SqueezeAction::Ignore, // print as is
         ];
 
-        let mut line = 0;
         let mut idx = 1;
-        for z in v.chunks(LSIZE_USIZE) {
+        for (line, z) in v.chunks(LSIZE_USIZE).enumerate() {
             for i in z {
                 s.process(*i, idx);
                 idx += 1;
             }
             assert_eq!(s.action(), exp[line]);
             s.advance();
-            line += 1;
         }
     }
 }