From 1d6eef1350ee0793fcd2a0eb191cdb127b76a49d Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Fri, 11 Jun 2021 18:12:51 +0200 Subject: Update ungrammar --- .../test_data/parser/ok/0006_inner_attributes.rast | 258 +++++++++++---------- .../syntax/test_data/parser/ok/0008_mod_item.rast | 9 +- .../test_data/parser/ok/0011_outer_attribute.rast | 45 ++-- .../parser/ok/0017_attr_trailing_comma.rast | 19 +- .../test_data/parser/ok/0035_weird_exprs.rast | 87 +++---- .../syntax/test_data/parser/ok/0044_let_attrs.rast | 25 +- .../test_data/parser/ok/0045_block_attrs.rast | 102 ++++---- .../parser/ok/0046_extern_inner_attributes.rast | 17 +- .../test_data/parser/ok/0051_parameter_attrs.rast | 135 ++++++----- .../ok/0053_outer_attribute_on_macro_rules.rast | 9 +- .../syntax/test_data/parser/ok/0062_macro_2.0.rast | 9 +- .../test_data/parser/ok/0063_variadic_fun.rast | 17 +- 12 files changed, 389 insertions(+), 343 deletions(-) (limited to 'crates/syntax/test_data/parser/ok') diff --git a/crates/syntax/test_data/parser/ok/0006_inner_attributes.rast b/crates/syntax/test_data/parser/ok/0006_inner_attributes.rast index 42587243a..be2d1dc12 100644 --- a/crates/syntax/test_data/parser/ok/0006_inner_attributes.rast +++ b/crates/syntax/test_data/parser/ok/0006_inner_attributes.rast @@ -3,182 +3,192 @@ SOURCE_FILE@0..236 POUND@0..1 "#" BANG@1..2 "!" L_BRACK@2..3 "[" - PATH@3..7 - PATH_SEGMENT@3..7 - NAME_REF@3..7 - IDENT@3..7 "attr" + META@3..7 + PATH@3..7 + PATH_SEGMENT@3..7 + NAME_REF@3..7 + IDENT@3..7 "attr" R_BRACK@7..8 "]" WHITESPACE@8..9 "\n" ATTR@9..23 POUND@9..10 "#" BANG@10..11 "!" L_BRACK@11..12 "[" - PATH@12..16 - PATH_SEGMENT@12..16 - NAME_REF@12..16 - IDENT@12..16 "attr" - TOKEN_TREE@16..22 - L_PAREN@16..17 "(" - TRUE_KW@17..21 "true" - R_PAREN@21..22 ")" + META@12..22 + PATH@12..16 + PATH_SEGMENT@12..16 + NAME_REF@12..16 + IDENT@12..16 "attr" + TOKEN_TREE@16..22 + L_PAREN@16..17 "(" + TRUE_KW@17..21 "true" + R_PAREN@21..22 ")" R_BRACK@22..23 "]" WHITESPACE@23..24 "\n" ATTR@24..39 POUND@24..25 "#" BANG@25..26 "!" L_BRACK@26..27 "[" - PATH@27..31 - PATH_SEGMENT@27..31 - NAME_REF@27..31 - IDENT@27..31 "attr" - TOKEN_TREE@31..38 - L_PAREN@31..32 "(" - IDENT@32..37 "ident" - R_PAREN@37..38 ")" + META@27..38 + PATH@27..31 + PATH_SEGMENT@27..31 + NAME_REF@27..31 + IDENT@27..31 "attr" + TOKEN_TREE@31..38 + L_PAREN@31..32 "(" + IDENT@32..37 "ident" + R_PAREN@37..38 ")" R_BRACK@38..39 "]" WHITESPACE@39..40 "\n" ATTR@40..116 POUND@40..41 "#" BANG@41..42 "!" L_BRACK@42..43 "[" - PATH@43..47 - PATH_SEGMENT@43..47 - NAME_REF@43..47 - IDENT@43..47 "attr" - TOKEN_TREE@47..115 - L_PAREN@47..48 "(" - IDENT@48..53 "ident" - COMMA@53..54 "," - WHITESPACE@54..55 " " - INT_NUMBER@55..58 "100" - COMMA@58..59 "," - WHITESPACE@59..60 " " - TRUE_KW@60..64 "true" - COMMA@64..65 "," - WHITESPACE@65..66 " " - STRING@66..72 "\"true\"" - COMMA@72..73 "," - WHITESPACE@73..74 " " - IDENT@74..79 "ident" - WHITESPACE@79..80 " " - EQ@80..81 "=" - WHITESPACE@81..82 " " - INT_NUMBER@82..85 "100" - COMMA@85..86 "," - WHITESPACE@86..87 " " - IDENT@87..92 "ident" - WHITESPACE@92..93 " " - EQ@93..94 "=" - WHITESPACE@94..95 " " - STRING@95..102 "\"hello\"" - COMMA@102..103 "," - WHITESPACE@103..104 " " - IDENT@104..109 "ident" - TOKEN_TREE@109..114 - L_PAREN@109..110 "(" - INT_NUMBER@110..113 "100" - R_PAREN@113..114 ")" - R_PAREN@114..115 ")" + META@43..115 + PATH@43..47 + PATH_SEGMENT@43..47 + NAME_REF@43..47 + IDENT@43..47 "attr" + TOKEN_TREE@47..115 + L_PAREN@47..48 "(" + IDENT@48..53 "ident" + COMMA@53..54 "," + WHITESPACE@54..55 " " + INT_NUMBER@55..58 "100" + COMMA@58..59 "," + WHITESPACE@59..60 " " + TRUE_KW@60..64 "true" + COMMA@64..65 "," + WHITESPACE@65..66 " " + STRING@66..72 "\"true\"" + COMMA@72..73 "," + WHITESPACE@73..74 " " + IDENT@74..79 "ident" + WHITESPACE@79..80 " " + EQ@80..81 "=" + WHITESPACE@81..82 " " + INT_NUMBER@82..85 "100" + COMMA@85..86 "," + WHITESPACE@86..87 " " + IDENT@87..92 "ident" + WHITESPACE@92..93 " " + EQ@93..94 "=" + WHITESPACE@94..95 " " + STRING@95..102 "\"hello\"" + COMMA@102..103 "," + WHITESPACE@103..104 " " + IDENT@104..109 "ident" + TOKEN_TREE@109..114 + L_PAREN@109..110 "(" + INT_NUMBER@110..113 "100" + R_PAREN@113..114 ")" + R_PAREN@114..115 ")" R_BRACK@115..116 "]" WHITESPACE@116..117 "\n" ATTR@117..130 POUND@117..118 "#" BANG@118..119 "!" L_BRACK@119..120 "[" - PATH@120..124 - PATH_SEGMENT@120..124 - NAME_REF@120..124 - IDENT@120..124 "attr" - TOKEN_TREE@124..129 - L_PAREN@124..125 "(" - INT_NUMBER@125..128 "100" - R_PAREN@128..129 ")" + META@120..129 + PATH@120..124 + PATH_SEGMENT@120..124 + NAME_REF@120..124 + IDENT@120..124 "attr" + TOKEN_TREE@124..129 + L_PAREN@124..125 "(" + INT_NUMBER@125..128 "100" + R_PAREN@128..129 ")" R_BRACK@129..130 "]" WHITESPACE@130..131 "\n" ATTR@131..155 POUND@131..132 "#" BANG@132..133 "!" L_BRACK@133..134 "[" - PATH@134..138 - PATH_SEGMENT@134..138 - NAME_REF@134..138 - IDENT@134..138 "attr" - TOKEN_TREE@138..154 - L_PAREN@138..139 "(" - IDENT@139..146 "enabled" - WHITESPACE@146..147 " " - EQ@147..148 "=" - WHITESPACE@148..149 " " - TRUE_KW@149..153 "true" - R_PAREN@153..154 ")" + META@134..154 + PATH@134..138 + PATH_SEGMENT@134..138 + NAME_REF@134..138 + IDENT@134..138 "attr" + TOKEN_TREE@138..154 + L_PAREN@138..139 "(" + IDENT@139..146 "enabled" + WHITESPACE@146..147 " " + EQ@147..148 "=" + WHITESPACE@148..149 " " + TRUE_KW@149..153 "true" + R_PAREN@153..154 ")" R_BRACK@154..155 "]" WHITESPACE@155..156 "\n" ATTR@156..173 POUND@156..157 "#" BANG@157..158 "!" L_BRACK@158..159 "[" - PATH@159..166 - PATH_SEGMENT@159..166 - NAME_REF@159..166 - IDENT@159..166 "enabled" - TOKEN_TREE@166..172 - L_PAREN@166..167 "(" - TRUE_KW@167..171 "true" - R_PAREN@171..172 ")" + META@159..172 + PATH@159..166 + PATH_SEGMENT@159..166 + NAME_REF@159..166 + IDENT@159..166 "enabled" + TOKEN_TREE@166..172 + L_PAREN@166..167 "(" + TRUE_KW@167..171 "true" + R_PAREN@171..172 ")" R_BRACK@172..173 "]" WHITESPACE@173..174 "\n" ATTR@174..191 POUND@174..175 "#" BANG@175..176 "!" L_BRACK@176..177 "[" - PATH@177..181 - PATH_SEGMENT@177..181 - NAME_REF@177..181 - IDENT@177..181 "attr" - TOKEN_TREE@181..190 - L_PAREN@181..182 "(" - STRING@182..189 "\"hello\"" - R_PAREN@189..190 ")" + META@177..190 + PATH@177..181 + PATH_SEGMENT@177..181 + NAME_REF@177..181 + IDENT@177..181 "attr" + TOKEN_TREE@181..190 + L_PAREN@181..182 "(" + STRING@182..189 "\"hello\"" + R_PAREN@189..190 ")" R_BRACK@190..191 "]" WHITESPACE@191..192 "\n" ATTR@192..214 POUND@192..193 "#" BANG@193..194 "!" L_BRACK@194..195 "[" - PATH@195..199 - PATH_SEGMENT@195..199 - NAME_REF@195..199 - IDENT@195..199 "repr" - TOKEN_TREE@199..213 - L_PAREN@199..200 "(" - IDENT@200..201 "C" - COMMA@201..202 "," - WHITESPACE@202..203 " " - IDENT@203..208 "align" - WHITESPACE@208..209 " " - EQ@209..210 "=" - WHITESPACE@210..211 " " - INT_NUMBER@211..212 "4" - R_PAREN@212..213 ")" + META@195..213 + PATH@195..199 + PATH_SEGMENT@195..199 + NAME_REF@195..199 + IDENT@195..199 "repr" + TOKEN_TREE@199..213 + L_PAREN@199..200 "(" + IDENT@200..201 "C" + COMMA@201..202 "," + WHITESPACE@202..203 " " + IDENT@203..208 "align" + WHITESPACE@208..209 " " + EQ@209..210 "=" + WHITESPACE@210..211 " " + INT_NUMBER@211..212 "4" + R_PAREN@212..213 ")" R_BRACK@213..214 "]" WHITESPACE@214..215 "\n" ATTR@215..236 POUND@215..216 "#" BANG@216..217 "!" L_BRACK@217..218 "[" - PATH@218..222 - PATH_SEGMENT@218..222 - NAME_REF@218..222 - IDENT@218..222 "repr" - TOKEN_TREE@222..235 - L_PAREN@222..223 "(" - IDENT@223..224 "C" - COMMA@224..225 "," - WHITESPACE@225..226 " " - IDENT@226..231 "align" - TOKEN_TREE@231..234 - L_PAREN@231..232 "(" - INT_NUMBER@232..233 "4" - R_PAREN@233..234 ")" - R_PAREN@234..235 ")" + META@218..235 + PATH@218..222 + PATH_SEGMENT@218..222 + NAME_REF@218..222 + IDENT@218..222 "repr" + TOKEN_TREE@222..235 + L_PAREN@222..223 "(" + IDENT@223..224 "C" + COMMA@224..225 "," + WHITESPACE@225..226 " " + IDENT@226..231 "align" + TOKEN_TREE@231..234 + L_PAREN@231..232 "(" + INT_NUMBER@232..233 "4" + R_PAREN@233..234 ")" + R_PAREN@234..235 ")" R_BRACK@235..236 "]" diff --git a/crates/syntax/test_data/parser/ok/0008_mod_item.rast b/crates/syntax/test_data/parser/ok/0008_mod_item.rast index b2c1d791f..8b1e0a52d 100644 --- a/crates/syntax/test_data/parser/ok/0008_mod_item.rast +++ b/crates/syntax/test_data/parser/ok/0008_mod_item.rast @@ -65,10 +65,11 @@ SOURCE_FILE@0..118 POUND@79..80 "#" BANG@80..81 "!" L_BRACK@81..82 "[" - PATH@82..86 - PATH_SEGMENT@82..86 - NAME_REF@82..86 - IDENT@82..86 "attr" + META@82..86 + PATH@82..86 + PATH_SEGMENT@82..86 + NAME_REF@82..86 + IDENT@82..86 "attr" R_BRACK@86..87 "]" WHITESPACE@87..92 "\n " MODULE@92..98 diff --git a/crates/syntax/test_data/parser/ok/0011_outer_attribute.rast b/crates/syntax/test_data/parser/ok/0011_outer_attribute.rast index 478fdba75..ff5877a7b 100644 --- a/crates/syntax/test_data/parser/ok/0011_outer_attribute.rast +++ b/crates/syntax/test_data/parser/ok/0011_outer_attribute.rast @@ -3,23 +3,25 @@ SOURCE_FILE@0..60 ATTR@0..12 POUND@0..1 "#" L_BRACK@1..2 "[" - PATH@2..5 - PATH_SEGMENT@2..5 - NAME_REF@2..5 - IDENT@2..5 "cfg" - TOKEN_TREE@5..11 - L_PAREN@5..6 "(" - IDENT@6..10 "test" - R_PAREN@10..11 ")" + META@2..11 + PATH@2..5 + PATH_SEGMENT@2..5 + NAME_REF@2..5 + IDENT@2..5 "cfg" + TOKEN_TREE@5..11 + L_PAREN@5..6 "(" + IDENT@6..10 "test" + R_PAREN@10..11 ")" R_BRACK@11..12 "]" WHITESPACE@12..13 "\n" ATTR@13..22 POUND@13..14 "#" L_BRACK@14..15 "[" - PATH@15..21 - PATH_SEGMENT@15..21 - NAME_REF@15..21 - IDENT@15..21 "ignore" + META@15..21 + PATH@15..21 + PATH_SEGMENT@15..21 + NAME_REF@15..21 + IDENT@15..21 "ignore" R_BRACK@21..22 "]" WHITESPACE@22..23 "\n" FN_KW@23..25 "fn" @@ -38,15 +40,16 @@ SOURCE_FILE@0..60 ATTR@36..52 POUND@36..37 "#" L_BRACK@37..38 "[" - PATH@38..42 - PATH_SEGMENT@38..42 - NAME_REF@38..42 - IDENT@38..42 "path" - WHITESPACE@42..43 " " - EQ@43..44 "=" - WHITESPACE@44..45 " " - LITERAL@45..51 - STRING@45..51 "\"a.rs\"" + META@38..51 + PATH@38..42 + PATH_SEGMENT@38..42 + NAME_REF@38..42 + IDENT@38..42 "path" + WHITESPACE@42..43 " " + EQ@43..44 "=" + WHITESPACE@44..45 " " + LITERAL@45..51 + STRING@45..51 "\"a.rs\"" R_BRACK@51..52 "]" WHITESPACE@52..53 "\n" MOD_KW@53..56 "mod" diff --git a/crates/syntax/test_data/parser/ok/0017_attr_trailing_comma.rast b/crates/syntax/test_data/parser/ok/0017_attr_trailing_comma.rast index a3e091ad3..94791f771 100644 --- a/crates/syntax/test_data/parser/ok/0017_attr_trailing_comma.rast +++ b/crates/syntax/test_data/parser/ok/0017_attr_trailing_comma.rast @@ -3,15 +3,16 @@ SOURCE_FILE@0..23 ATTR@0..10 POUND@0..1 "#" L_BRACK@1..2 "[" - PATH@2..5 - PATH_SEGMENT@2..5 - NAME_REF@2..5 - IDENT@2..5 "foo" - TOKEN_TREE@5..9 - L_PAREN@5..6 "(" - IDENT@6..7 "a" - COMMA@7..8 "," - R_PAREN@8..9 ")" + META@2..9 + PATH@2..5 + PATH_SEGMENT@2..5 + NAME_REF@2..5 + IDENT@2..5 "foo" + TOKEN_TREE@5..9 + L_PAREN@5..6 "(" + IDENT@6..7 "a" + COMMA@7..8 "," + R_PAREN@8..9 ")" R_BRACK@9..10 "]" WHITESPACE@10..11 "\n" FN_KW@11..13 "fn" diff --git a/crates/syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/syntax/test_data/parser/ok/0035_weird_exprs.rast index 46b192dc1..20675dbf5 100644 --- a/crates/syntax/test_data/parser/ok/0035_weird_exprs.rast +++ b/crates/syntax/test_data/parser/ok/0035_weird_exprs.rast @@ -11,71 +11,76 @@ SOURCE_FILE@0..3813 POUND@271..272 "#" BANG@272..273 "!" L_BRACK@273..274 "[" - PATH@274..279 - PATH_SEGMENT@274..279 - NAME_REF@274..279 - IDENT@274..279 "allow" - TOKEN_TREE@279..301 - L_PAREN@279..280 "(" - IDENT@280..300 "non_camel_case_types" - R_PAREN@300..301 ")" + META@274..301 + PATH@274..279 + PATH_SEGMENT@274..279 + NAME_REF@274..279 + IDENT@274..279 "allow" + TOKEN_TREE@279..301 + L_PAREN@279..280 "(" + IDENT@280..300 "non_camel_case_types" + R_PAREN@300..301 ")" R_BRACK@301..302 "]" WHITESPACE@302..303 "\n" ATTR@303..323 POUND@303..304 "#" BANG@304..305 "!" L_BRACK@305..306 "[" - PATH@306..311 - PATH_SEGMENT@306..311 - NAME_REF@306..311 - IDENT@306..311 "allow" - TOKEN_TREE@311..322 - L_PAREN@311..312 "(" - IDENT@312..321 "dead_code" - R_PAREN@321..322 ")" + META@306..322 + PATH@306..311 + PATH_SEGMENT@306..311 + NAME_REF@306..311 + IDENT@306..311 "allow" + TOKEN_TREE@311..322 + L_PAREN@311..312 "(" + IDENT@312..321 "dead_code" + R_PAREN@321..322 ")" R_BRACK@322..323 "]" WHITESPACE@323..324 "\n" ATTR@324..351 POUND@324..325 "#" BANG@325..326 "!" L_BRACK@326..327 "[" - PATH@327..332 - PATH_SEGMENT@327..332 - NAME_REF@327..332 - IDENT@327..332 "allow" - TOKEN_TREE@332..350 - L_PAREN@332..333 "(" - IDENT@333..349 "unreachable_code" - R_PAREN@349..350 ")" + META@327..350 + PATH@327..332 + PATH_SEGMENT@327..332 + NAME_REF@327..332 + IDENT@327..332 "allow" + TOKEN_TREE@332..350 + L_PAREN@332..333 "(" + IDENT@333..349 "unreachable_code" + R_PAREN@349..350 ")" R_BRACK@350..351 "]" WHITESPACE@351..352 "\n" ATTR@352..376 POUND@352..353 "#" BANG@353..354 "!" L_BRACK@354..355 "[" - PATH@355..360 - PATH_SEGMENT@355..360 - NAME_REF@355..360 - IDENT@355..360 "allow" - TOKEN_TREE@360..375 - L_PAREN@360..361 "(" - IDENT@361..374 "unused_parens" - R_PAREN@374..375 ")" + META@355..375 + PATH@355..360 + PATH_SEGMENT@355..360 + NAME_REF@355..360 + IDENT@355..360 "allow" + TOKEN_TREE@360..375 + L_PAREN@360..361 "(" + IDENT@361..374 "unused_parens" + R_PAREN@374..375 ")" R_BRACK@375..376 "]" WHITESPACE@376..378 "\n\n" ATTR@378..405 POUND@378..379 "#" BANG@379..380 "!" L_BRACK@380..381 "[" - PATH@381..396 - PATH_SEGMENT@381..396 - NAME_REF@381..396 - IDENT@381..396 "recursion_limit" - WHITESPACE@396..397 " " - EQ@397..398 "=" - WHITESPACE@398..399 " " - LITERAL@399..404 - STRING@399..404 "\"128\"" + META@381..404 + PATH@381..396 + PATH_SEGMENT@381..396 + NAME_REF@381..396 + IDENT@381..396 "recursion_limit" + WHITESPACE@396..397 " " + EQ@397..398 "=" + WHITESPACE@398..399 " " + LITERAL@399..404 + STRING@399..404 "\"128\"" R_BRACK@404..405 "]" WHITESPACE@405..407 "\n\n" USE@407..427 diff --git a/crates/syntax/test_data/parser/ok/0044_let_attrs.rast b/crates/syntax/test_data/parser/ok/0044_let_attrs.rast index af44a4dbe..d0e7a1dbe 100644 --- a/crates/syntax/test_data/parser/ok/0044_let_attrs.rast +++ b/crates/syntax/test_data/parser/ok/0044_let_attrs.rast @@ -17,18 +17,19 @@ SOURCE_FILE@0..166 ATTR@77..106 POUND@77..78 "#" L_BRACK@78..79 "[" - PATH@79..82 - PATH_SEGMENT@79..82 - NAME_REF@79..82 - IDENT@79..82 "cfg" - TOKEN_TREE@82..105 - L_PAREN@82..83 "(" - IDENT@83..90 "feature" - WHITESPACE@90..91 " " - EQ@91..92 "=" - WHITESPACE@92..93 " " - STRING@93..104 "\"backtrace\"" - R_PAREN@104..105 ")" + META@79..105 + PATH@79..82 + PATH_SEGMENT@79..82 + NAME_REF@79..82 + IDENT@79..82 "cfg" + TOKEN_TREE@82..105 + L_PAREN@82..83 "(" + IDENT@83..90 "feature" + WHITESPACE@90..91 " " + EQ@91..92 "=" + WHITESPACE@92..93 " " + STRING@93..104 "\"backtrace\"" + R_PAREN@104..105 ")" R_BRACK@105..106 "]" WHITESPACE@106..111 "\n " LET_KW@111..114 "let" diff --git a/crates/syntax/test_data/parser/ok/0045_block_attrs.rast b/crates/syntax/test_data/parser/ok/0045_block_attrs.rast index 5e50b4e0b..7fbd635d0 100644 --- a/crates/syntax/test_data/parser/ok/0045_block_attrs.rast +++ b/crates/syntax/test_data/parser/ok/0045_block_attrs.rast @@ -15,14 +15,15 @@ SOURCE_FILE@0..764 POUND@17..18 "#" BANG@18..19 "!" L_BRACK@19..20 "[" - PATH@20..23 - PATH_SEGMENT@20..23 - NAME_REF@20..23 - IDENT@20..23 "doc" - TOKEN_TREE@23..56 - L_PAREN@23..24 "(" - STRING@24..55 "\"Inner attributes all ..." - R_PAREN@55..56 ")" + META@20..56 + PATH@20..23 + PATH_SEGMENT@20..23 + NAME_REF@20..23 + IDENT@20..23 "doc" + TOKEN_TREE@23..56 + L_PAREN@23..24 "(" + STRING@24..55 "\"Inner attributes all ..." + R_PAREN@55..56 ")" R_BRACK@56..57 "]" WHITESPACE@57..62 "\n " COMMENT@62..97 "//! As are ModuleDoc ..." @@ -35,28 +36,30 @@ SOURCE_FILE@0..764 POUND@112..113 "#" BANG@113..114 "!" L_BRACK@114..115 "[" - PATH@115..118 - PATH_SEGMENT@115..118 - NAME_REF@115..118 - IDENT@115..118 "doc" - TOKEN_TREE@118..179 - L_PAREN@118..119 "(" - STRING@119..178 "\"Inner attributes are ..." - R_PAREN@178..179 ")" + META@115..179 + PATH@115..118 + PATH_SEGMENT@115..118 + NAME_REF@115..118 + IDENT@115..118 "doc" + TOKEN_TREE@118..179 + L_PAREN@118..119 "(" + STRING@119..178 "\"Inner attributes are ..." + R_PAREN@178..179 ")" R_BRACK@179..180 "]" WHITESPACE@180..189 "\n " ATTR@189..244 POUND@189..190 "#" BANG@190..191 "!" L_BRACK@191..192 "[" - PATH@192..195 - PATH_SEGMENT@192..195 - NAME_REF@192..195 - IDENT@192..195 "doc" - TOKEN_TREE@195..243 - L_PAREN@195..196 "(" - STRING@196..242 "\"Being validated is n ..." - R_PAREN@242..243 ")" + META@192..243 + PATH@192..195 + PATH_SEGMENT@192..195 + NAME_REF@192..195 + IDENT@192..195 "doc" + TOKEN_TREE@195..243 + L_PAREN@195..196 "(" + STRING@196..242 "\"Being validated is n ..." + R_PAREN@242..243 ")" R_BRACK@243..244 "]" WHITESPACE@244..253 "\n " COMMENT@253..288 "//! As are ModuleDoc ..." @@ -71,14 +74,15 @@ SOURCE_FILE@0..764 POUND@310..311 "#" BANG@311..312 "!" L_BRACK@312..313 "[" - PATH@313..316 - PATH_SEGMENT@313..316 - NAME_REF@313..316 - IDENT@313..316 "doc" - TOKEN_TREE@316..408 - L_PAREN@316..317 "(" - STRING@317..407 "\"Inner attributes are ..." - R_PAREN@407..408 ")" + META@313..408 + PATH@313..316 + PATH_SEGMENT@313..316 + NAME_REF@313..316 + IDENT@313..316 "doc" + TOKEN_TREE@316..408 + L_PAREN@316..317 "(" + STRING@317..407 "\"Inner attributes are ..." + R_PAREN@407..408 ")" R_BRACK@408..409 "]" WHITESPACE@409..418 "\n " COMMENT@418..453 "//! As are ModuleDoc ..." @@ -111,14 +115,15 @@ SOURCE_FILE@0..764 ATTR@488..533 POUND@488..489 "#" L_BRACK@489..490 "[" - PATH@490..493 - PATH_SEGMENT@490..493 - NAME_REF@490..493 - IDENT@490..493 "doc" - TOKEN_TREE@493..532 - L_PAREN@493..494 "(" - STRING@494..531 "\"Outer attributes are ..." - R_PAREN@531..532 ")" + META@490..532 + PATH@490..493 + PATH_SEGMENT@490..493 + NAME_REF@490..493 + IDENT@490..493 "doc" + TOKEN_TREE@493..532 + L_PAREN@493..494 "(" + STRING@494..531 "\"Outer attributes are ..." + R_PAREN@531..532 ")" R_BRACK@532..533 "]" WHITESPACE@533..534 " " L_CURLY@534..535 "{" @@ -200,14 +205,15 @@ SOURCE_FILE@0..764 POUND@690..691 "#" BANG@691..692 "!" L_BRACK@692..693 "[" - PATH@693..698 - PATH_SEGMENT@693..698 - NAME_REF@693..698 - IDENT@693..698 "allow" - TOKEN_TREE@698..716 - L_PAREN@698..699 "(" - IDENT@699..715 "unused_variables" - R_PAREN@715..716 ")" + META@693..716 + PATH@693..698 + PATH_SEGMENT@693..698 + NAME_REF@693..698 + IDENT@693..698 "allow" + TOKEN_TREE@698..716 + L_PAREN@698..699 "(" + IDENT@699..715 "unused_variables" + R_PAREN@715..716 ")" R_BRACK@716..717 "]" WHITESPACE@717..718 " " COMMENT@718..755 "// this is `inner_at ..." diff --git a/crates/syntax/test_data/parser/ok/0046_extern_inner_attributes.rast b/crates/syntax/test_data/parser/ok/0046_extern_inner_attributes.rast index 37594769a..854ff9d56 100644 --- a/crates/syntax/test_data/parser/ok/0046_extern_inner_attributes.rast +++ b/crates/syntax/test_data/parser/ok/0046_extern_inner_attributes.rast @@ -14,14 +14,15 @@ SOURCE_FILE@0..87 POUND@47..48 "#" BANG@48..49 "!" L_BRACK@49..50 "[" - PATH@50..53 - PATH_SEGMENT@50..53 - NAME_REF@50..53 - IDENT@50..53 "doc" - TOKEN_TREE@53..83 - L_PAREN@53..54 "(" - STRING@54..82 "\"This is also a doc c ..." - R_PAREN@82..83 ")" + META@50..83 + PATH@50..53 + PATH_SEGMENT@50..53 + NAME_REF@50..53 + IDENT@50..53 "doc" + TOKEN_TREE@53..83 + L_PAREN@53..54 "(" + STRING@54..82 "\"This is also a doc c ..." + R_PAREN@82..83 ")" R_BRACK@83..84 "]" WHITESPACE@84..85 "\n" R_CURLY@85..86 "}" diff --git a/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast index 88470c41c..f935a0df5 100644 --- a/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast +++ b/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast @@ -10,19 +10,21 @@ SOURCE_FILE@0..519 ATTR@6..14 POUND@6..7 "#" L_BRACK@7..8 "[" - PATH@8..13 - PATH_SEGMENT@8..13 - NAME_REF@8..13 - IDENT@8..13 "attr1" + META@8..13 + PATH@8..13 + PATH_SEGMENT@8..13 + NAME_REF@8..13 + IDENT@8..13 "attr1" R_BRACK@13..14 "]" WHITESPACE@14..15 " " ATTR@15..23 POUND@15..16 "#" L_BRACK@16..17 "[" - PATH@17..22 - PATH_SEGMENT@17..22 - NAME_REF@17..22 - IDENT@17..22 "attr2" + META@17..22 + PATH@17..22 + PATH_SEGMENT@17..22 + NAME_REF@17..22 + IDENT@17..22 "attr2" R_BRACK@22..23 "]" WHITESPACE@23..24 " " IDENT_PAT@24..27 @@ -52,10 +54,11 @@ SOURCE_FILE@0..519 ATTR@44..52 POUND@44..45 "#" L_BRACK@45..46 "[" - PATH@46..51 - PATH_SEGMENT@46..51 - NAME_REF@46..51 - IDENT@46..51 "attr1" + META@46..51 + PATH@46..51 + PATH_SEGMENT@46..51 + NAME_REF@46..51 + IDENT@46..51 "attr1" R_BRACK@51..52 "]" WHITESPACE@52..53 " " IDENT_PAT@53..54 @@ -111,10 +114,11 @@ SOURCE_FILE@0..519 ATTR@106..113 POUND@106..107 "#" L_BRACK@107..108 "[" - PATH@108..112 - PATH_SEGMENT@108..112 - NAME_REF@108..112 - IDENT@108..112 "attr" + META@108..112 + PATH@108..112 + PATH_SEGMENT@108..112 + NAME_REF@108..112 + IDENT@108..112 "attr" R_BRACK@112..113 "]" WHITESPACE@113..114 " " DOT3@114..117 "..." @@ -157,10 +161,11 @@ SOURCE_FILE@0..519 ATTR@146..153 POUND@146..147 "#" L_BRACK@147..148 "[" - PATH@148..152 - PATH_SEGMENT@148..152 - NAME_REF@148..152 - IDENT@148..152 "attr" + META@148..152 + PATH@148..152 + PATH_SEGMENT@148..152 + NAME_REF@148..152 + IDENT@148..152 "attr" R_BRACK@152..153 "]" WHITESPACE@153..154 " " REF_TYPE@154..166 @@ -207,10 +212,11 @@ SOURCE_FILE@0..519 ATTR@197..204 POUND@197..198 "#" L_BRACK@198..199 "[" - PATH@199..203 - PATH_SEGMENT@199..203 - NAME_REF@199..203 - IDENT@199..203 "attr" + META@199..203 + PATH@199..203 + PATH_SEGMENT@199..203 + NAME_REF@199..203 + IDENT@199..203 "attr" R_BRACK@203..204 "]" WHITESPACE@204..205 " " WILDCARD_PAT@205..206 @@ -229,10 +235,11 @@ SOURCE_FILE@0..519 POUND@213..214 "#" WHITESPACE@214..215 " " L_BRACK@215..216 "[" - PATH@216..220 - PATH_SEGMENT@216..220 - NAME_REF@216..220 - IDENT@216..220 "attr" + META@216..220 + PATH@216..220 + PATH_SEGMENT@216..220 + NAME_REF@216..220 + IDENT@216..220 "attr" R_BRACK@220..221 "]" WHITESPACE@221..222 " " IDENT_PAT@222..227 @@ -275,10 +282,11 @@ SOURCE_FILE@0..519 ATTR@257..268 POUND@257..258 "#" L_BRACK@258..259 "[" - PATH@259..267 - PATH_SEGMENT@259..267 - NAME_REF@259..267 - IDENT@259..267 "must_use" + META@259..267 + PATH@259..267 + PATH_SEGMENT@259..267 + NAME_REF@259..267 + IDENT@259..267 "must_use" R_BRACK@267..268 "]" WHITESPACE@268..269 " " NAME@269..273 @@ -300,10 +308,11 @@ SOURCE_FILE@0..519 ATTR@289..296 POUND@289..290 "#" L_BRACK@290..291 "[" - PATH@291..295 - PATH_SEGMENT@291..295 - NAME_REF@291..295 - IDENT@291..295 "attr" + META@291..295 + PATH@291..295 + PATH_SEGMENT@291..295 + NAME_REF@291..295 + IDENT@291..295 "attr" R_BRACK@295..296 "]" WHITESPACE@296..297 " " NAME@297..301 @@ -325,10 +334,11 @@ SOURCE_FILE@0..519 ATTR@317..324 POUND@317..318 "#" L_BRACK@318..319 "[" - PATH@319..323 - PATH_SEGMENT@319..323 - NAME_REF@319..323 - IDENT@319..323 "attr" + META@319..323 + PATH@319..323 + PATH_SEGMENT@319..323 + NAME_REF@319..323 + IDENT@319..323 "attr" R_BRACK@323..324 "]" WHITESPACE@324..325 " " AMP@325..326 "&" @@ -357,10 +367,11 @@ SOURCE_FILE@0..519 ATTR@350..357 POUND@350..351 "#" L_BRACK@351..352 "[" - PATH@352..356 - PATH_SEGMENT@352..356 - NAME_REF@352..356 - IDENT@352..356 "attr" + META@352..356 + PATH@352..356 + PATH_SEGMENT@352..356 + NAME_REF@352..356 + IDENT@352..356 "attr" R_BRACK@356..357 "]" WHITESPACE@357..358 " " AMP@358..359 "&" @@ -391,10 +402,11 @@ SOURCE_FILE@0..519 ATTR@387..394 POUND@387..388 "#" L_BRACK@388..389 "[" - PATH@389..393 - PATH_SEGMENT@389..393 - NAME_REF@389..393 - IDENT@389..393 "attr" + META@389..393 + PATH@389..393 + PATH_SEGMENT@389..393 + NAME_REF@389..393 + IDENT@389..393 "attr" R_BRACK@393..394 "]" WHITESPACE@394..395 " " AMP@395..396 "&" @@ -426,10 +438,11 @@ SOURCE_FILE@0..519 ATTR@423..430 POUND@423..424 "#" L_BRACK@424..425 "[" - PATH@425..429 - PATH_SEGMENT@425..429 - NAME_REF@425..429 - IDENT@425..429 "attr" + META@425..429 + PATH@425..429 + PATH_SEGMENT@425..429 + NAME_REF@425..429 + IDENT@425..429 "attr" R_BRACK@429..430 "]" WHITESPACE@430..431 " " AMP@431..432 "&" @@ -457,10 +470,11 @@ SOURCE_FILE@0..519 ATTR@458..465 POUND@458..459 "#" L_BRACK@459..460 "[" - PATH@460..464 - PATH_SEGMENT@460..464 - NAME_REF@460..464 - IDENT@460..464 "attr" + META@460..464 + PATH@460..464 + PATH_SEGMENT@460..464 + NAME_REF@460..464 + IDENT@460..464 "attr" R_BRACK@464..465 "]" WHITESPACE@465..466 " " NAME@466..470 @@ -489,10 +503,11 @@ SOURCE_FILE@0..519 ATTR@491..498 POUND@491..492 "#" L_BRACK@492..493 "[" - PATH@493..497 - PATH_SEGMENT@493..497 - NAME_REF@493..497 - IDENT@493..497 "attr" + META@493..497 + PATH@493..497 + PATH_SEGMENT@493..497 + NAME_REF@493..497 + IDENT@493..497 "attr" R_BRACK@497..498 "]" WHITESPACE@498..499 " " NAME@499..503 diff --git a/crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast b/crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast index 87d8ebcba..97416f16a 100644 --- a/crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast +++ b/crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast @@ -5,10 +5,11 @@ SOURCE_FILE@0..65 ATTR@14..29 POUND@14..15 "#" L_BRACK@15..16 "[" - PATH@16..28 - PATH_SEGMENT@16..28 - NAME_REF@16..28 - IDENT@16..28 "macro_export" + META@16..28 + PATH@16..28 + PATH_SEGMENT@16..28 + NAME_REF@16..28 + IDENT@16..28 "macro_export" R_BRACK@28..29 "]" WHITESPACE@29..30 "\n" MACRO_RULES_KW@30..41 "macro_rules" diff --git a/crates/syntax/test_data/parser/ok/0062_macro_2.0.rast b/crates/syntax/test_data/parser/ok/0062_macro_2.0.rast index 0c22c31a4..e75848f0f 100644 --- a/crates/syntax/test_data/parser/ok/0062_macro_2.0.rast +++ b/crates/syntax/test_data/parser/ok/0062_macro_2.0.rast @@ -55,10 +55,11 @@ SOURCE_FILE@0..349 ATTR@95..102 POUND@95..96 "#" L_BRACK@96..97 "[" - PATH@97..101 - PATH_SEGMENT@97..101 - NAME_REF@97..101 - IDENT@97..101 "test" + META@97..101 + PATH@97..101 + PATH_SEGMENT@97..101 + NAME_REF@97..101 + IDENT@97..101 "test" R_BRACK@101..102 "]" WHITESPACE@102..103 "\n" FN_KW@103..105 "fn" diff --git a/crates/syntax/test_data/parser/ok/0063_variadic_fun.rast b/crates/syntax/test_data/parser/ok/0063_variadic_fun.rast index f7c094898..dcc4105c9 100644 --- a/crates/syntax/test_data/parser/ok/0063_variadic_fun.rast +++ b/crates/syntax/test_data/parser/ok/0063_variadic_fun.rast @@ -96,14 +96,15 @@ SOURCE_FILE@0..126 ATTR@92..105 POUND@92..93 "#" L_BRACK@93..94 "[" - PATH@94..97 - PATH_SEGMENT@94..97 - NAME_REF@94..97 - IDENT@94..97 "cfg" - TOKEN_TREE@97..104 - L_PAREN@97..98 "(" - IDENT@98..103 "never" - R_PAREN@103..104 ")" + META@94..104 + PATH@94..97 + PATH_SEGMENT@94..97 + NAME_REF@94..97 + IDENT@94..97 "cfg" + TOKEN_TREE@97..104 + L_PAREN@97..98 "(" + IDENT@98..103 "never" + R_PAREN@103..104 ")" R_BRACK@104..105 "]" WHITESPACE@105..106 " " SLICE_PAT@106..115 -- cgit v1.2.3