Rollup merge of rust-lang#55298 - estebank:macro-def, r=pnkfelix

kennytm · kennytm · commit eb74711b5444 · 2018-10-26T23:06:30.000+08:00
Point at macro definition when no rules expect token Fix rust-lang#35150.
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs
@@ -247,8 +247,13 @@ impl<F> AttrProcMacro for F
 
 /// Represents a thing that maps token trees to Macro Results
 pub trait TTMacroExpander {
-    fn expand<'cx>(&self, ecx: &'cx mut ExtCtxt, span: Span, input: TokenStream)
-                   -> Box<dyn MacResult+'cx>;
+    fn expand<'cx>(
+        &self,
+        ecx: &'cx mut ExtCtxt,
+        span: Span,
+        input: TokenStream,
+        def_span: Option<Span>,
+    ) -> Box<dyn MacResult+'cx>;
 }
 
 pub type MacroExpanderFn =
@@ -259,8 +264,13 @@ impl<F> TTMacroExpander for F
     where F: for<'cx> Fn(&'cx mut ExtCtxt, Span, &[tokenstream::TokenTree])
     -> Box<dyn MacResult+'cx>
 {
-    fn expand<'cx>(&self, ecx: &'cx mut ExtCtxt, span: Span, input: TokenStream)
-                   -> Box<dyn MacResult+'cx> {
+    fn expand<'cx>(
+        &self,
+        ecx: &'cx mut ExtCtxt,
+        span: Span,
+        input: TokenStream,
+        _def_span: Option<Span>,
+    ) -> Box<dyn MacResult+'cx> {
         struct AvoidInterpolatedIdents;
 
         impl Folder for AvoidInterpolatedIdents {
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
@@ -764,7 +764,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
                                                                     edition) {
                     dummy_span
                 } else {
-                    kind.make_from(expander.expand(self.cx, span, mac.node.stream()))
+                    kind.make_from(expander.expand(self.cx, span, mac.node.stream(), None))
                 }
             }
 
@@ -785,7 +785,12 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
                                                                     edition) {
                     dummy_span
                 } else {
-                    kind.make_from(expander.expand(self.cx, span, mac.node.stream()))
+                    kind.make_from(expander.expand(
+                        self.cx,
+                        span,
+                        mac.node.stream(),
+                        def_info.map(|(_, s)| s),
+                    ))
                 }
             }
 
diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs
@@ -79,16 +79,19 @@ struct MacroRulesMacroExpander {
 }
 
 impl TTMacroExpander for MacroRulesMacroExpander {
-    fn expand<'cx>(&self,
-                   cx: &'cx mut ExtCtxt,
-                   sp: Span,
-                   input: TokenStream)
-                   -> Box<dyn MacResult+'cx> {
+    fn expand<'cx>(
+        &self,
+        cx: &'cx mut ExtCtxt,
+        sp: Span,
+        input: TokenStream,
+        def_span: Option<Span>,
+    ) -> Box<dyn MacResult+'cx> {
         if !self.valid {
             return DummyResult::any(sp);
         }
         generic_extension(cx,
                           sp,
+                          def_span,
                           self.name,
                           input,
                           &self.lhses,
@@ -104,6 +107,7 @@ fn trace_macros_note(cx: &mut ExtCtxt, sp: Span, message: String) {
 /// Given `lhses` and `rhses`, this is the new macro we create
 fn generic_extension<'cx>(cx: &'cx mut ExtCtxt,
                           sp: Span,
+                          def_span: Option<Span>,
                           name: ast::Ident,
                           arg: TokenStream,
                           lhses: &[quoted::TokenTree],
@@ -183,7 +187,14 @@ fn generic_extension<'cx>(cx: &'cx mut ExtCtxt,
     }
 
     let best_fail_msg = parse_failure_msg(best_fail_tok.expect("ran no matchers"));
-    let mut err = cx.struct_span_err(best_fail_spot.substitute_dummy(sp), &best_fail_msg);
+    let span = best_fail_spot.substitute_dummy(sp);
+    let mut err = cx.struct_span_err(span, &best_fail_msg);
+    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(cx.source_map().def_span(sp), "when calling this macro");
+        }
+    }
 
     // Check whether there's a missing comma in this macro call, like `println!("{}" a);`
     if let Some((arg, comma_span)) = arg.add_comma() {
@@ -194,7 +205,7 @@ fn generic_extension<'cx>(cx: &'cx mut ExtCtxt,
             };
             match TokenTree::parse(cx, lhs_tt, arg.clone()) {
                 Success(_) => {
-                    if comma_span == DUMMY_SP {
+                    if comma_span.is_dummy() {
                         err.note("you might be missing a comma");
                     } else {
                         err.span_suggestion_short_with_applicability(
diff --git a/src/test/run-pass-fulldeps/auxiliary/plugin_args.rs b/src/test/run-pass-fulldeps/auxiliary/plugin_args.rs
@@ -38,7 +38,8 @@ impl TTMacroExpander for Expander {
     fn expand<'cx>(&self,
                    ecx: &'cx mut ExtCtxt,
                    sp: Span,
-                   _: TokenStream) -> Box<MacResult+'cx> {
+                   _: TokenStream,
+                   _: Option<Span>) -> Box<MacResult+'cx> {
         let args = self.args.iter().map(|i| pprust::meta_list_item_to_string(i))
             .collect::<Vec<_>>().join(", ");
         MacEager::expr(ecx.expr_str(sp, Symbol::intern(&args)))
diff --git a/src/test/ui/editions/edition-keywords-2015-2015-parsing.stderr b/src/test/ui/editions/edition-keywords-2015-2015-parsing.stderr
@@ -2,13 +2,13 @@ error: no rules expected the token `r#async`
   --> $DIR/edition-keywords-2015-2015-parsing.rs:22:31
    |
 LL |     r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async`
-   |                               ^^^^^^^
+   |                               ^^^^^^^ no rules expected the token `r#async`
 
 error: no rules expected the token `async`
   --> $DIR/edition-keywords-2015-2015-parsing.rs:23:35
    |
 LL |     r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async`
-   |                                   ^^^^^
+   |                                   ^^^^^ no rules expected the token `async`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/editions/edition-keywords-2015-2018-parsing.stderr b/src/test/ui/editions/edition-keywords-2015-2018-parsing.stderr
@@ -2,13 +2,13 @@ error: no rules expected the token `r#async`
   --> $DIR/edition-keywords-2015-2018-parsing.rs:22:31
    |
 LL |     r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async`
-   |                               ^^^^^^^
+   |                               ^^^^^^^ no rules expected the token `r#async`
 
 error: no rules expected the token `async`
   --> $DIR/edition-keywords-2015-2018-parsing.rs:23:35
    |
 LL |     r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async`
-   |                                   ^^^^^
+   |                                   ^^^^^ no rules expected the token `async`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr b/src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr
@@ -14,13 +14,13 @@ error: no rules expected the token `r#async`
   --> $DIR/edition-keywords-2018-2015-parsing.rs:22:31
    |
 LL |     r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async`
-   |                               ^^^^^^^
+   |                               ^^^^^^^ no rules expected the token `r#async`
 
 error: no rules expected the token `async`
   --> $DIR/edition-keywords-2018-2015-parsing.rs:23:35
    |
 LL |     r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async`
-   |                                   ^^^^^
+   |                                   ^^^^^ no rules expected the token `async`
 
 error: expected one of `move`, `|`, or `||`, found `<eof>`
   --> <::edition_kw_macro_2015::passes_ident macros>:1:22
diff --git a/src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr b/src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr
@@ -14,13 +14,13 @@ error: no rules expected the token `r#async`
   --> $DIR/edition-keywords-2018-2018-parsing.rs:22:31
    |
 LL |     r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async`
-   |                               ^^^^^^^
+   |                               ^^^^^^^ no rules expected the token `r#async`
 
 error: no rules expected the token `async`
   --> $DIR/edition-keywords-2018-2018-parsing.rs:23:35
    |
 LL |     r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async`
-   |                                   ^^^^^
+   |                                   ^^^^^ no rules expected the token `async`
 
 error: expected one of `move`, `|`, or `||`, found `<eof>`
   --> <::edition_kw_macro_2018::passes_ident macros>:1:22
diff --git a/src/test/ui/empty/empty-comment.stderr b/src/test/ui/empty/empty-comment.stderr
@@ -1,8 +1,11 @@
 error: unexpected end of macro invocation
   --> $DIR/empty-comment.rs:20:5
    |
+LL | macro_rules! one_arg_macro {
+   | -------------------------- when calling this macro
+...
 LL |     one_arg_macro!(/**/); //~ ERROR unexpected end
-   |     ^^^^^^^^^^^^^^^^^^^^^
+   |     ^^^^^^^^^^^^^^^^^^^^^ unexpected end of macro invocation
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/fail-simple.stderr b/src/test/ui/fail-simple.stderr
@@ -2,7 +2,7 @@ error: no rules expected the token `@`
   --> $DIR/fail-simple.rs:12:12
    |
 LL |     panic!(@); //~ ERROR no rules expected the token `@`
-   |            ^
+   |            ^ no rules expected the token `@`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-7970a.stderr b/src/test/ui/issues/issue-7970a.stderr
@@ -1,8 +1,11 @@
 error: unexpected end of macro invocation
   --> $DIR/issue-7970a.rs:16:5
    |
+LL | macro_rules! one_arg_macro {
+   | -------------------------- when calling this macro
+...
 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
@@ -51,20 +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 {
+   | ---------------- when calling this macro
+...
 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 {
+   | ---------------- when calling this macro
+...
 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 {
+   | ---------------- when calling this macro
+...
 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
@@ -7,68 +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 {
+   | ---------------- when calling this macro
+...
 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 {
+   | ---------------- when calling this macro
+...
 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 {
+   | ---------------- when calling this macro
+...
 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 {
+   | -------------------- when calling this macro
+...
 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 {
+   | -------------------- when calling this macro
+...
 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 {
+   | -------------------- when calling this macro
+...
 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 {
+   | -------------------- when calling this macro
+...
 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 {
+   | -------------------- when calling this macro
+...
 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 {
+   | -------------------- when calling this macro
+...
 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 {
+   | -------------------- when calling this macro
+...
 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 {
+   | -------------------- when calling this macro
+...
 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
@@ -1,8 +1,11 @@
 error: no rules expected the token `a`
   --> $DIR/macro-non-lifetime.rs:18:8
    |
+LL | macro_rules! m { ($x:lifetime) => { } }
+   | -------------- when calling this macro
+...
 LL |     m!(a);
-   |        ^
+   |        ^ no rules expected the token `a`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/macros/missing-comma.stderr b/src/test/ui/macros/missing-comma.stderr
diff --git a/src/test/ui/macros/nonterminal-matching.stderr b/src/test/ui/macros/nonterminal-matching.stderr
diff --git a/src/test/ui/macros/trace_faulty_macros.stderr b/src/test/ui/macros/trace_faulty_macros.stderr
diff --git a/src/test/ui/parser/macro/macro-doc-comments-1.stderr b/src/test/ui/parser/macro/macro-doc-comments-1.stderr
diff --git a/src/test/ui/parser/macro/macro-doc-comments-2.stderr b/src/test/ui/parser/macro/macro-doc-comments-2.stderr
diff --git a/src/test/ui/underscore-ident-matcher.stderr b/src/test/ui/underscore-ident-matcher.stderr
diff --git a/src/test/ui/vec/vec-macro-with-comma-only.stderr b/src/test/ui/vec/vec-macro-with-comma-only.stderr

Original file line number	Diff line number	Diff line change
`@@ -764,7 +764,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {`
`764`	`764`	`edition) {`
`765`	`765`	`dummy_span`
`766`	`766`	`} else {`
`767`		`- kind.make_from(expander.expand(self.cx, span, mac.node.stream()))`
	`767`	`+ kind.make_from(expander.expand(self.cx, span, mac.node.stream(), None))`
`768`	`768`	`}`
`769`	`769`	`}`
`770`	`770`
`@@ -785,7 +785,12 @@ impl<'a, 'b> MacroExpander<'a, 'b> {`
`785`	`785`	`edition) {`
`786`	`786`	`dummy_span`
`787`	`787`	`} else {`
`788`		`- kind.make_from(expander.expand(self.cx, span, mac.node.stream()))`
	`788`	`+ kind.make_from(expander.expand(`
	`789`	`+ self.cx,`
	`790`	`+ span,`
	`791`	`+ mac.node.stream(),`
	`792`	`+ def_info.map(\|(_, s)\| s),`
	`793`	`+ ))`
`789`	`794`	`}`
`790`	`795`	`}`
`791`	`796`
Original file line number	Diff line number	Diff line change
@@ -2,13 +2,13 @@ error: no rules expected the token `r#async`
`2`	`2`	`--> $DIR/edition-keywords-2015-2015-parsing.rs:22:31`
`3`	`3`	`\|`
`4`	`4`	LL \| r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async`
`5`		`- \| ^^^^^^^`
	`5`	+ \| ^^^^^^^ no rules expected the token `r#async`
`6`	`6`
`7`	`7`	error: no rules expected the token `async`
`8`	`8`	`--> $DIR/edition-keywords-2015-2015-parsing.rs:23:35`
`9`	`9`	`\|`
`10`	`10`	LL \| r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async`
`11`		`- \| ^^^^^`
	`11`	+ \| ^^^^^ no rules expected the token `async`
`12`	`12`
`13`	`13`	`error: aborting due to 2 previous errors`
`14`	`14`
Original file line number	Diff line number	Diff line change
@@ -2,13 +2,13 @@ error: no rules expected the token `r#async`
`2`	`2`	`--> $DIR/edition-keywords-2015-2018-parsing.rs:22:31`
`3`	`3`	`\|`
`4`	`4`	LL \| r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async`
`5`		`- \| ^^^^^^^`
	`5`	+ \| ^^^^^^^ no rules expected the token `r#async`
`6`	`6`
`7`	`7`	error: no rules expected the token `async`
`8`	`8`	`--> $DIR/edition-keywords-2015-2018-parsing.rs:23:35`
`9`	`9`	`\|`
`10`	`10`	LL \| r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async`
`11`		`- \| ^^^^^`
	`11`	+ \| ^^^^^ no rules expected the token `async`
`12`	`12`
`13`	`13`	`error: aborting due to 2 previous errors`
`14`	`14`
Original file line number	Diff line number	Diff line change
@@ -14,13 +14,13 @@ error: no rules expected the token `r#async`
`14`	`14`	`--> $DIR/edition-keywords-2018-2015-parsing.rs:22:31`
`15`	`15`	`\|`
`16`	`16`	LL \| r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async`
`17`		`- \| ^^^^^^^`
	`17`	+ \| ^^^^^^^ no rules expected the token `r#async`
`18`	`18`
`19`	`19`	error: no rules expected the token `async`
`20`	`20`	`--> $DIR/edition-keywords-2018-2015-parsing.rs:23:35`
`21`	`21`	`\|`
`22`	`22`	LL \| r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async`
`23`		`- \| ^^^^^`
	`23`	+ \| ^^^^^ no rules expected the token `async`
`24`	`24`
`25`	`25`	error: expected one of `move`, `\|`, or `\|\|`, found `<eof>`
`26`	`26`	`--> <::edition_kw_macro_2015::passes_ident macros>:1:22`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error: no rules expected the token `@`
`2`	`2`	`--> $DIR/fail-simple.rs:12:12`
`3`	`3`	`\|`
`4`	`4`	LL \| panic!(@); //~ ERROR no rules expected the token `@`
`5`		`- \| ^`
	`5`	+ \| ^ no rules expected the token `@`
`6`	`6`
`7`	`7`	`error: aborting due to previous error`
`8`	`8`