Skip to content

Commit d5633a0

Browse files
lcnrlcnr
committed
uwuwu
1 parent e712a4c commit d5633a0

File tree

15 files changed

+32
-51
lines changed

15 files changed

+32
-51
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
946946
&self,
947947
clauses: &[ty::Clause<'tcx>],
948948
ty: Ty<'tcx>,
949-
region: ty::RegionParameterDefinition,
949+
region: ty::EarlyParamRegion,
950950
) -> bool {
951951
let tcx = self.infcx.tcx;
952952
ty.walk().any(|arg| {

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
258258
let item_def_id = tcx.hir().ty_param_owner(def_id.expect_local());
259259
let generics = tcx.generics_of(item_def_id);
260260
let index = generics.param_def_id_to_index[&def_id];
261-
ty::Region::new_early_param(
262-
tcx,
263-
ty::RegionParameterDefinition { def_id, index, name },
264-
)
261+
ty::Region::new_early_param(tcx, ty::EarlyParamRegion { def_id, index, name })
265262
}
266263

267264
Some(rbv::ResolvedArg::Free(scope, id)) => {

‎compiler/rustc_hir_analysis/src/check/compare_impl_item.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1090,7 +1090,7 @@ impl<'tcx> ty::FallibleTypeFolder<TyCtxt<'tcx>> for RemapHiddenTyRegions<'tcx> {
10901090
if let ty::ReEarlyParam(e) = region.kind() { e } else { bug!() }
10911091
} else {
10921092
let guar = match region.kind() {
1093-
ty::ReEarlyParam(ty::RegionParameterDefinition { def_id, .. })
1093+
ty::ReEarlyParam(ty::EarlyParamRegion { def_id, .. })
10941094
| ty::ReLateParam(ty::LateParamRegion {
10951095
bound_region: ty::BoundRegionKind::BrNamed(def_id, _),
10961096
..
@@ -1121,7 +1121,7 @@ impl<'tcx> ty::FallibleTypeFolder<TyCtxt<'tcx>> for RemapHiddenTyRegions<'tcx> {
11211121

11221122
Ok(ty::Region::new_early_param(
11231123
self.tcx,
1124-
ty::RegionParameterDefinition {
1124+
ty::EarlyParamRegion {
11251125
def_id: e.def_id,
11261126
name: e.name,
11271127
index: (e.index as usize - self.num_trait_args + self.num_impl_args) as u32,

‎compiler/rustc_hir_analysis/src/check/wfcheck.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ fn gather_gat_bounds<'tcx, T: TypeFoldable<TyCtxt<'tcx>>>(
597597
let region_param = gat_generics.param_at(*region_a_idx, tcx);
598598
let region_param = ty::Region::new_early_param(
599599
tcx,
600-
ty::RegionParameterDefinition {
600+
ty::EarlyParamRegion {
601601
def_id: region_param.def_id,
602602
index: region_param.index,
603603
name: region_param.name,
@@ -630,7 +630,7 @@ fn gather_gat_bounds<'tcx, T: TypeFoldable<TyCtxt<'tcx>>>(
630630
let region_a_param = gat_generics.param_at(*region_a_idx, tcx);
631631
let region_a_param = ty::Region::new_early_param(
632632
tcx,
633-
ty::RegionParameterDefinition {
633+
ty::EarlyParamRegion {
634634
def_id: region_a_param.def_id,
635635
index: region_a_param.index,
636636
name: region_a_param.name,
@@ -640,7 +640,7 @@ fn gather_gat_bounds<'tcx, T: TypeFoldable<TyCtxt<'tcx>>>(
640640
let region_b_param = gat_generics.param_at(*region_b_idx, tcx);
641641
let region_b_param = ty::Region::new_early_param(
642642
tcx,
643-
ty::RegionParameterDefinition {
643+
ty::EarlyParamRegion {
644644
def_id: region_b_param.def_id,
645645
index: region_b_param.index,
646646
name: region_b_param.name,

‎compiler/rustc_hir_analysis/src/collect.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ impl<'tcx> AstConv<'tcx> for ItemCtxt<'tcx> {
443443
self.tcx.replace_late_bound_regions_uncached(
444444
poly_trait_ref,
445445
|_| {
446-
ty::Region::new_early_param(self.tcx, ty::RegionParameterDefinition {
446+
ty::Region::new_early_param(self.tcx, ty::EarlyParamRegion {
447447
def_id: item_def_id,
448448
index: 0,
449449
name: Symbol::intern(&lt_name),

‎compiler/rustc_hir_analysis/src/collect/predicates_of.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -365,11 +365,7 @@ fn compute_bidirectional_outlives_predicates<'tcx>(
365365
if let ty::ReEarlyParam(..) = *orig_lifetime {
366366
let dup_lifetime = ty::Region::new_early_param(
367367
tcx,
368-
ty::RegionParameterDefinition {
369-
def_id: param.def_id,
370-
index: param.index,
371-
name: param.name,
372-
},
368+
ty::EarlyParamRegion { def_id: param.def_id, index: param.index, name: param.name },
373369
);
374370
let span = tcx.def_span(param.def_id);
375371
predicates.push((

‎compiler/rustc_hir_analysis/src/constrained_generic_params.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ impl From<ty::ParamTy> for Parameter {
1313
}
1414
}
1515

16-
impl From<ty::RegionParameterDefinition> for Parameter {
17-
fn from(param: ty::RegionParameterDefinition) -> Self {
16+
impl From<ty::EarlyParamRegion> for Parameter {
17+
fn from(param: ty::EarlyParamRegion) -> Self {
1818
Parameter(param.index)
1919
}
2020
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
113113
type ExprConst = ty::Expr<'tcx>;
114114

115115
type Region = Region<'tcx>;
116-
type RegionParameterDefinition = ty::RegionParameterDefinition;
116+
type RegionParameterDefinition = ty::EarlyParamRegion;
117117
type BoundRegion = ty::BoundRegion;
118118
type LateParamRegion = ty::LateParamRegion;
119119
type InferRegion = ty::RegionVid;
@@ -2077,7 +2077,7 @@ impl<'tcx> TyCtxt<'tcx> {
20772077
let generics = self.generics_of(new_parent);
20782078
return ty::Region::new_early_param(
20792079
self,
2080-
ty::RegionParameterDefinition {
2080+
ty::EarlyParamRegion {
20812081
def_id: ebv,
20822082
index: generics
20832083
.param_def_id_to_index(self, ebv)

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

+2-8
Original file line numberDiff line numberDiff line change
@@ -809,10 +809,7 @@ impl<'a, 'tcx> TypeFolder<TyCtxt<'tcx>> for ArgFolder<'a, 'tcx> {
809809
fn fold_region(&mut self, r: ty::Region<'tcx>) -> ty::Region<'tcx> {
810810
#[cold]
811811
#[inline(never)]
812-
fn region_param_out_of_range(
813-
data: ty::RegionParameterDefinition,
814-
args: &[GenericArg<'_>],
815-
) -> ! {
812+
fn region_param_out_of_range(data: ty::EarlyParamRegion, args: &[GenericArg<'_>]) -> ! {
816813
bug!(
817814
"Region parameter out of range when substituting in region {} (index={}, args = {:?})",
818815
data.name,
@@ -823,10 +820,7 @@ impl<'a, 'tcx> TypeFolder<TyCtxt<'tcx>> for ArgFolder<'a, 'tcx> {
823820

824821
#[cold]
825822
#[inline(never)]
826-
fn region_param_invalid(
827-
data: ty::RegionParameterDefinition,
828-
other: GenericArgKind<'_>,
829-
) -> ! {
823+
fn region_param_invalid(data: ty::EarlyParamRegion, other: GenericArgKind<'_>) -> ! {
830824
bug!(
831825
"Unexpected parameter {:?} when substituting in region {} (index={})",
832826
other,

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

+5-11
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ use rustc_hir::def_id::DefId;
66
use rustc_span::symbol::{kw, Symbol};
77
use rustc_span::Span;
88

9-
use super::{
10-
Clause, InstantiatedPredicates, ParamConst, ParamTy, RegionParameterDefinition, Ty, TyCtxt,
11-
};
9+
use super::{Clause, InstantiatedPredicates, ParamConst, ParamTy, Ty, TyCtxt};
1210

1311
#[derive(Clone, Debug, TyEncodable, TyDecodable, HashStable)]
1412
pub enum GenericParamDefKind {
@@ -64,13 +62,9 @@ pub struct GenericParamDef {
6462
}
6563

6664
impl GenericParamDef {
67-
pub fn to_early_bound_region_data(&self) -> ty::RegionParameterDefinition {
65+
pub fn to_early_bound_region_data(&self) -> ty::EarlyParamRegion {
6866
if let GenericParamDefKind::Lifetime = self.kind {
69-
ty::RegionParameterDefinition {
70-
def_id: self.def_id,
71-
index: self.index,
72-
name: self.name,
73-
}
67+
ty::EarlyParamRegion { def_id: self.def_id, index: self.index, name: self.name }
7468
} else {
7569
bug!("cannot convert a non-lifetime parameter def to an early bound region")
7670
}
@@ -266,10 +260,10 @@ impl<'tcx> Generics {
266260
}
267261
}
268262

269-
/// Returns the `GenericParamDef` associated with this `RegionParameterDefinition`.
263+
/// Returns the `GenericParamDef` associated with this `EarlyParamRegion`.
270264
pub fn region_param(
271265
&'tcx self,
272-
param: &RegionParameterDefinition,
266+
param: &ty::EarlyParamRegion,
273267
tcx: TyCtxt<'tcx>,
274268
) -> &'tcx GenericParamDef {
275269
let param = self.param_at(param.index as usize, tcx);

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ pub use self::sty::BoundRegionKind::*;
9898
pub use self::sty::{
9999
AliasTy, Article, Binder, BoundRegion, BoundRegionKind, BoundTy, BoundTyKind, BoundVar,
100100
BoundVariableKind, CanonicalPolyFnSig, ClauseKind, ClosureArgs, ClosureArgsParts, ConstKind,
101-
ConstVid, CoroutineArgs, CoroutineArgsParts, EffectVid, ExistentialPredicate,
101+
ConstVid, CoroutineArgs, CoroutineArgsParts, EarlyParamRegion, EffectVid, ExistentialPredicate,
102102
ExistentialProjection, ExistentialTraitRef, FnSig, GenSig, InlineConstArgs,
103103
InlineConstArgsParts, LateParamRegion, ParamConst, ParamTy, PolyExistentialPredicate,
104104
PolyExistentialProjection, PolyExistentialTraitRef, PolyFnSig, PolyGenSig, PolyTraitRef,
105-
PredicateKind, Region, RegionKind, RegionParameterDefinition, RegionVid, TraitRef, TyKind,
106-
TypeAndMut, UpvarArgs, VarianceDiagInfo,
105+
PredicateKind, Region, RegionKind, RegionVid, TraitRef, TyKind, TypeAndMut, UpvarArgs,
106+
VarianceDiagInfo,
107107
};
108108
pub use self::trait_def::TraitDef;
109109
pub use self::typeck_results::{
@@ -464,7 +464,7 @@ pub struct CReaderCacheKey {
464464
#[rustc_pass_by_value]
465465
pub struct Ty<'tcx>(Interned<'tcx, WithCachedTypeInfo<TyKind<'tcx>>>);
466466

467-
impl ty::RegionParameterDefinition {
467+
impl EarlyParamRegion {
468468
/// Does this early bound region have a name? Early bound regions normally
469469
/// always have names except when using anonymous lifetimes (`'_`).
470470
pub fn has_name(&self) -> bool {

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1470,7 +1470,7 @@ impl<'tcx> Region<'tcx> {
14701470
#[inline]
14711471
pub fn new_early_param(
14721472
tcx: TyCtxt<'tcx>,
1473-
early_bound_region: ty::RegionParameterDefinition,
1473+
early_bound_region: ty::EarlyParamRegion,
14741474
) -> Region<'tcx> {
14751475
tcx.intern_region(ty::ReEarlyParam(early_bound_region))
14761476
}
@@ -1574,13 +1574,13 @@ impl<'tcx> Deref for Region<'tcx> {
15741574

15751575
#[derive(Copy, Clone, PartialEq, Eq, Hash, TyEncodable, TyDecodable, PartialOrd, Ord)]
15761576
#[derive(HashStable)]
1577-
pub struct RegionParameterDefinition {
1577+
pub struct EarlyParamRegion {
15781578
pub def_id: DefId,
15791579
pub index: u32,
15801580
pub name: Symbol,
15811581
}
15821582

1583-
impl fmt::Debug for RegionParameterDefinition {
1583+
impl fmt::Debug for EarlyParamRegion {
15841584
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
15851585
write!(f, "{:?}, {}, {}", self.def_id, self.index, self.name)
15861586
}

‎compiler/rustc_smir/src/rustc_smir/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
1010
use crate::rustc_internal::{IndexMap, RustcInternal};
1111
use crate::rustc_smir::hir::def::DefKind;
12-
use crate::rustc_smir::stable_mir::ty::{BoundRegion, Region, RegionParameterDefinition};
12+
use crate::rustc_smir::stable_mir::ty::{BoundRegion, EarlyParamRegion, Region};
1313
use rustc_hir as hir;
1414
use rustc_middle::mir;
1515
use rustc_middle::mir::interpret::{alloc_range, AllocId};
@@ -1691,7 +1691,7 @@ impl<'tcx> Stable<'tcx> for ty::RegionKind<'tcx> {
16911691
fn stable(&self, tables: &mut Tables<'tcx>) -> Self::T {
16921692
use stable_mir::ty::RegionKind;
16931693
match self {
1694-
ty::ReEarlyParam(early_reg) => RegionKind::ReEarlyParam(RegionParameterDefinition {
1694+
ty::ReEarlyParam(early_reg) => RegionKind::ReEarlyParam(EarlyParamRegion {
16951695
def_id: tables.region_def(early_reg.def_id),
16961696
index: early_reg.index,
16971697
name: early_reg.name.to_string(),

‎compiler/rustc_ty_utils/src/implied_bounds.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ fn assumed_wf_types<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId) -> &'tcx [(Ty<'
7777
orig_lt,
7878
ty::Region::new_early_param(
7979
tcx,
80-
ty::RegionParameterDefinition {
80+
ty::EarlyParamRegion {
8181
def_id: param.def_id,
8282
index: param.index,
8383
name: param.name,

‎compiler/stable_mir/src/ty.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ pub struct Region {
6161

6262
#[derive(Clone, Debug, Eq, PartialEq)]
6363
pub enum RegionKind {
64-
ReEarlyParam(RegionParameterDefinition),
64+
ReEarlyParam(EarlyParamRegion),
6565
ReBound(DebruijnIndex, BoundRegion),
6666
ReStatic,
6767
RePlaceholder(Placeholder<BoundRegion>),
@@ -71,7 +71,7 @@ pub enum RegionKind {
7171
pub(crate) type DebruijnIndex = u32;
7272

7373
#[derive(Clone, Debug, Eq, PartialEq)]
74-
pub struct RegionParameterDefinition {
74+
pub struct EarlyParamRegion {
7575
pub def_id: RegionDef,
7676
pub index: u32,
7777
pub name: Symbol,

0 commit comments

Comments
 (0)