language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 05:45:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

hir_ty: use correct receiver_ty in method resolution

Browse source
This commit is contained in:
cynecx 2021-05-31 20:04:18 +02:00
parent 7c1d8ca635
commit 759cb07891
3 changed files with 82 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/hir_ty/src/infer/expr.rs
View file

@ -890,7 +890,7 @@ impl<'a> InferenceContext<'a> {
method_name,
)
});
let (derefed_receiver_ty, method_ty, substs) = match resolved {
let (receiver_ty, method_ty, substs) = match resolved {
Some((ty, func)) => {
let ty = canonicalized_receiver.decanonicalize_ty(ty);
let generics = generics(self.db.upcast(), func.into());
@ -916,16 +916,7 @@ impl<'a> InferenceContext<'a> {
}
None => (self.err_ty(), Vec::new(), self.err_ty()),
};
// Apply autoref so the below unification works correctly
// FIXME: return correct autorefs from lookup_method
let actual_receiver_ty = match self.resolve_ty_shallow(&expected_receiver_ty).as_reference()
{
Some((_, lifetime, mutability)) => {
TyKind::Ref(mutability, lifetime, derefed_receiver_ty).intern(&Interner)
}
_ => derefed_receiver_ty,
};
self.unify(&expected_receiver_ty, &actual_receiver_ty);
self.unify(&expected_receiver_ty, &receiver_ty);
self.check_call_arguments(args, &param_tys);
self.normalize_associated_types_in(ret_ty)