From 98181087984157e27faba0b969e384f3c62c39d5 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 31 Jul 2020 20:09:09 +0200 Subject: Rename BindPat -> IdentPat --- .../parser/ok/0028_operator_binding_power.rast | 2 +- .../test_data/parser/ok/0029_range_forms.rast | 4 +- .../ra_syntax/test_data/parser/ok/0030_traits.rast | 2 +- .../ra_syntax/test_data/parser/ok/0031_extern.rast | 94 +++++++++++----------- .../test_data/parser/ok/0033_label_break.rast | 2 +- .../test_data/parser/ok/0035_weird_exprs.rast | 36 ++++----- .../test_data/parser/ok/0041_raw_keywords.rast | 4 +- .../test_data/parser/ok/0044_let_attrs.rast | 2 +- .../parser/ok/0045_block_inner_attrs.rast | 2 +- .../parser/ok/0048_compound_assignment.rast | 2 +- .../parser/ok/0050_async_block_as_argument.rast | 2 +- .../test_data/parser/ok/0051_parameter_attrs.rast | 8 +- .../test_data/parser/ok/0052_for_range_block.rast | 2 +- .../test_data/parser/ok/0057_loop_in_call.rast | 2 +- .../parser/ok/0063_trait_fn_patterns.rast | 14 ++-- .../test_data/parser/ok/0063_variadic_fun.rast | 6 +- .../test_data/parser/ok/0064_impl_fn_params.rast | 12 +-- .../test_data/parser/ok/0067_where_for_pred.rast | 2 +- 18 files changed, 99 insertions(+), 99 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/ok') diff --git a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast index efe018484..3271a4695 100644 --- a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast +++ b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..248 LET_STMT@25..55 LET_KW@25..28 "let" WHITESPACE@28..29 " " - BIND_PAT@29..30 + IDENT_PAT@29..30 NAME@29..30 IDENT@29..30 "x" WHITESPACE@30..31 " " diff --git a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast index 47e46f009..a732f11c4 100644 --- a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast +++ b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast @@ -67,7 +67,7 @@ SOURCE_FILE@0..153 LET_STMT@64..76 LET_KW@64..67 "let" WHITESPACE@67..68 " " - BIND_PAT@68..69 + IDENT_PAT@68..69 NAME@68..69 IDENT@68..69 "x" WHITESPACE@69..70 " " @@ -135,7 +135,7 @@ SOURCE_FILE@0..153 LET_STMT@138..150 LET_KW@138..141 "let" WHITESPACE@141..142 " " - BIND_PAT@142..143 + IDENT_PAT@142..143 NAME@142..143 IDENT@142..143 "x" WHITESPACE@143..144 " " diff --git a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast b/crates/ra_syntax/test_data/parser/ok/0030_traits.rast index 280d4cb82..d07c6683a 100644 --- a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast +++ b/crates/ra_syntax/test_data/parser/ok/0030_traits.rast @@ -37,7 +37,7 @@ SOURCE_FILE@0..96 PARAM_LIST@79..92 L_PAREN@79..80 "(" PARAM@80..91 - BIND_PAT@80..81 + IDENT_PAT@80..81 NAME@80..81 IDENT@80..81 "x" COLON@81..82 ":" 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 0509f7504..79ea098a2 100644 --- a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast +++ b/crates/ra_syntax/test_data/parser/ok/0031_extern.rast @@ -17,7 +17,7 @@ SOURCE_FILE@0..1598 PARAM_LIST@26..75 L_PAREN@26..27 "(" PARAM@27..42 - BIND_PAT@27..33 + IDENT_PAT@27..33 NAME@27..33 IDENT@27..33 "domain" COLON@33..34 ":" @@ -31,7 +31,7 @@ SOURCE_FILE@0..1598 COMMA@42..43 "," WHITESPACE@43..44 " " PARAM@44..55 - BIND_PAT@44..46 + IDENT_PAT@44..46 NAME@44..46 IDENT@44..46 "ty" COLON@46..47 ":" @@ -45,7 +45,7 @@ SOURCE_FILE@0..1598 COMMA@55..56 "," WHITESPACE@56..57 " " PARAM@57..74 - BIND_PAT@57..65 + IDENT_PAT@57..65 NAME@57..65 IDENT@57..65 "protocol" COLON@65..66 ":" @@ -80,7 +80,7 @@ SOURCE_FILE@0..1598 PARAM_LIST@103..155 L_PAREN@103..104 "(" PARAM@104..115 - BIND_PAT@104..106 + IDENT_PAT@104..106 NAME@104..106 IDENT@104..106 "fd" COLON@106..107 ":" @@ -94,7 +94,7 @@ SOURCE_FILE@0..1598 COMMA@115..116 "," WHITESPACE@116..117 " " PARAM@117..138 - BIND_PAT@117..121 + IDENT_PAT@117..121 NAME@117..121 IDENT@117..121 "addr" COLON@121..122 ":" @@ -111,7 +111,7 @@ SOURCE_FILE@0..1598 COMMA@138..139 "," WHITESPACE@139..140 " " PARAM@140..154 - BIND_PAT@140..143 + IDENT_PAT@140..143 NAME@140..143 IDENT@140..143 "len" COLON@143..144 ":" @@ -145,7 +145,7 @@ SOURCE_FILE@0..1598 PARAM_LIST@186..264 L_PAREN@186..187 "(" PARAM@187..202 - BIND_PAT@187..193 + IDENT_PAT@187..193 NAME@187..193 IDENT@187..193 "socket" COLON@193..194 ":" @@ -159,7 +159,7 @@ SOURCE_FILE@0..1598 COMMA@202..203 "," WHITESPACE@203..204 " " PARAM@204..228 - BIND_PAT@204..211 + IDENT_PAT@204..211 NAME@204..211 IDENT@204..211 "address" COLON@211..212 ":" @@ -176,7 +176,7 @@ SOURCE_FILE@0..1598 COMMA@228..229 "," WHITESPACE@229..249 "\n " PARAM@249..263 - BIND_PAT@249..252 + IDENT_PAT@249..252 NAME@249..252 IDENT@249..252 "len" COLON@252..253 ":" @@ -210,7 +210,7 @@ SOURCE_FILE@0..1598 PARAM_LIST@294..329 L_PAREN@294..295 "(" PARAM@295..310 - BIND_PAT@295..301 + IDENT_PAT@295..301 NAME@295..301 IDENT@295..301 "socket" COLON@301..302 ":" @@ -224,7 +224,7 @@ SOURCE_FILE@0..1598 COMMA@310..311 "," WHITESPACE@311..312 " " PARAM@312..328 - BIND_PAT@312..319 + IDENT_PAT@312..319 NAME@312..319 IDENT@312..319 "backlog" COLON@319..320 ":" @@ -259,7 +259,7 @@ SOURCE_FILE@0..1598 PARAM_LIST@364..457 L_PAREN@364..365 "(" PARAM@365..380 - BIND_PAT@365..371 + IDENT_PAT@365..371 NAME@365..371 IDENT@365..371 "socket" COLON@371..372 ":" @@ -273,7 +273,7 @@ SOURCE_FILE@0..1598 COMMA@380..381 "," WHITESPACE@381..382 " " PARAM@382..404 - BIND_PAT@382..389 + IDENT_PAT@382..389 NAME@382..389 IDENT@382..389 "address" COLON@389..390 ":" @@ -290,7 +290,7 @@ SOURCE_FILE@0..1598 COMMA@404..405 "," WHITESPACE@405..429 "\n " PARAM@429..456 - BIND_PAT@429..440 + IDENT_PAT@429..440 NAME@429..440 IDENT@429..440 "address_len" COLON@440..441 ":" @@ -328,7 +328,7 @@ SOURCE_FILE@0..1598 PARAM_LIST@491..679 L_PAREN@491..492 "(" PARAM@492..507 - BIND_PAT@492..498 + IDENT_PAT@492..498 NAME@492..498 IDENT@492..498 "sockfd" COLON@498..499 ":" @@ -342,7 +342,7 @@ SOURCE_FILE@0..1598 COMMA@507..508 "," WHITESPACE@508..531 "\n " PARAM@531..545 - BIND_PAT@531..536 + IDENT_PAT@531..536 NAME@531..536 IDENT@531..536 "level" COLON@536..537 ":" @@ -356,7 +356,7 @@ SOURCE_FILE@0..1598 COMMA@545..546 "," WHITESPACE@546..569 "\n " PARAM@569..585 - BIND_PAT@569..576 + IDENT_PAT@569..576 NAME@569..576 IDENT@569..576 "optname" COLON@576..577 ":" @@ -370,7 +370,7 @@ SOURCE_FILE@0..1598 COMMA@585..586 "," WHITESPACE@586..609 "\n " PARAM@609..630 - BIND_PAT@609..615 + IDENT_PAT@609..615 NAME@609..615 IDENT@609..615 "optval" COLON@615..616 ":" @@ -388,7 +388,7 @@ SOURCE_FILE@0..1598 COMMA@630..631 "," WHITESPACE@631..654 "\n " PARAM@654..678 - BIND_PAT@654..660 + IDENT_PAT@654..660 NAME@654..660 IDENT@654..660 "optlen" COLON@660..661 ":" @@ -427,7 +427,7 @@ SOURCE_FILE@0..1598 PARAM_LIST@713..852 L_PAREN@713..714 "(" PARAM@714..729 - BIND_PAT@714..720 + IDENT_PAT@714..720 NAME@714..720 IDENT@714..720 "socket" COLON@720..721 ":" @@ -441,7 +441,7 @@ SOURCE_FILE@0..1598 COMMA@729..730 "," WHITESPACE@730..731 " " PARAM@731..745 - BIND_PAT@731..736 + IDENT_PAT@731..736 NAME@731..736 IDENT@731..736 "level" COLON@736..737 ":" @@ -455,7 +455,7 @@ SOURCE_FILE@0..1598 COMMA@745..746 "," WHITESPACE@746..747 " " PARAM@747..760 - BIND_PAT@747..751 + IDENT_PAT@747..751 NAME@747..751 IDENT@747..751 "name" COLON@751..752 ":" @@ -469,7 +469,7 @@ SOURCE_FILE@0..1598 COMMA@760..761 "," WHITESPACE@761..784 "\n " PARAM@784..806 - BIND_PAT@784..789 + IDENT_PAT@784..789 NAME@784..789 IDENT@784..789 "value" COLON@789..790 ":" @@ -487,7 +487,7 @@ SOURCE_FILE@0..1598 COMMA@806..807 "," WHITESPACE@807..830 "\n " PARAM@830..851 - BIND_PAT@830..840 + IDENT_PAT@830..840 NAME@830..840 IDENT@830..840 "option_len" COLON@840..841 ":" @@ -521,7 +521,7 @@ SOURCE_FILE@0..1598 PARAM_LIST@887..980 L_PAREN@887..888 "(" PARAM@888..903 - BIND_PAT@888..894 + IDENT_PAT@888..894 NAME@888..894 IDENT@888..894 "socket" COLON@894..895 ":" @@ -535,7 +535,7 @@ SOURCE_FILE@0..1598 COMMA@903..904 "," WHITESPACE@904..905 " " PARAM@905..927 - BIND_PAT@905..912 + IDENT_PAT@905..912 NAME@905..912 IDENT@905..912 "address" COLON@912..913 ":" @@ -552,7 +552,7 @@ SOURCE_FILE@0..1598 COMMA@927..928 "," WHITESPACE@928..952 "\n " PARAM@952..979 - BIND_PAT@952..963 + IDENT_PAT@952..963 NAME@952..963 IDENT@952..963 "address_len" COLON@963..964 ":" @@ -590,7 +590,7 @@ SOURCE_FILE@0..1598 PARAM_LIST@1010..1159 L_PAREN@1010..1011 "(" PARAM@1011..1026 - BIND_PAT@1011..1017 + IDENT_PAT@1011..1017 NAME@1011..1017 IDENT@1011..1017 "socket" COLON@1017..1018 ":" @@ -604,7 +604,7 @@ SOURCE_FILE@0..1598 COMMA@1026..1027 "," WHITESPACE@1027..1028 " " PARAM@1028..1048 - BIND_PAT@1028..1031 + IDENT_PAT@1028..1031 NAME@1028..1031 IDENT@1028..1031 "buf" COLON@1031..1032 ":" @@ -622,7 +622,7 @@ SOURCE_FILE@0..1598 COMMA@1048..1049 "," WHITESPACE@1049..1050 " " PARAM@1050..1063 - BIND_PAT@1050..1053 + IDENT_PAT@1050..1053 NAME@1050..1053 IDENT@1050..1053 "len" COLON@1053..1054 ":" @@ -636,7 +636,7 @@ SOURCE_FILE@0..1598 COMMA@1063..1064 "," WHITESPACE@1064..1083 "\n " PARAM@1083..1097 - BIND_PAT@1083..1088 + IDENT_PAT@1083..1088 NAME@1083..1088 IDENT@1083..1088 "flags" COLON@1088..1089 ":" @@ -650,7 +650,7 @@ SOURCE_FILE@0..1598 COMMA@1097..1098 "," WHITESPACE@1098..1099 " " PARAM@1099..1120 - BIND_PAT@1099..1103 + IDENT_PAT@1099..1103 NAME@1099..1103 IDENT@1099..1103 "addr" COLON@1103..1104 ":" @@ -667,7 +667,7 @@ SOURCE_FILE@0..1598 COMMA@1120..1121 "," WHITESPACE@1121..1140 "\n " PARAM@1140..1158 - BIND_PAT@1140..1147 + IDENT_PAT@1140..1147 NAME@1140..1147 IDENT@1140..1147 "addrlen" COLON@1147..1148 ":" @@ -701,7 +701,7 @@ SOURCE_FILE@0..1598 PARAM_LIST@1189..1275 L_PAREN@1189..1190 "(" PARAM@1190..1205 - BIND_PAT@1190..1196 + IDENT_PAT@1190..1196 NAME@1190..1196 IDENT@1190..1196 "socket" COLON@1196..1197 ":" @@ -715,7 +715,7 @@ SOURCE_FILE@0..1598 COMMA@1205..1206 "," WHITESPACE@1206..1207 " " PARAM@1207..1227 - BIND_PAT@1207..1210 + IDENT_PAT@1207..1210 NAME@1207..1210 IDENT@1207..1210 "buf" COLON@1210..1211 ":" @@ -733,7 +733,7 @@ SOURCE_FILE@0..1598 COMMA@1227..1228 "," WHITESPACE@1228..1229 " " PARAM@1229..1242 - BIND_PAT@1229..1232 + IDENT_PAT@1229..1232 NAME@1229..1232 IDENT@1229..1232 "len" COLON@1232..1233 ":" @@ -747,7 +747,7 @@ SOURCE_FILE@0..1598 COMMA@1242..1243 "," WHITESPACE@1243..1260 "\n " PARAM@1260..1274 - BIND_PAT@1260..1265 + IDENT_PAT@1260..1265 NAME@1260..1265 IDENT@1260..1265 "flags" COLON@1265..1266 ":" @@ -782,7 +782,7 @@ SOURCE_FILE@0..1598 PARAM_LIST@1309..1467 L_PAREN@1309..1310 "(" PARAM@1310..1325 - BIND_PAT@1310..1316 + IDENT_PAT@1310..1316 NAME@1310..1316 IDENT@1310..1316 "socket" COLON@1316..1317 ":" @@ -796,7 +796,7 @@ SOURCE_FILE@0..1598 COMMA@1325..1326 "," WHITESPACE@1326..1327 " " PARAM@1327..1345 - BIND_PAT@1327..1330 + IDENT_PAT@1327..1330 NAME@1327..1330 IDENT@1327..1330 "buf" COLON@1330..1331 ":" @@ -814,7 +814,7 @@ SOURCE_FILE@0..1598 COMMA@1345..1346 "," WHITESPACE@1346..1347 " " PARAM@1347..1360 - BIND_PAT@1347..1350 + IDENT_PAT@1347..1350 NAME@1347..1350 IDENT@1347..1350 "len" COLON@1350..1351 ":" @@ -828,7 +828,7 @@ SOURCE_FILE@0..1598 COMMA@1360..1361 "," WHITESPACE@1361..1382 "\n " PARAM@1382..1396 - BIND_PAT@1382..1387 + IDENT_PAT@1382..1387 NAME@1382..1387 IDENT@1382..1387 "flags" COLON@1387..1388 ":" @@ -842,7 +842,7 @@ SOURCE_FILE@0..1598 COMMA@1396..1397 "," WHITESPACE@1397..1398 " " PARAM@1398..1419 - BIND_PAT@1398..1402 + IDENT_PAT@1398..1402 NAME@1398..1402 IDENT@1398..1402 "addr" COLON@1402..1403 ":" @@ -860,7 +860,7 @@ SOURCE_FILE@0..1598 COMMA@1419..1420 "," WHITESPACE@1420..1441 "\n " PARAM@1441..1466 - BIND_PAT@1441..1448 + IDENT_PAT@1441..1448 NAME@1441..1448 IDENT@1441..1448 "addrlen" COLON@1448..1449 ":" @@ -899,7 +899,7 @@ SOURCE_FILE@0..1598 PARAM_LIST@1497..1581 L_PAREN@1497..1498 "(" PARAM@1498..1513 - BIND_PAT@1498..1504 + IDENT_PAT@1498..1504 NAME@1498..1504 IDENT@1498..1504 "socket" COLON@1504..1505 ":" @@ -913,7 +913,7 @@ SOURCE_FILE@0..1598 COMMA@1513..1514 "," WHITESPACE@1514..1515 " " PARAM@1515..1533 - BIND_PAT@1515..1518 + IDENT_PAT@1515..1518 NAME@1515..1518 IDENT@1515..1518 "buf" COLON@1518..1519 ":" @@ -931,7 +931,7 @@ SOURCE_FILE@0..1598 COMMA@1533..1534 "," WHITESPACE@1534..1535 " " PARAM@1535..1548 - BIND_PAT@1535..1538 + IDENT_PAT@1535..1538 NAME@1535..1538 IDENT@1535..1538 "len" COLON@1538..1539 ":" @@ -945,7 +945,7 @@ SOURCE_FILE@0..1598 COMMA@1548..1549 "," WHITESPACE@1549..1566 "\n " PARAM@1566..1580 - BIND_PAT@1566..1571 + IDENT_PAT@1566..1571 NAME@1566..1571 IDENT@1566..1571 "flags" COLON@1571..1572 ":" diff --git a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast b/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast index b3f29638c..88800ca7a 100644 --- a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast +++ b/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast @@ -127,7 +127,7 @@ SOURCE_FILE@0..506 LET_STMT@301..503 LET_KW@301..304 "let" WHITESPACE@304..305 " " - BIND_PAT@305..311 + IDENT_PAT@305..311 NAME@305..311 IDENT@305..311 "result" WHITESPACE@311..312 " " 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 d48f638cd..ac9c1fa79 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 @@ -144,7 +144,7 @@ SOURCE_FILE@0..3813 LET_STMT@543..570 LET_KW@543..546 "let" WHITESPACE@546..547 " " - BIND_PAT@547..549 + IDENT_PAT@547..549 NAME@547..549 IDENT@547..549 "_x" COLON@549..550 ":" @@ -186,7 +186,7 @@ SOURCE_FILE@0..3813 PARAM_LIST@595..603 L_PAREN@595..596 "(" PARAM@596..602 - BIND_PAT@596..598 + IDENT_PAT@596..598 NAME@596..598 IDENT@596..598 "_x" COLON@598..599 ":" @@ -237,7 +237,7 @@ SOURCE_FILE@0..3813 PARAM_LIST@648..664 L_PAREN@648..649 "(" PARAM@649..663 - BIND_PAT@649..650 + IDENT_PAT@649..650 NAME@649..650 IDENT@649..650 "x" COLON@650..651 ":" @@ -314,7 +314,7 @@ SOURCE_FILE@0..3813 LET_STMT@725..751 LET_KW@725..728 "let" WHITESPACE@728..729 " " - BIND_PAT@729..730 + IDENT_PAT@729..730 NAME@729..730 IDENT@729..730 "i" WHITESPACE@730..731 " " @@ -343,7 +343,7 @@ SOURCE_FILE@0..3813 LET_STMT@756..778 LET_KW@756..759 "let" WHITESPACE@759..760 " " - BIND_PAT@760..764 + IDENT_PAT@760..764 NAME@760..764 IDENT@760..764 "dont" WHITESPACE@764..765 " " @@ -587,7 +587,7 @@ SOURCE_FILE@0..3813 LET_STMT@1343..1361 LET_KW@1343..1346 "let" WHITESPACE@1346..1347 " " - BIND_PAT@1347..1353 + IDENT_PAT@1347..1353 MUT_KW@1347..1350 "mut" WHITESPACE@1350..1351 " " NAME@1351..1353 @@ -604,7 +604,7 @@ SOURCE_FILE@0..3813 LET_STMT@1366..1400 LET_KW@1366..1369 "let" WHITESPACE@1369..1370 " " - BIND_PAT@1370..1376 + IDENT_PAT@1370..1376 MUT_KW@1370..1373 "mut" WHITESPACE@1373..1374 " " NAME@1374..1376 @@ -649,7 +649,7 @@ SOURCE_FILE@0..3813 LET_STMT@1405..1438 LET_KW@1405..1408 "let" WHITESPACE@1408..1409 " " - BIND_PAT@1409..1415 + IDENT_PAT@1409..1415 MUT_KW@1409..1412 "mut" WHITESPACE@1412..1413 " " NAME@1413..1415 @@ -694,7 +694,7 @@ SOURCE_FILE@0..3813 LET_STMT@1443..1474 LET_KW@1443..1446 "let" WHITESPACE@1446..1447 " " - BIND_PAT@1447..1449 + IDENT_PAT@1447..1449 NAME@1447..1449 IDENT@1447..1449 "_a" WHITESPACE@1449..1450 " " @@ -737,7 +737,7 @@ SOURCE_FILE@0..3813 LET_STMT@1479..1537 LET_KW@1479..1482 "let" WHITESPACE@1482..1483 " " - BIND_PAT@1483..1485 + IDENT_PAT@1483..1485 NAME@1483..1485 IDENT@1483..1485 "_b" WHITESPACE@1485..1486 " " @@ -859,7 +859,7 @@ SOURCE_FILE@0..3813 LET_STMT@1603..1648 LET_KW@1603..1606 "let" WHITESPACE@1606..1607 " " - BIND_PAT@1607..1609 + IDENT_PAT@1607..1609 NAME@1607..1609 IDENT@1607..1609 "_a" WHITESPACE@1609..1610 " " @@ -906,7 +906,7 @@ SOURCE_FILE@0..3813 LET_STMT@1653..1685 LET_KW@1653..1656 "let" WHITESPACE@1656..1657 " " - BIND_PAT@1657..1659 + IDENT_PAT@1657..1659 NAME@1657..1659 IDENT@1657..1659 "_c" WHITESPACE@1659..1660 " " @@ -943,7 +943,7 @@ SOURCE_FILE@0..3813 LET_STMT@1690..1739 LET_KW@1690..1693 "let" WHITESPACE@1693..1694 " " - BIND_PAT@1694..1696 + IDENT_PAT@1694..1696 NAME@1694..1696 IDENT@1694..1696 "_b" COLON@1696..1697 ":" @@ -1024,7 +1024,7 @@ SOURCE_FILE@0..3813 LET_STMT@1790..1804 LET_KW@1790..1793 "let" WHITESPACE@1793..1794 " " - BIND_PAT@1794..1799 + IDENT_PAT@1794..1799 MUT_KW@1794..1797 "mut" WHITESPACE@1797..1798 " " NAME@1798..1799 @@ -1146,7 +1146,7 @@ SOURCE_FILE@0..3813 LET_STMT@1926..1958 LET_KW@1926..1929 "let" WHITESPACE@1929..1930 " " - BIND_PAT@1930..1935 + IDENT_PAT@1930..1935 NAME@1930..1935 IDENT@1930..1935 "_evil" WHITESPACE@1935..1936 " " @@ -1292,7 +1292,7 @@ SOURCE_FILE@0..3813 PARAM_LIST@2205..2213 L_PAREN@2205..2206 "(" PARAM@2206..2212 - BIND_PAT@2206..2208 + IDENT_PAT@2206..2208 NAME@2206..2208 IDENT@2206..2208 "u8" COLON@2208..2209 ":" @@ -1614,7 +1614,7 @@ SOURCE_FILE@0..3813 LET_STMT@2938..3021 LET_KW@2938..2941 "let" WHITESPACE@2941..2942 " " - BIND_PAT@2942..2945 + IDENT_PAT@2942..2945 NAME@2942..2945 IDENT@2942..2945 "val" WHITESPACE@2945..2946 " " @@ -1648,7 +1648,7 @@ SOURCE_FILE@0..3813 R_PAREN@2961..2962 ")" COMMA@2962..2963 "," PARAM@2963..2967 - BIND_PAT@2963..2967 + IDENT_PAT@2963..2967 NAME@2963..2965 IDENT@2963..2965 "__" AT@2965..2966 "@" diff --git a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast index 92ede8ccb..4035aef6f 100644 --- a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast +++ b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..59 LET_STMT@11..29 LET_KW@11..14 "let" WHITESPACE@14..15 " " - BIND_PAT@15..23 + IDENT_PAT@15..23 NAME@15..23 IDENT@15..23 "r#struct" WHITESPACE@23..24 " " @@ -27,7 +27,7 @@ SOURCE_FILE@0..59 LET_STMT@30..57 LET_KW@30..33 "let" WHITESPACE@33..34 " " - BIND_PAT@34..41 + IDENT_PAT@34..41 NAME@34..41 IDENT@34..41 "r#trait" WHITESPACE@41..42 " " diff --git a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast index 650f4e310..af44a4dbe 100644 --- a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast @@ -33,7 +33,7 @@ SOURCE_FILE@0..166 WHITESPACE@106..111 "\n " LET_KW@111..114 "let" WHITESPACE@114..115 " " - BIND_PAT@115..124 + IDENT_PAT@115..124 NAME@115..124 IDENT@115..124 "exit_code" WHITESPACE@124..125 " " diff --git a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast index bd152ffa3..0ac56df6d 100644 --- a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast @@ -114,7 +114,7 @@ SOURCE_FILE@0..686 COMMA@564..565 "," WHITESPACE@565..566 " " PARAM@566..600 - BIND_PAT@566..574 + IDENT_PAT@566..574 NAME@566..574 IDENT@566..574 "event_fn" COLON@574..575 ":" diff --git a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast index 662576e5f..eaab47843 100644 --- a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast +++ b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast @@ -16,7 +16,7 @@ SOURCE_FILE@0..257 LET_STMT@91..105 LET_KW@91..94 "let" WHITESPACE@94..95 " " - BIND_PAT@95..100 + IDENT_PAT@95..100 MUT_KW@95..98 "mut" WHITESPACE@98..99 " " NAME@99..100 diff --git a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast index 48e1f07d1..c7ce12e93 100644 --- a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast +++ b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast @@ -7,7 +7,7 @@ SOURCE_FILE@0..95 PARAM_LIST@6..49 L_PAREN@6..7 "(" PARAM@7..48 - BIND_PAT@7..8 + IDENT_PAT@7..8 NAME@7..8 IDENT@7..8 "x" COLON@8..9 ":" 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 a80a6cd7a..0303b198f 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 @@ -25,7 +25,7 @@ SOURCE_FILE@0..519 R_BRACK@22..23 "]" WHITESPACE@23..24 " " PARAM@24..33 - BIND_PAT@24..27 + IDENT_PAT@24..27 NAME@24..27 IDENT@24..27 "pat" COLON@27..28 ":" @@ -58,7 +58,7 @@ SOURCE_FILE@0..519 R_BRACK@51..52 "]" WHITESPACE@52..53 " " PARAM@53..58 - BIND_PAT@53..54 + IDENT_PAT@53..54 NAME@53..54 IDENT@53..54 "x" COLON@54..55 ":" @@ -91,7 +91,7 @@ SOURCE_FILE@0..519 PARAM_LIST@86..118 L_PAREN@86..87 "(" PARAM@87..104 - BIND_PAT@87..93 + IDENT_PAT@87..93 NAME@87..93 IDENT@87..93 "format" COLON@93..94 ":" @@ -234,7 +234,7 @@ SOURCE_FILE@0..519 R_BRACK@220..221 "]" WHITESPACE@221..222 " " PARAM@222..232 - BIND_PAT@222..227 + IDENT_PAT@222..227 MUT_KW@222..225 "mut" WHITESPACE@225..226 " " NAME@226..227 diff --git a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast index fd4f4f242..350823ba3 100644 --- a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast +++ b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..80 FOR_EXPR@14..77 FOR_KW@14..17 "for" WHITESPACE@17..18 " " - BIND_PAT@18..20 + IDENT_PAT@18..20 NAME@18..20 IDENT@18..20 "_x" WHITESPACE@20..21 " " diff --git a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast index 53410a1ee..76301004a 100644 --- a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast +++ b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast @@ -7,7 +7,7 @@ SOURCE_FILE@0..50 PARAM_LIST@6..14 L_PAREN@6..7 "(" PARAM@7..13 - BIND_PAT@7..8 + IDENT_PAT@7..8 NAME@7..8 IDENT@7..8 "x" COLON@8..9 ":" 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 9d88e4cbf..42680b283 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 @@ -18,12 +18,12 @@ SOURCE_FILE@0..170 PARAM@20..42 TUPLE_PAT@20..26 L_PAREN@20..21 "(" - BIND_PAT@21..22 + IDENT_PAT@21..22 NAME@21..22 IDENT@21..22 "a" COMMA@22..23 "," WHITESPACE@23..24 " " - BIND_PAT@24..25 + IDENT_PAT@24..25 NAME@24..25 IDENT@24..25 "b" R_PAREN@25..26 ")" @@ -68,13 +68,13 @@ SOURCE_FILE@0..170 L_CURLY@59..60 "{" WHITESPACE@60..61 " " RECORD_PAT_FIELD@61..62 - BIND_PAT@61..62 + IDENT_PAT@61..62 NAME@61..62 IDENT@61..62 "a" COMMA@62..63 "," WHITESPACE@63..64 " " RECORD_PAT_FIELD@64..65 - BIND_PAT@64..65 + IDENT_PAT@64..65 NAME@64..65 IDENT@64..65 "b" WHITESPACE@65..66 " " @@ -106,7 +106,7 @@ SOURCE_FILE@0..170 NAME_REF@85..92 IDENT@85..92 "NewType" L_PAREN@92..93 "(" - BIND_PAT@93..94 + IDENT_PAT@93..94 NAME@93..94 IDENT@93..94 "a" R_PAREN@94..95 ")" @@ -135,7 +135,7 @@ SOURCE_FILE@0..170 AMP@119..120 "&" REF_PAT@120..122 AMP@120..121 "&" - BIND_PAT@121..122 + IDENT_PAT@121..122 NAME@121..122 IDENT@121..122 "a" COLON@122..123 ":" @@ -175,7 +175,7 @@ SOURCE_FILE@0..170 COMMA@153..154 "," WHITESPACE@154..155 " " PARAM@155..165 - BIND_PAT@155..160 + IDENT_PAT@155..160 MUT_KW@155..158 "mut" WHITESPACE@158..159 " " NAME@159..160 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 d8bf1f8c8..a132591f0 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 @@ -108,17 +108,17 @@ SOURCE_FILE@0..126 PARAM@106..120 SLICE_PAT@106..115 L_BRACK@106..107 "[" - BIND_PAT@107..108 + IDENT_PAT@107..108 NAME@107..108 IDENT@107..108 "w" COMMA@108..109 "," WHITESPACE@109..110 " " - BIND_PAT@110..111 + IDENT_PAT@110..111 NAME@110..111 IDENT@110..111 "t" COMMA@111..112 "," WHITESPACE@112..113 " " - BIND_PAT@113..114 + IDENT_PAT@113..114 NAME@113..114 IDENT@113..114 "f" R_BRACK@114..115 "]" 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 087053f25..94260db7c 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 @@ -21,12 +21,12 @@ SOURCE_FILE@0..137 PARAM@19..41 TUPLE_PAT@19..25 L_PAREN@19..20 "(" - BIND_PAT@20..21 + IDENT_PAT@20..21 NAME@20..21 IDENT@20..21 "a" COMMA@21..22 "," WHITESPACE@22..23 " " - BIND_PAT@23..24 + IDENT_PAT@23..24 NAME@23..24 IDENT@23..24 "b" R_PAREN@24..25 ")" @@ -71,13 +71,13 @@ SOURCE_FILE@0..137 L_CURLY@58..59 "{" WHITESPACE@59..60 " " RECORD_PAT_FIELD@60..61 - BIND_PAT@60..61 + IDENT_PAT@60..61 NAME@60..61 IDENT@60..61 "a" COMMA@61..62 "," WHITESPACE@62..63 " " RECORD_PAT_FIELD@63..64 - BIND_PAT@63..64 + IDENT_PAT@63..64 NAME@63..64 IDENT@63..64 "b" WHITESPACE@64..65 " " @@ -109,7 +109,7 @@ SOURCE_FILE@0..137 NAME_REF@84..91 IDENT@84..91 "NewType" L_PAREN@91..92 "(" - BIND_PAT@92..93 + IDENT_PAT@92..93 NAME@92..93 IDENT@92..93 "a" R_PAREN@93..94 ")" @@ -138,7 +138,7 @@ SOURCE_FILE@0..137 AMP@118..119 "&" REF_PAT@119..121 AMP@119..120 "&" - BIND_PAT@120..121 + IDENT_PAT@120..121 NAME@120..121 IDENT@120..121 "a" COLON@121..122 ":" 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 a368ac1e8..fae9467fc 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 @@ -245,7 +245,7 @@ SOURCE_FILE@0..374 PARAM_LIST@239..247 L_PAREN@239..240 "(" PARAM@240..246 - BIND_PAT@240..242 + IDENT_PAT@240..242 NAME@240..242 IDENT@240..242 "_t" COLON@242..243 ":" -- cgit v1.2.3