Auto merge of #68717 - petrochenkov:stabexpat, r=varkor

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

diff --git a/tests/ui/formatting.stderr b/tests/ui/formatting.stderr
index 061540b9aa5f56c4373b4afd817d2d6cd07d47b0..e2095cc125bb7652db8fe7c147cf8f5362009b72 100644 (file)
--- a/tests/ui/formatting.stderr
+++ b/tests/ui/formatting.stderr
@@ -1,5 +1,5 @@
 error: this looks like an `else {..}` but the `else` is missing
-  --> $DIR/formatting.rs:21:6
+  --> $DIR/formatting.rs:15:6
    |
 LL |     } {
    |      ^
@@ -8,7 +8,7 @@ LL |     } {
    = 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:25:6
+  --> $DIR/formatting.rs:19:6
    |
 LL |     } if foo() {
    |      ^
@@ -16,7 +16,7 @@ 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:32:10
+  --> $DIR/formatting.rs:26:10
    |
 LL |         } if foo() {
    |          ^
@@ -24,7 +24,7 @@ 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:40:10
+  --> $DIR/formatting.rs:34:10
    |
 LL |         } if foo() {
    |          ^
@@ -32,7 +32,7 @@ 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:49:6
+  --> $DIR/formatting.rs:43:6
    |
 LL |       } else
    |  ______^
@@ -42,7 +42,7 @@ 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:54:6
+  --> $DIR/formatting.rs:48:6
    |
 LL |       }
    |  ______^
@@ -53,7 +53,7 @@ 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:60:6
+  --> $DIR/formatting.rs:54:6
    |
 LL |       } else
    |  ______^
@@ -63,7 +63,7 @@ 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:65:6
+  --> $DIR/formatting.rs:59:6
    |
 LL |       }
    |  ______^
@@ -74,7 +74,7 @@ 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:106:6
+  --> $DIR/formatting.rs:100:6
    |
 LL |     a =- 35;
    |      ^^^^
@@ -83,7 +83,7 @@ LL |     a =- 35;
    = 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:107:6
+  --> $DIR/formatting.rs:101:6
    |
 LL |     a =* &191;
    |      ^^^^
@@ -91,7 +91,7 @@ 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:110:6
+  --> $DIR/formatting.rs:104:6
    |
 LL |     b =! false;
    |      ^^^^
@@ -99,7 +99,7 @@ LL |     b =! false;
    = note: to remove this lint, use either `!=` or `= !`
 
 error: possibly missing a comma here
-  --> $DIR/formatting.rs:119:19
+  --> $DIR/formatting.rs:113:19
    |
 LL |         -1, -2, -3 // <= no comma here
    |                   ^
@@ -108,12 +108,20 @@ LL |         -1, -2, -3 // <= no comma here
    = 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:123:19
+  --> $DIR/formatting.rs:117:19
    |
 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 13 previous errors
+error: possibly missing a comma here
+  --> $DIR/formatting.rs:154:11
+   |
+LL |         -1
+   |           ^
+   |
+   = note: to remove this lint, add a comma or write the expr in a single line
+
+error: aborting due to 14 previous errors