Skip to content

Commit 0a9e3cc

Browse files
matkladmatklad
committed
Rename FieldDef -> Field
1 parent 6f8aa75 commit 0a9e3cc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+219
-228
lines changed

‎crates/ra_assists/src/handlers/change_visibility.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fn add_vis(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
4747
}
4848
(vis_offset(&parent), keyword.text_range())
4949
} else if let Some(field_name) = ctx.find_node_at_offset::<ast::Name>() {
50-
let field = field_name.syntax().ancestors().find_map(ast::RecordFieldDef::cast)?;
50+
let field = field_name.syntax().ancestors().find_map(ast::RecordField::cast)?;
5151
if field.name()? != field_name {
5252
mark::hit!(change_visibility_field_false_positive);
5353
return None;
@@ -56,7 +56,7 @@ fn add_vis(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
5656
return None;
5757
}
5858
(vis_offset(field.syntax()), field_name.syntax().text_range())
59-
} else if let Some(field) = ctx.find_node_at_offset::<ast::TupleFieldDef>() {
59+
} else if let Some(field) = ctx.find_node_at_offset::<ast::TupleField>() {
6060
if field.visibility().is_some() {
6161
return None;
6262
}

‎crates/ra_assists/src/handlers/move_bounds.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pub(crate) fn move_bounds_to_where_clause(acc: &mut Assists, ctx: &AssistContext
4343
ast::EnumDef(it) => it.variant_list()?.syntax().clone().into(),
4444
ast::StructDef(it) => {
4545
it.syntax().children_with_tokens()
46-
.find(|it| it.kind() == RECORD_FIELD_DEF_LIST || it.kind() == T![;])?
46+
.find(|it| it.kind() == RECORD_FIELD_LIST || it.kind() == T![;])?
4747
},
4848
_ => return None
4949
}

‎crates/ra_hir/src/code_model.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,8 @@ pub struct Field {
361361

362362
#[derive(Debug, PartialEq, Eq)]
363363
pub enum FieldSource {
364-
Named(ast::RecordFieldDef),
365-
Pos(ast::TupleFieldDef),
364+
Named(ast::RecordField),
365+
Pos(ast::TupleField),
366366
}
367367

368368
impl Field {

‎crates/ra_hir/src/semantics.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -589,8 +589,8 @@ to_def_impls![
589589
(crate::Const, ast::ConstDef, const_to_def),
590590
(crate::Static, ast::StaticDef, static_to_def),
591591
(crate::Function, ast::Fn, fn_to_def),
592-
(crate::Field, ast::RecordFieldDef, record_field_to_def),
593-
(crate::Field, ast::TupleFieldDef, tuple_field_to_def),
592+
(crate::Field, ast::RecordField, record_field_to_def),
593+
(crate::Field, ast::TupleField, tuple_field_to_def),
594594
(crate::EnumVariant, ast::EnumVariant, enum_variant_to_def),
595595
(crate::TypeParam, ast::TypeParam, type_param_to_def),
596596
(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: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,10 @@ impl SourceToDefCtx<'_, '_> {
9292
pub(super) fn type_alias_to_def(&mut self, src: InFile<ast::TypeAlias>) -> Option<TypeAliasId> {
9393
self.to_def(src, keys::TYPE_ALIAS)
9494
}
95-
pub(super) fn record_field_to_def(
96-
&mut self,
97-
src: InFile<ast::RecordFieldDef>,
98-
) -> Option<FieldId> {
95+
pub(super) fn record_field_to_def(&mut self, src: InFile<ast::RecordField>) -> Option<FieldId> {
9996
self.to_def(src, keys::RECORD_FIELD)
10097
}
101-
pub(super) fn tuple_field_to_def(
102-
&mut self,
103-
src: InFile<ast::TupleFieldDef>,
104-
) -> Option<FieldId> {
98+
pub(super) fn tuple_field_to_def(&mut self, src: InFile<ast::TupleField>) -> Option<FieldId> {
10599
self.to_def(src, keys::TUPLE_FIELD)
106100
}
107101
pub(super) fn enum_variant_to_def(

‎crates/ra_hir_def/src/adt.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ impl VariantData {
179179

180180
impl HasChildSource for VariantId {
181181
type ChildId = LocalFieldId;
182-
type Value = Either<ast::TupleFieldDef, ast::RecordFieldDef>;
182+
type Value = Either<ast::TupleField, ast::RecordField>;
183183

184184
fn child_source(&self, db: &dyn DefDatabase) -> InFile<ArenaMap<Self::ChildId, Self::Value>> {
185185
let (src, module_id) = match self {
@@ -194,7 +194,7 @@ impl HasChildSource for VariantId {
194194
}
195195
VariantId::UnionId(it) => (
196196
it.lookup(db).source(db).map(|it| {
197-
it.record_field_def_list()
197+
it.record_field_list()
198198
.map(ast::StructKind::Record)
199199
.unwrap_or(ast::StructKind::Unit)
200200
}),
@@ -218,7 +218,7 @@ pub enum StructKind {
218218
fn lower_struct(
219219
db: &dyn DefDatabase,
220220
expander: &mut CfgExpander,
221-
trace: &mut Trace<FieldData, Either<ast::TupleFieldDef, ast::RecordFieldDef>>,
221+
trace: &mut Trace<FieldData, Either<ast::TupleField, ast::RecordField>>,
222222
ast: &InFile<ast::StructKind>,
223223
) -> StructKind {
224224
let ctx = LowerCtx::new(db, ast.file_id);

‎crates/ra_hir_def/src/item_tree/lower.rs

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
//! AST -> `ItemTree` lowering code.
22
3-
use super::*;
4-
use crate::{
5-
attr::Attrs,
6-
generics::{GenericParams, TypeParamData, TypeParamProvenance},
7-
};
3+
use std::{collections::hash_map::Entry, mem, sync::Arc};
4+
85
use hir_expand::{ast_id_map::AstIdMap, hygiene::Hygiene, HirFileId};
96
use ra_arena::map::ArenaMap;
107
use ra_syntax::{
118
ast::{self, ModuleItemOwner},
129
SyntaxNode,
1310
};
1411
use smallvec::SmallVec;
15-
use std::{collections::hash_map::Entry, mem, sync::Arc};
12+
13+
use crate::{
14+
attr::Attrs,
15+
generics::{GenericParams, TypeParamData, TypeParamProvenance},
16+
};
17+
18+
use super::*;
1619

1720
fn id<N: ItemTreeNode>(index: Idx<N>) -> FileItemTreeId<N> {
1821
FileItemTreeId { index, _p: PhantomData }
@@ -191,7 +194,7 @@ impl Ctx {
191194
}
192195
}
193196

194-
fn lower_record_fields(&mut self, fields: &ast::RecordFieldDefList) -> IdRange<Field> {
197+
fn lower_record_fields(&mut self, fields: &ast::RecordFieldList) -> IdRange<Field> {
195198
let start = self.next_field_idx();
196199
for field in fields.fields() {
197200
if let Some(data) = self.lower_record_field(&field) {
@@ -203,15 +206,15 @@ impl Ctx {
203206
IdRange::new(start..end)
204207
}
205208

206-
fn lower_record_field(&mut self, field: &ast::RecordFieldDef) -> Option<Field> {
209+
fn lower_record_field(&mut self, field: &ast::RecordField) -> Option<Field> {
207210
let name = field.name()?.as_name();
208211
let visibility = self.lower_visibility(field);
209212
let type_ref = self.lower_type_ref_opt(field.ascribed_type());
210213
let res = Field { name, type_ref, visibility };
211214
Some(res)
212215
}
213216

214-
fn lower_tuple_fields(&mut self, fields: &ast::TupleFieldDefList) -> IdRange<Field> {
217+
fn lower_tuple_fields(&mut self, fields: &ast::TupleFieldList) -> IdRange<Field> {
215218
let start = self.next_field_idx();
216219
for (i, field) in fields.fields().enumerate() {
217220
let data = self.lower_tuple_field(i, &field);
@@ -222,7 +225,7 @@ impl Ctx {
222225
IdRange::new(start..end)
223226
}
224227

225-
fn lower_tuple_field(&mut self, idx: usize, field: &ast::TupleFieldDef) -> Field {
228+
fn lower_tuple_field(&mut self, idx: usize, field: &ast::TupleField) -> Field {
226229
let name = Name::new_tuple_field(idx);
227230
let visibility = self.lower_visibility(field);
228231
let type_ref = self.lower_type_ref_opt(field.type_ref());
@@ -234,10 +237,8 @@ impl Ctx {
234237
let visibility = self.lower_visibility(union);
235238
let name = union.name()?.as_name();
236239
let generic_params = self.lower_generic_params(GenericsOwner::Union, union);
237-
let fields = match union.record_field_def_list() {
238-
Some(record_field_def_list) => {
239-
self.lower_fields(&StructKind::Record(record_field_def_list))
240-
}
240+
let fields = match union.record_field_list() {
241+
Some(record_field_list) => self.lower_fields(&StructKind::Record(record_field_list)),
241242
None => Fields::Record(IdRange::new(self.next_field_idx()..self.next_field_idx())),
242243
};
243244
let ast_id = self.source_ast_id_map.ast_id(union);

‎crates/ra_hir_def/src/keys.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ pub const UNION: Key<ast::UnionDef, UnionId> = Key::new();
2525
pub const ENUM: Key<ast::EnumDef, EnumId> = Key::new();
2626

2727
pub const ENUM_VARIANT: Key<ast::EnumVariant, EnumVariantId> = Key::new();
28-
pub const TUPLE_FIELD: Key<ast::TupleFieldDef, FieldId> = Key::new();
29-
pub const RECORD_FIELD: Key<ast::RecordFieldDef, FieldId> = Key::new();
28+
pub const TUPLE_FIELD: Key<ast::TupleField, FieldId> = Key::new();
29+
pub const RECORD_FIELD: Key<ast::RecordField, FieldId> = Key::new();
3030
pub const TYPE_PARAM: Key<ast::TypeParam, TypeParamId> = Key::new();
3131

3232
pub const MACRO: Key<ast::MacroCall, MacroDefId> = Key::new();

‎crates/ra_ide/src/diagnostics.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -155,21 +155,21 @@ fn missing_struct_field_fix(
155155
module = s.module(sema.db);
156156
let source = s.source(sema.db);
157157
def_file_id = source.file_id;
158-
let fields = source.value.field_def_list()?;
159-
record_field_def_list(fields)?
158+
let fields = source.value.field_list()?;
159+
record_field_list(fields)?
160160
}
161161
VariantDef::Union(u) => {
162162
module = u.module(sema.db);
163163
let source = u.source(sema.db);
164164
def_file_id = source.file_id;
165-
source.value.record_field_def_list()?
165+
source.value.record_field_list()?
166166
}
167167
VariantDef::EnumVariant(e) => {
168168
module = e.module(sema.db);
169169
let source = e.source(sema.db);
170170
def_file_id = source.file_id;
171-
let fields = source.value.field_def_list()?;
172-
record_field_def_list(fields)?
171+
let fields = source.value.field_list()?;
172+
record_field_list(fields)?
173173
}
174174
};
175175
let def_file_id = def_file_id.original_file(sema.db);
@@ -205,10 +205,10 @@ fn missing_struct_field_fix(
205205
let fix = Fix::new("Create field", source_change.into());
206206
return Some(fix);
207207

208-
fn record_field_def_list(field_def_list: ast::FieldDefList) -> Option<ast::RecordFieldDefList> {
208+
fn record_field_list(field_def_list: ast::FieldList) -> Option<ast::RecordFieldList> {
209209
match field_def_list {
210-
ast::FieldDefList::RecordFieldDefList(it) => Some(it),
211-
ast::FieldDefList::TupleFieldDefList(_) => None,
210+
ast::FieldList::RecordFieldList(it) => Some(it),
211+
ast::FieldList::TupleFieldList(_) => None,
212212
}
213213
}
214214
}

‎crates/ra_ide/src/display/navigation_target.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ pub(crate) fn docs_from_symbol(db: &RootDatabase, symbol: &FileSymbol) -> Option
387387
ast::TypeAlias(it) => it.doc_comment_text(),
388388
ast::ConstDef(it) => it.doc_comment_text(),
389389
ast::StaticDef(it) => it.doc_comment_text(),
390-
ast::RecordFieldDef(it) => it.doc_comment_text(),
390+
ast::RecordField(it) => it.doc_comment_text(),
391391
ast::EnumVariant(it) => it.doc_comment_text(),
392392
ast::MacroCall(it) => it.doc_comment_text(),
393393
_ => None,
@@ -412,7 +412,7 @@ pub(crate) fn description_from_symbol(db: &RootDatabase, symbol: &FileSymbol) ->
412412
ast::TypeAlias(it) => it.short_label(),
413413
ast::ConstDef(it) => it.short_label(),
414414
ast::StaticDef(it) => it.short_label(),
415-
ast::RecordFieldDef(it) => it.short_label(),
415+
ast::RecordField(it) => it.short_label(),
416416
ast::EnumVariant(it) => it.short_label(),
417417
_ => None,
418418
}

0 commit comments

Comments
 (0)