Skip to content

Commit 1d1be29

Browse files
crlf0710crlf0710
committed
Rename ParameterKindsWithUniverseIndex to CanonicalVarKinds
1 parent 761d360 commit 1d1be29

File tree

10 files changed

+55
-64
lines changed

10 files changed

+55
-64
lines changed

‎chalk-integration/src/program.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,9 @@ impl tls::DebugContext for Program {
206206
write!(fmt, "{:?}", parameter_kinds.inner_debug(interner))
207207
}
208208

209-
fn debug_parameter_kinds_with_universe_index(
209+
fn debug_canonical_var_kinds(
210210
&self,
211-
parameter_kinds: &chalk_ir::ParameterKindsWithUniverseIndex<ChalkIr>,
211+
parameter_kinds: &chalk_ir::CanonicalVarKinds<ChalkIr>,
212212
fmt: &mut fmt::Formatter<'_>,
213213
) -> Result<(), fmt::Error> {
214214
let interner = self.interner();

‎chalk-ir/src/cast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ reflexive_impl!(for(I: Interner) WhereClause<I>);
8383
reflexive_impl!(for(I: Interner) ProgramClause<I>);
8484
reflexive_impl!(for(I: Interner) QuantifiedWhereClause<I>);
8585
reflexive_impl!(for(I: Interner) ParameterKinds<I>);
86-
reflexive_impl!(for(I: Interner) ParameterKindsWithUniverseIndex<I>);
86+
reflexive_impl!(for(I: Interner) CanonicalVarKinds<I>);
8787

8888
impl<I: Interner> CastTo<WhereClause<I>> for TraitRef<I> {
8989
fn cast_to(self, _interner: &I) -> WhereClause<I> {

‎chalk-ir/src/debug.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -661,9 +661,9 @@ impl<I: Interner> Debug for Environment<I> {
661661
}
662662
}
663663

664-
impl<I: Interner> Debug for ParameterKindsWithUniverseIndex<I> {
664+
impl<I: Interner> Debug for CanonicalVarKinds<I> {
665665
fn fmt(&self, fmt: &mut Formatter<'_>) -> Result<(), Error> {
666-
I::debug_parameter_kinds_with_universe_index(self, fmt)
666+
I::debug_canonical_var_kinds(self, fmt)
667667
.unwrap_or_else(|| write!(fmt, "{:?}", self.interned))
668668
}
669669
}

‎chalk-ir/src/fold/binder_impls.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,8 @@ where
7878
value: self_value,
7979
} = self;
8080
let value = self_value.fold_with(folder, outer_binder.shifted_in())?;
81-
let binders = ParameterKindsWithUniverseIndex {
82-
interned: TI::transfer_parameter_kinds_with_universe_index(
83-
self_binders.interned().clone(),
84-
),
81+
let binders = CanonicalVarKinds {
82+
interned: TI::transfer_canonical_var_kinds(self_binders.interned().clone()),
8583
};
8684
Ok(Canonical {
8785
binders: binders,

‎chalk-ir/src/interner.rs

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use crate::AliasTy;
22
use crate::ApplicationTy;
33
use crate::AssocTypeId;
4+
use crate::CanonicalVarKinds;
45
use crate::Goal;
56
use crate::GoalData;
67
use crate::Goals;
@@ -12,7 +13,6 @@ use crate::Parameter;
1213
use crate::ParameterData;
1314
use crate::ParameterKind;
1415
use crate::ParameterKinds;
15-
use crate::ParameterKindsWithUniverseIndex;
1616
use crate::ProgramClause;
1717
use crate::ProgramClauseData;
1818
use crate::ProgramClauseImplication;
@@ -139,13 +139,13 @@ pub trait Interner: Debug + Copy + Eq + Ord + Hash {
139139
type InternedParameterKinds: Debug + Clone + Eq + Hash;
140140

141141
/// "Interned" representation of a list of parameter kind with universe index.
142-
/// In normal user code, `Self::InternedParameterKindsWithUniverseIndex` is not referenced.
143-
/// Instead, we refer to `ParameterKindsWithUniverseIndex<Self>`, which wraps this type.
142+
/// In normal user code, `Self::InternedCanonicalVarKinds` is not referenced.
143+
/// Instead, we refer to `CanonicalVarKinds<Self>`, which wraps this type.
144144
///
145-
/// An `InternedParameterKindsWithUniverseIndex` is created by
146-
/// `intern_parameter_kinds_with_universe_index` and can be converted back
147-
/// to its underlying data via `parameter_kinds_with_universe_index_data`.
148-
type InternedParameterKindsWithUniverseIndex: Debug + Clone + Eq + Hash;
145+
/// An `InternedCanonicalVarKinds` is created by
146+
/// `intern_canonical_var_kinds` and can be converted back
147+
/// to its underlying data via `canonical_var_kinds_data`.
148+
type InternedCanonicalVarKinds: Debug + Clone + Eq + Hash;
149149

150150
/// The core "id" type used for struct-ids and the like.
151151
type DefId: Debug + Copy + Eq + Ord + Hash;
@@ -322,8 +322,8 @@ pub trait Interner: Debug + Copy + Eq + Ord + Hash {
322322
/// Returns `None` to fallback to the default debug output (e.g.,
323323
/// if no info about current program is available from TLS).
324324
#[allow(unused_variables)]
325-
fn debug_parameter_kinds_with_universe_index(
326-
parameter_kinds_with_universe_index: &ParameterKindsWithUniverseIndex<Self>,
325+
fn debug_canonical_var_kinds(
326+
canonical_var_kinds: &CanonicalVarKinds<Self>,
327327
fmt: &mut fmt::Formatter<'_>,
328328
) -> Option<fmt::Result> {
329329
None
@@ -578,18 +578,18 @@ pub trait Interner: Debug + Copy + Eq + Ord + Hash {
578578

579579
/// Create an "interned" parameter kinds with universe index from `data`. This is not
580580
/// normally invoked directly; instead, you invoke
581-
/// `ParameterKindsWithUniverseIndex::from` (which will ultimately call this
581+
/// `CanonicalVarKinds::from` (which will ultimately call this
582582
/// method).
583-
fn intern_parameter_kinds_with_universe_index(
583+
fn intern_canonical_var_kinds(
584584
&self,
585585
data: impl IntoIterator<Item = ParameterKind<UniverseIndex>>,
586-
) -> Self::InternedParameterKindsWithUniverseIndex;
586+
) -> Self::InternedCanonicalVarKinds;
587587

588588
/// Lookup the slice of `ParameterKind` that was interned to
589589
/// create a `ParameterKinds`.
590-
fn parameter_kinds_with_universe_index_data<'a>(
590+
fn canonical_var_kinds_data<'a>(
591591
&self,
592-
parameter_kinds_with_universe_index: &'a Self::InternedParameterKindsWithUniverseIndex,
592+
canonical_var_kinds: &'a Self::InternedCanonicalVarKinds,
593593
) -> &'a [ParameterKind<UniverseIndex>];
594594
}
595595

@@ -600,9 +600,9 @@ pub trait TargetInterner<I: Interner>: Interner {
600600
parameter_kinds: I::InternedParameterKinds,
601601
) -> Self::InternedParameterKinds;
602602

603-
fn transfer_parameter_kinds_with_universe_index(
604-
parameter_kinds: I::InternedParameterKindsWithUniverseIndex,
605-
) -> Self::InternedParameterKindsWithUniverseIndex;
603+
fn transfer_canonical_var_kinds(
604+
parameter_kinds: I::InternedCanonicalVarKinds,
605+
) -> Self::InternedCanonicalVarKinds;
606606
}
607607

608608
impl<I: Interner> TargetInterner<I> for I {
@@ -616,9 +616,9 @@ impl<I: Interner> TargetInterner<I> for I {
616616
parameter_kinds
617617
}
618618

619-
fn transfer_parameter_kinds_with_universe_index(
620-
parameter_kinds: I::InternedParameterKindsWithUniverseIndex,
621-
) -> Self::InternedParameterKindsWithUniverseIndex {
619+
fn transfer_canonical_var_kinds(
620+
parameter_kinds: I::InternedCanonicalVarKinds,
621+
) -> Self::InternedCanonicalVarKinds {
622622
parameter_kinds
623623
}
624624
}
@@ -669,7 +669,7 @@ mod default {
669669
type InternedProgramClauses = Vec<ProgramClause<ChalkIr>>;
670670
type InternedQuantifiedWhereClauses = Vec<QuantifiedWhereClause<ChalkIr>>;
671671
type InternedParameterKinds = Vec<ParameterKind<()>>;
672-
type InternedParameterKindsWithUniverseIndex = Vec<ParameterKind<UniverseIndex>>;
672+
type InternedCanonicalVarKinds = Vec<ParameterKind<UniverseIndex>>;
673673
type DefId = RawId;
674674
type Identifier = Identifier;
675675

@@ -759,15 +759,12 @@ mod default {
759759
})
760760
}
761761

762-
fn debug_parameter_kinds_with_universe_index(
763-
parameter_kinds_with_universe_index: &ParameterKindsWithUniverseIndex<Self>,
762+
fn debug_canonical_var_kinds(
763+
canonical_var_kinds: &CanonicalVarKinds<Self>,
764764
fmt: &mut fmt::Formatter<'_>,
765765
) -> Option<fmt::Result> {
766766
tls::with_current_program(|prog| {
767-
Some(prog?.debug_parameter_kinds_with_universe_index(
768-
parameter_kinds_with_universe_index,
769-
fmt,
770-
))
767+
Some(prog?.debug_canonical_var_kinds(canonical_var_kinds, fmt))
771768
})
772769
}
773770

@@ -948,17 +945,17 @@ mod default {
948945
) -> &'a [ParameterKind<()>] {
949946
parameter_kinds
950947
}
951-
fn intern_parameter_kinds_with_universe_index(
948+
fn intern_canonical_var_kinds(
952949
&self,
953950
data: impl IntoIterator<Item = ParameterKind<UniverseIndex>>,
954-
) -> Self::InternedParameterKindsWithUniverseIndex {
951+
) -> Self::InternedCanonicalVarKinds {
955952
data.into_iter().collect()
956953
}
957-
fn parameter_kinds_with_universe_index_data<'a>(
954+
fn canonical_var_kinds_data<'a>(
958955
&self,
959-
parameter_kinds_with_universe_index: &'a Self::InternedParameterKindsWithUniverseIndex,
956+
canonical_var_kinds: &'a Self::InternedCanonicalVarKinds,
960957
) -> &'a [ParameterKind<UniverseIndex>] {
961-
parameter_kinds_with_universe_index
958+
canonical_var_kinds
962959
}
963960
}
964961

‎chalk-ir/src/lib.rs

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1548,28 +1548,25 @@ impl<I: Interner> ParameterKinds<I> {
15481548
}
15491549

15501550
#[derive(Clone, PartialEq, Eq, Hash, PartialOrd, Ord, HasInterner)]
1551-
pub struct ParameterKindsWithUniverseIndex<I: Interner> {
1552-
interned: I::InternedParameterKindsWithUniverseIndex,
1551+
pub struct CanonicalVarKinds<I: Interner> {
1552+
interned: I::InternedCanonicalVarKinds,
15531553
}
15541554

1555-
impl<I: Interner> ParameterKindsWithUniverseIndex<I> {
1555+
impl<I: Interner> CanonicalVarKinds<I> {
15561556
pub fn new(interner: &I) -> Self {
15571557
Self::from(interner, None::<ParameterKind<UniverseIndex>>)
15581558
}
15591559

1560-
pub fn interned(&self) -> &I::InternedParameterKindsWithUniverseIndex {
1560+
pub fn interned(&self) -> &I::InternedCanonicalVarKinds {
15611561
&self.interned
15621562
}
15631563

15641564
pub fn from(
15651565
interner: &I,
15661566
parameter_kinds: impl IntoIterator<Item = ParameterKind<UniverseIndex>>,
15671567
) -> Self {
1568-
ParameterKindsWithUniverseIndex {
1569-
interned: I::intern_parameter_kinds_with_universe_index(
1570-
interner,
1571-
parameter_kinds.into_iter(),
1572-
),
1568+
CanonicalVarKinds {
1569+
interned: I::intern_canonical_var_kinds(interner, parameter_kinds.into_iter()),
15731570
}
15741571
}
15751572

@@ -1596,7 +1593,7 @@ impl<I: Interner> ParameterKindsWithUniverseIndex<I> {
15961593
}
15971594

15981595
pub fn as_slice(&self, interner: &I) -> &[ParameterKind<UniverseIndex>] {
1599-
interner.parameter_kinds_with_universe_index_data(&self.interned)
1596+
interner.canonical_var_kinds_data(&self.interned)
16001597
}
16011598
}
16021599

@@ -1608,7 +1605,7 @@ impl<I: Interner> ParameterKindsWithUniverseIndex<I> {
16081605
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
16091606
pub struct Canonical<T: HasInterner> {
16101607
pub value: T,
1611-
pub binders: ParameterKindsWithUniverseIndex<T::Interner>,
1608+
pub binders: CanonicalVarKinds<T::Interner>,
16121609
}
16131610

16141611
impl<T: HasInterner> HasInterner for Canonical<T> {

‎chalk-ir/src/tls.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
use crate::interner::ChalkIr;
22
use crate::{
3-
debug::SeparatorTraitRef, AliasTy, ApplicationTy, AssocTypeId, Goal, Goals, Lifetime, OpaqueTy,
4-
OpaqueTyId, Parameter, ParameterKinds, ParameterKindsWithUniverseIndex, ProgramClause,
5-
ProgramClauseImplication, ProjectionTy, ProgramClauses, QuantifiedWhereClauses, StructId, Substitution,
6-
TraitId, Ty,
3+
debug::SeparatorTraitRef, AliasTy, ApplicationTy, AssocTypeId, CanonicalVarKinds, Goal, Goals,
4+
Lifetime, OpaqueTy, OpaqueTyId, Parameter, ParameterKinds, ProgramClause, ProgramClauseImplication,
5+
ProgramClauses, ProjectionTy, QuantifiedWhereClauses, StructId, Substitution, TraitId, Ty,
76
};
87
use std::cell::RefCell;
98
use std::fmt;
@@ -82,9 +81,9 @@ pub trait DebugContext {
8281
fmt: &mut fmt::Formatter<'_>,
8382
) -> Result<(), fmt::Error>;
8483

85-
fn debug_parameter_kinds_with_universe_index(
84+
fn debug_canonical_var_kinds(
8685
&self,
87-
parameter_kinds: &ParameterKindsWithUniverseIndex<ChalkIr>,
86+
parameter_kinds: &CanonicalVarKinds<ChalkIr>,
8887
fmt: &mut fmt::Formatter<'_>,
8988
) -> Result<(), fmt::Error>;
9089

‎chalk-solve/src/infer/canonicalize.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ struct Canonicalizer<'q, I: Interner> {
7474
}
7575

7676
impl<'q, I: Interner> Canonicalizer<'q, I> {
77-
fn into_binders(self) -> ParameterKindsWithUniverseIndex<I> {
77+
fn into_binders(self) -> CanonicalVarKinds<I> {
7878
let Canonicalizer {
7979
table,
8080
free_vars,
8181
interner,
8282
..
8383
} = self;
84-
ParameterKindsWithUniverseIndex::from(
84+
CanonicalVarKinds::from(
8585
interner,
8686
free_vars
8787
.into_iter()

‎chalk-solve/src/infer/test.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ fn quantify_simple() {
181181
.quantified,
182182
Canonical {
183183
value: ty!(apply (item 0) (bound 0) (bound 1) (bound 2)),
184-
binders: ParameterKindsWithUniverseIndex::from(
184+
binders: CanonicalVarKinds::from(
185185
interner,
186186
vec![
187187
ParameterKind::Ty(U2),
@@ -222,7 +222,7 @@ fn quantify_bound() {
222222
.quantified,
223223
Canonical {
224224
value: ty!(apply (item 0) (apply (item 1) (bound 0) (bound 1)) (bound 2) (bound 0) (bound 1)),
225-
binders: ParameterKindsWithUniverseIndex::from(
225+
binders: CanonicalVarKinds::from(
226226
interner,
227227
vec![
228228
ParameterKind::Ty(U1),
@@ -266,7 +266,7 @@ fn quantify_ty_under_binder() {
266266
.quantified,
267267
Canonical {
268268
value: ty!(function 3 (apply (item 0) (bound 1) (bound 1 0) (bound 1 0) (lifetime (bound 1 1)))),
269-
binders: ParameterKindsWithUniverseIndex::from(
269+
binders: CanonicalVarKinds::from(
270270
interner,
271271
vec![ParameterKind::Ty(U0), ParameterKind::Lifetime(U0)]
272272
),

‎chalk-solve/src/infer/ucanonicalize.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl<I: Interner> InferenceTable<I> {
4141
DebruijnIndex::INNERMOST,
4242
)
4343
.unwrap();
44-
let binders = ParameterKindsWithUniverseIndex::from(
44+
let binders = CanonicalVarKinds::from(
4545
interner,
4646
value0
4747
.binders

0 commit comments

Comments
 (0)