language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 05:45:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename FieldDef -> Field

Browse source
This commit is contained in:
Aleksey Kladov 2020-07-30 16:49:13 +02:00
parent 6f8aa75329
commit 0a9e3ccc26
54 changed files with 219 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_parser/src/grammar.rs
View file

@ -142,7 +142,7 @@ pub(crate) fn reparser(
) -> Option<fn(&mut Parser)> {
let res = match node {
BLOCK_EXPR => expressions::block_expr,
RECORD_FIELD_DEF_LIST => items::record_field_def_list,
RECORD_FIELD_LIST => items::record_field_def_list,
RECORD_EXPR_FIELD_LIST => items::record_field_list,
ENUM_VARIANT_LIST => items::enum_variant_list,
MATCH_ARM_LIST => items::match_arm_list,

8
crates/ra_parser/src/grammar/items/adt.rs
View file

@ -119,7 +119,7 @@ pub(crate) fn record_field_def_list(p: &mut Parser) {
}
}
p.expect(T!['}']);
m.complete(p, RECORD_FIELD_DEF_LIST);
m.complete(p, RECORD_FIELD_LIST);
fn record_field_def(p: &mut Parser) {
let m = p.start();
@ -134,7 +134,7 @@ pub(crate) fn record_field_def_list(p: &mut Parser) {
name(p);
p.expect(T![:]);
types::type_(p);
m.complete(p, RECORD_FIELD_DEF);
m.complete(p, RECORD_FIELD);
} else {
m.abandon(p);
p.err_and_bump("expected field declaration");
@ -167,12 +167,12 @@ fn tuple_field_def_list(p: &mut Parser) {
break;
}
types::type_(p);
m.complete(p, TUPLE_FIELD_DEF);
m.complete(p, TUPLE_FIELD);
if !p.at(T![')']) {
p.expect(T![,]);
}
}
p.expect(T![')']);
m.complete(p, TUPLE_FIELD_DEF_LIST);
m.complete(p, TUPLE_FIELD_LIST);
}

8
crates/ra_parser/src/syntax_kind/generated.rs
View file

@ -207,10 +207,10 @@ pub enum SyntaxKind {
EXTERN_BLOCK,
EXTERN_ITEM_LIST,
ENUM_VARIANT,
RECORD_FIELD_DEF_LIST,
RECORD_FIELD_DEF,
TUPLE_FIELD_DEF_LIST,
TUPLE_FIELD_DEF,
RECORD_FIELD_LIST,
RECORD_FIELD,
TUPLE_FIELD_LIST,
TUPLE_FIELD,
ENUM_VARIANT_LIST,
ITEM_LIST,
ASSOC_ITEM_LIST,