mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore own item bounds in parent alias types in for_each_item_bound

Browse Source
This commit is contained in:
Michael Goulet 2024-02-11 18:23:05 +00:00
parent 899c895ba4
commit 38df5bdcf1
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/rustc_trait_selection/src/traits/select/mod.rs
View File

@ -1605,6 +1605,8 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
on_ambiguity: impl FnOnce(), on_ambiguity: impl FnOnce(),
) -> ControlFlow<T, ()> { ) -> ControlFlow<T, ()> {
let mut idx = 0; let mut idx = 0;
let mut in_parent_alias_type = false;
loop { loop {
let (kind, alias_ty) = match *self_ty.kind() { let (kind, alias_ty) = match *self_ty.kind() {
ty::Alias(kind @ (ty::Projection | ty::Opaque), alias_ty) => (kind, alias_ty), ty::Alias(kind @ (ty::Projection | ty::Opaque), alias_ty) => (kind, alias_ty),
@ -1618,6 +1620,18 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
for bound in for bound in
self.tcx().item_bounds(alias_ty.def_id).instantiate(self.tcx(), alias_ty.args) self.tcx().item_bounds(alias_ty.def_id).instantiate(self.tcx(), alias_ty.args)
{ {
// HACK: On subsequent recursions, we only care about bounds that don't
// share the same type as `self_ty`. This is because for truly rigid
// projections, we will never be able to equate, e.g. `<T as Tr>::A`
// with `<<T as Tr>::A as Tr>::A`.
if in_parent_alias_type {
match bound.kind().skip_binder() {
ty::ClauseKind::Trait(tr) if tr.self_ty() == self_ty => continue,
ty::ClauseKind::Projection(p) if p.self_ty() == self_ty => continue,
_ => {}
}
}
for_each(self, bound, idx)?; for_each(self, bound, idx)?;
idx += 1; idx += 1;
} }
@ -1627,6 +1641,8 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
} else { } else {
return ControlFlow::Continue(()); return ControlFlow::Continue(());
} }
in_parent_alias_type = true;
} }
} }