From b10e437039c2d7e300f6be6b5de6446419a2d660 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 28 Jul 2020 20:59:48 +0200 Subject: Fix nameref parsing --- crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/ok') diff --git a/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast b/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast index b5bdf0aa9..271486605 100644 --- a/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast +++ b/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast @@ -28,8 +28,7 @@ SOURCE_FILE@0..69 WHITESPACE@49..50 " " CRATE_KW@50..55 "crate" WHITESPACE@55..56 " " - SELF_KW@56..60 - SELF_KW@56..60 "self" + SELF_KW@56..60 "self" WHITESPACE@60..61 " " ALIAS@61..67 AS_KW@61..63 "as" -- cgit v1.2.3 From 081f35fe1b311223866fa5fc7edde2e8048cd901 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 11:48:19 +0200 Subject: Update tests --- crates/ra_syntax/test_data/parser/ok/0030_traits.rast | 4 ++-- crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast | 2 +- crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast | 2 +- crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast | 4 ++-- crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast | 2 +- crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast | 2 +- crates/ra_syntax/test_data/parser/ok/0066_default_const.rast | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/ok') 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 0aadc11a4..63693de4f 100644 --- a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast +++ b/crates/ra_syntax/test_data/parser/ok/0030_traits.rast @@ -5,7 +5,7 @@ SOURCE_FILE@0..96 NAME@6..14 IDENT@6..14 "Runnable" WHITESPACE@14..15 " " - ITEM_LIST@15..36 + ASSOC_ITEM_LIST@15..36 L_CURLY@15..16 "{" WHITESPACE@16..21 "\n " FN_DEF@21..34 @@ -26,7 +26,7 @@ SOURCE_FILE@0..96 NAME@44..57 IDENT@44..57 "TraitWithExpr" WHITESPACE@57..58 " " - ITEM_LIST@58..95 + ASSOC_ITEM_LIST@58..95 L_CURLY@58..59 "{" WHITESPACE@59..64 "\n " FN_DEF@64..93 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 468982b74..573edc081 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 @@ -17,7 +17,7 @@ SOURCE_FILE@0..199 NAME_REF@80..83 IDENT@80..83 "Foo" WHITESPACE@83..84 " " - ITEM_LIST@84..141 + ASSOC_ITEM_LIST@84..141 L_CURLY@84..85 "{" WHITESPACE@85..90 "\n " FN_DEF@90..139 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 e8b095251..69aa0ba4d 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 @@ -98,7 +98,7 @@ SOURCE_FILE@0..686 NAME_REF@529..537 IDENT@529..537 "Whatever" WHITESPACE@537..538 " " - ITEM_LIST@538..685 + ASSOC_ITEM_LIST@538..685 L_CURLY@538..539 "{" WHITESPACE@539..544 "\n " FN_DEF@544..683 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 816740a7c..919c690de 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 @@ -192,7 +192,7 @@ SOURCE_FILE@0..519 NAME@180..183 IDENT@180..183 "Foo" WHITESPACE@183..184 " " - ITEM_LIST@184..236 + ASSOC_ITEM_LIST@184..236 L_CURLY@184..185 "{" WHITESPACE@185..190 "\n " FN_DEF@190..234 @@ -260,7 +260,7 @@ SOURCE_FILE@0..519 NAME_REF@243..244 IDENT@243..244 "S" WHITESPACE@244..245 " " - ITEM_LIST@245..519 + ASSOC_ITEM_LIST@245..519 L_CURLY@245..246 "{" WHITESPACE@246..252 "\n " FN_DEF@252..277 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 886b211d0..40619b46e 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 @@ -5,7 +5,7 @@ SOURCE_FILE@0..170 NAME@6..7 IDENT@6..7 "T" WHITESPACE@7..8 " " - ITEM_LIST@8..169 + ASSOC_ITEM_LIST@8..169 L_CURLY@8..9 "{" WHITESPACE@9..14 "\n " FN_DEF@14..46 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 a0423806c..7b026e33b 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 @@ -8,7 +8,7 @@ SOURCE_FILE@0..137 NAME_REF@5..6 IDENT@5..6 "U" WHITESPACE@6..7 " " - ITEM_LIST@7..136 + ASSOC_ITEM_LIST@7..136 L_CURLY@7..8 "{" WHITESPACE@8..13 "\n " FN_DEF@13..45 diff --git a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast index dab0247ee..584b2faf1 100644 --- a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast +++ b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast @@ -16,7 +16,7 @@ SOURCE_FILE@0..46 NAME_REF@11..14 IDENT@11..14 "Foo" WHITESPACE@14..15 " " - ITEM_LIST@15..45 + ASSOC_ITEM_LIST@15..45 L_CURLY@15..16 "{" WHITESPACE@16..19 "\n " CONST_DEF@19..43 -- cgit v1.2.3 From 026e4e6af1e58843f3535f6e0f5365d0c2529e4e Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 12:01:14 +0200 Subject: Update tests --- crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast | 4 ++-- crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/ok') diff --git a/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast b/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast index 271486605..948c4ddb3 100644 --- a/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast +++ b/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast @@ -16,7 +16,7 @@ SOURCE_FILE@0..69 NAME_REF@31..34 IDENT@31..34 "foo" WHITESPACE@34..35 " " - ALIAS@35..41 + RENAME@35..41 AS_KW@35..37 "as" WHITESPACE@37..38 " " NAME@38..41 @@ -30,7 +30,7 @@ SOURCE_FILE@0..69 WHITESPACE@55..56 " " SELF_KW@56..60 "self" WHITESPACE@60..61 " " - ALIAS@61..67 + RENAME@61..67 AS_KW@61..63 "as" WHITESPACE@63..64 " " NAME@64..67 diff --git a/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast b/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast index 09e0050f0..cdddb4214 100644 --- a/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast +++ b/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast @@ -8,7 +8,7 @@ SOURCE_FILE@0..55 NAME_REF@4..7 IDENT@4..7 "foo" WHITESPACE@7..8 " " - ALIAS@8..14 + RENAME@8..14 AS_KW@8..10 "as" WHITESPACE@10..11 " " NAME@11..14 @@ -32,7 +32,7 @@ SOURCE_FILE@0..55 NAME_REF@26..27 IDENT@26..27 "a" WHITESPACE@27..28 " " - ALIAS@28..32 + RENAME@28..32 AS_KW@28..30 "as" WHITESPACE@30..31 " " NAME@31..32 @@ -55,7 +55,7 @@ SOURCE_FILE@0..55 NAME_REF@44..47 IDENT@44..47 "foo" WHITESPACE@47..48 " " - ALIAS@48..52 + RENAME@48..52 AS_KW@48..50 "as" WHITESPACE@50..51 " " NAME@51..52 -- cgit v1.2.3 From 96313283cd6cb7732ad4f6498f938dcd428d1864 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 12:33:05 +0200 Subject: Update tests --- crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/ok') diff --git a/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast b/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast index 948c4ddb3..594c2f8f2 100644 --- a/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast +++ b/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..69 - EXTERN_CRATE_ITEM@0..17 + EXTERN_CRATE@0..17 EXTERN_KW@0..6 "extern" WHITESPACE@6..7 " " CRATE_KW@7..12 "crate" @@ -8,7 +8,7 @@ SOURCE_FILE@0..69 IDENT@13..16 "foo" SEMICOLON@16..17 ";" WHITESPACE@17..18 "\n" - EXTERN_CRATE_ITEM@18..42 + EXTERN_CRATE@18..42 EXTERN_KW@18..24 "extern" WHITESPACE@24..25 " " CRATE_KW@25..30 "crate" @@ -23,7 +23,7 @@ SOURCE_FILE@0..69 IDENT@38..41 "bar" SEMICOLON@41..42 ";" WHITESPACE@42..43 "\n" - EXTERN_CRATE_ITEM@43..68 + EXTERN_CRATE@43..68 EXTERN_KW@43..49 "extern" WHITESPACE@49..50 " " CRATE_KW@50..55 "crate" -- cgit v1.2.3 From b6b77d1396d420421ede0aaf0a5638f9ceb895ed Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 14:18:12 +0200 Subject: Update tests --- crates/ra_syntax/test_data/parser/ok/0009_use_item.rast | 4 ++-- .../test_data/parser/ok/0010_use_path_segments.rast | 4 ++-- .../test_data/parser/ok/0013_use_path_self_super.rast | 4 ++-- crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast | 14 +++++++------- crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast | 4 ++-- crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/ok') diff --git a/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast b/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast index 96b8a94fc..6be1cf9fc 100644 --- a/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast +++ b/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..19 - USE_ITEM@0..8 + USE@0..8 USE_KW@0..3 "use" WHITESPACE@3..4 " " USE_TREE@4..7 @@ -9,7 +9,7 @@ SOURCE_FILE@0..19 IDENT@4..7 "foo" SEMICOLON@7..8 ";" WHITESPACE@8..9 "\n" - USE_ITEM@9..19 + USE@9..19 USE_KW@9..12 "use" WHITESPACE@12..13 " " USE_TREE@13..18 diff --git a/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast b/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast index 07272dc3c..4d49e7933 100644 --- a/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast +++ b/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..40 - USE_ITEM@0..20 + USE@0..20 USE_KW@0..3 "use" WHITESPACE@3..4 " " USE_TREE@4..19 @@ -20,7 +20,7 @@ SOURCE_FILE@0..40 IDENT@16..19 "baz" SEMICOLON@19..20 ";" WHITESPACE@20..21 "\n" - USE_ITEM@21..39 + USE@21..39 USE_KW@21..24 "use" WHITESPACE@24..25 " " USE_TREE@25..38 diff --git a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast index 05d9c05ad..66ab13660 100644 --- a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast +++ b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..38 - USE_ITEM@0..14 + USE@0..14 USE_KW@0..3 "use" WHITESPACE@3..4 " " USE_TREE@4..13 @@ -13,7 +13,7 @@ SOURCE_FILE@0..38 IDENT@10..13 "foo" SEMICOLON@13..14 ";" WHITESPACE@14..15 "\n" - USE_ITEM@15..37 + USE@15..37 USE_KW@15..18 "use" WHITESPACE@18..19 " " USE_TREE@19..36 diff --git a/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast b/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast index 3642c107b..4389d2d4b 100644 --- a/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast +++ b/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast @@ -1,12 +1,12 @@ SOURCE_FILE@0..81 - USE_ITEM@0..6 + USE@0..6 USE_KW@0..3 "use" WHITESPACE@3..4 " " USE_TREE@4..5 STAR@4..5 "*" SEMICOLON@5..6 ";" WHITESPACE@6..7 "\n" - USE_ITEM@7..15 + USE@7..15 USE_KW@7..10 "use" WHITESPACE@10..11 " " USE_TREE@11..14 @@ -14,7 +14,7 @@ SOURCE_FILE@0..81 STAR@13..14 "*" SEMICOLON@14..15 ";" WHITESPACE@15..16 "\n" - USE_ITEM@16..25 + USE@16..25 USE_KW@16..19 "use" WHITESPACE@19..20 " " USE_TREE@20..24 @@ -24,7 +24,7 @@ SOURCE_FILE@0..81 R_CURLY@23..24 "}" SEMICOLON@24..25 ";" WHITESPACE@25..26 "\n" - USE_ITEM@26..33 + USE@26..33 USE_KW@26..29 "use" WHITESPACE@29..30 " " USE_TREE@30..32 @@ -33,7 +33,7 @@ SOURCE_FILE@0..81 R_CURLY@31..32 "}" SEMICOLON@32..33 ";" WHITESPACE@33..34 "\n" - USE_ITEM@34..45 + USE@34..45 USE_KW@34..37 "use" WHITESPACE@37..38 " " USE_TREE@38..44 @@ -45,7 +45,7 @@ SOURCE_FILE@0..81 STAR@43..44 "*" SEMICOLON@44..45 ";" WHITESPACE@45..46 "\n" - USE_ITEM@46..58 + USE@46..58 USE_KW@46..49 "use" WHITESPACE@49..50 " " USE_TREE@50..57 @@ -59,7 +59,7 @@ SOURCE_FILE@0..81 R_CURLY@56..57 "}" SEMICOLON@57..58 ";" WHITESPACE@58..59 "\n" - USE_ITEM@59..80 + USE@59..80 USE_KW@59..62 "use" WHITESPACE@62..63 " " USE_TREE@63..79 diff --git a/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast b/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast index cdddb4214..d7e93f7eb 100644 --- a/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast +++ b/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..55 - USE_ITEM@0..15 + USE@0..15 USE_KW@0..3 "use" WHITESPACE@3..4 " " USE_TREE@4..14 @@ -15,7 +15,7 @@ SOURCE_FILE@0..55 IDENT@11..14 "bar" SEMICOLON@14..15 ";" WHITESPACE@15..16 "\n" - USE_ITEM@16..54 + USE@16..54 USE_KW@16..19 "use" WHITESPACE@19..20 " " USE_TREE@20..53 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 eb59d6e17..bbdf896d1 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 @@ -78,7 +78,7 @@ SOURCE_FILE@0..3813 STRING@399..404 "\"128\"" R_BRACK@404..405 "]" WHITESPACE@405..407 "\n\n" - USE_ITEM@407..427 + USE@407..427 USE_KW@407..410 "use" WHITESPACE@410..411 " " USE_TREE@411..426 @@ -98,7 +98,7 @@ SOURCE_FILE@0..3813 IDENT@422..426 "Cell" SEMICOLON@426..427 ";" WHITESPACE@427..428 "\n" - USE_ITEM@428..447 + USE@428..447 USE_KW@428..431 "use" WHITESPACE@431..432 " " USE_TREE@432..446 -- cgit v1.2.3 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 From 28ef4c375a9f56d69daf885504aea3df7012bb81 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 15:36:21 +0200 Subject: Rename TypeParamList -> GenericParamList --- .../test_data/parser/ok/0001_struct_item.rast | 2 +- .../parser/ok/0018_struct_type_params.rast | 30 +++++++++++----------- .../ra_syntax/test_data/parser/ok/0019_enums.rast | 2 +- .../parser/ok/0020_type_param_bounds.rast | 20 +++++++-------- .../test_data/parser/ok/0032_where_for.rast | 4 +-- .../test_data/parser/ok/0035_weird_exprs.rast | 2 +- .../test_data/parser/ok/0036_fully_qualified.rast | 2 +- .../test_data/parser/ok/0051_parameter_attrs.rast | 8 +++--- .../parser/ok/0065_plus_after_fn_trait_bound.rast | 2 +- .../test_data/parser/ok/0067_where_for_pred.rast | 26 +++++++++---------- 10 files changed, 49 insertions(+), 49 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/ok') diff --git a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast index 705f7e001..cf801aedd 100644 --- a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast +++ b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..32 WHITESPACE@6..7 " " NAME@7..8 IDENT@7..8 "S" - TYPE_PARAM_LIST@8..17 + GENERIC_PARAM_LIST@8..17 L_ANGLE@8..9 "<" TYPE_PARAM@9..16 NAME@9..10 diff --git a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast index 451634e3f..3ee208fff 100644 --- a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast +++ b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..290 WHITESPACE@6..7 " " NAME@7..9 IDENT@7..9 "S1" - TYPE_PARAM_LIST@9..12 + GENERIC_PARAM_LIST@9..12 L_ANGLE@9..10 "<" TYPE_PARAM@10..11 NAME@10..11 @@ -17,7 +17,7 @@ SOURCE_FILE@0..290 WHITESPACE@20..21 " " NAME@21..23 IDENT@21..23 "S2" - TYPE_PARAM_LIST@23..26 + GENERIC_PARAM_LIST@23..26 L_ANGLE@23..24 "<" TYPE_PARAM@24..25 NAME@24..25 @@ -39,7 +39,7 @@ SOURCE_FILE@0..290 WHITESPACE@39..40 " " NAME@40..42 IDENT@40..42 "S3" - TYPE_PARAM_LIST@42..45 + GENERIC_PARAM_LIST@42..45 L_ANGLE@42..43 "<" TYPE_PARAM@43..44 NAME@43..44 @@ -67,7 +67,7 @@ SOURCE_FILE@0..290 WHITESPACE@64..65 " " NAME@65..67 IDENT@65..67 "S4" - TYPE_PARAM_LIST@67..69 + GENERIC_PARAM_LIST@67..69 L_ANGLE@67..68 "<" R_ANGLE@68..69 ">" SEMICOLON@69..70 ";" @@ -77,7 +77,7 @@ SOURCE_FILE@0..290 WHITESPACE@77..78 " " NAME@78..80 IDENT@78..80 "S5" - TYPE_PARAM_LIST@80..84 + GENERIC_PARAM_LIST@80..84 L_ANGLE@80..81 "<" LIFETIME_PARAM@81..83 LIFETIME@81..83 "\'a" @@ -89,7 +89,7 @@ SOURCE_FILE@0..290 WHITESPACE@92..93 " " NAME@93..95 IDENT@93..95 "S6" - TYPE_PARAM_LIST@95..100 + GENERIC_PARAM_LIST@95..100 L_ANGLE@95..96 "<" LIFETIME_PARAM@96..99 LIFETIME@96..98 "\'a" @@ -102,7 +102,7 @@ SOURCE_FILE@0..290 WHITESPACE@108..109 " " NAME@109..111 IDENT@109..111 "S7" - TYPE_PARAM_LIST@111..119 + GENERIC_PARAM_LIST@111..119 L_ANGLE@111..112 "<" LIFETIME_PARAM@112..118 LIFETIME@112..114 "\'a" @@ -117,7 +117,7 @@ SOURCE_FILE@0..290 WHITESPACE@127..128 " " NAME@128..130 IDENT@128..130 "S8" - TYPE_PARAM_LIST@130..141 + GENERIC_PARAM_LIST@130..141 L_ANGLE@130..131 "<" LIFETIME_PARAM@131..139 LIFETIME@131..133 "\'a" @@ -135,7 +135,7 @@ SOURCE_FILE@0..290 WHITESPACE@149..150 " " NAME@150..152 IDENT@150..152 "S9" - TYPE_PARAM_LIST@152..165 + GENERIC_PARAM_LIST@152..165 L_ANGLE@152..153 "<" LIFETIME_PARAM@153..164 LIFETIME@153..155 "\'a" @@ -154,7 +154,7 @@ SOURCE_FILE@0..290 WHITESPACE@173..174 " " NAME@174..177 IDENT@174..177 "S10" - TYPE_PARAM_LIST@177..182 + GENERIC_PARAM_LIST@177..182 L_ANGLE@177..178 "<" LIFETIME_PARAM@178..180 LIFETIME@178..180 "\'a" @@ -167,7 +167,7 @@ SOURCE_FILE@0..290 WHITESPACE@190..191 " " NAME@191..194 IDENT@191..194 "S11" - TYPE_PARAM_LIST@194..202 + GENERIC_PARAM_LIST@194..202 L_ANGLE@194..195 "<" LIFETIME_PARAM@195..197 LIFETIME@195..197 "\'a" @@ -183,7 +183,7 @@ SOURCE_FILE@0..290 WHITESPACE@210..211 " " NAME@211..214 IDENT@211..214 "S12" - TYPE_PARAM_LIST@214..232 + GENERIC_PARAM_LIST@214..232 L_ANGLE@214..215 "<" LIFETIME_PARAM@215..222 LIFETIME@215..217 "\'a" @@ -207,7 +207,7 @@ SOURCE_FILE@0..290 WHITESPACE@241..242 " " NAME@242..245 IDENT@242..245 "S13" - TYPE_PARAM_LIST@245..248 + GENERIC_PARAM_LIST@245..248 L_ANGLE@245..246 "<" TYPE_PARAM@246..247 NAME@246..247 @@ -220,7 +220,7 @@ SOURCE_FILE@0..290 WHITESPACE@256..257 " " NAME@257..260 IDENT@257..260 "S14" - TYPE_PARAM_LIST@260..266 + GENERIC_PARAM_LIST@260..266 L_ANGLE@260..261 "<" TYPE_PARAM@261..262 NAME@261..262 @@ -238,7 +238,7 @@ SOURCE_FILE@0..290 WHITESPACE@274..275 " " NAME@275..278 IDENT@275..278 "S15" - TYPE_PARAM_LIST@278..288 + GENERIC_PARAM_LIST@278..288 L_ANGLE@278..279 "<" LIFETIME_PARAM@279..281 LIFETIME@279..281 "\'a" diff --git a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast b/crates/ra_syntax/test_data/parser/ok/0019_enums.rast index f767e9e19..993f28c4d 100644 --- a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast +++ b/crates/ra_syntax/test_data/parser/ok/0019_enums.rast @@ -15,7 +15,7 @@ SOURCE_FILE@0..182 WHITESPACE@17..18 " " NAME@18..20 IDENT@18..20 "E2" - TYPE_PARAM_LIST@20..23 + GENERIC_PARAM_LIST@20..23 L_ANGLE@20..21 "<" TYPE_PARAM@21..22 NAME@21..22 diff --git a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast b/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast index 4fb4baf56..5100e6a48 100644 --- a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast +++ b/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..250 WHITESPACE@6..7 " " NAME@7..8 IDENT@7..8 "A" - TYPE_PARAM_LIST@8..11 + GENERIC_PARAM_LIST@8..11 L_ANGLE@8..9 "<" TYPE_PARAM@9..10 NAME@9..10 @@ -17,7 +17,7 @@ SOURCE_FILE@0..250 WHITESPACE@19..20 " " NAME@20..21 IDENT@20..21 "B" - TYPE_PARAM_LIST@21..25 + GENERIC_PARAM_LIST@21..25 L_ANGLE@21..22 "<" TYPE_PARAM@22..24 NAME@22..23 @@ -32,7 +32,7 @@ SOURCE_FILE@0..250 WHITESPACE@33..34 " " NAME@34..35 IDENT@34..35 "C" - TYPE_PARAM_LIST@35..42 + GENERIC_PARAM_LIST@35..42 L_ANGLE@35..36 "<" TYPE_PARAM@36..41 NAME@36..37 @@ -50,7 +50,7 @@ SOURCE_FILE@0..250 WHITESPACE@50..51 " " NAME@51..52 IDENT@51..52 "D" - TYPE_PARAM_LIST@52..62 + GENERIC_PARAM_LIST@52..62 L_ANGLE@52..53 "<" TYPE_PARAM@53..60 NAME@53..54 @@ -71,7 +71,7 @@ SOURCE_FILE@0..250 WHITESPACE@70..71 " " NAME@71..72 IDENT@71..72 "E" - TYPE_PARAM_LIST@72..85 + GENERIC_PARAM_LIST@72..85 L_ANGLE@72..73 "<" TYPE_PARAM@73..83 NAME@73..74 @@ -95,7 +95,7 @@ SOURCE_FILE@0..250 WHITESPACE@93..94 " " NAME@94..95 IDENT@94..95 "F" - TYPE_PARAM_LIST@95..115 + GENERIC_PARAM_LIST@95..115 L_ANGLE@95..96 "<" TYPE_PARAM@96..114 NAME@96..97 @@ -127,7 +127,7 @@ SOURCE_FILE@0..250 WHITESPACE@123..124 " " NAME@124..125 IDENT@124..125 "G" - TYPE_PARAM_LIST@125..142 + GENERIC_PARAM_LIST@125..142 L_ANGLE@125..126 "<" TYPE_PARAM@126..141 NAME@126..127 @@ -158,7 +158,7 @@ SOURCE_FILE@0..250 WHITESPACE@150..151 " " NAME@151..152 IDENT@151..152 "H" - TYPE_PARAM_LIST@152..179 + GENERIC_PARAM_LIST@152..179 L_ANGLE@152..153 "<" TYPE_PARAM@153..178 NAME@153..154 @@ -199,7 +199,7 @@ SOURCE_FILE@0..250 WHITESPACE@187..188 " " NAME@188..189 IDENT@188..189 "I" - TYPE_PARAM_LIST@189..198 + GENERIC_PARAM_LIST@189..198 L_ANGLE@189..190 "<" TYPE_PARAM@190..192 NAME@190..191 @@ -222,7 +222,7 @@ SOURCE_FILE@0..250 WHITESPACE@206..207 " " NAME@207..208 IDENT@207..208 "K" - TYPE_PARAM_LIST@208..249 + GENERIC_PARAM_LIST@208..249 L_ANGLE@208..209 "<" LIFETIME_PARAM@209..215 LIFETIME@209..211 "\'a" 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 1b2325a2d..10da87c71 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 @@ -4,7 +4,7 @@ SOURCE_FILE@0..116 WHITESPACE@2..3 " " NAME@3..21 IDENT@3..21 "test_serialization" - TYPE_PARAM_LIST@21..26 + GENERIC_PARAM_LIST@21..26 L_ANGLE@21..22 "<" TYPE_PARAM@22..25 NAME@22..25 @@ -38,7 +38,7 @@ SOURCE_FILE@0..116 TYPE_BOUND@56..81 FOR_TYPE@56..81 FOR_KW@56..59 "for" - TYPE_PARAM_LIST@59..64 + GENERIC_PARAM_LIST@59..64 L_ANGLE@59..60 "<" LIFETIME_PARAM@60..63 LIFETIME@60..63 "\'de" 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 2e36b54bc..ea54651b7 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 @@ -1565,7 +1565,7 @@ SOURCE_FILE@0..3813 WHITESPACE@2856..2857 " " NAME@2857..2862 IDENT@2857..2862 "union" - TYPE_PARAM_LIST@2862..2870 + GENERIC_PARAM_LIST@2862..2870 L_ANGLE@2862..2863 "<" LIFETIME_PARAM@2863..2869 LIFETIME@2863..2869 "\'union" 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 a5f09e364..c4da317b9 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 @@ -9,7 +9,7 @@ SOURCE_FILE@0..157 WHITESPACE@68..69 " " NAME@69..72 IDENT@69..72 "foo" - TYPE_PARAM_LIST@72..85 + GENERIC_PARAM_LIST@72..85 L_ANGLE@72..73 "<" TYPE_PARAM@73..84 NAME@73..74 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 9a173b002..8081eefbc 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 @@ -137,7 +137,7 @@ SOURCE_FILE@0..519 WHITESPACE@132..133 " " NAME@133..136 IDENT@133..136 "foo" - TYPE_PARAM_LIST@136..168 + GENERIC_PARAM_LIST@136..168 L_ANGLE@136..137 "<" TYPE_PARAM@137..167 NAME@137..138 @@ -341,7 +341,7 @@ SOURCE_FILE@0..519 WHITESPACE@342..343 " " NAME@343..345 IDENT@343..345 "g3" - TYPE_PARAM_LIST@345..349 + GENERIC_PARAM_LIST@345..349 L_ANGLE@345..346 "<" LIFETIME_PARAM@346..348 LIFETIME@346..348 "\'a" @@ -373,7 +373,7 @@ SOURCE_FILE@0..519 WHITESPACE@379..380 " " NAME@380..382 IDENT@380..382 "g4" - TYPE_PARAM_LIST@382..386 + GENERIC_PARAM_LIST@382..386 L_ANGLE@382..383 "<" LIFETIME_PARAM@383..385 LIFETIME@383..385 "\'a" @@ -405,7 +405,7 @@ SOURCE_FILE@0..519 WHITESPACE@415..416 " " NAME@416..418 IDENT@416..418 "g5" - TYPE_PARAM_LIST@418..422 + GENERIC_PARAM_LIST@418..422 L_ANGLE@418..419 "<" LIFETIME_PARAM@419..421 LIFETIME@419..421 "\'a" 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 7996dc121..2c699ffcb 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 @@ -4,7 +4,7 @@ SOURCE_FILE@0..40 WHITESPACE@2..3 " " NAME@3..4 IDENT@3..4 "f" - TYPE_PARAM_LIST@4..7 + GENERIC_PARAM_LIST@4..7 L_ANGLE@4..5 "<" TYPE_PARAM@5..6 NAME@5..6 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 e4c2578f6..a368ac1e8 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 @@ -4,7 +4,7 @@ SOURCE_FILE@0..374 WHITESPACE@2..3 " " NAME@3..12 IDENT@3..12 "for_trait" - TYPE_PARAM_LIST@12..15 + GENERIC_PARAM_LIST@12..15 L_ANGLE@12..13 "<" TYPE_PARAM@13..14 NAME@13..14 @@ -19,7 +19,7 @@ SOURCE_FILE@0..374 WHITESPACE@23..28 "\n " WHERE_PRED@28..50 FOR_KW@28..31 "for" - TYPE_PARAM_LIST@31..35 + GENERIC_PARAM_LIST@31..35 L_ANGLE@31..32 "<" LIFETIME_PARAM@32..34 LIFETIME@32..34 "\'a" @@ -64,7 +64,7 @@ SOURCE_FILE@0..374 WHITESPACE@58..59 " " NAME@59..66 IDENT@59..66 "for_ref" - TYPE_PARAM_LIST@66..69 + GENERIC_PARAM_LIST@66..69 L_ANGLE@66..67 "<" TYPE_PARAM@67..68 NAME@67..68 @@ -79,7 +79,7 @@ SOURCE_FILE@0..374 WHITESPACE@77..82 "\n " WHERE_PRED@82..102 FOR_KW@82..85 "for" - TYPE_PARAM_LIST@85..89 + GENERIC_PARAM_LIST@85..89 L_ANGLE@85..86 "<" LIFETIME_PARAM@86..88 LIFETIME@86..88 "\'a" @@ -115,7 +115,7 @@ SOURCE_FILE@0..374 WHITESPACE@110..111 " " NAME@111..121 IDENT@111..121 "for_parens" - TYPE_PARAM_LIST@121..124 + GENERIC_PARAM_LIST@121..124 L_ANGLE@121..122 "<" TYPE_PARAM@122..123 NAME@122..123 @@ -130,7 +130,7 @@ SOURCE_FILE@0..374 WHITESPACE@132..137 "\n " WHERE_PRED@137..165 FOR_KW@137..140 "for" - TYPE_PARAM_LIST@140..144 + GENERIC_PARAM_LIST@140..144 L_ANGLE@140..141 "<" LIFETIME_PARAM@141..143 LIFETIME@141..143 "\'a" @@ -182,7 +182,7 @@ SOURCE_FILE@0..374 WHITESPACE@173..174 " " NAME@174..183 IDENT@174..183 "for_slice" - TYPE_PARAM_LIST@183..186 + GENERIC_PARAM_LIST@183..186 L_ANGLE@183..184 "<" TYPE_PARAM@184..185 NAME@184..185 @@ -197,7 +197,7 @@ SOURCE_FILE@0..374 WHITESPACE@194..199 "\n " WHERE_PRED@199..218 FOR_KW@199..202 "for" - TYPE_PARAM_LIST@202..206 + GENERIC_PARAM_LIST@202..206 L_ANGLE@202..203 "<" LIFETIME_PARAM@203..205 LIFETIME@203..205 "\'a" @@ -236,7 +236,7 @@ SOURCE_FILE@0..374 WHITESPACE@226..227 " " NAME@227..236 IDENT@227..236 "for_qpath" - TYPE_PARAM_LIST@236..239 + GENERIC_PARAM_LIST@236..239 L_ANGLE@236..237 "<" TYPE_PARAM@237..238 NAME@237..238 @@ -264,7 +264,7 @@ SOURCE_FILE@0..374 WHITESPACE@253..258 "\n " WHERE_PRED@258..295 FOR_KW@258..261 "for" - TYPE_PARAM_LIST@261..265 + GENERIC_PARAM_LIST@261..265 L_ANGLE@261..262 "<" LIFETIME_PARAM@262..264 LIFETIME@262..264 "\'a" @@ -318,7 +318,7 @@ SOURCE_FILE@0..374 WHITESPACE@303..304 " " NAME@304..314 IDENT@304..314 "for_for_fn" - TYPE_PARAM_LIST@314..317 + GENERIC_PARAM_LIST@314..317 L_ANGLE@314..315 "<" TYPE_PARAM@315..316 NAME@315..316 @@ -333,7 +333,7 @@ SOURCE_FILE@0..374 WHITESPACE@325..330 "\n " WHERE_PRED@330..368 FOR_KW@330..333 "for" - TYPE_PARAM_LIST@333..337 + GENERIC_PARAM_LIST@333..337 L_ANGLE@333..334 "<" LIFETIME_PARAM@334..336 LIFETIME@334..336 "\'a" @@ -341,7 +341,7 @@ SOURCE_FILE@0..374 WHITESPACE@337..338 " " FOR_TYPE@338..362 FOR_KW@338..341 "for" - TYPE_PARAM_LIST@341..345 + GENERIC_PARAM_LIST@341..345 L_ANGLE@341..342 "<" LIFETIME_PARAM@342..344 LIFETIME@342..344 "\'b" -- cgit v1.2.3 From 6f8aa75329d0a4e588e58b8f22f7932bf3d3a706 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 16:21:30 +0200 Subject: Rename RecordLit -> RecordExpr --- .../test_data/parser/ok/0043_complex_assignment.rast | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/ok') 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 22eb22e3c..1c5545b6d 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 @@ -46,16 +46,16 @@ SOURCE_FILE@0..160 BIN_EXPR@107..135 INDEX_EXPR@107..131 FIELD_EXPR@107..128 - RECORD_LIT@107..124 + RECORD_EXPR@107..124 PATH@107..111 PATH_SEGMENT@107..111 NAME_REF@107..111 IDENT@107..111 "Repr" WHITESPACE@111..112 " " - RECORD_FIELD_LIST@112..124 + RECORD_EXPR_FIELD_LIST@112..124 L_CURLY@112..113 "{" WHITESPACE@113..114 " " - RECORD_FIELD@114..122 + RECORD_EXPR_FIELD@114..122 NAME_REF@114..117 IDENT@114..117 "raw" COLON@117..118 ":" @@ -83,14 +83,14 @@ SOURCE_FILE@0..160 WHITESPACE@136..141 "\n " EXPR_STMT@141..157 CALL_EXPR@141..156 - RECORD_LIT@141..154 + RECORD_EXPR@141..154 PATH@141..145 PATH_SEGMENT@141..145 NAME_REF@141..145 IDENT@141..145 "Repr" - RECORD_FIELD_LIST@145..154 + RECORD_EXPR_FIELD_LIST@145..154 L_CURLY@145..146 "{" - RECORD_FIELD@146..153 + RECORD_EXPR_FIELD@146..153 NAME_REF@146..149 IDENT@146..149 "raw" COLON@149..150 ":" -- cgit v1.2.3 From 0a9e3ccc262fbcbd4cdaab30384f8cb71584544b Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 16:49:13 +0200 Subject: Rename FieldDef -> Field --- .../ra_syntax/test_data/parser/ok/0001_struct_item.rast | 4 ++-- .../test_data/parser/ok/0002_struct_item_field.rast | 4 ++-- crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast | 2 +- .../test_data/parser/ok/0016_struct_flavors.rast | 16 ++++++++-------- .../test_data/parser/ok/0018_struct_type_params.rast | 8 ++++---- crates/ra_syntax/test_data/parser/ok/0019_enums.rast | 14 +++++++------- .../ra_syntax/test_data/parser/ok/0035_weird_exprs.rast | 4 ++-- .../test_data/parser/ok/0040_raw_struct_item_field.rast | 4 ++-- .../test_data/parser/ok/0043_complex_assignment.rast | 4 ++-- .../test_data/parser/ok/0047_minus_in_inner_pattern.rast | 6 +++--- 10 files changed, 33 insertions(+), 33 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/ok') diff --git a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast index cf801aedd..c9d1af92f 100644 --- a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast +++ b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast @@ -20,10 +20,10 @@ SOURCE_FILE@0..32 IDENT@12..16 "Copy" R_ANGLE@16..17 ">" WHITESPACE@17..18 " " - RECORD_FIELD_DEF_LIST@18..31 + RECORD_FIELD_LIST@18..31 L_CURLY@18..19 "{" WHITESPACE@19..24 "\n " - RECORD_FIELD_DEF@24..28 + RECORD_FIELD@24..28 NAME@24..25 IDENT@24..25 "f" COLON@25..26 ":" diff --git a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast index a1d546491..57fb7a329 100644 --- a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast +++ b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast @@ -5,10 +5,10 @@ SOURCE_FILE@0..25 NAME@7..8 IDENT@7..8 "S" WHITESPACE@8..9 " " - RECORD_FIELD_DEF_LIST@9..25 + RECORD_FIELD_LIST@9..25 L_CURLY@9..10 "{" WHITESPACE@10..15 "\n " - RECORD_FIELD_DEF@15..23 + RECORD_FIELD@15..23 NAME@15..18 IDENT@15..18 "foo" COLON@18..19 ":" 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 ea26f1440..60ded78d5 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 @@ -46,7 +46,7 @@ SOURCE_FILE@0..118 NAME@59..60 IDENT@59..60 "S" WHITESPACE@60..61 " " - RECORD_FIELD_DEF_LIST@61..63 + RECORD_FIELD_LIST@61..63 L_CURLY@61..62 "{" R_CURLY@62..63 "}" WHITESPACE@63..64 "\n" diff --git a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast index 95656d19b..00b1b65be 100644 --- a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast +++ b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast @@ -12,7 +12,7 @@ SOURCE_FILE@0..97 NAME@17..18 IDENT@17..18 "B" WHITESPACE@18..19 " " - RECORD_FIELD_DEF_LIST@19..21 + RECORD_FIELD_LIST@19..21 L_CURLY@19..20 "{" R_CURLY@20..21 "}" WHITESPACE@21..22 "\n" @@ -21,7 +21,7 @@ SOURCE_FILE@0..97 WHITESPACE@28..29 " " NAME@29..30 IDENT@29..30 "C" - TUPLE_FIELD_DEF_LIST@30..32 + TUPLE_FIELD_LIST@30..32 L_PAREN@30..31 "(" R_PAREN@31..32 ")" SEMICOLON@32..33 ";" @@ -32,10 +32,10 @@ SOURCE_FILE@0..97 NAME@42..43 IDENT@42..43 "D" WHITESPACE@43..44 " " - RECORD_FIELD_DEF_LIST@44..74 + RECORD_FIELD_LIST@44..74 L_CURLY@44..45 "{" WHITESPACE@45..50 "\n " - RECORD_FIELD_DEF@50..56 + RECORD_FIELD@50..56 NAME@50..51 IDENT@50..51 "a" COLON@51..52 ":" @@ -47,7 +47,7 @@ SOURCE_FILE@0..97 IDENT@53..56 "u32" COMMA@56..57 "," WHITESPACE@57..62 "\n " - RECORD_FIELD_DEF@62..72 + RECORD_FIELD@62..72 VISIBILITY@62..65 PUB_KW@62..65 "pub" WHITESPACE@65..66 " " @@ -68,9 +68,9 @@ SOURCE_FILE@0..97 WHITESPACE@82..83 " " NAME@83..84 IDENT@83..84 "E" - TUPLE_FIELD_DEF_LIST@84..95 + TUPLE_FIELD_LIST@84..95 L_PAREN@84..85 "(" - TUPLE_FIELD_DEF@85..90 + TUPLE_FIELD@85..90 VISIBILITY@85..88 PUB_KW@85..88 "pub" WHITESPACE@88..89 " " @@ -81,7 +81,7 @@ SOURCE_FILE@0..97 IDENT@89..90 "x" COMMA@90..91 "," WHITESPACE@91..92 " " - TUPLE_FIELD_DEF@92..93 + TUPLE_FIELD@92..93 PATH_TYPE@92..93 PATH@92..93 PATH_SEGMENT@92..93 diff --git a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast index 3ee208fff..b757bd16d 100644 --- a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast +++ b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast @@ -23,9 +23,9 @@ SOURCE_FILE@0..290 NAME@24..25 IDENT@24..25 "T" R_ANGLE@25..26 ">" - TUPLE_FIELD_DEF_LIST@26..31 + TUPLE_FIELD_LIST@26..31 L_PAREN@26..27 "(" - TUPLE_FIELD_DEF@27..30 + TUPLE_FIELD@27..30 PATH_TYPE@27..30 PATH@27..30 PATH_SEGMENT@27..30 @@ -46,10 +46,10 @@ SOURCE_FILE@0..290 IDENT@43..44 "T" R_ANGLE@44..45 ">" WHITESPACE@45..46 " " - RECORD_FIELD_DEF_LIST@46..56 + RECORD_FIELD_LIST@46..56 L_CURLY@46..47 "{" WHITESPACE@47..48 " " - RECORD_FIELD_DEF@48..54 + RECORD_FIELD@48..54 NAME@48..49 IDENT@48..49 "u" COLON@49..50 ":" diff --git a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast b/crates/ra_syntax/test_data/parser/ok/0019_enums.rast index 993f28c4d..1a32d88fd 100644 --- a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast +++ b/crates/ra_syntax/test_data/parser/ok/0019_enums.rast @@ -86,10 +86,10 @@ SOURCE_FILE@0..182 NAME@101..102 IDENT@101..102 "C" WHITESPACE@102..103 " " - RECORD_FIELD_DEF_LIST@103..146 + RECORD_FIELD_LIST@103..146 L_CURLY@103..104 "{" WHITESPACE@104..113 "\n " - RECORD_FIELD_DEF@113..119 + RECORD_FIELD@113..119 NAME@113..114 IDENT@113..114 "a" COLON@114..115 ":" @@ -101,7 +101,7 @@ SOURCE_FILE@0..182 IDENT@116..119 "u32" COMMA@119..120 "," WHITESPACE@120..129 "\n " - RECORD_FIELD_DEF@129..139 + RECORD_FIELD@129..139 VISIBILITY@129..132 PUB_KW@129..132 "pub" WHITESPACE@132..133 " " @@ -123,7 +123,7 @@ SOURCE_FILE@0..182 NAME@152..153 IDENT@152..153 "F" WHITESPACE@153..154 " " - RECORD_FIELD_DEF_LIST@154..156 + RECORD_FIELD_LIST@154..156 L_CURLY@154..155 "{" R_CURLY@155..156 "}" COMMA@156..157 "," @@ -131,9 +131,9 @@ SOURCE_FILE@0..182 ENUM_VARIANT@162..169 NAME@162..163 IDENT@162..163 "D" - TUPLE_FIELD_DEF_LIST@163..169 + TUPLE_FIELD_LIST@163..169 L_PAREN@163..164 "(" - TUPLE_FIELD_DEF@164..167 + TUPLE_FIELD@164..167 PATH_TYPE@164..167 PATH@164..167 PATH_SEGMENT@164..167 @@ -146,7 +146,7 @@ SOURCE_FILE@0..182 ENUM_VARIANT@175..178 NAME@175..176 IDENT@175..176 "E" - TUPLE_FIELD_DEF_LIST@176..178 + TUPLE_FIELD_LIST@176..178 L_PAREN@176..177 "(" R_PAREN@177..178 ")" COMMA@178..179 "," 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 ea54651b7..2aa075993 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 @@ -1571,10 +1571,10 @@ SOURCE_FILE@0..3813 LIFETIME@2863..2869 "\'union" R_ANGLE@2869..2870 ">" WHITESPACE@2870..2871 " " - RECORD_FIELD_DEF_LIST@2871..2904 + RECORD_FIELD_LIST@2871..2904 L_CURLY@2871..2872 "{" WHITESPACE@2872..2873 " " - RECORD_FIELD_DEF@2873..2901 + RECORD_FIELD@2873..2901 NAME@2873..2878 IDENT@2873..2878 "union" COLON@2878..2879 ":" diff --git a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast index 5640bae0a..0f0138c86 100644 --- a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast +++ b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast @@ -5,10 +5,10 @@ SOURCE_FILE@0..27 NAME@7..8 IDENT@7..8 "S" WHITESPACE@8..9 " " - RECORD_FIELD_DEF_LIST@9..27 + RECORD_FIELD_LIST@9..27 L_CURLY@9..10 "{" WHITESPACE@10..15 "\n " - RECORD_FIELD_DEF@15..25 + RECORD_FIELD@15..25 NAME@15..20 IDENT@15..20 "r#foo" COLON@20..21 ":" 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 1c5545b6d..9c2ea3754 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 @@ -7,10 +7,10 @@ SOURCE_FILE@0..160 NAME@69..73 IDENT@69..73 "Repr" WHITESPACE@73..74 " " - RECORD_FIELD_DEF_LIST@74..90 + RECORD_FIELD_LIST@74..90 L_CURLY@74..75 "{" WHITESPACE@75..76 " " - RECORD_FIELD_DEF@76..88 + RECORD_FIELD@76..88 NAME@76..79 IDENT@76..79 "raw" COLON@79..80 ":" 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 29a5d48e6..fcf605ec8 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 @@ -268,9 +268,9 @@ SOURCE_FILE@0..395 ENUM_VARIANT@356..365 NAME@356..357 IDENT@356..357 "B" - TUPLE_FIELD_DEF_LIST@357..365 + TUPLE_FIELD_LIST@357..365 L_PAREN@357..358 "(" - TUPLE_FIELD_DEF@358..360 + TUPLE_FIELD@358..360 PATH_TYPE@358..360 PATH@358..360 PATH_SEGMENT@358..360 @@ -278,7 +278,7 @@ SOURCE_FILE@0..395 IDENT@358..360 "i8" COMMA@360..361 "," WHITESPACE@361..362 " " - TUPLE_FIELD_DEF@362..364 + TUPLE_FIELD@362..364 PATH_TYPE@362..364 PATH@362..364 PATH_SEGMENT@362..364 -- cgit v1.2.3 From 1ae4721c9cfea746fce59a816b1c266bf373d6cf Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 17:36:46 +0200 Subject: Finalize union grammar --- crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.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/0035_weird_exprs.rast b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast index 2aa075993..b04a505ea 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 @@ -1560,7 +1560,7 @@ SOURCE_FILE@0..3813 BLOCK_EXPR@2845..2906 L_CURLY@2845..2846 "{" WHITESPACE@2846..2851 "\n " - UNION_DEF@2851..2904 + UNION@2851..2904 UNION_KW@2851..2856 "union" WHITESPACE@2856..2857 " " NAME@2857..2862 -- cgit v1.2.3 From 216a5344c8ef3c3e430d2761dc8b1a7b60250a15 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 17:50:40 +0200 Subject: Rename StructDef -> Struct --- .../test_data/parser/ok/0001_struct_item.rast | 2 +- .../parser/ok/0002_struct_item_field.rast | 2 +- .../test_data/parser/ok/0008_mod_item.rast | 2 +- .../test_data/parser/ok/0016_struct_flavors.rast | 10 ++++---- .../parser/ok/0018_struct_type_params.rast | 30 +++++++++++----------- .../parser/ok/0020_type_param_bounds.rast | 20 +++++++-------- .../parser/ok/0040_raw_struct_item_field.rast | 2 +- .../test_data/parser/ok/0042_ufcs_call_list.rast | 2 +- .../parser/ok/0043_complex_assignment.rast | 2 +- 9 files changed, 36 insertions(+), 36 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/ok') diff --git a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast index c9d1af92f..a171fe7a8 100644 --- a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast +++ b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..32 - STRUCT_DEF@0..31 + STRUCT@0..31 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 diff --git a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast index 57fb7a329..362892b91 100644 --- a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast +++ b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..25 - STRUCT_DEF@0..25 + STRUCT@0..25 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 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 60ded78d5..b2c1d791f 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 @@ -40,7 +40,7 @@ SOURCE_FILE@0..118 WHITESPACE@41..46 "\n " R_CURLY@46..47 "}" WHITESPACE@47..52 "\n " - STRUCT_DEF@52..63 + STRUCT@52..63 STRUCT_KW@52..58 "struct" WHITESPACE@58..59 " " NAME@59..60 diff --git a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast index 00b1b65be..b15f41dd7 100644 --- a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast +++ b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast @@ -1,12 +1,12 @@ SOURCE_FILE@0..97 - STRUCT_DEF@0..9 + STRUCT@0..9 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 IDENT@7..8 "A" SEMICOLON@8..9 ";" WHITESPACE@9..10 "\n" - STRUCT_DEF@10..21 + STRUCT@10..21 STRUCT_KW@10..16 "struct" WHITESPACE@16..17 " " NAME@17..18 @@ -16,7 +16,7 @@ SOURCE_FILE@0..97 L_CURLY@19..20 "{" R_CURLY@20..21 "}" WHITESPACE@21..22 "\n" - STRUCT_DEF@22..33 + STRUCT@22..33 STRUCT_KW@22..28 "struct" WHITESPACE@28..29 " " NAME@29..30 @@ -26,7 +26,7 @@ SOURCE_FILE@0..97 R_PAREN@31..32 ")" SEMICOLON@32..33 ";" WHITESPACE@33..35 "\n\n" - STRUCT_DEF@35..74 + STRUCT@35..74 STRUCT_KW@35..41 "struct" WHITESPACE@41..42 " " NAME@42..43 @@ -63,7 +63,7 @@ SOURCE_FILE@0..97 WHITESPACE@72..73 "\n" R_CURLY@73..74 "}" WHITESPACE@74..76 "\n\n" - STRUCT_DEF@76..96 + STRUCT@76..96 STRUCT_KW@76..82 "struct" WHITESPACE@82..83 " " NAME@83..84 diff --git a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast index b757bd16d..630aa0708 100644 --- a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast +++ b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..290 - STRUCT_DEF@0..13 + STRUCT@0..13 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..9 @@ -12,7 +12,7 @@ SOURCE_FILE@0..290 R_ANGLE@11..12 ">" SEMICOLON@12..13 ";" WHITESPACE@13..14 "\n" - STRUCT_DEF@14..32 + STRUCT@14..32 STRUCT_KW@14..20 "struct" WHITESPACE@20..21 " " NAME@21..23 @@ -34,7 +34,7 @@ SOURCE_FILE@0..290 R_PAREN@30..31 ")" SEMICOLON@31..32 ";" WHITESPACE@32..33 "\n" - STRUCT_DEF@33..56 + STRUCT@33..56 STRUCT_KW@33..39 "struct" WHITESPACE@39..40 " " NAME@40..42 @@ -62,7 +62,7 @@ SOURCE_FILE@0..290 WHITESPACE@54..55 " " R_CURLY@55..56 "}" WHITESPACE@56..58 "\n\n" - STRUCT_DEF@58..70 + STRUCT@58..70 STRUCT_KW@58..64 "struct" WHITESPACE@64..65 " " NAME@65..67 @@ -72,7 +72,7 @@ SOURCE_FILE@0..290 R_ANGLE@68..69 ">" SEMICOLON@69..70 ";" WHITESPACE@70..71 "\n" - STRUCT_DEF@71..85 + STRUCT@71..85 STRUCT_KW@71..77 "struct" WHITESPACE@77..78 " " NAME@78..80 @@ -84,7 +84,7 @@ SOURCE_FILE@0..290 R_ANGLE@83..84 ">" SEMICOLON@84..85 ";" WHITESPACE@85..86 "\n" - STRUCT_DEF@86..101 + STRUCT@86..101 STRUCT_KW@86..92 "struct" WHITESPACE@92..93 " " NAME@93..95 @@ -97,7 +97,7 @@ SOURCE_FILE@0..290 R_ANGLE@99..100 ">" SEMICOLON@100..101 ";" WHITESPACE@101..102 "\n" - STRUCT_DEF@102..120 + STRUCT@102..120 STRUCT_KW@102..108 "struct" WHITESPACE@108..109 " " NAME@109..111 @@ -112,7 +112,7 @@ SOURCE_FILE@0..290 R_ANGLE@118..119 ">" SEMICOLON@119..120 ";" WHITESPACE@120..121 "\n" - STRUCT_DEF@121..142 + STRUCT@121..142 STRUCT_KW@121..127 "struct" WHITESPACE@127..128 " " NAME@128..130 @@ -130,7 +130,7 @@ SOURCE_FILE@0..290 R_ANGLE@140..141 ">" SEMICOLON@141..142 ";" WHITESPACE@142..143 "\n" - STRUCT_DEF@143..166 + STRUCT@143..166 STRUCT_KW@143..149 "struct" WHITESPACE@149..150 " " NAME@150..152 @@ -149,7 +149,7 @@ SOURCE_FILE@0..290 R_ANGLE@164..165 ">" SEMICOLON@165..166 ";" WHITESPACE@166..167 "\n" - STRUCT_DEF@167..183 + STRUCT@167..183 STRUCT_KW@167..173 "struct" WHITESPACE@173..174 " " NAME@174..177 @@ -162,7 +162,7 @@ SOURCE_FILE@0..290 R_ANGLE@181..182 ">" SEMICOLON@182..183 ";" WHITESPACE@183..184 "\n" - STRUCT_DEF@184..203 + STRUCT@184..203 STRUCT_KW@184..190 "struct" WHITESPACE@190..191 " " NAME@191..194 @@ -178,7 +178,7 @@ SOURCE_FILE@0..290 R_ANGLE@201..202 ">" SEMICOLON@202..203 ";" WHITESPACE@203..204 "\n" - STRUCT_DEF@204..233 + STRUCT@204..233 STRUCT_KW@204..210 "struct" WHITESPACE@210..211 " " NAME@211..214 @@ -202,7 +202,7 @@ SOURCE_FILE@0..290 R_ANGLE@231..232 ">" SEMICOLON@232..233 ";" WHITESPACE@233..235 "\n\n" - STRUCT_DEF@235..249 + STRUCT@235..249 STRUCT_KW@235..241 "struct" WHITESPACE@241..242 " " NAME@242..245 @@ -215,7 +215,7 @@ SOURCE_FILE@0..290 R_ANGLE@247..248 ">" SEMICOLON@248..249 ";" WHITESPACE@249..250 "\n" - STRUCT_DEF@250..267 + STRUCT@250..267 STRUCT_KW@250..256 "struct" WHITESPACE@256..257 " " NAME@257..260 @@ -233,7 +233,7 @@ SOURCE_FILE@0..290 R_ANGLE@265..266 ">" SEMICOLON@266..267 ";" WHITESPACE@267..268 "\n" - STRUCT_DEF@268..289 + STRUCT@268..289 STRUCT_KW@268..274 "struct" WHITESPACE@274..275 " " NAME@275..278 diff --git a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast b/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast index 5100e6a48..9bdc50e1e 100644 --- a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast +++ b/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..250 - STRUCT_DEF@0..12 + STRUCT@0..12 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 @@ -12,7 +12,7 @@ SOURCE_FILE@0..250 R_ANGLE@10..11 ">" SEMICOLON@11..12 ";" WHITESPACE@12..13 "\n" - STRUCT_DEF@13..26 + STRUCT@13..26 STRUCT_KW@13..19 "struct" WHITESPACE@19..20 " " NAME@20..21 @@ -27,7 +27,7 @@ SOURCE_FILE@0..250 R_ANGLE@24..25 ">" SEMICOLON@25..26 ";" WHITESPACE@26..27 "\n" - STRUCT_DEF@27..43 + STRUCT@27..43 STRUCT_KW@27..33 "struct" WHITESPACE@33..34 " " NAME@34..35 @@ -45,7 +45,7 @@ SOURCE_FILE@0..250 R_ANGLE@41..42 ">" SEMICOLON@42..43 ";" WHITESPACE@43..44 "\n" - STRUCT_DEF@44..63 + STRUCT@44..63 STRUCT_KW@44..50 "struct" WHITESPACE@50..51 " " NAME@51..52 @@ -66,7 +66,7 @@ SOURCE_FILE@0..250 R_ANGLE@61..62 ">" SEMICOLON@62..63 ";" WHITESPACE@63..64 "\n" - STRUCT_DEF@64..86 + STRUCT@64..86 STRUCT_KW@64..70 "struct" WHITESPACE@70..71 " " NAME@71..72 @@ -90,7 +90,7 @@ SOURCE_FILE@0..250 R_ANGLE@84..85 ">" SEMICOLON@85..86 ";" WHITESPACE@86..87 "\n" - STRUCT_DEF@87..116 + STRUCT@87..116 STRUCT_KW@87..93 "struct" WHITESPACE@93..94 " " NAME@94..95 @@ -122,7 +122,7 @@ SOURCE_FILE@0..250 R_ANGLE@114..115 ">" SEMICOLON@115..116 ";" WHITESPACE@116..117 "\n" - STRUCT_DEF@117..143 + STRUCT@117..143 STRUCT_KW@117..123 "struct" WHITESPACE@123..124 " " NAME@124..125 @@ -153,7 +153,7 @@ SOURCE_FILE@0..250 R_ANGLE@141..142 ">" SEMICOLON@142..143 ";" WHITESPACE@143..144 "\n" - STRUCT_DEF@144..180 + STRUCT@144..180 STRUCT_KW@144..150 "struct" WHITESPACE@150..151 " " NAME@151..152 @@ -194,7 +194,7 @@ SOURCE_FILE@0..250 R_ANGLE@178..179 ">" SEMICOLON@179..180 ";" WHITESPACE@180..181 "\n" - STRUCT_DEF@181..199 + STRUCT@181..199 STRUCT_KW@181..187 "struct" WHITESPACE@187..188 " " NAME@188..189 @@ -217,7 +217,7 @@ SOURCE_FILE@0..250 R_ANGLE@197..198 ">" SEMICOLON@198..199 ";" WHITESPACE@199..200 "\n" - STRUCT_DEF@200..250 + STRUCT@200..250 STRUCT_KW@200..206 "struct" WHITESPACE@206..207 " " NAME@207..208 diff --git a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast index 0f0138c86..8cfc14f49 100644 --- a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast +++ b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..27 - STRUCT_DEF@0..27 + STRUCT@0..27 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 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 4f0c68822..c4ffc0a3d 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 @@ -1,7 +1,7 @@ SOURCE_FILE@0..199 COMMENT@0..60 "// https://github.com ..." WHITESPACE@60..62 "\n\n" - STRUCT_DEF@62..73 + STRUCT@62..73 STRUCT_KW@62..68 "struct" WHITESPACE@68..69 " " NAME@69..72 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 9c2ea3754..adc4a22e9 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 @@ -1,7 +1,7 @@ SOURCE_FILE@0..160 COMMENT@0..60 "// https://github.com ..." WHITESPACE@60..62 "\n\n" - STRUCT_DEF@62..90 + STRUCT@62..90 STRUCT_KW@62..68 "struct" WHITESPACE@68..69 " " NAME@69..73 -- cgit v1.2.3 From 609680ef97dbf82c07b6b06e21aa366423892304 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 17:52:53 +0200 Subject: Rename EnumDef -> Enum --- crates/ra_syntax/test_data/parser/ok/0019_enums.rast | 10 +++++----- .../test_data/parser/ok/0047_minus_in_inner_pattern.rast | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/ok') diff --git a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast b/crates/ra_syntax/test_data/parser/ok/0019_enums.rast index 1a32d88fd..1ffcffc1a 100644 --- a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast +++ b/crates/ra_syntax/test_data/parser/ok/0019_enums.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..182 - ENUM_DEF@0..11 + ENUM@0..11 ENUM_KW@0..4 "enum" WHITESPACE@4..5 " " NAME@5..7 @@ -10,7 +10,7 @@ SOURCE_FILE@0..182 WHITESPACE@9..10 "\n" R_CURLY@10..11 "}" WHITESPACE@11..13 "\n\n" - ENUM_DEF@13..27 + ENUM@13..27 ENUM_KW@13..17 "enum" WHITESPACE@17..18 " " NAME@18..20 @@ -27,7 +27,7 @@ SOURCE_FILE@0..182 WHITESPACE@25..26 "\n" R_CURLY@26..27 "}" WHITESPACE@27..29 "\n\n" - ENUM_DEF@29..46 + ENUM@29..46 ENUM_KW@29..33 "enum" WHITESPACE@33..34 " " NAME@34..36 @@ -42,7 +42,7 @@ SOURCE_FILE@0..182 WHITESPACE@44..45 "\n" R_CURLY@45..46 "}" WHITESPACE@46..48 "\n\n" - ENUM_DEF@48..66 + ENUM@48..66 ENUM_KW@48..52 "enum" WHITESPACE@52..53 " " NAME@53..55 @@ -58,7 +58,7 @@ SOURCE_FILE@0..182 WHITESPACE@64..65 "\n" R_CURLY@65..66 "}" WHITESPACE@66..68 "\n\n" - ENUM_DEF@68..181 + ENUM@68..181 ENUM_KW@68..72 "enum" WHITESPACE@72..73 " " NAME@73..75 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 fcf605ec8..9db4f0aa1 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 @@ -256,7 +256,7 @@ SOURCE_FILE@0..395 WHITESPACE@339..340 "\n" R_CURLY@340..341 "}" WHITESPACE@341..343 "\n\n" - ENUM_DEF@343..367 + ENUM@343..367 ENUM_KW@343..347 "enum" WHITESPACE@347..348 " " NAME@348..349 -- cgit v1.2.3 From 1766aae145c6925a33e427f2fe6ef2a56c301665 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 17:56:53 +0200 Subject: Rename EnumVariant -> Variant --- .../ra_syntax/test_data/parser/ok/0019_enums.rast | 26 +++++++++++----------- .../parser/ok/0047_minus_in_inner_pattern.rast | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/ok') diff --git a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast b/crates/ra_syntax/test_data/parser/ok/0019_enums.rast index 1ffcffc1a..c3df00814 100644 --- a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast +++ b/crates/ra_syntax/test_data/parser/ok/0019_enums.rast @@ -5,7 +5,7 @@ SOURCE_FILE@0..182 NAME@5..7 IDENT@5..7 "E1" WHITESPACE@7..8 " " - ENUM_VARIANT_LIST@8..11 + VARIANT_LIST@8..11 L_CURLY@8..9 "{" WHITESPACE@9..10 "\n" R_CURLY@10..11 "}" @@ -22,7 +22,7 @@ SOURCE_FILE@0..182 IDENT@21..22 "T" R_ANGLE@22..23 ">" WHITESPACE@23..24 " " - ENUM_VARIANT_LIST@24..27 + VARIANT_LIST@24..27 L_CURLY@24..25 "{" WHITESPACE@25..26 "\n" R_CURLY@26..27 "}" @@ -33,10 +33,10 @@ SOURCE_FILE@0..182 NAME@34..36 IDENT@34..36 "E3" WHITESPACE@36..37 " " - ENUM_VARIANT_LIST@37..46 + VARIANT_LIST@37..46 L_CURLY@37..38 "{" WHITESPACE@38..43 "\n " - ENUM_VARIANT@43..44 + VARIANT@43..44 NAME@43..44 IDENT@43..44 "X" WHITESPACE@44..45 "\n" @@ -48,10 +48,10 @@ SOURCE_FILE@0..182 NAME@53..55 IDENT@53..55 "E4" WHITESPACE@55..56 " " - ENUM_VARIANT_LIST@56..66 + VARIANT_LIST@56..66 L_CURLY@56..57 "{" WHITESPACE@57..62 "\n " - ENUM_VARIANT@62..63 + VARIANT@62..63 NAME@62..63 IDENT@62..63 "X" COMMA@63..64 "," @@ -64,15 +64,15 @@ SOURCE_FILE@0..182 NAME@73..75 IDENT@73..75 "E5" WHITESPACE@75..76 " " - ENUM_VARIANT_LIST@76..181 + VARIANT_LIST@76..181 L_CURLY@76..77 "{" WHITESPACE@77..82 "\n " - ENUM_VARIANT@82..83 + VARIANT@82..83 NAME@82..83 IDENT@82..83 "A" COMMA@83..84 "," WHITESPACE@84..89 "\n " - ENUM_VARIANT@89..95 + VARIANT@89..95 NAME@89..90 IDENT@89..90 "B" WHITESPACE@90..91 " " @@ -82,7 +82,7 @@ SOURCE_FILE@0..182 INT_NUMBER@93..95 "92" COMMA@95..96 "," WHITESPACE@96..101 "\n " - ENUM_VARIANT@101..146 + VARIANT@101..146 NAME@101..102 IDENT@101..102 "C" WHITESPACE@102..103 " " @@ -119,7 +119,7 @@ SOURCE_FILE@0..182 R_CURLY@145..146 "}" COMMA@146..147 "," WHITESPACE@147..152 "\n " - ENUM_VARIANT@152..156 + VARIANT@152..156 NAME@152..153 IDENT@152..153 "F" WHITESPACE@153..154 " " @@ -128,7 +128,7 @@ SOURCE_FILE@0..182 R_CURLY@155..156 "}" COMMA@156..157 "," WHITESPACE@157..162 "\n " - ENUM_VARIANT@162..169 + VARIANT@162..169 NAME@162..163 IDENT@162..163 "D" TUPLE_FIELD_LIST@163..169 @@ -143,7 +143,7 @@ SOURCE_FILE@0..182 R_PAREN@168..169 ")" COMMA@169..170 "," WHITESPACE@170..175 "\n " - ENUM_VARIANT@175..178 + VARIANT@175..178 NAME@175..176 IDENT@175..176 "E" TUPLE_FIELD_LIST@176..178 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 9db4f0aa1..7a54fa113 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 @@ -262,10 +262,10 @@ SOURCE_FILE@0..395 NAME@348..349 IDENT@348..349 "A" WHITESPACE@349..350 " " - ENUM_VARIANT_LIST@350..367 + VARIANT_LIST@350..367 L_CURLY@350..351 "{" WHITESPACE@351..356 "\n " - ENUM_VARIANT@356..365 + VARIANT@356..365 NAME@356..357 IDENT@356..357 "B" TUPLE_FIELD_LIST@357..365 -- cgit v1.2.3 From 3cd4112bdc924c132cb0eab9d064511a215421ec Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 18:02:20 +0200 Subject: Finalize const&static grammar --- crates/ra_syntax/test_data/parser/ok/0023_static_items.rast | 4 ++-- crates/ra_syntax/test_data/parser/ok/0024_const_item.rast | 6 +++--- crates/ra_syntax/test_data/parser/ok/0066_default_const.rast | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/ok') diff --git a/crates/ra_syntax/test_data/parser/ok/0023_static_items.rast b/crates/ra_syntax/test_data/parser/ok/0023_static_items.rast index 97d90dc75..9374cf5e9 100644 --- a/crates/ra_syntax/test_data/parser/ok/0023_static_items.rast +++ b/crates/ra_syntax/test_data/parser/ok/0023_static_items.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..47 - STATIC_DEF@0..20 + STATIC@0..20 STATIC_KW@0..6 "static" WHITESPACE@6..7 " " NAME@7..10 @@ -18,7 +18,7 @@ SOURCE_FILE@0..47 INT_NUMBER@18..19 "1" SEMICOLON@19..20 ";" WHITESPACE@20..21 "\n" - STATIC_DEF@21..46 + STATIC@21..46 STATIC_KW@21..27 "static" WHITESPACE@27..28 " " MUT_KW@28..31 "mut" diff --git a/crates/ra_syntax/test_data/parser/ok/0024_const_item.rast b/crates/ra_syntax/test_data/parser/ok/0024_const_item.rast index d241f034c..dd1b9c9a0 100644 --- a/crates/ra_syntax/test_data/parser/ok/0024_const_item.rast +++ b/crates/ra_syntax/test_data/parser/ok/0024_const_item.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..64 - CONST_DEF@0..17 + CONST@0..17 CONST_KW@0..5 "const" WHITESPACE@5..6 " " UNDERSCORE@6..7 "_" @@ -17,7 +17,7 @@ SOURCE_FILE@0..64 INT_NUMBER@15..16 "0" SEMICOLON@16..17 ";" WHITESPACE@17..18 "\n" - CONST_DEF@18..38 + CONST@18..38 CONST_KW@18..23 "const" WHITESPACE@23..24 " " NAME@24..27 @@ -36,7 +36,7 @@ SOURCE_FILE@0..64 INT_NUMBER@35..37 "92" SEMICOLON@37..38 ";" WHITESPACE@38..39 "\n" - CONST_DEF@39..63 + CONST@39..63 CONST_KW@39..44 "const" WHITESPACE@44..45 " " MUT_KW@45..48 "mut" diff --git a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast index 584b2faf1..485efe20c 100644 --- a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast +++ b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast @@ -19,7 +19,7 @@ SOURCE_FILE@0..46 ASSOC_ITEM_LIST@15..45 L_CURLY@15..16 "{" WHITESPACE@16..19 "\n " - CONST_DEF@19..43 + CONST@19..43 DEFAULT_KW@19..26 "default" WHITESPACE@26..27 " " CONST_KW@27..32 "const" -- cgit v1.2.3 From c83467796b6c7365ea4f41900d74444384a9e618 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 18:17:28 +0200 Subject: Finalize Trait grammar --- crates/ra_syntax/test_data/parser/ok/0030_traits.rast | 4 ++-- crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast | 2 +- crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/ok') diff --git a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast b/crates/ra_syntax/test_data/parser/ok/0030_traits.rast index 4bcf07ffb..280d4cb82 100644 --- a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast +++ b/crates/ra_syntax/test_data/parser/ok/0030_traits.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..96 - TRAIT_DEF@0..36 + TRAIT@0..36 TRAIT_KW@0..5 "trait" WHITESPACE@5..6 " " NAME@6..14 @@ -20,7 +20,7 @@ SOURCE_FILE@0..96 WHITESPACE@34..35 "\n" R_CURLY@35..36 "}" WHITESPACE@36..38 "\n\n" - TRAIT_DEF@38..95 + TRAIT@38..95 TRAIT_KW@38..43 "trait" WHITESPACE@43..44 " " NAME@44..57 diff --git a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast index 8081eefbc..7a574ebb4 100644 --- a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast @@ -186,7 +186,7 @@ SOURCE_FILE@0..519 L_CURLY@170..171 "{" R_CURLY@171..172 "}" WHITESPACE@172..174 "\n\n" - TRAIT_DEF@174..236 + TRAIT@174..236 TRAIT_KW@174..179 "trait" WHITESPACE@179..180 " " NAME@180..183 diff --git a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast index a87bbf4eb..facce8167 100644 --- a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast +++ b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..170 - TRAIT_DEF@0..169 + TRAIT@0..169 TRAIT_KW@0..5 "trait" WHITESPACE@5..6 " " NAME@6..7 -- cgit v1.2.3 From c5798c4d75aa807aec47208a49101bdec3affcca Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 18:28:28 +0200 Subject: Finalize impl Grammar --- crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast | 2 +- crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast | 2 +- crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast | 2 +- crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast | 2 +- crates/ra_syntax/test_data/parser/ok/0066_default_const.rast | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/ok') diff --git a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast index c4ffc0a3d..ed29b0812 100644 --- a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast +++ b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast @@ -8,7 +8,7 @@ SOURCE_FILE@0..199 IDENT@69..72 "Foo" SEMICOLON@72..73 ";" WHITESPACE@73..75 "\n\n" - IMPL_DEF@75..141 + IMPL@75..141 IMPL_KW@75..79 "impl" WHITESPACE@79..80 " " PATH_TYPE@80..83 diff --git a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast index 5ebc53618..139ce9046 100644 --- a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast @@ -89,7 +89,7 @@ SOURCE_FILE@0..686 WHITESPACE@461..463 "\n\n" COMMENT@463..523 "// https://github.com ..." WHITESPACE@523..524 "\n" - IMPL_DEF@524..685 + IMPL@524..685 IMPL_KW@524..528 "impl" WHITESPACE@528..529 " " PATH_TYPE@529..537 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 7a574ebb4..2cc849784 100644 --- a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast @@ -251,7 +251,7 @@ SOURCE_FILE@0..519 WHITESPACE@234..235 "\n" R_CURLY@235..236 "}" WHITESPACE@236..238 "\n\n" - IMPL_DEF@238..519 + IMPL@238..519 IMPL_KW@238..242 "impl" WHITESPACE@242..243 " " PATH_TYPE@243..244 diff --git a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast index ef0eca47c..453757c3c 100644 --- a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast +++ b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..137 - IMPL_DEF@0..136 + IMPL@0..136 IMPL_KW@0..4 "impl" WHITESPACE@4..5 " " PATH_TYPE@5..6 diff --git a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast index 485efe20c..6246a31a6 100644 --- a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast +++ b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..46 - IMPL_DEF@0..45 + IMPL@0..45 IMPL_KW@0..4 "impl" WHITESPACE@4..5 " " PATH_TYPE@5..6 -- cgit v1.2.3