1 files changed, 3 insertions, 25 deletions

diff --git a/crates/ra_hir/src/adt.rs b/crates/ra_hir/src/adt.rs
index 4b35c01b3..935f39959 100644
--- a/crates/ra_hir/src/adt.rs
+++ b/crates/ra_hir/src/adt.rs
@@ -1,11 +1,9 @@
 use std::sync::Arc;
 
-use ra_db::Cancelable;
 use ra_syntax::ast::{self, NameOwner, StructFlavor};
 
 use crate::{
-    DefId, Name, AsName, Struct,
-    db::HirDatabase,
+    DefId, Name, AsName, Struct, Enum,
     type_ref::TypeRef,
 };
 
@@ -13,10 +11,6 @@ impl Struct {
     pub(crate) fn new(def_id: DefId) -> Self {
         Struct { def_id }
     }
-
-    pub(crate) fn struct_data(&self, db: &impl HirDatabase) -> Cancelable<Arc<StructData>> {
-        Ok(db.struct_data(self.def_id)?)
-    }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -42,32 +36,16 @@ impl StructData {
     }
 }
 
-pub struct Enum {
-    def_id: DefId,
-}
-
 impl Enum {
     pub(crate) fn new(def_id: DefId) -> Self {
         Enum { def_id }
     }
-
-    pub fn def_id(&self) -> DefId {
-        self.def_id
-    }
-
-    pub fn name(&self, db: &impl HirDatabase) -> Cancelable<Option<Name>> {
-        Ok(db.enum_data(self.def_id)?.name.clone())
-    }
-
-    pub fn variants(&self, db: &impl HirDatabase) -> Cancelable<Vec<(Name, Arc<VariantData>)>> {
-        Ok(db.enum_data(self.def_id)?.variants.clone())
-    }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct EnumData {
-    name: Option<Name>,
-    variants: Vec<(Name, Arc<VariantData>)>,
+    pub(crate) name: Option<Name>,
+    pub(crate) variants: Vec<(Name, Arc<VariantData>)>,
 }
 
 impl EnumData {