diff options
| author | bors <bors@rust-lang.org> | 2022-04-05 09:47:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-05 09:47:44 +0000 |
| commit | 634770c0a7f8598164ab825cfe419cc8b03c36e5 (patch) | |
| tree | a8e3276b6c7928babd414057b34015a8a310c6d5 /compiler/rustc_interface/src | |
| parent | 949b98cab8a186b98bf87e64374b8d0848c55271 (diff) | |
| parent | bf44a87732496e4ea5e7f7cb11680bb68fd6cad4 (diff) | |
| download | rust-634770c0a7f8598164ab825cfe419cc8b03c36e5.tar.gz rust-634770c0a7f8598164ab825cfe419cc8b03c36e5.zip | |
Auto merge of #95667 - Dylan-DPC:rollup-n7xzs3y, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #95234 (bootstrap.py: nixos check in /etc/os-release with quotes) - #95449 (Fix `x doc --stage 0 compiler`) - #95512 (diagnostics: translation infrastructure) - #95607 (Note invariance reason for FnDef types) - #95645 (Fix intra doc link ICE when trying to get traits in scope for primitive) Failed merges: 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 f2164bccc3e..eac6a33cf22 100644 --- a/compiler/rustc_interface/src/passes.rs +++ b/compiler/rustc_interface/src/passes.rs @@ -10,7 +10,7 @@ use rustc_codegen_ssa::traits::CodegenBackend; use rustc_data_structures::parallel; use rustc_data_structures::sync::{Lrc, OnceCell, WorkerLocal}; use rustc_data_structures::temp_dir::MaybeTempDir; -use rustc_errors::{Applicability, ErrorGuaranteed, PResult}; +use rustc_errors::{Applicability, ErrorGuaranteed, MultiSpan, PResult}; use rustc_expand::base::{ExtCtxt, LintStoreExpand, ResolverExpand}; use rustc_hir::def_id::{StableCrateId, LOCAL_CRATE}; use rustc_hir::Crate; @@ -35,7 +35,7 @@ use rustc_session::output::{filename_for_input, filename_for_metadata}; use rustc_session::search_paths::PathKind; use rustc_session::{Limit, Session}; use rustc_span::symbol::{sym, Symbol}; -use rustc_span::{FileName, MultiSpan}; +use rustc_span::FileName; use rustc_trait_selection::traits; use rustc_typeck as typeck; use tempfile::Builder as TempFileBuilder; |
