Auto merge of #4478 - tsurai:master, r=flip1995

[rust.git] / tests / ui / formatting.stderr

diff --git a/tests/ui/formatting.stderr b/tests/ui/formatting.stderr
index d9fee73660c769c329761420203bfb3295476fca..29a5c55bc34b7512a1528294a6c5d830e7f9eedf 100644 (file)
--- a/tests/ui/formatting.stderr
+++ b/tests/ui/formatting.stderr
@@ -1,90 +1,119 @@
-error: this looks like an `else if` but the `else` is missing
+error: this looks like an `else {..}` but the `else` is missing
   --> $DIR/formatting.rs:15:6
    |
-15 |     } if foo() {
+LL |     } {
    |      ^
    |
    = note: `-D clippy::suspicious-else-formatting` implied by `-D warnings`
+   = note: to remove this lint, add the missing `else` or add a new line before the next block
+
+error: this looks like an `else if` but the `else` is missing
+  --> $DIR/formatting.rs:19:6
+   |
+LL |     } if foo() {
+   |      ^
+   |
    = note: to remove this lint, add the missing `else` or add a new line before the second `if`
 
 error: this looks like an `else if` but the `else` is missing
-  --> $DIR/formatting.rs:22:10
+  --> $DIR/formatting.rs:26:10
    |
-22 |         } if foo() {
+LL |         } if foo() {
    |          ^
    |
    = note: to remove this lint, add the missing `else` or add a new line before the second `if`
 
 error: this looks like an `else if` but the `else` is missing
-  --> $DIR/formatting.rs:30:10
+  --> $DIR/formatting.rs:34:10
    |
-30 |         } if foo() {
+LL |         } if foo() {
    |          ^
    |
    = note: to remove this lint, add the missing `else` or add a new line before the second `if`
 
+error: this is an `else {..}` but the formatting might hide it
+  --> $DIR/formatting.rs:43:6
+   |
+LL |       } else
+   |  ______^
+LL | |     {
+   | |____^
+   |
+   = note: to remove this lint, remove the `else` or remove the new line between `else` and `{..}`
+
+error: this is an `else {..}` but the formatting might hide it
+  --> $DIR/formatting.rs:48:6
+   |
+LL |       }
+   |  ______^
+LL | |     else
+LL | |     {
+   | |____^
+   |
+   = note: to remove this lint, remove the `else` or remove the new line between `else` and `{..}`
+
 error: this is an `else if` but the formatting might hide it
-  --> $DIR/formatting.rs:39:6
+  --> $DIR/formatting.rs:54:6
    |
-39 |       } else
+LL |       } else
    |  ______^
-40 | |     if foo() { // the span of the above error should continue here
+LL | |     if foo() { // the span of the above error should continue here
    | |____^
    |
    = note: to remove this lint, remove the `else` or remove the new line between `else` and `if`
 
 error: this is an `else if` but the formatting might hide it
-  --> $DIR/formatting.rs:44:6
+  --> $DIR/formatting.rs:59:6
    |
-44 |       }
+LL |       }
    |  ______^
-45 | |     else
-46 | |     if foo() { // the span of the above error should continue here
+LL | |     else
+LL | |     if foo() { // the span of the above error should continue here
    | |____^
    |
    = note: to remove this lint, remove the `else` or remove the new line between `else` and `if`
 
 error: this looks like you are trying to use `.. -= ..`, but you really are doing `.. = (- ..)`
-  --> $DIR/formatting.rs:71:6
+  --> $DIR/formatting.rs:100:6
    |
-71 |     a =- 35;
+LL |     a =- 35;
    |      ^^^^
    |
    = note: `-D clippy::suspicious-assignment-formatting` implied by `-D warnings`
    = note: to remove this lint, use either `-=` or `= -`
 
 error: this looks like you are trying to use `.. *= ..`, but you really are doing `.. = (* ..)`
-  --> $DIR/formatting.rs:72:6
+  --> $DIR/formatting.rs:101:6
    |
-72 |     a =* &191;
+LL |     a =* &191;
    |      ^^^^
    |
    = note: to remove this lint, use either `*=` or `= *`
 
 error: this looks like you are trying to use `.. != ..`, but you really are doing `.. = (! ..)`
-  --> $DIR/formatting.rs:75:6
+  --> $DIR/formatting.rs:104:6
    |
-75 |     b =! false;
+LL |     b =! false;
    |      ^^^^
    |
    = note: to remove this lint, use either `!=` or `= !`
 
 error: possibly missing a comma here
-  --> $DIR/formatting.rs:84:19
+  --> $DIR/formatting.rs:113:19
    |
-84 |         -1, -2, -3 // <= no comma here
+LL |         -1, -2, -3 // <= no comma here
    |                   ^
    |
    = note: `-D clippy::possible-missing-comma` implied by `-D warnings`
    = note: to remove this lint, add a comma or write the expr in a single line
 
 error: possibly missing a comma here
-  --> $DIR/formatting.rs:88:19
+  --> $DIR/formatting.rs:117:19
    |
-88 |         -1, -2, -3 // <= no comma here
+LL |         -1, -2, -3 // <= no comma here
    |                   ^
    |
    = note: to remove this lint, add a comma or write the expr in a single line
 
-error: aborting due to 10 previous errors
+error: aborting due to 13 previous errors