diff options
| author | bors <bors@rust-lang.org> | 2025-07-31 08:54:41 +0000 | 
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-07-31 08:54:41 +0000 | 
| commit | 64ca23b6235732fa61c0a2b957c5d7e591e7c972 (patch) | |
| tree | 4688ea8f1bef26095df721f0a4344b64e2e66f03 /compiler/rustc_interface/src | |
| parent | cc0a5b73053c62a3df5f84b3ee85079c9b65fa87 (diff) | |
| parent | 017586c93abe3b7e6f495a1f2bf34df4f3693411 (diff) | |
| download | rust-64ca23b6235732fa61c0a2b957c5d7e591e7c972.tar.gz rust-64ca23b6235732fa61c0a2b957c5d7e591e7c972.zip | |
Auto merge of #144723 - Zalathar:rollup-f9e0rfo, r=Zalathar
Rollup of 3 pull requests Successful merges: - rust-lang/rust#144657 (fix: Only "close the window" when its the last annotated file) - rust-lang/rust#144665 (Re-block SRoA on SIMD types) - rust-lang/rust#144713 (`rustc_middle::ty` cleanups) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_interface/src')
| -rw-r--r-- | compiler/rustc_interface/src/passes.rs | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/compiler/rustc_interface/src/passes.rs b/compiler/rustc_interface/src/passes.rs index 057fbe2fc4e..83ac981429c 100644 --- a/compiler/rustc_interface/src/passes.rs +++ b/compiler/rustc_interface/src/passes.rs @@ -29,7 +29,7 @@ use rustc_parse::{ new_parser_from_file, new_parser_from_source_str, unwrap_or_emit_fatal, validate_attr, }; use rustc_passes::{abi_test, input_stats, layout_test}; -use rustc_resolve::Resolver; +use rustc_resolve::{Resolver, ResolverOutputs}; use rustc_session::config::{CrateType, Input, OutFileName, OutputFilenames, OutputType}; use rustc_session::cstore::Untracked; use rustc_session::output::{collect_crate_types, filename_for_input}; @@ -793,7 +793,7 @@ fn resolver_for_lowering_raw<'tcx>( // Make sure we don't mutate the cstore from here on. tcx.untracked().cstore.freeze(); - let ty::ResolverOutputs { + let ResolverOutputs { global_ctxt: untracked_resolutions, ast_lowering: untracked_resolver_for_lowering, } = resolver.into_outputs(); | 
