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 --- .../test_data/parser/inline/err/0002_misplaced_label_err.rast | 2 +- .../test_data/parser/inline/err/0006_unsafe_block_in_mod.rast | 4 ++-- .../parser/inline/err/0007_async_without_semicolon.rast | 2 +- .../ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast | 2 +- .../parser/inline/err/0009_attr_on_expr_not_allowed.rast | 2 +- .../test_data/parser/inline/err/0010_bad_tuple_index_expr.rast | 2 +- .../test_data/parser/inline/err/0010_wrong_order_fns.rast | 2 +- .../test_data/parser/inline/err/0014_default_fn_type.rast | 2 +- .../err/0014_record_literal_before_ellipsis_recovery.rast | 2 +- .../test_data/parser/inline/ok/0001_trait_item_list.rast | 4 ++-- .../test_data/parser/inline/ok/0003_where_pred_for.rast | 2 +- .../test_data/parser/inline/ok/0005_function_type_params.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0006_self_param.rast | 10 +++++----- .../ra_syntax/test_data/parser/inline/ok/0008_path_part.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast | 2 +- .../test_data/parser/inline/ok/0015_continue_expr.rast | 2 +- .../test_data/parser/inline/ok/0018_arb_self_types.rast | 4 ++-- .../ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast | 2 +- .../test_data/parser/inline/ok/0021_impl_item_list.rast | 4 ++-- .../ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast | 2 +- .../test_data/parser/inline/ok/0026_tuple_pat_fields.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast | 4 ++-- .../ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast | 2 +- .../test_data/parser/inline/ok/0036_unsafe_extern_fn.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast | 2 +- .../test_data/parser/inline/ok/0038_full_range_expr.rast | 2 +- .../test_data/parser/inline/ok/0040_crate_keyword_vis.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0044_block_items.rast | 4 ++-- .../parser/inline/ok/0045_param_list_opt_patterns.rast | 2 +- .../test_data/parser/inline/ok/0048_path_type_with_bounds.rast | 4 ++-- crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast | 2 +- .../test_data/parser/inline/ok/0055_literal_pattern.rast | 2 +- .../test_data/parser/inline/ok/0056_where_clause.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast | 2 +- .../test_data/parser/inline/ok/0059_match_arms_commas.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast | 2 +- .../test_data/parser/inline/ok/0062_mod_contents.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast | 2 +- .../parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast | 2 +- .../parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast | 8 ++++---- .../test_data/parser/inline/ok/0076_function_where_clause.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast | 2 +- .../test_data/parser/inline/ok/0080_postfix_range.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast | 2 +- .../test_data/parser/inline/ok/0085_expr_literals.rast | 2 +- .../test_data/parser/inline/ok/0086_function_ret_type.rast | 4 ++-- .../test_data/parser/inline/ok/0088_break_ambiguity.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast | 2 +- .../test_data/parser/inline/ok/0095_placeholder_pat.rast | 2 +- .../test_data/parser/inline/ok/0096_no_semi_after_block.rast | 2 +- .../test_data/parser/inline/ok/0098_const_unsafe_fn.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0099_param_list.rast | 8 ++++---- crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast | 2 +- .../test_data/parser/inline/ok/0102_record_field_pat_list.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast | 2 +- .../test_data/parser/inline/ok/0107_method_call_expr.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast | 2 +- .../test_data/parser/inline/ok/0113_nocontentexpr.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast | 2 +- .../parser/inline/ok/0120_match_arms_inner_attribute.rast | 2 +- .../parser/inline/ok/0121_match_arms_outer_attributes.rast | 2 +- .../parser/inline/ok/0122_generic_lifetime_type_attribute.rast | 2 +- .../test_data/parser/inline/ok/0123_param_list_vararg.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast | 2 +- .../test_data/parser/inline/ok/0125_crate_keyword_path.rast | 2 +- .../parser/inline/ok/0125_record_literal_field_with_attr.rast | 2 +- .../test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast | 2 +- .../parser/inline/ok/0127_attr_on_last_expr_in_block.rast | 2 +- .../test_data/parser/inline/ok/0128_combined_fns.rast | 4 ++-- .../ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast | 2 +- .../test_data/parser/inline/ok/0130_try_block_expr.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast | 2 +- .../test_data/parser/inline/ok/0132_default_fn_type.rast | 2 +- .../parser/inline/ok/0134_nocontentexpr_after_item.rast | 4 ++-- .../ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast | 2 +- .../parser/inline/ok/0138_associated_type_bounds.rast | 2 +- .../parser/inline/ok/0138_expression_after_block.rast | 2 +- .../test_data/parser/inline/ok/0138_self_param_outer_attr.rast | 2 +- .../test_data/parser/inline/ok/0139_param_outer_arg.rast | 2 +- .../test_data/parser/inline/ok/0142_for_range_from.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast | 2 +- .../test_data/parser/inline/ok/0145_record_field_pat.rast | 2 +- .../test_data/parser/inline/ok/0146_as_precedence.rast | 2 +- .../test_data/parser/inline/ok/0152_arg_with_attr.rast | 2 +- .../test_data/parser/inline/ok/0155_closure_params.rast | 2 +- .../test_data/parser/inline/ok/0156_fn_def_param.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast | 2 +- .../parser/inline/ok/0158_binop_resets_statementness.rast | 2 +- .../test_data/parser/inline/ok/0158_lambda_ret_block.rast | 2 +- .../test_data/parser/inline/ok/0159_try_macro_fallback.rast | 2 +- .../test_data/parser/inline/ok/0161_labeled_block.rast | 2 +- .../test_data/parser/inline/ok/0162_unsafe_block.rast | 2 +- .../test_data/parser/inline/ok/0163_default_unsafe_fn.rast | 2 +- .../test_data/parser/inline/ok/0164_type_path_in_pattern.rast | 2 +- 113 files changed, 133 insertions(+), 133 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/inline') 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 75668c818..8b0a888fd 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 @@ -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..7 diff --git a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast index c789e8d82..cc0f8bcaf 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..33 - FN_DEF@0..10 + FN@0..10 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 @@ -19,7 +19,7 @@ SOURCE_FILE@0..33 WHITESPACE@19..20 " " R_CURLY@20..21 "}" WHITESPACE@21..22 " " - FN_DEF@22..32 + FN@22..32 FN_KW@22..24 "fn" WHITESPACE@24..25 " " NAME@25..28 diff --git a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast index cd24313d4..3f3a7f1b9 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.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/inline/err/0008_pub_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast index c5fa7a404..63a10127d 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..21 - FN_DEF@0..20 + FN@0..20 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast index 4e3fa704e..8fd8d5e59 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..48 - FN_DEF@0..47 + FN@0..47 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast index e1abc5633..fa14e1e6d 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.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/inline/err/0010_wrong_order_fns.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast index 53f7ebaf9..d2a18330f 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast @@ -2,7 +2,7 @@ SOURCE_FILE@0..50 ERROR@0..6 UNSAFE_KW@0..6 "unsafe" WHITESPACE@6..7 " " - FN_DEF@7..24 + FN@7..24 ASYNC_KW@7..12 "async" WHITESPACE@12..13 " " FN_KW@13..15 "fn" 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 5501dc5a6..b31195281 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 @@ -35,7 +35,7 @@ SOURCE_FILE@0..62 NAME_REF@40..47 IDENT@40..47 "default" WHITESPACE@47..48 " " - FN_DEF@48..59 + FN@48..59 FN_KW@48..50 "fn" WHITESPACE@50..51 " " NAME@51..54 diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast index a9de44b57..6753c3fe7 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..45 - FN_DEF@0..44 + FN@0..44 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 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 f422acdda..7847ba65a 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 @@ -41,7 +41,7 @@ SOURCE_FILE@0..83 IDENT@41..44 "i32" SEMICOLON@44..45 ";" WHITESPACE@45..50 "\n " - FN_DEF@50..61 + FN@50..61 FN_KW@50..52 "fn" WHITESPACE@52..53 " " NAME@53..56 @@ -54,7 +54,7 @@ SOURCE_FILE@0..83 L_CURLY@59..60 "{" R_CURLY@60..61 "}" WHITESPACE@61..66 "\n " - FN_DEF@66..80 + FN@66..80 FN_KW@66..68 "fn" WHITESPACE@68..69 " " NAME@69..72 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast index cd0892451..9cae1e8cc 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..54 - FN_DEF@0..53 + FN@0..53 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..12 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast index 6c8c1e24b..1b56e20d5 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..28 - FN_DEF@0..27 + FN@0..27 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 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 0cd1dffc9..87c170707 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 @@ -11,7 +11,7 @@ SOURCE_FILE@0..128 ASSOC_ITEM_LIST@7..127 L_CURLY@7..8 "{" WHITESPACE@8..13 "\n " - FN_DEF@13..26 + FN@13..26 FN_KW@13..15 "fn" WHITESPACE@15..16 " " NAME@16..17 @@ -26,7 +26,7 @@ SOURCE_FILE@0..128 L_CURLY@24..25 "{" R_CURLY@25..26 "}" WHITESPACE@26..31 "\n " - FN_DEF@31..46 + FN@31..46 FN_KW@31..33 "fn" WHITESPACE@33..34 " " NAME@34..35 @@ -43,7 +43,7 @@ SOURCE_FILE@0..128 L_CURLY@44..45 "{" R_CURLY@45..46 "}" WHITESPACE@46..51 "\n " - FN_DEF@51..69 + FN@51..69 FN_KW@51..53 "fn" WHITESPACE@53..54 " " NAME@54..55 @@ -62,7 +62,7 @@ SOURCE_FILE@0..128 L_CURLY@67..68 "{" R_CURLY@68..69 "}" WHITESPACE@69..74 "\n " - FN_DEF@74..103 + FN@74..103 FN_KW@74..76 "fn" WHITESPACE@76..77 " " NAME@77..78 @@ -95,7 +95,7 @@ SOURCE_FILE@0..128 L_CURLY@101..102 "{" R_CURLY@102..103 "}" WHITESPACE@103..108 "\n " - FN_DEF@108..125 + FN@108..125 FN_KW@108..110 "fn" WHITESPACE@110..111 " " NAME@111..112 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast index 10eb31d68..3ce2acfae 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..103 - FN_DEF@0..102 + FN@0..102 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast index 425e5196c..f62826fd5 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..26 - FN_DEF@0..25 + FN@0..25 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast index d823c08fc..66a609346 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..48 - FN_DEF@0..47 + FN@0..47 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast index 422912e3c..104e153ce 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..69 - FN_DEF@0..68 + FN@0..68 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 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 79148e953..e75180900 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 @@ -11,7 +11,7 @@ SOURCE_FILE@0..69 ASSOC_ITEM_LIST@7..68 L_CURLY@7..8 "{" WHITESPACE@8..13 "\n " - FN_DEF@13..33 + FN@13..33 FN_KW@13..15 "fn" WHITESPACE@15..16 " " NAME@16..17 @@ -35,7 +35,7 @@ SOURCE_FILE@0..69 L_CURLY@31..32 "{" R_CURLY@32..33 "}" WHITESPACE@33..38 "\n " - FN_DEF@38..66 + FN@38..66 FN_KW@38..40 "fn" WHITESPACE@40..41 " " NAME@41..42 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast index 10d6b2fde..7db38ea4d 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..44 - FN_DEF@0..43 + FN@0..43 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 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 31b5b6616..daa55ec6c 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 @@ -45,7 +45,7 @@ SOURCE_FILE@0..89 INT_NUMBER@46..48 "92" SEMICOLON@48..49 ";" WHITESPACE@49..54 "\n " - FN_DEF@54..65 + FN@54..65 FN_KW@54..56 "fn" WHITESPACE@56..57 " " NAME@57..60 @@ -58,7 +58,7 @@ SOURCE_FILE@0..89 L_CURLY@63..64 "{" R_CURLY@64..65 "}" WHITESPACE@65..70 "\n " - FN_DEF@70..86 + FN@70..86 FN_KW@70..72 "fn" WHITESPACE@72..73 " " NAME@73..76 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast index 7eb27d5e1..dea0c73f7 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..39 - FN_DEF@0..38 + FN@0..38 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast index b4598768e..e5f550347 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..97 - FN_DEF@0..96 + FN@0..96 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast index b824c10a8..9e76d881e 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..52 - FN_DEF@0..51 + FN@0..51 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast index fabb09937..e096b3a1f 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.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/inline/ok/0030_cond.rast b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast index 3aed26732..381284dc5 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..197 - FN_DEF@0..37 + FN@0..37 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 @@ -41,7 +41,7 @@ SOURCE_FILE@0..197 WHITESPACE@35..36 " " R_CURLY@36..37 "}" WHITESPACE@37..38 "\n" - FN_DEF@38..196 + FN@38..196 FN_KW@38..40 "fn" WHITESPACE@40..41 " " NAME@41..44 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast index 899b63aac..ffe1a3a01 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..93 - FN_DEF@0..92 + FN@0..92 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast index e064aafaf..f905def6f 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..102 - FN_DEF@0..101 + FN@0..101 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast index cf5825593..293b1d64c 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..30 - FN_DEF@0..29 + FN@0..29 UNSAFE_KW@0..6 "unsafe" WHITESPACE@6..7 " " ABI@7..17 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast index fbd90bc0f..8f6cd2e2f 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast @@ -32,7 +32,7 @@ SOURCE_FILE@0..71 IDENT@19..25 "Output" SEMICOLON@25..26 ";" WHITESPACE@26..27 "\n" - FN_DEF@27..70 + FN@27..70 FN_KW@27..29 "fn" WHITESPACE@29..30 " " NAME@30..33 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast index a767f145d..64e705fb3 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..21 - FN_DEF@0..20 + FN@0..20 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast index aa582516a..47cbe7c1f 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..71 - FN_DEF@0..19 + FN@0..19 VISIBILITY@0..5 CRATE_KW@0..5 "crate" WHITESPACE@5..6 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast index 0c1c6e877..40875ae1e 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..118 - FN_DEF@0..117 + FN@0..117 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast b/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast index c23b3b67c..1fd3cd0e7 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..21 - FN_DEF@0..20 + FN@0..20 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..4 @@ -11,7 +11,7 @@ SOURCE_FILE@0..21 BLOCK_EXPR@7..20 L_CURLY@7..8 "{" WHITESPACE@8..9 " " - FN_DEF@9..18 + FN@9..18 FN_KW@9..11 "fn" WHITESPACE@11..12 " " NAME@12..13 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast index 9ca2165ba..fbf2e7c67 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..35 - FN_DEF@0..34 + FN@0..34 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast index b209f67f8..37757ccd4 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..58 - FN_DEF@0..26 + FN@0..26 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 @@ -38,7 +38,7 @@ SOURCE_FILE@0..58 L_CURLY@24..25 "{" R_CURLY@25..26 "}" WHITESPACE@26..27 "\n" - FN_DEF@27..57 + FN@27..57 FN_KW@27..29 "fn" WHITESPACE@29..30 " " NAME@30..33 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 5f1429102..02c57079f 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 @@ -8,7 +8,7 @@ SOURCE_FILE@0..22 ASSOC_ITEM_LIST@8..21 L_CURLY@8..9 "{" WHITESPACE@9..10 " " - FN_DEF@10..19 + FN@10..19 FN_KW@10..12 "fn" WHITESPACE@12..13 " " NAME@13..16 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast index 70232a3b2..2bfb52453 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..91 - FN_DEF@0..90 + FN@0..90 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast b/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast index 03c52525e..68bb43852 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..113 - FN_DEF@0..112 + FN@0..112 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast index 24f89b83f..28129c50c 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..116 - FN_DEF@0..115 + FN@0..115 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast index bb43d1eaf..97548a5ee 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..18 - FN_DEF@0..17 + FN@0..17 CONST_KW@0..5 "const" WHITESPACE@5..6 " " FN_KW@6..8 "fn" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast index 8bd94a868..3e72f9671 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..112 - FN_DEF@0..111 + FN@0..111 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast index 9210f155c..fa659c19b 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.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/inline/ok/0061_record_lit.rast b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast index 850465d82..b0aa73b7d 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..112 - FN_DEF@0..111 + FN@0..111 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast index 02656df31..f6417ab13 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..70 - FN_DEF@0..11 + FN@0..11 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast index 445d8d309..587160003 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..137 - FN_DEF@0..136 + FN@0..136 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast index 177bb5514..d2279877b 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..167 - FN_DEF@0..166 + FN@0..166 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast index f8ff7079b..4c1165dc8 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..46 - FN_DEF@0..45 + FN@0..45 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast index 07b3d1435..d6926425c 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..97 - FN_DEF@0..96 + FN@0..96 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast index 665f716a8..437d7ac04 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..40 - FN_DEF@0..39 + FN@0..39 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast index 3fd3a4391..3ca70f021 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..84 - FN_DEF@0..83 + FN@0..83 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast index 97c6e6a9d..5cefc5076 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..65 - FN_DEF@0..9 + FN@0..9 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..4 @@ -12,7 +12,7 @@ SOURCE_FILE@0..65 L_CURLY@7..8 "{" R_CURLY@8..9 "}" WHITESPACE@9..10 "\n" - FN_DEF@10..31 + FN@10..31 FN_KW@10..12 "fn" WHITESPACE@12..13 " " NAME@13..14 @@ -38,7 +38,7 @@ SOURCE_FILE@0..65 WHITESPACE@29..30 " " R_CURLY@30..31 "}" WHITESPACE@31..32 "\n" - FN_DEF@32..48 + FN@32..48 FN_KW@32..34 "fn" WHITESPACE@34..35 " " NAME@35..36 @@ -62,7 +62,7 @@ SOURCE_FILE@0..65 WHITESPACE@46..47 " " R_CURLY@47..48 "}" WHITESPACE@48..49 "\n" - FN_DEF@49..64 + FN@49..64 FN_KW@49..51 "fn" WHITESPACE@51..52 " " NAME@52..53 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast index e2c1a507d..cfa4c05f5 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..29 - FN_DEF@0..28 + FN@0..28 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast index 4f3a8ed24..33e6fb93f 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..21 - FN_DEF@0..20 + FN@0..20 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast index 462d1a8bb..3c80846db 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.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/inline/ok/0082_ref_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast index 58bdf7e34..1563b1988 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..200 - FN_DEF@0..199 + FN@0..199 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast index 9fcb7899e..ded36949a 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..189 - FN_DEF@0..188 + FN@0..188 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast index a42abc189..70e05a859 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..30 - FN_DEF@0..11 + FN@0..11 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 @@ -12,7 +12,7 @@ SOURCE_FILE@0..30 L_CURLY@9..10 "{" R_CURLY@10..11 "}" WHITESPACE@11..12 "\n" - FN_DEF@12..29 + FN@12..29 FN_KW@12..14 "fn" WHITESPACE@14..15 " " NAME@15..18 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast index 7e71d7373..34f520994 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..88 - FN_DEF@0..87 + FN@0..87 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast index 48aaf1004..405b6a259 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..19 - FN_DEF@0..18 + FN@0..18 ABI@0..6 EXTERN_KW@0..6 "extern" WHITESPACE@6..7 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast index aed81f9b0..82f03f9c1 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..26 - FN_DEF@0..25 + FN@0..25 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast index 67d9595d3..25706d2a4 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..26 - FN_DEF@0..25 + FN@0..25 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast index 031e74652..cb5316a0d 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..167 - FN_DEF@0..166 + FN@0..166 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast index 816e49310..32a77ba49 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..25 - FN_DEF@0..24 + FN@0..24 CONST_KW@0..5 "const" WHITESPACE@5..6 " " UNSAFE_KW@6..12 "unsafe" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast index d48ef865c..1627556c8 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..67 - FN_DEF@0..9 + FN@0..9 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..4 @@ -12,7 +12,7 @@ SOURCE_FILE@0..67 L_CURLY@7..8 "{" R_CURLY@8..9 "}" WHITESPACE@9..10 "\n" - FN_DEF@10..25 + FN@10..25 FN_KW@10..12 "fn" WHITESPACE@12..13 " " NAME@13..14 @@ -36,7 +36,7 @@ SOURCE_FILE@0..67 L_CURLY@23..24 "{" R_CURLY@24..25 "}" WHITESPACE@25..26 "\n" - FN_DEF@26..43 + FN@26..43 FN_KW@26..28 "fn" WHITESPACE@28..29 " " NAME@29..30 @@ -62,7 +62,7 @@ SOURCE_FILE@0..67 L_CURLY@41..42 "{" R_CURLY@42..43 "}" WHITESPACE@43..44 "\n" - FN_DEF@44..66 + FN@44..66 FN_KW@44..46 "fn" WHITESPACE@46..47 " " NAME@47..48 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast index e4455cd3e..766de4efe 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.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..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast index 8a8743060..73c94e5d4 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..19 - FN_DEF@0..18 + FN@0..18 UNSAFE_KW@0..6 "unsafe" WHITESPACE@6..7 " " FN_KW@7..9 "fn" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast index 9f966ff8a..fe1c290c3 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..119 - FN_DEF@0..118 + FN@0..118 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast index 9b3bef04e..c4c0a0568 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..55 - FN_DEF@0..54 + FN@0..54 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast index e64717152..51a6c5170 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..134 - FN_DEF@0..133 + FN@0..133 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast index 98963dc62..b2961b0ff 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..49 - FN_DEF@0..48 + FN@0..48 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast index ea603e2c9..ca7e4a5c3 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..40 - FN_DEF@0..39 + FN@0..39 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast index 30ff96a7c..a6a169f1b 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..74 - FN_DEF@0..73 + FN@0..73 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast index b58f40ac1..432318da0 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..94 - FN_DEF@0..93 + FN@0..93 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast index b67714c17..3cd554d45 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..146 - FN_DEF@0..145 + FN@0..145 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast index 5de480da9..d761c1c68 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..50 - FN_DEF@0..49 + FN@0..49 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast index e152c6b6c..aaaf803b7 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..58 - FN_DEF@0..57 + FN@0..57 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast index b283ab804..4b5f9cdc9 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.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/inline/ok/0121_match_arms_outer_attributes.rast b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast index 9d5470914..54cc3be3a 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..259 - FN_DEF@0..258 + FN@0..258 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast index ada2fc54e..f4008cfdc 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..64 - FN_DEF@0..63 + FN@0..63 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast index b3a33c14d..f155743cf 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast @@ -8,7 +8,7 @@ SOURCE_FILE@0..57 EXTERN_ITEM_LIST@11..56 L_CURLY@11..12 "{" WHITESPACE@12..13 " " - FN_DEF@13..54 + FN@13..54 FN_KW@13..15 "fn" WHITESPACE@15..16 " " NAME@16..22 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast index 6178dfe59..a7df188bd 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..18 - FN_DEF@0..17 + FN@0..17 ASYNC_KW@0..5 "async" WHITESPACE@5..6 " " FN_KW@6..8 "fn" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast index ced59b7c1..aa4d7a784 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..27 - FN_DEF@0..26 + FN@0..26 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast index 97611f7f3..20979cef3 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..46 - FN_DEF@0..45 + FN@0..45 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast index 09221fc54..0342e64f3 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..82 - FN_DEF@0..81 + FN@0..81 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast index 93cc41533..3b46e5b47 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.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/inline/ok/0128_combined_fns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast index 0901f2348..98a20f36d 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..50 - FN_DEF@0..24 + FN@0..24 ASYNC_KW@0..5 "async" WHITESPACE@5..6 " " UNSAFE_KW@6..12 "unsafe" @@ -16,7 +16,7 @@ SOURCE_FILE@0..50 L_CURLY@22..23 "{" R_CURLY@23..24 "}" WHITESPACE@24..25 "\n" - FN_DEF@25..49 + FN@25..49 CONST_KW@25..30 "const" WHITESPACE@30..31 " " UNSAFE_KW@31..37 "unsafe" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast index 28291afc2..e283966ca 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.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/inline/ok/0130_let_stmt.rast b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast index bb94a05c6..931e81f27 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..135 - FN_DEF@0..134 + FN@0..134 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast index 8f2f144c7..0fe3bf582 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.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..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast index 87ac42748..48f483813 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..106 - FN_DEF@0..105 + FN@0..105 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 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 3772cb64b..9fc724f3f 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 @@ -36,7 +36,7 @@ SOURCE_FILE@0..69 IDENT@38..41 "Bar" SEMICOLON@41..42 ";" WHITESPACE@42..47 "\n " - FN_DEF@47..66 + FN@47..66 DEFAULT_KW@47..54 "default" WHITESPACE@54..55 " " FN_KW@55..57 "fn" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast index b330a0932..ceae8a4ec 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..111 - FN_DEF@0..110 + FN@0..110 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..18 @@ -33,7 +33,7 @@ SOURCE_FILE@0..111 R_CURLY@74..75 "}" SEMICOLON@75..76 ";" WHITESPACE@76..81 "\n " - FN_DEF@81..90 + FN@81..90 FN_KW@81..83 "fn" WHITESPACE@83..84 " " NAME@84..85 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast index 8e8d9e992..923effe38 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..67 - FN_DEF@0..66 + FN@0..66 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast index c457851c9..1ad03e005 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..59 - FN_DEF@0..58 + FN@0..58 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..12 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast index ea325831e..a03139ab5 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..52 - FN_DEF@0..51 + FN@0..51 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast index 9135de9df..6403ff8d5 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..26 - FN_DEF@0..25 + FN@0..25 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..4 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast index 14610a0a2..36fd2997b 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..28 - FN_DEF@0..27 + FN@0..27 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..4 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast b/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast index e6be8b7e4..d11019076 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..51 - FN_DEF@0..50 + FN@0..50 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast index 57fba5fd5..09fd9e9b8 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..118 - FN_DEF@0..117 + FN@0..117 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast index 8d8b9597b..8d0f1ead5 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..555 - FN_DEF@0..554 + FN@0..554 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast index 7c092d518..b41ef4098 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..63 - FN_DEF@0..62 + FN@0..62 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast index 8382a4f96..2d0c83458 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..43 - FN_DEF@0..42 + FN@0..42 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast index f43dfbe63..2905c5f1a 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..34 - FN_DEF@0..33 + FN@0..33 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast index ecac05950..c63a55a56 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..63 - FN_DEF@0..62 + FN@0..62 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast index 092833417..3b8dfefc6 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.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/inline/ok/0156_or_pattern.rast b/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast index 88d512f1a..4d4c41f1a 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..130 - FN_DEF@0..129 + FN@0..129 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast b/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast index bd9e8d40f..8ae24b9c1 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..28 - FN_DEF@0..27 + FN@0..27 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast index 08333a325..9c071ec2e 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..34 - FN_DEF@0..33 + FN@0..33 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast b/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast index 5f09e4f4a..fb46d4ce4 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..27 - FN_DEF@0..26 + FN@0..26 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast index 9efebd8b8..9e9a5f9c5 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.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..4 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast index 4991f2c36..ca9a1183d 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.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..4 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 c0b8c0300..680f35445 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 @@ -19,7 +19,7 @@ SOURCE_FILE@0..50 ASSOC_ITEM_LIST@15..49 L_CURLY@15..16 "{" WHITESPACE@16..21 "\n " - FN_DEF@21..47 + FN@21..47 DEFAULT_KW@21..28 "default" WHITESPACE@28..29 " " UNSAFE_KW@29..35 "unsafe" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast b/crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast index 868899275..f5e20b93d 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.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 -- cgit v1.2.3 From eb2f8063444b11257111f4f8ade990ec810e0361 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 15:25:46 +0200 Subject: Rename TypeAliasDef -> TypeAlias --- .../test_data/parser/inline/err/0001_array_type_missing_semi.rast | 2 +- .../parser/inline/err/0003_pointer_type_no_mutability.rast | 2 +- .../parser/inline/err/0005_fn_pointer_type_missing_fn.rast | 2 +- .../test_data/parser/inline/err/0014_default_fn_type.rast | 2 +- .../test_data/parser/inline/ok/0001_trait_item_list.rast | 2 +- .../parser/inline/ok/0004_value_parameters_no_patterns.rast | 2 +- .../test_data/parser/inline/ok/0012_type_item_where_clause.rast | 2 +- .../test_data/parser/inline/ok/0013_pointer_type_mut.rast | 4 ++-- crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast | 2 +- .../test_data/parser/inline/ok/0023_placeholder_type.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast | 2 +- .../test_data/parser/inline/ok/0028_impl_trait_type.rast | 2 +- .../test_data/parser/inline/ok/0032_fn_pointer_type.rast | 8 ++++---- .../test_data/parser/inline/ok/0033_reference_type;.rast | 6 +++--- crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast | 2 +- .../test_data/parser/inline/ok/0046_singleton_tuple_type.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast | 8 ++++---- .../ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast | 2 +- .../test_data/parser/inline/ok/0073_type_item_type_params.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast | 6 +++--- crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast | 2 +- .../test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast | 2 +- .../test_data/parser/inline/ok/0104_path_fn_trait_args.rast | 2 +- .../test_data/parser/inline/ok/0117_macro_call_type.rast | 4 ++-- .../test_data/parser/inline/ok/0131_existential_type.rast | 2 +- .../test_data/parser/inline/ok/0132_default_fn_type.rast | 2 +- .../parser/inline/ok/0154_fn_pointer_param_ident_path.rast | 4 ++-- .../test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast | 2 +- 33 files changed, 46 insertions(+), 46 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/inline') diff --git a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast index bf70ebca4..0b9bbec07 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..18 - TYPE_ALIAS_DEF@0..12 + TYPE_ALIAS@0..12 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast index 95bcc3c0a..2409eefe7 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..14 - TYPE_ALIAS_DEF@0..13 + TYPE_ALIAS@0..13 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast index 90202d764..776022fd9 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..20 - TYPE_ALIAS_DEF@0..15 + TYPE_ALIAS@0..15 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 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 b31195281..22c7c5f0d 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 @@ -14,7 +14,7 @@ SOURCE_FILE@0..62 NAME_REF@14..21 IDENT@14..21 "default" WHITESPACE@21..22 " " - TYPE_ALIAS_DEF@22..35 + TYPE_ALIAS@22..35 TYPE_KW@22..26 "type" WHITESPACE@26..27 " " NAME@27..28 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 7847ba65a..a62ce23e6 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 @@ -11,7 +11,7 @@ SOURCE_FILE@0..83 ASSOC_ITEM_LIST@7..82 L_CURLY@7..8 "{" WHITESPACE@8..13 "\n " - TYPE_ALIAS_DEF@13..27 + TYPE_ALIAS@13..27 TYPE_KW@13..17 "type" WHITESPACE@17..18 " " NAME@18..19 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast index 20eba09f5..ace8ad050 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..39 - TYPE_ALIAS_DEF@0..38 + TYPE_ALIAS@0..38 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast index 283442a8b..28c94bfd6 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..31 - TYPE_ALIAS_DEF@0..30 + TYPE_ALIAS@0..30 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..8 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast b/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast index e2e871dda..845b32e6d 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..36 - TYPE_ALIAS_DEF@0..17 + TYPE_ALIAS@0..17 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 @@ -16,7 +16,7 @@ SOURCE_FILE@0..36 R_PAREN@15..16 ")" SEMICOLON@16..17 ";" WHITESPACE@17..18 "\n" - TYPE_ALIAS_DEF@18..35 + TYPE_ALIAS@18..35 TYPE_KW@18..22 "type" WHITESPACE@22..23 " " NAME@23..24 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast index a60940fcf..b1d5106ce 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..16 - TYPE_ALIAS_DEF@0..15 + TYPE_ALIAS@0..15 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..10 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast index 61a0b22f4..c131df1c9 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..19 - TYPE_ALIAS_DEF@0..18 + TYPE_ALIAS@0..18 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 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 daa55ec6c..3ae870e17 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 @@ -11,7 +11,7 @@ SOURCE_FILE@0..89 ASSOC_ITEM_LIST@7..88 L_CURLY@7..8 "{" WHITESPACE@8..13 "\n " - TYPE_ALIAS_DEF@13..26 + TYPE_ALIAS@13..26 TYPE_KW@13..17 "type" WHITESPACE@17..18 " " NAME@18..19 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast index 17687617b..57008e5fe 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..22 - TYPE_ALIAS_DEF@0..21 + TYPE_ALIAS@0..21 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..16 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast index 0a6d77f45..fd819ea37 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..15 - TYPE_ALIAS_DEF@0..14 + TYPE_ALIAS@0..14 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast index 93f5c738c..f45f3cab8 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..43 - TYPE_ALIAS_DEF@0..42 + TYPE_ALIAS@0..42 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast index 72705e148..79a5ee339 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..113 - TYPE_ALIAS_DEF@0..14 + TYPE_ALIAS@0..14 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 @@ -14,7 +14,7 @@ SOURCE_FILE@0..113 R_PAREN@12..13 ")" SEMICOLON@13..14 ";" WHITESPACE@14..15 "\n" - TYPE_ALIAS_DEF@15..36 + TYPE_ALIAS@15..36 TYPE_KW@15..19 "type" WHITESPACE@19..20 " " NAME@20..21 @@ -31,7 +31,7 @@ SOURCE_FILE@0..113 R_PAREN@34..35 ")" SEMICOLON@35..36 ";" WHITESPACE@36..37 "\n" - TYPE_ALIAS_DEF@37..69 + TYPE_ALIAS@37..69 TYPE_KW@37..41 "type" WHITESPACE@41..42 " " NAME@42..43 @@ -53,7 +53,7 @@ SOURCE_FILE@0..113 R_PAREN@67..68 ")" SEMICOLON@68..69 ";" WHITESPACE@69..70 "\n" - TYPE_ALIAS_DEF@70..112 + TYPE_ALIAS@70..112 TYPE_KW@70..74 "type" WHITESPACE@74..75 " " NAME@75..76 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast b/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast index 784fbb592..c522f76cf 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..54 - TYPE_ALIAS_DEF@0..13 + TYPE_ALIAS@0..13 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 @@ -14,7 +14,7 @@ SOURCE_FILE@0..54 R_PAREN@11..12 ")" SEMICOLON@12..13 ";" WHITESPACE@13..14 "\n" - TYPE_ALIAS_DEF@14..35 + TYPE_ALIAS@14..35 TYPE_KW@14..18 "type" WHITESPACE@18..19 " " NAME@19..20 @@ -31,7 +31,7 @@ SOURCE_FILE@0..54 R_PAREN@33..34 ")" SEMICOLON@34..35 ";" WHITESPACE@35..36 "\n" - TYPE_ALIAS_DEF@36..53 + TYPE_ALIAS@36..53 TYPE_KW@36..40 "type" WHITESPACE@40..41 " " NAME@41..42 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast index 8f6cd2e2f..b6379e62f 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..71 - TYPE_ALIAS_DEF@0..26 + TYPE_ALIAS@0..26 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast index e92ea2bf2..2185d3c91 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..46 - TYPE_ALIAS_DEF@0..45 + TYPE_ALIAS@0..45 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast index c28dc9d61..e89284c14 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..17 - TYPE_ALIAS_DEF@0..16 + TYPE_ALIAS@0..16 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast index 798ef2a48..6330dbf9e 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..13 - TYPE_ALIAS_DEF@0..12 + TYPE_ALIAS@0..12 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast index 0d2f5ff56..9bc36bea7 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..71 - TYPE_ALIAS_DEF@0..13 + TYPE_ALIAS@0..13 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 @@ -14,7 +14,7 @@ SOURCE_FILE@0..71 IDENT@9..12 "Foo" SEMICOLON@12..13 ";" WHITESPACE@13..14 "\n" - TYPE_ALIAS_DEF@14..29 + TYPE_ALIAS@14..29 TYPE_KW@14..18 "type" WHITESPACE@18..19 " " NAME@19..20 @@ -30,7 +30,7 @@ SOURCE_FILE@0..71 IDENT@25..28 "Foo" SEMICOLON@28..29 ";" WHITESPACE@29..30 "\n" - TYPE_ALIAS_DEF@30..49 + TYPE_ALIAS@30..49 TYPE_KW@30..34 "type" WHITESPACE@34..35 " " NAME@35..36 @@ -49,7 +49,7 @@ SOURCE_FILE@0..71 IDENT@45..48 "Foo" SEMICOLON@48..49 ";" WHITESPACE@49..50 "\n" - TYPE_ALIAS_DEF@50..70 + TYPE_ALIAS@50..70 TYPE_KW@50..54 "type" WHITESPACE@54..55 " " NAME@55..56 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast index 8e10f3673..629fea99d 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..42 - TYPE_ALIAS_DEF@0..41 + TYPE_ALIAS@0..41 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast index cc871ac0c..0123cb108 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..21 - TYPE_ALIAS_DEF@0..20 + TYPE_ALIAS@0..20 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..11 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast index a08e16fab..2befc8388 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..16 - TYPE_ALIAS_DEF@0..15 + TYPE_ALIAS@0..15 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..8 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast index b26ac2d36..175ec9844 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..121 - TYPE_ALIAS_DEF@0..28 + TYPE_ALIAS@0..28 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 @@ -29,7 +29,7 @@ SOURCE_FILE@0..121 R_PAREN@26..27 ")" SEMICOLON@27..28 ";" WHITESPACE@28..29 "\n" - TYPE_ALIAS_DEF@29..81 + TYPE_ALIAS@29..81 TYPE_KW@29..33 "type" WHITESPACE@33..34 " " NAME@34..35 @@ -74,7 +74,7 @@ SOURCE_FILE@0..121 R_PAREN@79..80 ")" SEMICOLON@80..81 ";" WHITESPACE@81..82 "\n" - TYPE_ALIAS_DEF@82..120 + TYPE_ALIAS@82..120 TYPE_KW@82..86 "type" WHITESPACE@86..87 " " NAME@87..90 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast index 9cd8910d4..ee8894966 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..16 - TYPE_ALIAS_DEF@0..15 + TYPE_ALIAS@0..15 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast b/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast index 1e2d7db7c..95686977f 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..21 - TYPE_ALIAS_DEF@0..20 + TYPE_ALIAS@0..20 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast index e3c4cfeb3..3f53d60c0 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..29 - TYPE_ALIAS_DEF@0..28 + TYPE_ALIAS@0..28 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast index ddfcf974e..f3d4ad72c 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..41 - TYPE_ALIAS_DEF@0..16 + TYPE_ALIAS@0..16 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 @@ -18,7 +18,7 @@ SOURCE_FILE@0..41 R_PAREN@14..15 ")" SEMICOLON@15..16 ";" WHITESPACE@16..17 "\n" - TYPE_ALIAS_DEF@17..40 + TYPE_ALIAS@17..40 TYPE_KW@17..21 "type" WHITESPACE@21..22 " " NAME@22..23 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast index 4a1c2b3a4..d47071a91 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..37 - TYPE_ALIAS_DEF@0..36 + TYPE_ALIAS@0..36 EXISTENTIAL_KW@0..11 "existential" WHITESPACE@11..12 " " TYPE_KW@12..16 "type" 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 9fc724f3f..de02238df 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 @@ -19,7 +19,7 @@ SOURCE_FILE@0..69 ASSOC_ITEM_LIST@15..68 L_CURLY@15..16 "{" WHITESPACE@16..21 "\n " - TYPE_ALIAS_DEF@21..42 + TYPE_ALIAS@21..42 DEFAULT_KW@21..28 "default" WHITESPACE@28..29 " " TYPE_KW@29..33 "type" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast index 861065362..69b4d73d7 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..55 - TYPE_ALIAS_DEF@0..24 + TYPE_ALIAS@0..24 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..8 @@ -25,7 +25,7 @@ SOURCE_FILE@0..55 R_PAREN@22..23 ")" SEMICOLON@23..24 ";" WHITESPACE@24..25 "\n" - TYPE_ALIAS_DEF@25..54 + TYPE_ALIAS@25..54 TYPE_KW@25..29 "type" WHITESPACE@29..30 " " NAME@30..33 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast index fad9df007..ccca045b6 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..23 - TYPE_ALIAS_DEF@0..22 + TYPE_ALIAS@0..22 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..8 -- cgit v1.2.3