about summary refs log tree commit diff
path: root/src/libsyntax_ext
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-07-12 20:25:28 +0800
committerGitHub <noreply@github.com>2018-07-12 20:25:28 +0800
commit63cc55b2ecdcccd0ef57ce89fcd5453f6567b63f (patch)
tree1ec263db6804eee3e8abc4e1a4958151bc9f75d3 /src/libsyntax_ext
parentc2c6986733ff26f17beb1b5ea7d413b6ad30a240 (diff)
parent7735f45eab4b07a3dcb359ea111911cfb9952a5c (diff)
downloadrust-63cc55b2ecdcccd0ef57ce89fcd5453f6567b63f.tar.gz
rust-63cc55b2ecdcccd0ef57ce89fcd5453f6567b63f.zip
Rollup merge of #52276 - alexcrichton:validate-proc-macro-attr, r=petrochenkov
rustc: Verify #[proc_macro] is only a word

... and perform the same verification for #[proc_macro_attribute], currently
neither of these attributes take any arguments.

Closes #52273
Diffstat (limited to 'src/libsyntax_ext')
-rw-r--r--src/libsyntax_ext/proc_macro_registrar.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax_ext/proc_macro_registrar.rs b/src/libsyntax_ext/proc_macro_registrar.rs
index ef29e5a6b02..261208556b5 100644
--- a/src/libsyntax_ext/proc_macro_registrar.rs
+++ b/src/libsyntax_ext/proc_macro_registrar.rs
@@ -200,8 +200,8 @@ impl<'a> CollectProcMacros<'a> {
     }
 
     fn collect_attr_proc_macro(&mut self, item: &'a ast::Item, attr: &'a ast::Attribute) {
-        if let Some(_) = attr.meta_item_list() {
-            self.handler.span_err(attr.span, "`#[proc_macro_attribute]` attribute
+        if !attr.is_word() {
+            self.handler.span_err(attr.span, "`#[proc_macro_attribute]` attribute \
                 does not take any arguments");
             return;
         }
@@ -223,8 +223,8 @@ impl<'a> CollectProcMacros<'a> {
     }
 
     fn collect_bang_proc_macro(&mut self, item: &'a ast::Item, attr: &'a ast::Attribute) {
-        if let Some(_) = attr.meta_item_list() {
-            self.handler.span_err(attr.span, "`#[proc_macro]` attribute
+        if !attr.is_word() {
+            self.handler.span_err(attr.span, "`#[proc_macro]` attribute \
                 does not take any arguments");
             return;
         }