Update remaining test files

flip1995 · flip1995 · commit 7363728d1865 · 2020-02-06T19:15:01.000+01:00
diff --git a/tests/ui/collapsible_else_if.fixed b/tests/ui/collapsible_else_if.fixed
@@ -10,57 +10,57 @@ fn main() {
     if x == "hello" {
         print!("Hello ");
     } else if y == "world" {
-    println!("world!")
-}
+        println!("world!")
+    }
 
     if x == "hello" {
         print!("Hello ");
     } else if let Some(42) = Some(42) {
-    println!("world!")
-}
+        println!("world!")
+    }
 
     if x == "hello" {
         print!("Hello ");
     } else if y == "world" {
-    println!("world")
-}
-else {
-    println!("!")
-}
+        println!("world")
+    }
+    else {
+        println!("!")
+    }
 
     if x == "hello" {
         print!("Hello ");
     } else if let Some(42) = Some(42) {
-    println!("world")
-}
-else {
-    println!("!")
-}
+        println!("world")
+    }
+    else {
+        println!("!")
+    }
 
     if let Some(42) = Some(42) {
         print!("Hello ");
     } else if let Some(42) = Some(42) {
-    println!("world")
-}
-else {
-    println!("!")
-}
+        println!("world")
+    }
+    else {
+        println!("!")
+    }
 
     if let Some(42) = Some(42) {
         print!("Hello ");
     } else if x == "hello" {
-    println!("world")
-}
-else {
-    println!("!")
-}
+        println!("world")
+    }
+    else {
+        println!("!")
+    }
 
     if let Some(42) = Some(42) {
         print!("Hello ");
     } else if let Some(42) = Some(42) {
-    println!("world")
-}
-else {
-    println!("!")
-}
+        println!("world")
+    }
+    else {
+        println!("!")
+    }
 }
diff --git a/tests/ui/collapsible_else_if.stderr b/tests/ui/collapsible_else_if.stderr
@@ -13,8 +13,8 @@ LL | |     }
 help: try
    |
 LL |     } else if y == "world" {
-LL |     println!("world!")
-LL | }
+LL |         println!("world!")
+LL |     }
    |
 
 error: this `else { if .. }` block can be collapsed
@@ -31,8 +31,8 @@ LL | |     }
 help: try
    |
 LL |     } else if let Some(42) = Some(42) {
-LL |     println!("world!")
-LL | }
+LL |         println!("world!")
+LL |     }
    |
 
 error: this `else { if .. }` block can be collapsed
@@ -51,11 +51,11 @@ LL | |     }
 help: try
    |
 LL |     } else if y == "world" {
-LL |     println!("world")
-LL | }
-LL | else {
-LL |     println!("!")
-LL | }
+LL |         println!("world")
+LL |     }
+LL |     else {
+LL |         println!("!")
+LL |     }
    |
 
 error: this `else { if .. }` block can be collapsed
@@ -74,11 +74,11 @@ LL | |     }
 help: try
    |
 LL |     } else if let Some(42) = Some(42) {
-LL |     println!("world")
-LL | }
-LL | else {
-LL |     println!("!")
-LL | }
+LL |         println!("world")
+LL |     }
+LL |     else {
+LL |         println!("!")
+LL |     }
    |
 
 error: this `else { if .. }` block can be collapsed
@@ -97,11 +97,11 @@ LL | |     }
 help: try
    |
 LL |     } else if let Some(42) = Some(42) {
-LL |     println!("world")
-LL | }
-LL | else {
-LL |     println!("!")
-LL | }
+LL |         println!("world")
+LL |     }
+LL |     else {
+LL |         println!("!")
+LL |     }
    |
 
 error: this `else { if .. }` block can be collapsed
@@ -120,11 +120,11 @@ LL | |     }
 help: try
    |
 LL |     } else if x == "hello" {
-LL |     println!("world")
-LL | }
-LL | else {
-LL |     println!("!")
-LL | }
+LL |         println!("world")
+LL |     }
+LL |     else {
+LL |         println!("!")
+LL |     }
    |
 
 error: this `else { if .. }` block can be collapsed
