Auto merge of #5011 - JohnTitor:split-collapsible-if, r=flip1995

Split up `collapsible_if` ui test Part of #2038 changelog: none
rust-lang · Jan 7, 2020 · fdccfe7 · fdccfe7
2 parents cdd1347 + 175c78b
commit fdccfe7
Show file tree

Hide file tree

Showing 6 changed files with 302 additions and 283 deletions.
diff --git a/tests/ui/collapsible_else_if.fixed b/tests/ui/collapsible_else_if.fixed
@@ -0,0 +1,66 @@
+// run-rustfix
+#![allow(clippy::cognitive_complexity, clippy::assertions_on_constants)]
+
+#[rustfmt::skip]
+#[warn(clippy::collapsible_if)]
+fn main() {
+    let x = "hello";
+    let y = "world";
+    // Collapse `else { if .. }` to `else if ..`
+    if x == "hello" {
+        print!("Hello ");
+    } else if y == "world" {
+    println!("world!")
+}
+
+    if x == "hello" {
+        print!("Hello ");
+    } else if let Some(42) = Some(42) {
+    println!("world!")
+}
+
+    if x == "hello" {
+        print!("Hello ");
+    } else if y == "world" {
+    println!("world")
+}
+else {
+    println!("!")
+}
+
+    if x == "hello" {
+        print!("Hello ");
+    } else if let Some(42) = Some(42) {
+    println!("world")
+}
+else {
+    println!("!")
+}
+
+    if let Some(42) = Some(42) {
+        print!("Hello ");
+    } else if let Some(42) = Some(42) {
+    println!("world")
+}
+else {
+    println!("!")
+}
+
+    if let Some(42) = Some(42) {
+        print!("Hello ");
+    } else if x == "hello" {
+    println!("world")
+}
+else {
+    println!("!")
+}
+
+    if let Some(42) = Some(42) {
+        print!("Hello ");
+    } else if let Some(42) = Some(42) {
+    println!("world")
+}
+else {
+    println!("!")
+}
+}
diff --git a/tests/ui/collapsible_else_if.rs b/tests/ui/collapsible_else_if.rs
@@ -0,0 +1,80 @@
+// run-rustfix
+#![allow(clippy::cognitive_complexity, clippy::assertions_on_constants)]
+
+#[rustfmt::skip]
+#[warn(clippy::collapsible_if)]
+fn main() {
+    let x = "hello";
+    let y = "world";
+    // Collapse `else { if .. }` to `else if ..`
+    if x == "hello" {
+        print!("Hello ");
+    } else {
+        if y == "world" {
+            println!("world!")
+        }
+    }
+
+    if x == "hello" {
+        print!("Hello ");
+    } else {
+        if let Some(42) = Some(42) {
+            println!("world!")
+        }
+    }
+
+    if x == "hello" {
+        print!("Hello ");
+    } else {
+        if y == "world" {
+            println!("world")
+        }
+        else {
+            println!("!")
+        }
+    }
+
+    if x == "hello" {
+        print!("Hello ");
+    } else {
+        if let Some(42) = Some(42) {
+            println!("world")
+        }
+        else {
+            println!("!")
+        }
+    }
+
+    if let Some(42) = Some(42) {
+        print!("Hello ");
+    } else {
+        if let Some(42) = Some(42) {
+            println!("world")
+        }
+        else {
+            println!("!")
+        }
+    }
+
+    if let Some(42) = Some(42) {
+        print!("Hello ");
+    } else {
+        if x == "hello" {
+            println!("world")
+        }
+        else {
+            println!("!")
+        }
+    }
+
+    if let Some(42) = Some(42) {
+        print!("Hello ");
+    } else {
+        if let Some(42) = Some(42) {
+            println!("world")
+        }
+        else {
+            println!("!")
+        }
+    }
+}
diff --git a/tests/ui/collapsible_else_if.stderr b/tests/ui/collapsible_else_if.stderr
@@ -0,0 +1,154 @@
+error: this `else { if .. }` block can be collapsed
+  --> $DIR/collapsible_else_if.rs:12:12
+   |
+LL |       } else {
+   |  ____________^
+LL | |         if y == "world" {
+LL | |             println!("world!")
+LL | |         }
+LL | |     }
+   | |_____^
+   |
+   = note: `-D clippy::collapsible-if` implied by `-D warnings`
+help: try
+   |
+LL |     } else if y == "world" {
+LL |     println!("world!")
+LL | }
+   |
+
+error: this `else { if .. }` block can be collapsed
+  --> $DIR/collapsible_else_if.rs:20:12
+   |
+LL |       } else {
+   |  ____________^
+LL | |         if let Some(42) = Some(42) {
+LL | |             println!("world!")
+LL | |         }
+LL | |     }
+   | |_____^
+   |
+help: try
+   |
+LL |     } else if let Some(42) = Some(42) {
+LL |     println!("world!")
+LL | }
+   |
+
+error: this `else { if .. }` block can be collapsed
+  --> $DIR/collapsible_else_if.rs:28:12
+   |
+LL |       } else {
+   |  ____________^
+LL | |         if y == "world" {
+LL | |             println!("world")
+LL | |         }
+...  |
+LL | |         }
+LL | |     }
+   | |_____^
+   |
+help: try
+   |
+LL |     } else if y == "world" {
+LL |     println!("world")
+LL | }
+LL | else {
+LL |     println!("!")
+LL | }
+   |
+
+error: this `else { if .. }` block can be collapsed
+  --> $DIR/collapsible_else_if.rs:39:12
+   |
+LL |       } else {
+   |  ____________^
+LL | |         if let Some(42) = Some(42) {
+LL | |             println!("world")
+LL | |         }
+...  |
+LL | |         }
+LL | |     }
+   | |_____^
+   |
+help: try
+   |
+LL |     } else if let Some(42) = Some(42) {
+LL |     println!("world")
+LL | }
+LL | else {
+LL |     println!("!")
+LL | }
+   |
+
+error: this `else { if .. }` block can be collapsed
+  --> $DIR/collapsible_else_if.rs:50:12
+   |
+LL |       } else {
+   |  ____________^
+LL | |         if let Some(42) = Some(42) {
+LL | |             println!("world")
+LL | |         }
+...  |
+LL | |         }
+LL | |     }
+   | |_____^
+   |
+help: try
+   |
+LL |     } else if let Some(42) = Some(42) {
+LL |     println!("world")
+LL | }
+LL | else {
+LL |     println!("!")
+LL | }
+   |
+
+error: this `else { if .. }` block can be collapsed
+  --> $DIR/collapsible_else_if.rs:61:12
+   |
+LL |       } else {
+   |  ____________^
+LL | |         if x == "hello" {
+LL | |             println!("world")
+LL | |         }
+...  |
+LL | |         }
+LL | |     }
+   | |_____^
+   |
+help: try
+   |
+LL |     } else if x == "hello" {
+LL |     println!("world")
+LL | }
+LL | else {
+LL |     println!("!")
+LL | }
+   |
+
+error: this `else { if .. }` block can be collapsed
+  --> $DIR/collapsible_else_if.rs:72:12
+   |
+LL |       } else {
+   |  ____________^
+LL | |         if let Some(42) = Some(42) {
+LL | |             println!("world")
+LL | |         }
+...  |
+LL | |         }
+LL | |     }
+   | |_____^
+   |
+help: try
+   |
+LL |     } else if let Some(42) = Some(42) {
+LL |     println!("world")
+LL | }
+LL | else {
+LL |     println!("!")
+LL | }
+   |
+
+error: aborting due to 7 previous errors
+
diff --git a/tests/ui/collapsible_if.fixed b/tests/ui/collapsible_if.fixed
@@ -30,64 +30,6 @@ fn main() {
     println!("world!")
 }
 
