Skip to content

Commit 1f37b9a

Browse files
compiler: remove rustc_target::abi entirely
1 parent 3948be6 commit 1f37b9a

File tree

80 files changed

+129
-87
lines changed

Some content is hidden

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

80 files changed

+129
-87
lines changed

Cargo.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4015,6 +4015,7 @@ version = "0.0.0"
40154015
dependencies = [
40164016
"rustc-rayon",
40174017
"rustc-rayon-core",
4018+
"rustc_abi",
40184019
"rustc_ast",
40194020
"rustc_ast_lowering",
40204021
"rustc_ast_passes",

compiler/rustc_codegen_ssa/src/traits/consts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
use rustc_abi as abi;
12
use rustc_middle::mir::interpret::{ConstAllocation, Scalar};
2-
use rustc_target::abi;
33

44
use super::BackendTypes;
55

compiler/rustc_interface/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ edition = "2021"
77
# tidy-alphabetical-start
88
rustc-rayon = { version = "0.5.0" }
99
rustc-rayon-core = { version = "0.5.0" }
10+
rustc_abi = { path = "../rustc_abi" }
1011
rustc_ast = { path = "../rustc_ast" }
1112
rustc_ast_lowering = { path = "../rustc_ast_lowering" }
1213
rustc_ast_passes = { path = "../rustc_ast_passes" }

compiler/rustc_interface/src/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use std::num::NonZero;
44
use std::path::{Path, PathBuf};
55
use std::sync::atomic::AtomicBool;
66

7+
use rustc_abi::Align;
78
use rustc_data_structures::profiling::TimePassesFormat;
89
use rustc_errors::emitter::HumanReadableErrorType;
910
use rustc_errors::{ColorConfig, registry};
@@ -24,7 +25,6 @@ use rustc_session::{CompilerIO, EarlyDiagCtxt, Session, build_session, filesearc
2425
use rustc_span::edition::{DEFAULT_EDITION, Edition};
2526
use rustc_span::source_map::{RealFileLoader, SourceMapInputs};
2627
use rustc_span::{FileName, SourceFileHashAlgorithm, sym};
27-
use rustc_target::abi::Align;
2828
use rustc_target::spec::{
2929
CodeModel, FramePointer, LinkerFlavorCli, MergeFunctions, OnBrokenPipe, PanicStrategy,
3030
RelocModel, RelroLevel, SanitizerSet, SplitDebuginfo, StackProtector, TlsModel, WasmCAbi,

compiler/rustc_monomorphize/src/mono_checks/abi_check.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
//! This module ensures that if a function's ABI requires a particular target feature,
22
//! that target feature is enabled both on the callee and all callers.
3+
use rustc_abi::{BackendRepr, RegKind};
34
use rustc_hir::CRATE_HIR_ID;
45
use rustc_middle::mir::{self, traversal};
56
use rustc_middle::ty::inherent::*;
67
use rustc_middle::ty::{self, Instance, InstanceKind, Ty, TyCtxt};
78
use rustc_session::lint::builtin::ABI_UNSUPPORTED_VECTOR_TYPES;
89
use rustc_span::def_id::DefId;
910
use rustc_span::{DUMMY_SP, Span, Symbol};
10-
use rustc_target::abi::call::{FnAbi, PassMode};
11-
use rustc_target::abi::{BackendRepr, RegKind};
11+
use rustc_target::callconv::{FnAbi, PassMode};
1212

1313
use crate::errors::{
1414
AbiErrorDisabledVectorTypeCall, AbiErrorDisabledVectorTypeDef,

compiler/rustc_passes/src/abi_test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use rustc_middle::ty::layout::{FnAbiError, LayoutError};
66
use rustc_middle::ty::{self, GenericArgs, Instance, Ty, TyCtxt};
77
use rustc_span::source_map::Spanned;
88
use rustc_span::sym;
9-
use rustc_target::abi::call::FnAbi;
9+
use rustc_target::callconv::FnAbi;
1010

1111
use super::layout_test::ensure_wf;
1212
use crate::errors::{AbiInvalidAttribute, AbiNe, AbiOf, UnrecognizedField};

compiler/rustc_passes/src/check_attr.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use std::cell::Cell;
88
use std::collections::hash_map::Entry;
99

10+
use rustc_abi::{ExternAbi, Size};
1011
use rustc_ast::{AttrStyle, LitKind, MetaItemInner, MetaItemKind, MetaItemLit, ast};
1112
use rustc_data_structures::fx::FxHashMap;
1213
use rustc_errors::{Applicability, DiagCtxtHandle, IntoDiagArg, MultiSpan, StashKey};
@@ -32,8 +33,6 @@ use rustc_session::lint::builtin::{
3233
};
3334
use rustc_session::parse::feature_err;
3435
use rustc_span::{BytePos, DUMMY_SP, Span, Symbol, kw, sym};
35-
use rustc_target::abi::Size;
36-
use rustc_target::spec::abi::Abi;
3736
use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
3837
use rustc_trait_selection::infer::{TyCtxtInferExt, ValuePairs};
3938
use rustc_trait_selection::traits::ObligationCtxt;
@@ -1519,7 +1518,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
15191518
if target == Target::ForeignMod
15201519
&& let hir::Node::Item(item) = self.tcx.hir_node(hir_id)
15211520
&& let Item { kind: ItemKind::ForeignMod { abi, .. }, .. } = item
1522-
&& !matches!(abi, Abi::Rust | Abi::RustIntrinsic)
1521+
&& !matches!(abi, ExternAbi::Rust | ExternAbi::RustIntrinsic)
15231522
{
15241523
return;
15251524
}
@@ -2445,7 +2444,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
24452444
token_stream,
24462445
false,
24472446
Safety::Safe,
2448-
Abi::Rust,
2447+
ExternAbi::Rust,
24492448
);
24502449

24512450
if let Err(terr) = ocx.eq(&cause, param_env, expected_sig, sig) {

compiler/rustc_target/src/callconv/aarch64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::iter;
22

33
use rustc_abi::{BackendRepr, HasDataLayout, Primitive, TyAbiInterface};
44

5-
use crate::abi::call::{ArgAbi, FnAbi, Reg, RegKind, Uniform};
5+
use crate::callconv::{ArgAbi, FnAbi, Reg, RegKind, Uniform};
66
use crate::spec::{HasTargetSpec, Target};
77

88
/// Indicates the variant of the AArch64 ABI we are compiling for.

compiler/rustc_target/src/callconv/amdgpu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use rustc_abi::{HasDataLayout, TyAbiInterface};
22

3-
use crate::abi::call::{ArgAbi, FnAbi};
3+
use crate::callconv::{ArgAbi, FnAbi};
44

55
fn classify_ret<'a, Ty, C>(_cx: &C, ret: &mut ArgAbi<'a, Ty>)
66
where

compiler/rustc_target/src/callconv/arm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use rustc_abi::{HasDataLayout, TyAbiInterface};
22

3-
use crate::abi::call::{ArgAbi, Conv, FnAbi, Reg, RegKind, Uniform};
3+
use crate::callconv::{ArgAbi, Conv, FnAbi, Reg, RegKind, Uniform};
44
use crate::spec::HasTargetSpec;
55

66
fn is_homogeneous_aggregate<'a, Ty, C>(cx: &C, arg: &mut ArgAbi<'a, Ty>) -> Option<Uniform>

0 commit comments

Comments
 (0)