From dd496223f50232fe98312ee8edc89eb4b5ee3d85 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Tue, 15 Dec 2020 19:23:51 +0100 Subject: Node-ify lifetimes --- .../parser/err/0024_many_type_parens.rast | 22 +++++++---- .../parser/err/0027_incomplere_where_for.rast | 3 +- .../test_data/parser/err/0043_weird_blocks.rast | 3 +- .../parser/err/0044_unexpected_for_type.rast | 45 ++++++++++++++-------- .../parser/err/0046_ambiguous_trait_object.rast | 9 +++-- 5 files changed, 54 insertions(+), 28 deletions(-) (limited to 'crates/syntax/test_data/parser/err') diff --git a/crates/syntax/test_data/parser/err/0024_many_type_parens.rast b/crates/syntax/test_data/parser/err/0024_many_type_parens.rast index e3be6b22e..4c4ddf5ec 100644 --- a/crates/syntax/test_data/parser/err/0024_many_type_parens.rast +++ b/crates/syntax/test_data/parser/err/0024_many_type_parens.rast @@ -42,7 +42,8 @@ SOURCE_FILE@0..240 GENERIC_PARAM_LIST@32..36 L_ANGLE@32..33 "<" LIFETIME_PARAM@33..35 - LIFETIME@33..35 "\'a" + LIFETIME@33..35 + LIFETIME_IDENT@33..35 "\'a" R_ANGLE@35..36 ">" WHITESPACE@36..37 " " PATH_TYPE@37..46 @@ -53,7 +54,8 @@ SOURCE_FILE@0..240 GENERIC_ARG_LIST@42..46 L_ANGLE@42..43 "<" LIFETIME_ARG@43..45 - LIFETIME@43..45 "\'a" + LIFETIME@43..45 + LIFETIME_IDENT@43..45 "\'a" R_ANGLE@45..46 ">" R_PAREN@46..47 ")" R_ANGLE@47..48 ">" @@ -125,7 +127,8 @@ SOURCE_FILE@0..240 GENERIC_PARAM_LIST@106..110 L_ANGLE@106..107 "<" LIFETIME_PARAM@107..109 - LIFETIME@107..109 "\'a" + LIFETIME@107..109 + LIFETIME_IDENT@107..109 "\'a" R_ANGLE@109..110 ">" WHITESPACE@110..111 " " PATH_TYPE@111..120 @@ -136,7 +139,8 @@ SOURCE_FILE@0..240 GENERIC_ARG_LIST@116..120 L_ANGLE@116..117 "<" LIFETIME_ARG@117..119 - LIFETIME@117..119 "\'a" + LIFETIME@117..119 + LIFETIME_IDENT@117..119 "\'a" R_ANGLE@119..120 ">" R_PAREN@120..121 ")" EXPR_STMT@121..123 @@ -187,7 +191,7 @@ SOURCE_FILE@0..240 PATH_SEGMENT@154..158 L_ANGLE@154..155 "<" ERROR@155..157 - LIFETIME@155..157 "\'a" + LIFETIME_IDENT@155..157 "\'a" R_ANGLE@157..158 ">" WHITESPACE@158..159 " " BIN_EXPR@159..180 @@ -201,7 +205,7 @@ SOURCE_FILE@0..240 IDENT@159..164 "Trait" L_ANGLE@164..165 "<" ERROR@165..167 - LIFETIME@165..167 "\'a" + LIFETIME_IDENT@165..167 "\'a" R_ANGLE@167..168 ">" ERROR@168..169 R_PAREN@168..169 ")" @@ -245,7 +249,8 @@ SOURCE_FILE@0..240 GENERIC_PARAM_LIST@200..204 L_ANGLE@200..201 "<" LIFETIME_PARAM@201..203 - LIFETIME@201..203 "\'a" + LIFETIME@201..203 + LIFETIME_IDENT@201..203 "\'a" R_ANGLE@203..204 ">" WHITESPACE@204..205 " " PATH_TYPE@205..214 @@ -256,7 +261,8 @@ SOURCE_FILE@0..240 GENERIC_ARG_LIST@210..214 L_ANGLE@210..211 "<" LIFETIME_ARG@211..213 - LIFETIME@211..213 "\'a" + LIFETIME@211..213 + LIFETIME_IDENT@211..213 "\'a" R_ANGLE@213..214 ">" R_PAREN@214..215 ")" WHITESPACE@215..216 " " diff --git a/crates/syntax/test_data/parser/err/0027_incomplere_where_for.rast b/crates/syntax/test_data/parser/err/0027_incomplere_where_for.rast index a8e42e6ea..c5215d6b1 100644 --- a/crates/syntax/test_data/parser/err/0027_incomplere_where_for.rast +++ b/crates/syntax/test_data/parser/err/0027_incomplere_where_for.rast @@ -16,7 +16,8 @@ SOURCE_FILE@0..30 GENERIC_PARAM_LIST@22..26 L_ANGLE@22..23 "<" LIFETIME_PARAM@23..25 - LIFETIME@23..25 "\'a" + LIFETIME@23..25 + LIFETIME_IDENT@23..25 "\'a" R_ANGLE@25..26 ">" WHITESPACE@26..27 "\n" BLOCK_EXPR@27..29 diff --git a/crates/syntax/test_data/parser/err/0043_weird_blocks.rast b/crates/syntax/test_data/parser/err/0043_weird_blocks.rast index df29017e7..e73bd1aea 100644 --- a/crates/syntax/test_data/parser/err/0043_weird_blocks.rast +++ b/crates/syntax/test_data/parser/err/0043_weird_blocks.rast @@ -54,7 +54,8 @@ SOURCE_FILE@0..83 EXPR_STMT@68..75 ERROR@68..75 LABEL@68..75 - LIFETIME@68..74 "\'label" + LIFETIME@68..74 + LIFETIME_IDENT@68..74 "\'label" COLON@74..75 ":" WHITESPACE@75..76 " " LITERAL@76..78 diff --git a/crates/syntax/test_data/parser/err/0044_unexpected_for_type.rast b/crates/syntax/test_data/parser/err/0044_unexpected_for_type.rast index 71aa86494..cc54185e5 100644 --- a/crates/syntax/test_data/parser/err/0044_unexpected_for_type.rast +++ b/crates/syntax/test_data/parser/err/0044_unexpected_for_type.rast @@ -12,12 +12,14 @@ SOURCE_FILE@0..239 GENERIC_PARAM_LIST@17..21 L_ANGLE@17..18 "<" LIFETIME_PARAM@18..20 - LIFETIME@18..20 "\'a" + LIFETIME@18..20 + LIFETIME_IDENT@18..20 "\'a" R_ANGLE@20..21 ">" WHITESPACE@21..22 " " REF_TYPE@22..29 AMP@22..23 "&" - LIFETIME@23..25 "\'a" + LIFETIME@23..25 + LIFETIME_IDENT@23..25 "\'a" WHITESPACE@25..26 " " PATH_TYPE@26..29 PATH@26..29 @@ -39,14 +41,16 @@ SOURCE_FILE@0..239 GENERIC_PARAM_LIST@48..52 L_ANGLE@48..49 "<" LIFETIME_PARAM@49..51 - LIFETIME@49..51 "\'a" + LIFETIME@49..51 + LIFETIME_IDENT@49..51 "\'a" R_ANGLE@51..52 ">" WHITESPACE@52..53 " " TUPLE_TYPE@53..63 L_PAREN@53..54 "(" REF_TYPE@54..61 AMP@54..55 "&" - LIFETIME@55..57 "\'a" + LIFETIME@55..57 + LIFETIME_IDENT@55..57 "\'a" WHITESPACE@57..58 " " PATH_TYPE@58..61 PATH@58..61 @@ -70,7 +74,8 @@ SOURCE_FILE@0..239 GENERIC_PARAM_LIST@84..88 L_ANGLE@84..85 "<" LIFETIME_PARAM@85..87 - LIFETIME@85..87 "\'a" + LIFETIME@85..87 + LIFETIME_IDENT@85..87 "\'a" R_ANGLE@87..88 ">" WHITESPACE@88..89 " " SLICE_TYPE@89..94 @@ -96,7 +101,8 @@ SOURCE_FILE@0..239 GENERIC_PARAM_LIST@115..119 L_ANGLE@115..116 "<" LIFETIME_PARAM@116..118 - LIFETIME@116..118 "\'a" + LIFETIME@116..118 + LIFETIME_IDENT@116..118 "\'a" R_ANGLE@118..119 ">" WHITESPACE@119..120 " " FOR_TYPE@120..148 @@ -104,7 +110,8 @@ SOURCE_FILE@0..239 GENERIC_PARAM_LIST@123..127 L_ANGLE@123..124 "<" LIFETIME_PARAM@124..126 - LIFETIME@124..126 "\'b" + LIFETIME@124..126 + LIFETIME_IDENT@124..126 "\'b" R_ANGLE@126..127 ">" WHITESPACE@127..128 " " FN_PTR_TYPE@128..148 @@ -114,7 +121,8 @@ SOURCE_FILE@0..239 PARAM@131..138 REF_TYPE@131..138 AMP@131..132 "&" - LIFETIME@132..134 "\'a" + LIFETIME@132..134 + LIFETIME_IDENT@132..134 "\'a" WHITESPACE@134..135 " " PATH_TYPE@135..138 PATH@135..138 @@ -126,7 +134,8 @@ SOURCE_FILE@0..239 PARAM@140..147 REF_TYPE@140..147 AMP@140..141 "&" - LIFETIME@141..143 "\'b" + LIFETIME@141..143 + LIFETIME_IDENT@141..143 "\'b" WHITESPACE@143..144 " " PATH_TYPE@144..147 PATH@144..147 @@ -159,7 +168,8 @@ SOURCE_FILE@0..239 GENERIC_PARAM_LIST@183..187 L_ANGLE@183..184 "<" LIFETIME_PARAM@184..186 - LIFETIME@184..186 "\'a" + LIFETIME@184..186 + LIFETIME_IDENT@184..186 "\'a" R_ANGLE@186..187 ">" WHITESPACE@187..188 " " FOR_TYPE@188..227 @@ -167,7 +177,8 @@ SOURCE_FILE@0..239 GENERIC_PARAM_LIST@191..195 L_ANGLE@191..192 "<" LIFETIME_PARAM@192..194 - LIFETIME@192..194 "\'b" + LIFETIME@192..194 + LIFETIME_IDENT@192..194 "\'b" R_ANGLE@194..195 ">" WHITESPACE@195..196 " " FOR_TYPE@196..227 @@ -175,7 +186,8 @@ SOURCE_FILE@0..239 GENERIC_PARAM_LIST@199..203 L_ANGLE@199..200 "<" LIFETIME_PARAM@200..202 - LIFETIME@200..202 "\'c" + LIFETIME@200..202 + LIFETIME_IDENT@200..202 "\'c" R_ANGLE@202..203 ">" WHITESPACE@203..204 " " FN_PTR_TYPE@204..227 @@ -185,7 +197,8 @@ SOURCE_FILE@0..239 PARAM@207..212 REF_TYPE@207..212 AMP@207..208 "&" - LIFETIME@208..210 "\'a" + LIFETIME@208..210 + LIFETIME_IDENT@208..210 "\'a" WHITESPACE@210..211 " " PATH_TYPE@211..212 PATH@211..212 @@ -197,7 +210,8 @@ SOURCE_FILE@0..239 PARAM@214..219 REF_TYPE@214..219 AMP@214..215 "&" - LIFETIME@215..217 "\'b" + LIFETIME@215..217 + LIFETIME_IDENT@215..217 "\'b" WHITESPACE@217..218 " " PATH_TYPE@218..219 PATH@218..219 @@ -209,7 +223,8 @@ SOURCE_FILE@0..239 PARAM@221..226 REF_TYPE@221..226 AMP@221..222 "&" - LIFETIME@222..224 "\'c" + LIFETIME@222..224 + LIFETIME_IDENT@222..224 "\'c" WHITESPACE@224..225 " " PATH_TYPE@225..226 PATH@225..226 diff --git a/crates/syntax/test_data/parser/err/0046_ambiguous_trait_object.rast b/crates/syntax/test_data/parser/err/0046_ambiguous_trait_object.rast index 592741cdb..7049f4734 100644 --- a/crates/syntax/test_data/parser/err/0046_ambiguous_trait_object.rast +++ b/crates/syntax/test_data/parser/err/0046_ambiguous_trait_object.rast @@ -7,14 +7,16 @@ SOURCE_FILE@0..187 GENERIC_PARAM_LIST@8..12 L_ANGLE@8..9 "<" LIFETIME_PARAM@9..11 - LIFETIME@9..11 "\'a" + LIFETIME@9..11 + LIFETIME_IDENT@9..11 "\'a" R_ANGLE@11..12 ">" WHITESPACE@12..13 " " EQ@13..14 "=" WHITESPACE@14..15 " " REF_TYPE@15..34 AMP@15..16 "&" - LIFETIME@16..18 "\'a" + LIFETIME@16..18 + LIFETIME_IDENT@16..18 "\'a" WHITESPACE@18..19 " " DYN_TRAIT_TYPE@19..34 DYN_KW@19..22 "dyn" @@ -101,7 +103,8 @@ SOURCE_FILE@0..187 PLUS@99..100 "+" WHITESPACE@100..101 " " TYPE_BOUND@101..108 - LIFETIME@101..108 "\'static" + LIFETIME@101..108 + LIFETIME_IDENT@101..108 "\'static" SEMICOLON@108..109 ";" WHITESPACE@109..110 "\n" FN@110..186 -- cgit v1.2.3