diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-03-27 15:24:19 -0500 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-03-27 15:56:24 -0700 |
| commit | 1fe2dfca813a2e95e4e842333a87a207db20bb6e (patch) | |
| tree | 3c10e1c5aa057e9fd9f0d0356500193d4a4d1f4f /src/libsyntax/ext | |
| parent | bccd341d11f51cb0c06d60a318b0f7decad0a795 (diff) | |
| parent | 29a052d2d807dcb9f1d45878a3083af7a993263d (diff) | |
| download | rust-1fe2dfca813a2e95e4e842333a87a207db20bb6e.tar.gz rust-1fe2dfca813a2e95e4e842333a87a207db20bb6e.zip | |
Rollup merge of #40813 - jseyfried:fix_expansion_regression, r=nrc
macros: fix ICE on some nested macro definitions Fixes #40770. r? @nrc
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/placeholders.rs | 2 |
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), _ => {} } |