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/inline/err/0004_impl_type.rast | 8 ++++---- .../test_data/parser/inline/err/0014_default_fn_type.rast | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/inline/err') diff --git a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast index fd939be8d..2d0253aa0 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast @@ -8,7 +8,7 @@ SOURCE_FILE@0..87 NAME_REF@5..9 IDENT@5..9 "Type" WHITESPACE@9..10 " " - ITEM_LIST@10..12 + ASSOC_ITEM_LIST@10..12 L_CURLY@10..11 "{" R_CURLY@11..12 "}" WHITESPACE@12..13 "\n" @@ -29,7 +29,7 @@ SOURCE_FILE@0..87 NAME_REF@29..30 IDENT@29..30 "T" WHITESPACE@30..31 " " - ITEM_LIST@31..33 + ASSOC_ITEM_LIST@31..33 L_CURLY@31..32 "{" R_CURLY@32..33 "}" WHITESPACE@33..34 "\n" @@ -45,7 +45,7 @@ SOURCE_FILE@0..87 NAME_REF@44..51 IDENT@44..51 "NotType" WHITESPACE@51..52 " " - ITEM_LIST@52..54 + ASSOC_ITEM_LIST@52..54 L_CURLY@52..53 "{" R_CURLY@53..54 "}" WHITESPACE@54..55 "\n" @@ -69,7 +69,7 @@ SOURCE_FILE@0..87 NAME_REF@76..83 IDENT@76..83 "NotType" WHITESPACE@83..84 " " - ITEM_LIST@84..86 + ASSOC_ITEM_LIST@84..86 L_CURLY@84..85 "{" R_CURLY@85..86 "}" WHITESPACE@86..87 "\n" diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast index b8cd0587d..5501dc5a6 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast @@ -5,7 +5,7 @@ SOURCE_FILE@0..62 NAME@6..7 IDENT@6..7 "T" WHITESPACE@7..8 " " - ITEM_LIST@8..61 + ASSOC_ITEM_LIST@8..61 L_CURLY@8..9 "{" WHITESPACE@9..14 "\n " MACRO_CALL@14..21 -- 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/inline/err/0015_empty_segment.rast | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/ra_syntax/test_data/parser/inline/err') diff --git a/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rast b/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rast index da8505607..2f59d0606 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..13 - USE_ITEM@0..12 + USE@0..12 USE_KW@0..3 "use" WHITESPACE@3..4 " " USE_TREE@4..12 -- 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/inline/err/0002_misplaced_label_err.rast | 2 +- .../test_data/parser/inline/err/0006_unsafe_block_in_mod.rast | 4 ++-- .../test_data/parser/inline/err/0007_async_without_semicolon.rast | 2 +- crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast | 2 +- .../test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast | 2 +- .../test_data/parser/inline/err/0010_bad_tuple_index_expr.rast | 2 +- .../ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast | 2 +- .../ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast | 2 +- .../inline/err/0014_record_literal_before_ellipsis_recovery.rast | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/inline/err') diff --git a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast index 75668c818..8b0a888fd 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..30 - FN_DEF@0..29 + FN@0..29 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 diff --git a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast index c789e8d82..cc0f8bcaf 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..33 - FN_DEF@0..10 + FN@0..10 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 @@ -19,7 +19,7 @@ SOURCE_FILE@0..33 WHITESPACE@19..20 " " R_CURLY@20..21 "}" WHITESPACE@21..22 " " - FN_DEF@22..32 + FN@22..32 FN_KW@22..24 "fn" WHITESPACE@24..25 " " NAME@25..28 diff --git a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast index cd24313d4..3f3a7f1b9 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..30 - FN_DEF@0..29 + FN@0..29 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast index c5fa7a404..63a10127d 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..21 - FN_DEF@0..20 + FN@0..20 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast index 4e3fa704e..8fd8d5e59 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..48 - FN_DEF@0..47 + FN@0..47 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast index e1abc5633..fa14e1e6d 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..47 - FN_DEF@0..46 + FN@0..46 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..6 diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast index 53f7ebaf9..d2a18330f 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast @@ -2,7 +2,7 @@ SOURCE_FILE@0..50 ERROR@0..6 UNSAFE_KW@0..6 "unsafe" WHITESPACE@6..7 " " - FN_DEF@7..24 + FN@7..24 ASYNC_KW@7..12 "async" WHITESPACE@12..13 " " FN_KW@13..15 "fn" diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast index 5501dc5a6..b31195281 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast @@ -35,7 +35,7 @@ SOURCE_FILE@0..62 NAME_REF@40..47 IDENT@40..47 "default" WHITESPACE@47..48 " " - FN_DEF@48..59 + FN@48..59 FN_KW@48..50 "fn" WHITESPACE@50..51 " " NAME@51..54 diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast index a9de44b57..6753c3fe7 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..45 - FN_DEF@0..44 + FN@0..44 FN_KW@0..2 "fn" WHITESPACE@2..3 " " NAME@3..7 -- cgit v1.2.3 From eb2f8063444b11257111f4f8ade990ec810e0361 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 15:25:46 +0200 Subject: Rename TypeAliasDef -> TypeAlias --- .../test_data/parser/inline/err/0001_array_type_missing_semi.rast | 2 +- .../test_data/parser/inline/err/0003_pointer_type_no_mutability.rast | 2 +- .../test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast | 2 +- crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/inline/err') diff --git a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast index bf70ebca4..0b9bbec07 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..18 - TYPE_ALIAS_DEF@0..12 + TYPE_ALIAS@0..12 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast index 95bcc3c0a..2409eefe7 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..14 - TYPE_ALIAS_DEF@0..13 + TYPE_ALIAS@0..13 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast index 90202d764..776022fd9 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..20 - TYPE_ALIAS_DEF@0..15 + TYPE_ALIAS@0..15 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast index b31195281..22c7c5f0d 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..62 NAME_REF@14..21 IDENT@14..21 "default" WHITESPACE@21..22 " " - TYPE_ALIAS_DEF@22..35 + TYPE_ALIAS@22..35 TYPE_KW@22..26 "type" WHITESPACE@26..27 " " NAME@27..28 -- 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 --- .../inline/err/0014_record_literal_before_ellipsis_recovery.rast | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/inline/err') diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast index 6753c3fe7..a81c442c0 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast @@ -11,16 +11,16 @@ SOURCE_FILE@0..45 BLOCK_EXPR@10..44 L_CURLY@10..11 "{" WHITESPACE@11..16 "\n " - RECORD_LIT@16..42 + RECORD_EXPR@16..42 PATH@16..17 PATH_SEGMENT@16..17 NAME_REF@16..17 IDENT@16..17 "S" WHITESPACE@17..18 " " - RECORD_FIELD_LIST@18..42 + RECORD_EXPR_FIELD_LIST@18..42 L_CURLY@18..19 "{" WHITESPACE@19..20 " " - RECORD_FIELD@20..40 + RECORD_EXPR_FIELD@20..40 NAME_REF@20..25 IDENT@20..25 "field" WHITESPACE@25..26 " " -- 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/inline/err/0010_wrong_order_fns.rast | 2 +- .../ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/inline/err') diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast index d2a18330f..a6e6552a9 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast @@ -17,7 +17,7 @@ SOURCE_FILE@0..50 L_CURLY@22..23 "{" R_CURLY@23..24 "}" WHITESPACE@24..25 "\n" - CONST_DEF@25..46 + CONST@25..46 UNSAFE_KW@25..31 "unsafe" WHITESPACE@31..32 " " CONST_KW@32..37 "const" diff --git a/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast b/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast index ebcc26e0d..8d761b907 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..19 - STATIC_DEF@0..18 + STATIC@0..18 STATIC_KW@0..6 "static" WHITESPACE@6..7 " " ERROR@7..8 -- 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/inline/err/0014_default_fn_type.rast | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/ra_syntax/test_data/parser/inline/err') diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast index 22c7c5f0d..acd72094b 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..62 - TRAIT_DEF@0..61 + TRAIT@0..61 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 --- .../parser/inline/err/0002_misplaced_label_err.rast | 2 +- .../test_data/parser/inline/err/0004_impl_type.rast | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/inline/err') diff --git a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast index 8b0a888fd..a4271fc87 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast @@ -17,7 +17,7 @@ SOURCE_FILE@0..30 LIFETIME@16..21 "\'loop" COLON@21..22 ":" WHITESPACE@22..23 " " - IMPL_DEF@23..27 + IMPL@23..27 IMPL_KW@23..27 "impl" WHITESPACE@27..28 "\n" R_CURLY@28..29 "}" diff --git a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast index 2d0253aa0..29d6b3974 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..87 - IMPL_DEF@0..12 + IMPL@0..12 IMPL_KW@0..4 "impl" WHITESPACE@4..5 " " PATH_TYPE@5..9 @@ -12,7 +12,7 @@ SOURCE_FILE@0..87 L_CURLY@10..11 "{" R_CURLY@11..12 "}" WHITESPACE@12..13 "\n" - IMPL_DEF@13..33 + IMPL@13..33 IMPL_KW@13..17 "impl" WHITESPACE@17..18 " " PATH_TYPE@18..24 @@ -33,10 +33,10 @@ SOURCE_FILE@0..87 L_CURLY@31..32 "{" R_CURLY@32..33 "}" WHITESPACE@33..34 "\n" - IMPL_DEF@34..38 + IMPL@34..38 IMPL_KW@34..38 "impl" WHITESPACE@38..39 " " - IMPL_DEF@39..54 + IMPL@39..54 IMPL_KW@39..43 "impl" WHITESPACE@43..44 " " PATH_TYPE@44..51 @@ -49,7 +49,7 @@ SOURCE_FILE@0..87 L_CURLY@52..53 "{" R_CURLY@53..54 "}" WHITESPACE@54..55 "\n" - IMPL_DEF@55..70 + IMPL@55..70 IMPL_KW@55..59 "impl" WHITESPACE@59..60 " " PATH_TYPE@60..66 @@ -60,7 +60,7 @@ SOURCE_FILE@0..87 WHITESPACE@66..67 " " FOR_KW@67..70 "for" WHITESPACE@70..71 " " - IMPL_DEF@71..86 + IMPL@71..86 IMPL_KW@71..75 "impl" WHITESPACE@75..76 " " PATH_TYPE@76..83 -- cgit v1.2.3