language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 22:31:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

move enum to code_model_api

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-08 15:22:57 +03:00
parent e30c533eb6
commit 2d4dc22af8
3 changed files with 26 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crates/ra_hir/src/adt.rs
View file

@ -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 {