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/lower.rs | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

(limited to 'crates/ra_hir_ty/src/lower.rs')

diff --git a/crates/ra_hir_ty/src/lower.rs b/crates/ra_hir_ty/src/lower.rs
index 53d955a12..f8331d257 100644
--- a/crates/ra_hir_ty/src/lower.rs
+++ b/crates/ra_hir_ty/src/lower.rs
@@ -14,21 +14,21 @@ use hir_def::{
     path::{GenericArg, Path, PathKind, PathSegment},
     resolver::{HasResolver, Resolver, TypeNs},
     type_ref::{TypeBound, TypeRef},
-    AdtId, AstItemDef, ConstId, EnumId, EnumVariantId, FunctionId, GenericDefId, HasModule,
+    AdtId, AstItemDef, ConstId, EnumId, EnumVariantId, FunctionId, GenericDefId, HasModule, ImplId,
     LocalStructFieldId, Lookup, StaticId, StructId, TraitId, TypeAliasId, UnionId, VariantId,
 };
 use ra_arena::map::ArenaMap;
 use ra_db::CrateId;
 
-use super::{
-    FnSig, GenericPredicate, ProjectionPredicate, ProjectionTy, Substs, TraitEnvironment, TraitRef,
-    Ty, TypeCtor, TypeWalk,
-};
 use crate::{
     db::HirDatabase,
     primitive::{FloatTy, IntTy},
-    utils::make_mut_slice,
-    utils::{all_super_traits, associated_type_by_name_including_super_traits, variant_data},
+    utils::{
+        all_super_traits, associated_type_by_name_including_super_traits, make_mut_slice,
+        variant_data,
+    },
+    FnSig, GenericPredicate, ImplTy, ProjectionPredicate, ProjectionTy, Substs, TraitEnvironment,
+    TraitRef, Ty, TypeCtor, TypeWalk,
 };
 
 impl Ty {
@@ -179,11 +179,7 @@ impl Ty {
                 let name = resolved_segment.name.clone();
                 Ty::Param { idx, name }
             }
-            TypeNs::SelfType(impl_id) => {
-                let impl_data = db.impl_data(impl_id);
-                let resolver = impl_id.resolver(db);
-                Ty::from_hir(db, &resolver, &impl_data.target_type)
-            }
+            TypeNs::SelfType(impl_id) => db.impl_ty(impl_id).self_type().clone(),
             TypeNs::AdtSelfType(adt) => db.ty(adt.into()),
 
             TypeNs::AdtId(it) => Ty::from_hir_path_inner(db, resolver, resolved_segment, it.into()),
@@ -751,3 +747,18 @@ pub(crate) fn value_ty_query(db: &impl HirDatabase, def: ValueTyDefId) -> Ty {
         ValueTyDefId::StaticId(it) => type_for_static(db, it),
     }
 }
+
+pub(crate) fn impl_ty_query(db: &impl HirDatabase, impl_id: ImplId) -> ImplTy {
+    let impl_data = db.impl_data(impl_id);
+    let resolver = impl_id.resolver(db);
+    let self_ty = Ty::from_hir(db, &resolver, &impl_data.target_type);
+    match impl_data.target_trait.as_ref() {
+        Some(trait_ref) => {
+            match TraitRef::from_hir(db, &resolver, trait_ref, Some(self_ty.clone())) {
+                Some(it) => ImplTy::TraitRef(it),
+                None => ImplTy::Inherent(self_ty),
+            }
+        }
+        None => ImplTy::Inherent(self_ty),
+    }
+}
-- 
cgit v1.2.3