diff options
| author | bors <bors@rust-lang.org> | 2025-02-09 10:08:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-02-09 10:08:04 +0000 |
| commit | 1ff21350fdc967393243227c88dddb5def8717b2 (patch) | |
| tree | 8d4f8d0b46af6834308545a35915e65aab191eca /compiler/rustc_interface/src | |
| parent | 43ca9d18e333797f0aa3b525501a7cec8d61a96b (diff) | |
| parent | 45289b74fa97ab83ded74da0f1d1efc9ae4616aa (diff) | |
| download | rust-1ff21350fdc967393243227c88dddb5def8717b2.tar.gz rust-1ff21350fdc967393243227c88dddb5def8717b2.zip | |
Auto merge of #136762 - workingjubilee:rollup-23fn0nl, r=workingjubilee
Rollup of 8 pull requests Successful merges: - #136397 (Add a comment pointing to ICE-136223) - #136686 (Clean up `HashMap` and `HashSet` docs.) - #136706 (compiler: mostly-finish `rustc_abi` updates) - #136710 (Document `Sum::sum` returns additive identities for `[]`) - #136724 (Make `AsyncFnOnce`, `AsyncFnMut`, `AsyncFn` non-`#[fundamental]`) - #136727 (Have a break from review rotation) - #136730 (transmutability: fix ICE when passing wrong ADT to ASSUME) - #136736 (Small resolve refactor) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_interface/src')
| -rw-r--r-- | compiler/rustc_interface/src/tests.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_interface/src/tests.rs b/compiler/rustc_interface/src/tests.rs index 46d6f37a91c..a5a11cf776b 100644 --- a/compiler/rustc_interface/src/tests.rs +++ b/compiler/rustc_interface/src/tests.rs @@ -4,6 +4,7 @@ use std::num::NonZero; use std::path::{Path, PathBuf}; use std::sync::atomic::AtomicBool; +use rustc_abi::Align; use rustc_data_structures::profiling::TimePassesFormat; use rustc_errors::emitter::HumanReadableErrorType; use rustc_errors::{ColorConfig, registry}; @@ -24,7 +25,6 @@ use rustc_session::{CompilerIO, EarlyDiagCtxt, Session, build_session, filesearc use rustc_span::edition::{DEFAULT_EDITION, Edition}; use rustc_span::source_map::{RealFileLoader, SourceMapInputs}; use rustc_span::{FileName, SourceFileHashAlgorithm, sym}; -use rustc_target::abi::Align; use rustc_target::spec::{ CodeModel, FramePointer, LinkerFlavorCli, MergeFunctions, OnBrokenPipe, PanicStrategy, RelocModel, RelroLevel, SanitizerSet, SplitDebuginfo, StackProtector, TlsModel, WasmCAbi, |