diff options
| author | bors <bors@rust-lang.org> | 2016-11-10 11:25:17 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-10 11:25:17 -0800 |
| commit | 3dced6f71e6e8cf8f59e3614194a61427a3a408b (patch) | |
| tree | d774bf9b6a1fda191695d4917979b0243652812d /src/libsyntax | |
| parent | bc1cc1db6ddee8d57d20adc05b740e3b73649ab5 (diff) | |
| parent | 67eeb0a72081ae7db45a07de55fd2cb77b2ebee1 (diff) | |
| download | rust-3dced6f71e6e8cf8f59e3614194a61427a3a408b.tar.gz rust-3dced6f71e6e8cf8f59e3614194a61427a3a408b.zip | |
Auto merge of #37645 - jseyfried:fix_crate_var_in_custom_derives, r=nrc
Fix regression involving custom derives on items with `$crate` The regression was introduced in #37213. I believe we cannot make the improvements from #37213 work with the current custom derive setup (c.f. https://github.com/rust-lang/rust/issues/37637#issuecomment-258959145) -- we'll have to wait for `TokenStream`'s API to improve. Fixes #37637. r? @nrc
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/base.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index 1f47a91fcc1..63eee7df9e8 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -517,6 +517,7 @@ pub type NamedSyntaxExtension = (Name, SyntaxExtension); pub trait Resolver { fn next_node_id(&mut self) -> ast::NodeId; fn get_module_scope(&mut self, id: ast::NodeId) -> Mark; + fn eliminate_crate_var(&mut self, item: P<ast::Item>) -> P<ast::Item>; fn visit_expansion(&mut self, mark: Mark, expansion: &Expansion); fn add_macro(&mut self, scope: Mark, def: ast::MacroDef, export: bool); @@ -539,6 +540,7 @@ pub struct DummyResolver; impl Resolver for DummyResolver { fn next_node_id(&mut self) -> ast::NodeId { ast::DUMMY_NODE_ID } fn get_module_scope(&mut self, _id: ast::NodeId) -> Mark { Mark::root() } + fn eliminate_crate_var(&mut self, item: P<ast::Item>) -> P<ast::Item> { item } fn visit_expansion(&mut self, _invoc: Mark, _expansion: &Expansion) {} fn add_macro(&mut self, _scope: Mark, _def: ast::MacroDef, _export: bool) {} |