From 02d25ab60d2701ce71fe2dfaca36627ad902e229 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Thu, 17 Jun 2021 18:09:44 +0200 Subject: Fix parser tests for 1.53 --- .../parser/inline/err/0002_misplaced_label_err.rast | 2 +- .../test_data/parser/inline/ok/0003_where_pred_for.rast | 4 ++-- .../syntax/test_data/parser/inline/ok/0006_self_param.rast | 4 ++-- .../test_data/parser/inline/ok/0007_type_param_bounds.rast | 2 +- .../test_data/parser/inline/ok/0015_continue_expr.rast | 2 +- .../test_data/parser/inline/ok/0028_impl_trait_type.rast | 4 ++-- .../test_data/parser/inline/ok/0033_reference_type;.rast | 2 +- .../syntax/test_data/parser/inline/ok/0034_break_expr.rast | 4 ++-- crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast | 2 +- .../parser/inline/ok/0045_param_list_opt_patterns.rast | 2 +- .../parser/inline/ok/0048_path_type_with_bounds.rast | 4 ++-- .../test_data/parser/inline/ok/0055_literal_pattern.rast | 2 +- .../syntax/test_data/parser/inline/ok/0056_where_clause.rast | 12 ++++++------ .../test_data/parser/inline/ok/0065_dyn_trait_type.rast | 4 ++-- crates/syntax/test_data/parser/inline/ok/0081_for_type.rast | 10 +++++----- .../test_data/parser/inline/ok/0085_expr_literals.rast | 4 ++-- crates/syntax/test_data/parser/inline/ok/0109_label.rast | 6 +++--- .../inline/ok/0122_generic_lifetime_type_attribute.rast | 4 ++-- .../parser/inline/ok/0154_no_dyn_trait_leading_for.rast | 4 ++-- .../test_data/parser/inline/ok/0161_labeled_block.rast | 2 +- 20 files changed, 40 insertions(+), 40 deletions(-) (limited to 'crates/syntax/test_data/parser/inline') diff --git a/crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast b/crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast index 0adf2cd5a..97bb5059d 100644 --- a/crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast +++ b/crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast @@ -15,7 +15,7 @@ SOURCE_FILE@0..30 ERROR@16..22 LABEL@16..22 LIFETIME@16..21 - LIFETIME_IDENT@16..21 "\'loop" + LIFETIME_IDENT@16..21 "'loop" COLON@21..22 ":" WHITESPACE@22..23 " " IMPL@23..27 diff --git a/crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rast b/crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rast index 6cdfd058b..12f5040f9 100644 --- a/crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rast +++ b/crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rast @@ -23,7 +23,7 @@ SOURCE_FILE@0..54 L_ANGLE@30..31 "<" LIFETIME_PARAM@31..33 LIFETIME@31..33 - LIFETIME_IDENT@31..33 "\'a" + LIFETIME_IDENT@31..33 "'a" R_ANGLE@33..34 ">" WHITESPACE@34..35 " " PATH_TYPE@35..36 @@ -46,7 +46,7 @@ SOURCE_FILE@0..54 REF_TYPE@41..48 AMP@41..42 "&" LIFETIME@42..44 - LIFETIME_IDENT@42..44 "\'a" + LIFETIME_IDENT@42..44 "'a" WHITESPACE@44..45 " " PATH_TYPE@45..48 PATH@45..48 diff --git a/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast index f0d152d33..d4c8b9d67 100644 --- a/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast +++ b/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast @@ -55,7 +55,7 @@ SOURCE_FILE@0..128 SELF_PARAM@56..64 AMP@56..57 "&" LIFETIME@57..59 - LIFETIME_IDENT@57..59 "\'a" + LIFETIME_IDENT@57..59 "'a" WHITESPACE@59..60 " " NAME@60..64 SELF_KW@60..64 "self" @@ -76,7 +76,7 @@ SOURCE_FILE@0..128 SELF_PARAM@79..91 AMP@79..80 "&" LIFETIME@80..82 - LIFETIME_IDENT@80..82 "\'a" + LIFETIME_IDENT@80..82 "'a" WHITESPACE@82..83 " " MUT_KW@83..86 "mut" WHITESPACE@86..87 " " diff --git a/crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast b/crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast index 075b438d2..121c3966a 100644 --- a/crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast +++ b/crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..35 TYPE_BOUND_LIST@12..32 TYPE_BOUND@12..14 LIFETIME@12..14 - LIFETIME_IDENT@12..14 "\'a" + LIFETIME_IDENT@12..14 "'a" WHITESPACE@14..15 " " PLUS@15..16 "+" WHITESPACE@16..17 " " diff --git a/crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rast b/crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rast index b9e92b57a..b67ea2682 100644 --- a/crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rast +++ b/crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rast @@ -27,7 +27,7 @@ SOURCE_FILE@0..69 CONTINUE_KW@48..56 "continue" WHITESPACE@56..57 " " LIFETIME@57..59 - LIFETIME_IDENT@57..59 "\'l" + LIFETIME_IDENT@57..59 "'l" SEMICOLON@59..60 ";" WHITESPACE@60..65 "\n " R_CURLY@65..66 "}" diff --git a/crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast b/crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast index dad4362b7..b44f46f05 100644 --- a/crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast +++ b/crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast @@ -32,7 +32,7 @@ SOURCE_FILE@0..43 L_ANGLE@31..32 "<" LIFETIME_ARG@32..34 LIFETIME@32..34 - LIFETIME_IDENT@32..34 "\'a" + LIFETIME_IDENT@32..34 "'a" R_ANGLE@34..35 ">" R_ANGLE@35..36 ">" WHITESPACE@36..37 " " @@ -40,6 +40,6 @@ SOURCE_FILE@0..43 WHITESPACE@38..39 " " TYPE_BOUND@39..41 LIFETIME@39..41 - LIFETIME_IDENT@39..41 "\'a" + LIFETIME_IDENT@39..41 "'a" SEMICOLON@41..42 ";" WHITESPACE@42..43 "\n" diff --git a/crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rast b/crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rast index ac0299268..7cb288bf0 100644 --- a/crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rast +++ b/crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rast @@ -25,7 +25,7 @@ SOURCE_FILE@0..54 REF_TYPE@23..34 AMP@23..24 "&" LIFETIME@24..31 - LIFETIME_IDENT@24..31 "\'static" + LIFETIME_IDENT@24..31 "'static" WHITESPACE@31..32 " " TUPLE_TYPE@32..34 L_PAREN@32..33 "(" diff --git a/crates/syntax/test_data/parser/inline/ok/0034_break_expr.rast b/crates/syntax/test_data/parser/inline/ok/0034_break_expr.rast index 828013d45..783b25338 100644 --- a/crates/syntax/test_data/parser/inline/ok/0034_break_expr.rast +++ b/crates/syntax/test_data/parser/inline/ok/0034_break_expr.rast @@ -27,7 +27,7 @@ SOURCE_FILE@0..102 BREAK_KW@45..50 "break" WHITESPACE@50..51 " " LIFETIME@51..53 - LIFETIME_IDENT@51..53 "\'l" + LIFETIME_IDENT@51..53 "'l" SEMICOLON@53..54 ";" WHITESPACE@54..63 "\n " EXPR_STMT@63..72 @@ -43,7 +43,7 @@ SOURCE_FILE@0..102 BREAK_KW@81..86 "break" WHITESPACE@86..87 " " LIFETIME@87..89 - LIFETIME_IDENT@87..89 "\'l" + LIFETIME_IDENT@87..89 "'l" WHITESPACE@89..90 " " LITERAL@90..92 INT_NUMBER@90..92 "92" diff --git a/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast index 68c0f1c66..11efa23a4 100644 --- a/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast +++ b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast @@ -16,7 +16,7 @@ SOURCE_FILE@0..59 L_ANGLE@10..11 "<" LIFETIME_ARG@11..18 LIFETIME@11..18 - LIFETIME_IDENT@11..18 "\'static" + LIFETIME_IDENT@11..18 "'static" COMMA@18..19 "," WHITESPACE@19..20 " " TYPE_ARG@20..23 diff --git a/crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast b/crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast index b6f5a5689..abc258b33 100644 --- a/crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast +++ b/crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast @@ -34,7 +34,7 @@ SOURCE_FILE@0..35 L_ANGLE@24..25 "<" LIFETIME_ARG@25..27 LIFETIME@25..27 - LIFETIME_IDENT@25..27 "\'a" + LIFETIME_IDENT@25..27 "'a" R_ANGLE@27..28 ">" R_PAREN@28..29 ")" R_ANGLE@29..30 ">" diff --git a/crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast b/crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast index 7df6e190a..e1b88c5db 100644 --- a/crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast +++ b/crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast @@ -32,7 +32,7 @@ SOURCE_FILE@0..58 WHITESPACE@19..20 " " TYPE_BOUND@20..22 LIFETIME@20..22 - LIFETIME_IDENT@20..22 "\'f" + LIFETIME_IDENT@20..22 "'f" R_ANGLE@22..23 ">" WHITESPACE@23..24 " " BLOCK_EXPR@24..26 @@ -74,7 +74,7 @@ SOURCE_FILE@0..58 WHITESPACE@50..51 " " TYPE_BOUND@51..53 LIFETIME@51..53 - LIFETIME_IDENT@51..53 "\'f" + LIFETIME_IDENT@51..53 "'f" R_ANGLE@53..54 ">" WHITESPACE@54..55 " " BLOCK_EXPR@55..57 diff --git a/crates/syntax/test_data/parser/inline/ok/0055_literal_pattern.rast b/crates/syntax/test_data/parser/inline/ok/0055_literal_pattern.rast index 68bb43852..acf18fc2b 100644 --- a/crates/syntax/test_data/parser/inline/ok/0055_literal_pattern.rast +++ b/crates/syntax/test_data/parser/inline/ok/0055_literal_pattern.rast @@ -49,7 +49,7 @@ SOURCE_FILE@0..113 MATCH_ARM@71..80 LITERAL_PAT@71..74 LITERAL@71..74 - CHAR@71..74 "\'c\'" + CHAR@71..74 "'c'" WHITESPACE@74..75 " " FAT_ARROW@75..77 "=>" WHITESPACE@77..78 " " diff --git a/crates/syntax/test_data/parser/inline/ok/0056_where_clause.rast b/crates/syntax/test_data/parser/inline/ok/0056_where_clause.rast index 61dea413d..d42a7e295 100644 --- a/crates/syntax/test_data/parser/inline/ok/0056_where_clause.rast +++ b/crates/syntax/test_data/parser/inline/ok/0056_where_clause.rast @@ -13,19 +13,19 @@ SOURCE_FILE@0..116 WHITESPACE@14..18 "\n " WHERE_PRED@18..29 LIFETIME@18..20 - LIFETIME_IDENT@18..20 "\'a" + LIFETIME_IDENT@18..20 "'a" COLON@20..21 ":" WHITESPACE@21..22 " " TYPE_BOUND_LIST@22..29 TYPE_BOUND@22..24 LIFETIME@22..24 - LIFETIME_IDENT@22..24 "\'b" + LIFETIME_IDENT@22..24 "'b" WHITESPACE@24..25 " " PLUS@25..26 "+" WHITESPACE@26..27 " " TYPE_BOUND@27..29 LIFETIME@27..29 - LIFETIME_IDENT@27..29 "\'c" + LIFETIME_IDENT@27..29 "'c" COMMA@29..30 "," WHITESPACE@30..34 "\n " WHERE_PRED@34..59 @@ -57,7 +57,7 @@ SOURCE_FILE@0..116 WHITESPACE@51..52 " " TYPE_BOUND@52..59 LIFETIME@52..59 - LIFETIME_IDENT@52..59 "\'static" + LIFETIME_IDENT@52..59 "'static" COMMA@59..60 "," WHITESPACE@60..64 "\n " WHERE_PRED@64..82 @@ -76,7 +76,7 @@ SOURCE_FILE@0..116 TYPE_BOUND_LIST@80..82 TYPE_BOUND@80..82 LIFETIME@80..82 - LIFETIME_IDENT@80..82 "\'a" + LIFETIME_IDENT@80..82 "'a" COMMA@82..83 "," WHITESPACE@83..87 "\n " WHERE_PRED@87..112 @@ -108,7 +108,7 @@ SOURCE_FILE@0..116 TYPE_BOUND_LIST@110..112 TYPE_BOUND@110..112 LIFETIME@110..112 - LIFETIME_IDENT@110..112 "\'a" + LIFETIME_IDENT@110..112 "'a" WHITESPACE@112..113 "\n" BLOCK_EXPR@113..115 L_CURLY@113..114 "{" diff --git a/crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast b/crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast index 49d26cef4..8f76177d1 100644 --- a/crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast +++ b/crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast @@ -32,7 +32,7 @@ SOURCE_FILE@0..42 L_ANGLE@30..31 "<" LIFETIME_ARG@31..33 LIFETIME@31..33 - LIFETIME_IDENT@31..33 "\'a" + LIFETIME_IDENT@31..33 "'a" R_ANGLE@33..34 ">" R_ANGLE@34..35 ">" WHITESPACE@35..36 " " @@ -40,6 +40,6 @@ SOURCE_FILE@0..42 WHITESPACE@37..38 " " TYPE_BOUND@38..40 LIFETIME@38..40 - LIFETIME_IDENT@38..40 "\'a" + LIFETIME_IDENT@38..40 "'a" SEMICOLON@40..41 ";" WHITESPACE@41..42 "\n" diff --git a/crates/syntax/test_data/parser/inline/ok/0081_for_type.rast b/crates/syntax/test_data/parser/inline/ok/0081_for_type.rast index 8c909b5af..7958e32e5 100644 --- a/crates/syntax/test_data/parser/inline/ok/0081_for_type.rast +++ b/crates/syntax/test_data/parser/inline/ok/0081_for_type.rast @@ -13,7 +13,7 @@ SOURCE_FILE@0..121 L_ANGLE@12..13 "<" LIFETIME_PARAM@13..15 LIFETIME@13..15 - LIFETIME_IDENT@13..15 "\'a" + LIFETIME_IDENT@13..15 "'a" R_ANGLE@15..16 ">" WHITESPACE@16..17 " " FN_PTR_TYPE@17..27 @@ -44,7 +44,7 @@ SOURCE_FILE@0..121 L_ANGLE@41..42 "<" LIFETIME_PARAM@42..44 LIFETIME@42..44 - LIFETIME_IDENT@42..44 "\'a" + LIFETIME_IDENT@42..44 "'a" R_ANGLE@44..45 ">" WHITESPACE@45..46 " " FN_PTR_TYPE@46..80 @@ -62,7 +62,7 @@ SOURCE_FILE@0..121 REF_TYPE@67..73 AMP@67..68 "&" LIFETIME@68..70 - LIFETIME_IDENT@68..70 "\'a" + LIFETIME_IDENT@68..70 "'a" WHITESPACE@70..71 " " TUPLE_TYPE@71..73 L_PAREN@71..72 "(" @@ -91,7 +91,7 @@ SOURCE_FILE@0..121 L_ANGLE@96..97 "<" LIFETIME_PARAM@97..99 LIFETIME@97..99 - LIFETIME_IDENT@97..99 "\'a" + LIFETIME_IDENT@97..99 "'a" R_ANGLE@99..100 ">" WHITESPACE@100..101 " " PATH_TYPE@101..119 @@ -105,7 +105,7 @@ SOURCE_FILE@0..121 REF_TYPE@111..118 AMP@111..112 "&" LIFETIME@112..114 - LIFETIME_IDENT@112..114 "\'a" + LIFETIME_IDENT@112..114 "'a" WHITESPACE@114..115 " " PATH_TYPE@115..118 PATH@115..118 diff --git a/crates/syntax/test_data/parser/inline/ok/0085_expr_literals.rast b/crates/syntax/test_data/parser/inline/ok/0085_expr_literals.rast index ae838105d..f784e96e0 100644 --- a/crates/syntax/test_data/parser/inline/ok/0085_expr_literals.rast +++ b/crates/syntax/test_data/parser/inline/ok/0085_expr_literals.rast @@ -68,7 +68,7 @@ SOURCE_FILE@0..189 EQ@90..91 "=" WHITESPACE@91..92 " " LITERAL@92..96 - BYTE@92..96 "b\'a\'" + BYTE@92..96 "b'a'" SEMICOLON@96..97 ";" WHITESPACE@97..102 "\n " LET_STMT@102..114 @@ -80,7 +80,7 @@ SOURCE_FILE@0..189 EQ@108..109 "=" WHITESPACE@109..110 " " LITERAL@110..113 - CHAR@110..113 "\'b\'" + CHAR@110..113 "'b'" SEMICOLON@113..114 ";" WHITESPACE@114..119 "\n " LET_STMT@119..131 diff --git a/crates/syntax/test_data/parser/inline/ok/0109_label.rast b/crates/syntax/test_data/parser/inline/ok/0109_label.rast index 860dfe608..8540b8520 100644 --- a/crates/syntax/test_data/parser/inline/ok/0109_label.rast +++ b/crates/syntax/test_data/parser/inline/ok/0109_label.rast @@ -15,7 +15,7 @@ SOURCE_FILE@0..74 LOOP_EXPR@15..26 LABEL@15..18 LIFETIME@15..17 - LIFETIME_IDENT@15..17 "\'a" + LIFETIME_IDENT@15..17 "'a" COLON@17..18 ":" WHITESPACE@18..19 " " LOOP_KW@19..23 "loop" @@ -28,7 +28,7 @@ SOURCE_FILE@0..74 WHILE_EXPR@31..48 LABEL@31..34 LIFETIME@31..33 - LIFETIME_IDENT@31..33 "\'b" + LIFETIME_IDENT@31..33 "'b" COLON@33..34 ":" WHITESPACE@34..35 " " WHILE_KW@35..40 "while" @@ -44,7 +44,7 @@ SOURCE_FILE@0..74 FOR_EXPR@53..71 LABEL@53..56 LIFETIME@53..55 - LIFETIME_IDENT@53..55 "\'c" + LIFETIME_IDENT@53..55 "'c" COLON@55..56 ":" WHITESPACE@56..57 " " FOR_KW@57..60 "for" diff --git a/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast b/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast index 840181383..5682bd28c 100644 --- a/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast +++ b/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast @@ -22,7 +22,7 @@ SOURCE_FILE@0..64 R_BRACK@25..26 "]" WHITESPACE@26..27 " " LIFETIME@27..29 - LIFETIME_IDENT@27..29 "\'a" + LIFETIME_IDENT@27..29 "'a" COMMA@29..30 "," WHITESPACE@30..31 " " TYPE_PARAM@31..48 @@ -53,7 +53,7 @@ SOURCE_FILE@0..64 REF_TYPE@53..58 AMP@53..54 "&" LIFETIME@54..56 - LIFETIME_IDENT@54..56 "\'a" + LIFETIME_IDENT@54..56 "'a" WHITESPACE@56..57 " " PATH_TYPE@57..58 PATH@57..58 diff --git a/crates/syntax/test_data/parser/inline/ok/0154_no_dyn_trait_leading_for.rast b/crates/syntax/test_data/parser/inline/ok/0154_no_dyn_trait_leading_for.rast index edfcb288c..860684b29 100644 --- a/crates/syntax/test_data/parser/inline/ok/0154_no_dyn_trait_leading_for.rast +++ b/crates/syntax/test_data/parser/inline/ok/0154_no_dyn_trait_leading_for.rast @@ -16,7 +16,7 @@ SOURCE_FILE@0..34 L_ANGLE@12..13 "<" LIFETIME_PARAM@13..15 LIFETIME@13..15 - LIFETIME_IDENT@13..15 "\'a" + LIFETIME_IDENT@13..15 "'a" R_ANGLE@15..16 ">" WHITESPACE@16..17 " " PATH_TYPE@17..25 @@ -28,7 +28,7 @@ SOURCE_FILE@0..34 L_ANGLE@21..22 "<" LIFETIME_ARG@22..24 LIFETIME@22..24 - LIFETIME_IDENT@22..24 "\'a" + LIFETIME_IDENT@22..24 "'a" R_ANGLE@24..25 ">" WHITESPACE@25..26 " " PLUS@26..27 "+" diff --git a/crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rast b/crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rast index c2dea1cc1..47e8859ed 100644 --- a/crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rast +++ b/crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rast @@ -15,7 +15,7 @@ SOURCE_FILE@0..23 EFFECT_EXPR@9..19 LABEL@9..16 LIFETIME@9..15 - LIFETIME_IDENT@9..15 "\'label" + LIFETIME_IDENT@9..15 "'label" COLON@15..16 ":" WHITESPACE@16..17 " " BLOCK_EXPR@17..19 -- cgit v1.2.3