Merge #5606

5606: Finalize impl Grammar r=matklad a=matklad



bors r+
🤖

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

35 files changed, 47 insertions, 47 deletions

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 1ce5f188f..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]
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 02339d035..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
@@ -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]
@@ -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/0026_imp_recovery.rast b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast
index 8c8bf7b7e..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,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..14
+  [email protected]
     [email protected] "impl"
     [email protected]
       [email protected] "<"
@@ -17,7 +17,7 @@ [email protected]
                     [email protected] "Clone"
       [email protected] ">"
   [email protected] "\n"
-  IMPL_DEF@15..37
+  [email protected]
     [email protected] "impl"
     [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 b1400aa5f..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]
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 f041fa6f7..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,5 +1,5 @@
 [email protected]
-  TRAIT_DEF@0..38
+  [email protected]
     [email protected] "trait"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
index 8b0a888fd..a4271fc87 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
@@ -17,7 +17,7 @@ [email protected]
             [email protected] "\'loop"
             [email protected] ":"
       [email protected] " "
-      IMPL_DEF@23..27
+      [email protected]
         [email protected] "impl"
       [email protected] "\n"
       [email protected] "}"
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast
index 2d0253aa0..29d6b3974 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..12
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]
@@ -12,7 +12,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  IMPL_DEF@13..33
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]
@@ -33,10 +33,10 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  IMPL_DEF@34..38
+  [email protected]
     [email protected] "impl"
   [email protected] " "
-  IMPL_DEF@39..54
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]
@@ -49,7 +49,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  IMPL_DEF@55..70
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]
@@ -60,7 +60,7 @@ [email protected]
     [email protected] " "
     [email protected] "for"
   [email protected] " "
-  IMPL_DEF@71..86
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
index 22c7c5f0d..acd72094b 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TRAIT_DEF@0..61
+  [email protected]
     [email protected] "trait"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
index 955e00dde..c7289e400 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..82
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
index 87c170707..ae61cbad8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..127
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.rast b/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.rast
index 69b82e33c..625ab4c2d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TRAIT_DEF@0..17
+  [email protected]
     [email protected] "unsafe"
     [email protected] " "
     [email protected] "trait"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
index e75180900..20b2b6c19 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..68
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
index 52181ca0c..ca0702aba 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..88
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast
index 8f20ccaa3..3638462f8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TRAIT_DEF@0..41
+  [email protected]
     [email protected] "trait"
     [email protected] " "
     [email protected]
@@ -52,7 +52,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  TRAIT_DEF@42..100
+  [email protected]
     [email protected] "trait"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast
index 8a6b5a8fc..d6dfa83b7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..26
+  [email protected]
     [email protected] "unsafe"
     [email protected] " "
     [email protected] "default"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast
index 02c57079f..a5bf55131 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TRAIT_DEF@0..21
+  [email protected]
     [email protected] "trait"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast
index 31178f86e..4368930cc 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..19
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected] "!"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast b/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast
index 26825ef86..209711fc4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..11
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast
index e3223cee5..43c09affe 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..18
+  [email protected]
     [email protected] "unsafe"
     [email protected] " "
     [email protected] "impl"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.rast b/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.rast
index 7efa4c34d..0cac9ac43 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TRAIT_DEF@0..15
+  [email protected]
     [email protected] "auto"
     [email protected] " "
     [email protected] "trait"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.rast b/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.rast
index fad27be66..0ef11c682 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TRAIT_DEF@0..22
+  [email protected]
     [email protected] "unsafe"
     [email protected] " "
     [email protected] "auto"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast
index 8a839a4a6..0a1b21d6e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..19
+  [email protected]
     [email protected] "default"
     [email protected] " "
     [email protected] "impl"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
index f2561abd6..141a7b203 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
@@ -8,7 +8,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  IMPL_DEF@9..93
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
index de02238df..b8d26a53a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..68
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
index 07e555d63..8f197a19d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..28
+  [email protected]
     [email protected] "impl"
     [email protected]
       [email protected] "<"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast b/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast
index e2a770a37..cc220e534 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TRAIT_DEF@0..18
+  [email protected]
     [email protected] "trait"
     [email protected] " "
     [email protected]
@@ -31,7 +31,7 @@ [email protected]
                 [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  TRAIT_DEF@19..51
+  [email protected]
     [email protected] "trait"
     [email protected] " "
     [email protected]
@@ -82,7 +82,7 @@ [email protected]
                     [email protected] "Copy"
     [email protected] ";"
   [email protected] "\n"
-  TRAIT_DEF@52..82
+  [email protected]
     [email protected] "trait"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast
index 680f35445..1269621dc 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..49
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast
index e0c338297..6bfe925af 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..26
+  [email protected]
     [email protected] "default"
     [email protected] " "
     [email protected] "unsafe"
diff --git a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast b/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
index 4bcf07ffb..280d4cb82 100644
--- a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TRAIT_DEF@0..36
+  [email protected]
     [email protected] "trait"
     [email protected] " "
     [email protected]
@@ -20,7 +20,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  TRAIT_DEF@38..95
+  [email protected]
     [email protected] "trait"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast
index c4ffc0a3d..ed29b0812 100644
--- a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast
@@ -8,7 +8,7 @@ [email protected]
       [email protected] "Foo"
     [email protected] ";"
   [email protected] "\n\n"
-  IMPL_DEF@75..141
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
index 5ebc53618..139ce9046 100644
--- a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
@@ -89,7 +89,7 @@ [email protected]
   [email protected] "\n\n"
   [email protected] "// https://github.com ..."
   [email protected] "\n"
-  IMPL_DEF@524..685
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
index 8081eefbc..2cc849784 100644
--- a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
@@ -186,7 +186,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n\n"
-  TRAIT_DEF@174..236
+  [email protected]
     [email protected] "trait"
     [email protected] " "
     [email protected]
@@ -251,7 +251,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  IMPL_DEF@238..519
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
index a87bbf4eb..facce8167 100644
--- a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TRAIT_DEF@0..169
+  [email protected]
     [email protected] "trait"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
index ef0eca47c..453757c3c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..136
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast
index 485efe20c..6246a31a6 100644
--- a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..45
+  [email protected]
     [email protected] "impl"
     [email protected] " "
     [email protected]