1 files changed, 16 insertions, 26 deletions

diff --git a/crates/ra_hir/src/generics.rs b/crates/ra_hir/src/generics.rs
index c76df0698..77fb76bfc 100644
--- a/crates/ra_hir/src/generics.rs
+++ b/crates/ra_hir/src/generics.rs
@@ -12,8 +12,8 @@ use crate::{
     name::SELF_TYPE,
     path::Path,
     type_ref::{TypeBound, TypeRef},
-    AdtDef, AsName, Container, Enum, EnumVariant, Function, HasSource, ImplBlock, Name, Struct,
-    Trait, TypeAlias, Union,
+    Adt, AsName, Container, Enum, EnumVariant, Function, HasSource, ImplBlock, Name, Struct, Trait,
+    TypeAlias, Union,
 };
 
 /// Data about a generic parameter (to a function, struct, impl, ...).
@@ -47,9 +47,7 @@ pub struct WherePredicate {
 #[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
 pub enum GenericDef {
     Function(Function),
-    Struct(Struct),
-    Union(Union),
-    Enum(Enum),
+    Adt(Adt),
     Trait(Trait),
     TypeAlias(TypeAlias),
     ImplBlock(ImplBlock),
@@ -57,7 +55,14 @@ pub enum GenericDef {
     // can, and this makes some code easier to write
     EnumVariant(EnumVariant),
 }
-impl_froms!(GenericDef: Function, Struct, Union, Enum, Trait, TypeAlias, ImplBlock, EnumVariant);
+impl_froms!(
+    GenericDef: Function,
+    Adt(Struct, Enum, Union),
+    Trait,
+    TypeAlias,
+    ImplBlock,
+    EnumVariant
+);
 
 impl GenericParams {
     pub(crate) fn generic_params_query(
@@ -69,10 +74,7 @@ impl GenericParams {
             GenericDef::Function(it) => it.container(db).map(GenericDef::from),
             GenericDef::TypeAlias(it) => it.container(db).map(GenericDef::from),
             GenericDef::EnumVariant(it) => Some(it.parent_enum(db).into()),
-            GenericDef::Struct(_)
-            | GenericDef::Union(_)
-            | GenericDef::Enum(_)
-            | GenericDef::Trait(_) => None,
+            GenericDef::Adt(_) | GenericDef::Trait(_) => None,
             GenericDef::ImplBlock(_) => None,
         };
         generics.parent_params = parent.map(|p| db.generic_params(p));
@@ -80,9 +82,9 @@ impl GenericParams {
         // FIXME: add `: Sized` bound for everything except for `Self` in traits
         match def {
             GenericDef::Function(it) => generics.fill(&it.source(db).ast, start),
-            GenericDef::Struct(it) => generics.fill(&it.source(db).ast, start),
-            GenericDef::Union(it) => generics.fill(&it.source(db).ast, start),
-            GenericDef::Enum(it) => generics.fill(&it.source(db).ast, start),
+            GenericDef::Adt(Adt::Struct(it)) => generics.fill(&it.source(db).ast, start),
+            GenericDef::Adt(Adt::Union(it)) => generics.fill(&it.source(db).ast, start),
+            GenericDef::Adt(Adt::Enum(it)) => generics.fill(&it.source(db).ast, start),
             GenericDef::Trait(it) => {
                 // traits get the Self type as an implicit first type parameter
                 generics.params.push(GenericParam { idx: start, name: SELF_TYPE, default: None });
@@ -186,9 +188,7 @@ impl GenericDef {
     pub(crate) fn resolver(&self, db: &impl HirDatabase) -> crate::Resolver {
         match self {
             GenericDef::Function(inner) => inner.resolver(db),
-            GenericDef::Struct(inner) => inner.resolver(db),
-            GenericDef::Union(inner) => inner.resolver(db),
-            GenericDef::Enum(inner) => inner.resolver(db),
+            GenericDef::Adt(adt) => adt.resolver(db),
             GenericDef::Trait(inner) => inner.resolver(db),
             GenericDef::TypeAlias(inner) => inner.resolver(db),
             GenericDef::ImplBlock(inner) => inner.resolver(db),
@@ -206,16 +206,6 @@ impl From<Container> for GenericDef {
     }
 }
 
-impl From<crate::adt::AdtDef> for GenericDef {
-    fn from(adt: crate::adt::AdtDef) -> Self {
-        match adt {
-            AdtDef::Struct(s) => s.into(),
-            AdtDef::Union(u) => u.into(),
-            AdtDef::Enum(e) => e.into(),
-        }
-    }
-}
-
 pub trait HasGenericParams: Copy {
     fn generic_params(self, db: &impl DefDatabase) -> Arc<GenericParams>;
 }