Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-30 21:16:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix a stupid typo

Browse Source
This commit is contained in:
Chayim Refael Friedman
2026-03-09 12:28:02 +02:00
parent bd1ba78364
commit e0829846ce
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/rust-analyzer/crates/hir-ty/src/lower.rs
+13 -8
View File
@@ -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)