From 1142112c70b705f59b7d559d9d72cdc831865158 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 14:51:08 +0200 Subject: Rename FnDef -> Fn --- crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast | 2 +- crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast | 2 +- crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast | 4 ++-- crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast | 2 +- crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast | 2 +- crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast | 2 +- crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast | 2 +- crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast | 2 +- crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast | 2 +- crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast | 4 ++-- crates/ra_syntax/test_data/parser/err/0019_let_recover.rast | 2 +- crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast | 4 ++-- crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast | 2 +- crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast | 6 +++--- crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast | 2 +- crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast | 4 ++-- crates/ra_syntax/test_data/parser/err/0025_nope.rast | 2 +- .../ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast | 2 +- crates/ra_syntax/test_data/parser/err/0029_field_completion.rast | 2 +- crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast | 2 +- .../ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast | 2 +- .../ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast | 2 +- crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast | 2 +- crates/ra_syntax/test_data/parser/err/0035_use_recover.rast | 2 +- .../ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast | 4 ++-- .../test_data/parser/err/0038_endless_inclusive_range.rast | 2 +- crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast | 2 +- crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast | 2 +- crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast | 2 +- 29 files changed, 36 insertions(+), 36 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/err') 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 @@ SOURCE_FILE@0..54 - FN_DEF@0..31 + FN@0..31 ATTR@0..18 POUND@0..1 "#" L_BRACK@1..2 "[" 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 @@ SOURCE_FILE@0..31 ERROR@14..15 R_CURLY@14..15 "}" WHITESPACE@15..17 "\n\n" - FN_DEF@17..27 + FN@17..27 FN_KW@17..19 "fn" WHITESPACE@19..20 " " NAME@20..23 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 @@ SOURCE_FILE@0..95 - FN_DEF@0..12 + FN@0..12 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 @@ -58,7 +58,7 @@ SOURCE_FILE@0..95 WHITESPACE@78..79 "\n" R_CURLY@79..80 "}" WHITESPACE@80..82 "\n\n" - FN_DEF@82..94 + FN@82..94 FN_KW@82..84 "fn" WHITESPACE@84..85 " " NAME@85..88 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 @@ SOURCE_FILE@0..42 - FN_DEF@0..41 + FN@0..41 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 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 @@ SOURCE_FILE@0..389 - FN_DEF@0..389 + FN@0..389 VISIBILITY@0..10 PUB_KW@0..3 L_PAREN@3..4 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 @@ SOURCE_FILE@0..23 - FN_DEF@0..22 + FN@0..22 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 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 @@ SOURCE_FILE@0..14 - FN_DEF@0..7 + FN@0..7 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 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 @@ SOURCE_FILE@0..56 - FN_DEF@0..55 + FN@0..55 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 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 @@ SOURCE_FILE@0..47 - FN_DEF@0..46 + FN@0..46 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 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 @@ SOURCE_FILE@0..183 ASSOC_ITEM_LIST@14..182 L_CURLY@14..15 "{" WHITESPACE@15..20 "\n " - FN_DEF@20..161 + FN@20..161 FN_KW@20..22 "fn" WHITESPACE@22..23 " " NAME@23..32 @@ -116,7 +116,7 @@ SOURCE_FILE@0..183 WHITESPACE@155..160 "\n " R_CURLY@160..161 "}" WHITESPACE@161..167 "\n\n " - FN_DEF@167..180 + FN@167..180 FN_KW@167..169 "fn" WHITESPACE@169..170 " " NAME@170..180 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 @@ SOURCE_FILE@0..139 - FN_DEF@0..138 + FN@0..138 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 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 @@ SOURCE_FILE@0..16 - FN_DEF@0..2 + FN@0..2 FN_KW@0..2 "fn" WHITESPACE@2..4 "\n\n" - FN_DEF@4..15 + FN@4..15 FN_KW@4..6 "fn" WHITESPACE@6..7 " " NAME@7..10 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 @@ SOURCE_FILE@0..22 - FN_DEF@0..21 + FN@0..21 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 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 @@ SOURCE_FILE@0..112 - FN_DEF@0..33 + FN@0..33 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..4 @@ -40,7 +40,7 @@ SOURCE_FILE@0..112 WHITESPACE@31..32 " " R_CURLY@32..33 "}" WHITESPACE@33..34 "\n" - FN_DEF@34..68 + FN@34..68 FN_KW@34..36 "fn" WHITESPACE@36..37 " " NAME@37..38 @@ -88,7 +88,7 @@ SOURCE_FILE@0..112 WHITESPACE@66..67 " " R_CURLY@67..68 "}" WHITESPACE@68..69 "\n" - FN_DEF@69..111 + FN@69..111 FN_KW@69..71 "fn" WHITESPACE@71..72 " " NAME@72..73 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 @@ SOURCE_FILE@0..94 - FN_DEF@0..55 + FN@0..55 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 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 @@ SOURCE_FILE@0..240 - FN_DEF@0..53 + FN@0..53 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..4 @@ -65,7 +65,7 @@ SOURCE_FILE@0..240 L_CURLY@51..52 "{" R_CURLY@52..53 "}" WHITESPACE@53..55 "\n\n" - FN_DEF@55..239 + FN@55..239 FN_KW@55..57 "fn" WHITESPACE@57..58 " " NAME@58..62 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 @@ SOURCE_FILE@0..575 - FN_DEF@0..574 + FN@0..574 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 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 @@ SOURCE_FILE@0..30 - FN_DEF@0..29 + FN@0..29 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 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 @@ SOURCE_FILE@0..24 - FN_DEF@0..23 + FN@0..23 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 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 @@ SOURCE_FILE@0..350 - FN_DEF@0..349 + FN@0..349 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..8 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 @@ SOURCE_FILE@0..293 - FN_DEF@0..292 + FN@0..292 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 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 @@ SOURCE_FILE@0..89 - FN_DEF@0..88 + FN@0..88 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 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 @@ SOURCE_FILE@0..91 - FN_DEF@0..89 + FN@0..89 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 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 @@ SOURCE_FILE@0..48 USE@34..37 USE_KW@34..37 "use" WHITESPACE@37..38 "\n" - FN_DEF@38..47 + FN@38..47 FN_KW@38..40 "fn" WHITESPACE@40..41 " " NAME@41..42 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..f180616f1 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 @@ SOURCE_FILE@0..118 ASSOC_ITEM_LIST@14..117 L_CURLY@14..15 "{" WHITESPACE@15..20 "\n " - FN_DEF@20..31 + FN@20..31 FN_KW@20..22 "fn" WHITESPACE@22..23 " " NAME@23..26 @@ -30,7 +30,7 @@ SOURCE_FILE@0..118 L_CURLY@29..30 "{" R_CURLY@30..31 "}" WHITESPACE@31..36 "\n " - FN_DEF@36..51 + FN@36..51 VISIBILITY@36..39 PUB_KW@36..39 "pub" WHITESPACE@39..40 " " 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 @@ SOURCE_FILE@0..33 - FN_DEF@0..32 + FN@0..32 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 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 @@ SOURCE_FILE@0..83 - FN_DEF@0..82 + FN@0..82 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 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..5f59c3bc2 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 @@ -136,7 +136,7 @@ SOURCE_FILE@0..239 R_PAREN@147..148 ")" SEMICOLON@148..149 ";" WHITESPACE@149..150 "\n" - FN_DEF@150..238 + FN@150..238 FN_KW@150..152 "fn" WHITESPACE@152..153 " " NAME@153..164 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 @@ SOURCE_FILE@0..83 - FN_DEF@0..82 + FN@0..82 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 -- cgit v1.2.3