From 66a12f504f149bfa487f2353df003482802a18b4 Mon Sep 17 00:00:00 2001 From: est31 Date: Mon, 28 Dec 2015 05:31:11 +0100 Subject: Custom help message for people trying to make macro public The current help message is too much about "normal" macros to be used as general message. Keep it for normal macros, and add custom help and error messages for macro definitions. --- src/libsyntax/parse/parser.rs | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index efd351a632d..d5947ba7ad9 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -67,7 +67,7 @@ use parse::classify; use parse::common::{SeqSep, seq_sep_none, seq_sep_trailing_allowed}; use parse::lexer::{Reader, TokenAndSpan}; use parse::obsolete::{ParserObsoleteMethods, ObsoleteSyntax}; -use parse::token::{self, MatchNt, SubstNt, SpecialVarNt, InternedString}; +use parse::token::{self, intern, MatchNt, SubstNt, SpecialVarNt, InternedString}; use parse::token::{keywords, special_idents, SpecialMacroVar}; use parse::{new_sub_parser_from_file, ParseSess}; use util::parser::{AssocOp, Fixity}; @@ -4612,10 +4612,20 @@ impl<'a> Parser<'a> { fn complain_if_pub_macro(&mut self, visa: Visibility, span: Span) { match visa { Public => { - self.diagnostic().struct_span_err(span, "can't qualify macro invocation with `pub`") - .fileline_help(span, "try adjusting the macro to put `pub` inside \ - the invocation") - .emit(); + let is_macro_rules :bool = match self.token { + token::Ident(sid, _) => sid.name == intern("macro_rules"), + _ => false, + }; + if is_macro_rules { + self.diagnostic().struct_span_err(span, "can't qualify macro_rules invocation with `pub`") + .fileline_help(span, "did you mean #[macro_export]?") + .emit(); + } else { + self.diagnostic().struct_span_err(span, "can't qualify macro invocation with `pub`") + .fileline_help(span, "try adjusting the macro to put `pub` \ + inside the invocation") + .emit(); + } } Inherited => (), } -- cgit 1.4.1-3-g733a5 From f4eb44e4df5abaf2124d48f45cc4c8b1429d6bfa Mon Sep 17 00:00:00 2001 From: est31 Date: Tue, 29 Dec 2015 13:59:19 +0100 Subject: whitespace after colon, not before --- src/libsyntax/parse/parser.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index d5947ba7ad9..32a54d6e357 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -4612,7 +4612,7 @@ impl<'a> Parser<'a> { fn complain_if_pub_macro(&mut self, visa: Visibility, span: Span) { match visa { Public => { - let is_macro_rules :bool = match self.token { + let is_macro_rules: bool = match self.token { token::Ident(sid, _) => sid.name == intern("macro_rules"), _ => false, }; -- cgit 1.4.1-3-g733a5 From 40a9481f8776446bf4bce3f89d81330791b179cf Mon Sep 17 00:00:00 2001 From: est31 Date: Wed, 30 Dec 2015 16:27:55 +0100 Subject: Limit line length to below 100 chars --- src/libsyntax/parse/parser.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 32a54d6e357..939b3f0fc58 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -4617,11 +4617,13 @@ impl<'a> Parser<'a> { _ => false, }; if is_macro_rules { - self.diagnostic().struct_span_err(span, "can't qualify macro_rules invocation with `pub`") + self.diagnostic().struct_span_err(span, "can't qualify macro_rules \ + invocation with `pub`") .fileline_help(span, "did you mean #[macro_export]?") .emit(); } else { - self.diagnostic().struct_span_err(span, "can't qualify macro invocation with `pub`") + self.diagnostic().struct_span_err(span, "can't qualify macro \ + invocation with `pub`") .fileline_help(span, "try adjusting the macro to put `pub` \ inside the invocation") .emit(); -- cgit 1.4.1-3-g733a5