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 --- .../parser/inline/ok/0040_crate_keyword_vis.rast | 8 ++++---- .../parser/inline/ok/0054_record_field_attrs.rast | 4 ++-- .../test_data/parser/inline/ok/0068_union_items.rast | 8 ++++---- .../test_data/parser/inline/ok/0083_struct_items.rast | 16 ++++++++-------- .../parser/inline/ok/0114_tuple_struct_where.rast | 8 ++++---- .../parser/inline/ok/0115_tuple_field_attrs.rast | 4 ++-- .../parser/inline/ok/0134_nocontentexpr_after_item.rast | 2 +- .../parser/inline/ok/0157_variant_discriminant.rast | 4 ++-- 8 files changed, 27 insertions(+), 27 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/inline') diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast index 47cbe7c1f..a0ad07807 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast @@ -22,10 +22,10 @@ SOURCE_FILE@0..71 NAME@27..28 IDENT@27..28 "S" WHITESPACE@28..29 " " - RECORD_FIELD_DEF_LIST@29..49 + RECORD_FIELD_LIST@29..49 L_CURLY@29..30 "{" WHITESPACE@30..31 " " - RECORD_FIELD_DEF@31..47 + RECORD_FIELD@31..47 VISIBILITY@31..36 CRATE_KW@31..36 "crate" WHITESPACE@36..37 " " @@ -46,9 +46,9 @@ SOURCE_FILE@0..71 WHITESPACE@56..57 " " NAME@57..58 IDENT@57..58 "T" - TUPLE_FIELD_DEF_LIST@58..69 + TUPLE_FIELD_LIST@58..69 L_PAREN@58..59 "(" - TUPLE_FIELD_DEF@59..68 + TUPLE_FIELD@59..68 VISIBILITY@59..64 CRATE_KW@59..64 "crate" WHITESPACE@64..65 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast b/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast index 6362aa02d..775bc2869 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast @@ -5,10 +5,10 @@ SOURCE_FILE@0..64 NAME@7..8 IDENT@7..8 "S" WHITESPACE@8..9 " " - RECORD_FIELD_DEF_LIST@9..63 + RECORD_FIELD_LIST@9..63 L_CURLY@9..10 "{" WHITESPACE@10..15 "\n " - RECORD_FIELD_DEF@15..60 + RECORD_FIELD@15..60 ATTR@15..43 POUND@15..16 "#" L_BRACK@16..17 "[" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast b/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast index ec2496072..2726516b8 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast @@ -5,7 +5,7 @@ SOURCE_FILE@0..51 NAME@6..9 IDENT@6..9 "Foo" WHITESPACE@9..10 " " - RECORD_FIELD_DEF_LIST@10..12 + RECORD_FIELD_LIST@10..12 L_CURLY@10..11 "{" R_CURLY@11..12 "}" WHITESPACE@12..13 "\n" @@ -15,10 +15,10 @@ SOURCE_FILE@0..51 NAME@19..22 IDENT@19..22 "Foo" WHITESPACE@22..23 " " - RECORD_FIELD_DEF_LIST@23..50 + RECORD_FIELD_LIST@23..50 L_CURLY@23..24 "{" WHITESPACE@24..29 "\n " - RECORD_FIELD_DEF@29..35 + RECORD_FIELD@29..35 NAME@29..30 IDENT@29..30 "a" COLON@30..31 ":" @@ -30,7 +30,7 @@ SOURCE_FILE@0..51 IDENT@32..35 "i32" COMMA@35..36 "," WHITESPACE@36..41 "\n " - RECORD_FIELD_DEF@41..47 + RECORD_FIELD@41..47 NAME@41..42 IDENT@41..42 "b" COLON@42..43 ":" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast index 217b07e59..0d9a36618 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast @@ -12,7 +12,7 @@ SOURCE_FILE@0..106 NAME@19..22 IDENT@19..22 "Foo" WHITESPACE@22..23 " " - RECORD_FIELD_DEF_LIST@23..25 + RECORD_FIELD_LIST@23..25 L_CURLY@23..24 "{" R_CURLY@24..25 "}" WHITESPACE@25..26 "\n" @@ -21,7 +21,7 @@ SOURCE_FILE@0..106 WHITESPACE@32..33 " " NAME@33..36 IDENT@33..36 "Foo" - TUPLE_FIELD_DEF_LIST@36..38 + TUPLE_FIELD_LIST@36..38 L_PAREN@36..37 "(" R_PAREN@37..38 ")" SEMICOLON@38..39 ";" @@ -31,9 +31,9 @@ SOURCE_FILE@0..106 WHITESPACE@46..47 " " NAME@47..50 IDENT@47..50 "Foo" - TUPLE_FIELD_DEF_LIST@50..65 + TUPLE_FIELD_LIST@50..65 L_PAREN@50..51 "(" - TUPLE_FIELD_DEF@51..57 + TUPLE_FIELD@51..57 PATH_TYPE@51..57 PATH@51..57 PATH_SEGMENT@51..57 @@ -41,7 +41,7 @@ SOURCE_FILE@0..106 IDENT@51..57 "String" COMMA@57..58 "," WHITESPACE@58..59 " " - TUPLE_FIELD_DEF@59..64 + TUPLE_FIELD@59..64 PATH_TYPE@59..64 PATH@59..64 PATH_SEGMENT@59..64 @@ -56,10 +56,10 @@ SOURCE_FILE@0..106 NAME@74..77 IDENT@74..77 "Foo" WHITESPACE@77..78 " " - RECORD_FIELD_DEF_LIST@78..105 + RECORD_FIELD_LIST@78..105 L_CURLY@78..79 "{" WHITESPACE@79..84 "\n " - RECORD_FIELD_DEF@84..90 + RECORD_FIELD@84..90 NAME@84..85 IDENT@84..85 "a" COLON@85..86 ":" @@ -71,7 +71,7 @@ SOURCE_FILE@0..106 IDENT@87..90 "i32" COMMA@90..91 "," WHITESPACE@91..96 "\n " - RECORD_FIELD_DEF@96..102 + RECORD_FIELD@96..102 NAME@96..97 IDENT@96..97 "b" COLON@97..98 ":" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast index 0b1ec5b27..3c9af3d1f 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast @@ -10,9 +10,9 @@ SOURCE_FILE@0..53 NAME@12..13 IDENT@12..13 "T" R_ANGLE@13..14 ">" - TUPLE_FIELD_DEF_LIST@14..17 + TUPLE_FIELD_LIST@14..17 L_PAREN@14..15 "(" - TUPLE_FIELD_DEF@15..16 + TUPLE_FIELD@15..16 PATH_TYPE@15..16 PATH@15..16 PATH_SEGMENT@15..16 @@ -51,9 +51,9 @@ SOURCE_FILE@0..53 NAME@46..47 IDENT@46..47 "T" R_ANGLE@47..48 ">" - TUPLE_FIELD_DEF_LIST@48..51 + TUPLE_FIELD_LIST@48..51 L_PAREN@48..49 "(" - TUPLE_FIELD_DEF@49..50 + TUPLE_FIELD@49..50 PATH_TYPE@49..50 PATH@49..50 PATH_SEGMENT@49..50 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast index 3c0ef9005..51812a4f2 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast @@ -5,10 +5,10 @@ SOURCE_FILE@0..60 NAME@7..8 IDENT@7..8 "S" WHITESPACE@8..9 " " - TUPLE_FIELD_DEF_LIST@9..58 + TUPLE_FIELD_LIST@9..58 L_PAREN@9..10 "(" WHITESPACE@10..15 "\n " - TUPLE_FIELD_DEF@15..55 + TUPLE_FIELD@15..55 ATTR@15..43 POUND@15..16 "#" L_BRACK@16..17 "[" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast index ceae8a4ec..d92bf84f4 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast @@ -53,7 +53,7 @@ SOURCE_FILE@0..111 NAME@103..104 IDENT@103..104 "S" WHITESPACE@104..105 " " - RECORD_FIELD_DEF_LIST@105..107 + RECORD_FIELD_LIST@105..107 L_CURLY@105..106 "{" R_CURLY@106..107 "}" SEMICOLON@107..108 ";" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast b/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast index e8a0e9ddd..289fdfd6d 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast @@ -11,9 +11,9 @@ SOURCE_FILE@0..23 ENUM_VARIANT@9..20 NAME@9..10 IDENT@9..10 "X" - TUPLE_FIELD_DEF_LIST@10..15 + TUPLE_FIELD_LIST@10..15 L_PAREN@10..11 "(" - TUPLE_FIELD_DEF@11..14 + TUPLE_FIELD@11..14 PATH_TYPE@11..14 PATH@11..14 PATH_SEGMENT@11..14 -- cgit v1.2.3