From 970dbf871795650ecf49b7198d53bdcad9c612af Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 25 Apr 2020 14:23:34 +0200 Subject: Rename StructField -> Field --- crates/ra_hir_def/src/adt.rs | 22 +++++++++++----------- crates/ra_hir_def/src/attr.rs | 2 +- crates/ra_hir_def/src/child_by_source.rs | 6 +++--- crates/ra_hir_def/src/docs.rs | 2 +- crates/ra_hir_def/src/keys.rs | 6 +++--- crates/ra_hir_def/src/lib.rs | 10 +++++----- 6 files changed, 24 insertions(+), 24 deletions(-) (limited to 'crates/ra_hir_def/src') diff --git a/crates/ra_hir_def/src/adt.rs b/crates/ra_hir_def/src/adt.rs index 7c0d93691..753becc3d 100644 --- a/crates/ra_hir_def/src/adt.rs +++ b/crates/ra_hir_def/src/adt.rs @@ -14,7 +14,7 @@ use ra_syntax::ast::{self, NameOwner, TypeAscriptionOwner, VisibilityOwner}; use crate::{ body::CfgExpander, db::DefDatabase, src::HasChildSource, src::HasSource, trace::Trace, type_ref::TypeRef, visibility::RawVisibility, EnumId, HasModule, LocalEnumVariantId, - LocalStructFieldId, Lookup, ModuleId, StructId, UnionId, VariantId, + LocalFieldId, Lookup, ModuleId, StructId, UnionId, VariantId, }; /// Note that we use `StructData` for unions as well! @@ -38,14 +38,14 @@ pub struct EnumVariantData { #[derive(Debug, Clone, PartialEq, Eq)] pub enum VariantData { - Record(Arena), - Tuple(Arena), + Record(Arena), + Tuple(Arena), Unit, } /// A single field of an enum variant or struct #[derive(Debug, Clone, PartialEq, Eq)] -pub struct StructFieldData { +pub struct FieldData { pub name: Name, pub type_ref: TypeRef, pub visibility: RawVisibility, @@ -133,15 +133,15 @@ impl VariantData { } } - pub fn fields(&self) -> &Arena { - const EMPTY: &Arena = &Arena::new(); + pub fn fields(&self) -> &Arena { + const EMPTY: &Arena = &Arena::new(); match &self { VariantData::Record(fields) | VariantData::Tuple(fields) => fields, _ => EMPTY, } } - pub fn field(&self, name: &Name) -> Option { + pub fn field(&self, name: &Name) -> Option { self.fields().iter().find_map(|(id, data)| if &data.name == name { Some(id) } else { None }) } @@ -155,7 +155,7 @@ impl VariantData { } impl HasChildSource for VariantId { - type ChildId = LocalStructFieldId; + type ChildId = LocalFieldId; type Value = Either; fn child_source(&self, db: &dyn DefDatabase) -> InFile> { @@ -195,7 +195,7 @@ pub enum StructKind { fn lower_struct( db: &dyn DefDatabase, expander: &mut CfgExpander, - trace: &mut Trace>, + trace: &mut Trace>, ast: &InFile, ) -> StructKind { match &ast.value { @@ -208,7 +208,7 @@ fn lower_struct( trace.alloc( || Either::Left(fd.clone()), - || StructFieldData { + || FieldData { name: Name::new_tuple_field(i), type_ref: TypeRef::from_ast_opt(fd.type_ref()), visibility: RawVisibility::from_ast(db, ast.with_value(fd.visibility())), @@ -226,7 +226,7 @@ fn lower_struct( trace.alloc( || Either::Right(fd.clone()), - || StructFieldData { + || FieldData { name: fd.name().map(|n| n.as_name()).unwrap_or_else(Name::missing), type_ref: TypeRef::from_ast_opt(fd.ascribed_type()), visibility: RawVisibility::from_ast(db, ast.with_value(fd.visibility())), diff --git a/crates/ra_hir_def/src/attr.rs b/crates/ra_hir_def/src/attr.rs index 2f2e3e5ba..714a66b02 100644 --- a/crates/ra_hir_def/src/attr.rs +++ b/crates/ra_hir_def/src/attr.rs @@ -43,7 +43,7 @@ impl Attrs { }; Attrs::from_attrs_owner(db, src.as_ref().map(|it| it as &dyn AttrsOwner)) } - AttrDefId::StructFieldId(it) => { + AttrDefId::FieldId(it) => { let src = it.parent.child_source(db); match &src.value[it.local_id] { Either::Left(_tuple) => Attrs::default(), diff --git a/crates/ra_hir_def/src/child_by_source.rs b/crates/ra_hir_def/src/child_by_source.rs index 7009f21d1..a885ec96d 100644 --- a/crates/ra_hir_def/src/child_by_source.rs +++ b/crates/ra_hir_def/src/child_by_source.rs @@ -12,8 +12,8 @@ use crate::{ item_scope::ItemScope, keys, src::{HasChildSource, HasSource}, - AdtId, AssocItemId, DefWithBodyId, EnumId, EnumVariantId, ImplId, Lookup, ModuleDefId, - ModuleId, StructFieldId, TraitId, VariantId, + AdtId, AssocItemId, DefWithBodyId, EnumId, EnumVariantId, FieldId, ImplId, Lookup, ModuleDefId, + ModuleId, TraitId, VariantId, }; pub trait ChildBySource { @@ -140,7 +140,7 @@ impl ChildBySource for VariantId { let arena_map = self.child_source(db); let arena_map = arena_map.as_ref(); for (local_id, source) in arena_map.value.iter() { - let id = StructFieldId { parent: *self, local_id }; + let id = FieldId { parent: *self, local_id }; match source { Either::Left(source) => { res[keys::TUPLE_FIELD].insert(arena_map.with_value(source.clone()), id) diff --git a/crates/ra_hir_def/src/docs.rs b/crates/ra_hir_def/src/docs.rs index 0539a77d4..b221ae1ce 100644 --- a/crates/ra_hir_def/src/docs.rs +++ b/crates/ra_hir_def/src/docs.rs @@ -43,7 +43,7 @@ impl Documentation { let src = def_map[module.local_id].declaration_source(db)?; docs_from_ast(&src.value) } - AttrDefId::StructFieldId(it) => { + AttrDefId::FieldId(it) => { let src = it.parent.child_source(db); match &src.value[it.local_id] { Either::Left(_tuple) => None, diff --git a/crates/ra_hir_def/src/keys.rs b/crates/ra_hir_def/src/keys.rs index 8cd70eb9a..a7349a21d 100644 --- a/crates/ra_hir_def/src/keys.rs +++ b/crates/ra_hir_def/src/keys.rs @@ -8,7 +8,7 @@ use rustc_hash::FxHashMap; use crate::{ dyn_map::{DynMap, Policy}, - ConstId, EnumId, EnumVariantId, FunctionId, ImplId, StaticId, StructFieldId, StructId, TraitId, + ConstId, EnumId, EnumVariantId, FieldId, FunctionId, ImplId, StaticId, StructId, TraitId, TypeAliasId, TypeParamId, UnionId, }; @@ -25,8 +25,8 @@ pub const UNION: Key = Key::new(); pub const ENUM: Key = Key::new(); pub const ENUM_VARIANT: Key = Key::new(); -pub const TUPLE_FIELD: Key = Key::new(); -pub const RECORD_FIELD: Key = Key::new(); +pub const TUPLE_FIELD: Key = Key::new(); +pub const RECORD_FIELD: Key = Key::new(); pub const TYPE_PARAM: Key = Key::new(); pub const MACRO: Key = Key::new(); diff --git a/crates/ra_hir_def/src/lib.rs b/crates/ra_hir_def/src/lib.rs index 2d27bbdf8..518772e8a 100644 --- a/crates/ra_hir_def/src/lib.rs +++ b/crates/ra_hir_def/src/lib.rs @@ -133,12 +133,12 @@ pub struct EnumVariantId { pub type LocalEnumVariantId = Idx; #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] -pub struct StructFieldId { +pub struct FieldId { pub parent: VariantId, - pub local_id: LocalStructFieldId, + pub local_id: LocalFieldId, } -pub type LocalStructFieldId = Idx; +pub type LocalFieldId = Idx; #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] pub struct ConstId(salsa::InternId); @@ -299,7 +299,7 @@ impl From for GenericDefId { #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] pub enum AttrDefId { ModuleId(ModuleId), - StructFieldId(StructFieldId), + FieldId(FieldId), AdtId(AdtId), FunctionId(FunctionId), EnumVariantId(EnumVariantId), @@ -313,7 +313,7 @@ pub enum AttrDefId { impl_froms!( AttrDefId: ModuleId, - StructFieldId, + FieldId, AdtId(StructId, EnumId, UnionId), EnumVariantId, StaticId, -- cgit v1.2.3