diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-07-05 03:09:24 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-07-09 22:17:44 +0300 |
| commit | 39975077868fc63a7e9a3cec5130adb3607f6838 (patch) | |
| tree | 09df0356e85dced0d14aa4dc5de9db1ab9b9b596 /src/libsyntax | |
| parent | 4344a90308b810447adb011f3fd45fde41f7ce48 (diff) | |
| download | rust-39975077868fc63a7e9a3cec5130adb3607f6838.tar.gz rust-39975077868fc63a7e9a3cec5130adb3607f6838.zip | |
Resolve `$crate` in all hygienic contexts for pretty-pringing
Stop visiting AST to discover those contexts, just iterate through hygiene data instead
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/base.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index 15c0b6ca5aa..c0ba41b8af4 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -701,7 +701,7 @@ pub trait Resolver { fn get_module_scope(&mut self, id: ast::NodeId) -> Mark; - fn resolve_dollar_crates(&mut self, fragment: &AstFragment); + fn resolve_dollar_crates(&mut self); fn visit_ast_fragment_with_placeholders(&mut self, mark: Mark, fragment: &AstFragment, derives: &[Mark]); fn add_builtin(&mut self, ident: ast::Ident, ext: Lrc<SyntaxExtension>); diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 74ef5cbe917..053686b8b1f 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -429,7 +429,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> { fn collect_invocations(&mut self, mut fragment: AstFragment, derives: &[Mark]) -> (AstFragment, Vec<Invocation>) { // Resolve `$crate`s in the fragment for pretty-printing. - self.cx.resolver.resolve_dollar_crates(&fragment); + self.cx.resolver.resolve_dollar_crates(); let invocations = { let mut collector = InvocationCollector { |