diff options
| author | bors <bors@rust-lang.org> | 2025-02-05 21:17:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-02-05 21:17:26 +0000 |
| commit | 6741521dc478182392806e816e919a36be5a2ba2 (patch) | |
| tree | 242844a7878300c82a8ac08595c62c8cd413d6ee /compiler/rustc_codegen_gcc/src/builder.rs | |
| parent | a9730c3b5f84a001c052c60c97ed0765e9ceac04 (diff) | |
| parent | eeef079a3099e657109aba017d7ab292330b7602 (diff) | |
| download | rust-6741521dc478182392806e816e919a36be5a2ba2.tar.gz rust-6741521dc478182392806e816e919a36be5a2ba2.zip | |
Auto merge of #136572 - jieyouxu:rollup-mtyaisw, r=jieyouxu
Rollup of 12 pull requests
Successful merges:
- #132547 (cg_gcc: Directly use rustc_abi instead of reexports)
- #135572 (tests: Port `split-debuginfo` to rmake.rs)
- #135964 (Make cenum_impl_drop_cast a hard error)
- #136154 (Use +secure-plt for powerpc-unknown-linux-gnu{,spe})
- #136304 (Reject negative literals for unsigned or char types in pattern ranges and literals)
- #136418 (uefi: process: Add support for command environment variables)
- #136449 (std: move network code into `sys`)
- #136517 (implement inherent str constructors)
- #136536 (Rename and Move some UI tests to more suitable subdirs)
- #136537 (Update `compiler-builtins` to 0.1.145)
- #136555 (Rename `slice::take...` methods to `split_off...`)
- #136567 (Arbitrary self types v2: recursion test)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_gcc/src/builder.rs')
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/builder.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_gcc/src/builder.rs b/compiler/rustc_codegen_gcc/src/builder.rs index 89e5cf1b8c6..bba19d06258 100644 --- a/compiler/rustc_codegen_gcc/src/builder.rs +++ b/compiler/rustc_codegen_gcc/src/builder.rs @@ -29,7 +29,7 @@ use rustc_middle::ty::layout::{ use rustc_middle::ty::{self, Instance, Ty, TyCtxt}; use rustc_span::Span; use rustc_span::def_id::DefId; -use rustc_target::abi::call::FnAbi; +use rustc_target::callconv::FnAbi; use rustc_target::spec::{HasTargetSpec, HasWasmCAbiOpt, HasX86AbiOpt, Target, WasmCAbi, X86Abi}; use crate::common::{SignType, TypeReflection, type_is_pointer}; |
