Skip to content

Commit d3e8dd3

Browse files
ChayimFriedman2ChayimFriedman2
committed
Avoid having traits in rustc_type_ir for FnSigKind and Abi
Instead, just use the concrete types `FnSigKind` and `rustc_abi::ExternAbi`. This simplifies the code in both rustc and rust-analyzer.
1 parent 88eb471 commit d3e8dd3

17 files changed

Lines changed: 97 additions & 150 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,8 +1085,9 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
10851085
}
10861086

10871087
// Build a new closure where the return type is an owned value, instead of a ref.
1088-
let fn_sig_kind =
1089-
FnSigKind::default().set_safe(true).set_c_variadic(liberated_sig.c_variadic());
1088+
let fn_sig_kind = FnSigKind::default()
1089+
.set_safety(hir::Safety::Safe)
1090+
.set_c_variadic(liberated_sig.c_variadic());
10901091
let closure_sig_as_fn_ptr_ty = Ty::new_fn_ptr(
10911092
tcx,
10921093
ty::Binder::dummy(tcx.mk_fn_sig(

‎compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3590,7 +3590,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
35903590

35913591
let fn_sig_kind = FnSigKind::default()
35923592
.set_abi(abi)
3593-
.set_safe(safety.is_safe())
3593+
.set_safety(safety)
35943594
.set_c_variadic(decl.fn_decl_kind.c_variadic());
35953595
let fn_ty = tcx.mk_fn_sig(input_tys, output_ty, fn_sig_kind);
35963596
let fn_ptr_ty = ty::Binder::bind_with_vars(fn_ty, bound_vars);

‎compiler/rustc_hir_typeck/src/closure.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
723723
let bound_sig = expected_sig.sig.map_bound(|sig| {
724724
let fn_sig_kind = FnSigKind::default()
725725
.set_abi(ExternAbi::RustCall)
726-
.set_safe(true)
726+
.set_safety(hir::Safety::Safe)
727727
.set_c_variadic(sig.c_variadic());
728728
self.tcx.mk_fn_sig(sig.inputs().iter().cloned(), sig.output(), fn_sig_kind)
729729
});
@@ -860,7 +860,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
860860

861861
let fn_sig_kind = FnSigKind::default()
862862
.set_abi(ExternAbi::RustCall)
863-
.set_safe(true)
863+
.set_safety(hir::Safety::Safe)
864864
.set_c_variadic(expected_sigs.liberated_sig.c_variadic());
865865
expected_sigs.liberated_sig =
866866
self.tcx.mk_fn_sig(inputs, supplied_output_ty, fn_sig_kind);
@@ -935,7 +935,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
935935

936936
let fn_sig_kind = FnSigKind::default()
937937
.set_abi(ExternAbi::RustCall)
938-
.set_safe(true)
938+
.set_safety(hir::Safety::Safe)
939939
.set_c_variadic(decl.c_variadic());
940940
let result = ty::Binder::bind_with_vars(
941941
self.tcx.mk_fn_sig(supplied_arguments, supplied_return, fn_sig_kind),
@@ -1098,7 +1098,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
10981098

10991099
let fn_sig_kind = FnSigKind::default()
11001100
.set_abi(ExternAbi::RustCall)
1101-
.set_safe(true)
1101+
.set_safety(hir::Safety::Safe)
11021102
.set_c_variadic(decl.c_variadic());
11031103
let result = ty::Binder::dummy(self.tcx.mk_fn_sig(supplied_arguments, err_ty, fn_sig_kind));
11041104

‎compiler/rustc_middle/src/ty/context.rs‎

Lines changed: 24 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ use rustc_span::def_id::{CRATE_DEF_ID, DefPathHash, StableCrateId};
4747
use rustc_span::{DUMMY_SP, Ident, Span, Symbol, kw, sym};
4848
use rustc_type_ir::TyKind::*;
4949
pub use rustc_type_ir::lift::Lift;
50-
use rustc_type_ir::{
51-
CollectAndApply, FnSigKind, TypeFlags, WithCachedTypeInfo, elaborate, search_graph,
52-
};
50+
use rustc_type_ir::{CollectAndApply, TypeFlags, WithCachedTypeInfo, elaborate, search_graph};
5351
use tracing::{debug, instrument};
5452

5553
use crate::arena::Arena;
@@ -69,11 +67,11 @@ use crate::traits;
6967
use crate::traits::solve::{ExternalConstraints, ExternalConstraintsData, PredefinedOpaques};
7068
use crate::ty::predicate::ExistentialPredicateStableCmpExt as _;
7169
use crate::ty::{
72-
self, AdtDef, AdtDefData, AdtKind, Binder, Clause, Clauses, Const, GenericArg, GenericArgs,
73-
GenericArgsRef, GenericParamDefKind, List, ListWithCachedTypeInfo, ParamConst, Pattern,
74-
PatternKind, PolyExistentialPredicate, PolyFnSig, Predicate, PredicateKind, PredicatePolarity,
75-
Region, RegionKind, ReprOptions, TraitObjectVisitor, Ty, TyKind, TyVid, ValTree, ValTreeKind,
76-
Visibility,
70+
self, AdtDef, AdtDefData, AdtKind, Binder, Clause, Clauses, Const, FnSigKind, GenericArg,
71+
GenericArgs, GenericArgsRef, GenericParamDefKind, List, ListWithCachedTypeInfo, ParamConst,
72+
Pattern, PatternKind, PolyExistentialPredicate, PolyFnSig, Predicate, PredicateKind,
73+
PredicatePolarity, Region, RegionKind, ReprOptions, TraitObjectVisitor, Ty, TyKind, TyVid,
74+
ValTree, ValTreeKind, Visibility,
7775
};
7876

7977
impl<'tcx> rustc_type_ir::inherent::DefId<TyCtxt<'tcx>> for DefId {
@@ -86,50 +84,6 @@ impl<'tcx> rustc_type_ir::inherent::DefId<TyCtxt<'tcx>> for DefId {
8684
}
8785
}
8886

89-
impl<'tcx> rustc_type_ir::inherent::FSigKind<TyCtxt<'tcx>> for FnSigKind {
90-
fn fn_sig_kind(self) -> Self {
91-
self
92-
}
93-
94-
fn new(abi: ExternAbi, safety: hir::Safety, c_variadic: bool) -> Self {
95-
FnSigKind::default().set_abi(abi).set_safe(safety.is_safe()).set_c_variadic(c_variadic)
96-
}
97-
98-
fn abi(self) -> ExternAbi {
99-
self.abi()
100-
}
101-
102-
fn safety(self) -> hir::Safety {
103-
if self.is_safe() { hir::Safety::Safe } else { hir::Safety::Unsafe }
104-
}
105-
106-
fn c_variadic(self) -> bool {
107-
self.c_variadic()
108-
}
109-
}
110-
111-
impl<'tcx> rustc_type_ir::inherent::Abi<TyCtxt<'tcx>> for ExternAbi {
112-
fn abi(self) -> Self {
113-
self
114-
}
115-
116-
fn rust() -> Self {
117-
ExternAbi::Rust
118-
}
119-
120-
fn is_rust(self) -> bool {
121-
matches!(self, ExternAbi::Rust)
122-
}
123-
124-
fn pack_abi(self) -> u8 {
125-
self.as_packed()
126-
}
127-
128-
fn unpack_abi(abi_index: u8) -> Self {
129-
Self::from_packed(abi_index)
130-
}
131-
}
132-
13387
impl<'tcx> rustc_type_ir::inherent::Safety<TyCtxt<'tcx>> for hir::Safety {
13488
fn safe() -> Self {
13589
hir::Safety::Safe
@@ -1373,7 +1327,7 @@ impl<'tcx> TyCtxt<'tcx> {
13731327
let caller_features = &self.body_codegen_attrs(caller).target_features;
13741328
if self.is_target_feature_call_safe(&fun_features, &caller_features) {
13751329
return Some(fun_sig.map_bound(|sig| ty::FnSig {
1376-
fn_sig_kind: fun_sig.fn_sig_kind().set_safe(true),
1330+
fn_sig_kind: fun_sig.fn_sig_kind().set_safety(hir::Safety::Safe),
13771331
..sig
13781332
}));
13791333
}
@@ -2142,7 +2096,10 @@ impl<'tcx> TyCtxt<'tcx> {
21422096
assert!(sig.safety().is_safe());
21432097
Ty::new_fn_ptr(
21442098
self,
2145-
sig.map_bound(|sig| ty::FnSig { fn_sig_kind: sig.fn_sig_kind.set_safe(false), ..sig }),
2099+
sig.map_bound(|sig| ty::FnSig {
2100+
fn_sig_kind: sig.fn_sig_kind.set_safety(hir::Safety::Unsafe),
2101+
..sig
2102+
}),
21462103
)
21472104
}
21482105

@@ -2151,7 +2108,10 @@ impl<'tcx> TyCtxt<'tcx> {
21512108
/// unsafe.
21522109
pub fn safe_to_unsafe_sig(self, sig: PolyFnSig<'tcx>) -> PolyFnSig<'tcx> {
21532110
assert!(sig.safety().is_safe());
2154-
sig.map_bound(|sig| ty::FnSig { fn_sig_kind: sig.fn_sig_kind.set_safe(false), ..sig })
2111+
sig.map_bound(|sig| ty::FnSig {
2112+
fn_sig_kind: sig.fn_sig_kind.set_safety(hir::Safety::Unsafe),
2113+
..sig
2114+
})
21552115
}
21562116

21572117
/// Given the def_id of a Trait `trait_def_id` and the name of an associated item `assoc_name`
@@ -2196,7 +2156,7 @@ impl<'tcx> TyCtxt<'tcx> {
21962156
self.mk_fn_sig(
21972157
params,
21982158
s.output(),
2199-
s.fn_sig_kind.set_safe(safety.is_safe()).set_abi(ExternAbi::Rust),
2159+
s.fn_sig_kind.set_safety(safety).set_abi(ExternAbi::Rust),
22002160
)
22012161
})
22022162
}
@@ -2470,7 +2430,12 @@ impl<'tcx> TyCtxt<'tcx> {
24702430
// IntoIterator` instead of `I: Iterator`, and it doesn't have a slice
24712431
// variant, because of the need to combine `inputs` and `output`. This
24722432
// explains the lack of `_from_iter` suffix.
2473-
pub fn mk_fn_sig<I, T>(self, inputs: I, output: I::Item, fn_sig_kind: FnSigKind) -> T::Output
2433+
pub fn mk_fn_sig<I, T>(
2434+
self,
2435+
inputs: I,
2436+
output: I::Item,
2437+
fn_sig_kind: FnSigKind<'tcx>,
2438+
) -> T::Output
24742439
where
24752440
I: IntoIterator<Item = T>,
24762441
T: CollectAndApply<Ty<'tcx>, ty::FnSig<'tcx>>,
@@ -2492,7 +2457,7 @@ impl<'tcx> TyCtxt<'tcx> {
24922457
I: IntoIterator<Item = T>,
24932458
T: CollectAndApply<Ty<'tcx>, ty::FnSig<'tcx>>,
24942459
{
2495-
self.mk_fn_sig(inputs, output, FnSigKind::default().set_safe(safety.is_safe()))
2460+
self.mk_fn_sig(inputs, output, FnSigKind::default().set_safety(safety))
24962461
}
24972462

24982463
/// `mk_fn_sig`, but with a safe Rust ABI, and no C-variadic argument.
@@ -2501,7 +2466,7 @@ impl<'tcx> TyCtxt<'tcx> {
25012466
I: IntoIterator<Item = T>,
25022467
T: CollectAndApply<Ty<'tcx>, ty::FnSig<'tcx>>,
25032468
{
2504-
self.mk_fn_sig(inputs, output, FnSigKind::default().set_safe(true))
2469+
self.mk_fn_sig(inputs, output, FnSigKind::default().set_safety(hir::Safety::Safe))
25052470
}
25062471

25072472
pub fn mk_poly_existential_predicates_from_iter<I, T>(self, iter: I) -> T::Output

‎compiler/rustc_middle/src/ty/context/impl_interner.rs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@
22
33
use std::{debug_assert_matches, fmt};
44

5-
use rustc_abi::ExternAbi;
65
use rustc_errors::ErrorGuaranteed;
76
use rustc_hir as hir;
87
use rustc_hir::def::{CtorKind, CtorOf, DefKind};
98
use rustc_hir::def_id::{DefId, LocalDefId};
109
use rustc_hir::lang_items::LangItem;
1110
use rustc_span::{DUMMY_SP, Span, Symbol};
1211
use rustc_type_ir::lang_items::{SolverAdtLangItem, SolverLangItem, SolverTraitLangItem};
13-
use rustc_type_ir::{
14-
CollectAndApply, FnSigKind, Interner, TypeFoldable, Unnormalized, search_graph,
15-
};
12+
use rustc_type_ir::{CollectAndApply, Interner, TypeFoldable, Unnormalized, search_graph};
1613

1714
use crate::dep_graph::{DepKind, DepNodeIndex};
1815
use crate::infer::canonical::CanonicalVarKinds;
@@ -92,9 +89,7 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
9289
type AllocId = crate::mir::interpret::AllocId;
9390
type Pat = Pattern<'tcx>;
9491
type PatList = &'tcx List<Pattern<'tcx>>;
95-
type FSigKind = FnSigKind;
9692
type Safety = hir::Safety;
97-
type Abi = ExternAbi;
9893
type Const = ty::Const<'tcx>;
9994
type Consts = &'tcx List<Self::Const>;
10095

‎compiler/rustc_middle/src/ty/print/pretty.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
751751
if self.tcx().codegen_fn_attrs(def_id).safe_target_features {
752752
write!(self, "#[target_features] ")?;
753753
sig = sig.map_bound(|mut sig| {
754-
sig.fn_sig_kind = sig.fn_sig_kind.set_safe(true);
754+
sig.fn_sig_kind = sig.fn_sig_kind.set_safety(hir::Safety::Safe);
755755
sig
756756
});
757757
}

‎compiler/rustc_middle/src/ty/structural_impls.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ TrivialLiftImpls! {
198198
rustc_hir::Safety,
199199
rustc_middle::mir::ConstValue,
200200
rustc_type_ir::BoundConstness,
201-
rustc_type_ir::FnSigKind,
202201
rustc_type_ir::PredicatePolarity,
203202
// tidy-alphabetical-end
204203
}

‎compiler/rustc_middle/src/ty/sty.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub type TypeAndMut<'tcx> = ir::TypeAndMut<TyCtxt<'tcx>>;
3737
pub type AliasTy<'tcx> = ir::AliasTy<TyCtxt<'tcx>>;
3838
pub type AliasTyKind<'tcx> = ir::AliasTyKind<TyCtxt<'tcx>>;
3939
pub type FnSig<'tcx> = ir::FnSig<TyCtxt<'tcx>>;
40-
pub type FnSigKind = ir::FnSigKind;
40+
pub type FnSigKind<'tcx> = ir::FnSigKind<TyCtxt<'tcx>>;
4141
pub type Binder<'tcx, T> = ir::Binder<TyCtxt<'tcx>, T>;
4242
pub type EarlyBinder<'tcx, T> = ir::EarlyBinder<TyCtxt<'tcx>, T>;
4343
pub type Unnormalized<'tcx, T> = ir::Unnormalized<TyCtxt<'tcx>, T>;

‎compiler/rustc_public/src/unstable/convert/internal.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ impl RustcInternal for FnSig {
310310
) -> Self::T<'tcx> {
311311
let fn_sig_kind = rustc_ty::FnSigKind::default()
312312
.set_abi(self.abi.internal(tables, tcx))
313-
.set_safe(self.safety == Safety::Safe)
313+
.set_safety(self.safety.internal(tables, tcx))
314314
.set_c_variadic(self.c_variadic);
315315
tcx.lift(rustc_ty::FnSig {
316316
inputs_and_output: tcx.mk_type_list(&self.inputs_and_output.internal(tables, tcx)),

‎compiler/rustc_public/src/unstable/convert/stable/ty.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ where
254254

255255
// This internal type isn't publicly exposed, because it is an implementation detail.
256256
// But it's a public field of FnSig (which has a public mirror type), so allow conversions.
257-
impl<'tcx> Stable<'tcx> for ty::FnSigKind {
257+
impl<'tcx> Stable<'tcx> for ty::FnSigKind<'tcx> {
258258
type T = (bool /*c_variadic*/, crate::mir::Safety, crate::ty::Abi);
259259
fn stable<'cx>(
260260
&self,

0 commit comments

Comments
 (0)