Unnamed repository; edit this file 'description' to name the repository.
| -rw-r--r-- | crates/hir-ty/src/lower.rs | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/crates/hir-ty/src/lower.rs b/crates/hir-ty/src/lower.rs index 83b67bf1fe..49594f34fd 100644 --- a/crates/hir-ty/src/lower.rs +++ b/crates/hir-ty/src/lower.rs @@ -1805,22 +1805,27 @@ fn resolve_type_param_assoc_type_shorthand( } AssocTypeShorthandResolution::Cycle => return AssocTypeShorthandResolution::Cycle, }; + let (assoc_type, args) = assoc_type_and_args + .get_with(|(assoc_type, args)| (*assoc_type, args.as_ref())) + .skip_binder(); + let args = EarlyBinder::bind(args).instantiate(interner, bounded_trait_ref.args); + let current_result = StoredEarlyBinder::bind((assoc_type, args.store())); if let Some(this_trait_resolution) = this_trait_resolution { return AssocTypeShorthandResolution::Ambiguous { sub_trait_resolution: Some(this_trait_resolution), }; } else if let Some(prev_resolution) = &supertraits_resolution { - if prev_resolution == lookup_on_bounded_trait { - return AssocTypeShorthandResolution::Ambiguous { sub_trait_resolution: None }; - } else { + if let AssocTypeShorthandResolution::Ambiguous { + sub_trait_resolution: Some(prev_resolution), + } + | AssocTypeShorthandResolution::Resolved(prev_resolution) = prev_resolution + && *prev_resolution == current_result + { continue; + } else { + return AssocTypeShorthandResolution::Ambiguous { sub_trait_resolution: None }; } } else { - let (assoc_type, args) = assoc_type_and_args - .get_with(|(assoc_type, args)| (*assoc_type, args.as_ref())) - .skip_binder(); - let args = EarlyBinder::bind(args).instantiate(interner, bounded_trait_ref.args); - let current_result = StoredEarlyBinder::bind((assoc_type, args.store())); supertraits_resolution = Some(match lookup_on_bounded_trait { AssocTypeShorthandResolution::Resolved(_) => { AssocTypeShorthandResolution::Resolved(current_result) |