Move error checks out of span for easier to follow `.stderr`

diff --git a/src/test/ui/macro_backtrace/main.rs b/src/test/ui/macro_backtrace/main.rs
index 77faac17d1a2877d08238a2d43c62f8fa0f543e8..72a5c0d5e3728bd696b3c1a94c6bbf61ce2a7a51 100644 (file)
--- a/src/test/ui/macro_backtrace/main.rs
+++ b/src/test/ui/macro_backtrace/main.rs
@@ -17,10 +17,10 @@
 // a local macro
 macro_rules! pong {
     () => { syntax error };
-    //~^ ERROR expected one of
-    //~| ERROR expected one of
-    //~| ERROR expected one of
 }
+//~^^ ERROR expected one of
+//~| ERROR expected one of
+//~| ERROR expected one of
 
 fn main() {
     pong!();

diff --git a/src/test/ui/macro_backtrace/main.stderr b/src/test/ui/macro_backtrace/main.stderr
index e543a9f5bc0c9a61f0aee52cd03e46c327f18bcd..5990f71b3ca0ad1f7b74d980855f0d201f254187 100644 (file)
--- a/src/test/ui/macro_backtrace/main.stderr
+++ b/src/test/ui/macro_backtrace/main.stderr
@@ -4,10 +4,7 @@ error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found
 18 | / macro_rules! pong {
 19 | |     () => { syntax error };
    | |                    ^^^^^ expected one of 8 possible tokens here
-20 | |     //~^ ERROR expected one of
-21 | |     //~| ERROR expected one of
-22 | |     //~| ERROR expected one of
-23 | | }
+20 | | }
    | |_- in this expansion of `pong!`
 ...
 26 |       pong!();
@@ -19,10 +16,7 @@ error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found
 18 | / macro_rules! pong {
 19 | |     () => { syntax error };
    | |                    ^^^^^ expected one of 8 possible tokens here
-20 | |     //~^ ERROR expected one of
-21 | |     //~| ERROR expected one of
-22 | |     //~| ERROR expected one of
-23 | | }
+20 | | }
    | |_- in this expansion of `pong!`
 ...
 27 |       ping!();
@@ -42,10 +36,7 @@ error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found
 18 | / macro_rules! pong {
 19 | |     () => { syntax error };
    | |                    ^^^^^ expected one of 8 possible tokens here
-20 | |     //~^ ERROR expected one of
-21 | |     //~| ERROR expected one of
-22 | |     //~| ERROR expected one of
-23 | | }
+20 | | }
    | |_- in this expansion of `pong!` (#5)
 ...
 28 |       deep!();