From bff8dd094958f1abe2fcfe8fe9f15dc7a7e6b53e Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 1 Aug 2020 13:47:19 +0200 Subject: Update grammar --- .../ra_syntax/test_data/parser/ok/0031_extern.rast | 32 +++++++++++----------- .../test_data/parser/ok/0035_weird_exprs.rast | 4 +-- .../test_data/parser/ok/0051_parameter_attrs.rast | 4 +-- .../parser/ok/0054_qual_path_in_type_arg.rast | 2 +- .../parser/ok/0063_trait_fn_patterns.rast | 4 +-- .../test_data/parser/ok/0063_variadic_fun.rast | 6 ++-- .../test_data/parser/ok/0064_impl_fn_params.rast | 4 +-- .../test_data/parser/ok/0067_where_for_pred.rast | 20 +++++++------- 8 files changed, 38 insertions(+), 38 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/ok') diff --git a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast b/crates/ra_syntax/test_data/parser/ok/0031_extern.rast index 79ea098a2..8150d445f 100644 --- a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast +++ b/crates/ra_syntax/test_data/parser/ok/0031_extern.rast @@ -99,7 +99,7 @@ SOURCE_FILE@0..1598 IDENT@117..121 "addr" COLON@121..122 ":" WHITESPACE@122..123 " " - POINTER_TYPE@123..138 + PTR_TYPE@123..138 STAR@123..124 "*" CONST_KW@124..129 "const" WHITESPACE@129..130 " " @@ -164,7 +164,7 @@ SOURCE_FILE@0..1598 IDENT@204..211 "address" COLON@211..212 ":" WHITESPACE@212..213 " " - POINTER_TYPE@213..228 + PTR_TYPE@213..228 STAR@213..214 "*" CONST_KW@214..219 "const" WHITESPACE@219..220 " " @@ -278,7 +278,7 @@ SOURCE_FILE@0..1598 IDENT@382..389 "address" COLON@389..390 ":" WHITESPACE@390..391 " " - POINTER_TYPE@391..404 + PTR_TYPE@391..404 STAR@391..392 "*" MUT_KW@392..395 "mut" WHITESPACE@395..396 " " @@ -295,7 +295,7 @@ SOURCE_FILE@0..1598 IDENT@429..440 "address_len" COLON@440..441 ":" WHITESPACE@441..442 " " - POINTER_TYPE@442..456 + PTR_TYPE@442..456 STAR@442..443 "*" MUT_KW@443..446 "mut" WHITESPACE@446..447 " " @@ -375,7 +375,7 @@ SOURCE_FILE@0..1598 IDENT@609..615 "optval" COLON@615..616 ":" WHITESPACE@616..617 " " - POINTER_TYPE@617..630 + PTR_TYPE@617..630 STAR@617..618 "*" MUT_KW@618..621 "mut" WHITESPACE@621..622 " " @@ -393,7 +393,7 @@ SOURCE_FILE@0..1598 IDENT@654..660 "optlen" COLON@660..661 ":" WHITESPACE@661..662 " " - POINTER_TYPE@662..678 + PTR_TYPE@662..678 STAR@662..663 "*" MUT_KW@663..666 "mut" WHITESPACE@666..667 " " @@ -474,7 +474,7 @@ SOURCE_FILE@0..1598 IDENT@784..789 "value" COLON@789..790 ":" WHITESPACE@790..791 " " - POINTER_TYPE@791..806 + PTR_TYPE@791..806 STAR@791..792 "*" CONST_KW@792..797 "const" WHITESPACE@797..798 " " @@ -540,7 +540,7 @@ SOURCE_FILE@0..1598 IDENT@905..912 "address" COLON@912..913 ":" WHITESPACE@913..914 " " - POINTER_TYPE@914..927 + PTR_TYPE@914..927 STAR@914..915 "*" MUT_KW@915..918 "mut" WHITESPACE@918..919 " " @@ -557,7 +557,7 @@ SOURCE_FILE@0..1598 IDENT@952..963 "address_len" COLON@963..964 ":" WHITESPACE@964..965 " " - POINTER_TYPE@965..979 + PTR_TYPE@965..979 STAR@965..966 "*" MUT_KW@966..969 "mut" WHITESPACE@969..970 " " @@ -609,7 +609,7 @@ SOURCE_FILE@0..1598 IDENT@1028..1031 "buf" COLON@1031..1032 ":" WHITESPACE@1032..1033 " " - POINTER_TYPE@1033..1048 + PTR_TYPE@1033..1048 STAR@1033..1034 "*" CONST_KW@1034..1039 "const" WHITESPACE@1039..1040 " " @@ -655,7 +655,7 @@ SOURCE_FILE@0..1598 IDENT@1099..1103 "addr" COLON@1103..1104 ":" WHITESPACE@1104..1105 " " - POINTER_TYPE@1105..1120 + PTR_TYPE@1105..1120 STAR@1105..1106 "*" CONST_KW@1106..1111 "const" WHITESPACE@1111..1112 " " @@ -720,7 +720,7 @@ SOURCE_FILE@0..1598 IDENT@1207..1210 "buf" COLON@1210..1211 ":" WHITESPACE@1211..1212 " " - POINTER_TYPE@1212..1227 + PTR_TYPE@1212..1227 STAR@1212..1213 "*" CONST_KW@1213..1218 "const" WHITESPACE@1218..1219 " " @@ -801,7 +801,7 @@ SOURCE_FILE@0..1598 IDENT@1327..1330 "buf" COLON@1330..1331 ":" WHITESPACE@1331..1332 " " - POINTER_TYPE@1332..1345 + PTR_TYPE@1332..1345 STAR@1332..1333 "*" MUT_KW@1333..1336 "mut" WHITESPACE@1336..1337 " " @@ -847,7 +847,7 @@ SOURCE_FILE@0..1598 IDENT@1398..1402 "addr" COLON@1402..1403 ":" WHITESPACE@1403..1404 " " - POINTER_TYPE@1404..1419 + PTR_TYPE@1404..1419 STAR@1404..1405 "*" MUT_KW@1405..1408 "mut" WHITESPACE@1408..1409 " " @@ -865,7 +865,7 @@ SOURCE_FILE@0..1598 IDENT@1441..1448 "addrlen" COLON@1448..1449 ":" WHITESPACE@1449..1450 " " - POINTER_TYPE@1450..1466 + PTR_TYPE@1450..1466 STAR@1450..1451 "*" MUT_KW@1451..1454 "mut" WHITESPACE@1454..1455 " " @@ -918,7 +918,7 @@ SOURCE_FILE@0..1598 IDENT@1515..1518 "buf" COLON@1518..1519 ":" WHITESPACE@1519..1520 " " - POINTER_TYPE@1520..1533 + PTR_TYPE@1520..1533 STAR@1520..1521 "*" MUT_KW@1521..1524 "mut" WHITESPACE@1524..1525 " " diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast index 5bb9363a8..7c61b5006 100644 --- a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast @@ -242,7 +242,7 @@ SOURCE_FILE@0..3813 IDENT@649..650 "x" COLON@650..651 ":" WHITESPACE@651..652 " " - REFERENCE_TYPE@652..663 + REF_TYPE@652..663 AMP@652..653 "&" PATH_TYPE@653..663 PATH@653..663 @@ -1579,7 +1579,7 @@ SOURCE_FILE@0..3813 IDENT@2873..2878 "union" COLON@2878..2879 ":" WHITESPACE@2879..2880 " " - REFERENCE_TYPE@2880..2901 + REF_TYPE@2880..2901 AMP@2880..2881 "&" LIFETIME@2881..2887 "\'union" WHITESPACE@2887..2888 " " diff --git a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast index 0303b198f..d4f05f279 100644 --- a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast @@ -96,7 +96,7 @@ SOURCE_FILE@0..519 IDENT@87..93 "format" COLON@93..94 ":" WHITESPACE@94..95 " " - POINTER_TYPE@95..104 + PTR_TYPE@95..104 STAR@95..96 "*" CONST_KW@96..101 "const" WHITESPACE@101..102 " " @@ -163,7 +163,7 @@ SOURCE_FILE@0..519 R_BRACK@152..153 "]" WHITESPACE@153..154 " " PARAM@154..166 - REFERENCE_TYPE@154..166 + REF_TYPE@154..166 AMP@154..155 "&" MUT_KW@155..158 "mut" WHITESPACE@158..159 " " diff --git a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast index f71ceecd7..f25c9ac36 100644 --- a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast +++ b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast @@ -102,7 +102,7 @@ SOURCE_FILE@0..88 PARAM_LIST@76..83 L_PAREN@76..77 "(" PARAM@77..82 - REFERENCE_TYPE@77..82 + REF_TYPE@77..82 AMP@77..78 "&" PATH_TYPE@78..82 PATH@78..82 diff --git a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast index 42680b283..8eda59976 100644 --- a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast +++ b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast @@ -140,9 +140,9 @@ SOURCE_FILE@0..170 IDENT@121..122 "a" COLON@122..123 ":" WHITESPACE@123..124 " " - REFERENCE_TYPE@124..131 + REF_TYPE@124..131 AMP@124..125 "&" - REFERENCE_TYPE@125..131 + REF_TYPE@125..131 AMP@125..126 "&" PATH_TYPE@126..131 PATH@126..131 diff --git a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast b/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast index a132591f0..4009b3ff8 100644 --- a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast +++ b/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast @@ -20,7 +20,7 @@ SOURCE_FILE@0..126 UNDERSCORE@22..23 "_" COLON@23..24 ":" WHITESPACE@24..25 " " - POINTER_TYPE@25..32 + PTR_TYPE@25..32 STAR@25..26 "*" MUT_KW@26..29 "mut" WHITESPACE@29..30 " " @@ -49,7 +49,7 @@ SOURCE_FILE@0..126 UNDERSCORE@50..51 "_" COLON@51..52 ":" WHITESPACE@52..53 " " - POINTER_TYPE@53..60 + PTR_TYPE@53..60 STAR@53..54 "*" MUT_KW@54..57 "mut" WHITESPACE@57..58 " " @@ -81,7 +81,7 @@ SOURCE_FILE@0..126 UNDERSCORE@80..81 "_" COLON@81..82 ":" WHITESPACE@82..83 " " - POINTER_TYPE@83..90 + PTR_TYPE@83..90 STAR@83..84 "*" MUT_KW@84..87 "mut" WHITESPACE@87..88 " " diff --git a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast index 94260db7c..a3c6ed82e 100644 --- a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast +++ b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast @@ -143,9 +143,9 @@ SOURCE_FILE@0..137 IDENT@120..121 "a" COLON@121..122 ":" WHITESPACE@122..123 " " - REFERENCE_TYPE@123..130 + REF_TYPE@123..130 AMP@123..124 "&" - REFERENCE_TYPE@124..130 + REF_TYPE@124..130 AMP@124..125 "&" PATH_TYPE@125..130 PATH@125..130 diff --git a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast b/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast index fae9467fc..8f8639a37 100644 --- a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast +++ b/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast @@ -42,7 +42,7 @@ SOURCE_FILE@0..374 PARAM_LIST@41..50 L_PAREN@41..42 "(" PARAM@42..49 - REFERENCE_TYPE@42..49 + REF_TYPE@42..49 AMP@42..43 "&" LIFETIME@43..45 "\'a" WHITESPACE@45..46 " " @@ -85,7 +85,7 @@ SOURCE_FILE@0..374 LIFETIME@86..88 "\'a" R_ANGLE@88..89 ">" WHITESPACE@89..90 " " - REFERENCE_TYPE@90..95 + REF_TYPE@90..95 AMP@90..91 "&" LIFETIME@91..93 "\'a" WHITESPACE@93..94 " " @@ -138,7 +138,7 @@ SOURCE_FILE@0..374 WHITESPACE@144..145 " " PAREN_TYPE@145..152 L_PAREN@145..146 "(" - REFERENCE_TYPE@146..151 + REF_TYPE@146..151 AMP@146..147 "&" LIFETIME@147..149 "\'a" WHITESPACE@149..150 " " @@ -160,7 +160,7 @@ SOURCE_FILE@0..374 PARAM_LIST@156..165 L_PAREN@156..157 "(" PARAM@157..164 - REFERENCE_TYPE@157..164 + REF_TYPE@157..164 AMP@157..158 "&" LIFETIME@158..160 "\'a" WHITESPACE@160..161 " " @@ -205,7 +205,7 @@ SOURCE_FILE@0..374 WHITESPACE@206..207 " " SLICE_TYPE@207..214 L_BRACK@207..208 "[" - REFERENCE_TYPE@208..213 + REF_TYPE@208..213 AMP@208..209 "&" LIFETIME@209..211 "\'a" WHITESPACE@211..212 " " @@ -250,7 +250,7 @@ SOURCE_FILE@0..374 IDENT@240..242 "_t" COLON@242..243 ":" WHITESPACE@243..244 " " - REFERENCE_TYPE@244..246 + REF_TYPE@244..246 AMP@244..245 "&" PATH_TYPE@245..246 PATH@245..246 @@ -275,7 +275,7 @@ SOURCE_FILE@0..374 PATH@266..280 PATH_SEGMENT@266..280 L_ANGLE@266..267 "<" - REFERENCE_TYPE@267..272 + REF_TYPE@267..272 AMP@267..268 "&" LIFETIME@268..270 "\'a" WHITESPACE@270..271 " " @@ -347,12 +347,12 @@ SOURCE_FILE@0..374 LIFETIME@342..344 "\'b" R_ANGLE@344..345 ">" WHITESPACE@345..346 " " - FN_POINTER_TYPE@346..362 + FN_PTR_TYPE@346..362 FN_KW@346..348 "fn" PARAM_LIST@348..362 L_PAREN@348..349 "(" PARAM@349..354 - REFERENCE_TYPE@349..354 + REF_TYPE@349..354 AMP@349..350 "&" LIFETIME@350..352 "\'a" WHITESPACE@352..353 " " @@ -364,7 +364,7 @@ SOURCE_FILE@0..374 COMMA@354..355 "," WHITESPACE@355..356 " " PARAM@356..361 - REFERENCE_TYPE@356..361 + REF_TYPE@356..361 AMP@356..357 "&" LIFETIME@357..359 "\'b" WHITESPACE@359..360 " " -- cgit v1.2.3