language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-01 12:24:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: Fix type argument mismatch incorrectly triggering on inferred trait args

Browse source
This commit is contained in:
Lukas Wirth 2025-04-24 07:34:04 +02:00
parent 8fb2dcc947
commit dce59ad8fb
4 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/hir-ty/src/infer/path.rs
View file

@ -207,7 +207,7 @@ impl InferenceContext<'_> {
(TypeNs::TraitId(trait_), true) => {
let self_ty = self.table.new_type_var();
let trait_ref =
path_ctx.lower_trait_ref_from_resolved_path(trait_, self_ty);
path_ctx.lower_trait_ref_from_resolved_path(trait_, self_ty, true);
drop_ctx(ctx, no_diagnostics);
self.resolve_trait_assoc_item(trait_ref, last_segment, id)
}

2
crates/hir-ty/src/lower.rs
View file

@ -538,7 +538,7 @@ impl<'a> TyLoweringContext<'a> {
TypeNs::TraitId(tr) => tr,
_ => return None,
};
Some((ctx.lower_trait_ref_from_resolved_path(resolved, explicit_self_ty), ctx))
Some((ctx.lower_trait_ref_from_resolved_path(resolved, explicit_self_ty, false), ctx))
}
fn lower_trait_ref(

7
crates/hir-ty/src/lower/path.rs
View file

@ -166,6 +166,7 @@ impl<'a, 'b> PathLoweringContext<'a, 'b> {
let trait_ref = self.lower_trait_ref_from_resolved_path(
trait_,
TyKind::Error.intern(Interner),
infer_args,
);
self.skip_resolved_segment();
@ -830,8 +831,9 @@ impl<'a, 'b> PathLoweringContext<'a, 'b> {
&mut self,
resolved: TraitId,
explicit_self_ty: Ty,
infer_args: bool,
) -> TraitRef {
let substs = self.trait_ref_substs_from_path(resolved, explicit_self_ty);
let substs = self.trait_ref_substs_from_path(resolved, explicit_self_ty, infer_args);
TraitRef { trait_id: to_chalk_trait_id(resolved), substitution: substs }
}
@ -839,8 +841,9 @@ impl<'a, 'b> PathLoweringContext<'a, 'b> {
&mut self,
resolved: TraitId,
explicit_self_ty: Ty,
infer_args: bool,
) -> Substitution {
self.substs_from_path_segment(resolved.into(), false, Some(explicit_self_ty), false)
self.substs_from_path_segment(resolved.into(), infer_args, Some(explicit_self_ty), false)
}
pub(super) fn assoc_type_bindings_from_type_bound<'c>(