Skip to content

Commit 282702c

Browse files
bors[bot]matklad
bors[bot]
and
matklad
authored
Merge #5595
5595: Rename RecordLit -> RecordExpr r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
2 parents 323fd64 + 6f8aa75 commit 282702c

38 files changed

+145
-139
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ fn get_tail_expr_from_block(expr: &Expr) -> Option<Vec<NodeType>> {
240240
Expr::ParenExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
241241
Expr::PathExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
242242
Expr::Label(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
243-
Expr::RecordLit(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
243+
Expr::RecordExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
244244
Expr::IndexExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
245245
Expr::MethodCallExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
246246
Expr::AwaitExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub(crate) fn extract_variable(acc: &mut Assists, ctx: &AssistContext) -> Option
4545
target,
4646
move |edit| {
4747
let field_shorthand =
48-
match to_extract.syntax().parent().and_then(ast::RecordField::cast) {
48+
match to_extract.syntax().parent().and_then(ast::RecordExprField::cast) {
4949
Some(field) => field.name_ref(),
5050
None => None,
5151
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ fn add_vis_to_referenced_module_def(acc: &mut Assists, ctx: &AssistContext) -> O
8282
}
8383

8484
fn add_vis_to_referenced_record_field(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
85-
let record_field: ast::RecordField = ctx.find_node_at_offset()?;
85+
let record_field: ast::RecordExprField = ctx.find_node_at_offset()?;
8686
let (record_field_def, _) = ctx.sema.resolve_record_field(&record_field)?;
8787

8888
let current_module = ctx.sema.scope(record_field.syntax()).module()?;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
2323
// ```
2424
//
2525
pub(crate) fn reorder_fields(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
26-
reorder::<ast::RecordLit>(acc, ctx).or_else(|| reorder::<ast::RecordPat>(acc, ctx))
26+
reorder::<ast::RecordExpr>(acc, ctx).or_else(|| reorder::<ast::RecordPat>(acc, ctx))
2727
}
2828

2929
fn reorder<R: AstNode>(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
@@ -56,7 +56,7 @@ fn reorder<R: AstNode>(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
5656

5757
fn get_fields_kind(node: &SyntaxNode) -> Vec<SyntaxKind> {
5858
match node.kind() {
59-
RECORD_LIT => vec![RECORD_FIELD],
59+
RECORD_EXPR => vec![RECORD_EXPR_FIELD],
6060
RECORD_PAT => vec![RECORD_FIELD_PAT, BIND_PAT],
6161
_ => vec![],
6262
}
@@ -65,7 +65,7 @@ fn get_fields_kind(node: &SyntaxNode) -> Vec<SyntaxKind> {
6565
fn get_field_name(node: &SyntaxNode) -> String {
6666
let res = match_ast! {
6767
match node {
68-
ast::RecordField(field) => field.field_name().map(|it| it.to_string()),
68+
ast::RecordExprField(field) => field.field_name().map(|it| it.to_string()),
6969
ast::RecordFieldPat(field) => field.field_name().map(|it| it.to_string()),
7070
_ => None,
7171
}

‎crates/ra_hir/src/semantics.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,10 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
209209
self.imp.resolve_field(field)
210210
}
211211

212-
pub fn resolve_record_field(&self, field: &ast::RecordField) -> Option<(Field, Option<Local>)> {
212+
pub fn resolve_record_field(
213+
&self,
214+
field: &ast::RecordExprField,
215+
) -> Option<(Field, Option<Local>)> {
213216
self.imp.resolve_record_field(field)
214217
}
215218

@@ -225,7 +228,7 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
225228
self.imp.resolve_path(path)
226229
}
227230

228-
pub fn resolve_variant(&self, record_lit: ast::RecordLit) -> Option<VariantDef> {
231+
pub fn resolve_variant(&self, record_lit: ast::RecordExpr) -> Option<VariantDef> {
229232
self.imp.resolve_variant(record_lit).map(VariantDef::from)
230233
}
231234

@@ -240,7 +243,7 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
240243
// FIXME: use this instead?
241244
// pub fn resolve_name_ref(&self, name_ref: &ast::NameRef) -> Option<???>;
242245

243-
pub fn record_literal_missing_fields(&self, literal: &ast::RecordLit) -> Vec<(Field, Type)> {
246+
pub fn record_literal_missing_fields(&self, literal: &ast::RecordExpr) -> Vec<(Field, Type)> {
244247
self.imp.record_literal_missing_fields(literal)
245248
}
246249

@@ -422,7 +425,7 @@ impl<'db> SemanticsImpl<'db> {
422425
self.analyze(field.syntax()).resolve_field(self.db, field)
423426
}
424427

425-
fn resolve_record_field(&self, field: &ast::RecordField) -> Option<(Field, Option<Local>)> {
428+
fn resolve_record_field(&self, field: &ast::RecordExprField) -> Option<(Field, Option<Local>)> {
426429
self.analyze(field.syntax()).resolve_record_field(self.db, field)
427430
}
428431

@@ -440,7 +443,7 @@ impl<'db> SemanticsImpl<'db> {
440443
self.analyze(path.syntax()).resolve_path(self.db, path)
441444
}
442445

443-
fn resolve_variant(&self, record_lit: ast::RecordLit) -> Option<VariantId> {
446+
fn resolve_variant(&self, record_lit: ast::RecordExpr) -> Option<VariantId> {
444447
self.analyze(record_lit.syntax()).resolve_variant(self.db, record_lit)
445448
}
446449

@@ -453,7 +456,7 @@ impl<'db> SemanticsImpl<'db> {
453456
self.analyze(pat.syntax()).resolve_bind_pat_to_const(self.db, pat)
454457
}
455458

456-
fn record_literal_missing_fields(&self, literal: &ast::RecordLit) -> Vec<(Field, Type)> {
459+
fn record_literal_missing_fields(&self, literal: &ast::RecordExpr) -> Vec<(Field, Type)> {
457460
self.analyze(literal.syntax())
458461
.record_literal_missing_fields(self.db, literal)
459462
.unwrap_or_default()

‎crates/ra_hir/src/source_analyzer.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ impl SourceAnalyzer {
159159
pub(crate) fn resolve_record_field(
160160
&self,
161161
db: &dyn HirDatabase,
162-
field: &ast::RecordField,
162+
field: &ast::RecordExprField,
163163
) -> Option<(Field, Option<Local>)> {
164164
let expr = field.expr()?;
165165
let expr_id = self.expr_id(db, &expr)?;
@@ -246,7 +246,7 @@ impl SourceAnalyzer {
246246
}
247247
}
248248

249-
if let Some(rec_lit) = path.syntax().parent().and_then(ast::RecordLit::cast) {
249+
if let Some(rec_lit) = path.syntax().parent().and_then(ast::RecordExpr::cast) {
250250
let expr_id = self.expr_id(db, &rec_lit.into())?;
251251
if let Some(VariantId::EnumVariantId(variant)) =
252252
self.infer.as_ref()?.variant_resolution_for_expr(expr_id)
@@ -284,7 +284,7 @@ impl SourceAnalyzer {
284284
pub(crate) fn record_literal_missing_fields(
285285
&self,
286286
db: &dyn HirDatabase,
287-
literal: &ast::RecordLit,
287+
literal: &ast::RecordExpr,
288288
) -> Option<Vec<(Field, Type)>> {
289289
let krate = self.resolver.krate()?;
290290
let body = self.body.as_ref()?;
@@ -358,7 +358,7 @@ impl SourceAnalyzer {
358358
pub(crate) fn resolve_variant(
359359
&self,
360360
db: &dyn HirDatabase,
361-
record_lit: ast::RecordLit,
361+
record_lit: ast::RecordExpr,
362362
) -> Option<VariantId> {
363363
let infer = self.infer.as_ref()?;
364364
let expr_id = self.expr_id(db, &record_lit.into())?;

‎crates/ra_hir_def/src/body.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ pub struct BodySourceMap {
216216
expr_map_back: ArenaMap<ExprId, Result<ExprSource, SyntheticSyntax>>,
217217
pat_map: FxHashMap<PatSource, PatId>,
218218
pat_map_back: ArenaMap<PatId, Result<PatSource, SyntheticSyntax>>,
219-
field_map: FxHashMap<(ExprId, usize), InFile<AstPtr<ast::RecordField>>>,
219+
field_map: FxHashMap<(ExprId, usize), InFile<AstPtr<ast::RecordExprField>>>,
220220
expansions: FxHashMap<InFile<AstPtr<ast::MacroCall>>, HirFileId>,
221221
}
222222

@@ -314,7 +314,7 @@ impl BodySourceMap {
314314
self.pat_map.get(&src).cloned()
315315
}
316316

317-
pub fn field_syntax(&self, expr: ExprId, field: usize) -> InFile<AstPtr<ast::RecordField>> {
317+
pub fn field_syntax(&self, expr: ExprId, field: usize) -> InFile<AstPtr<ast::RecordExprField>> {
318318
self.field_map[&(expr, field)].clone()
319319
}
320320
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,10 +379,10 @@ impl ExprCollector<'_> {
379379
let expr = e.expr().map(|e| self.collect_expr(e));
380380
self.alloc_expr(Expr::Return { expr }, syntax_ptr)
381381
}
382-
ast::Expr::RecordLit(e) => {
382+
ast::Expr::RecordExpr(e) => {
383383
let path = e.path().and_then(|path| self.expander.parse_path(path));
384384
let mut field_ptrs = Vec::new();
385-
let record_lit = if let Some(nfl) = e.record_field_list() {
385+
let record_lit = if let Some(nfl) = e.record_expr_field_list() {
386386
let fields = nfl
387387
.fields()
388388
.inspect(|field| field_ptrs.push(AstPtr::new(field)))

‎crates/ra_hir_expand/src/db.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ fn to_fragment_kind(db: &dyn AstDatabase, id: MacroCallId) -> FragmentKind {
386386
MATCH_EXPR => FragmentKind::Expr,
387387
MATCH_ARM => FragmentKind::Expr,
388388
MATCH_GUARD => FragmentKind::Expr,
389-
RECORD_FIELD => FragmentKind::Expr,
389+
RECORD_EXPR_FIELD => FragmentKind::Expr,
390390
CALL_EXPR => FragmentKind::Expr,
391391
INDEX_EXPR => FragmentKind::Expr,
392392
METHOD_CALL_EXPR => FragmentKind::Expr,

‎crates/ra_hir_ty/src/diagnostics.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pub fn validate_body(db: &dyn HirDatabase, owner: DefWithBodyId, sink: &mut Diag
2929
#[derive(Debug)]
3030
pub struct NoSuchField {
3131
pub file: HirFileId,
32-
pub field: AstPtr<ast::RecordField>,
32+
pub field: AstPtr<ast::RecordExprField>,
3333
}
3434

3535
impl Diagnostic for NoSuchField {
@@ -47,19 +47,19 @@ impl Diagnostic for NoSuchField {
4747
}
4848

4949
impl AstDiagnostic for NoSuchField {
50-
type AST = ast::RecordField;
50+
type AST = ast::RecordExprField;
5151

5252
fn ast(&self, db: &dyn AstDatabase) -> Self::AST {
5353
let root = db.parse_or_expand(self.source().file_id).unwrap();
5454
let node = self.source().value.to_node(&root);
55-
ast::RecordField::cast(node).unwrap()
55+
ast::RecordExprField::cast(node).unwrap()
5656
}
5757
}
5858

5959
#[derive(Debug)]
6060
pub struct MissingFields {
6161
pub file: HirFileId,
62-
pub field_list: AstPtr<ast::RecordFieldList>,
62+
pub field_list: AstPtr<ast::RecordExprFieldList>,
6363
pub missed_fields: Vec<Name>,
6464
}
6565

@@ -80,12 +80,12 @@ impl Diagnostic for MissingFields {
8080
}
8181

8282
impl AstDiagnostic for MissingFields {
83-
type AST = ast::RecordFieldList;
83+
type AST = ast::RecordExprFieldList;
8484

8585
fn ast(&self, db: &dyn AstDatabase) -> Self::AST {
8686
let root = db.parse_or_expand(self.source().file_id).unwrap();
8787
let node = self.source().value.to_node(&root);
88-
ast::RecordFieldList::cast(node).unwrap()
88+
ast::RecordExprFieldList::cast(node).unwrap()
8989
}
9090
}
9191

0 commit comments

Comments
 (0)