Tweak tests to avoid confusing suggestion output

Author: estebank

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,
 }
 

tests/ui/enum/nested-enum.stderr

@@ -7,31 +7,28 @@ 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 },
    |     ^^^^^^
    |
 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 },
    |     ^^^^^
    |
 help: consider creating a new `union` definition instead of nesting
    |
 LL -     union Wibble { field: u8 },
-LL +
    |
 
 error: aborting due to 3 previous errors

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() { }

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

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 `;`

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