diff options
| author | bors <bors@rust-lang.org> | 2020-04-26 01:12:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-26 01:12:20 +0000 |
| commit | b592b37fa31c0d81ca23fea9fe7998c3f0f4bd0b (patch) | |
| tree | 065f6ab256a55a6cbc1826ddc1aa75ecbca043b4 /src/librustc_interface | |
| parent | 0862458dad90a0d80827e22e3f86e33add6d847c (diff) | |
| parent | f70c9dba22df28b606ee413a82a3fe4305855620 (diff) | |
| download | rust-b592b37fa31c0d81ca23fea9fe7998c3f0f4bd0b.tar.gz rust-b592b37fa31c0d81ca23fea9fe7998c3f0f4bd0b.zip | |
Auto merge of #71566 - Dylan-DPC:rollup-9xoz6fg, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #70043 (Add all remaining `DefKind`s.) - #71140 ([breaking change] Disallow statics initializing themselves) - #71392 (Don't hold the predecessor cache lock longer than necessary) - #71541 (Add regression test for #26376) - #71554 (Replace thread_local with generator resume arguments in box_region.) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_interface')
| -rw-r--r-- | src/librustc_interface/passes.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/librustc_interface/passes.rs b/src/librustc_interface/passes.rs index 4c054795136..4b09148eab6 100644 --- a/src/librustc_interface/passes.rs +++ b/src/librustc_interface/passes.rs @@ -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)) |
