2 files changed, 15 insertions, 41 deletions

diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index c5539e076..a132d128b 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -432,15 +432,16 @@ impl Adt {
         }
     }
 
+    pub fn module(self, db: &impl DefDatabase) -> Module {
+        match self {
+            Adt::Struct(s) => s.module(db),
+            Adt::Union(s) => s.module(db),
+            Adt::Enum(e) => e.module(db),
+        }
+    }
+
     pub fn krate(self, db: &impl HirDatabase) -> Option<Crate> {
-        Some(
-            match self {
-                Adt::Struct(s) => s.module(db),
-                Adt::Union(s) => s.module(db),
-                Adt::Enum(e) => e.module(db),
-            }
-            .krate(),
-        )
+        Some(self.module(db).krate())
     }
 }
 
diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
index b8e1b4dad..eca8e0596 100644
--- a/crates/ra_hir/src/resolve.rs
+++ b/crates/ra_hir/src/resolve.rs
@@ -16,7 +16,7 @@ use crate::{
     expr::{ExprScopes, PatId, ScopeId},
     generics::{GenericParams, HasGenericParams},
     Adt, Const, Container, DefWithBody, Enum, EnumVariant, Function, GenericDef, ImplBlock, Local,
-    MacroDef, Module, ModuleDef, PerNs, Static, Struct, Trait, TypeAlias, Union,
+    MacroDef, Module, ModuleDef, PerNs, Static, Struct, Trait, TypeAlias,
 };
 
 #[derive(Debug, Clone, Default)]
@@ -505,40 +505,13 @@ impl HasResolver for Trait {
     }
 }
 
-impl HasResolver for Struct {
+impl<T: Into<Adt>> HasResolver for T {
     fn resolver(self, db: &impl DefDatabase) -> Resolver {
-        self.module(db)
-            .resolver(db)
-            .push_generic_params_scope(db, self.into())
-            .push_scope(Scope::AdtScope(self.into()))
-    }
-}
-
-impl HasResolver for Union {
-    fn resolver(self, db: &impl DefDatabase) -> Resolver {
-        self.module(db)
-            .resolver(db)
-            .push_generic_params_scope(db, self.into())
-            .push_scope(Scope::AdtScope(self.into()))
-    }
-}
-
-impl HasResolver for Enum {
-    fn resolver(self, db: &impl DefDatabase) -> Resolver {
-        self.module(db)
+        let def = self.into();
+        def.module(db)
             .resolver(db)
-            .push_generic_params_scope(db, self.into())
-            .push_scope(Scope::AdtScope(self.into()))
-    }
-}
-
-impl HasResolver for Adt {
-    fn resolver(self, db: &impl DefDatabase) -> Resolver {
-        match self {
-            Adt::Struct(it) => it.resolver(db),
-            Adt::Union(it) => it.resolver(db),
-            Adt::Enum(it) => it.resolver(db),
-        }
+            .push_generic_params_scope(db, def.into())
+            .push_scope(Scope::AdtScope(def))
     }
 }