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/ok/0005_fn_item.rast | 2 +- .../test_data/parser/ok/0008_mod_item.rast | 2 +- .../test_data/parser/ok/0011_outer_attribute.rast | 2 +- .../test_data/parser/ok/0012_visibility.rast | 10 +++--- .../parser/ok/0017_attr_trailing_comma.rast | 2 +- .../test_data/parser/ok/0021_extern_fn.rast | 6 ++-- .../parser/ok/0025_extern_fn_in_block.rast | 4 +-- .../parser/ok/0026_const_fn_in_block.rast | 4 +-- .../parser/ok/0027_unsafe_fn_in_block.rast | 4 +-- .../parser/ok/0028_operator_binding_power.rast | 2 +- .../test_data/parser/ok/0029_range_forms.rast | 2 +- .../test_data/parser/ok/0030_string_suffixes.rast | 2 +- .../ra_syntax/test_data/parser/ok/0030_traits.rast | 4 +-- .../ra_syntax/test_data/parser/ok/0031_extern.rast | 24 +++++++------- .../test_data/parser/ok/0032_where_for.rast | 2 +- .../test_data/parser/ok/0033_label_break.rast | 2 +- .../parser/ok/0034_crate_path_in_call.rast | 2 +- .../test_data/parser/ok/0035_weird_exprs.rast | 38 +++++++++++----------- .../test_data/parser/ok/0036_fully_qualified.rast | 2 +- .../test_data/parser/ok/0038_where_pred_type.rast | 2 +- .../test_data/parser/ok/0039_raw_fn_item.rast | 2 +- .../test_data/parser/ok/0041_raw_keywords.rast | 2 +- .../test_data/parser/ok/0042_ufcs_call_list.rast | 6 ++-- .../parser/ok/0043_complex_assignment.rast | 2 +- .../test_data/parser/ok/0044_let_attrs.rast | 2 +- .../parser/ok/0045_block_inner_attrs.rast | 4 +-- .../parser/ok/0047_minus_in_inner_pattern.rast | 4 +-- .../parser/ok/0048_compound_assignment.rast | 2 +- .../test_data/parser/ok/0049_async_block.rast | 2 +- .../parser/ok/0050_async_block_as_argument.rast | 4 +-- .../test_data/parser/ok/0051_parameter_attrs.rast | 26 +++++++-------- .../test_data/parser/ok/0052_for_range_block.rast | 2 +- .../parser/ok/0054_qual_path_in_type_arg.rast | 6 ++-- .../test_data/parser/ok/0055_dot_dot_dot.rast | 2 +- .../test_data/parser/ok/0056_neq_in_type.rast | 2 +- .../test_data/parser/ok/0057_loop_in_call.rast | 4 +-- .../parser/ok/0058_unary_expr_precedence.rast | 2 +- .../test_data/parser/ok/0059_loops_in_parens.rast | 2 +- .../test_data/parser/ok/0060_as_range.rast | 2 +- .../test_data/parser/ok/0061_match_full_range.rast | 2 +- .../test_data/parser/ok/0062_macro_2.0.rast | 2 +- .../parser/ok/0063_trait_fn_patterns.rast | 10 +++--- .../test_data/parser/ok/0063_variadic_fun.rast | 6 ++-- .../test_data/parser/ok/0064_impl_fn_params.rast | 8 ++--- .../test_data/parser/ok/0065_comment_newline.rast | 2 +- .../parser/ok/0065_plus_after_fn_trait_bound.rast | 2 +- .../test_data/parser/ok/0067_where_for_pred.rast | 12 +++---- 47 files changed, 120 insertions(+), 120 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/ok') diff --git a/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast b/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast index 0ec237f8e..a7a2b11a7 100644 --- a/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast +++ b/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..13 - FN_DEF@0..12 + FN@0..12 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast index 37b452ec4..ea26f1440 100644 --- a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast +++ b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast @@ -26,7 +26,7 @@ SOURCE_FILE@0..118 ITEM_LIST@25..65 L_CURLY@25..26 "{" WHITESPACE@26..31 "\n " - FN_DEF@31..47 + FN@31..47 FN_KW@31..33 "fn" WHITESPACE@33..34 " " NAME@34..37 diff --git a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast b/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast index 0b9bc58e8..478fdba75 100644 --- a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast +++ b/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..60 - FN_DEF@0..34 + FN@0..34 ATTR@0..12 POUND@0..1 "#" L_BRACK@1..2 "[" diff --git a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast b/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast index 980b34049..83a93b5a9 100644 --- a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast +++ b/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..98 - 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..98 L_CURLY@7..8 "{" R_CURLY@8..9 "}" WHITESPACE@9..10 "\n" - FN_DEF@10..23 + FN@10..23 VISIBILITY@10..13 PUB_KW@10..13 "pub" WHITESPACE@13..14 " " @@ -28,7 +28,7 @@ SOURCE_FILE@0..98 L_CURLY@21..22 "{" R_CURLY@22..23 "}" WHITESPACE@23..24 "\n" - FN_DEF@24..44 + FN@24..44 VISIBILITY@24..34 PUB_KW@24..27 "pub" L_PAREN@27..28 "(" @@ -47,7 +47,7 @@ SOURCE_FILE@0..98 L_CURLY@42..43 "{" R_CURLY@43..44 "}" WHITESPACE@44..45 "\n" - FN_DEF@45..65 + FN@45..65 VISIBILITY@45..55 PUB_KW@45..48 "pub" L_PAREN@48..49 "(" @@ -66,7 +66,7 @@ SOURCE_FILE@0..98 L_CURLY@63..64 "{" R_CURLY@64..65 "}" WHITESPACE@65..66 "\n" - FN_DEF@66..97 + FN@66..97 VISIBILITY@66..87 PUB_KW@66..69 "pub" L_PAREN@69..70 "(" diff --git a/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast b/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast index 964cbf5dd..a3e091ad3 100644 --- a/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast +++ b/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..23 - FN_DEF@0..22 + FN@0..22 ATTR@0..10 POUND@0..1 "#" L_BRACK@1..2 "[" diff --git a/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast b/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast index 873791f50..5524efaaf 100644 --- a/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast +++ b/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..71 - FN_DEF@0..19 + FN@0..19 ABI@0..6 EXTERN_KW@0..6 "extern" WHITESPACE@6..7 " " @@ -16,7 +16,7 @@ SOURCE_FILE@0..71 WHITESPACE@17..18 "\n" R_CURLY@18..19 "}" WHITESPACE@19..21 "\n\n" - FN_DEF@21..44 + FN@21..44 ABI@21..31 EXTERN_KW@21..27 "extern" WHITESPACE@27..28 " " @@ -35,7 +35,7 @@ SOURCE_FILE@0..71 WHITESPACE@42..43 "\n" R_CURLY@43..44 "}" WHITESPACE@44..46 "\n\n" - FN_DEF@46..70 + FN@46..70 ABI@46..57 EXTERN_KW@46..52 "extern" WHITESPACE@52..53 " " diff --git a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast b/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast index 5701f566e..bb6527b48 100644 --- a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast +++ b/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.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..7 @@ -11,7 +11,7 @@ SOURCE_FILE@0..35 BLOCK_EXPR@10..34 L_CURLY@10..11 "{" WHITESPACE@11..16 "\n " - FN_DEF@16..32 + FN@16..32 ABI@16..22 EXTERN_KW@16..22 "extern" WHITESPACE@22..23 " " diff --git a/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast b/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast index b029d8692..5bcf54deb 100644 --- a/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast +++ b/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_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 @@ -11,7 +11,7 @@ SOURCE_FILE@0..34 BLOCK_EXPR@10..33 L_CURLY@10..11 "{" WHITESPACE@11..16 "\n " - FN_DEF@16..31 + FN@16..31 CONST_KW@16..21 "const" WHITESPACE@21..22 " " FN_KW@22..24 "fn" diff --git a/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast b/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast index 299bbd136..a7cc12295 100644 --- a/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast +++ b/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..53 - FN_DEF@0..52 + FN@0..52 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 @@ -11,7 +11,7 @@ SOURCE_FILE@0..53 BLOCK_EXPR@10..52 L_CURLY@10..11 "{" WHITESPACE@11..16 "\n " - FN_DEF@16..32 + FN@16..32 UNSAFE_KW@16..22 "unsafe" WHITESPACE@22..23 " " FN_KW@23..25 "fn" diff --git a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast index de3c4b786..efe018484 100644 --- a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast +++ b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..248 - FN_DEF@0..247 + FN@0..247 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..16 diff --git a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast index dc47d68a6..47e46f009 100644 --- a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast +++ b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..153 - FN_DEF@0..152 + FN@0..152 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast index 86c3b46c4..93f766149 100644 --- a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast +++ b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.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/ok/0030_traits.rast b/crates/ra_syntax/test_data/parser/ok/0030_traits.rast index 63693de4f..4bcf07ffb 100644 --- a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast +++ b/crates/ra_syntax/test_data/parser/ok/0030_traits.rast @@ -8,7 +8,7 @@ SOURCE_FILE@0..96 ASSOC_ITEM_LIST@15..36 L_CURLY@15..16 "{" WHITESPACE@16..21 "\n " - FN_DEF@21..34 + FN@21..34 FN_KW@21..23 "fn" WHITESPACE@23..24 " " NAME@24..31 @@ -29,7 +29,7 @@ SOURCE_FILE@0..96 ASSOC_ITEM_LIST@58..95 L_CURLY@58..59 "{" WHITESPACE@59..64 "\n " - FN_DEF@64..93 + FN@64..93 FN_KW@64..66 "fn" WHITESPACE@66..67 " " NAME@67..79 diff --git a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast b/crates/ra_syntax/test_data/parser/ok/0031_extern.rast index ea285f52f..0509f7504 100644 --- a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast +++ b/crates/ra_syntax/test_data/parser/ok/0031_extern.rast @@ -6,7 +6,7 @@ SOURCE_FILE@0..1598 EXTERN_ITEM_LIST@7..1597 L_CURLY@7..8 "{" WHITESPACE@8..13 "\n " - FN_DEF@13..87 + FN@13..87 VISIBILITY@13..16 PUB_KW@13..16 "pub" WHITESPACE@16..17 " " @@ -69,7 +69,7 @@ SOURCE_FILE@0..1598 IDENT@81..86 "c_int" SEMICOLON@86..87 ";" WHITESPACE@87..92 "\n " - FN_DEF@92..167 + FN@92..167 VISIBILITY@92..95 PUB_KW@92..95 "pub" WHITESPACE@95..96 " " @@ -134,7 +134,7 @@ SOURCE_FILE@0..1598 IDENT@161..166 "c_int" SEMICOLON@166..167 ";" WHITESPACE@167..172 "\n " - FN_DEF@172..276 + FN@172..276 VISIBILITY@172..175 PUB_KW@172..175 "pub" WHITESPACE@175..176 " " @@ -199,7 +199,7 @@ SOURCE_FILE@0..1598 IDENT@270..275 "c_int" SEMICOLON@275..276 ";" WHITESPACE@276..281 "\n " - FN_DEF@281..341 + FN@281..341 VISIBILITY@281..284 PUB_KW@281..284 "pub" WHITESPACE@284..285 " " @@ -248,7 +248,7 @@ SOURCE_FILE@0..1598 IDENT@335..340 "c_int" SEMICOLON@340..341 ";" WHITESPACE@341..346 "\n " - FN_DEF@346..469 + FN@346..469 VISIBILITY@346..349 PUB_KW@346..349 "pub" WHITESPACE@349..350 " " @@ -317,7 +317,7 @@ SOURCE_FILE@0..1598 IDENT@463..468 "c_int" SEMICOLON@468..469 ";" WHITESPACE@469..474 "\n " - FN_DEF@474..691 + FN@474..691 VISIBILITY@474..477 PUB_KW@474..477 "pub" WHITESPACE@477..478 " " @@ -416,7 +416,7 @@ SOURCE_FILE@0..1598 IDENT@685..690 "c_int" SEMICOLON@690..691 ";" WHITESPACE@691..696 "\n " - FN_DEF@696..864 + FN@696..864 VISIBILITY@696..699 PUB_KW@696..699 "pub" WHITESPACE@699..700 " " @@ -510,7 +510,7 @@ SOURCE_FILE@0..1598 IDENT@858..863 "c_int" SEMICOLON@863..864 ";" WHITESPACE@864..869 "\n " - FN_DEF@869..992 + FN@869..992 VISIBILITY@869..872 PUB_KW@869..872 "pub" WHITESPACE@872..873 " " @@ -579,7 +579,7 @@ SOURCE_FILE@0..1598 IDENT@986..991 "c_int" SEMICOLON@991..992 ";" WHITESPACE@992..997 "\n " - FN_DEF@997..1173 + FN@997..1173 VISIBILITY@997..1000 PUB_KW@997..1000 "pub" WHITESPACE@1000..1001 " " @@ -690,7 +690,7 @@ SOURCE_FILE@0..1598 IDENT@1165..1172 "ssize_t" SEMICOLON@1172..1173 ";" WHITESPACE@1173..1178 "\n " - FN_DEF@1178..1289 + FN@1178..1289 VISIBILITY@1178..1181 PUB_KW@1178..1181 "pub" WHITESPACE@1181..1182 " " @@ -771,7 +771,7 @@ SOURCE_FILE@0..1598 IDENT@1281..1288 "ssize_t" SEMICOLON@1288..1289 ";" WHITESPACE@1289..1294 "\n " - FN_DEF@1294..1481 + FN@1294..1481 VISIBILITY@1294..1297 PUB_KW@1294..1297 "pub" WHITESPACE@1297..1298 " " @@ -888,7 +888,7 @@ SOURCE_FILE@0..1598 IDENT@1473..1480 "ssize_t" SEMICOLON@1480..1481 ";" WHITESPACE@1481..1486 "\n " - FN_DEF@1486..1595 + FN@1486..1595 VISIBILITY@1486..1489 PUB_KW@1486..1489 "pub" WHITESPACE@1489..1490 " " diff --git a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast index 8d76c4e0b..1b2325a2d 100644 --- a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast +++ b/crates/ra_syntax/test_data/parser/ok/0032_where_for.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..21 diff --git a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast b/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast index 13b730ded..b3f29638c 100644 --- a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast +++ b/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..506 - FN_DEF@0..505 + FN@0..505 COMMENT@0..33 "// format with label ..." WHITESPACE@33..34 "\n" FN_KW@34..36 "fn" diff --git a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast b/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast index 21874ae3a..5ad8c570d 100644 --- a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast +++ b/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..62 - FN_DEF@0..61 + FN@0..61 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast index bbdf896d1..2e36b54bc 100644 --- a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast @@ -120,7 +120,7 @@ SOURCE_FILE@0..3813 WHITESPACE@447..449 "\n\n" COMMENT@449..518 "// Just a grab bag of ..." WHITESPACE@518..520 "\n\n" - FN_DEF@520..572 + FN@520..572 FN_KW@520..522 "fn" WHITESPACE@522..523 " " NAME@523..530 @@ -166,7 +166,7 @@ SOURCE_FILE@0..3813 WHITESPACE@570..571 " " R_CURLY@571..572 "}" WHITESPACE@572..574 "\n\n" - FN_DEF@574..624 + FN@574..624 FN_KW@574..576 "fn" WHITESPACE@576..577 " " NAME@577..582 @@ -178,7 +178,7 @@ SOURCE_FILE@0..3813 BLOCK_EXPR@585..624 L_CURLY@585..586 "{" WHITESPACE@586..591 "\n " - FN_DEF@591..607 + FN@591..607 FN_KW@591..593 "fn" WHITESPACE@593..594 " " NAME@594..595 @@ -217,7 +217,7 @@ SOURCE_FILE@0..3813 WHITESPACE@622..623 "\n" R_CURLY@623..624 "}" WHITESPACE@624..626 "\n\n" - FN_DEF@626..816 + FN@626..816 FN_KW@626..628 "fn" WHITESPACE@628..629 " " NAME@629..633 @@ -229,7 +229,7 @@ SOURCE_FILE@0..3813 BLOCK_EXPR@636..816 L_CURLY@636..637 "{" WHITESPACE@637..642 "\n " - FN_DEF@642..720 + FN@642..720 FN_KW@642..644 "fn" WHITESPACE@644..645 " " NAME@645..648 @@ -407,7 +407,7 @@ SOURCE_FILE@0..3813 WHITESPACE@814..815 "\n" R_CURLY@815..816 "}" WHITESPACE@816..818 "\n\n" - FN_DEF@818..1322 + FN@818..1322 FN_KW@818..820 "fn" WHITESPACE@820..821 " " NAME@821..832 @@ -572,7 +572,7 @@ SOURCE_FILE@0..3813 WHITESPACE@1320..1321 "\n" R_CURLY@1321..1322 "}" WHITESPACE@1322..1324 "\n\n" - FN_DEF@1324..1539 + FN@1324..1539 FN_KW@1324..1326 "fn" WHITESPACE@1326..1327 " " NAME@1327..1334 @@ -809,7 +809,7 @@ SOURCE_FILE@0..3813 WHITESPACE@1537..1538 "\n" R_CURLY@1538..1539 "}" WHITESPACE@1539..1541 "\n\n" - FN_DEF@1541..1741 + FN@1541..1741 FN_KW@1541..1543 "fn" WHITESPACE@1543..1544 " " NAME@1544..1557 @@ -830,7 +830,7 @@ SOURCE_FILE@0..3813 BLOCK_EXPR@1569..1741 L_CURLY@1569..1570 "{" WHITESPACE@1570..1575 "\n " - FN_DEF@1575..1598 + FN@1575..1598 FN_KW@1575..1577 "fn" WHITESPACE@1577..1578 " " NAME@1578..1579 @@ -988,7 +988,7 @@ SOURCE_FILE@0..3813 WHITESPACE@1739..1740 "\n" R_CURLY@1740..1741 "}" WHITESPACE@1741..1743 "\n\n" - FN_DEF@1743..1904 + FN@1743..1904 FN_KW@1743..1745 "fn" WHITESPACE@1745..1746 " " NAME@1746..1755 @@ -1131,7 +1131,7 @@ SOURCE_FILE@0..3813 WHITESPACE@1902..1903 "\n" R_CURLY@1903..1904 "}" WHITESPACE@1904..1906 "\n\n" - FN_DEF@1906..1960 + FN@1906..1960 FN_KW@1906..1908 "fn" WHITESPACE@1908..1909 " " NAME@1909..1921 @@ -1166,7 +1166,7 @@ SOURCE_FILE@0..3813 WHITESPACE@1958..1959 " " R_CURLY@1959..1960 "}" WHITESPACE@1960..1962 "\n\n" - FN_DEF@1962..2198 + FN@1962..2198 FN_KW@1962..1964 "fn" WHITESPACE@1964..1965 " " NAME@1965..1969 @@ -1284,7 +1284,7 @@ SOURCE_FILE@0..3813 WHITESPACE@2196..2197 "\n" R_CURLY@2197..2198 "}" WHITESPACE@2198..2200 "\n\n" - FN_DEF@2200..2693 + FN@2200..2693 FN_KW@2200..2202 "fn" WHITESPACE@2202..2203 " " NAME@2203..2205 @@ -1468,7 +1468,7 @@ SOURCE_FILE@0..3813 WHITESPACE@2691..2692 "\n" R_CURLY@2692..2693 "}" WHITESPACE@2693..2695 "\n\n" - FN_DEF@2695..2832 + FN@2695..2832 FN_KW@2695..2697 "fn" WHITESPACE@2697..2698 " " NAME@2698..2703 @@ -1548,7 +1548,7 @@ SOURCE_FILE@0..3813 WHITESPACE@2830..2831 "\n" R_CURLY@2831..2832 "}" WHITESPACE@2832..2834 "\n\n" - FN_DEF@2834..2906 + FN@2834..2906 FN_KW@2834..2836 "fn" WHITESPACE@2836..2837 " " NAME@2837..2842 @@ -1599,7 +1599,7 @@ SOURCE_FILE@0..3813 WHITESPACE@2904..2905 "\n" R_CURLY@2905..2906 "}" WHITESPACE@2906..2908 "\n\n" - FN_DEF@2908..3042 + FN@2908..3042 FN_KW@2908..2910 "fn" WHITESPACE@2910..2911 " " NAME@2911..2929 @@ -1722,7 +1722,7 @@ SOURCE_FILE@0..3813 WHITESPACE@3040..3041 "\n" R_CURLY@3041..3042 "}" WHITESPACE@3042..3044 "\n\n" - FN_DEF@3044..3514 + FN@3044..3514 FN_KW@3044..3046 "fn" WHITESPACE@3046..3047 " " NAME@3047..3057 @@ -2056,7 +2056,7 @@ SOURCE_FILE@0..3813 WHITESPACE@3512..3513 "\n" R_CURLY@3513..3514 "}" WHITESPACE@3514..3516 "\n\n" - FN_DEF@3516..3552 + FN@3516..3552 FN_KW@3516..3518 "fn" WHITESPACE@3518..3519 " " NAME@3519..3525 @@ -2090,7 +2090,7 @@ SOURCE_FILE@0..3813 WHITESPACE@3550..3551 "\n" R_CURLY@3551..3552 "}" WHITESPACE@3552..3554 "\n\n" - FN_DEF@3554..3812 + FN@3554..3812 VISIBILITY@3554..3557 PUB_KW@3554..3557 "pub" WHITESPACE@3557..3558 " " diff --git a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast index a64a82e94..a5f09e364 100644 --- a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast +++ b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast @@ -1,7 +1,7 @@ SOURCE_FILE@0..157 COMMENT@0..60 "// https://github.com ..." WHITESPACE@60..62 "\n\n" - FN_DEF@62..156 + FN@62..156 VISIBILITY@62..65 PUB_KW@62..65 "pub" WHITESPACE@65..66 " " diff --git a/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast b/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast index 7fd414090..22168eaf1 100644 --- a/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast +++ b/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..34 - FN_DEF@0..34 + FN@0..34 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast b/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast index 17be2c238..68a366354 100644 --- a/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast +++ b/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..15 - FN_DEF@0..14 + FN@0..14 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..8 diff --git a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast index acf32a852..92ede8ccb 100644 --- a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast +++ b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..59 - FN_DEF@0..59 + FN@0..59 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast index 573edc081..4f0c68822 100644 --- a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast +++ b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast @@ -20,7 +20,7 @@ SOURCE_FILE@0..199 ASSOC_ITEM_LIST@84..141 L_CURLY@84..85 "{" WHITESPACE@85..90 "\n " - FN_DEF@90..139 + FN@90..139 FN_KW@90..92 "fn" WHITESPACE@92..93 " " NAME@93..96 @@ -55,7 +55,7 @@ SOURCE_FILE@0..199 WHITESPACE@139..140 "\n" R_CURLY@140..141 "}" WHITESPACE@141..143 "\n\n" - FN_DEF@143..161 + FN@143..161 FN_KW@143..145 "fn" WHITESPACE@145..146 " " NAME@146..149 @@ -78,7 +78,7 @@ SOURCE_FILE@0..199 L_CURLY@159..160 "{" R_CURLY@160..161 "}" WHITESPACE@161..163 "\n\n" - FN_DEF@163..198 + FN@163..198 FN_KW@163..165 "fn" WHITESPACE@165..166 " " NAME@166..170 diff --git a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast index 900eeb445..22eb22e3c 100644 --- a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast +++ b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast @@ -30,7 +30,7 @@ SOURCE_FILE@0..160 WHITESPACE@88..89 " " R_CURLY@89..90 "}" WHITESPACE@90..92 "\n\n" - FN_DEF@92..159 + FN@92..159 FN_KW@92..94 "fn" WHITESPACE@94..95 " " NAME@95..98 diff --git a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast index 6d941487b..c9e6d88eb 100644 --- a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..166 - FN_DEF@0..165 + FN@0..165 COMMENT@0..60 "// https://github.com ..." WHITESPACE@60..61 "\n" FN_KW@61..63 "fn" diff --git a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast index 69aa0ba4d..5ebc53618 100644 --- a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..686 - FN_DEF@0..461 + FN@0..461 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..8 @@ -101,7 +101,7 @@ SOURCE_FILE@0..686 ASSOC_ITEM_LIST@538..685 L_CURLY@538..539 "{" WHITESPACE@539..544 "\n " - FN_DEF@544..683 + FN@544..683 FN_KW@544..546 "fn" WHITESPACE@546..547 " " NAME@547..558 diff --git a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast index 38e44e48a..29a5d48e6 100644 --- a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast +++ b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast @@ -1,7 +1,7 @@ SOURCE_FILE@0..395 COMMENT@0..60 "// https://github.com ..." WHITESPACE@60..62 "\n\n" - FN_DEF@62..341 + FN@62..341 FN_KW@62..64 "fn" WHITESPACE@64..65 " " NAME@65..69 @@ -288,7 +288,7 @@ SOURCE_FILE@0..395 WHITESPACE@365..366 "\n" R_CURLY@366..367 "}" WHITESPACE@367..369 "\n\n" - FN_DEF@369..394 + FN@369..394 FN_KW@369..371 "fn" WHITESPACE@371..372 " " NAME@372..375 diff --git a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast index 28233c5d0..662576e5f 100644 --- a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast +++ b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast @@ -1,7 +1,7 @@ SOURCE_FILE@0..257 COMMENT@0..58 "// https://github.com ..." WHITESPACE@58..60 "\n\n" - FN_DEF@60..256 + FN@60..256 FN_KW@60..62 "fn" WHITESPACE@62..63 " " NAME@63..82 diff --git a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast b/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast index 0569488f8..57ecad3cf 100644 --- a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast +++ b/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..47 - 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/ok/0050_async_block_as_argument.rast b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast index 7847da085..798e81ca6 100644 --- a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast +++ b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..95 - FN_DEF@0..52 + FN@0..52 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 @@ -52,7 +52,7 @@ SOURCE_FILE@0..95 L_CURLY@50..51 "{" R_CURLY@51..52 "}" WHITESPACE@52..54 "\n\n" - FN_DEF@54..94 + FN@54..94 FN_KW@54..56 "fn" WHITESPACE@56..57 " " NAME@57..61 diff --git a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast index 919c690de..9a173b002 100644 --- a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..519 - FN_DEF@0..37 + FN@0..37 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..5 @@ -41,7 +41,7 @@ SOURCE_FILE@0..519 L_CURLY@35..36 "{" R_CURLY@36..37 "}" WHITESPACE@37..38 "\n" - FN_DEF@38..62 + FN@38..62 FN_KW@38..40 "fn" WHITESPACE@40..41 " " NAME@41..43 @@ -83,7 +83,7 @@ SOURCE_FILE@0..519 EXTERN_ITEM_LIST@75..128 L_CURLY@75..76 "{" WHITESPACE@76..77 " " - FN_DEF@77..126 + FN@77..126 FN_KW@77..79 "fn" WHITESPACE@79..80 " " NAME@80..86 @@ -132,7 +132,7 @@ SOURCE_FILE@0..519 WHITESPACE@126..127 " " R_CURLY@127..128 "}" WHITESPACE@128..130 "\n\n" - FN_DEF@130..172 + FN@130..172 FN_KW@130..132 "fn" WHITESPACE@132..133 " " NAME@133..136 @@ -195,7 +195,7 @@ SOURCE_FILE@0..519 ASSOC_ITEM_LIST@184..236 L_CURLY@184..185 "{" WHITESPACE@185..190 "\n " - FN_DEF@190..234 + FN@190..234 FN_KW@190..192 "fn" WHITESPACE@192..193 " " NAME@193..196 @@ -263,7 +263,7 @@ SOURCE_FILE@0..519 ASSOC_ITEM_LIST@245..519 L_CURLY@245..246 "{" WHITESPACE@246..252 "\n " - FN_DEF@252..277 + FN@252..277 FN_KW@252..254 "fn" WHITESPACE@254..255 " " NAME@255..256 @@ -287,7 +287,7 @@ SOURCE_FILE@0..519 L_CURLY@275..276 "{" R_CURLY@276..277 "}" WHITESPACE@277..283 "\n " - FN_DEF@283..305 + FN@283..305 FN_KW@283..285 "fn" WHITESPACE@285..286 " " NAME@286..288 @@ -311,7 +311,7 @@ SOURCE_FILE@0..519 L_CURLY@303..304 "{" R_CURLY@304..305 "}" WHITESPACE@305..311 "\n " - FN_DEF@311..334 + FN@311..334 FN_KW@311..313 "fn" WHITESPACE@313..314 " " NAME@314..316 @@ -336,7 +336,7 @@ SOURCE_FILE@0..519 L_CURLY@332..333 "{" R_CURLY@333..334 "}" WHITESPACE@334..340 "\n " - FN_DEF@340..371 + FN@340..371 FN_KW@340..342 "fn" WHITESPACE@342..343 " " NAME@343..345 @@ -368,7 +368,7 @@ SOURCE_FILE@0..519 L_CURLY@369..370 "{" R_CURLY@370..371 "}" WHITESPACE@371..377 "\n " - FN_DEF@377..407 + FN@377..407 FN_KW@377..379 "fn" WHITESPACE@379..380 " " NAME@380..382 @@ -400,7 +400,7 @@ SOURCE_FILE@0..519 L_CURLY@405..406 "{" R_CURLY@406..407 "}" WHITESPACE@407..413 "\n " - FN_DEF@413..447 + FN@413..447 FN_KW@413..415 "fn" WHITESPACE@415..416 " " NAME@416..418 @@ -434,7 +434,7 @@ SOURCE_FILE@0..519 L_CURLY@445..446 "{" R_CURLY@446..447 "}" WHITESPACE@447..453 "\n " - FN_DEF@453..480 + FN@453..480 FN_KW@453..455 "fn" WHITESPACE@455..456 " " NAME@456..457 @@ -465,7 +465,7 @@ SOURCE_FILE@0..519 L_CURLY@478..479 "{" R_CURLY@479..480 "}" WHITESPACE@480..486 "\n " - FN_DEF@486..517 + FN@486..517 FN_KW@486..488 "fn" WHITESPACE@488..489 " " NAME@489..490 diff --git a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast index 65cfa7bc5..a30000398 100644 --- a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast +++ b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..80 - FN_DEF@0..79 + FN@0..79 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast index d6aec7ab9..e3997ac5b 100644 --- a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast +++ b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..88 - FN_DEF@0..26 + FN@0..26 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..4 @@ -35,7 +35,7 @@ SOURCE_FILE@0..88 L_CURLY@24..25 "{" R_CURLY@25..26 "}" WHITESPACE@26..28 "\n\n" - FN_DEF@28..56 + FN@28..56 FN_KW@28..30 "fn" WHITESPACE@30..31 " " NAME@31..32 @@ -77,7 +77,7 @@ SOURCE_FILE@0..88 L_CURLY@54..55 "{" R_CURLY@55..56 "}" WHITESPACE@56..58 "\n\n" - FN_DEF@58..87 + FN@58..87 FN_KW@58..60 "fn" WHITESPACE@60..61 " " NAME@61..62 diff --git a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast b/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast index 9e0cec35f..1c893180c 100644 --- a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast +++ b/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast @@ -12,7 +12,7 @@ SOURCE_FILE@0..49 R_PAREN@10..11 ")" SEMICOLON@11..12 ";" WHITESPACE@12..14 "\n\n" - FN_DEF@14..48 + FN@14..48 FN_KW@14..16 "fn" WHITESPACE@16..17 " " NAME@17..21 diff --git a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast b/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast index 7fa3033ac..3ef916e55 100644 --- a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast +++ b/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..71 - FN_DEF@0..70 + FN@0..70 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast index d93968016..53410a1ee 100644 --- a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast +++ b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..50 - FN_DEF@0..17 + FN@0..17 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 @@ -23,7 +23,7 @@ SOURCE_FILE@0..50 L_CURLY@15..16 "{" R_CURLY@16..17 "}" WHITESPACE@17..19 "\n\n" - FN_DEF@19..50 + FN@19..50 FN_KW@19..21 "fn" WHITESPACE@21..22 " " NAME@22..26 diff --git a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast b/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast index b5c72ee36..a1dfd58f2 100644 --- a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast +++ b/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..79 - FN_DEF@0..78 + FN@0..78 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast b/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast index ddcb139c1..767b516a2 100644 --- a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast +++ b/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..105 - FN_DEF@0..104 + FN@0..104 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast b/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast index 098152fc3..1fd1a2888 100644 --- a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast +++ b/crates/ra_syntax/test_data/parser/ok/0060_as_range.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..7 diff --git a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast b/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast index c6e982976..ba49c115b 100644 --- a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast +++ b/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.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..7 diff --git a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast b/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast index bf791ee2b..0c22c31a4 100644 --- a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast +++ b/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast @@ -51,7 +51,7 @@ SOURCE_FILE@0..349 WHITESPACE@91..92 "\n" R_CURLY@92..93 "}" WHITESPACE@93..95 "\n\n" - FN_DEF@95..348 + FN@95..348 ATTR@95..102 POUND@95..96 "#" L_BRACK@96..97 "[" diff --git a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast index 40619b46e..a87bbf4eb 100644 --- a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast +++ b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast @@ -8,7 +8,7 @@ SOURCE_FILE@0..170 ASSOC_ITEM_LIST@8..169 L_CURLY@8..9 "{" WHITESPACE@9..14 "\n " - FN_DEF@14..46 + FN@14..46 FN_KW@14..16 "fn" WHITESPACE@16..17 " " NAME@17..19 @@ -50,7 +50,7 @@ SOURCE_FILE@0..170 L_CURLY@44..45 "{" R_CURLY@45..46 "}" WHITESPACE@46..51 "\n " - FN_DEF@51..74 + FN@51..74 FN_KW@51..53 "fn" WHITESPACE@53..54 " " NAME@54..56 @@ -92,7 +92,7 @@ SOURCE_FILE@0..170 L_CURLY@72..73 "{" R_CURLY@73..74 "}" WHITESPACE@74..79 "\n " - FN_DEF@79..108 + FN@79..108 FN_KW@79..81 "fn" WHITESPACE@81..82 " " NAME@82..84 @@ -123,7 +123,7 @@ SOURCE_FILE@0..170 L_CURLY@106..107 "{" R_CURLY@107..108 "}" WHITESPACE@108..113 "\n " - FN_DEF@113..135 + FN@113..135 FN_KW@113..115 "fn" WHITESPACE@115..116 " " NAME@116..118 @@ -155,7 +155,7 @@ SOURCE_FILE@0..170 L_CURLY@133..134 "{" R_CURLY@134..135 "}" WHITESPACE@135..140 "\n " - FN_DEF@140..167 + FN@140..167 FN_KW@140..142 "fn" WHITESPACE@142..143 " " NAME@143..146 diff --git a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast b/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast index 5a9f07c89..7adedb02e 100644 --- a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast +++ b/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast @@ -8,7 +8,7 @@ SOURCE_FILE@0..126 EXTERN_ITEM_LIST@11..125 L_CURLY@11..12 "{" WHITESPACE@12..17 "\n " - FN_DEF@17..40 + FN@17..40 FN_KW@17..19 "fn" WHITESPACE@19..20 " " NAME@20..21 @@ -37,7 +37,7 @@ SOURCE_FILE@0..126 R_PAREN@38..39 ")" SEMICOLON@39..40 ";" WHITESPACE@40..45 "\n " - FN_DEF@45..70 + FN@45..70 FN_KW@45..47 "fn" WHITESPACE@47..48 " " NAME@48..49 @@ -69,7 +69,7 @@ SOURCE_FILE@0..126 R_PAREN@68..69 ")" SEMICOLON@69..70 ";" WHITESPACE@70..75 "\n " - FN_DEF@75..123 + FN@75..123 FN_KW@75..77 "fn" WHITESPACE@77..78 " " NAME@78..79 diff --git a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast index 7b026e33b..ef0eca47c 100644 --- a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast +++ b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast @@ -11,7 +11,7 @@ SOURCE_FILE@0..137 ASSOC_ITEM_LIST@7..136 L_CURLY@7..8 "{" WHITESPACE@8..13 "\n " - FN_DEF@13..45 + FN@13..45 FN_KW@13..15 "fn" WHITESPACE@15..16 " " NAME@16..18 @@ -53,7 +53,7 @@ SOURCE_FILE@0..137 L_CURLY@43..44 "{" R_CURLY@44..45 "}" WHITESPACE@45..50 "\n " - FN_DEF@50..73 + FN@50..73 FN_KW@50..52 "fn" WHITESPACE@52..53 " " NAME@53..55 @@ -95,7 +95,7 @@ SOURCE_FILE@0..137 L_CURLY@71..72 "{" R_CURLY@72..73 "}" WHITESPACE@73..78 "\n " - FN_DEF@78..107 + FN@78..107 FN_KW@78..80 "fn" WHITESPACE@80..81 " " NAME@81..83 @@ -126,7 +126,7 @@ SOURCE_FILE@0..137 L_CURLY@105..106 "{" R_CURLY@106..107 "}" WHITESPACE@107..112 "\n " - FN_DEF@112..134 + FN@112..134 FN_KW@112..114 "fn" WHITESPACE@114..115 " " NAME@115..117 diff --git a/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast b/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast index d1fffdd63..29bd38c05 100644 --- a/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast +++ b/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..26 - FN_DEF@0..25 + FN@0..25 COMMENT@0..11 "/// Example" WHITESPACE@11..13 "\n\n" FN_KW@13..15 "fn" diff --git a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast b/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast index eb2f8eb3c..7996dc121 100644 --- a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast +++ b/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.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..4 diff --git a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast b/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast index 503585103..e4c2578f6 100644 --- a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast +++ b/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..374 - FN_DEF@0..55 + FN@0..55 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..12 @@ -59,7 +59,7 @@ SOURCE_FILE@0..374 WHITESPACE@53..54 "\n" R_CURLY@54..55 "}" WHITESPACE@55..56 "\n" - FN_DEF@56..107 + FN@56..107 FN_KW@56..58 "fn" WHITESPACE@58..59 " " NAME@59..66 @@ -110,7 +110,7 @@ SOURCE_FILE@0..374 WHITESPACE@105..106 "\n" R_CURLY@106..107 "}" WHITESPACE@107..108 "\n" - FN_DEF@108..170 + FN@108..170 FN_KW@108..110 "fn" WHITESPACE@110..111 " " NAME@111..121 @@ -177,7 +177,7 @@ SOURCE_FILE@0..374 WHITESPACE@168..169 "\n" R_CURLY@169..170 "}" WHITESPACE@170..171 "\n" - FN_DEF@171..223 + FN@171..223 FN_KW@171..173 "fn" WHITESPACE@173..174 " " NAME@174..183 @@ -231,7 +231,7 @@ SOURCE_FILE@0..374 WHITESPACE@221..222 "\n" R_CURLY@222..223 "}" WHITESPACE@223..224 "\n" - FN_DEF@224..300 + FN@224..300 FN_KW@224..226 "fn" WHITESPACE@226..227 " " NAME@227..236 @@ -313,7 +313,7 @@ SOURCE_FILE@0..374 WHITESPACE@298..299 "\n" R_CURLY@299..300 "}" WHITESPACE@300..301 "\n" - FN_DEF@301..373 + FN@301..373 FN_KW@301..303 "fn" WHITESPACE@303..304 " " NAME@304..314 -- 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 --- crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/ra_syntax/test_data/parser/ok') diff --git a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast b/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast index 1c893180c..7447d516e 100644 --- a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast +++ b/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..49 - TYPE_ALIAS_DEF@0..12 + TYPE_ALIAS@0..12 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 -- cgit v1.2.3