about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-12-04 12:51:38 +0000
committerbors <bors@rust-lang.org>2016-12-04 12:51:38 +0000
commitb462e8fa61a6744aa7435f0bef17023062c165df (patch)
treee754bdabbfbebfe00b3f7d6c3926df26bd6e6855 /src/libsyntax
parentd14d74d5f7d39d1e2583bca231c26bbc0d4ee9a0 (diff)
parentff621ec70eac9c687d0154df5405600669041ab3 (diff)
downloadrust-b462e8fa61a6744aa7435f0bef17023062c165df.tar.gz
rust-b462e8fa61a6744aa7435f0bef17023062c165df.zip
Auto merge of #38082 - jseyfried:macro_invocation_paths, r=nrc
macros: support invocation paths (e.g. `foo::bar!()`) behind `#![feature(use_extern_macros)]`

r? @nrc
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/ext/expand.rs7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index fd6cae1e1b6..4138acafac6 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -400,12 +400,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
                                           &self.cx.ecfg.features.unwrap());
         }
 
-        if path.segments.len() > 1 || path.global || !path.segments[0].parameters.is_empty() {
-            self.cx.span_err(path.span, "expected macro name without module separators");
-            return kind.dummy(span);
-        }
-
-        let extname = path.segments[0].identifier.name;
+        let extname = path.segments.last().unwrap().identifier.name;
         let ident = ident.unwrap_or(keywords::Invalid.ident());
         let marked_tts = mark_tts(&tts, mark);
         let opt_expanded = match *ext {