From 66a12f504f149bfa487f2353df003482802a18b4 Mon Sep 17 00:00:00 2001 From: est31 Date: Mon, 28 Dec 2015 05:31:11 +0100 Subject: [PATCH 1/5] 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 +++++++++++++----- src/test/compile-fail/pub-macro-rules.rs | 27 ++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 src/test/compile-fail/pub-macro-rules.rs diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index efd351a632da1..d5947ba7ad9bd 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 => (), } diff --git a/src/test/compile-fail/pub-macro-rules.rs b/src/test/compile-fail/pub-macro-rules.rs new file mode 100644 index 0000000000000..93b992f2f8af2 --- /dev/null +++ b/src/test/compile-fail/pub-macro-rules.rs @@ -0,0 +1,27 @@ +// Copyright 2015 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#[macro_use] mod bleh { + pub macro_rules! foo { //~ ERROR can't qualify macro_rules invocation with `pub` + //~^ HELP did you mean #[macro_export]? + ($n:ident) => ( + fn $n () -> i32 { + 1 + } + ) + } + +} + +foo!(meh); + +fn main() { + println!("{}", meh()); +} From f4eb44e4df5abaf2124d48f45cc4c8b1429d6bfa Mon Sep 17 00:00:00 2001 From: est31 Date: Tue, 29 Dec 2015 13:59:19 +0100 Subject: [PATCH 2/5] whitespace after colon, not before --- src/libsyntax/parse/parser.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index d5947ba7ad9bd..32a54d6e357b3 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, }; From 1bbcceb9f6c21ad236eda0af1b2fa8928c3d32d6 Mon Sep 17 00:00:00 2001 From: est31 Date: Tue, 29 Dec 2015 14:00:38 +0100 Subject: [PATCH 3/5] Move pub-macro-rules.rs test to parse-fail directory --- src/test/{compile-fail => parse-fail}/pub-macro-rules.rs | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/test/{compile-fail => parse-fail}/pub-macro-rules.rs (100%) diff --git a/src/test/compile-fail/pub-macro-rules.rs b/src/test/parse-fail/pub-macro-rules.rs similarity index 100% rename from src/test/compile-fail/pub-macro-rules.rs rename to src/test/parse-fail/pub-macro-rules.rs From 94434f1f6c58e7872a7a80b8b71bc2cbcc0cf260 Mon Sep 17 00:00:00 2001 From: est31 Date: Tue, 29 Dec 2015 14:19:08 +0100 Subject: [PATCH 4/5] Move pub-{item,methd}-macro.rs to the parse-fail subdir as well --- src/test/{compile-fail => parse-fail}/pub-item-macro.rs | 0 src/test/{compile-fail => parse-fail}/pub-method-macro.rs | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/test/{compile-fail => parse-fail}/pub-item-macro.rs (100%) rename src/test/{compile-fail => parse-fail}/pub-method-macro.rs (100%) diff --git a/src/test/compile-fail/pub-item-macro.rs b/src/test/parse-fail/pub-item-macro.rs similarity index 100% rename from src/test/compile-fail/pub-item-macro.rs rename to src/test/parse-fail/pub-item-macro.rs diff --git a/src/test/compile-fail/pub-method-macro.rs b/src/test/parse-fail/pub-method-macro.rs similarity index 100% rename from src/test/compile-fail/pub-method-macro.rs rename to src/test/parse-fail/pub-method-macro.rs From 40a9481f8776446bf4bce3f89d81330791b179cf Mon Sep 17 00:00:00 2001 From: est31 Date: Wed, 30 Dec 2015 16:27:55 +0100 Subject: [PATCH 5/5] Limit line length to below 100 chars --- src/libsyntax/parse/parser.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 32a54d6e357b3..939b3f0fc58bd 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();