From 6294fd5ec9c6946bdd91f1274956c573f9f2a136 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 9 Nov 2019 15:34:00 +0300 Subject: Unfork struct and union ids --- crates/ra_hir_def/src/adt.rs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'crates/ra_hir_def/src/adt.rs') diff --git a/crates/ra_hir_def/src/adt.rs b/crates/ra_hir_def/src/adt.rs index 8f41e55d2..a29c4d41e 100644 --- a/crates/ra_hir_def/src/adt.rs +++ b/crates/ra_hir_def/src/adt.rs @@ -8,7 +8,7 @@ use ra_syntax::ast::{self, NameOwner, TypeAscriptionOwner}; use crate::{ db::DefDatabase2, type_ref::TypeRef, AstItemDef, EnumId, LocalEnumVariantId, - LocalStructFieldId, StructId, UnionId, + LocalStructFieldId, StructOrUnionId, }; /// Note that we use `StructData` for unions as well! @@ -49,15 +49,11 @@ pub struct StructFieldData { } impl StructData { - pub(crate) fn struct_data_query(db: &impl DefDatabase2, struct_: StructId) -> Arc { - let src = struct_.source(db); - let name = src.ast.name().map(|n| n.as_name()); - let variant_data = VariantData::new(src.ast.kind()); - let variant_data = Arc::new(variant_data); - Arc::new(StructData { name, variant_data }) - } - pub(crate) fn union_data_query(db: &impl DefDatabase2, struct_: UnionId) -> Arc { - let src = struct_.source(db); + pub(crate) fn struct_data_query( + db: &impl DefDatabase2, + id: StructOrUnionId, + ) -> Arc { + let src = id.source(db); let name = src.ast.name().map(|n| n.as_name()); let variant_data = VariantData::new(src.ast.kind()); let variant_data = Arc::new(variant_data); -- cgit v1.2.3