Merge pull request #2643 from phansch/split_up_match_bool_ui_tests

Split up match_bool UI tests

Author: oli-obk

tests/ui/match_bool.rs

@@ -0,0 +1,44 @@
+fn match_bool() {
+    let test: bool = true;
+
+    match test {
+        true => 0,
+        false => 42,
+    };
+
+    let option = 1;
+    match option == 1 {
+        true => 1,
+        false => 0,
+    };
+
+    match test {
+        true => (),
+        false => { println!("Noooo!"); }
+    };
+
+    match test {
+        false => { println!("Noooo!"); }
+        _ => (),
+    };
+
+    match test && test {
+        false => { println!("Noooo!"); }
+        _ => (),
+    };
+
+    match test {
+        false => { println!("Noooo!"); }
+        true => { println!("Yes!"); }
+    };
+
+    // Not linted
+    match option {
+        1 ... 10 => 1,
+        11 ... 20 => 2,
+        _ => 3,
+    };
+}
+
+fn main() {
+}

tests/ui/match_bool.stderr

@@ -0,0 +1,74 @@
+error: this boolean expression can be simplified
+  --> $DIR/match_bool.rs:25:11
+   |
+25 |     match test && test {
+   |           ^^^^^^^^^^^^ help: try: `test`
+   |
+   = note: `-D nonminimal-bool` implied by `-D warnings`
+
+error: you seem to be trying to match on a boolean expression
+ --> $DIR/match_bool.rs:4:5
+  |
+4 | /     match test {
+5 | |         true => 0,
+6 | |         false => 42,
+7 | |     };
+  | |_____^ help: consider using an if/else expression: `if test { 0 } else { 42 }`
+  |
+  = note: `-D match-bool` implied by `-D warnings`
+
+error: you seem to be trying to match on a boolean expression
+  --> $DIR/match_bool.rs:10:5
+   |
+10 | /     match option == 1 {
+11 | |         true => 1,
+12 | |         false => 0,
+13 | |     };
+   | |_____^ help: consider using an if/else expression: `if option == 1 { 1 } else { 0 }`
+
+error: you seem to be trying to match on a boolean expression
+  --> $DIR/match_bool.rs:15:5
+   |
+15 | /     match test {
+16 | |         true => (),
+17 | |         false => { println!("Noooo!"); }
+18 | |     };
+   | |_____^ help: consider using an if/else expression: `if !test { println!("Noooo!"); }`
+
+error: you seem to be trying to match on a boolean expression
+  --> $DIR/match_bool.rs:20:5
+   |
+20 | /     match test {
+21 | |         false => { println!("Noooo!"); }
+22 | |         _ => (),
+23 | |     };
+   | |_____^ help: consider using an if/else expression: `if !test { println!("Noooo!"); }`
+
+error: you seem to be trying to match on a boolean expression
+  --> $DIR/match_bool.rs:25:5
+   |
+25 | /     match test && test {
+26 | |         false => { println!("Noooo!"); }
+27 | |         _ => (),
+28 | |     };
+   | |_____^ help: consider using an if/else expression: `if !(test && test) { println!("Noooo!"); }`
+
+error: equal expressions as operands to `&&`
+  --> $DIR/match_bool.rs:25:11
+   |
+25 |     match test && test {
+   |           ^^^^^^^^^^^^
+   |
+   = note: #[deny(eq_op)] on by default
+
+error: you seem to be trying to match on a boolean expression
+  --> $DIR/match_bool.rs:30:5
+   |
+30 | /     match test {
+31 | |         false => { println!("Noooo!"); }
+32 | |         true => { println!("Yes!"); }
+33 | |     };
+   | |_____^ help: consider using an if/else expression: `if test { println!("Yes!"); } else { println!("Noooo!"); }`
+
+error: aborting due to 8 previous errors
+

tests/ui/matches.rs

@@ -24,48 +24,6 @@ fn unwrap_addr() -> Option<&'static ExprNode> {
     }
 }
 
-fn match_bool() {
-    let test: bool = true;
-
-    match test {
-        true => 0,
-        false => 42,
-    };
-
-    let option = 1;
-    match option == 1 {
-        true => 1,
-        false => 0,
-    };
-
-    match test {
-        true => (),
-        false => { println!("Noooo!"); }
-    };
-
-    match test {
-        false => { println!("Noooo!"); }
-        _ => (),
-    };
-
-    match test && test {
-        false => { println!("Noooo!"); }
-        _ => (),
-    };
-
-    match test {
-        false => { println!("Noooo!"); }
-        true => { println!("Yes!"); }
-    };
-
-    // Not linted
-    match option {
-        1 ... 10 => 1,
-        11 ... 20 => 2,
-        _ => 3,
-    };
-}
-
 fn ref_pats() {
     {
         let v = &Some(0);