44 files changed, 140 insertions, 140 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..bbbf496c8 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
@@ -1,14 +1,14 @@
 [email protected]
-  STRUCT_DEF@0..34
+  [email protected]
     [email protected] "struct"
     [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..6dc73bfdb 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
@@ -5,13 +5,13 @@ [email protected]
   [email protected]
     [email protected] "match"
   [email protected] "\n\n"
-  STRUCT_DEF@10..21
+  [email protected]
     [email protected] "struct"
     [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/0002_duplicate_shebang.rast b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast
index 6717995e9..4cfd1bce4 100644
--- a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast
+++ b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast
@@ -6,7 +6,7 @@ [email protected]
     [email protected] "!"
   [email protected]
     [email protected] "/"
-  USE_ITEM@24..28
+  [email protected]
     [email protected] "use"
     [email protected]
       [email protected] "/"
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..7763fad84 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
@@ -1,14 +1,14 @@
 [email protected]
-  STRUCT_DEF@0..39
+  [email protected]
     [email protected] "struct"
     [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/0004_use_path_bad_segment.rast b/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast
index b3bcf472a..9a0f4665e 100644
--- a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast
+++ b/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..12
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast
index 375ed45e0..4845a6563 100644
--- a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..31
+  [email protected]
     [email protected]
       [email protected] "#"
       [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..5f85c3943 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
@@ -1,14 +1,14 @@
 [email protected]
-  STRUCT_DEF@0..73
+  [email protected]
     [email protected] "struct"
     [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/0007_stray_curly_in_file.rast b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
index b72c92c33..560bfd751 100644
--- a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
+++ b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
@@ -2,7 +2,7 @@ [email protected]
   [email protected]
     [email protected] "}"
   [email protected] "\n\n"
-  STRUCT_DEF@3..12
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
@@ -12,7 +12,7 @@ [email protected]
   [email protected]
     [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@17..27
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
index 33953d8d7..1e9637c26 100644
--- a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..12
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -58,7 +58,7 @@ [email protected]
     [email protected] "\n"
     [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@82..94
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast
index aca02ece4..dacf71aa1 100644
--- a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast
+++ b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast
@@ -1,10 +1,10 @@
 [email protected]
-  STRUCT_DEF@0..11
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected] "90"
@@ -38,7 +38,7 @@ [email protected]
     [email protected] "\n"
     [email protected] "}"
   [email protected] "\n\n"
-  STRUCT_DEF@33..42
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
index 3bf57eacc..1c3e0f65b 100644
--- a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
+++ b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..41
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast
index 87c54c32c..b02d390af 100644
--- a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast
+++ b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast
@@ -3,7 +3,7 @@ [email protected]
     [email protected]
       [email protected] "extern"
   [email protected] " "
-  STRUCT_DEF@7..18
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast
index e1e782f5f..d62906b99 100644
--- a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast
+++ b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..389
+  [email protected]
     [email protected]
       [email protected]
       [email protected]
@@ -10,7 +10,7 @@ [email protected]
     [email protected]
     [email protected]
       [email protected] "process"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected]
       [email protected]
         [email protected] "'a"
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..3eef848fc 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
@@ -1,5 +1,5 @@
 [email protected]
-  STRUCT_DEF@0..72
+  [email protected]
     [email protected]
       [email protected] "pub"
     [email protected] " "
@@ -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/0014_where_no_bounds.rast b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast
index 9323b7890..a1f39b22a 100644
--- a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..22
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "foo"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast b/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast
index b18378cff..a3c25b450 100644
--- a/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast
+++ b/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..7
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
index 93434f34f..66157c3dc 100644
--- a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
+++ b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..55
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
index 628315c78..bb4a28f4e 100644
--- a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
+++ b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..46
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
index 31cc4e551..bc95b8512 100644
--- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
+++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..182
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]
@@ -8,10 +8,10 @@ [email protected]
           [email protected]
             [email protected] "FnScopes"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@20..161
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -75,16 +75,16 @@ [email protected]
               [email protected] "push"
             [email protected]
               [email protected] "("
-              RECORD_LIT@111..154
+              RECORD_EXPR@111..154
                 [email protected]
                   [email protected]
                     [email protected]
                       [email protected] "ScopeData"
                 [email protected] " "
-                [email protected]
+                RECORD_EXPR_[email protected]
                   [email protected] "{"
                   [email protected] " "
-                  [email protected]
+                  RECORD_EXPR_[email protected]
                     [email protected]
                       [email protected] "parent"
                     [email protected] ":"
@@ -96,7 +96,7 @@ [email protected]
                             [email protected] "None"
                   [email protected] ","
                   [email protected] " "
-                  [email protected]
+                  RECORD_EXPR_[email protected]
                     [email protected]
                       [email protected] "entries"
                     [email protected] ":"
@@ -116,7 +116,7 @@ [email protected]
           [email protected] "\n    "
           [email protected] "}"
       [email protected] "\n\n    "
-      FN_DEF@167..180
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
index 4ff27f5c8..f6fa964b7 100644
--- a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..138
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast
index 5f3a31473..6f6feba5a 100644
--- a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast
@@ -1,8 +1,8 @@
 [email protected]
-  FN_DEF@0..2
+  [email protected]
     [email protected] "fn"
   [email protected] "\n\n"
-  FN_DEF@4..15
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
index 1746bd3c1..ba4ce4795 100644
--- a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
+++ b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..21
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
index 28146f44e..71fb19783 100644
--- a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..33
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -28,7 +28,7 @@ [email protected]
         [email protected]
           [email protected] ","
       [email protected] " "
-      STRUCT_DEF@19..26
+      [email protected]
         [email protected] "struct"
         [email protected]
           [email protected] ","
@@ -40,7 +40,7 @@ [email protected]
       [email protected] " "
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@34..68
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -75,7 +75,7 @@ [email protected]
         [email protected]
           [email protected] ","
       [email protected] " "
-      IMPL_DEF@56..60
+      [email protected]
         [email protected] "impl"
       [email protected]
         [email protected]
@@ -88,7 +88,7 @@ [email protected]
       [email protected] " "
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@69..111
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -133,7 +133,7 @@ [email protected]
         [email protected]
           [email protected] ","
       [email protected] " "
-      TRAIT_DEF@98..104
+      [email protected]
         [email protected] "trait"
         [email protected]
           [email protected] ","
diff --git a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
index 9ea9d715e..5ffefd742 100644
--- a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
+++ b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..55
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
index 48610a5eb..4c2d1ad68 100644
--- a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
+++ b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..53
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "f"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -39,7 +39,7 @@ [email protected]
             [email protected] "("
             [email protected]
               [email protected] "for"
-              TYP[email protected]
+              GENERIC[email protected]
                 [email protected] "<"
                 [email protected]
                   [email protected] "\'a"
@@ -65,7 +65,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@55..239
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -122,7 +122,7 @@ [email protected]
               [email protected] "("
               [email protected]
                 [email protected] "for"
-                TYP[email protected]
+                GENERIC[email protected]
                   [email protected] "<"
                   [email protected]
                     [email protected] "\'a"
@@ -242,7 +242,7 @@ [email protected]
                           [email protected] "("
                           [email protected]
                             [email protected] "for"
-                            TYP[email protected]
+                            GENERIC[email protected]
                               [email protected] "<"
                               [email protected]
                                 [email protected] "\'a"
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 88b086daf..fca646557 100644
--- a/crates/ra_syntax/test_data/parser/err/0025_nope.rast
+++ b/crates/ra_syntax/test_data/parser/err/0025_nope.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..574
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -11,26 +11,26 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      ENUM_DEF@16..152
+      [email protected]
         [email protected] "enum"
         [email protected] " "
         [email protected]
           [email protected] "Test"
         [email protected] " "
-        ENUM_[email protected]
+        [email protected]
           [email protected] "{"
           [email protected] "\n        "
-          ENUM_[email protected]
+          [email protected]
             [email protected]
               [email protected] "Var1"
           [email protected] ","
           [email protected] "\n        "
-          ENUM_[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]
@@ -39,14 +39,14 @@ [email protected]
               [email protected] ")"
           [email protected] ","
           [email protected] "\n        "
-          ENUM_[email protected]
+          [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] ":"
@@ -79,39 +79,39 @@ [email protected]
           [email protected] "1"
         [email protected] ";"
       [email protected] "\n    "
-      ENUM_DEF@191..223
+      [email protected]
         [email protected] "enum"
         [email protected] " "
         [email protected]
           [email protected] "Test2"
         [email protected] " "
-        ENUM_[email protected]
+        [email protected]
           [email protected] "{"
           [email protected] "\n        "
-          ENUM_[email protected]
+          [email protected]
             [email protected]
               [email protected] "Fine"
           [email protected] ","
           [email protected] "\n    "
           [email protected] "}"
       [email protected] "\n\n    "
-      ENUM_DEF@229..300
+      [email protected]
         [email protected] "enum"
         [email protected] " "
         [email protected]
           [email protected] "Test3"
         [email protected] " "
-        ENUM_[email protected]
+        [email protected]
           [email protected] "{"
           [email protected] "\n        "
-          ENUM_[email protected]
+          [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] ":"
@@ -132,7 +132,7 @@ [email protected]
         [email protected]
           [email protected] "{"
           [email protected] "\n        "
-          ENUM_DEF@316..453
+          [email protected]
             [email protected] "// fail again"
             [email protected] "\n        "
             [email protected] "enum"
@@ -140,15 +140,15 @@ [email protected]
             [email protected]
               [email protected] "Test4"
             [email protected] " "
-            ENUM_[email protected]
+            [email protected]
               [email protected] "{"
               [email protected] "\n            "
-              ENUM_[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/err/0026_imp_recovery.rast b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast
index bf07409fb..7e4b11c27 100644
--- a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast
@@ -1,7 +1,7 @@
 [email protected]
-  IMPL_DEF@0..14
+  [email protected]
     [email protected] "impl"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -17,9 +17,9 @@ [email protected]
                     [email protected] "Clone"
       [email protected] ">"
   [email protected] "\n"
-  IMPL_DEF@15..37
+  [email protected]
     [email protected] "impl"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -41,7 +41,7 @@ [email protected]
                       [email protected] "T"
             [email protected] ">"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
index 4d6461d1e..a8e42e6ea 100644
--- a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
+++ b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..29
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -13,7 +13,7 @@ [email protected]
       [email protected] " "
       [email protected]
         [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
           [email protected] "<"
           [email protected]
             [email protected] "\'a"
diff --git a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
index 0da8f59f0..bfcd0149e 100644
--- a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
+++ b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..23
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
index 515819e42..55ff3943f 100644
--- a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..349
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
index c6859eca8..ec9f556aa 100644
--- a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..292
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
index 53e445459..063532e02 100644
--- a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..88
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
index 1b2ac5011..303a49576 100644
--- a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..89
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
index 9588cf3b3..2f03709eb 100644
--- a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..13
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -14,10 +14,10 @@ [email protected]
             [email protected] "bar"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@14..17
+  [email protected]
     [email protected] "use"
   [email protected] "\n"
-  USE_ITEM@18..33
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -31,10 +31,10 @@ [email protected]
             [email protected] "baz"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@34..37
+  [email protected]
     [email protected] "use"
   [email protected] "\n"
-  FN_DEF@38..47
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast b/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast
index f926b67d2..ef6172f8a 100644
--- a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast
+++ b/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..36
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
index e3cda7c43..faf87d6e5 100644
--- a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
+++ b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..117
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]
@@ -14,10 +14,10 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@20..31
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -30,7 +30,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@36..51
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -46,7 +46,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      TYPE_ALIAS_DEF@56..81
+      [email protected]
         [email protected]
           [email protected] "pub"
           [email protected] "("
@@ -65,7 +65,7 @@ [email protected]
           [email protected] ")"
         [email protected] ";"
       [email protected] "\n    "
-      CONST_DEF@86..115
+      [email protected]
         [email protected]
           [email protected] "pub"
           [email protected] "("
diff --git a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
index 21db9ee85..bed7ad6c3 100644
--- a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
+++ b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..32
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
index ec950381b..a98c31b0c 100644
--- a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..82
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
index d2a549273..284c8715b 100644
--- a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
+++ b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..12
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -9,7 +9,7 @@ [email protected]
           [email protected] "crate"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@13..54
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -52,7 +52,7 @@ [email protected]
         [email protected] "}"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@55..72
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -66,7 +66,7 @@ [email protected]
           [email protected] "crate"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@73..97
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
index d0360c467..2049a9d72 100644
--- a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
+++ b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..12
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -9,7 +9,7 @@ [email protected]
           [email protected] "super"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@13..26
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -23,7 +23,7 @@ [email protected]
           [email protected] "super"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@27..47
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -41,7 +41,7 @@ [email protected]
           [email protected] "super"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@48..66
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
index 4f382b06c..deadf56b4 100644
--- a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
+++ b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..11
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -9,7 +9,7 @@ [email protected]
           [email protected] "self"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@12..24
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0043_default_const.rast b/crates/ra_syntax/test_data/parser/err/0043_default_const.rast
index 8eb583ef8..51ad2a846 100644
--- a/crates/ra_syntax/test_data/parser/err/0043_default_const.rast
+++ b/crates/ra_syntax/test_data/parser/err/0043_default_const.rast
@@ -1,11 +1,11 @@
 [email protected]
-  TRAIT_DEF@0..38
+  [email protected]
     [email protected] "trait"
     [email protected] " "
     [email protected]
       [email protected] "T"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n  "
       [email protected]
@@ -14,7 +14,7 @@ [email protected]
             [email protected]
               [email protected] "default"
       [email protected] " "
-      CONST_DEF@20..36
+      [email protected]
         [email protected] "const"
         [email protected] " "
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast
index cb90f28bc..082625c13 100644
--- a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast
+++ b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..30
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -9,7 +9,7 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "for"
-      TYP[email protected]
+      GENERIC[email protected]
         [email protected] "<"
         [email protected]
           [email protected] "\'a"
@@ -26,7 +26,7 @@ [email protected]
                 [email protected] "u32"
     [email protected] ";"
   [email protected] "\n"
-  TYPE_ALIAS_DEF@31..64
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -36,7 +36,7 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "for"
-      TYP[email protected]
+      GENERIC[email protected]
         [email protected] "<"
         [email protected]
           [email protected] "\'a"
@@ -57,7 +57,7 @@ [email protected]
         [email protected] ")"
     [email protected] ";"
   [email protected] "\n"
-  TYPE_ALIAS_DEF@65..95
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -67,7 +67,7 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "for"
-      TYP[email protected]
+      GENERIC[email protected]
         [email protected] "<"
         [email protected]
           [email protected] "\'a"
@@ -83,7 +83,7 @@ [email protected]
         [email protected] "]"
     [email protected] ";"
   [email protected] "\n"
-  TYPE_ALIAS_DEF@96..149
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -93,7 +93,7 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "for"
-      TYP[email protected]
+      GENERIC[email protected]
         [email protected] "<"
         [email protected]
           [email protected] "\'a"
@@ -101,7 +101,7 @@ [email protected]
       [email protected] " "
       [email protected]
         [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
           [email protected] "<"
           [email protected]
             [email protected] "\'b"
@@ -136,12 +136,12 @@ [email protected]
             [email protected] ")"
     [email protected] ";"
   [email protected] "\n"
-  FN_DEF@150..238
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "for_for_for"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -156,7 +156,7 @@ [email protected]
       [email protected] "\n    "
       [email protected]
         [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
           [email protected] "<"
           [email protected]
             [email protected] "\'a"
@@ -164,7 +164,7 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected] "for"
-          TYP[email protected]
+          GENERIC[email protected]
             [email protected] "<"
             [email protected]
               [email protected] "\'b"
@@ -172,7 +172,7 @@ [email protected]
           [email protected] " "
           [email protected]
             [email protected] "for"
-            TYP[email protected]
+            GENERIC[email protected]
               [email protected] "<"
               [email protected]
                 [email protected] "\'c"
diff --git a/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast
index e46456384..df29017e7 100644
--- a/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast
+++ b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..82
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]