Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 43c7805

Browse files
committedNov 4, 2024
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
2 parents 42188c3 + 72df778 commit 43c7805

File tree

167 files changed

+1810
-496
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+1810
-496
lines changed
 

‎compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use std::fmt::Write;
1515

16+
use rustc_abi::Integer;
1617
use rustc_data_structures::fx::FxHashSet;
1718
use rustc_data_structures::stable_hasher::{Hash64, HashStable, StableHasher};
1819
use rustc_hir::def_id::DefId;
@@ -23,7 +24,6 @@ use rustc_middle::ty::layout::{IntegerExt, TyAndLayout};
2324
use rustc_middle::ty::{
2425
self, ExistentialProjection, GenericArgKind, GenericArgsRef, ParamEnv, Ty, TyCtxt,
2526
};
26-
use rustc_target::abi::Integer;
2727
use smallvec::SmallVec;
2828

2929
use crate::debuginfo::wants_c_like_enum_debuginfo;
@@ -364,7 +364,7 @@ fn push_debuginfo_type_name<'tcx>(
364364
} else {
365365
output.push_str(sig.safety.prefix_str());
366366

367-
if sig.abi != rustc_target::spec::abi::Abi::Rust {
367+
if sig.abi != rustc_abi::ExternAbi::Rust {
368368
output.push_str("extern \"");
369369
output.push_str(sig.abi.name());
370370
output.push_str("\" ");

‎compiler/rustc_codegen_ssa/src/meth.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use rustc_middle::bug;
22
use rustc_middle::ty::{self, GenericArgKind, Ty};
33
use rustc_session::config::Lto;
44
use rustc_symbol_mangling::typeid_for_trait_ref;
5-
use rustc_target::abi::call::FnAbi;
5+
use rustc_target::callconv::FnAbi;
66
use tracing::{debug, instrument};
77

88
use crate::traits::*;
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.