language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Push resolver further up

Browse source
This commit is contained in:
Aleksey Kladov 2020-01-14 14:20:33 +01:00
parent 7ec62ea5e6
commit 21c5fd8b1b
4 changed files with 60 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/ra_hir_ty/src/infer/expr.rs
View file

@ -569,12 +569,19 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
) -> Ty {
let receiver_ty = self.infer_expr(receiver, &Expectation::none());
let canonicalized_receiver = self.canonicalizer().canonicalize_ty(receiver_ty.clone());
let resolved = method_resolution::lookup_method(
&canonicalized_receiver.value,
self.db,
method_name,
&self.resolver,
);
let traits_in_scope = self.resolver.traits_in_scope(self.db);
let resolved = self.resolver.krate().and_then(|krate| {
method_resolution::lookup_method(
&canonicalized_receiver.value,
self.db,
self.trait_env.clone(),
krate,
&traits_in_scope,
method_name,
)
});
let (derefed_receiver_ty, method_ty, def_generics) = match resolved {
Some((ty, func)) => {
let ty = canonicalized_receiver.decanonicalize_ty(ty);