diff options
| author | bors <bors@rust-lang.org> | 2024-11-04 00:54:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-11-04 00:54:17 +0000 |
| commit | 43c78051ea96f89ecf33533dfed6db6f1eeba150 (patch) | |
| tree | 43a251075d339858465972aefe001694a3e23f91 /compiler/rustc_codegen_llvm/src/llvm/mod.rs | |
| parent | 42188c3ca8ed84210c8cab6b1e2d553925e3dd2f (diff) | |
| parent | 72df7780dd966be9970a68e22d413f11f4c3ef7a (diff) | |
| download | rust-43c78051ea96f89ecf33533dfed6db6f1eeba150.tar.gz rust-43c78051ea96f89ecf33533dfed6db6f1eeba150.zip | |
Auto merge of #132581 - workingjubilee:rollup-4wj318p, r=workingjubilee
Rollup of 6 pull requests Successful merges: - #126136 (Call the target libdir target libdir) - #132516 (Add bad-reg inline assembly ui test for RISC-V and s390x) - #132521 (replace manual time convertions with std ones, comptime time format parsing) - #132560 (Remove outdated tidy license fixmes) - #132563 (Modify `NonZero` documentation to reference the underlying integer type) - #132574 (compiler: Directly use rustc_abi almost everywhere) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/llvm/mod.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm/mod.rs b/compiler/rustc_codegen_llvm/src/llvm/mod.rs index 00a5cd3b859..3b0bf47366e 100644 --- a/compiler/rustc_codegen_llvm/src/llvm/mod.rs +++ b/compiler/rustc_codegen_llvm/src/llvm/mod.rs @@ -8,8 +8,8 @@ use std::str::FromStr; use std::string::FromUtf8Error; use libc::c_uint; +use rustc_abi::{Align, Size, WrappingRange}; use rustc_llvm::RustString; -use rustc_target::abi::{Align, Size, WrappingRange}; pub use self::AtomicRmwBinOp::*; pub use self::CallConv::*; |