Skip to content

Commit 0598182

Browse files
bors[bot]matklad
bors[bot]
and
matklad
authored
Merge #4135
4135: Rename StructField -> Field r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
2 parents 7bc7173 + 970dbf8 commit 0598182

File tree

27 files changed

+132
-148
lines changed

27 files changed

+132
-148
lines changed

‎crates/ra_hir/src/code_model.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ use hir_def::{
1313
resolver::{HasResolver, Resolver},
1414
type_ref::{Mutability, TypeRef},
1515
AdtId, AssocContainerId, ConstId, DefWithBodyId, EnumId, FunctionId, GenericDefId, HasModule,
16-
ImplId, LocalEnumVariantId, LocalModuleId, LocalStructFieldId, Lookup, ModuleId, StaticId,
17-
StructId, TraitId, TypeAliasId, TypeParamId, UnionId,
16+
ImplId, LocalEnumVariantId, LocalFieldId, LocalModuleId, Lookup, ModuleId, StaticId, StructId,
17+
TraitId, TypeAliasId, TypeParamId, UnionId,
1818
};
1919
use hir_expand::{
2020
diagnostics::DiagnosticSink,
@@ -294,9 +294,9 @@ impl Module {
294294
}
295295

296296
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
297-
pub struct StructField {
297+
pub struct Field {
298298
pub(crate) parent: VariantDef,
299-
pub(crate) id: LocalStructFieldId,
299+
pub(crate) id: LocalFieldId,
300300
}
301301

302302
#[derive(Debug, PartialEq, Eq)]
@@ -305,7 +305,7 @@ pub enum FieldSource {
305305
Pos(ast::TupleFieldDef),
306306
}
307307

308-
impl StructField {
308+
impl Field {
309309
pub fn name(&self, db: &dyn HirDatabase) -> Name {
310310
self.parent.variant_data(db).fields()[self.id].name.clone()
311311
}
@@ -331,7 +331,7 @@ impl StructField {
331331
}
332332
}
333333

334-
impl HasVisibility for StructField {
334+
impl HasVisibility for Field {
335335
fn visibility(&self, db: &dyn HirDatabase) -> Visibility {
336336
let variant_data = self.parent.variant_data(db);
337337
let visibility = &variant_data.fields()[self.id].visibility;
@@ -358,12 +358,12 @@ impl Struct {
358358
db.struct_data(self.id).name.clone()
359359
}
360360

361-
pub fn fields(self, db: &dyn HirDatabase) -> Vec<StructField> {
361+
pub fn fields(self, db: &dyn HirDatabase) -> Vec<Field> {
362362
db.struct_data(self.id)
363363
.variant_data
364364
.fields()
365365
.iter()
366-
.map(|(id, _)| StructField { parent: self.into(), id })
366+
.map(|(id, _)| Field { parent: self.into(), id })
367367
.collect()
368368
}
369369

@@ -394,12 +394,12 @@ impl Union {
394394
Type::from_def(db, self.id.lookup(db.upcast()).container.module(db.upcast()).krate, self.id)
395395
}
396396

397-
pub fn fields(self, db: &dyn HirDatabase) -> Vec<StructField> {
397+
pub fn fields(self, db: &dyn HirDatabase) -> Vec<Field> {
398398
db.union_data(self.id)
399399
.variant_data
400400
.fields()
401401
.iter()
402-
.map(|(id, _)| StructField { parent: self.into(), id })
402+
.map(|(id, _)| Field { parent: self.into(), id })
403403
.collect()
404404
}
405405

@@ -457,11 +457,11 @@ impl EnumVariant {
457457
db.enum_data(self.parent.id).variants[self.id].name.clone()
458458
}
459459

460-
pub fn fields(self, db: &dyn HirDatabase) -> Vec<StructField> {
460+
pub fn fields(self, db: &dyn HirDatabase) -> Vec<Field> {
461461
self.variant_data(db)
462462
.fields()
463463
.iter()
464-
.map(|(id, _)| StructField { parent: self.into(), id })
464+
.map(|(id, _)| Field { parent: self.into(), id })
465465
.collect()
466466
}
467467

@@ -527,7 +527,7 @@ pub enum VariantDef {
527527
impl_froms!(VariantDef: Struct, Union, EnumVariant);
528528

529529
impl VariantDef {
530-
pub fn fields(self, db: &dyn HirDatabase) -> Vec<StructField> {
530+
pub fn fields(self, db: &dyn HirDatabase) -> Vec<Field> {
531531
match self {
532532
VariantDef::Struct(it) => it.fields(db),
533533
VariantDef::Union(it) => it.fields(db),
@@ -1148,15 +1148,15 @@ impl Type {
11481148
}
11491149
}
11501150

1151-
pub fn fields(&self, db: &dyn HirDatabase) -> Vec<(StructField, Type)> {
1151+
pub fn fields(&self, db: &dyn HirDatabase) -> Vec<(Field, Type)> {
11521152
if let Ty::Apply(a_ty) = &self.ty.value {
11531153
if let TypeCtor::Adt(AdtId::StructId(s)) = a_ty.ctor {
11541154
let var_def = s.into();
11551155
return db
11561156
.field_types(var_def)
11571157
.iter()
11581158
.map(|(local_id, ty)| {
1159-
let def = StructField { parent: var_def.into(), id: local_id };
1159+
let def = Field { parent: var_def.into(), id: local_id };
11601160
let ty = ty.clone().subst(&a_ty.parameters);
11611161
(def, self.derived(ty))
11621162
})
@@ -1352,7 +1352,7 @@ impl ScopeDef {
13521352
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
13531353
pub enum AttrDef {
13541354
Module(Module),
1355-
StructField(StructField),
1355+
Field(Field),
13561356
Adt(Adt),
13571357
Function(Function),
13581358
EnumVariant(EnumVariant),
@@ -1365,7 +1365,7 @@ pub enum AttrDef {
13651365

13661366
impl_froms!(
13671367
AttrDef: Module,
1368-
StructField,
1368+
Field,
13691369
Adt(Struct, Enum, Union),
13701370
EnumVariant,
13711371
Static,

‎crates/ra_hir/src/from_id.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
//! are splitting the hir.
55
66
use hir_def::{
7-
expr::PatId, AdtId, AssocItemId, AttrDefId, DefWithBodyId, EnumVariantId, GenericDefId,
8-
ModuleDefId, StructFieldId, VariantId,
7+
expr::PatId, AdtId, AssocItemId, AttrDefId, DefWithBodyId, EnumVariantId, FieldId,
8+
GenericDefId, ModuleDefId, VariantId,
99
};
1010

1111
use crate::{
12-
code_model::ItemInNs, Adt, AssocItem, AttrDef, DefWithBody, EnumVariant, GenericDef, Local,
13-
MacroDef, ModuleDef, StructField, VariantDef,
12+
code_model::ItemInNs, Adt, AssocItem, AttrDef, DefWithBody, EnumVariant, Field, GenericDef,
13+
Local, MacroDef, ModuleDef, VariantDef,
1414
};
1515

1616
macro_rules! from_id {
@@ -184,23 +184,23 @@ impl From<VariantDef> for VariantId {
184184
}
185185
}
186186

187-
impl From<StructField> for StructFieldId {
188-
fn from(def: StructField) -> Self {
189-
StructFieldId { parent: def.parent.into(), local_id: def.id }
187+
impl From<Field> for FieldId {
188+
fn from(def: Field) -> Self {
189+
FieldId { parent: def.parent.into(), local_id: def.id }
190190
}
191191
}
192192

193-
impl From<StructFieldId> for StructField {
194-
fn from(def: StructFieldId) -> Self {
195-
StructField { parent: def.parent.into(), id: def.local_id }
193+
impl From<FieldId> for Field {
194+
fn from(def: FieldId) -> Self {
195+
Field { parent: def.parent.into(), id: def.local_id }
196196
}
197197
}
198198

199199
impl From<AttrDef> for AttrDefId {
200200
fn from(def: AttrDef) -> Self {
201201
match def {
202202
AttrDef::Module(it) => AttrDefId::ModuleId(it.id),
203-
AttrDef::StructField(it) => AttrDefId::StructFieldId(it.into()),
203+
AttrDef::Field(it) => AttrDefId::FieldId(it.into()),
204204
AttrDef::Adt(it) => AttrDefId::AdtId(it.into()),
205205
AttrDef::Function(it) => AttrDefId::FunctionId(it.id),
206206
AttrDef::EnumVariant(it) => AttrDefId::EnumVariantId(it.into()),

‎crates/ra_hir/src/has_source.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ use hir_def::{
99
use ra_syntax::ast;
1010

1111
use crate::{
12-
db::HirDatabase, Const, Enum, EnumVariant, FieldSource, Function, ImplDef, MacroDef, Module,
13-
Static, Struct, StructField, Trait, TypeAlias, TypeParam, Union,
12+
db::HirDatabase, Const, Enum, EnumVariant, Field, FieldSource, Function, ImplDef, MacroDef,
13+
Module, Static, Struct, Trait, TypeAlias, TypeParam, Union,
1414
};
1515

1616
pub use hir_expand::InFile;
@@ -37,7 +37,7 @@ impl Module {
3737
}
3838
}
3939

40-
impl HasSource for StructField {
40+
impl HasSource for Field {
4141
type Ast = FieldSource;
4242
fn source(self, db: &dyn HirDatabase) -> InFile<FieldSource> {
4343
let var = VariantId::from(self.parent);

‎crates/ra_hir/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ mod has_source;
5252
pub use crate::{
5353
code_model::{
5454
Adt, AsAssocItem, AssocItem, AssocItemContainer, AttrDef, Const, Crate, CrateDependency,
55-
DefWithBody, Docs, Enum, EnumVariant, FieldSource, Function, GenericDef, HasAttrs,
55+
DefWithBody, Docs, Enum, EnumVariant, Field, FieldSource, Function, GenericDef, HasAttrs,
5656
HasVisibility, ImplDef, Local, MacroDef, Module, ModuleDef, ScopeDef, Static, Struct,
57-
StructField, Trait, Type, TypeAlias, TypeParam, Union, VariantDef, Visibility,
57+
Trait, Type, TypeAlias, TypeParam, Union, VariantDef, Visibility,
5858
},
5959
has_source::HasSource,
6060
semantics::{original_range, PathResolution, Semantics, SemanticsScope},

‎crates/ra_hir/src/semantics.rs

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ use crate::{
2323
diagnostics::Diagnostic,
2424
semantics::source_to_def::{ChildContainer, SourceToDefCache, SourceToDefCtx},
2525
source_analyzer::{resolve_hir_path, SourceAnalyzer},
26-
AssocItem, Function, HirFileId, ImplDef, InFile, Local, MacroDef, Module, ModuleDef, Name,
27-
Origin, Path, ScopeDef, StructField, Trait, Type, TypeParam,
26+
AssocItem, Field, Function, HirFileId, ImplDef, InFile, Local, MacroDef, Module, ModuleDef,
27+
Name, Origin, Path, ScopeDef, Trait, Type, TypeParam,
2828
};
2929

3030
#[derive(Debug, Clone, PartialEq, Eq)]
@@ -184,18 +184,15 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
184184
self.analyze(call.syntax()).resolve_method_call(self.db, call)
185185
}
186186

187-
pub fn resolve_field(&self, field: &ast::FieldExpr) -> Option<StructField> {
187+
pub fn resolve_field(&self, field: &ast::FieldExpr) -> Option<Field> {
188188
self.analyze(field.syntax()).resolve_field(self.db, field)
189189
}
190190

191-
pub fn resolve_record_field(
192-
&self,
193-
field: &ast::RecordField,
194-
) -> Option<(StructField, Option<Local>)> {
191+
pub fn resolve_record_field(&self, field: &ast::RecordField) -> Option<(Field, Option<Local>)> {
195192
self.analyze(field.syntax()).resolve_record_field(self.db, field)
196193
}
197194

198-
pub fn resolve_record_field_pat(&self, field: &ast::RecordFieldPat) -> Option<StructField> {
195+
pub fn resolve_record_field_pat(&self, field: &ast::RecordFieldPat) -> Option<Field> {
199196
self.analyze(field.syntax()).resolve_record_field_pat(self.db, field)
200197
}
201198

@@ -216,19 +213,13 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
216213
// FIXME: use this instead?
217214
// pub fn resolve_name_ref(&self, name_ref: &ast::NameRef) -> Option<???>;
218215

219-
pub fn record_literal_missing_fields(
220-
&self,
221-
literal: &ast::RecordLit,
222-
) -> Vec<(StructField, Type)> {
216+
pub fn record_literal_missing_fields(&self, literal: &ast::RecordLit) -> Vec<(Field, Type)> {
223217
self.analyze(literal.syntax())
224218
.record_literal_missing_fields(self.db, literal)
225219
.unwrap_or_default()
226220
}
227221

228-
pub fn record_pattern_missing_fields(
229-
&self,
230-
pattern: &ast::RecordPat,
231-
) -> Vec<(StructField, Type)> {
222+
pub fn record_pattern_missing_fields(&self, pattern: &ast::RecordPat) -> Vec<(Field, Type)> {
232223
self.analyze(pattern.syntax())
233224
.record_pattern_missing_fields(self.db, pattern)
234225
.unwrap_or_default()
@@ -359,8 +350,8 @@ to_def_impls![
359350
(crate::Const, ast::ConstDef, const_to_def),
360351
(crate::Static, ast::StaticDef, static_to_def),
361352
(crate::Function, ast::FnDef, fn_to_def),
362-
(crate::StructField, ast::RecordFieldDef, record_field_to_def),
363-
(crate::StructField, ast::TupleFieldDef, tuple_field_to_def),
353+
(crate::Field, ast::RecordFieldDef, record_field_to_def),
354+
(crate::Field, ast::TupleFieldDef, tuple_field_to_def),
364355
(crate::EnumVariant, ast::EnumVariant, enum_variant_to_def),
365356
(crate::TypeParam, ast::TypeParam, type_param_to_def),
366357
(crate::MacroDef, ast::MacroCall, macro_call_to_def), // this one is dubious, not all calls are macros

‎crates/ra_hir/src/semantics/source_to_def.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use hir_def::{
55
dyn_map::DynMap,
66
expr::PatId,
77
keys::{self, Key},
8-
ConstId, DefWithBodyId, EnumId, EnumVariantId, FunctionId, GenericDefId, ImplId, ModuleId,
9-
StaticId, StructFieldId, StructId, TraitId, TypeAliasId, TypeParamId, UnionId, VariantId,
8+
ConstId, DefWithBodyId, EnumId, EnumVariantId, FieldId, FunctionId, GenericDefId, ImplId,
9+
ModuleId, StaticId, StructId, TraitId, TypeAliasId, TypeParamId, UnionId, VariantId,
1010
};
1111
use hir_expand::{name::AsName, AstId, MacroDefKind};
1212
use ra_db::FileId;
@@ -97,13 +97,13 @@ impl SourceToDefCtx<'_, '_> {
9797
pub(super) fn record_field_to_def(
9898
&mut self,
9999
src: InFile<ast::RecordFieldDef>,
100-
) -> Option<StructFieldId> {
100+
) -> Option<FieldId> {
101101
self.to_def(src, keys::RECORD_FIELD)
102102
}
103103
pub(super) fn tuple_field_to_def(
104104
&mut self,
105105
src: InFile<ast::TupleFieldDef>,
106-
) -> Option<StructFieldId> {
106+
) -> Option<FieldId> {
107107
self.to_def(src, keys::TUPLE_FIELD)
108108
}
109109
pub(super) fn enum_variant_to_def(

‎crates/ra_hir/src/source_analyzer.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use hir_def::{
1414
},
1515
expr::{ExprId, Pat, PatId},
1616
resolver::{resolver_for_scope, Resolver, TypeNs, ValueNs},
17-
AsMacroCall, DefWithBodyId, LocalStructFieldId, StructFieldId, VariantId,
17+
AsMacroCall, DefWithBodyId, FieldId, LocalFieldId, VariantId,
1818
};
1919
use hir_expand::{hygiene::Hygiene, name::AsName, HirFileId, InFile};
2020
use hir_ty::{
@@ -27,8 +27,8 @@ use ra_syntax::{
2727
};
2828

2929
use crate::{
30-
db::HirDatabase, semantics::PathResolution, Adt, Const, EnumVariant, Function, Local, MacroDef,
31-
ModPath, ModuleDef, Path, PathKind, Static, Struct, StructField, Trait, Type, TypeAlias,
30+
db::HirDatabase, semantics::PathResolution, Adt, Const, EnumVariant, Field, Function, Local,
31+
MacroDef, ModPath, ModuleDef, Path, PathKind, Static, Struct, Trait, Type, TypeAlias,
3232
TypeParam,
3333
};
3434
use ra_db::CrateId;
@@ -140,7 +140,7 @@ impl SourceAnalyzer {
140140
&self,
141141
db: &dyn HirDatabase,
142142
field: &ast::FieldExpr,
143-
) -> Option<StructField> {
143+
) -> Option<Field> {
144144
let expr_id = self.expr_id(db, &field.clone().into())?;
145145
self.infer.as_ref()?.field_resolution(expr_id).map(|it| it.into())
146146
}
@@ -149,7 +149,7 @@ impl SourceAnalyzer {
149149
&self,
150150
db: &dyn HirDatabase,
151151
field: &ast::RecordField,
152-
) -> Option<(StructField, Option<Local>)> {
152+
) -> Option<(Field, Option<Local>)> {
153153
let expr = field.expr()?;
154154
let expr_id = self.expr_id(db, &expr)?;
155155
let local = if field.name_ref().is_some() {
@@ -172,7 +172,7 @@ impl SourceAnalyzer {
172172
&self,
173173
_db: &dyn HirDatabase,
174174
field: &ast::RecordFieldPat,
175-
) -> Option<StructField> {
175+
) -> Option<Field> {
176176
let pat_id = self.pat_id(&field.pat()?)?;
177177
let struct_field = self.infer.as_ref()?.record_field_pat_resolution(pat_id)?;
178178
Some(struct_field.into())
@@ -232,7 +232,7 @@ impl SourceAnalyzer {
232232
&self,
233233
db: &dyn HirDatabase,
234234
literal: &ast::RecordLit,
235-
) -> Option<Vec<(StructField, Type)>> {
235+
) -> Option<Vec<(Field, Type)>> {
236236
let krate = self.resolver.krate()?;
237237
let body = self.body.as_ref()?;
238238
let infer = self.infer.as_ref()?;
@@ -253,7 +253,7 @@ impl SourceAnalyzer {
253253
&self,
254254
db: &dyn HirDatabase,
255255
pattern: &ast::RecordPat,
256-
) -> Option<Vec<(StructField, Type)>> {
256+
) -> Option<Vec<(Field, Type)>> {
257257
let krate = self.resolver.krate()?;
258258
let body = self.body.as_ref()?;
259259
let infer = self.infer.as_ref()?;
@@ -276,14 +276,14 @@ impl SourceAnalyzer {
276276
krate: CrateId,
277277
substs: &Substs,
278278
variant: VariantId,
279-
missing_fields: Vec<LocalStructFieldId>,
280-
) -> Vec<(StructField, Type)> {
279+
missing_fields: Vec<LocalFieldId>,
280+
) -> Vec<(Field, Type)> {
281281
let field_types = db.field_types(variant);
282282

283283
missing_fields
284284
.into_iter()
285285
.map(|local_id| {
286-
let field = StructFieldId { parent: variant, local_id };
286+
let field = FieldId { parent: variant, local_id };
287287
let ty = field_types[local_id].clone().subst(substs);
288288
(field.into(), Type::new_with_resolver_inner(db, krate, &self.resolver, ty))
289289
})

0 commit comments

Comments
 (0)