user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

expand: Keep the correct current expansion ID for eager expansions

Browse source 
Solve the problem of `ParentScope` entries for eager expansions not exising in the resolver map by creating them on demand.
This commit is contained in:
Vadim Petrochenkov 2019-08-19 23:35:25 +03:00
parent 1dd56aa304
commit 96032aa5ef
4 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libsyntax/ext/expand.rs
View file

@ -318,7 +318,6 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
progress = true;
let ExpansionData { depth, id: expn_id, .. } = invoc.expansion_data;
self.cx.current_expansion = invoc.expansion_data.clone();
self.cx.current_expansion.id = scope;
// FIXME(jseyfried): Refactor out the following logic
let (expanded_fragment, new_invocations) = if let Some(ext) = ext {