From d4b8e99540ed815f7c0187cf2db8a2e4c0a61d8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20K=C3=BCber?= Date: Wed, 13 Dec 2017 11:27:18 -0800 Subject: [PATCH] Move error checks out of span for easier to follow `.stderr` --- src/test/ui/macro_backtrace/main.rs | 6 +++--- src/test/ui/macro_backtrace/main.stderr | 15 +++------------ 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/test/ui/macro_backtrace/main.rs b/src/test/ui/macro_backtrace/main.rs index 77faac17d1a..72a5c0d5e37 100644 --- 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 e543a9f5bc0..5990f71b3ca 100644 --- 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!();