summary refs log tree commit diff
path: root/src/libsyntax/ext
diff options
context:
space:
mode:
authorJeffrey Seyfried <jeffrey.seyfried@gmail.com>2017-07-13 14:12:57 -0700
committerJeffrey Seyfried <jeffrey.seyfried@gmail.com>2017-07-13 14:12:57 -0700
commitb5c5a0c3fd91e2f3a61e26bf5a00297a6e2b3366 (patch)
treeea4e9242484a3014086f1b012d2dfa6d1247c624 /src/libsyntax/ext
parentb2c0707872082c890f332178f59fd02eea5b98f3 (diff)
downloadrust-b5c5a0c3fd91e2f3a61e26bf5a00297a6e2b3366.tar.gz
rust-b5c5a0c3fd91e2f3a61e26bf5a00297a6e2b3366.zip
Fix regression involving identifiers in `macro_rules!` patterns.
Diffstat (limited to 'src/libsyntax/ext')
-rw-r--r--src/libsyntax/ext/tt/quoted.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libsyntax/ext/tt/quoted.rs b/src/libsyntax/ext/tt/quoted.rs
index 4e9e30857b1..74fa85d130b 100644
--- a/src/libsyntax/ext/tt/quoted.rs
+++ b/src/libsyntax/ext/tt/quoted.rs
@@ -196,7 +196,8 @@ fn parse_tree<I>(tree: tokenstream::TokenTree,
                     num_captures: name_captures,
                 }))
             }
-            Some(tokenstream::TokenTree::Token(ident_span, token::Ident(ident))) => {
+            Some(tokenstream::TokenTree::Token(ident_span, ref token)) if token.is_ident() => {
+                let ident = token.ident().unwrap();
                 let span = Span { lo: span.lo, ..ident_span };
                 if ident.name == keywords::Crate.name() {
                     let ident = ast::Ident { name: keywords::DollarCrate.name(), ..ident };