1
Fork 0

Simplify expansion logic

This commit is contained in:
Oli Scherer 2023-02-14 09:50:13 +00:00
parent d15663814b
commit 241c6a4a61

View file

@ -186,8 +186,8 @@ impl<'tcx> Queries<'tcx> {
pub fn global_ctxt(&'tcx self) -> Result<QueryResult<'_, &'tcx GlobalCtxt<'tcx>>> { pub fn global_ctxt(&'tcx self) -> Result<QueryResult<'_, &'tcx GlobalCtxt<'tcx>>> {
self.gcx.compute(|| { self.gcx.compute(|| {
let crate_name = *self.crate_name()?.borrow(); let crate_name = *self.crate_name()?.borrow();
let (krate, resolver_outputs, lint_store) = { let (krate, lint_store) = self.register_plugins()?.steal();
let (krate, lint_store) = self.register_plugins()?.steal(); let (krate, resolver_outputs) = {
let _timer = self.session().timer("configure_and_expand"); let _timer = self.session().timer("configure_and_expand");
let sess = self.session(); let sess = self.session();
@ -206,7 +206,7 @@ impl<'tcx> Queries<'tcx> {
crate_name, crate_name,
&mut resolver, &mut resolver,
)?; )?;
(Lrc::new(krate), resolver.into_outputs(), lint_store) (Lrc::new(krate), resolver.into_outputs())
}; };
let ty::ResolverOutputs { let ty::ResolverOutputs {