From d4a0e545e7dac8f5b4e07ebaf76e7f91b87f34f3 Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonas@schievink.net>
Date: Mon, 23 Nov 2015 21:06:51 +0100
Subject: Print the macro context name on incomplete parse

Fixes #22425

Also fixes #30007, since it's just a change from `true` to `false`.
---
 src/libsyntax/ext/tt/macro_rules.rs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/libsyntax/ext')

diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs
index 43647ea4a2e..516d323b4e5 100644
--- a/src/libsyntax/ext/tt/macro_rules.rs
+++ b/src/libsyntax/ext/tt/macro_rules.rs
@@ -44,7 +44,7 @@ impl<'a> ParserAnyMacro<'a> {
     /// about e.g. the semicolon in `macro_rules! kapow { () => {
     /// panic!(); } }` doesn't get picked up by .parse_expr(), but it's
     /// allowed to be there.
-    fn ensure_complete_parse(&self, allow_semi: bool) {
+    fn ensure_complete_parse(&self, allow_semi: bool, context: &str) {
         let mut parser = self.parser.borrow_mut();
         if allow_semi && parser.token == token::Semi {
             panictry!(parser.bump())
@@ -58,8 +58,8 @@ impl<'a> ParserAnyMacro<'a> {
             parser.span_err(span, &msg[..]);
 
             let msg = format!("caused by the macro expansion here; the usage \
-                               of `{}` is likely invalid in this context",
-                               self.macro_ident);
+                               of `{}!` is likely invalid in this {} context",
+                               self.macro_ident, context);
             parser.span_note(self.site_span, &msg[..]);
         }
     }
@@ -68,12 +68,12 @@ impl<'a> ParserAnyMacro<'a> {
 impl<'a> MacResult for ParserAnyMacro<'a> {
     fn make_expr(self: Box<ParserAnyMacro<'a>>) -> Option<P<ast::Expr>> {
         let ret = panictry!(self.parser.borrow_mut().parse_expr());
-        self.ensure_complete_parse(true);
+        self.ensure_complete_parse(true, "expression");
         Some(ret)
     }
     fn make_pat(self: Box<ParserAnyMacro<'a>>) -> Option<P<ast::Pat>> {
         let ret = panictry!(self.parser.borrow_mut().parse_pat());
-        self.ensure_complete_parse(false);
+        self.ensure_complete_parse(false, "pattern");
         Some(ret)
     }
     fn make_items(self: Box<ParserAnyMacro<'a>>) -> Option<SmallVector<P<ast::Item>>> {
@@ -81,7 +81,7 @@ impl<'a> MacResult for ParserAnyMacro<'a> {
         while let Some(item) = panictry!(self.parser.borrow_mut().parse_item()) {
             ret.push(item);
         }
-        self.ensure_complete_parse(false);
+        self.ensure_complete_parse(false, "item");
         Some(ret)
     }
 
@@ -95,7 +95,7 @@ impl<'a> MacResult for ParserAnyMacro<'a> {
                 _ => ret.push(panictry!(parser.parse_impl_item()))
             }
         }
-        self.ensure_complete_parse(false);
+        self.ensure_complete_parse(false, "item");
         Some(ret)
     }
 
@@ -115,13 +115,13 @@ impl<'a> MacResult for ParserAnyMacro<'a> {
                 }
             }
         }
-        self.ensure_complete_parse(false);
+        self.ensure_complete_parse(false, "statement");
         Some(ret)
     }
 
     fn make_ty(self: Box<ParserAnyMacro<'a>>) -> Option<P<ast::Ty>> {
         let ret = panictry!(self.parser.borrow_mut().parse_ty());
-        self.ensure_complete_parse(true);
+        self.ensure_complete_parse(false, "type");
         Some(ret)
     }
 }
@@ -327,7 +327,7 @@ fn check_lhs_nt_follows(cx: &mut ExtCtxt, lhs: &TokenTree, sp: Span) {
         tt @ &TokenTree::Sequence(..) => {
             check_matcher(cx, Some(tt).into_iter(), &Eof);
         },
-        _ => cx.span_err(sp, "Invalid macro matcher; matchers must be contained \
+        _ => cx.span_err(sp, "invalid macro matcher; matchers must be contained \
                               in balanced delimiters or a repetition indicator")
     };
     // we don't abort on errors on rejection, the driver will do that for us
-- 
cgit 1.4.1-3-g733a5