Merge #5597

5597: Rename FieldDef -> Field r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

25 files changed, 84 insertions, 84 deletions

diff --git a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast
index 81f0f575c..93f6060ed 100644
--- a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast
+++ b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast
@@ -5,10 +5,10 @@ [email protected]
     [email protected]
       [email protected] "S"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@15..21
+      [email protected]
         [email protected]
           [email protected] "a"
         [email protected] ":"
@@ -19,7 +19,7 @@ [email protected]
               [email protected]
                 [email protected] "u32"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@26..32
+      [email protected]
         [email protected]
           [email protected] "b"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast
index 97d0fe910..7e2f429e1 100644
--- a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast
+++ b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast
@@ -11,7 +11,7 @@ [email protected]
     [email protected]
       [email protected] "S"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "}"
 error 0..0: expected an item
diff --git a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast
index 21c255698..e0f3916b3 100644
--- a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast
+++ b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast
@@ -5,10 +5,10 @@ [email protected]
     [email protected]
       [email protected] "S"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@15..21
+      [email protected]
         [email protected]
           [email protected] "a"
         [email protected] ":"
@@ -20,7 +20,7 @@ [email protected]
                 [email protected] "i32"
       [email protected] ","
       [email protected] "\n    "
-      RECORD_FIELD_DEF@27..36
+      [email protected]
         [email protected]
           [email protected] "b"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast
index 2d6364998..ad9447761 100644
--- a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast
@@ -5,10 +5,10 @@ [email protected]
     [email protected]
       [email protected] "S"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@15..21
+      [email protected]
         [email protected]
           [email protected] "f"
         [email protected] ":"
@@ -35,7 +35,7 @@ [email protected]
       [email protected]
         [email protected] "*"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@48..58
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -50,7 +50,7 @@ [email protected]
                 [email protected] "u32"
       [email protected] ","
       [email protected] "\n    "
-      RECORD_FIELD_DEF@64..70
+      [email protected]
         [email protected]
           [email protected] "z"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast
index 211e5fd46..c3591d25c 100644
--- a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast
+++ b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast
@@ -7,10 +7,10 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "Cache"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
       [email protected] "\n    "
-      TUPLE_FIELD_DEF@22..68
+      [email protected]
         [email protected]
           [email protected]
             [email protected]
@@ -47,7 +47,7 @@ [email protected]
                                       [email protected]
                                         [email protected] "@"
       [email protected] " "
