diff options
| author | bors <bors@rust-lang.org> | 2024-10-09 22:21:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-09 22:21:43 +0000 |
| commit | fc0f045dd1fe9b0f14f504d0513623342be6f0dc (patch) | |
| tree | b1d6965506ef363c4324af76028fab9d91aa9f2e /compiler/rustc_codegen_cranelift/src | |
| parent | eb4e2346748e1760f74fcaa27b42431e0b95f8f3 (diff) | |
| parent | 0fe2532a37b5a23f554cd3e64e2d6da1838ed451 (diff) | |
| download | rust-fc0f045dd1fe9b0f14f504d0513623342be6f0dc.tar.gz rust-fc0f045dd1fe9b0f14f504d0513623342be6f0dc.zip | |
Auto merge of #131458 - matthiaskrgr:rollup-82qeotv, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #131382 (Add "reference" as a known compiletest header) - #131420 (Dont ICE when encountering post-mono layout cycle error) - #131424 (compiler: Stop reexporting enum-globs from `rustc_target::abi`) - #131426 (Fix quotation marks around debug line in `src/ci/run.sh`) - #131435 (Ignore broken-pipe-no-ice on apple (specifically macOS) for now) - #131447 (add more crash tests) - #131456 (Fix typo in E0793) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_cranelift/src')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/src/discriminant.rs | 3 | ||||
| -rw-r--r-- | compiler/rustc_codegen_cranelift/src/lib.rs | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_cranelift/src/discriminant.rs b/compiler/rustc_codegen_cranelift/src/discriminant.rs index e7ac084558a..d462dcd63a9 100644 --- a/compiler/rustc_codegen_cranelift/src/discriminant.rs +++ b/compiler/rustc_codegen_cranelift/src/discriminant.rs @@ -3,7 +3,8 @@ //! Adapted from <https://github.com/rust-lang/rust/blob/31c0645b9d2539f47eecb096142474b29dc542f7/compiler/rustc_codegen_ssa/src/mir/place.rs> //! (<https://github.com/rust-lang/rust/pull/104535>) -use rustc_target::abi::{Int, TagEncoding, Variants}; +use rustc_abi::Primitive::Int; +use rustc_abi::{TagEncoding, Variants}; use crate::prelude::*; diff --git a/compiler/rustc_codegen_cranelift/src/lib.rs b/compiler/rustc_codegen_cranelift/src/lib.rs index f6b7981395a..b6f9ce8fc29 100644 --- a/compiler/rustc_codegen_cranelift/src/lib.rs +++ b/compiler/rustc_codegen_cranelift/src/lib.rs @@ -15,6 +15,7 @@ extern crate jobserver; #[macro_use] extern crate rustc_middle; +extern crate rustc_abi; extern crate rustc_ast; extern crate rustc_codegen_ssa; extern crate rustc_data_structures; |