Skip to content

Commit 3a36a09

Browse files
Rename AliasEq -> AliasRelate
1 parent 5dc3fd7 commit 3a36a09

File tree

29 files changed

+57
-53
lines changed

29 files changed

+57
-53
lines changed

compiler/rustc_hir_analysis/src/astconv/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1335,7 +1335,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
13351335
ty::Clause::RegionOutlives(_) | ty::Clause::ConstArgHasType(..) => bug!(),
13361336
},
13371337
ty::PredicateKind::WellFormed(_)
1338-
| ty::PredicateKind::AliasEq(..)
1338+
| ty::PredicateKind::AliasRelate(..)
13391339
| ty::PredicateKind::ObjectSafe(_)
13401340
| ty::PredicateKind::ClosureKind(_, _, _)
13411341
| ty::PredicateKind::Subtype(_)

compiler/rustc_hir_analysis/src/impl_wf_check/min_specialization.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ fn trait_predicate_kind<'tcx>(
528528
| ty::PredicateKind::Clause(ty::Clause::TypeOutlives(_))
529529
| ty::PredicateKind::Clause(ty::Clause::Projection(_))
530530
| ty::PredicateKind::Clause(ty::Clause::ConstArgHasType(..))
531-
| ty::PredicateKind::AliasEq(..)
531+
| ty::PredicateKind::AliasRelate(..)
532532
| ty::PredicateKind::WellFormed(_)
533533
| ty::PredicateKind::Subtype(_)
534534
| ty::PredicateKind::Coerce(_)

compiler/rustc_hir_analysis/src/outlives/explicit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ impl<'tcx> ExplicitPredicatesMap<'tcx> {
5656
| ty::PredicateKind::Clause(ty::Clause::Projection(..))
5757
| ty::PredicateKind::Clause(ty::Clause::ConstArgHasType(..))
5858
| ty::PredicateKind::WellFormed(..)
59-
| ty::PredicateKind::AliasEq(..)
59+
| ty::PredicateKind::AliasRelate(..)
6060
| ty::PredicateKind::ObjectSafe(..)
6161
| ty::PredicateKind::ClosureKind(..)
6262
| ty::PredicateKind::Subtype(..)

compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
666666
| ty::PredicateKind::Clause(ty::Clause::TypeOutlives(..))
667667
| ty::PredicateKind::WellFormed(..)
668668
| ty::PredicateKind::ObjectSafe(..)
669-
| ty::PredicateKind::AliasEq(..)
669+
| ty::PredicateKind::AliasRelate(..)
670670
| ty::PredicateKind::ConstEvaluatable(..)
671671
| ty::PredicateKind::ConstEquate(..)
672672
// N.B., this predicate is created by breaking down a

compiler/rustc_hir_typeck/src/method/probe.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
838838
| ty::PredicateKind::ConstEvaluatable(..)
839839
| ty::PredicateKind::ConstEquate(..)
840840
| ty::PredicateKind::Ambiguous
841-
| ty::PredicateKind::AliasEq(..)
841+
| ty::PredicateKind::AliasRelate(..)
842842
| ty::PredicateKind::TypeWellFormedFromEnv(..) => None,
843843
}
844844
});

