about summary refs log tree commit diff
path: root/src/libsyntax/ext
diff options
context:
space:
mode:
authorJeffrey Seyfried <jeffrey.seyfried@gmail.com>2017-03-25 04:04:13 +0000
committerJeffrey Seyfried <jeffrey.seyfried@gmail.com>2017-03-25 04:04:13 +0000
commit29a052d2d807dcb9f1d45878a3083af7a993263d (patch)
tree0567e1792355119542aee719811e6b273eba6fd6 /src/libsyntax/ext
parent49c67bd632e961a57863805e5d0a400f97da9b93 (diff)
downloadrust-29a052d2d807dcb9f1d45878a3083af7a993263d.tar.gz
rust-29a052d2d807dcb9f1d45878a3083af7a993263d.zip
Fix ICE with nested macros in certain situations.
Diffstat (limited to 'src/libsyntax/ext')
-rw-r--r--src/libsyntax/ext/placeholders.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/ext/placeholders.rs b/src/libsyntax/ext/placeholders.rs
index f0e328a551d..2d0994a7b78 100644
--- a/src/libsyntax/ext/placeholders.rs
+++ b/src/libsyntax/ext/placeholders.rs
@@ -106,8 +106,8 @@ impl<'a, 'b> PlaceholderExpander<'a, 'b> {
 impl<'a, 'b> Folder for PlaceholderExpander<'a, 'b> {
     fn fold_item(&mut self, item: P<ast::Item>) -> SmallVector<P<ast::Item>> {
         match item.node {
-            ast::ItemKind::Mac(ref mac) if !mac.node.path.segments.is_empty() => {}
             ast::ItemKind::Mac(_) => return self.remove(item.id).make_items(),
+            ast::ItemKind::MacroDef(_) => return SmallVector::one(item),
             _ => {}
         }