-    // Collapse `else { if .. }` to `else if ..`
-    if x == "hello" {
-        print!("Hello ");
-    } else if y == "world" {
-    println!("world!")
-}
-
-    if x == "hello" {
-        print!("Hello ");
-    } else if let Some(42) = Some(42) {
-    println!("world!")
-}
-
-    if x == "hello" {
-        print!("Hello ");
-    } else if y == "world" {
-    println!("world")
-}
-else {
-    println!("!")
-}
-
-    if x == "hello" {
-        print!("Hello ");
-    } else if let Some(42) = Some(42) {
-    println!("world")
-}
-else {
-    println!("!")
-}
-
-    if let Some(42) = Some(42) {
-        print!("Hello ");
-    } else if let Some(42) = Some(42) {
-    println!("world")
-}
-else {
-    println!("!")
-}
-
-    if let Some(42) = Some(42) {
-        print!("Hello ");
-    } else if x == "hello" {
-    println!("world")
-}
-else {
-    println!("!")
-}
-
-    if let Some(42) = Some(42) {
-        print!("Hello ");
-    } else if let Some(42) = Some(42) {
-    println!("world")
-}
-else {
-    println!("!")
-}
-
     // Works because any if with an else statement cannot be collapsed.
     if x == "hello" {
         if y == "world" {