Skip to content

Commit ed46830

Browse files
Only make GAT ambiguous in match_projection_projections considering shallow resolvability
1 parent ddba1dc commit ed46830

File tree

1 file changed

+11
-1
lines changed
  • compiler/rustc_trait_selection/src/traits/select

1 file changed

+11
-1
lines changed

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

+11-1
Original file line numberDiff line numberDiff line change
@@ -1778,9 +1778,19 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
17781778
// If this type is a GAT, and of the GAT args resolve to something new,
17791779
// that means that we must have newly inferred something about the GAT.
17801780
// We should give up in that case.
1781+
// FIXME(generic-associated-types): This only detects one layer of inference,
1782+
// which is probably not what we actually want, but fixing it causes some ambiguity:
1783+
// <https://github.com/rust-lang/rust/issues/125196>.
17811784
if !generics.own_params.is_empty()
17821785
&& obligation.predicate.args[generics.parent_count..].iter().any(|&p| {
1783-
p.has_non_region_infer() && self.infcx.resolve_vars_if_possible(p) != p
1786+
p.has_non_region_infer()
1787+
&& match p.unpack() {
1788+
ty::GenericArgKind::Const(ct) => {
1789+
self.infcx.shallow_resolve_const(ct) != ct
1790+
}
1791+
ty::GenericArgKind::Type(ty) => self.infcx.shallow_resolve(ty) != ty,
1792+
ty::GenericArgKind::Lifetime(_) => false,
1793+
}
17841794
})
17851795
{
17861796
ProjectionMatchesProjection::Ambiguous

0 commit comments

Comments
 (0)