From dd40e0b4eeef38d62e7053733ac7c2a327b135de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Esteban=20K=C3=BCber?= <esteban@kuber.com.ar>
Date: Thu, 11 Jul 2024 21:42:15 +0000
Subject: [PATCH] Tweak tests to avoid confusing suggestion output

---
 tests/ui/enum/nested-enum.rs                             | 9 ++++++---
 tests/ui/enum/nested-enum.stderr                         | 7 ++-----
 .../fn-no-semicolon-issue-124935-semi-after-item.rs      | 3 ++-
 .../fn-no-semicolon-issue-124935-semi-after-item.stderr  | 1 -
 .../issues/missing-main-issue-124935-semi-after-item.rs  | 3 ++-
 .../missing-main-issue-124935-semi-after-item.stderr     | 1 -
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/ui/enum/nested-enum.rs b/tests/ui/enum/nested-enum.rs
index 80957b8a14c2..ff39fdee6bc6 100644
--- a/tests/ui/enum/nested-enum.rs
+++ b/tests/ui/enum/nested-enum.rs
@@ -1,7 +1,10 @@
 enum Foo {
-    enum Bar { Baz }, //~ ERROR `enum` definition cannot be nested inside `enum`
-    struct Quux { field: u8 }, //~ ERROR `struct` definition cannot be nested inside `enum`
-    union Wibble { field: u8 }, //~ ERROR `union` definition cannot be nested inside `enum`
+    enum Bar { Baz },
+    //~^ ERROR `enum` definition cannot be nested inside `enum`
+    struct Quux { field: u8 },
+    //~^ ERROR `struct` definition cannot be nested inside `enum`
+    union Wibble { field: u8 },
+    //~^ ERROR `union` definition cannot be nested inside `enum`
     Bat,
 }
 
diff --git a/tests/ui/enum/nested-enum.stderr b/tests/ui/enum/nested-enum.stderr
index 0f9c8025c452..78df333abb31 100644
--- a/tests/ui/enum/nested-enum.stderr
+++ b/tests/ui/enum/nested-enum.stderr
@@ -7,11 +7,10 @@ LL |     enum Bar { Baz },
 help: consider creating a new `enum` definition instead of nesting
    |
 LL -     enum Bar { Baz },
-LL +
    |
 
 error: `struct` definition cannot be nested inside `enum`
-  --> $DIR/nested-enum.rs:3:5
+  --> $DIR/nested-enum.rs:4:5
    |
 LL |     struct Quux { field: u8 },
    |     ^^^^^^
@@ -19,11 +18,10 @@ LL |     struct Quux { field: u8 },
 help: consider creating a new `struct` definition instead of nesting
    |
 LL -     struct Quux { field: u8 },
-LL +
    |
 
 error: `union` definition cannot be nested inside `enum`
-  --> $DIR/nested-enum.rs:4:5
+  --> $DIR/nested-enum.rs:6:5
    |
 LL |     union Wibble { field: u8 },
    |     ^^^^^
@@ -31,7 +29,6 @@ LL |     union Wibble { field: u8 },
 help: consider creating a new `union` definition instead of nesting
    |
 LL -     union Wibble { field: u8 },
-LL +
    |
 
 error: aborting due to 3 previous errors
diff --git a/tests/ui/parser/issues/fn-no-semicolon-issue-124935-semi-after-item.rs b/tests/ui/parser/issues/fn-no-semicolon-issue-124935-semi-after-item.rs
index 3c0059ba3e3e..c9fb08506ddb 100644
--- a/tests/ui/parser/issues/fn-no-semicolon-issue-124935-semi-after-item.rs
+++ b/tests/ui/parser/issues/fn-no-semicolon-issue-124935-semi-after-item.rs
@@ -2,5 +2,6 @@
 // Tests that we do not erroneously emit an error about
 // missing main function when the mod starts with a `;`
 
-; //~ ERROR expected item, found `;`
+;
+//~^ ERROR expected item, found `;`
 fn main() { }
diff --git a/tests/ui/parser/issues/fn-no-semicolon-issue-124935-semi-after-item.stderr b/tests/ui/parser/issues/fn-no-semicolon-issue-124935-semi-after-item.stderr
index c0d85aa17d2a..002dc028cf55 100644
--- a/tests/ui/parser/issues/fn-no-semicolon-issue-124935-semi-after-item.stderr
+++ b/tests/ui/parser/issues/fn-no-semicolon-issue-124935-semi-after-item.stderr
@@ -7,7 +7,6 @@ LL | ;
 help: remove this semicolon
    |
 LL - ;
-LL +
    |
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/parser/issues/missing-main-issue-124935-semi-after-item.rs b/tests/ui/parser/issues/missing-main-issue-124935-semi-after-item.rs
index 3fbac5fae232..a8a608c191a8 100644
--- a/tests/ui/parser/issues/missing-main-issue-124935-semi-after-item.rs
+++ b/tests/ui/parser/issues/missing-main-issue-124935-semi-after-item.rs
@@ -2,4 +2,5 @@
 // Tests that we still emit an error after an item.
 
 fn main() { }
-; //~ ERROR expected item, found `;`
+;
+//~^ ERROR expected item, found `;`
diff --git a/tests/ui/parser/issues/missing-main-issue-124935-semi-after-item.stderr b/tests/ui/parser/issues/missing-main-issue-124935-semi-after-item.stderr
index 8d4f23683863..aae5c1e1b22f 100644
--- a/tests/ui/parser/issues/missing-main-issue-124935-semi-after-item.stderr
+++ b/tests/ui/parser/issues/missing-main-issue-124935-semi-after-item.stderr
@@ -8,7 +8,6 @@ LL | ;
 help: remove this semicolon
    |
 LL - ;
-LL +
    |
 
 error: aborting due to 1 previous error