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/err/0018_incomplete_fn.rast | 2 +- crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast | 2 +- crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast | 2 +- crates/ra_syntax/test_data/parser/err/0043_default_const.rast | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/err') diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast index 31cc4e551..a87e5061a 100644 --- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast +++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast @@ -8,7 +8,7 @@ SOURCE_FILE@0..183 NAME_REF@5..13 IDENT@5..13 "FnScopes" WHITESPACE@13..14 " " - ITEM_LIST@14..182 + ASSOC_ITEM_LIST@14..182 L_CURLY@14..15 "{" WHITESPACE@15..20 "\n " FN_DEF@20..161 diff --git a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast index bf07409fb..254ff546a 100644 --- a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast +++ b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast @@ -41,7 +41,7 @@ SOURCE_FILE@0..38 IDENT@32..33 "T" R_ANGLE@33..34 ">" WHITESPACE@34..35 " " - ITEM_LIST@35..37 + ASSOC_ITEM_LIST@35..37 L_CURLY@35..36 "{" R_CURLY@36..37 "}" WHITESPACE@37..38 "\n" diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast index e3cda7c43..bc446e3df 100644 --- a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast +++ b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..118 L_PAREN@11..12 "(" R_PAREN@12..13 ")" WHITESPACE@13..14 " " - ITEM_LIST@14..117 + ASSOC_ITEM_LIST@14..117 L_CURLY@14..15 "{" WHITESPACE@15..20 "\n " FN_DEF@20..31 diff --git a/crates/ra_syntax/test_data/parser/err/0043_default_const.rast b/crates/ra_syntax/test_data/parser/err/0043_default_const.rast index 8eb583ef8..6ca1a4870 100644 --- a/crates/ra_syntax/test_data/parser/err/0043_default_const.rast +++ b/crates/ra_syntax/test_data/parser/err/0043_default_const.rast @@ -5,7 +5,7 @@ SOURCE_FILE@0..39 NAME@6..7 IDENT@6..7 "T" WHITESPACE@7..8 " " - ITEM_LIST@8..38 + ASSOC_ITEM_LIST@8..38 L_CURLY@8..9 "{" WHITESPACE@9..12 "\n " MACRO_CALL@12..19 -- 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/err/0002_duplicate_shebang.rast | 2 +- .../ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast | 2 +- crates/ra_syntax/test_data/parser/err/0035_use_recover.rast | 8 ++++---- crates/ra_syntax/test_data/parser/err/0036_partial_use.rast | 2 +- .../test_data/parser/err/0040_illegal_crate_kw_location.rast | 8 ++++---- .../test_data/parser/err/0041_illegal_super_keyword_location.rast | 8 ++++---- .../test_data/parser/err/0042_illegal_self_keyword_location.rast | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/err') diff --git a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast index 6717995e9..4cfd1bce4 100644 --- a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast +++ b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast @@ -6,7 +6,7 @@ SOURCE_FILE@0..42 BANG@22..23 "!" ERROR@23..24 SLASH@23..24 "/" - USE_ITEM@24..28 + USE@24..28 USE_KW@24..27 "use" ERROR@27..28 SLASH@27..28 "/" diff --git a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast b/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast index b3bcf472a..9a0f4665e 100644 --- a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast +++ b/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..12 - USE_ITEM@0..12 + USE@0..12 USE_KW@0..3 "use" WHITESPACE@3..4 " " USE_TREE@4..11 diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast index 9588cf3b3..0415085b0 100644 --- a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast +++ b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..48 - USE_ITEM@0..13 + USE@0..13 USE_KW@0..3 "use" WHITESPACE@3..4 " " USE_TREE@4..12 @@ -14,10 +14,10 @@ SOURCE_FILE@0..48 IDENT@9..12 "bar" SEMICOLON@12..13 ";" WHITESPACE@13..14 "\n" - USE_ITEM@14..17 + USE@14..17 USE_KW@14..17 "use" WHITESPACE@17..18 "\n" - USE_ITEM@18..33 + USE@18..33 USE_KW@18..21 "use" WHITESPACE@21..22 " " USE_TREE@22..32 @@ -31,7 +31,7 @@ SOURCE_FILE@0..48 IDENT@29..32 "baz" SEMICOLON@32..33 ";" WHITESPACE@33..34 "\n" - USE_ITEM@34..37 + USE@34..37 USE_KW@34..37 "use" WHITESPACE@37..38 "\n" FN_DEF@38..47 diff --git a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast b/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast index f926b67d2..ef6172f8a 100644 --- a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast +++ b/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..37 - USE_ITEM@0..36 + USE@0..36 USE_KW@0..3 "use" WHITESPACE@3..4 " " USE_TREE@4..36 diff --git a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast index d2a549273..284c8715b 100644 --- a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast +++ b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..98 - USE_ITEM@0..12 + USE@0..12 USE_KW@0..3 "use" WHITESPACE@3..4 " " USE_TREE@4..11 @@ -9,7 +9,7 @@ SOURCE_FILE@0..98 CRATE_KW@6..11 "crate" SEMICOLON@11..12 ";" WHITESPACE@12..13 "\n" - USE_ITEM@13..54 + USE@13..54 USE_KW@13..16 "use" WHITESPACE@16..17 " " USE_TREE@17..53 @@ -52,7 +52,7 @@ SOURCE_FILE@0..98 R_CURLY@52..53 "}" SEMICOLON@53..54 ";" WHITESPACE@54..55 "\n" - USE_ITEM@55..72 + USE@55..72 USE_KW@55..58 "use" WHITESPACE@58..59 " " USE_TREE@59..71 @@ -66,7 +66,7 @@ SOURCE_FILE@0..98 CRATE_KW@66..71 "crate" SEMICOLON@71..72 ";" WHITESPACE@72..73 "\n" - USE_ITEM@73..97 + USE@73..97 USE_KW@73..76 "use" WHITESPACE@76..77 " " USE_TREE@77..96 diff --git a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast index d0360c467..2049a9d72 100644 --- a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast +++ b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..67 - USE_ITEM@0..12 + USE@0..12 USE_KW@0..3 "use" WHITESPACE@3..4 " " USE_TREE@4..11 @@ -9,7 +9,7 @@ SOURCE_FILE@0..67 SUPER_KW@6..11 "super" SEMICOLON@11..12 ";" WHITESPACE@12..13 "\n" - USE_ITEM@13..26 + USE@13..26 USE_KW@13..16 "use" WHITESPACE@16..17 " " USE_TREE@17..25 @@ -23,7 +23,7 @@ SOURCE_FILE@0..67 SUPER_KW@20..25 "super" SEMICOLON@25..26 ";" WHITESPACE@26..27 "\n" - USE_ITEM@27..47 + USE@27..47 USE_KW@27..30 "use" WHITESPACE@30..31 " " USE_TREE@31..46 @@ -41,7 +41,7 @@ SOURCE_FILE@0..67 SUPER_KW@41..46 "super" SEMICOLON@46..47 ";" WHITESPACE@47..48 "\n" - USE_ITEM@48..66 + USE@48..66 USE_KW@48..51 "use" WHITESPACE@51..52 " " USE_TREE@52..65 diff --git a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast index 4f382b06c..deadf56b4 100644 --- a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast +++ b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..25 - USE_ITEM@0..11 + USE@0..11 USE_KW@0..3 "use" WHITESPACE@3..4 " " USE_TREE@4..10 @@ -9,7 +9,7 @@ SOURCE_FILE@0..25 SELF_KW@6..10 "self" SEMICOLON@10..11 ";" WHITESPACE@11..12 "\n" - USE_ITEM@12..24 + USE@12..24 USE_KW@12..15 "use" WHITESPACE@15..16 " " USE_TREE@16..23 -- 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 --- crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast | 2 +- crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast | 2 +- crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast | 4 ++-- crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast | 2 +- crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast | 2 +- crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast | 2 +- crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast | 2 +- crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast | 2 +- crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast | 2 +- crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast | 4 ++-- crates/ra_syntax/test_data/parser/err/0019_let_recover.rast | 2 +- crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast | 4 ++-- crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast | 2 +- crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast | 6 +++--- crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast | 2 +- crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast | 4 ++-- crates/ra_syntax/test_data/parser/err/0025_nope.rast | 2 +- .../ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast | 2 +- crates/ra_syntax/test_data/parser/err/0029_field_completion.rast | 2 +- crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast | 2 +- .../ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast | 2 +- .../ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast | 2 +- crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast | 2 +- crates/ra_syntax/test_data/parser/err/0035_use_recover.rast | 2 +- .../ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast | 4 ++-- .../test_data/parser/err/0038_endless_inclusive_range.rast | 2 +- crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast | 2 +- crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast | 2 +- crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast | 2 +- 29 files changed, 36 insertions(+), 36 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/err') diff --git a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast index 375ed45e0..4845a6563 100644 --- a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast +++ b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..54 - FN_DEF@0..31 + FN@0..31 ATTR@0..18 POUND@0..1 "#" L_BRACK@1..2 "[" diff --git a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast index b72c92c33..2ae5bacea 100644 --- a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast +++ b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast @@ -12,7 +12,7 @@ SOURCE_FILE@0..31 ERROR@14..15 R_CURLY@14..15 "}" WHITESPACE@15..17 "\n\n" - FN_DEF@17..27 + FN@17..27 FN_KW@17..19 "fn" WHITESPACE@19..20 " " NAME@20..23 diff --git a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast index 33953d8d7..1e9637c26 100644 --- a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast +++ b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..95 - FN_DEF@0..12 + FN@0..12 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 @@ -58,7 +58,7 @@ SOURCE_FILE@0..95 WHITESPACE@78..79 "\n" R_CURLY@79..80 "}" WHITESPACE@80..82 "\n\n" - FN_DEF@82..94 + FN@82..94 FN_KW@82..84 "fn" WHITESPACE@84..85 " " NAME@85..88 diff --git a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast index 3bf57eacc..1c3e0f65b 100644 --- a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast +++ b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..42 - FN_DEF@0..41 + FN@0..41 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast index e1e782f5f..c8bf96550 100644 --- a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast +++ b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..389 - FN_DEF@0..389 + FN@0..389 VISIBILITY@0..10 PUB_KW@0..3 L_PAREN@3..4 diff --git a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast index 9323b7890..1ab045a44 100644 --- a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast +++ b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..23 - FN_DEF@0..22 + FN@0..22 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast b/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast index b18378cff..a3c25b450 100644 --- a/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast +++ b/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..14 - FN_DEF@0..7 + FN@0..7 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast index 93434f34f..66157c3dc 100644 --- a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast +++ b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..56 - FN_DEF@0..55 + FN@0..55 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast index 628315c78..bb4a28f4e 100644 --- a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast +++ b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..47 - FN_DEF@0..46 + FN@0..46 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast index a87e5061a..ce43ddf45 100644 --- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast +++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast @@ -11,7 +11,7 @@ SOURCE_FILE@0..183 ASSOC_ITEM_LIST@14..182 L_CURLY@14..15 "{" WHITESPACE@15..20 "\n " - FN_DEF@20..161 + FN@20..161 FN_KW@20..22 "fn" WHITESPACE@22..23 " " NAME@23..32 @@ -116,7 +116,7 @@ SOURCE_FILE@0..183 WHITESPACE@155..160 "\n " R_CURLY@160..161 "}" WHITESPACE@161..167 "\n\n " - FN_DEF@167..180 + FN@167..180 FN_KW@167..169 "fn" WHITESPACE@169..170 " " NAME@170..180 diff --git a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast index 4ff27f5c8..f6fa964b7 100644 --- a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast +++ b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..139 - FN_DEF@0..138 + FN@0..138 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast index 5f3a31473..6f6feba5a 100644 --- a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast +++ b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast @@ -1,8 +1,8 @@ SOURCE_FILE@0..16 - FN_DEF@0..2 + FN@0..2 FN_KW@0..2 "fn" WHITESPACE@2..4 "\n\n" - FN_DEF@4..15 + FN@4..15 FN_KW@4..6 "fn" WHITESPACE@6..7 " " NAME@7..10 diff --git a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast index 1746bd3c1..ba4ce4795 100644 --- a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast +++ b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..22 - FN_DEF@0..21 + FN@0..21 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast index 28146f44e..866f61113 100644 --- a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast +++ b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..112 - FN_DEF@0..33 + FN@0..33 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..4 @@ -40,7 +40,7 @@ SOURCE_FILE@0..112 WHITESPACE@31..32 " " R_CURLY@32..33 "}" WHITESPACE@33..34 "\n" - FN_DEF@34..68 + FN@34..68 FN_KW@34..36 "fn" WHITESPACE@36..37 " " NAME@37..38 @@ -88,7 +88,7 @@ SOURCE_FILE@0..112 WHITESPACE@66..67 " " R_CURLY@67..68 "}" WHITESPACE@68..69 "\n" - FN_DEF@69..111 + FN@69..111 FN_KW@69..71 "fn" WHITESPACE@71..72 " " NAME@72..73 diff --git a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast index 9ea9d715e..5ffefd742 100644 --- a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast +++ b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..94 - FN_DEF@0..55 + FN@0..55 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast index 48610a5eb..1e94e72bc 100644 --- a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast +++ b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..240 - FN_DEF@0..53 + FN@0..53 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..4 @@ -65,7 +65,7 @@ SOURCE_FILE@0..240 L_CURLY@51..52 "{" R_CURLY@52..53 "}" WHITESPACE@53..55 "\n\n" - FN_DEF@55..239 + FN@55..239 FN_KW@55..57 "fn" WHITESPACE@57..58 " " NAME@58..62 diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.rast b/crates/ra_syntax/test_data/parser/err/0025_nope.rast index 88b086daf..4b9bd679e 100644 --- a/crates/ra_syntax/test_data/parser/err/0025_nope.rast +++ b/crates/ra_syntax/test_data/parser/err/0025_nope.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..575 - FN_DEF@0..574 + FN@0..574 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast index 4d6461d1e..53704f640 100644 --- a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast +++ b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..30 - FN_DEF@0..29 + FN@0..29 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast index 0da8f59f0..bfcd0149e 100644 --- a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast +++ b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..24 - FN_DEF@0..23 + FN@0..23 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast index 515819e42..55ff3943f 100644 --- a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast +++ b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..350 - FN_DEF@0..349 + FN@0..349 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..8 diff --git a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast index c6859eca8..ec9f556aa 100644 --- a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast +++ b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..293 - FN_DEF@0..292 + FN@0..292 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast index 53e445459..063532e02 100644 --- a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast +++ b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..89 - FN_DEF@0..88 + FN@0..88 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast index 1b2ac5011..303a49576 100644 --- a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast +++ b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..91 - FN_DEF@0..89 + FN@0..89 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast index 0415085b0..2f03709eb 100644 --- a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast +++ b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast @@ -34,7 +34,7 @@ SOURCE_FILE@0..48 USE@34..37 USE_KW@34..37 "use" WHITESPACE@37..38 "\n" - FN_DEF@38..47 + FN@38..47 FN_KW@38..40 "fn" WHITESPACE@40..41 " " NAME@41..42 diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast index bc446e3df..f180616f1 100644 --- a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast +++ b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast @@ -17,7 +17,7 @@ SOURCE_FILE@0..118 ASSOC_ITEM_LIST@14..117 L_CURLY@14..15 "{" WHITESPACE@15..20 "\n " - FN_DEF@20..31 + FN@20..31 FN_KW@20..22 "fn" WHITESPACE@22..23 " " NAME@23..26 @@ -30,7 +30,7 @@ SOURCE_FILE@0..118 L_CURLY@29..30 "{" R_CURLY@30..31 "}" WHITESPACE@31..36 "\n " - FN_DEF@36..51 + FN@36..51 VISIBILITY@36..39 PUB_KW@36..39 "pub" WHITESPACE@39..40 " " diff --git a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast index 21db9ee85..bed7ad6c3 100644 --- a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast +++ b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..33 - FN_DEF@0..32 + FN@0..32 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast index ec950381b..a98c31b0c 100644 --- a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast +++ b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..83 - FN_DEF@0..82 + FN@0..82 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast index cb90f28bc..5f59c3bc2 100644 --- a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast +++ b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast @@ -136,7 +136,7 @@ SOURCE_FILE@0..239 R_PAREN@147..148 ")" SEMICOLON@148..149 ";" WHITESPACE@149..150 "\n" - FN_DEF@150..238 + FN@150..238 FN_KW@150..152 "fn" WHITESPACE@152..153 " " NAME@153..164 diff --git a/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast index e46456384..df29017e7 100644 --- a/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast +++ b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..83 - FN_DEF@0..82 + FN@0..82 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 -- cgit v1.2.3 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 --- .../ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast | 2 +- .../ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/err') diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast index f180616f1..c0ba4fba9 100644 --- a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast +++ b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast @@ -46,7 +46,7 @@ SOURCE_FILE@0..118 L_CURLY@49..50 "{" R_CURLY@50..51 "}" WHITESPACE@51..56 "\n " - TYPE_ALIAS_DEF@56..81 + TYPE_ALIAS@56..81 VISIBILITY@56..66 PUB_KW@56..59 "pub" L_PAREN@59..60 "(" diff --git a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast index 5f59c3bc2..19b3540e9 100644 --- a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast +++ b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..239 - TYPE_ALIAS_DEF@0..30 + TYPE_ALIAS@0..30 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..11 @@ -26,7 +26,7 @@ SOURCE_FILE@0..239 IDENT@26..29 "u32" SEMICOLON@29..30 ";" WHITESPACE@30..31 "\n" - TYPE_ALIAS_DEF@31..64 + TYPE_ALIAS@31..64 TYPE_KW@31..35 "type" WHITESPACE@35..36 " " NAME@36..42 @@ -57,7 +57,7 @@ SOURCE_FILE@0..239 R_PAREN@62..63 ")" SEMICOLON@63..64 ";" WHITESPACE@64..65 "\n" - TYPE_ALIAS_DEF@65..95 + TYPE_ALIAS@65..95 TYPE_KW@65..69 "type" WHITESPACE@69..70 " " NAME@70..78 @@ -83,7 +83,7 @@ SOURCE_FILE@0..239 R_BRACK@93..94 "]" SEMICOLON@94..95 ";" WHITESPACE@95..96 "\n" - TYPE_ALIAS_DEF@96..149 + TYPE_ALIAS@96..149 TYPE_KW@96..100 "type" WHITESPACE@100..101 " " NAME@101..109 -- 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 --- .../parser/err/0009_broken_struct_type_parameter.rast | 2 +- .../test_data/parser/err/0012_broken_lambda.rast | 2 +- .../test_data/parser/err/0014_where_no_bounds.rast | 2 +- .../test_data/parser/err/0024_many_type_parens.rast | 8 ++++---- .../test_data/parser/err/0026_imp_recovery.rast | 4 ++-- .../parser/err/0027_incomplere_where_for.rast | 2 +- .../test_data/parser/err/0044_unexpected_for_type.rast | 18 +++++++++--------- 7 files changed, 19 insertions(+), 19 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/err') diff --git a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast index aca02ece4..10081a870 100644 --- a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast +++ b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..43 WHITESPACE@6..7 " " NAME@7..8 IDENT@7..8 "S" - TYPE_PARAM_LIST@8..11 + GENERIC_PARAM_LIST@8..11 L_ANGLE@8..9 "<" ERROR@9..11 INT_NUMBER@9..11 "90" diff --git a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast index c8bf96550..d62906b99 100644 --- a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast +++ b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast @@ -10,7 +10,7 @@ SOURCE_FILE@0..389 WHITESPACE@13..14 NAME@14..21 IDENT@14..21 "process" - TYPE_PARAM_LIST@21..38 + GENERIC_PARAM_LIST@21..38 L_ANGLE@21..22 LIFETIME_PARAM@22..24 LIFETIME@22..24 "'a" diff --git a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast index 1ab045a44..a1f39b22a 100644 --- a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast +++ b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..23 WHITESPACE@2..3 " " NAME@3..6 IDENT@3..6 "foo" - TYPE_PARAM_LIST@6..9 + GENERIC_PARAM_LIST@6..9 L_ANGLE@6..7 "<" TYPE_PARAM@7..8 NAME@7..8 diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast index 1e94e72bc..4c2d1ad68 100644 --- a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast +++ b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..240 WHITESPACE@2..3 " " NAME@3..4 IDENT@3..4 "f" - TYPE_PARAM_LIST@4..48 + GENERIC_PARAM_LIST@4..48 L_ANGLE@4..5 "<" TYPE_PARAM@5..47 NAME@5..6 @@ -39,7 +39,7 @@ SOURCE_FILE@0..240 L_PAREN@28..29 "(" FOR_TYPE@29..46 FOR_KW@29..32 "for" - TYPE_PARAM_LIST@32..36 + GENERIC_PARAM_LIST@32..36 L_ANGLE@32..33 "<" LIFETIME_PARAM@33..35 LIFETIME@33..35 "\'a" @@ -122,7 +122,7 @@ SOURCE_FILE@0..240 L_PAREN@102..103 "(" FOR_TYPE@103..120 FOR_KW@103..106 "for" - TYPE_PARAM_LIST@106..110 + GENERIC_PARAM_LIST@106..110 L_ANGLE@106..107 "<" LIFETIME_PARAM@107..109 LIFETIME@107..109 "\'a" @@ -242,7 +242,7 @@ SOURCE_FILE@0..240 L_PAREN@196..197 "(" FOR_TYPE@197..214 FOR_KW@197..200 "for" - TYPE_PARAM_LIST@200..204 + GENERIC_PARAM_LIST@200..204 L_ANGLE@200..201 "<" LIFETIME_PARAM@201..203 LIFETIME@201..203 "\'a" diff --git a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast index 254ff546a..8c8bf7b7e 100644 --- a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast +++ b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast @@ -1,7 +1,7 @@ SOURCE_FILE@0..38 IMPL_DEF@0..14 IMPL_KW@0..4 "impl" - TYPE_PARAM_LIST@4..14 + GENERIC_PARAM_LIST@4..14 L_ANGLE@4..5 "<" TYPE_PARAM@5..13 NAME@5..6 @@ -19,7 +19,7 @@ SOURCE_FILE@0..38 WHITESPACE@14..15 "\n" IMPL_DEF@15..37 IMPL_KW@15..19 "impl" - TYPE_PARAM_LIST@19..22 + GENERIC_PARAM_LIST@19..22 L_ANGLE@19..20 "<" TYPE_PARAM@20..21 NAME@20..21 diff --git a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast index 53704f640..a8e42e6ea 100644 --- a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast +++ b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast @@ -13,7 +13,7 @@ SOURCE_FILE@0..30 WHITESPACE@18..19 " " WHERE_PRED@19..26 FOR_KW@19..22 "for" - TYPE_PARAM_LIST@22..26 + GENERIC_PARAM_LIST@22..26 L_ANGLE@22..23 "<" LIFETIME_PARAM@23..25 LIFETIME@23..25 "\'a" diff --git a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast index 19b3540e9..082625c13 100644 --- a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast +++ b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast @@ -9,7 +9,7 @@ SOURCE_FILE@0..239 WHITESPACE@13..14 " " FOR_TYPE@14..29 FOR_KW@14..17 "for" - TYPE_PARAM_LIST@17..21 + GENERIC_PARAM_LIST@17..21 L_ANGLE@17..18 "<" LIFETIME_PARAM@18..20 LIFETIME@18..20 "\'a" @@ -36,7 +36,7 @@ SOURCE_FILE@0..239 WHITESPACE@44..45 " " FOR_TYPE@45..63 FOR_KW@45..48 "for" - TYPE_PARAM_LIST@48..52 + GENERIC_PARAM_LIST@48..52 L_ANGLE@48..49 "<" LIFETIME_PARAM@49..51 LIFETIME@49..51 "\'a" @@ -67,7 +67,7 @@ SOURCE_FILE@0..239 WHITESPACE@80..81 " " FOR_TYPE@81..94 FOR_KW@81..84 "for" - TYPE_PARAM_LIST@84..88 + GENERIC_PARAM_LIST@84..88 L_ANGLE@84..85 "<" LIFETIME_PARAM@85..87 LIFETIME@85..87 "\'a" @@ -93,7 +93,7 @@ SOURCE_FILE@0..239 WHITESPACE@111..112 " " FOR_TYPE@112..148 FOR_KW@112..115 "for" - TYPE_PARAM_LIST@115..119 + GENERIC_PARAM_LIST@115..119 L_ANGLE@115..116 "<" LIFETIME_PARAM@116..118 LIFETIME@116..118 "\'a" @@ -101,7 +101,7 @@ SOURCE_FILE@0..239 WHITESPACE@119..120 " " FOR_TYPE@120..148 FOR_KW@120..123 "for" - TYPE_PARAM_LIST@123..127 + GENERIC_PARAM_LIST@123..127 L_ANGLE@123..124 "<" LIFETIME_PARAM@124..126 LIFETIME@124..126 "\'b" @@ -141,7 +141,7 @@ SOURCE_FILE@0..239 WHITESPACE@152..153 " " NAME@153..164 IDENT@153..164 "for_for_for" - TYPE_PARAM_LIST@164..167 + GENERIC_PARAM_LIST@164..167 L_ANGLE@164..165 "<" TYPE_PARAM@165..166 NAME@165..166 @@ -156,7 +156,7 @@ SOURCE_FILE@0..239 WHITESPACE@175..180 "\n " WHERE_PRED@180..233 FOR_KW@180..183 "for" - TYPE_PARAM_LIST@183..187 + GENERIC_PARAM_LIST@183..187 L_ANGLE@183..184 "<" LIFETIME_PARAM@184..186 LIFETIME@184..186 "\'a" @@ -164,7 +164,7 @@ SOURCE_FILE@0..239 WHITESPACE@187..188 " " FOR_TYPE@188..227 FOR_KW@188..191 "for" - TYPE_PARAM_LIST@191..195 + GENERIC_PARAM_LIST@191..195 L_ANGLE@191..192 "<" LIFETIME_PARAM@192..194 LIFETIME@192..194 "\'b" @@ -172,7 +172,7 @@ SOURCE_FILE@0..239 WHITESPACE@195..196 " " FOR_TYPE@196..227 FOR_KW@196..199 "for" - TYPE_PARAM_LIST@199..203 + GENERIC_PARAM_LIST@199..203 L_ANGLE@199..200 "<" LIFETIME_PARAM@200..202 LIFETIME@200..202 "\'c" -- 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 --- crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/err') diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast index ce43ddf45..1ce5f188f 100644 --- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast +++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast @@ -75,16 +75,16 @@ SOURCE_FILE@0..183 IDENT@106..110 "push" ARG_LIST@110..155 L_PAREN@110..111 "(" - RECORD_LIT@111..154 + RECORD_EXPR@111..154 PATH@111..120 PATH_SEGMENT@111..120 NAME_REF@111..120 IDENT@111..120 "ScopeData" WHITESPACE@120..121 " " - RECORD_FIELD_LIST@121..154 + RECORD_EXPR_FIELD_LIST@121..154 L_CURLY@121..122 "{" WHITESPACE@122..123 " " - RECORD_FIELD@123..135 + RECORD_EXPR_FIELD@123..135 NAME_REF@123..129 IDENT@123..129 "parent" COLON@129..130 ":" @@ -96,7 +96,7 @@ SOURCE_FILE@0..183 IDENT@131..135 "None" COMMA@135..136 "," WHITESPACE@136..137 " " - RECORD_FIELD@137..152 + RECORD_EXPR_FIELD@137..152 NAME_REF@137..144 IDENT@137..144 "entries" COLON@144..145 ":" -- 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 --- .../parser/err/0000_struct_field_missing_comma.rast | 6 +++--- .../test_data/parser/err/0001_item_recovery_in_file.rast | 2 +- .../test_data/parser/err/0003_C++_semicolon.rast | 6 +++--- .../test_data/parser/err/0006_named_field_recovery.rast | 8 ++++---- .../test_data/parser/err/0013_invalid_type.rast | 6 +++--- crates/ra_syntax/test_data/parser/err/0025_nope.rast | 16 ++++++++-------- 6 files changed, 22 insertions(+), 22 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/err') diff --git a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast index 81f0f575c..93f6060ed 100644 --- a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast +++ b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast @@ -5,10 +5,10 @@ SOURCE_FILE@0..34 NAME@7..8 IDENT@7..8 "S" WHITESPACE@8..9 " " - RECORD_FIELD_DEF_LIST@9..34 + RECORD_FIELD_LIST@9..34 L_CURLY@9..10 "{" WHITESPACE@10..15 "\n " - RECORD_FIELD_DEF@15..21 + RECORD_FIELD@15..21 NAME@15..16 IDENT@15..16 "a" COLON@16..17 ":" @@ -19,7 +19,7 @@ SOURCE_FILE@0..34 NAME_REF@18..21 IDENT@18..21 "u32" WHITESPACE@21..26 "\n " - RECORD_FIELD_DEF@26..32 + RECORD_FIELD@26..32 NAME@26..27 IDENT@26..27 "b" COLON@27..28 ":" diff --git a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast index 97d0fe910..7e2f429e1 100644 --- a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast +++ b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast @@ -11,7 +11,7 @@ SOURCE_FILE@0..21 NAME@17..18 IDENT@17..18 "S" WHITESPACE@18..19 " " - RECORD_FIELD_DEF_LIST@19..21 + RECORD_FIELD_LIST@19..21 L_CURLY@19..20 "{" R_CURLY@20..21 "}" error 0..0: expected an item diff --git a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast index 21c255698..e0f3916b3 100644 --- a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast +++ b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast @@ -5,10 +5,10 @@ SOURCE_FILE@0..40 NAME@7..8 IDENT@7..8 "S" WHITESPACE@8..9 " " - RECORD_FIELD_DEF_LIST@9..39 + RECORD_FIELD_LIST@9..39 L_CURLY@9..10 "{" WHITESPACE@10..15 "\n " - RECORD_FIELD_DEF@15..21 + RECORD_FIELD@15..21 NAME@15..16 IDENT@15..16 "a" COLON@16..17 ":" @@ -20,7 +20,7 @@ SOURCE_FILE@0..40 IDENT@18..21 "i32" COMMA@21..22 "," WHITESPACE@22..27 "\n " - RECORD_FIELD_DEF@27..36 + RECORD_FIELD@27..36 NAME@27..28 IDENT@27..28 "b" COLON@28..29 ":" diff --git a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast index 2d6364998..ad9447761 100644 --- a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast +++ b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast @@ -5,10 +5,10 @@ SOURCE_FILE@0..74 NAME@7..8 IDENT@7..8 "S" WHITESPACE@8..9 " " - RECORD_FIELD_DEF_LIST@9..73 + RECORD_FIELD_LIST@9..73 L_CURLY@9..10 "{" WHITESPACE@10..15 "\n " - RECORD_FIELD_DEF@15..21 + RECORD_FIELD@15..21 NAME@15..16 IDENT@15..16 "f" COLON@16..17 ":" @@ -35,7 +35,7 @@ SOURCE_FILE@0..74 ERROR@42..43 STAR@42..43 "*" WHITESPACE@43..48 "\n " - RECORD_FIELD_DEF@48..58 + RECORD_FIELD@48..58 VISIBILITY@48..51 PUB_KW@48..51 "pub" WHITESPACE@51..52 " " @@ -50,7 +50,7 @@ SOURCE_FILE@0..74 IDENT@55..58 "u32" COMMA@58..59 "," WHITESPACE@59..64 "\n " - RECORD_FIELD_DEF@64..70 + RECORD_FIELD@64..70 NAME@64..65 IDENT@64..65 "z" COLON@65..66 ":" diff --git a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast index 211e5fd46..c3591d25c 100644 --- a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast +++ b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast @@ -7,10 +7,10 @@ SOURCE_FILE@0..86 WHITESPACE@10..11 " " NAME@11..16 IDENT@11..16 "Cache" - TUPLE_FIELD_DEF_LIST@16..72 + TUPLE_FIELD_LIST@16..72 L_PAREN@16..17 "(" WHITESPACE@17..22 "\n " - TUPLE_FIELD_DEF@22..68 + TUPLE_FIELD@22..68 PATH_TYPE@22..68 PATH@22..68 PATH_SEGMENT@22..68 @@ -47,7 +47,7 @@ SOURCE_FILE@0..86 ERROR@67..68 AT@67..68 "@" WHITESPACE@68..69 " " - TUPLE_FIELD_DEF@69..72 + TUPLE_FIELD@69..72 PATH_TYPE@69..72 PATH@69..72 PATH_SEGMENT@69..72 diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.rast b/crates/ra_syntax/test_data/parser/err/0025_nope.rast index 4b9bd679e..a1258028d 100644 --- a/crates/ra_syntax/test_data/parser/err/0025_nope.rast +++ b/crates/ra_syntax/test_data/parser/err/0025_nope.rast @@ -28,9 +28,9 @@ SOURCE_FILE@0..575 ENUM_VARIANT@50..62 NAME@50..54 IDENT@50..54 "Var2" - TUPLE_FIELD_DEF_LIST@54..62 + TUPLE_FIELD_LIST@54..62 L_PAREN@54..55 "(" - TUPLE_FIELD_DEF@55..61 + TUPLE_FIELD@55..61 PATH_TYPE@55..61 PATH@55..61 PATH_SEGMENT@55..61 @@ -43,10 +43,10 @@ SOURCE_FILE@0..575 NAME@72..76 IDENT@72..76 "Var3" WHITESPACE@76..77 " " - RECORD_FIELD_DEF_LIST@77..145 + RECORD_FIELD_LIST@77..145 L_CURLY@77..78 "{" WHITESPACE@78..91 "\n " - RECORD_FIELD_DEF@91..95 + RECORD_FIELD@91..95 NAME@91..94 IDENT@91..94 "abc" COLON@94..95 ":" @@ -108,10 +108,10 @@ SOURCE_FILE@0..575 NAME@250..259 IDENT@250..259 "StillFine" WHITESPACE@259..260 " " - RECORD_FIELD_DEF_LIST@260..293 + RECORD_FIELD_LIST@260..293 L_CURLY@260..261 "{" WHITESPACE@261..274 "\n " - RECORD_FIELD_DEF@274..282 + RECORD_FIELD@274..282 NAME@274..277 IDENT@274..277 "def" COLON@277..278 ":" @@ -146,9 +146,9 @@ SOURCE_FILE@0..575 ENUM_VARIANT@363..372 NAME@363..367 IDENT@363..367 "Nope" - TUPLE_FIELD_DEF_LIST@367..372 + TUPLE_FIELD_LIST@367..372 L_PAREN@367..368 "(" - TUPLE_FIELD_DEF@368..371 + TUPLE_FIELD@368..371 PATH_TYPE@368..371 PATH@368..371 PATH_SEGMENT@368..371 -- 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/err/0000_struct_field_missing_comma.rast | 2 +- crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast | 2 +- crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast | 2 +- crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast | 2 +- crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast | 2 +- .../test_data/parser/err/0009_broken_struct_type_parameter.rast | 4 ++-- crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast | 2 +- crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast | 2 +- crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/err') diff --git a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast index 93f6060ed..bbbf496c8 100644 --- a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast +++ b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..34 - STRUCT_DEF@0..34 + STRUCT@0..34 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 diff --git a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast index 7e2f429e1..6dc73bfdb 100644 --- a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast +++ b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast @@ -5,7 +5,7 @@ SOURCE_FILE@0..21 ERROR@3..8 MATCH_KW@3..8 "match" WHITESPACE@8..10 "\n\n" - STRUCT_DEF@10..21 + STRUCT@10..21 STRUCT_KW@10..16 "struct" WHITESPACE@16..17 " " NAME@17..18 diff --git a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast index e0f3916b3..7763fad84 100644 --- a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast +++ b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..40 - STRUCT_DEF@0..39 + STRUCT@0..39 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 diff --git a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast index ad9447761..5f85c3943 100644 --- a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast +++ b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..74 - STRUCT_DEF@0..73 + STRUCT@0..73 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 diff --git a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast index 2ae5bacea..560bfd751 100644 --- a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast +++ b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast @@ -2,7 +2,7 @@ SOURCE_FILE@0..31 ERROR@0..1 R_CURLY@0..1 "}" WHITESPACE@1..3 "\n\n" - STRUCT_DEF@3..12 + STRUCT@3..12 STRUCT_KW@3..9 "struct" WHITESPACE@9..10 " " NAME@10..11 diff --git a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast index 10081a870..dacf71aa1 100644 --- a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast +++ b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..43 - STRUCT_DEF@0..11 + STRUCT@0..11 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 @@ -38,7 +38,7 @@ SOURCE_FILE@0..43 WHITESPACE@29..30 "\n" R_CURLY@30..31 "}" WHITESPACE@31..33 "\n\n" - STRUCT_DEF@33..42 + STRUCT@33..42 STRUCT_KW@33..39 "struct" WHITESPACE@39..40 " " NAME@40..41 diff --git a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast index 87c54c32c..b02d390af 100644 --- a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast +++ b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast @@ -3,7 +3,7 @@ SOURCE_FILE@0..19 ABI@0..6 EXTERN_KW@0..6 "extern" WHITESPACE@6..7 " " - STRUCT_DEF@7..18 + STRUCT@7..18 STRUCT_KW@7..13 "struct" WHITESPACE@13..14 " " NAME@14..17 diff --git a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast index c3591d25c..3eef848fc 100644 --- a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast +++ b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..86 - STRUCT_DEF@0..72 + STRUCT@0..72 VISIBILITY@0..3 PUB_KW@0..3 "pub" WHITESPACE@3..4 " " diff --git a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast index 866f61113..02339d035 100644 --- a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast +++ b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast @@ -28,7 +28,7 @@ SOURCE_FILE@0..112 ERROR@17..18 COMMA@17..18 "," WHITESPACE@18..19 " " - STRUCT_DEF@19..26 + STRUCT@19..26 STRUCT_KW@19..25 "struct" ERROR@25..26 COMMA@25..26 "," -- 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/err/0025_nope.rast | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/err') diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.rast b/crates/ra_syntax/test_data/parser/err/0025_nope.rast index a1258028d..94456e48c 100644 --- a/crates/ra_syntax/test_data/parser/err/0025_nope.rast +++ b/crates/ra_syntax/test_data/parser/err/0025_nope.rast @@ -11,7 +11,7 @@ SOURCE_FILE@0..575 BLOCK_EXPR@10..574 L_CURLY@10..11 "{" WHITESPACE@11..16 "\n " - ENUM_DEF@16..152 + ENUM@16..152 ENUM_KW@16..20 "enum" WHITESPACE@20..21 " " NAME@21..25 @@ -79,7 +79,7 @@ SOURCE_FILE@0..575 INT_NUMBER@184..185 "1" SEMICOLON@185..186 ";" WHITESPACE@186..191 "\n " - ENUM_DEF@191..223 + ENUM@191..223 ENUM_KW@191..195 "enum" WHITESPACE@195..196 " " NAME@196..201 @@ -95,7 +95,7 @@ SOURCE_FILE@0..575 WHITESPACE@217..222 "\n " R_CURLY@222..223 "}" WHITESPACE@223..229 "\n\n " - ENUM_DEF@229..300 + ENUM@229..300 ENUM_KW@229..233 "enum" WHITESPACE@233..234 " " NAME@234..239 @@ -132,7 +132,7 @@ SOURCE_FILE@0..575 BLOCK_EXPR@306..459 L_CURLY@306..307 "{" WHITESPACE@307..316 "\n " - ENUM_DEF@316..453 + ENUM@316..453 COMMENT@316..329 "// fail again" WHITESPACE@329..338 "\n " ENUM_KW@338..342 "enum" -- 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 --- crates/ra_syntax/test_data/parser/err/0025_nope.rast | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/err') diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.rast b/crates/ra_syntax/test_data/parser/err/0025_nope.rast index 94456e48c..fca646557 100644 --- a/crates/ra_syntax/test_data/parser/err/0025_nope.rast +++ b/crates/ra_syntax/test_data/parser/err/0025_nope.rast @@ -17,15 +17,15 @@ SOURCE_FILE@0..575 NAME@21..25 IDENT@21..25 "Test" WHITESPACE@25..26 " " - ENUM_VARIANT_LIST@26..152 + VARIANT_LIST@26..152 L_CURLY@26..27 "{" WHITESPACE@27..36 "\n " - ENUM_VARIANT@36..40 + VARIANT@36..40 NAME@36..40 IDENT@36..40 "Var1" COMMA@40..41 "," WHITESPACE@41..50 "\n " - ENUM_VARIANT@50..62 + VARIANT@50..62 NAME@50..54 IDENT@50..54 "Var2" TUPLE_FIELD_LIST@54..62 @@ -39,7 +39,7 @@ SOURCE_FILE@0..575 R_PAREN@61..62 ")" COMMA@62..63 "," WHITESPACE@63..72 "\n " - ENUM_VARIANT@72..145 + VARIANT@72..145 NAME@72..76 IDENT@72..76 "Var3" WHITESPACE@76..77 " " @@ -85,10 +85,10 @@ SOURCE_FILE@0..575 NAME@196..201 IDENT@196..201 "Test2" WHITESPACE@201..202 " " - ENUM_VARIANT_LIST@202..223 + VARIANT_LIST@202..223 L_CURLY@202..203 "{" WHITESPACE@203..212 "\n " - ENUM_VARIANT@212..216 + VARIANT@212..216 NAME@212..216 IDENT@212..216 "Fine" COMMA@216..217 "," @@ -101,10 +101,10 @@ SOURCE_FILE@0..575 NAME@234..239 IDENT@234..239 "Test3" WHITESPACE@239..240 " " - ENUM_VARIANT_LIST@240..300 + VARIANT_LIST@240..300 L_CURLY@240..241 "{" WHITESPACE@241..250 "\n " - ENUM_VARIANT@250..293 + VARIANT@250..293 NAME@250..259 IDENT@250..259 "StillFine" WHITESPACE@259..260 " " @@ -140,10 +140,10 @@ SOURCE_FILE@0..575 NAME@343..348 IDENT@343..348 "Test4" WHITESPACE@348..349 " " - ENUM_VARIANT_LIST@349..453 + VARIANT_LIST@349..453 L_CURLY@349..350 "{" WHITESPACE@350..363 "\n " - ENUM_VARIANT@363..372 + VARIANT@363..372 NAME@363..367 IDENT@363..367 "Nope" TUPLE_FIELD_LIST@367..372 -- 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/err/0037_visibility_in_traits.rast | 2 +- crates/ra_syntax/test_data/parser/err/0043_default_const.rast | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/err') diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast index c0ba4fba9..b1400aa5f 100644 --- a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast +++ b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast @@ -65,7 +65,7 @@ SOURCE_FILE@0..118 R_PAREN@79..80 ")" SEMICOLON@80..81 ";" WHITESPACE@81..86 "\n " - CONST_DEF@86..115 + CONST@86..115 VISIBILITY@86..96 PUB_KW@86..89 "pub" L_PAREN@89..90 "(" diff --git a/crates/ra_syntax/test_data/parser/err/0043_default_const.rast b/crates/ra_syntax/test_data/parser/err/0043_default_const.rast index 6ca1a4870..f041fa6f7 100644 --- a/crates/ra_syntax/test_data/parser/err/0043_default_const.rast +++ b/crates/ra_syntax/test_data/parser/err/0043_default_const.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..39 NAME_REF@12..19 IDENT@12..19 "default" WHITESPACE@19..20 " " - CONST_DEF@20..36 + CONST@20..36 CONST_KW@20..25 "const" WHITESPACE@25..26 " " NAME@26..27 -- 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/err/0022_bad_exprs.rast | 2 +- crates/ra_syntax/test_data/parser/err/0043_default_const.rast | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/err') diff --git a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast index 02339d035..a6e304b78 100644 --- a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast +++ b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast @@ -133,7 +133,7 @@ SOURCE_FILE@0..112 ERROR@96..97 COMMA@96..97 "," WHITESPACE@97..98 " " - TRAIT_DEF@98..104 + TRAIT@98..104 TRAIT_KW@98..103 "trait" ERROR@103..104 COMMA@103..104 "," diff --git a/crates/ra_syntax/test_data/parser/err/0043_default_const.rast b/crates/ra_syntax/test_data/parser/err/0043_default_const.rast index f041fa6f7..51ad2a846 100644 --- a/crates/ra_syntax/test_data/parser/err/0043_default_const.rast +++ b/crates/ra_syntax/test_data/parser/err/0043_default_const.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..39 - TRAIT_DEF@0..38 + TRAIT@0..38 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/err/0018_incomplete_fn.rast | 2 +- crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast | 2 +- crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast | 4 ++-- crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/err') diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast index 1ce5f188f..bc95b8512 100644 --- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast +++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..183 - IMPL_DEF@0..182 + IMPL@0..182 IMPL_KW@0..4 "impl" WHITESPACE@4..5 " " PATH_TYPE@5..13 diff --git a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast index a6e304b78..71fb19783 100644 --- a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast +++ b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast @@ -75,7 +75,7 @@ SOURCE_FILE@0..112 ERROR@54..55 COMMA@54..55 "," WHITESPACE@55..56 " " - IMPL_DEF@56..60 + IMPL@56..60 IMPL_KW@56..60 "impl" EXPR_STMT@60..61 ERROR@60..61 diff --git a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast index 8c8bf7b7e..7e4b11c27 100644 --- a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast +++ b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..38 - IMPL_DEF@0..14 + IMPL@0..14 IMPL_KW@0..4 "impl" GENERIC_PARAM_LIST@4..14 L_ANGLE@4..5 "<" @@ -17,7 +17,7 @@ SOURCE_FILE@0..38 IDENT@8..13 "Clone" R_ANGLE@13..14 ">" WHITESPACE@14..15 "\n" - IMPL_DEF@15..37 + IMPL@15..37 IMPL_KW@15..19 "impl" GENERIC_PARAM_LIST@19..22 L_ANGLE@19..20 "<" diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast index b1400aa5f..faf87d6e5 100644 --- a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast +++ b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..118 - IMPL_DEF@0..117 + IMPL@0..117 IMPL_KW@0..4 "impl" WHITESPACE@4..5 " " PATH_TYPE@5..6 -- cgit v1.2.3