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

Replace thread_local with generator resume arguments in box_region.

Browse source
This commit is contained in:
Alex Aktsipetrov 2020-03-31 18:49:05 +02:00
parent a58b1ed44f
commit 357f4ce431
2 changed files with 31 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/librustc_interface/passes.rs
View file

@ -109,7 +109,8 @@ pub fn configure_and_expand(
// its contents but the results of name resolution on those contents. Hopefully we'll push
// this back at some point.
let crate_name = crate_name.to_string();
let (result, resolver) = BoxedResolver::new(static move || {
let (result, resolver) = BoxedResolver::new(static move |mut action| {
let _ = action;
let sess = &*sess;
let resolver_arenas = Resolver::arenas();
let res = configure_and_expand_inner(
@ -126,11 +127,11 @@ pub fn configure_and_expand(
panic!()
}
Ok((krate, resolver)) => {
yield BoxedResolver::initial_yield(Ok(krate));
action = yield BoxedResolver::initial_yield(Ok(krate));
resolver
}
};
box_region_allow_access!(for(), (&mut Resolver<'_>), (&mut resolver));
box_region_allow_access!(for(), (&mut Resolver<'_>), (&mut resolver), action);
resolver.into_outputs()
});
result.map(|k| (k, resolver))