From 0a9e3ccc262fbcbd4cdaab30384f8cb71584544b Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 16:49:13 +0200 Subject: Rename FieldDef -> Field --- crates/ra_parser/src/grammar.rs | 2 +- crates/ra_parser/src/grammar/items/adt.rs | 8 ++++---- crates/ra_parser/src/syntax_kind/generated.rs | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'crates/ra_parser/src') diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs index 3610e7392..03041d110 100644 --- a/crates/ra_parser/src/grammar.rs +++ b/crates/ra_parser/src/grammar.rs @@ -142,7 +142,7 @@ pub(crate) fn reparser( ) -> Option { 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, diff --git a/crates/ra_parser/src/grammar/items/adt.rs b/crates/ra_parser/src/grammar/items/adt.rs index 74b9f514b..0e96bf77e 100644 --- a/crates/ra_parser/src/grammar/items/adt.rs +++ b/crates/ra_parser/src/grammar/items/adt.rs @@ -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); } diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs index ac79786ff..8586758b4 100644 --- a/crates/ra_parser/src/syntax_kind/generated.rs +++ b/crates/ra_parser/src/syntax_kind/generated.rs @@ -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, -- cgit v1.2.3