@@ -143,11 +143,11 @@ LL | |     }
 help: try
    |
 LL |     } else if let Some(42) = Some(42) {
-LL |     println!("world")
-LL | }
-LL | else {
-LL |     println!("!")
-LL | }
+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
@@ -7,28 +7,28 @@ fn main() {
     let x = "hello";
     let y = "world";
     if x == "hello" && y == "world" {
-    println!("Hello world!");
-}
+        println!("Hello world!");
+    }
 
     if (x == "hello" || x == "world") && (y == "world" || y == "hello") {
-    println!("Hello world!");
-}
+        println!("Hello world!");
+    }
 
     if x == "hello" && x == "world" && (y == "world" || y == "hello") {
-    println!("Hello world!");
-}
+        println!("Hello world!");
+    }
 
     if (x == "hello" || x == "world") && y == "world" && y == "hello" {
-    println!("Hello world!");
-}
+        println!("Hello world!");
+    }
 
     if x == "hello" && x == "world" && y == "world" && y == "hello" {
-    println!("Hello world!");
-}
+        println!("Hello world!");
+    }
 
     if 42 == 1337 && 'a' != 'A' {
-    println!("world!")
-}
+        println!("world!")
+    }
 
     // Works because any if with an else statement cannot be collapsed.
     if x == "hello" {
@@ -81,8 +81,8 @@ fn main() {
     }
 
     if x == "hello" && y == "world" { // Collapsible
-    println!("Hello world!");
-}
+        println!("Hello world!");
+    }
 
     if x == "hello" {
         print!("Hello ");
diff --git a/tests/ui/collapsible_if.stderr b/tests/ui/collapsible_if.stderr
@@ -12,8 +12,8 @@ LL | |     }
 help: try
    |
 LL |     if x == "hello" && y == "world" {
-LL |     println!("Hello world!");
-LL | }
+LL |         println!("Hello world!");
+LL |     }
    |
 
 error: this `if` statement can be collapsed
@@ -29,8 +29,8 @@ LL | |     }
 help: try
    |
 LL |     if (x == "hello" || x == "world") && (y == "world" || y == "hello") {
-LL |     println!("Hello world!");
-LL | }
+LL |         println!("Hello world!");
+LL |     }
    |
 
 error: this `if` statement can be collapsed
@@ -46,8 +46,8 @@ LL | |     }
 help: try
    |
 LL |     if x == "hello" && x == "world" && (y == "world" || y == "hello") {
-LL |     println!("Hello world!");
-LL | }
+LL |         println!("Hello world!");
+LL |     }
    |
 
 error: this `if` statement can be collapsed
@@ -63,8 +63,8 @@ LL | |     }
 help: try
    |
 LL |     if (x == "hello" || x == "world") && y == "world" && y == "hello" {
-LL |     println!("Hello world!");
-LL | }
+LL |         println!("Hello world!");
+LL |     }
    |
 
 error: this `if` statement can be collapsed
@@ -80,8 +80,8 @@ LL | |     }
 help: try
    |
 LL |     if x == "hello" && x == "world" && y == "world" && y == "hello" {
-LL |     println!("Hello world!");
-LL | }
+LL |         println!("Hello world!");
+LL |     }
    |
 
 error: this `if` statement can be collapsed
@@ -97,8 +97,8 @@ LL | |     }
 help: try
    |
 LL |     if 42 == 1337 && 'a' != 'A' {
-LL |     println!("world!")
-LL | }
+LL |         println!("world!")
+LL |     }
    |
 
 error: this `if` statement can be collapsed
@@ -114,8 +114,8 @@ LL | |     }
 help: try
    |
 LL |     if x == "hello" && y == "world" { // Collapsible
-LL |     println!("Hello world!");
-LL | }
+LL |         println!("Hello world!");
+LL |     }
    |
 
 error: aborting due to 7 previous errors
diff --git a/tests/ui/match_bool.stderr b/tests/ui/match_bool.stderr
@@ -40,8 +40,8 @@ LL | |     };
 help: consider using an `if`/`else` expression
    |
 LL |     if !test {
-LL |     println!("Noooo!");
-LL | };
+LL |         println!("Noooo!");
+LL |     };
    |
 
 error: you seem to be trying to match on a boolean expression
@@ -58,8 +58,8 @@ LL | |     };
 help: consider using an `if`/`else` expression
    |
 LL |     if !test {
-LL |     println!("Noooo!");
-LL | };
+LL |         println!("Noooo!");
+LL |     };
    |
 
 error: you seem to be trying to match on a boolean expression