compiler/rustc_infer/src/infer/combine.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ pub trait ObligationEmittingRelation<'tcx>: TypeRelation<'tcx> {
842842
let (a, b) = if self.a_is_expected() { (a, b) } else { (b, a) };
843843

844844
self.register_predicates([ty::Binder::dummy(if self.tcx().trait_solver_next() {
845-
ty::PredicateKind::AliasEq(a.into(), b.into(), ty::AliasRelationDirection::Equate)
845+
ty::PredicateKind::AliasRelate(a.into(), b.into(), ty::AliasRelationDirection::Equate)
846846
} else {
847847
ty::PredicateKind::ConstEquate(a, b)
848848
})]);
@@ -852,14 +852,14 @@ pub trait ObligationEmittingRelation<'tcx>: TypeRelation<'tcx> {
852852
///
853853
/// If they aren't equal then the relation doesn't hold.
854854
fn register_type_equate_obligation(&mut self, a: Ty<'tcx>, b: Ty<'tcx>) {
855-
self.register_predicates([ty::Binder::dummy(ty::PredicateKind::AliasEq(
855+
self.register_predicates([ty::Binder::dummy(ty::PredicateKind::AliasRelate(
856856
a.into(),
857857
b.into(),
858858
self.alias_relate_direction(),
859859
))]);
860860
}
861861

862-
/// Relation direction emitted for `AliasEq` predicates
862+
/// Relation direction emitted for `AliasRelate` predicates
863863
fn alias_relate_direction(&self) -> ty::AliasRelationDirection;
864864
}
865865

compiler/rustc_infer/src/infer/outlives/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub fn explicit_outlives_bounds<'tcx>(
2222
ty::PredicateKind::Clause(ty::Clause::Projection(..))
2323
| ty::PredicateKind::Clause(ty::Clause::Trait(..))
2424
| ty::PredicateKind::Clause(ty::Clause::ConstArgHasType(..))
25-
| ty::PredicateKind::AliasEq(..)
25+
| ty::PredicateKind::AliasRelate(..)
2626
| ty::PredicateKind::Coerce(..)
2727
| ty::PredicateKind::Subtype(..)
2828
| ty::PredicateKind::WellFormed(..)

compiler/rustc_infer/src/infer/projection.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ impl<'tcx> InferCtxt<'tcx> {
2626
// completely change the normalization routine with the new solver.
2727
//
2828
// The new solver correctly handles projection equality so this hack
29-
// is not necessary. if re-enabled it should emit `PredicateKind::AliasEq`
29+
// is not necessary. if re-enabled it should emit `PredicateKind::AliasRelate`
3030
// not `PredicateKind::Clause(Clause::Projection(..))` as in the new solver
3131
// `Projection` is used as `normalizes-to` which will fail for `<T as Trait>::Assoc eq ?0`.
3232
return projection_ty.to_ty(self.tcx);

compiler/rustc_infer/src/traits/util.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ impl<'tcx> Elaborator<'tcx> {
293293
// Nothing to elaborate
294294
}
295295
ty::PredicateKind::Ambiguous => {}
296-
ty::PredicateKind::AliasEq(..) => {
296+
ty::PredicateKind::AliasRelate(..) => {
297297
// No
298298
}
299299
ty::PredicateKind::Clause(ty::Clause::ConstArgHasType(..)) => {

compiler/rustc_lint/src/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1601,7 +1601,7 @@ impl<'tcx> LateLintPass<'tcx> for TrivialConstraints {
16011601
// Ignore projections, as they can only be global
16021602
// if the trait bound is global
16031603
Clause(Clause::Projection(..)) |
1604-
AliasEq(..) |
1604+
AliasRelate(..) |
16051605
// Ignore bounds that a user can't type
16061606
WellFormed(..) |
16071607
ObjectSafe(..) |

compiler/rustc_middle/src/ty/flags.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ impl FlagComputation {
288288
self.add_ty(ty);
289289
}
290290
ty::PredicateKind::Ambiguous => {}
291-
ty::PredicateKind::AliasEq(t1, t2, _) => {
291+
ty::PredicateKind::AliasRelate(t1, t2, _) => {
292292
self.add_term(t1);
293293
self.add_term(t2);
294294
}

compiler/rustc_middle/src/ty/mod.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ impl<'tcx> Predicate<'tcx> {
543543
| PredicateKind::Clause(Clause::TypeOutlives(_))
544544
| PredicateKind::Clause(Clause::Projection(_))
545545
| PredicateKind::Clause(Clause::ConstArgHasType(..))
546-
| PredicateKind::AliasEq(..)
546+
| PredicateKind::AliasRelate(..)
547547
| PredicateKind::ObjectSafe(_)
548548
| PredicateKind::ClosureKind(_, _, _)
549549
| PredicateKind::Subtype(_)
@@ -640,7 +640,7 @@ pub enum PredicateKind<'tcx> {
640640
/// This predicate requires two terms to be equal to eachother.
641641
///
642642
/// Only used for new solver
643-
AliasEq(Term<'tcx>, Term<'tcx>, AliasRelationDirection),
643+
AliasRelate(Term<'tcx>, Term<'tcx>, AliasRelationDirection),
644644
}
645645

646646
#[derive(Clone, Copy, PartialEq, Eq, Hash, TyEncodable, TyDecodable)]
@@ -1224,7 +1224,7 @@ impl<'tcx> Predicate<'tcx> {
12241224
PredicateKind::Clause(Clause::Trait(t)) => Some(predicate.rebind(t)),
12251225
PredicateKind::Clause(Clause::Projection(..))
12261226
| PredicateKind::Clause(Clause::ConstArgHasType(..))
1227-
| PredicateKind::AliasEq(..)
1227+
| PredicateKind::AliasRelate(..)
12281228
| PredicateKind::Subtype(..)
12291229
| PredicateKind::Coerce(..)
12301230
| PredicateKind::Clause(Clause::RegionOutlives(..))
@@ -1245,7 +1245,7 @@ impl<'tcx> Predicate<'tcx> {
12451245
PredicateKind::Clause(Clause::Projection(t)) => Some(predicate.rebind(t)),
12461246
PredicateKind::Clause(Clause::Trait(..))
12471247
| PredicateKind::Clause(Clause::ConstArgHasType(..))
1248-
| PredicateKind::AliasEq(..)
1248+
| PredicateKind::AliasRelate(..)
12491249
| PredicateKind::Subtype(..)
12501250
| PredicateKind::Coerce(..)
12511251
| PredicateKind::Clause(Clause::RegionOutlives(..))
@@ -1267,7 +1267,7 @@ impl<'tcx> Predicate<'tcx> {
12671267
PredicateKind::Clause(Clause::Trait(..))
12681268
| PredicateKind::Clause(Clause::ConstArgHasType(..))
12691269
| PredicateKind::Clause(Clause::Projection(..))
1270-
| PredicateKind::AliasEq(..)
1270+
| PredicateKind::AliasRelate(..)
12711271
| PredicateKind::Subtype(..)
12721272
| PredicateKind::Coerce(..)
12731273
| PredicateKind::Clause(Clause::RegionOutlives(..))

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2848,7 +2848,7 @@ define_print_and_forward_display! {
28482848
}
28492849
ty::PredicateKind::Ambiguous => p!("ambiguous"),
28502850
// TODO
2851-
ty::PredicateKind::AliasEq(t1, t2, _) => p!(print(t1), " == ", print(t2)),
2851+
ty::PredicateKind::AliasRelate(t1, t2, _) => p!(print(t1), " == ", print(t2)),
28522852
}
28532853
}
28542854

compiler/rustc_middle/src/ty/structural_impls.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ impl<'tcx> fmt::Debug for ty::PredicateKind<'tcx> {
178178
}
179179
ty::PredicateKind::Ambiguous => write!(f, "Ambiguous"),
180180
// TODO
181-
ty::PredicateKind::AliasEq(t1, t2, _) => write!(f, "AliasEq({t1:?}, {t2:?})"),
181+
ty::PredicateKind::AliasRelate(t1, t2, _) => write!(f, "AliasRelate({t1:?}, {t2:?})"),
182182
}
183183
}
184184
}

compiler/rustc_privacy/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ where
180180
| ty::PredicateKind::ConstEquate(_, _)
181181
| ty::PredicateKind::TypeWellFormedFromEnv(_)
182182
| ty::PredicateKind::Ambiguous
183-
| ty::PredicateKind::AliasEq(..) => bug!("unexpected predicate: {:?}", predicate),
183+
| ty::PredicateKind::AliasRelate(..) => bug!("unexpected predicate: {:?}", predicate),
184184
}
185185
}
186186

compiler/rustc_trait_selection/src/solve/eval_ctxt.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,11 @@ impl<'a, 'tcx> EvalCtxt<'a, 'tcx> {
223223
ty::PredicateKind::TypeWellFormedFromEnv(..) => {
224224
bug!("TypeWellFormedFromEnv is only used for Chalk")
225225
}
226-
ty::PredicateKind::AliasEq(lhs, rhs, direction) => {
227-
self.compute_alias_eq_goal(Goal { param_env, predicate: (lhs, rhs, direction) })
228-
}
226+
ty::PredicateKind::AliasRelate(lhs, rhs, direction) => self
227+
.compute_alias_relate_goal(Goal {
228+
param_env,
229+
predicate: (lhs, rhs, direction),
230+
}),
229231
}
230232
} else {
231233
let kind = self.infcx.instantiate_binder_with_placeholders(kind);

compiler/rustc_trait_selection/src/solve/fulfill.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ impl<'tcx> TraitEngine<'tcx> for FulfillmentCtxt<'tcx> {
7373
MismatchedProjectionTypes { err: TypeError::Mismatch },
7474
)
7575
}
76-
ty::PredicateKind::AliasEq(_, _, _) => {
76+
ty::PredicateKind::AliasRelate(_, _, _) => {
7777
FulfillmentErrorCode::CodeProjectionError(
7878
MismatchedProjectionTypes { err: TypeError::Mismatch },
7979
)

compiler/rustc_trait_selection/src/solve/mod.rs

+7-5
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ impl<'a, 'tcx> EvalCtxt<'a, 'tcx> {
156156
}
157157

158158
#[instrument(level = "debug", skip(self), ret)]
159-
fn compute_alias_eq_goal(
159+
fn compute_alias_relate_goal(
160160
&mut self,
161161
goal: Goal<'tcx, (ty::Term<'tcx>, ty::Term<'tcx>, ty::AliasRelationDirection)>,
162162
) -> QueryResult<'tcx> {
@@ -204,12 +204,12 @@ impl<'a, 'tcx> EvalCtxt<'a, 'tcx> {
204204

205205
if lhs.is_infer() || rhs.is_infer() {
206206
bug!(
207-
"`AliasEq` goal with an infer var on lhs or rhs which should have been instantiated"
207+
"`AliasRelate` goal with an infer var on lhs or rhs which should have been instantiated"
208208
);
209209
}
210210

211211
match (lhs.to_projection_term(tcx), rhs.to_projection_term(tcx)) {
212-
(None, None) => bug!("`AliasEq` goal without an alias on either lhs or rhs"),
212+
(None, None) => bug!("`AliasRelate` goal without an alias on either lhs or rhs"),
213213

214214
// RHS is not a projection, only way this is true is if LHS normalizes-to RHS
215215
(Some(alias_lhs), None) => evaluate_normalizes_to(self, alias_lhs, rhs, direction),
@@ -220,7 +220,7 @@ impl<'a, 'tcx> EvalCtxt<'a, 'tcx> {
220220
}
221221

222222
(Some(alias_lhs), Some(alias_rhs)) => {
223-
debug!("compute_alias_eq_goal: both sides are aliases");
223+
debug!("compute_alias_relate_goal: both sides are aliases");
224224

225225
let candidates = vec![
226226
// LHS normalizes-to RHS
@@ -229,7 +229,9 @@ impl<'a, 'tcx> EvalCtxt<'a, 'tcx> {
229229
evaluate_normalizes_to(self, alias_rhs, lhs, direction.invert()),
230230
// Relate via substs
231231
self.probe(|ecx| {
232-
debug!("compute_alias_eq_goal: alias defids are equal, equating substs");
232+
debug!(
233+
"compute_alias_relate_goal: alias defids are equal, equating substs"
234+
);
233235

234236
ecx.add_goals(
235237
match direction {

compiler/rustc_trait_selection/src/traits/auto_trait.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ impl<'tcx> AutoTraitFinder<'tcx> {
832832
// the `ParamEnv`.
833833
ty::PredicateKind::WellFormed(..)
834834
| ty::PredicateKind::Clause(ty::Clause::ConstArgHasType(..))
835-
| ty::PredicateKind::AliasEq(..)
835+
| ty::PredicateKind::AliasRelate(..)
836836
| ty::PredicateKind::ObjectSafe(..)
837837
| ty::PredicateKind::ClosureKind(..)
838838
| ty::PredicateKind::Subtype(..)

compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1276,9 +1276,9 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
12761276
"TypeWellFormedFromEnv predicate should only exist in the environment"
12771277
),
12781278

1279-
ty::PredicateKind::AliasEq(..) => span_bug!(
1279+
ty::PredicateKind::AliasRelate(..) => span_bug!(
12801280
span,
1281-
"AliasEq predicate should never be the predicate cause of a SelectionError"
1281+
"AliasRelate predicate should never be the predicate cause of a SelectionError"
12821282
),
12831283

12841284
ty::PredicateKind::Clause(ty::Clause::ConstArgHasType(ct, ty)) => {

compiler/rustc_trait_selection/src/traits/fulfill.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,8 @@ impl<'a, 'tcx> ObligationProcessor for FulfillProcessor<'a, 'tcx> {
361361
ty::PredicateKind::TypeWellFormedFromEnv(..) => {
362362
bug!("TypeWellFormedFromEnv is only used for Chalk")
363363
}
364-
ty::PredicateKind::AliasEq(..) => {
365-
bug!("AliasEq is only used for new solver")
364+
ty::PredicateKind::AliasRelate(..) => {
365+
bug!("AliasRelate is only used for new solver")
366366
}
367367
},
368368
Some(pred) => match pred {
@@ -630,8 +630,8 @@ impl<'a, 'tcx> ObligationProcessor for FulfillProcessor<'a, 'tcx> {
630630
ty::PredicateKind::TypeWellFormedFromEnv(..) => {
631631
bug!("TypeWellFormedFromEnv is only used for Chalk")
632632
}
633-
ty::PredicateKind::AliasEq(..) => {
634-
bug!("AliasEq is only used for new solver")
633+
ty::PredicateKind::AliasRelate(..) => {
634+
bug!("AliasRelate is only used for new solver")
635635
}
636636
ty::PredicateKind::Clause(ty::Clause::ConstArgHasType(ct, ty)) => {
637637
match self.selcx.infcx.at(&obligation.cause, obligation.param_env).eq(

compiler/rustc_trait_selection/src/traits/object_safety.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ fn predicate_references_self<'tcx>(
335335
has_self_ty(&ty.into()).then_some(sp)
336336
}
337337

338-
ty::PredicateKind::AliasEq(..) => bug!("`AliasEq` not allowed as assumption"),
338+
ty::PredicateKind::AliasRelate(..) => bug!("`AliasRelate` not allowed as assumption"),
339339

340340
ty::PredicateKind::WellFormed(..)
341341
| ty::PredicateKind::ObjectSafe(..)
@@ -395,7 +395,7 @@ fn generics_require_sized_self(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
395395
| ty::PredicateKind::Clause(ty::Clause::TypeOutlives(..))
396396
| ty::PredicateKind::ConstEvaluatable(..)
397397
| ty::PredicateKind::ConstEquate(..)
398-
| ty::PredicateKind::AliasEq(..)
398+
| ty::PredicateKind::AliasRelate(..)
399399
| ty::PredicateKind::Ambiguous
400400
| ty::PredicateKind::TypeWellFormedFromEnv(..) => false,
401401
}

compiler/rustc_trait_selection/src/traits/select/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -977,8 +977,8 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
977977
ty::PredicateKind::TypeWellFormedFromEnv(..) => {
978978
bug!("TypeWellFormedFromEnv is only used for chalk")
979979
}
980-
ty::PredicateKind::AliasEq(..) => {
981-
bug!("AliasEq is only used for new solver")
980+
ty::PredicateKind::AliasRelate(..) => {
981+
bug!("AliasRelate is only used for new solver")
982982
}
983983
ty::PredicateKind::Ambiguous => Ok(EvaluatedToAmbig),
984984
ty::PredicateKind::Clause(ty::Clause::ConstArgHasType(ct, ty)) => {

compiler/rustc_trait_selection/src/traits/wf.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ pub fn predicate_obligations<'tcx>(
191191
ty::PredicateKind::TypeWellFormedFromEnv(..) => {
192192
bug!("TypeWellFormedFromEnv is only used for Chalk")
193193
}
194-
ty::PredicateKind::AliasEq(..) => {
195-
bug!("We should only wf check where clauses and `AliasEq` is not a `Clause`")
194+
ty::PredicateKind::AliasRelate(..) => {
195+
bug!("We should only wf check where clauses and `AliasRelate` is not a `Clause`")
196196
}
197197
}
198198

@@ -936,7 +936,7 @@ pub(crate) fn required_region_bounds<'tcx>(
936936
| ty::PredicateKind::ConstEvaluatable(..)
937937
| ty::PredicateKind::ConstEquate(..)
938938
| ty::PredicateKind::Ambiguous
939-
| ty::PredicateKind::AliasEq(..)
939+
| ty::PredicateKind::AliasRelate(..)
940940
| ty::PredicateKind::TypeWellFormedFromEnv(..) => None,
941941
ty::PredicateKind::Clause(ty::Clause::TypeOutlives(ty::OutlivesPredicate(
942942
ref t,

compiler/rustc_traits/src/chalk/lowering.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ impl<'tcx> LowerInto<'tcx, chalk_ir::InEnvironment<chalk_ir::Goal<RustInterner<'
119119
},
120120
ty::PredicateKind::ObjectSafe(..)
121121
| ty::PredicateKind::Clause(ty::Clause::ConstArgHasType(..))
122-
| ty::PredicateKind::AliasEq(..)
122+
| ty::PredicateKind::AliasRelate(..)
123123
| ty::PredicateKind::ClosureKind(..)
124124
| ty::PredicateKind::Subtype(..)
125125
| ty::PredicateKind::Coerce(..)
@@ -215,7 +215,7 @@ impl<'tcx> LowerInto<'tcx, chalk_ir::GoalData<RustInterner<'tcx>>> for ty::Predi
215215
// some of these in terms of chalk operations.
216216
ty::PredicateKind::ClosureKind(..)
217217
| ty::PredicateKind::Clause(ty::Clause::ConstArgHasType(..))
218-
| ty::PredicateKind::AliasEq(..)
218+
| ty::PredicateKind::AliasRelate(..)
219219
| ty::PredicateKind::Coerce(..)
220220
| ty::PredicateKind::ConstEvaluatable(..)
221221
| ty::PredicateKind::Ambiguous
@@ -652,7 +652,7 @@ impl<'tcx> LowerInto<'tcx, Option<chalk_ir::QuantifiedWhereClause<RustInterner<'
652652
ty::PredicateKind::Clause(ty::Clause::ConstArgHasType(..)) => None,
653653

654654
ty::PredicateKind::ObjectSafe(..)
655-
| ty::PredicateKind::AliasEq(..)
655+
| ty::PredicateKind::AliasRelate(..)
656656
| ty::PredicateKind::ClosureKind(..)
657657
| ty::PredicateKind::Subtype(..)
658658
| ty::PredicateKind::Coerce(..)
@@ -787,7 +787,7 @@ impl<'tcx> LowerInto<'tcx, Option<chalk_solve::rust_ir::QuantifiedInlineBound<Ru
787787
ty::PredicateKind::Clause(ty::Clause::ConstArgHasType(..)) => None,
788788

789789
ty::PredicateKind::Clause(ty::Clause::RegionOutlives(..))
790-
| ty::PredicateKind::AliasEq(..)
790+
| ty::PredicateKind::AliasRelate(..)
791791
| ty::PredicateKind::ObjectSafe(..)
792792
| ty::PredicateKind::ClosureKind(..)
793793
| ty::PredicateKind::Subtype(..)

0 commit comments

Comments
 (0)