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_ide_db/src/defs.rs | 22 +++++++++++----------- crates/ra_ide_db/src/search.rs | 12 ++++++------ 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'crates/ra_ide_db/src') diff --git a/crates/ra_ide_db/src/defs.rs b/crates/ra_ide_db/src/defs.rs index 785613b82..7cd2384e9 100644 --- a/crates/ra_ide_db/src/defs.rs +++ b/crates/ra_ide_db/src/defs.rs @@ -6,8 +6,8 @@ // FIXME: this badly needs rename/rewrite (matklad, 2020-02-06). use hir::{ - HasVisibility, ImplDef, Local, MacroDef, Module, ModuleDef, Name, PathResolution, Semantics, - StructField, TypeParam, Visibility, + Field, HasVisibility, ImplDef, Local, MacroDef, Module, ModuleDef, Name, PathResolution, + Semantics, TypeParam, Visibility, }; use ra_prof::profile; use ra_syntax::{ @@ -22,7 +22,7 @@ use crate::RootDatabase; #[derive(Debug, PartialEq, Eq)] pub enum Definition { Macro(MacroDef), - StructField(StructField), + Field(Field), ModuleDef(ModuleDef), SelfType(ImplDef), Local(Local), @@ -33,7 +33,7 @@ impl Definition { pub fn module(&self, db: &RootDatabase) -> Option { match self { Definition::Macro(it) => it.module(db), - Definition::StructField(it) => Some(it.parent_def(db).module(db)), + Definition::Field(it) => Some(it.parent_def(db).module(db)), Definition::ModuleDef(it) => it.module(db), Definition::SelfType(it) => Some(it.module(db)), Definition::Local(it) => Some(it.module(db)), @@ -46,7 +46,7 @@ impl Definition { match self { Definition::Macro(_) => None, - Definition::StructField(sf) => Some(sf.visibility(db)), + Definition::Field(sf) => Some(sf.visibility(db)), Definition::ModuleDef(def) => module?.visibility_of(db, def), Definition::SelfType(_) => None, Definition::Local(_) => None, @@ -57,7 +57,7 @@ impl Definition { pub fn name(&self, db: &RootDatabase) -> Option { let name = match self { Definition::Macro(it) => it.name(db)?, - Definition::StructField(it) => it.name(db), + Definition::Field(it) => it.name(db), Definition::ModuleDef(def) => match def { hir::ModuleDef::Module(it) => it.name(db)?, hir::ModuleDef::Function(it) => it.name(db), @@ -124,8 +124,8 @@ fn classify_name_inner(sema: &Semantics, name: &ast::Name) -> Opti Some(Definition::Local(local)) }, ast::RecordFieldDef(it) => { - let field: hir::StructField = sema.to_def(&it)?; - Some(Definition::StructField(field)) + let field: hir::Field = sema.to_def(&it)?; + Some(Definition::Field(field)) }, ast::Module(it) => { let def = sema.to_def(&it)?; @@ -213,7 +213,7 @@ pub fn classify_name_ref( if let Some(field_expr) = ast::FieldExpr::cast(parent.clone()) { tested_by!(goto_def_for_fields; force); if let Some(field) = sema.resolve_field(&field_expr) { - return Some(NameRefClass::Definition(Definition::StructField(field))); + return Some(NameRefClass::Definition(Definition::Field(field))); } } @@ -221,7 +221,7 @@ pub fn classify_name_ref( tested_by!(goto_def_for_record_fields; force); tested_by!(goto_def_for_field_init_shorthand; force); if let Some((field, local)) = sema.resolve_record_field(&record_field) { - let field = Definition::StructField(field); + let field = Definition::Field(field); let res = match local { None => NameRefClass::Definition(field), Some(local) => NameRefClass::FieldShorthand { field, local }, @@ -233,7 +233,7 @@ pub fn classify_name_ref( if let Some(record_field_pat) = ast::RecordFieldPat::cast(parent.clone()) { tested_by!(goto_def_for_record_field_pats; force); if let Some(field) = sema.resolve_record_field_pat(&record_field_pat) { - let field = Definition::StructField(field); + let field = Definition::Field(field); return Some(NameRefClass::Definition(field)); } } diff --git a/crates/ra_ide_db/src/search.rs b/crates/ra_ide_db/src/search.rs index 596f957b8..b464959fc 100644 --- a/crates/ra_ide_db/src/search.rs +++ b/crates/ra_ide_db/src/search.rs @@ -28,8 +28,8 @@ pub struct Reference { #[derive(Debug, Clone, PartialEq)] pub enum ReferenceKind { - StructFieldShorthandForField, - StructFieldShorthandForLocal, + FieldShorthandForField, + FieldShorthandForLocal, StructLiteral, Other, } @@ -242,14 +242,14 @@ impl Definition { } Some(NameRefClass::FieldShorthand { local, field }) => { match self { - Definition::StructField(_) if &field == self => refs.push(Reference { + Definition::Field(_) if &field == self => refs.push(Reference { file_range: sema.original_range(name_ref.syntax()), - kind: ReferenceKind::StructFieldShorthandForField, + kind: ReferenceKind::FieldShorthandForField, access: reference_access(&field, &name_ref), }), Definition::Local(l) if &local == l => refs.push(Reference { file_range: sema.original_range(name_ref.syntax()), - kind: ReferenceKind::StructFieldShorthandForLocal, + kind: ReferenceKind::FieldShorthandForLocal, access: reference_access(&Definition::Local(local), &name_ref), }), @@ -267,7 +267,7 @@ impl Definition { fn reference_access(def: &Definition, name_ref: &ast::NameRef) -> Option { // Only Locals and Fields have accesses for now. match def { - Definition::Local(_) | Definition::StructField(_) => {} + Definition::Local(_) | Definition::Field(_) => {} _ => return None, }; -- cgit v1.2.3