Skip to content

Commit 1ba782a

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of #132550 - workingjubilee:rustc-abi-selects-borrowck-for-mono-sans, r=compiler-errors
compiler: Continue introducing rustc_abi to the compiler Some crates have not heard of rustc_abi before, so arrange introductions. Encourage some crates to go further and leave rustc_target behind: it was no good for them.
2 parents ecbd8d1 + ab6994f commit 1ba782a

File tree

21 files changed

+35
-30
lines changed

21 files changed

+35
-30
lines changed

‎Cargo.lock

+5-2
Original file line numberDiff line numberDiff line change
@@ -3346,6 +3346,7 @@ dependencies = [
33463346
"either",
33473347
"itertools",
33483348
"polonius-engine",
3349+
"rustc_abi",
33493350
"rustc_data_structures",
33503351
"rustc_errors",
33513352
"rustc_fluent_macro",
@@ -3359,7 +3360,6 @@ dependencies = [
33593360
"rustc_mir_dataflow",
33603361
"rustc_session",
33613362
"rustc_span",
3362-
"rustc_target",
33633363
"rustc_trait_selection",
33643364
"rustc_traits",
33653365
"smallvec",
@@ -3706,6 +3706,7 @@ name = "rustc_hir"
37063706
version = "0.0.0"
37073707
dependencies = [
37083708
"odht",
3709+
"rustc_abi",
37093710
"rustc_arena",
37103711
"rustc_ast",
37113712
"rustc_data_structures",
@@ -4131,6 +4132,7 @@ dependencies = [
41314132
name = "rustc_monomorphize"
41324133
version = "0.0.0"
41334134
dependencies = [
4135+
"rustc_abi",
41344136
"rustc_data_structures",
41354137
"rustc_errors",
41364138
"rustc_fluent_macro",
@@ -4335,6 +4337,7 @@ name = "rustc_sanitizers"
43354337
version = "0.0.0"
43364338
dependencies = [
43374339
"bitflags 2.6.0",
4340+
"rustc_abi",
43384341
"rustc_data_structures",
43394342
"rustc_hir",
43404343
"rustc_middle",
@@ -4467,6 +4470,7 @@ name = "rustc_trait_selection"
44674470
version = "0.0.0"
44684471
dependencies = [
44694472
"itertools",
4473+
"rustc_abi",
44704474
"rustc_ast",
44714475
"rustc_ast_ir",
44724476
"rustc_attr",
@@ -4483,7 +4487,6 @@ dependencies = [
44834487
"rustc_serialize",
44844488
"rustc_session",
44854489
"rustc_span",
4486-
"rustc_target",
44874490
"rustc_transmute",
44884491
"rustc_type_ir",
44894492
"smallvec",

‎compiler/rustc_borrowck/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ edition = "2021"
88
either = "1.5.0"
99
itertools = "0.12"
1010
polonius-engine = "0.13.0"
11+
rustc_abi = { path = "../rustc_abi" }
1112
rustc_data_structures = { path = "../rustc_data_structures" }
1213
rustc_errors = { path = "../rustc_errors" }
1314
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
@@ -21,7 +22,6 @@ rustc_middle = { path = "../rustc_middle" }
2122
rustc_mir_dataflow = { path = "../rustc_mir_dataflow" }
2223
rustc_session = { path = "../rustc_session" }
2324
rustc_span = { path = "../rustc_span" }
24-
rustc_target = { path = "../rustc_target" }
2525
rustc_trait_selection = { path = "../rustc_trait_selection" }
2626
rustc_traits = { path = "../rustc_traits" }
2727
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }

‎compiler/rustc_borrowck/src/diagnostics/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//! Borrow checker diagnostics.
22
3+
use rustc_abi::{FieldIdx, VariantIdx};
34
use rustc_errors::{Applicability, Diag, MultiSpan};
45
use rustc_hir::def::{CtorKind, Namespace};
56
use rustc_hir::{self as hir, CoroutineKind, LangItem};
@@ -21,7 +22,6 @@ use rustc_span::def_id::LocalDefId;
2122
use rustc_span::source_map::Spanned;
2223
use rustc_span::symbol::sym;
2324
use rustc_span::{DUMMY_SP, Span, Symbol};
24-
use rustc_target::abi::{FieldIdx, VariantIdx};
2525
use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
2626
use rustc_trait_selection::infer::InferCtxtExt;
2727
use rustc_trait_selection::traits::{

‎compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
use core::ops::ControlFlow;
55

66
use hir::{ExprKind, Param};
7+
use rustc_abi::FieldIdx;
78
use rustc_errors::{Applicability, Diag};
89
use rustc_hir::intravisit::Visitor;
910
use rustc_hir::{self as hir, BindingMode, ByRef, Node};
@@ -16,7 +17,6 @@ use rustc_middle::mir::{
1617
use rustc_middle::ty::{self, InstanceKind, Ty, TyCtxt, Upcast};
1718
use rustc_span::symbol::{Symbol, kw};
1819
use rustc_span::{BytePos, DesugaringKind, Span, sym};
19-
use rustc_target::abi::FieldIdx;
2020
use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
2121
use rustc_trait_selection::infer::InferCtxtExt;
2222
use rustc_trait_selection::traits;

‎compiler/rustc_borrowck/src/diagnostics/region_errors.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
11031103
peeled_ty,
11041104
liberated_sig.c_variadic,
11051105
hir::Safety::Safe,
1106-
rustc_target::spec::abi::Abi::Rust,
1106+
rustc_abi::ExternAbi::Rust,
11071107
)),
11081108
);
11091109
let closure_ty = Ty::new_closure(

‎compiler/rustc_borrowck/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ use std::marker::PhantomData;
2121
use std::ops::Deref;
2222

2323
use consumers::{BodyWithBorrowckFacts, ConsumerOptions};
24+
use rustc_abi::FieldIdx;
2425
use rustc_data_structures::fx::{FxIndexMap, FxIndexSet};
2526
use rustc_data_structures::graph::dominators::Dominators;
2627
use rustc_errors::Diag;
@@ -45,7 +46,6 @@ use rustc_mir_dataflow::move_paths::{
4546
};
4647
use rustc_session::lint::builtin::UNUSED_MUT;
4748
use rustc_span::{Span, Symbol};
48-
use rustc_target::abi::FieldIdx;
4949
use smallvec::SmallVec;
5050
use tracing::{debug, instrument};
5151

‎compiler/rustc_borrowck/src/path_utils.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
use rustc_abi::FieldIdx;
12
use rustc_data_structures::graph::dominators::Dominators;
23
use rustc_middle::mir::{BasicBlock, Body, BorrowKind, Location, Place, PlaceRef, ProjectionElem};
34
use rustc_middle::ty::TyCtxt;
4-
use rustc_target::abi::FieldIdx;
55
use tracing::debug;
66

77
use crate::borrow_set::{BorrowData, BorrowSet, TwoPhaseActivation};

‎compiler/rustc_borrowck/src/type_check/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use std::rc::Rc;
44
use std::{fmt, iter, mem};
55

66
use either::Either;
7+
use rustc_abi::{FIRST_VARIANT, FieldIdx};
78
use rustc_data_structures::frozen::Frozen;
89
use rustc_data_structures::fx::{FxIndexMap, FxIndexSet};
910
use rustc_errors::ErrorGuaranteed;
@@ -40,7 +41,6 @@ use rustc_span::def_id::CRATE_DEF_ID;
4041
use rustc_span::source_map::Spanned;
4142
use rustc_span::symbol::sym;
4243
use rustc_span::{DUMMY_SP, Span};
43-
use rustc_target::abi::{FIRST_VARIANT, FieldIdx};
4444
use rustc_trait_selection::traits::query::type_op::custom::{
4545
CustomTypeOp, scrape_region_constraints,
4646
};

‎compiler/rustc_hir/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ edition = "2021"
66
[dependencies]
77
# tidy-alphabetical-start
88
odht = { version = "0.3.1", features = ["nightly"] }
9+
rustc_abi = { path = "../rustc_abi" }
910
rustc_arena = { path = "../rustc_arena" }
1011
rustc_ast = { path = "../rustc_ast" }
1112
rustc_data_structures = { path = "../rustc_data_structures" }

‎compiler/rustc_hir/src/hir.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use std::fmt;
22

3+
use rustc_abi::ExternAbi;
34
use rustc_ast::util::parser::ExprPrecedence;
45
use rustc_ast::{
56
self as ast, Attribute, FloatTy, InlineAsmOptions, InlineAsmTemplatePiece, IntTy, Label,
@@ -19,7 +20,6 @@ use rustc_span::source_map::Spanned;
1920
use rustc_span::symbol::{Ident, Symbol, kw, sym};
2021
use rustc_span::{BytePos, DUMMY_SP, ErrorGuaranteed, Span};
2122
use rustc_target::asm::InlineAsmRegOrRegClass;
22-
use rustc_target::spec::abi::Abi;
2323
use smallvec::SmallVec;
2424
use tracing::debug;
2525

@@ -2735,7 +2735,7 @@ impl PrimTy {
27352735
#[derive(Debug, Clone, Copy, HashStable_Generic)]
27362736
pub struct BareFnTy<'hir> {
27372737
pub safety: Safety,
2738-
pub abi: Abi,
2738+
pub abi: ExternAbi,
27392739
pub generic_params: &'hir [GenericParam<'hir>],
27402740
pub decl: &'hir FnDecl<'hir>,
27412741
pub param_names: &'hir [Ident],
@@ -3313,7 +3313,7 @@ impl<'hir> Item<'hir> {
33133313

33143314
expect_mod, &'hir Mod<'hir>, ItemKind::Mod(m), m;
33153315

3316-
expect_foreign_mod, (Abi, &'hir [ForeignItemRef]),
3316+
expect_foreign_mod, (ExternAbi, &'hir [ForeignItemRef]),
33173317
ItemKind::ForeignMod { abi, items }, (*abi, items);
33183318

33193319
expect_global_asm, &'hir InlineAsm<'hir>, ItemKind::GlobalAsm(asm), asm;
@@ -3386,7 +3386,7 @@ pub struct FnHeader {
33863386
pub safety: Safety,
33873387
pub constness: Constness,
33883388
pub asyncness: IsAsync,
3389-
pub abi: Abi,
3389+
pub abi: ExternAbi,
33903390
}
33913391

33923392
impl FnHeader {
@@ -3428,7 +3428,7 @@ pub enum ItemKind<'hir> {
34283428
/// A module.
34293429
Mod(&'hir Mod<'hir>),
34303430
/// An external module, e.g. `extern { .. }`.
3431-
ForeignMod { abi: Abi, items: &'hir [ForeignItemRef] },
3431+
ForeignMod { abi: ExternAbi, items: &'hir [ForeignItemRef] },
34323432
/// Module-level inline assembly (from `global_asm!`).
34333433
GlobalAsm(&'hir InlineAsm<'hir>),
34343434
/// A type alias, e.g., `type Foo = Bar<u8>`.

‎compiler/rustc_monomorphize/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ edition = "2021"
55

66
[dependencies]
77
# tidy-alphabetical-start
8+
rustc_abi = { path = "../rustc_abi" }
89
rustc_data_structures = { path = "../rustc_data_structures" }
910
rustc_errors = { path = "../rustc_errors" }
1011
rustc_fluent_macro = { path = "../rustc_fluent_macro" }

‎compiler/rustc_monomorphize/src/collector.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ mod move_check;
210210
use std::path::PathBuf;
211211

212212
use move_check::MoveCheckState;
213+
use rustc_abi::Size;
213214
use rustc_data_structures::sync::{LRef, MTLock, par_for_each_in};
214215
use rustc_data_structures::unord::{UnordMap, UnordSet};
215216
use rustc_hir as hir;
@@ -236,7 +237,6 @@ use rustc_session::config::EntryFnType;
236237
use rustc_span::source_map::{Spanned, dummy_spanned, respan};
237238
use rustc_span::symbol::{Ident, sym};
238239
use rustc_span::{DUMMY_SP, Span};
239-
use rustc_target::abi::Size;
240240
use tracing::{debug, instrument, trace};
241241

242242
use crate::errors::{self, EncounteredErrorWhileInstantiating, NoOptimizedMir, RecursionLimit};

‎compiler/rustc_sanitizers/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ edition = "2021"
77
bitflags = "2.5.0"
88
tracing = "0.1"
99
twox-hash = "1.6.3"
10+
rustc_abi = { path = "../rustc_abi" }
1011
rustc_data_structures = { path = "../rustc_data_structures" }
1112
rustc_hir = { path = "../rustc_hir" }
1213
rustc_middle = { path = "../rustc_middle" }

‎compiler/rustc_sanitizers/src/cfi/typeid/itanium_cxx_abi/encode.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
88
use std::fmt::Write as _;
99

10+
use rustc_abi::{ExternAbi, Integer};
1011
use rustc_data_structures::base_n::{ALPHANUMERIC_ONLY, CASE_INSENSITIVE, ToBaseN};
1112
use rustc_data_structures::fx::FxHashMap;
1213
use rustc_hir as hir;
@@ -18,8 +19,6 @@ use rustc_middle::ty::{
1819
};
1920
use rustc_span::def_id::DefId;
2021
use rustc_span::sym;
21-
use rustc_target::abi::Integer;
22-
use rustc_target::spec::abi::Abi;
2322
use tracing::instrument;
2423

2524
use crate::cfi::typeid::TypeIdOptions;
@@ -185,7 +184,7 @@ fn encode_fnsig<'tcx>(
185184
let mut encode_ty_options = EncodeTyOptions::from_bits(options.bits())
186185
.unwrap_or_else(|| bug!("encode_fnsig: invalid option(s) `{:?}`", options.bits()));
187186
match fn_sig.abi {
188-
Abi::C { .. } => {
187+
ExternAbi::C { .. } => {
189188
encode_ty_options.insert(EncodeTyOptions::GENERALIZE_REPR_C);
190189
}
191190
_ => {

‎compiler/rustc_sanitizers/src/cfi/typeid/itanium_cxx_abi/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use rustc_data_structures::fx::FxHashMap;
88
use rustc_middle::bug;
99
use rustc_middle::ty::{self, Instance, Ty, TyCtxt, TypeFoldable, TypeVisitableExt};
10-
use rustc_target::abi::call::{Conv, FnAbi, PassMode};
10+
use rustc_target::callconv::{Conv, FnAbi, PassMode};
1111
use tracing::instrument;
1212

1313
mod encode;

‎compiler/rustc_sanitizers/src/cfi/typeid/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
77
use bitflags::bitflags;
88
use rustc_middle::ty::{Instance, Ty, TyCtxt};
9-
use rustc_target::abi::call::FnAbi;
9+
use rustc_target::callconv::FnAbi;
1010

1111
bitflags! {
1212
/// Options for typeid_for_fnabi.

‎compiler/rustc_sanitizers/src/kcfi/typeid/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use std::hash::Hasher;
88

99
use rustc_middle::ty::{Instance, InstanceKind, ReifyReason, Ty, TyCtxt};
10-
use rustc_target::abi::call::FnAbi;
10+
use rustc_target::callconv::FnAbi;
1111
use twox_hash::XxHash64;
1212

1313
pub use crate::cfi::typeid::{TypeIdOptions, itanium_cxx_abi};

‎compiler/rustc_trait_selection/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ edition = "2021"
66
[dependencies]
77
# tidy-alphabetical-start
88
itertools = "0.12"
9+
rustc_abi = { path = "../rustc_abi" }
910
rustc_ast = { path = "../rustc_ast" }
1011
rustc_ast_ir = { path = "../rustc_ast_ir" }
1112
rustc_attr = { path = "../rustc_attr" }
@@ -22,7 +23,6 @@ rustc_query_system = { path = "../rustc_query_system" }
2223
rustc_serialize = { path = "../rustc_serialize" }
2324
rustc_session = { path = "../rustc_session" }
2425
rustc_span = { path = "../rustc_span" }
25-
rustc_target = { path = "../rustc_target" }
2626
rustc_transmute = { path = "../rustc_transmute", features = ["rustc"] }
2727
rustc_type_ir = { path = "../rustc_type_ir" }
2828
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }

‎compiler/rustc_trait_selection/src/error_reporting/infer/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ use std::ops::ControlFlow;
5050
use std::path::PathBuf;
5151
use std::{cmp, fmt, iter};
5252

53+
use rustc_abi::ExternAbi;
5354
use rustc_data_structures::fx::{FxIndexMap, FxIndexSet};
5455
use rustc_errors::{Applicability, Diag, DiagStyledString, IntoDiagArg, StringPart, pluralize};
5556
use rustc_hir::def::DefKind;
@@ -67,7 +68,6 @@ use rustc_middle::ty::{
6768
TypeVisitableExt,
6869
};
6970
use rustc_span::{BytePos, DesugaringKind, Pos, Span, sym};
70-
use rustc_target::spec::abi;
7171
use tracing::{debug, instrument};
7272

7373
use crate::error_reporting::TypeErrCtxt;
@@ -686,10 +686,10 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
686686

687687
// unsafe extern "C" for<'a> fn(&'a T) -> &'a T
688688
// ^^^^^^^^^^
689-
if sig1.abi != abi::Abi::Rust {
689+
if sig1.abi != ExternAbi::Rust {
690690
values.0.push(format!("extern {} ", sig1.abi), sig1.abi != sig2.abi);
691691
}
692-
if sig2.abi != abi::Abi::Rust {
692+
if sig2.abi != ExternAbi::Rust {
693693
values.1.push(format!("extern {} ", sig2.abi), sig1.abi != sig2.abi);
694694
}
695695

‎compiler/rustc_trait_selection/src/error_reporting/traits/suggestions.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use std::iter;
66
use std::path::PathBuf;
77

88
use itertools::{EitherOrBoth, Itertools};
9+
use rustc_abi::ExternAbi;
910
use rustc_data_structures::fx::FxHashSet;
1011
use rustc_data_structures::stack::ensure_sufficient_stack;
1112
use rustc_errors::codes::*;
@@ -38,7 +39,6 @@ use rustc_middle::{bug, span_bug};
3839
use rustc_span::def_id::LocalDefId;
3940
use rustc_span::symbol::{Ident, Symbol, kw, sym};
4041
use rustc_span::{BytePos, DUMMY_SP, DesugaringKind, ExpnKind, MacroKind, Span};
41-
use rustc_target::spec::abi;
4242
use tracing::{debug, instrument};
4343

4444
use super::{
@@ -1916,15 +1916,15 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
19161916
infcx.next_ty_var(DUMMY_SP),
19171917
false,
19181918
hir::Safety::Safe,
1919-
abi::Abi::Rust,
1919+
ExternAbi::Rust,
19201920
)
19211921
}
19221922
_ => infcx.tcx.mk_fn_sig(
19231923
[inputs],
19241924
infcx.next_ty_var(DUMMY_SP),
19251925
false,
19261926
hir::Safety::Safe,
1927-
abi::Abi::Rust,
1927+
ExternAbi::Rust,
19281928
),
19291929
};
19301930

@@ -3996,7 +3996,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
39963996
&& let [self_ty, found_ty] = trait_ref.args.as_slice()
39973997
&& let Some(fn_ty) = self_ty.as_type().filter(|ty| ty.is_fn())
39983998
&& let fn_sig @ ty::FnSig {
3999-
abi: abi::Abi::Rust,
3999+
abi: ExternAbi::Rust,
40004000
c_variadic: false,
40014001
safety: hir::Safety::Safe,
40024002
..

0 commit comments

Comments
 (0)