-      TUPLE_FIELD_DEF@69..72
+      [email protected]
         [email protected]
           [email protected]
             [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.rast b/crates/ra_syntax/test_data/parser/err/0025_nope.rast
index 4b9bd679e..a1258028d 100644
--- a/crates/ra_syntax/test_data/parser/err/0025_nope.rast
+++ b/crates/ra_syntax/test_data/parser/err/0025_nope.rast
@@ -28,9 +28,9 @@ [email protected]
           [email protected]
             [email protected]
               [email protected] "Var2"
-            TUPLE_FIELD_DEF_[email protected]
+            [email protected]
               [email protected] "("
-              TUPLE_FIELD_DEF@55..61
+              [email protected]
                 [email protected]
                   [email protected]
                     [email protected]
@@ -43,10 +43,10 @@ [email protected]
             [email protected]
               [email protected] "Var3"
             [email protected] " "
-            RECORD_FIELD_DEF_[email protected]
+            [email protected]
               [email protected] "{"
               [email protected] "\n            "
-              RECORD_FIELD_DEF@91..95
+              [email protected]
                 [email protected]
                   [email protected] "abc"
                 [email protected] ":"
@@ -108,10 +108,10 @@ [email protected]
             [email protected]
               [email protected] "StillFine"
             [email protected] " "
-            RECORD_FIELD_DEF_[email protected]
+            [email protected]
               [email protected] "{"
               [email protected] "\n            "
-              RECORD_FIELD_DEF@274..282
+              [email protected]
                 [email protected]
                   [email protected] "def"
                 [email protected] ":"
@@ -146,9 +146,9 @@ [email protected]
               [email protected]
                 [email protected]
                   [email protected] "Nope"
-                TUPLE_FIELD_DEF_[email protected]
+                [email protected]
                   [email protected] "("
-                  TUPLE_FIELD_DEF@368..371
+                  [email protected]
                     [email protected]
                       [email protected]
                         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs b/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs
index 0e6e0ccc3..f1d0dc343 100644
--- a/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs
+++ b/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs
@@ -86,7 +86,7 @@ fn find_reparsable_node(node: SyntaxNodeRef, range: TextRange) -> Option<(Syntax
     fn reparser(node: SyntaxNodeRef) -> Option<fn(&mut Parser)> {
         let res = match node.kind() {
             BLOCK => grammar::block,
-            RECORD_FIELD_DEF_LIST => grammar::record_field_def_list,
+            RECORD_FIELD_LIST => grammar::record_field_list,
             _ => return None,
         };
         Some(res)
@@ -138,7 +138,7 @@ fn find_reparsable_node(node: SyntaxNodeRef, range: TextRange) -> Option<(Syntax
         let res = match node.kind() {
      ;
     let end = u32::from(range.end()) as usize;
-    text.replaT => grammar::record_field_def_list,
+    text.replaT => grammar::record_field_list,
             _ => return None,
         };
         Some(res)
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 @@ [email protected]
     [email protected]
       [email protected] "S"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] " "
-      RECORD_FIELD_DEF@31..47
+      [email protected]
         [email protected]
           [email protected] "crate"
         [email protected] " "
@@ -46,9 +46,9 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "T"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
-      TUPLE_FIELD_DEF@59..68
+      [email protected]
         [email protected]
           [email protected] "crate"
         [email protected] " "
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 @@ [email protected]
     [email protected]
       [email protected] "S"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@15..60
+      [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
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 @@ [email protected]
     [email protected]
       [email protected] "Foo"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
@@ -15,10 +15,10 @@ [email protected]
     [email protected]
       [email protected] "Foo"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@29..35
+      [email protected]
         [email protected]
           [email protected] "a"
         [email protected] ":"
@@ -30,7 +30,7 @@ [email protected]
                 [email protected] "i32"
       [email protected] ","
       [email protected] "\n    "
-      RECORD_FIELD_DEF@41..47
+      [email protected]
         [email protected]
           [email protected] "b"
         [email protected] ":"
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 @@ [email protected]
     [email protected]
       [email protected] "Foo"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
@@ -21,7 +21,7 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "Foo"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected] ";"
@@ -31,9 +31,9 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "Foo"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
-      TUPLE_FIELD_DEF@51..57
+      [email protected]
         [email protected]
           [email protected]
             [email protected]
@@ -41,7 +41,7 @@ [email protected]
                 [email protected] "String"
       [email protected] ","
       [email protected] " "
-      TUPLE_FIELD_DEF@59..64
+      [email protected]
         [email protected]
           [email protected]
             [email protected]
@@ -56,10 +56,10 @@ [email protected]
     [email protected]
       [email protected] "Foo"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@84..90
+      [email protected]
         [email protected]
           [email protected] "a"
         [email protected] ":"
@@ -71,7 +71,7 @@ [email protected]
                 [email protected] "i32"
       [email protected] ","
       [email protected] "\n    "
-      RECORD_FIELD_DEF@96..102
+      [email protected]
         [email protected]
           [email protected] "b"
         [email protected] ":"
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 @@ [email protected]
         [email protected]
           [email protected] "T"
       [email protected] ">"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
-      TUPLE_FIELD_DEF@15..16
+      [email protected]
         [email protected]
           [email protected]
             [email protected]
@@ -51,9 +51,9 @@ [email protected]
         [email protected]
           [email protected] "T"
       [email protected] ">"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
-      TUPLE_FIELD_DEF@49..50
+      [email protected]
         [email protected]
           [email protected]
             [email protected]
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 @@ [email protected]
     [email protected]
       [email protected] "S"
     [email protected] " "
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
       [email protected] "\n    "
-      TUPLE_FIELD_DEF@15..55
+      [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
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 @@ [email protected]
         [email protected]
           [email protected] "S"
         [email protected] " "
-        RECORD_FIELD_DEF_[email protected]
+        [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] ";"
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 @@ [email protected]
       [email protected]
         [email protected]
           [email protected] "X"
-        TUPLE_FIELD_DEF_[email protected]
+        [email protected]
           [email protected] "("
-          TUPLE_FIELD_DEF@11..14
+          [email protected]
             [email protected]
               [email protected]
                 [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast
index cf801aedd..c9d1af92f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast
@@ -20,10 +20,10 @@ [email protected]
                     [email protected] "Copy"
       [email protected] ">"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@24..28
+      [email protected]
         [email protected]
           [email protected] "f"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast
index a1d546491..57fb7a329 100644
--- a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast
@@ -5,10 +5,10 @@ [email protected]
     [email protected]
       [email protected] "S"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@15..23
+      [email protected]
         [email protected]
           [email protected] "foo"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast
index ea26f1440..60ded78d5 100644
--- a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast
@@ -46,7 +46,7 @@ [email protected]
         [email protected]
           [email protected] "S"
         [email protected] " "
-        RECORD_FIELD_DEF_[email protected]
+        [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast
index 95656d19b..00b1b65be 100644
--- a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast
@@ -12,7 +12,7 @@ [email protected]
     [email protected]
       [email protected] "B"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
@@ -21,7 +21,7 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "C"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected] ";"
@@ -32,10 +32,10 @@ [email protected]
     [email protected]
       [email protected] "D"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@50..56
+      [email protected]
         [email protected]
           [email protected] "a"
         [email protected] ":"
@@ -47,7 +47,7 @@ [email protected]
                 [email protected] "u32"
       [email protected] ","
       [email protected] "\n    "
-      RECORD_FIELD_DEF@62..72
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -68,9 +68,9 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "E"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
-      TUPLE_FIELD_DEF@85..90
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -81,7 +81,7 @@ [email protected]
                 [email protected] "x"
       [email protected] ","
       [email protected] " "
-      TUPLE_FIELD_DEF@92..93
+      [email protected]
         [email protected]
           [email protected]
             [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast
index 3ee208fff..b757bd16d 100644
--- a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast
@@ -23,9 +23,9 @@ [email protected]
         [email protected]
           [email protected] "T"
       [email protected] ">"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
-      TUPLE_FIELD_DEF@27..30
+      [email protected]
         [email protected]
           [email protected]
             [email protected]
@@ -46,10 +46,10 @@ [email protected]
           [email protected] "T"
       [email protected] ">"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] " "
-      RECORD_FIELD_DEF@48..54
+      [email protected]
         [email protected]
           [email protected] "u"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast b/crates/ra_syntax/test_data/parser/ok/0019_enums.rast
index 993f28c4d..1a32d88fd 100644
--- a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0019_enums.rast
@@ -86,10 +86,10 @@ [email protected]
         [email protected]
           [email protected] "C"
         [email protected] " "
-        RECORD_FIELD_DEF_[email protected]
+        [email protected]
           [email protected] "{"
           [email protected] "\n        "
-          RECORD_FIELD_DEF@113..119
+          [email protected]
             [email protected]
               [email protected] "a"
             [email protected] ":"
@@ -101,7 +101,7 @@ [email protected]
                     [email protected] "u32"
           [email protected] ","
           [email protected] "\n        "
-          RECORD_FIELD_DEF@129..139
+          [email protected]
             [email protected]
               [email protected] "pub"
             [email protected] " "
@@ -123,7 +123,7 @@ [email protected]
         [email protected]
           [email protected] "F"
         [email protected] " "
-        RECORD_FIELD_DEF_[email protected]
+        [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] ","
@@ -131,9 +131,9 @@ [email protected]
       [email protected]
         [email protected]
           [email protected] "D"
-        TUPLE_FIELD_DEF_[email protected]
+        [email protected]
           [email protected] "("
-          TUPLE_FIELD_DEF@164..167
+          [email protected]
             [email protected]
               [email protected]
                 [email protected]
@@ -146,7 +146,7 @@ [email protected]
       [email protected]
         [email protected]
           [email protected] "E"
-        TUPLE_FIELD_DEF_[email protected]
+        [email protected]
           [email protected] "("
           [email protected] ")"
       [email protected] ","
diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
index ea54651b7..2aa075993 100644
--- a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
@@ -1571,10 +1571,10 @@ [email protected]
             [email protected] "\'union"
           [email protected] ">"
         [email protected] " "
-        RECORD_FIELD_DEF_[email protected]
+        [email protected]
           [email protected] "{"
           [email protected] " "
-          RECORD_FIELD_DEF@2873..2901
+          [email protected]
             [email protected]
               [email protected] "union"
             [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast
index 5640bae0a..0f0138c86 100644
--- a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast
@@ -5,10 +5,10 @@ [email protected]
     [email protected]
       [email protected] "S"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@15..25
+      [email protected]
         [email protected]
           [email protected] "r#foo"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast
index 1c5545b6d..9c2ea3754 100644
--- a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast
@@ -7,10 +7,10 @@ [email protected]
     [email protected]
       [email protected] "Repr"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] " "
-      RECORD_FIELD_DEF@76..88
+      [email protected]
         [email protected]
           [email protected] "raw"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
index 29a5d48e6..fcf605ec8 100644
--- a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
@@ -268,9 +268,9 @@ [email protected]
       [email protected]
         [email protected]
           [email protected] "B"
-        TUPLE_FIELD_DEF_[email protected]
+        [email protected]
           [email protected] "("
-          TUPLE_FIELD_DEF@358..360
+          [email protected]
             [email protected]
               [email protected]
                 [email protected]
@@ -278,7 +278,7 @@ [email protected]
                     [email protected] "i8"
           [email protected] ","
           [email protected] " "
-          TUPLE_FIELD_DEF@362..364
+          [email protected]
             [email protected]
               [email protected]
                 [email protected]