From ee95a35664e6fe9153f6324cfc57872ca365887c Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 20 Nov 2019 17:49:57 +0300
Subject: Don't duplicate ContainerId type

---
 crates/ra_hir_def/src/lib.rs | 37 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

(limited to 'crates/ra_hir_def/src/lib.rs')

diff --git a/crates/ra_hir_def/src/lib.rs b/crates/ra_hir_def/src/lib.rs
index 6052370b4..da6506fcd 100644
--- a/crates/ra_hir_def/src/lib.rs
+++ b/crates/ra_hir_def/src/lib.rs
@@ -201,7 +201,7 @@ impl_intern_key!(FunctionId);
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct FunctionLoc {
-    pub container: FunctionContainerId,
+    pub container: ContainerId,
     pub ast_id: AstId<ast::FnDef>,
 }
 
@@ -219,13 +219,6 @@ impl Lookup for FunctionId {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum FunctionContainerId {
-    ModuleId(ModuleId),
-    ImplId(ImplId),
-    TraitId(TraitId),
-}
-
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct StructOrUnionId(salsa::InternId);
 impl_intern_key!(StructOrUnionId);
@@ -335,7 +328,7 @@ impl_intern_key!(TypeAliasId);
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TypeAliasLoc {
-    pub container: TypeAliasContainerId,
+    pub container: ContainerId,
     pub ast_id: AstId<ast::TypeAliasDef>,
 }
 
@@ -353,13 +346,6 @@ impl Lookup for TypeAliasId {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum TypeAliasContainerId {
-    ModuleId(ModuleId),
-    ImplId(ImplId),
-    TraitId(TraitId),
-}
-
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct ImplId(salsa::InternId);
 impl_intern_key!(ImplId);
@@ -391,6 +377,13 @@ macro_rules! impl_froms {
     }
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum ContainerId {
+    ModuleId(ModuleId),
+    ImplId(ImplId),
+    TraitId(TraitId),
+}
+
 /// A Data Type
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub enum AdtId {
@@ -488,9 +481,9 @@ pub trait HasModule {
 impl HasModule for FunctionLoc {
     fn module(&self, db: &impl db::DefDatabase2) -> ModuleId {
         match self.container {
-            FunctionContainerId::ModuleId(it) => it,
-            FunctionContainerId::ImplId(it) => it.module(db),
-            FunctionContainerId::TraitId(it) => it.module(db),
+            ContainerId::ModuleId(it) => it,
+            ContainerId::ImplId(it) => it.module(db),
+            ContainerId::TraitId(it) => it.module(db),
         }
     }
 }
@@ -498,9 +491,9 @@ impl HasModule for FunctionLoc {
 impl HasModule for TypeAliasLoc {
     fn module(&self, db: &impl db::DefDatabase2) -> ModuleId {
         match self.container {
-            TypeAliasContainerId::ModuleId(it) => it,
-            TypeAliasContainerId::ImplId(it) => it.module(db),
-            TypeAliasContainerId::TraitId(it) => it.module(db),
+            ContainerId::ModuleId(it) => it,
+            ContainerId::ImplId(it) => it.module(db),
+            ContainerId::TraitId(it) => it.module(db),
         }
     }
 }
-- 
cgit v1.2.3