From 8d3469682681d5b206d5ae31fc63fb97d9cedb3a Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 27 Nov 2019 22:12:09 +0300
Subject: Memoize impl resolutions

---
 crates/ra_hir_ty/src/infer/coerce.rs | 22 ++++++----------------
 crates/ra_hir_ty/src/infer/path.rs   | 10 ++++------
 2 files changed, 10 insertions(+), 22 deletions(-)

(limited to 'crates/ra_hir_ty/src/infer')

diff --git a/crates/ra_hir_ty/src/infer/coerce.rs b/crates/ra_hir_ty/src/infer/coerce.rs
index d66a21932..719a0f395 100644
--- a/crates/ra_hir_ty/src/infer/coerce.rs
+++ b/crates/ra_hir_ty/src/infer/coerce.rs
@@ -4,16 +4,11 @@
 //!
 //! See: https://doc.rust-lang.org/nomicon/coercions.html
 
-use hir_def::{
-    lang_item::LangItemTarget,
-    resolver::{HasResolver, Resolver},
-    type_ref::Mutability,
-    AdtId,
-};
+use hir_def::{lang_item::LangItemTarget, resolver::Resolver, type_ref::Mutability, AdtId};
 use rustc_hash::FxHashMap;
 use test_utils::tested_by;
 
-use crate::{autoderef, db::HirDatabase, Substs, TraitRef, Ty, TypeCtor, TypeWalk};
+use crate::{autoderef, db::HirDatabase, ImplTy, Substs, Ty, TypeCtor, TypeWalk};
 
 use super::{InEnvironment, InferTy, InferenceContext, TypeVarValue};
 
@@ -59,17 +54,12 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
         impls
             .iter()
             .filter_map(|&impl_id| {
-                let impl_data = db.impl_data(impl_id);
-                let resolver = impl_id.resolver(db);
-                let target_ty = Ty::from_hir(db, &resolver, &impl_data.target_type);
+                let trait_ref = match db.impl_ty(impl_id) {
+                    ImplTy::TraitRef(it) => it,
+                    ImplTy::Inherent(_) => return None,
+                };
 
                 // `CoerseUnsized` has one generic parameter for the target type.
-                let trait_ref = TraitRef::from_hir(
-                    db,
-                    &resolver,
-                    impl_data.target_trait.as_ref()?,
-                    Some(target_ty),
-                )?;
                 let cur_from_ty = trait_ref.substs.0.get(0)?;
                 let cur_to_ty = trait_ref.substs.0.get(1)?;
 
diff --git a/crates/ra_hir_ty/src/infer/path.rs b/crates/ra_hir_ty/src/infer/path.rs
index e6676e1aa..14be66836 100644
--- a/crates/ra_hir_ty/src/infer/path.rs
+++ b/crates/ra_hir_ty/src/infer/path.rs
@@ -2,7 +2,7 @@
 
 use hir_def::{
     path::{Path, PathKind, PathSegment},
-    resolver::{HasResolver, ResolveValueResult, Resolver, TypeNs, ValueNs},
+    resolver::{ResolveValueResult, Resolver, TypeNs, ValueNs},
     AssocItemId, ContainerId, Lookup,
 };
 use hir_expand::name::Name;
@@ -244,17 +244,15 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                 ContainerId::ImplId(it) => it,
                 _ => return None,
             };
-            let resolver = impl_id.resolver(self.db);
-            let impl_data = self.db.impl_data(impl_id);
-            let impl_block = Ty::from_hir(self.db, &resolver, &impl_data.target_type);
-            let impl_block_substs = impl_block.substs()?;
+            let self_ty = self.db.impl_ty(impl_id).self_type().clone();
+            let self_ty_substs = self_ty.substs()?;
             let actual_substs = actual_def_ty.substs()?;
 
             let mut new_substs = vec![Ty::Unknown; gen.count_parent_params()];
 
             // The following code *link up* the function actual parma type
             // and impl_block type param index
-            impl_block_substs.iter().zip(actual_substs.iter()).for_each(|(param, pty)| {
+            self_ty_substs.iter().zip(actual_substs.iter()).for_each(|(param, pty)| {
                 if let Ty::Param { idx, .. } = param {
                     if let Some(s) = new_substs.get_mut(*idx as usize) {
                         *s = pty.clone();
-- 
cgit v1.2.3