Merge #5591

5591: Rename TypeAliasDef -> TypeAlias r=matklad a=matklad



bors r+
🤖

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

29 files changed, 41 insertions, 41 deletions

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/0007_stray_curly_in_file.rast b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
index b72c92c33..2ae5bacea 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
@@ -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/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/0012_broken_lambda.rast b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast
index e1e782f5f..c8bf96550 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]
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..1ab045a44 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,5 +1,5 @@
 [email protected]
-  FN_DEF@0..22
+  [email protected]
     [email protected] "fn"
     [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 a87e5061a..ce43ddf45 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
@@ -11,7 +11,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@20..161
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [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..866f61113 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]
@@ -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]
@@ -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]
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..1e94e72bc 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,5 +1,5 @@
 [email protected]
-  FN_DEF@0..53
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -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]
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..4b9bd679e 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]
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..53704f640 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]
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 0415085b0..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
@@ -34,7 +34,7 @@ [email protected]
   [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/0037_visibility_in_traits.rast b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
index bc446e3df..c0ba4fba9 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
@@ -17,7 +17,7 @@ [email protected]
     [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] "("
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/0044_unexpected_for_type.rast b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast
index cb90f28bc..19b3540e9 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]
@@ -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]
@@ -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]
@@ -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]
@@ -136,7 +136,7 @@ [email protected]
             [email protected] ")"
     [email protected] ";"
   [email protected] "\n"
-  FN_DEF@150..238
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
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]