From 1ab45ec7e366f6f16a6a3d0a58cacb0ee48ef406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20K=C3=BCber?= Date: Wed, 24 Oct 2018 11:34:23 -0700 Subject: [PATCH] Point to macro def span instead of whole body --- src/libsyntax/ext/tt/macro_rules.rs | 2 +- src/test/ui/empty/empty-comment.stderr | 10 +- src/test/ui/issues/issue-7970a.stderr | 10 +- ...-at-most-once-rep-2018-feature-gate.stderr | 36 ++---- .../macros/macro-at-most-once-rep-2018.stderr | 110 +++++++----------- src/test/ui/macros/macro-non-lifetime.stderr | 2 +- src/test/ui/macros/missing-comma.stderr | 68 ++++------- src/test/ui/macros/trace_faulty_macros.stderr | 16 ++- .../parser/macro/macro-doc-comments-1.stderr | 10 +- .../parser/macro/macro-doc-comments-2.stderr | 10 +- src/test/ui/underscore-ident-matcher.stderr | 12 +- 11 files changed, 107 insertions(+), 179 deletions(-) diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index 41e8cbe550211..03fb89b21a43c 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -187,7 +187,7 @@ fn generic_extension<'cx>(cx: &'cx mut ExtCtxt, err.span_label(span, best_fail_msg); if let Some(sp) = def_span { if cx.source_map().span_to_filename(sp).is_real() && !sp.is_dummy() { - err.span_label(sp, "when calling this macro"); + err.span_label(cx.source_map().def_span(sp), "when calling this macro"); } } diff --git a/src/test/ui/empty/empty-comment.stderr b/src/test/ui/empty/empty-comment.stderr index e15f347f49d9c..de826102081e7 100644 --- a/src/test/ui/empty/empty-comment.stderr +++ b/src/test/ui/empty/empty-comment.stderr @@ -1,13 +1,11 @@ error: unexpected end of macro invocation --> $DIR/empty-comment.rs:20:5 | -LL | / macro_rules! one_arg_macro { -LL | | ($fmt:expr) => (print!(concat!($fmt, "/n"))); -LL | | } - | |_- when calling this macro +LL | macro_rules! one_arg_macro { + | -------------------------- when calling this macro ... -LL | one_arg_macro!(/**/); //~ ERROR unexpected end - | ^^^^^^^^^^^^^^^^^^^^^ unexpected end of macro invocation +LL | one_arg_macro!(/**/); //~ ERROR unexpected end + | ^^^^^^^^^^^^^^^^^^^^^ unexpected end of macro invocation error: aborting due to previous error diff --git a/src/test/ui/issues/issue-7970a.stderr b/src/test/ui/issues/issue-7970a.stderr index 94beebf514e17..96fb374b58c6c 100644 --- a/src/test/ui/issues/issue-7970a.stderr +++ b/src/test/ui/issues/issue-7970a.stderr @@ -1,13 +1,11 @@ error: unexpected end of macro invocation --> $DIR/issue-7970a.rs:16:5 | -LL | / macro_rules! one_arg_macro { -LL | | ($fmt:expr) => (print!(concat!($fmt, "/n"))); -LL | | } - | |_- when calling this macro +LL | macro_rules! one_arg_macro { + | -------------------------- when calling this macro ... -LL | one_arg_macro!(); - | ^^^^^^^^^^^^^^^^^ unexpected end of macro invocation +LL | one_arg_macro!(); + | ^^^^^^^^^^^^^^^^^ unexpected end of macro invocation error: aborting due to previous error diff --git a/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.stderr b/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.stderr index 6f77eb634399b..7705ba3b11ed5 100644 --- a/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.stderr +++ b/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.stderr @@ -51,41 +51,29 @@ LL | ($(a)?*) => {} error: no rules expected the token `?` --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:41:11 | -LL | / macro_rules! foo { -LL | | ($(a)?) => {} -LL | | //~^ERROR using the `?` macro Kleene operator for -LL | | //~|ERROR expected `*` or `+` -LL | | } - | |_- when calling this macro +LL | macro_rules! foo { + | ---------------- when calling this macro ... -LL | foo!(a?); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` +LL | foo!(a?); //~ ERROR no rules expected the token `?` + | ^ no rules expected the token `?` error: no rules expected the token `?` --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:42:11 | -LL | / macro_rules! foo { -LL | | ($(a)?) => {} -LL | | //~^ERROR using the `?` macro Kleene operator for -LL | | //~|ERROR expected `*` or `+` -LL | | } - | |_- when calling this macro +LL | macro_rules! foo { + | ---------------- when calling this macro ... -LL | foo!(a?a); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` +LL | foo!(a?a); //~ ERROR no rules expected the token `?` + | ^ no rules expected the token `?` error: no rules expected the token `?` --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:43:11 | -LL | / macro_rules! foo { -LL | | ($(a)?) => {} -LL | | //~^ERROR using the `?` macro Kleene operator for -LL | | //~|ERROR expected `*` or `+` -LL | | } - | |_- when calling this macro +LL | macro_rules! foo { + | ---------------- when calling this macro ... -LL | foo!(a?a?a); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` +LL | foo!(a?a?a); //~ ERROR no rules expected the token `?` + | ^ no rules expected the token `?` error: aborting due to 10 previous errors diff --git a/src/test/ui/macros/macro-at-most-once-rep-2018.stderr b/src/test/ui/macros/macro-at-most-once-rep-2018.stderr index 3bdfae5ccdf7f..25dd66b81f567 100644 --- a/src/test/ui/macros/macro-at-most-once-rep-2018.stderr +++ b/src/test/ui/macros/macro-at-most-once-rep-2018.stderr @@ -7,123 +7,101 @@ LL | ($(a),?) => {} //~ERROR the `?` macro repetition operator error: no rules expected the token `?` --> $DIR/macro-at-most-once-rep-2018.rs:36:11 | -LL | / macro_rules! foo { -LL | | ($(a)?) => {} -LL | | } - | |_- when calling this macro +LL | macro_rules! foo { + | ---------------- when calling this macro ... -LL | foo!(a?); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` +LL | foo!(a?); //~ ERROR no rules expected the token `?` + | ^ no rules expected the token `?` error: no rules expected the token `?` --> $DIR/macro-at-most-once-rep-2018.rs:37:11 | -LL | / macro_rules! foo { -LL | | ($(a)?) => {} -LL | | } - | |_- when calling this macro +LL | macro_rules! foo { + | ---------------- when calling this macro ... -LL | foo!(a?a); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` +LL | foo!(a?a); //~ ERROR no rules expected the token `?` + | ^ no rules expected the token `?` error: no rules expected the token `?` --> $DIR/macro-at-most-once-rep-2018.rs:38:11 | -LL | / macro_rules! foo { -LL | | ($(a)?) => {} -LL | | } - | |_- when calling this macro +LL | macro_rules! foo { + | ---------------- when calling this macro ... -LL | foo!(a?a?a); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` +LL | foo!(a?a?a); //~ ERROR no rules expected the token `?` + | ^ no rules expected the token `?` error: unexpected end of macro invocation --> $DIR/macro-at-most-once-rep-2018.rs:40:5 | -LL | / macro_rules! barplus { -LL | | ($(a)?+) => {} // ok. matches "a+" and "+" -LL | | } - | |_- when calling this macro +LL | macro_rules! barplus { + | -------------------- when calling this macro ... -LL | barplus!(); //~ERROR unexpected end of macro invocation - | ^^^^^^^^^^^ unexpected end of macro invocation +LL | barplus!(); //~ERROR unexpected end of macro invocation + | ^^^^^^^^^^^ unexpected end of macro invocation error: unexpected end of macro invocation --> $DIR/macro-at-most-once-rep-2018.rs:41:14 | -LL | / macro_rules! barplus { -LL | | ($(a)?+) => {} // ok. matches "a+" and "+" -LL | | } - | |_- when calling this macro +LL | macro_rules! barplus { + | -------------------- when calling this macro ... -LL | barplus!(a); //~ERROR unexpected end of macro invocation - | ^ unexpected end of macro invocation +LL | barplus!(a); //~ERROR unexpected end of macro invocation + | ^ unexpected end of macro invocation error: no rules expected the token `?` --> $DIR/macro-at-most-once-rep-2018.rs:42:15 | -LL | / macro_rules! barplus { -LL | | ($(a)?+) => {} // ok. matches "a+" and "+" -LL | | } - | |_- when calling this macro +LL | macro_rules! barplus { + | -------------------- when calling this macro ... -LL | barplus!(a?); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` +LL | barplus!(a?); //~ ERROR no rules expected the token `?` + | ^ no rules expected the token `?` error: no rules expected the token `?` --> $DIR/macro-at-most-once-rep-2018.rs:43:15 | -LL | / macro_rules! barplus { -LL | | ($(a)?+) => {} // ok. matches "a+" and "+" -LL | | } - | |_- when calling this macro +LL | macro_rules! barplus { + | -------------------- when calling this macro ... -LL | barplus!(a?a); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` +LL | barplus!(a?a); //~ ERROR no rules expected the token `?` + | ^ no rules expected the token `?` error: unexpected end of macro invocation --> $DIR/macro-at-most-once-rep-2018.rs:47:5 | -LL | / macro_rules! barstar { -LL | | ($(a)?*) => {} // ok. matches "a*" and "*" -LL | | } - | |_- when calling this macro +LL | macro_rules! barstar { + | -------------------- when calling this macro ... -LL | barstar!(); //~ERROR unexpected end of macro invocation - | ^^^^^^^^^^^ unexpected end of macro invocation +LL | barstar!(); //~ERROR unexpected end of macro invocation + | ^^^^^^^^^^^ unexpected end of macro invocation error: unexpected end of macro invocation --> $DIR/macro-at-most-once-rep-2018.rs:48:14 | -LL | / macro_rules! barstar { -LL | | ($(a)?*) => {} // ok. matches "a*" and "*" -LL | | } - | |_- when calling this macro +LL | macro_rules! barstar { + | -------------------- when calling this macro ... -LL | barstar!(a); //~ERROR unexpected end of macro invocation - | ^ unexpected end of macro invocation +LL | barstar!(a); //~ERROR unexpected end of macro invocation + | ^ unexpected end of macro invocation error: no rules expected the token `?` --> $DIR/macro-at-most-once-rep-2018.rs:49:15 | -LL | / macro_rules! barstar { -LL | | ($(a)?*) => {} // ok. matches "a*" and "*" -LL | | } - | |_- when calling this macro +LL | macro_rules! barstar { + | -------------------- when calling this macro ... -LL | barstar!(a?); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` +LL | barstar!(a?); //~ ERROR no rules expected the token `?` + | ^ no rules expected the token `?` error: no rules expected the token `?` --> $DIR/macro-at-most-once-rep-2018.rs:50:15 | -LL | / macro_rules! barstar { -LL | | ($(a)?*) => {} // ok. matches "a*" and "*" -LL | | } - | |_- when calling this macro +LL | macro_rules! barstar { + | -------------------- when calling this macro ... -LL | barstar!(a?a); //~ ERROR no rules expected the token `?` - | ^ no rules expected the token `?` +LL | barstar!(a?a); //~ ERROR no rules expected the token `?` + | ^ no rules expected the token `?` error: aborting due to 12 previous errors diff --git a/src/test/ui/macros/macro-non-lifetime.stderr b/src/test/ui/macros/macro-non-lifetime.stderr index 48a93010c3b6f..d526023d441b1 100644 --- a/src/test/ui/macros/macro-non-lifetime.stderr +++ b/src/test/ui/macros/macro-non-lifetime.stderr @@ -2,7 +2,7 @@ error: no rules expected the token `a` --> $DIR/macro-non-lifetime.rs:18:8 | LL | macro_rules! m { ($x:lifetime) => { } } - | --------------------------------------- when calling this macro + | -------------- when calling this macro ... LL | m!(a); | ^ no rules expected the token `a` diff --git a/src/test/ui/macros/missing-comma.stderr b/src/test/ui/macros/missing-comma.stderr index 5548be86a1300..1d6af44bd08a5 100644 --- a/src/test/ui/macros/missing-comma.stderr +++ b/src/test/ui/macros/missing-comma.stderr @@ -7,68 +7,44 @@ LL | println!("{}" a); error: no rules expected the token `b` --> $DIR/missing-comma.rs:22:12 | -LL | / macro_rules! foo { -LL | | ($a:ident) => (); -LL | | ($a:ident, $b:ident) => (); -LL | | ($a:ident, $b:ident, $c:ident) => (); -LL | | ($a:ident, $b:ident, $c:ident, $d:ident) => (); -LL | | ($a:ident, $b:ident, $c:ident, $d:ident, $e:ident) => (); -LL | | } - | |_- when calling this macro +LL | macro_rules! foo { + | ---------------- when calling this macro ... -LL | foo!(a b); - | -^ no rules expected the token `b` - | | - | help: missing comma here +LL | foo!(a b); + | -^ no rules expected the token `b` + | | + | help: missing comma here error: no rules expected the token `e` --> $DIR/missing-comma.rs:24:21 | -LL | / macro_rules! foo { -LL | | ($a:ident) => (); -LL | | ($a:ident, $b:ident) => (); -LL | | ($a:ident, $b:ident, $c:ident) => (); -LL | | ($a:ident, $b:ident, $c:ident, $d:ident) => (); -LL | | ($a:ident, $b:ident, $c:ident, $d:ident, $e:ident) => (); -LL | | } - | |_- when calling this macro +LL | macro_rules! foo { + | ---------------- when calling this macro ... -LL | foo!(a, b, c, d e); - | -^ no rules expected the token `e` - | | - | help: missing comma here +LL | foo!(a, b, c, d e); + | -^ no rules expected the token `e` + | | + | help: missing comma here error: no rules expected the token `d` --> $DIR/missing-comma.rs:26:18 | -LL | / macro_rules! foo { -LL | | ($a:ident) => (); -LL | | ($a:ident, $b:ident) => (); -LL | | ($a:ident, $b:ident, $c:ident) => (); -LL | | ($a:ident, $b:ident, $c:ident, $d:ident) => (); -LL | | ($a:ident, $b:ident, $c:ident, $d:ident, $e:ident) => (); -LL | | } - | |_- when calling this macro +LL | macro_rules! foo { + | ---------------- when calling this macro ... -LL | foo!(a, b, c d, e); - | -^ no rules expected the token `d` - | | - | help: missing comma here +LL | foo!(a, b, c d, e); + | -^ no rules expected the token `d` + | | + | help: missing comma here error: no rules expected the token `d` --> $DIR/missing-comma.rs:28:18 | -LL | / macro_rules! foo { -LL | | ($a:ident) => (); -LL | | ($a:ident, $b:ident) => (); -LL | | ($a:ident, $b:ident, $c:ident) => (); -LL | | ($a:ident, $b:ident, $c:ident, $d:ident) => (); -LL | | ($a:ident, $b:ident, $c:ident, $d:ident, $e:ident) => (); -LL | | } - | |_- when calling this macro +LL | macro_rules! foo { + | ---------------- when calling this macro ... -LL | foo!(a, b, c d e); - | ^ no rules expected the token `d` +LL | foo!(a, b, c d e); + | ^ no rules expected the token `d` error: aborting due to 5 previous errors diff --git a/src/test/ui/macros/trace_faulty_macros.stderr b/src/test/ui/macros/trace_faulty_macros.stderr index ecc3694d120fa..853eb5847c0cd 100644 --- a/src/test/ui/macros/trace_faulty_macros.stderr +++ b/src/test/ui/macros/trace_faulty_macros.stderr @@ -1,16 +1,14 @@ error: no rules expected the token `bcd` --> $DIR/trace_faulty_macros.rs:17:26 | -LL | / macro_rules! my_faulty_macro { -LL | | () => { -LL | | my_faulty_macro!(bcd); //~ ERROR no rules - | | ^^^ no rules expected the token `bcd` -LL | | }; -LL | | } - | |_- when calling this macro +LL | macro_rules! my_faulty_macro { + | ---------------------------- when calling this macro +LL | () => { +LL | my_faulty_macro!(bcd); //~ ERROR no rules + | ^^^ no rules expected the token `bcd` ... -LL | my_faulty_macro!(); - | ------------------- in this macro invocation +LL | my_faulty_macro!(); + | ------------------- in this macro invocation note: trace_macro --> $DIR/trace_faulty_macros.rs:43:5 diff --git a/src/test/ui/parser/macro/macro-doc-comments-1.stderr b/src/test/ui/parser/macro/macro-doc-comments-1.stderr index 4fcc56ac832eb..1e765dcde4f68 100644 --- a/src/test/ui/parser/macro/macro-doc-comments-1.stderr +++ b/src/test/ui/parser/macro/macro-doc-comments-1.stderr @@ -1,13 +1,11 @@ error: no rules expected the token `!` --> $DIR/macro-doc-comments-1.rs:16:5 | -LL | / macro_rules! outer { -LL | | (#[$outer:meta]) => () -LL | | } - | |_- when calling this macro +LL | macro_rules! outer { + | ------------------ when calling this macro ... -LL | //! Inner - | ^^^^^^^^^ no rules expected the token `!` +LL | //! Inner + | ^^^^^^^^^ no rules expected the token `!` error: aborting due to previous error diff --git a/src/test/ui/parser/macro/macro-doc-comments-2.stderr b/src/test/ui/parser/macro/macro-doc-comments-2.stderr index b34e99fbd9e77..0ab8a3cafb55f 100644 --- a/src/test/ui/parser/macro/macro-doc-comments-2.stderr +++ b/src/test/ui/parser/macro/macro-doc-comments-2.stderr @@ -1,13 +1,11 @@ error: no rules expected the token `[` --> $DIR/macro-doc-comments-2.rs:16:5 | -LL | / macro_rules! inner { -LL | | (#![$inner:meta]) => () -LL | | } - | |_- when calling this macro +LL | macro_rules! inner { + | ------------------ when calling this macro ... -LL | /// Outer - | ^ no rules expected the token `[` +LL | /// Outer + | ^ no rules expected the token `[` error: aborting due to previous error diff --git a/src/test/ui/underscore-ident-matcher.stderr b/src/test/ui/underscore-ident-matcher.stderr index 19d489db5723f..e148c48ed1314 100644 --- a/src/test/ui/underscore-ident-matcher.stderr +++ b/src/test/ui/underscore-ident-matcher.stderr @@ -1,15 +1,11 @@ error: no rules expected the token `_` --> $DIR/underscore-ident-matcher.rs:18:19 | -LL | / macro_rules! identity { -LL | | ($i: ident) => ( -LL | | $i -LL | | ) -LL | | } - | |_- when calling this macro +LL | macro_rules! identity { + | --------------------- when calling this macro ... -LL | let identity!(_) = 10; //~ ERROR no rules expected the token `_` - | ^ no rules expected the token `_` +LL | let identity!(_) = 10; //~ ERROR no rules expected the token `_` + | ^ no rules expected the token `_` error: aborting due to previous error