From 1234dda9ee60a19a83a9664c2e1208247566b49b Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 20 Dec 2019 13:47:44 +0100
Subject: Use generic ItemLoc for impls

---
 crates/ra_hir_def/src/lib.rs               | 27 ++++-----------------------
 crates/ra_hir_def/src/nameres/collector.rs |  3 ++-
 2 files changed, 6 insertions(+), 24 deletions(-)

(limited to 'crates/ra_hir_def')

diff --git a/crates/ra_hir_def/src/lib.rs b/crates/ra_hir_def/src/lib.rs
index faeb2fc8a..d11b573e5 100644
--- a/crates/ra_hir_def/src/lib.rs
+++ b/crates/ra_hir_def/src/lib.rs
@@ -160,27 +160,8 @@ impl_intern!(TypeAliasId, TypeAliasLoc, intern_type_alias, lookup_intern_type_al
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct ImplId(salsa::InternId);
-impl_intern_key!(ImplId);
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ImplLoc {
-    pub container: ModuleId,
-    pub ast_id: AstId<ast::ImplBlock>,
-}
-
-impl Intern for ImplLoc {
-    type ID = ImplId;
-    fn intern(self, db: &impl db::DefDatabase) -> ImplId {
-        db.intern_impl(self)
-    }
-}
-
-impl Lookup for ImplId {
-    type Data = ImplLoc;
-    fn lookup(&self, db: &impl db::DefDatabase) -> ImplLoc {
-        db.lookup_intern_impl(*self)
-    }
-}
+type ImplLoc = ItemLoc<ast::ImplBlock>;
+impl_intern!(ImplId, ImplLoc, intern_impl, lookup_intern_impl);
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct TypeParamId {
@@ -379,7 +360,7 @@ impl HasModule for AssocContainerId {
     fn module(&self, db: &impl db::DefDatabase) -> ModuleId {
         match *self {
             AssocContainerId::ContainerId(it) => it.module(db),
-            AssocContainerId::ImplId(it) => it.lookup(db).container,
+            AssocContainerId::ImplId(it) => it.lookup(db).container.module(db),
             AssocContainerId::TraitId(it) => it.lookup(db).container.module(db),
         }
     }
@@ -431,7 +412,7 @@ impl HasModule for GenericDefId {
             GenericDefId::AdtId(it) => it.module(db),
             GenericDefId::TraitId(it) => it.lookup(db).container.module(db),
             GenericDefId::TypeAliasId(it) => it.lookup(db).module(db),
-            GenericDefId::ImplId(it) => it.lookup(db).container,
+            GenericDefId::ImplId(it) => it.lookup(db).container.module(db),
             GenericDefId::EnumVariantId(it) => it.parent.lookup(db).container.module(db),
             GenericDefId::ConstId(it) => it.lookup(db).module(db),
         }
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs
index a1ea130e0..e68bf4868 100644
--- a/crates/ra_hir_def/src/nameres/collector.rs
+++ b/crates/ra_hir_def/src/nameres/collector.rs
@@ -661,9 +661,10 @@ where
                             krate: self.def_collector.def_map.krate,
                             local_id: self.module_id,
                         };
+                        let container = ContainerId::ModuleId(module);
                         let ast_id = self.raw_items[imp].ast_id;
                         let impl_id =
-                            ImplLoc { container: module, ast_id: AstId::new(self.file_id, ast_id) }
+                            ImplLoc { container, ast_id: AstId::new(self.file_id, ast_id) }
                                 .intern(self.def_collector.db);
                         self.def_collector.def_map.modules[self.module_id].impls.push(impl_id)
                     }
-- 
cgit v1.2.3