@@ -76,8 +76,8 @@ LL | |     };
 help: consider using an `if`/`else` expression
    |
 LL |     if !(test && test) {
-LL |     println!("Noooo!");
-LL | };
+LL |         println!("Noooo!");
+LL |     };
    |
 
 error: equal expressions as operands to `&&`
@@ -103,10 +103,10 @@ LL | |     };
 help: consider using an `if`/`else` expression
    |
 LL |     if test {
-LL |     println!("Yes!");
-LL | } else {
-LL |     println!("Noooo!");
-LL | };
+LL |         println!("Yes!");
+LL |     } else {
+LL |         println!("Noooo!");
+LL |     };
    |
 
 error: aborting due to 8 previous errors
diff --git a/tests/ui/single_match.stderr b/tests/ui/single_match.stderr
@@ -13,8 +13,8 @@ LL | |     };
 help: try this
    |
 LL |     if let Some(y) = x {
-LL |     println!("{:?}", y);
-LL | };
+LL |         println!("{:?}", y);
+LL |     };
    |
 
 error: you seem to be trying to use match for destructuring a single pattern. Consider using `if let`
diff --git a/tests/ui/single_match_else.stderr b/tests/ui/single_match_else.stderr
@@ -14,9 +14,9 @@ LL | |     }
 help: try this
    |
 LL |     if let ExprNode::ExprAddrOf = ExprNode::Butterflies { Some(&NODE) } else {
-LL |     let x = 5;
-LL |     None
-LL | }
+LL |         let x = 5;
+LL |         None
+LL |     }
    |
 
 error: aborting due to previous error

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ LL \| \| }`
`12`	`12`	`help: try`
`13`	`13`	`\|`
`14`	`14`	`LL \| if x == "hello" && y == "world" {`
`15`		`-LL \| println!("Hello world!");`
`16`		`-LL \| }`
	`15`	`+LL \| println!("Hello world!");`
	`16`	`+LL \| }`
`17`	`17`	`\|`
`18`	`18`
`19`	`19`	error: this `if` statement can be collapsed
`@@ -29,8 +29,8 @@ LL \| \| }`
`29`	`29`	`help: try`
`30`	`30`	`\|`
`31`	`31`	`LL \| if (x == "hello" \|\| x == "world") && (y == "world" \|\| y == "hello") {`
`32`		`-LL \| println!("Hello world!");`
`33`		`-LL \| }`
	`32`	`+LL \| println!("Hello world!");`
	`33`	`+LL \| }`
`34`	`34`	`\|`
`35`	`35`
`36`	`36`	error: this `if` statement can be collapsed
`@@ -46,8 +46,8 @@ LL \| \| }`
`46`	`46`	`help: try`
`47`	`47`	`\|`
`48`	`48`	`LL \| if x == "hello" && x == "world" && (y == "world" \|\| y == "hello") {`
`49`		`-LL \| println!("Hello world!");`
`50`		`-LL \| }`
	`49`	`+LL \| println!("Hello world!");`
	`50`	`+LL \| }`
`51`	`51`	`\|`
`52`	`52`
`53`	`53`	error: this `if` statement can be collapsed
`@@ -63,8 +63,8 @@ LL \| \| }`
`63`	`63`	`help: try`
`64`	`64`	`\|`
`65`	`65`	`LL \| if (x == "hello" \|\| x == "world") && y == "world" && y == "hello" {`
`66`		`-LL \| println!("Hello world!");`
`67`		`-LL \| }`
	`66`	`+LL \| println!("Hello world!");`
	`67`	`+LL \| }`
`68`	`68`	`\|`
`69`	`69`
`70`	`70`	error: this `if` statement can be collapsed
`@@ -80,8 +80,8 @@ LL \| \| }`
`80`	`80`	`help: try`
`81`	`81`	`\|`
`82`	`82`	`LL \| if x == "hello" && x == "world" && y == "world" && y == "hello" {`
`83`		`-LL \| println!("Hello world!");`
`84`		`-LL \| }`
	`83`	`+LL \| println!("Hello world!");`
	`84`	`+LL \| }`
`85`	`85`	`\|`
`86`	`86`
`87`	`87`	error: this `if` statement can be collapsed
`@@ -97,8 +97,8 @@ LL \| \| }`
`97`	`97`	`help: try`
`98`	`98`	`\|`
`99`	`99`	`LL \| if 42 == 1337 && 'a' != 'A' {`
`100`		`-LL \| println!("world!")`
`101`		`-LL \| }`
	`100`	`+LL \| println!("world!")`
	`101`	`+LL \| }`
`102`	`102`	`\|`
`103`	`103`
`104`	`104`	error: this `if` statement can be collapsed
`@@ -114,8 +114,8 @@ LL \| \| }`
`114`	`114`	`help: try`
`115`	`115`	`\|`
`116`	`116`	`LL \| if x == "hello" && y == "world" { // Collapsible`
`117`		`-LL \| println!("Hello world!");`
`118`		`-LL \| }`
	`117`	`+LL \| println!("Hello world!");`
	`118`	`+LL \| }`
`119`	`119`	`\|`
`120`	`120`
`121`	`121`	`error: aborting due to 7 previous errors`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ LL \| \| };`
`40`	`40`	help: consider using an `if`/`else` expression
`41`	`41`	`\|`
`42`	`42`	`LL \| if !test {`
`43`		`-LL \| println!("Noooo!");`
`44`		`-LL \| };`
	`43`	`+LL \| println!("Noooo!");`
	`44`	`+LL \| };`
`45`	`45`	`\|`
`46`	`46`
`47`	`47`	`error: you seem to be trying to match on a boolean expression`
`@@ -58,8 +58,8 @@ LL \| \| };`
`58`	`58`	help: consider using an `if`/`else` expression
`59`	`59`	`\|`
`60`	`60`	`LL \| if !test {`
`61`		`-LL \| println!("Noooo!");`
`62`		`-LL \| };`
	`61`	`+LL \| println!("Noooo!");`
	`62`	`+LL \| };`
`63`	`63`	`\|`
`64`	`64`
`65`	`65`	`error: you seem to be trying to match on a boolean expression`
`@@ -76,8 +76,8 @@ LL \| \| };`
`76`	`76`	help: consider using an `if`/`else` expression
`77`	`77`	`\|`
`78`	`78`	`LL \| if !(test && test) {`
`79`		`-LL \| println!("Noooo!");`
`80`		`-LL \| };`
	`79`	`+LL \| println!("Noooo!");`
	`80`	`+LL \| };`
`81`	`81`	`\|`
`82`	`82`
`83`	`83`	error: equal expressions as operands to `&&`
`@@ -103,10 +103,10 @@ LL \| \| };`
`103`	`103`	help: consider using an `if`/`else` expression
`104`	`104`	`\|`
`105`	`105`	`LL \| if test {`
`106`		`-LL \| println!("Yes!");`
`107`		`-LL \| } else {`
`108`		`-LL \| println!("Noooo!");`
`109`		`-LL \| };`
	`106`	`+LL \| println!("Yes!");`
	`107`	`+LL \| } else {`
	`108`	`+LL \| println!("Noooo!");`
	`109`	`+LL \| };`
`110`	`110`	`\|`
`111`	`111`
`112`	`112`	`error: aborting due to 8 previous errors`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ LL \| \| };`
`13`	`13`	`help: try this`
`14`	`14`	`\|`
`15`	`15`	`LL \| if let Some(y) = x {`
`16`		`-LL \| println!("{:?}", y);`
`17`		`-LL \| };`
	`16`	`+LL \| println!("{:?}", y);`
	`17`	`+LL \| };`
`18`	`18`	`\|`
`19`	`19`
`20`	`20`	error: you seem to be trying to use match for destructuring a single pattern. Consider using `if let`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ LL \| \| }`
`14`	`14`	`help: try this`
`15`	`15`	`\|`
`16`	`16`	`LL \| if let ExprNode::ExprAddrOf = ExprNode::Butterflies { Some(&NODE) } else {`
`17`		`-LL \| let x = 5;`
`18`		`-LL \| None`
`19`		`-LL \| }`
	`17`	`+LL \| let x = 5;`
	`18`	`+LL \| None`
	`19`	`+LL \| }`
`20`	`20`	`\|`
`21`	`21`
`22`	`22`	`error: aborting due to previous error`