From e30c533eb67ba8a24708a94385849854c17e67f9 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 8 Jan 2019 15:19:37 +0300 Subject: move stuct to code_model_api --- crates/ra_hir/src/adt.rs | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) (limited to 'crates/ra_hir/src/adt.rs') diff --git a/crates/ra_hir/src/adt.rs b/crates/ra_hir/src/adt.rs index b75adda84..4b35c01b3 100644 --- a/crates/ra_hir/src/adt.rs +++ b/crates/ra_hir/src/adt.rs @@ -4,41 +4,25 @@ use ra_db::Cancelable; use ra_syntax::ast::{self, NameOwner, StructFlavor}; use crate::{ - DefId, Name, AsName, + DefId, Name, AsName, Struct, db::HirDatabase, type_ref::TypeRef, }; -pub struct Struct { - def_id: DefId, -} - impl Struct { pub(crate) fn new(def_id: DefId) -> Self { Struct { def_id } } - pub fn def_id(&self) -> DefId { - self.def_id - } - - pub fn variant_data(&self, db: &impl HirDatabase) -> Cancelable> { - Ok(db.struct_data(self.def_id)?.variant_data.clone()) - } - - pub fn struct_data(&self, db: &impl HirDatabase) -> Cancelable> { + pub(crate) fn struct_data(&self, db: &impl HirDatabase) -> Cancelable> { Ok(db.struct_data(self.def_id)?) } - - pub fn name(&self, db: &impl HirDatabase) -> Cancelable> { - Ok(db.struct_data(self.def_id)?.name.clone()) - } } #[derive(Debug, Clone, PartialEq, Eq)] pub struct StructData { - name: Option, - variant_data: Arc, + pub(crate) name: Option, + pub(crate) variant_data: Arc, } impl StructData { -- cgit v1.2.3 From 2d4dc22af8db8f9ebb5f2e95cd25c473494a4b70 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 8 Jan 2019 15:22:57 +0300 Subject: move enum to code_model_api --- crates/ra_hir/src/adt.rs | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) (limited to 'crates/ra_hir/src/adt.rs') 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> { - 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> { - Ok(db.enum_data(self.def_id)?.name.clone()) - } - - pub fn variants(&self, db: &impl HirDatabase) -> Cancelable)>> { - Ok(db.enum_data(self.def_id)?.variants.clone()) - } } #[derive(Debug, Clone, PartialEq, Eq)] pub struct EnumData { - name: Option, - variants: Vec<(Name, Arc)>, + pub(crate) name: Option, + pub(crate) variants: Vec<(Name, Arc)>, } impl EnumData { -- cgit v1.2.3 From 2d0ab52212f62345ba9f9d5040c553e59460b349 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 8 Jan 2019 15:27:00 +0300 Subject: move variants to API --- crates/ra_hir/src/adt.rs | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) (limited to 'crates/ra_hir/src/adt.rs') diff --git a/crates/ra_hir/src/adt.rs b/crates/ra_hir/src/adt.rs index 935f39959..58deea1c7 100644 --- a/crates/ra_hir/src/adt.rs +++ b/crates/ra_hir/src/adt.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use ra_syntax::ast::{self, NameOwner, StructFlavor}; use crate::{ - DefId, Name, AsName, Struct, Enum, + DefId, Name, AsName, Struct, Enum, VariantData, StructField, type_ref::TypeRef, }; @@ -67,30 +67,6 @@ impl EnumData { } } -/// A single field of an enum variant or struct -#[derive(Debug, Clone, PartialEq, Eq)] -pub struct StructField { - name: Name, - type_ref: TypeRef, -} - -impl StructField { - pub fn name(&self) -> Name { - self.name.clone() - } - pub fn type_ref(&self) -> &TypeRef { - &self.type_ref - } -} - -/// Fields of an enum variant or struct -#[derive(Debug, Clone, PartialEq, Eq)] -pub enum VariantData { - Struct(Vec), - Tuple(Vec), - Unit, -} - impl VariantData { pub fn new(flavor: StructFlavor) -> Self { match flavor { @@ -122,8 +98,8 @@ impl VariantData { pub(crate) fn get_field_type_ref(&self, field_name: &Name) -> Option<&TypeRef> { self.fields() .iter() - .find(|f| f.name == *field_name) - .map(|f| &f.type_ref) + .find(|f| f.name() == field_name) + .map(|f| f.type_ref()) } pub fn fields(&self) -> &[StructField] { -- cgit v1.2.3 From 64f202bdd7f74b081e08f2b5faee4bd91c9b44a8 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 8 Jan 2019 15:32:27 +0300 Subject: move variant public api to api --- crates/ra_hir/src/adt.rs | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) (limited to 'crates/ra_hir/src/adt.rs') diff --git a/crates/ra_hir/src/adt.rs b/crates/ra_hir/src/adt.rs index 58deea1c7..d56570754 100644 --- a/crates/ra_hir/src/adt.rs +++ b/crates/ra_hir/src/adt.rs @@ -26,14 +26,6 @@ impl StructData { let variant_data = Arc::new(variant_data); StructData { name, variant_data } } - - pub fn name(&self) -> Option<&Name> { - self.name.as_ref() - } - - pub fn variant_data(&self) -> &Arc { - &self.variant_data - } } impl Enum { @@ -68,7 +60,7 @@ impl EnumData { } impl VariantData { - pub fn new(flavor: StructFlavor) -> Self { + pub(crate) fn new(flavor: StructFlavor) -> Self { match flavor { StructFlavor::Tuple(fl) => { let fields = fl @@ -101,29 +93,4 @@ impl VariantData { .find(|f| f.name() == field_name) .map(|f| f.type_ref()) } - - pub fn fields(&self) -> &[StructField] { - match *self { - VariantData::Struct(ref fields) | VariantData::Tuple(ref fields) => fields, - _ => &[], - } - } - pub fn is_struct(&self) -> bool { - match self { - VariantData::Struct(..) => true, - _ => false, - } - } - pub fn is_tuple(&self) -> bool { - match self { - VariantData::Tuple(..) => true, - _ => false, - } - } - pub fn is_unit(&self) -> bool { - match self { - VariantData::Unit => true, - _ => false, - } - } } -- cgit v1.2.3 From 5edcf313f6b265c626b75f92c11fe62385ab9556 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 8 Jan 2019 15:38:29 +0300 Subject: move query impls to adt --- crates/ra_hir/src/adt.rs | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) (limited to 'crates/ra_hir/src/adt.rs') diff --git a/crates/ra_hir/src/adt.rs b/crates/ra_hir/src/adt.rs index d56570754..8639bbd5c 100644 --- a/crates/ra_hir/src/adt.rs +++ b/crates/ra_hir/src/adt.rs @@ -1,9 +1,10 @@ use std::sync::Arc; -use ra_syntax::ast::{self, NameOwner, StructFlavor}; +use ra_db::Cancelable; +use ra_syntax::ast::{self, NameOwner, StructFlavor, AstNode}; use crate::{ - DefId, Name, AsName, Struct, Enum, VariantData, StructField, + DefId, Name, AsName, Struct, Enum, VariantData, StructField, HirDatabase, DefKind, type_ref::TypeRef, }; @@ -20,12 +21,24 @@ pub struct StructData { } impl StructData { - pub(crate) fn new(struct_def: &ast::StructDef) -> StructData { + fn new(struct_def: &ast::StructDef) -> StructData { let name = struct_def.name().map(|n| n.as_name()); let variant_data = VariantData::new(struct_def.flavor()); let variant_data = Arc::new(variant_data); StructData { name, variant_data } } + + pub(crate) fn struct_data_query( + db: &impl HirDatabase, + def_id: DefId, + ) -> Cancelable> { + let def_loc = def_id.loc(db); + assert!(def_loc.kind == DefKind::Struct); + let syntax = db.file_item(def_loc.source_item_id); + let struct_def = + ast::StructDef::cast(&syntax).expect("struct def should point to StructDef node"); + Ok(Arc::new(StructData::new(struct_def))) + } } impl Enum { @@ -41,7 +54,7 @@ pub struct EnumData { } impl EnumData { - pub(crate) fn new(enum_def: &ast::EnumDef) -> Self { + fn new(enum_def: &ast::EnumDef) -> Self { let name = enum_def.name().map(|n| n.as_name()); let variants = if let Some(evl) = enum_def.variant_list() { evl.variants() @@ -57,6 +70,17 @@ impl EnumData { }; EnumData { name, variants } } + + pub(crate) fn enum_data_query( + db: &impl HirDatabase, + def_id: DefId, + ) -> Cancelable> { + let def_loc = def_id.loc(db); + assert!(def_loc.kind == DefKind::Enum); + let syntax = db.file_item(def_loc.source_item_id); + let enum_def = ast::EnumDef::cast(&syntax).expect("enum def should point to EnumDef node"); + Ok(Arc::new(EnumData::new(enum_def))) + } } impl VariantData { -- cgit v1.2.3 From 54e5c4f0859ecbac0762051ca680a567c67cff6f Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 8 Jan 2019 15:40:02 +0300 Subject: minimize visibility --- crates/ra_hir/src/adt.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/ra_hir/src/adt.rs') diff --git a/crates/ra_hir/src/adt.rs b/crates/ra_hir/src/adt.rs index 8639bbd5c..602e7db74 100644 --- a/crates/ra_hir/src/adt.rs +++ b/crates/ra_hir/src/adt.rs @@ -84,7 +84,7 @@ impl EnumData { } impl VariantData { - pub(crate) fn new(flavor: StructFlavor) -> Self { + fn new(flavor: StructFlavor) -> Self { match flavor { StructFlavor::Tuple(fl) => { let fields = fl -- cgit v1.2.3