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

rust-lang · Dec 13, 2017 · d4b8e99 · d4b8e99
1 parent b7bb67a
commit d4b8e99
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git 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
@@ -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!();