From 14cb96ec0e6be3b99bfe4ea373c058dcbd2a4f79 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 31 Jul 2020 19:54:16 +0200 Subject: Allign RecordPat with RecordExpr --- .../test_data/parser/inline/ok/0008_path_part.rast | 2 +- .../parser/inline/ok/0102_record_field_pat_list.rast | 16 ++++++++-------- .../test_data/parser/inline/ok/0143_box_pat.rast | 6 +++--- .../parser/inline/ok/0145_record_field_pat.rast | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/inline/ok') diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast index 3ce2acfae..d848f3c88 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast @@ -58,7 +58,7 @@ SOURCE_FILE@0..103 NAME_REF@62..65 IDENT@62..65 "Bar" WHITESPACE@65..66 " " - RECORD_FIELD_PAT_LIST@66..72 + RECORD_PAT_FIELD_LIST@66..72 L_CURLY@66..67 "{" WHITESPACE@67..68 " " DOT2@68..70 ".." diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast index fe1c290c3..003c517ac 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast @@ -20,7 +20,7 @@ SOURCE_FILE@0..119 NAME_REF@19..20 IDENT@19..20 "S" WHITESPACE@20..21 " " - RECORD_FIELD_PAT_LIST@21..23 + RECORD_PAT_FIELD_LIST@21..23 L_CURLY@21..22 "{" R_CURLY@22..23 "}" WHITESPACE@23..24 " " @@ -40,16 +40,16 @@ SOURCE_FILE@0..119 NAME_REF@38..39 IDENT@38..39 "S" WHITESPACE@39..40 " " - RECORD_FIELD_PAT_LIST@40..56 + RECORD_PAT_FIELD_LIST@40..56 L_CURLY@40..41 "{" WHITESPACE@41..42 " " - RECORD_FIELD_PAT@42..43 + RECORD_PAT_FIELD@42..43 BIND_PAT@42..43 NAME@42..43 IDENT@42..43 "f" COMMA@43..44 "," WHITESPACE@44..45 " " - RECORD_FIELD_PAT@45..54 + RECORD_PAT_FIELD@45..54 BIND_PAT@45..54 REF_KW@45..48 "ref" WHITESPACE@48..49 " " @@ -76,10 +76,10 @@ SOURCE_FILE@0..119 NAME_REF@71..72 IDENT@71..72 "S" WHITESPACE@72..73 " " - RECORD_FIELD_PAT_LIST@73..84 + RECORD_PAT_FIELD_LIST@73..84 L_CURLY@73..74 "{" WHITESPACE@74..75 " " - RECORD_FIELD_PAT@75..79 + RECORD_PAT_FIELD@75..79 NAME_REF@75..76 IDENT@75..76 "h" COLON@76..77 ":" @@ -107,10 +107,10 @@ SOURCE_FILE@0..119 NAME_REF@99..100 IDENT@99..100 "S" WHITESPACE@100..101 " " - RECORD_FIELD_PAT_LIST@101..110 + RECORD_PAT_FIELD_LIST@101..110 L_CURLY@101..102 "{" WHITESPACE@102..103 " " - RECORD_FIELD_PAT@103..107 + RECORD_PAT_FIELD@103..107 NAME_REF@103..104 IDENT@103..104 "h" COLON@104..105 ":" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast index 09fd9e9b8..caae3e2dc 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast @@ -40,10 +40,10 @@ SOURCE_FILE@0..118 NAME_REF@44..49 IDENT@44..49 "Outer" WHITESPACE@49..50 " " - RECORD_FIELD_PAT_LIST@50..81 + RECORD_PAT_FIELD_LIST@50..81 L_CURLY@50..51 "{" WHITESPACE@51..52 " " - RECORD_FIELD_PAT@52..57 + RECORD_PAT_FIELD@52..57 BOX_PAT@52..57 BOX_KW@52..55 "box" WHITESPACE@55..56 " " @@ -52,7 +52,7 @@ SOURCE_FILE@0..118 IDENT@56..57 "i" COMMA@57..58 "," WHITESPACE@58..59 " " - RECORD_FIELD_PAT@59..79 + RECORD_PAT_FIELD@59..79 NAME_REF@59..60 IDENT@59..60 "j" COLON@60..61 ":" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast index b41ef4098..925409bdf 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast @@ -20,10 +20,10 @@ SOURCE_FILE@0..63 NAME_REF@19..20 IDENT@19..20 "S" WHITESPACE@20..21 " " - RECORD_FIELD_PAT_LIST@21..29 + RECORD_PAT_FIELD_LIST@21..29 L_CURLY@21..22 "{" WHITESPACE@22..23 " " - RECORD_FIELD_PAT@23..27 + RECORD_PAT_FIELD@23..27 NAME_REF@23..24 INT_NUMBER@23..24 "0" COLON@24..25 ":" @@ -50,10 +50,10 @@ SOURCE_FILE@0..63 NAME_REF@44..45 IDENT@44..45 "S" WHITESPACE@45..46 " " - RECORD_FIELD_PAT_LIST@46..54 + RECORD_PAT_FIELD_LIST@46..54 L_CURLY@46..47 "{" WHITESPACE@47..48 " " - RECORD_FIELD_PAT@48..52 + RECORD_PAT_FIELD@48..52 NAME_REF@48..49 IDENT@48..49 "x" COLON@49..50 ":" -- cgit v1.2.3 From 6791eb9685375da94556bb910ea71f78b08be5ec Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 31 Jul 2020 20:07:21 +0200 Subject: Rename PalceholderPat -> WildcardPat --- .../parser/inline/ok/0026_tuple_pat_fields.rast | 6 +++--- .../test_data/parser/inline/ok/0030_cond.rast | 14 +++++++------- .../test_data/parser/inline/ok/0042_call_expr.rast | 6 +++--- .../test_data/parser/inline/ok/0053_path_expr.rast | 8 ++++---- .../parser/inline/ok/0059_match_arms_commas.rast | 6 +++--- .../test_data/parser/inline/ok/0066_match_arm.rast | 4 ++-- .../inline/ok/0070_stmt_bin_expr_ambiguity.rast | 2 +- .../test_data/parser/inline/ok/0071_match_expr.rast | 2 +- .../inline/ok/0074_stmt_postfix_expr_ambiguity.rast | 2 +- .../test_data/parser/inline/ok/0075_block.rast | 2 +- .../parser/inline/ok/0080_postfix_range.rast | 4 ++-- .../test_data/parser/inline/ok/0082_ref_expr.rast | 12 ++++++------ .../parser/inline/ok/0085_expr_literals.rast | 20 ++++++++++---------- .../parser/inline/ok/0095_placeholder_pat.rast | 2 +- .../parser/inline/ok/0096_no_semi_after_block.rast | 2 +- .../parser/inline/ok/0102_record_field_pat_list.rast | 4 ++-- .../test_data/parser/inline/ok/0112_bind_pat.rast | 4 ++-- .../test_data/parser/inline/ok/0118_match_guard.rast | 2 +- .../inline/ok/0120_match_arms_inner_attribute.rast | 2 +- .../inline/ok/0121_match_arms_outer_attributes.rast | 6 +++--- .../ok/0122_generic_lifetime_type_attribute.rast | 2 +- .../test_data/parser/inline/ok/0130_let_stmt.rast | 2 +- .../parser/inline/ok/0130_try_block_expr.rast | 2 +- .../parser/inline/ok/0146_as_precedence.rast | 2 +- .../test_data/parser/inline/ok/0156_or_pattern.rast | 16 ++++++++-------- .../inline/ok/0157_fn_pointer_unnamed_arg.rast | 2 +- 26 files changed, 68 insertions(+), 68 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/inline/ok') diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast index e5f550347..45d17e800 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast @@ -38,7 +38,7 @@ SOURCE_FILE@0..97 NAME_REF@37..38 IDENT@37..38 "S" L_PAREN@38..39 "(" - PLACEHOLDER_PAT@39..40 + WILDCARD_PAT@39..40 UNDERSCORE@39..40 "_" R_PAREN@40..41 ")" WHITESPACE@41..42 " " @@ -58,7 +58,7 @@ SOURCE_FILE@0..97 NAME_REF@56..57 IDENT@56..57 "S" L_PAREN@57..58 "(" - PLACEHOLDER_PAT@58..59 + WILDCARD_PAT@58..59 UNDERSCORE@58..59 "_" COMMA@59..60 "," R_PAREN@60..61 ")" @@ -79,7 +79,7 @@ SOURCE_FILE@0..97 NAME_REF@76..77 IDENT@76..77 "S" L_PAREN@77..78 "(" - PLACEHOLDER_PAT@78..79 + WILDCARD_PAT@78..79 UNDERSCORE@78..79 "_" COMMA@79..80 "," WHITESPACE@80..81 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast index 381284dc5..58a97d3ad 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast @@ -23,7 +23,7 @@ SOURCE_FILE@0..197 NAME_REF@18..22 IDENT@18..22 "Some" L_PAREN@22..23 "(" - PLACEHOLDER_PAT@23..24 + WILDCARD_PAT@23..24 UNDERSCORE@23..24 "_" R_PAREN@24..25 ")" WHITESPACE@25..26 " " @@ -67,7 +67,7 @@ SOURCE_FILE@0..197 NAME_REF@60..64 IDENT@60..64 "Some" L_PAREN@64..65 "(" - PLACEHOLDER_PAT@65..66 + WILDCARD_PAT@65..66 UNDERSCORE@65..66 "_" R_PAREN@66..67 ")" WHITESPACE@67..68 " " @@ -79,7 +79,7 @@ SOURCE_FILE@0..197 NAME_REF@70..74 IDENT@70..74 "Some" L_PAREN@74..75 "(" - PLACEHOLDER_PAT@75..76 + WILDCARD_PAT@75..76 UNDERSCORE@75..76 "_" R_PAREN@76..77 ")" WHITESPACE@77..78 " " @@ -110,7 +110,7 @@ SOURCE_FILE@0..197 NAME_REF@101..105 IDENT@101..105 "Some" L_PAREN@105..106 "(" - PLACEHOLDER_PAT@106..107 + WILDCARD_PAT@106..107 UNDERSCORE@106..107 "_" R_PAREN@107..108 ")" WHITESPACE@108..109 " " @@ -140,7 +140,7 @@ SOURCE_FILE@0..197 NAME_REF@133..137 IDENT@133..137 "Some" L_PAREN@137..138 "(" - PLACEHOLDER_PAT@138..139 + WILDCARD_PAT@138..139 UNDERSCORE@138..139 "_" R_PAREN@139..140 ")" WHITESPACE@140..141 " " @@ -152,7 +152,7 @@ SOURCE_FILE@0..197 NAME_REF@143..147 IDENT@143..147 "Some" L_PAREN@147..148 "(" - PLACEHOLDER_PAT@148..149 + WILDCARD_PAT@148..149 UNDERSCORE@148..149 "_" R_PAREN@149..150 ")" WHITESPACE@150..151 " " @@ -182,7 +182,7 @@ SOURCE_FILE@0..197 NAME_REF@177..181 IDENT@177..181 "Some" L_PAREN@181..182 "(" - PLACEHOLDER_PAT@182..183 + WILDCARD_PAT@182..183 UNDERSCORE@182..183 "_" R_PAREN@183..184 ")" WHITESPACE@184..185 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast index 40875ae1e..fa38e9466 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..118 LET_STMT@15..27 LET_KW@15..18 "let" WHITESPACE@18..19 " " - PLACEHOLDER_PAT@19..20 + WILDCARD_PAT@19..20 UNDERSCORE@19..20 "_" WHITESPACE@20..21 " " EQ@21..22 "=" @@ -33,7 +33,7 @@ SOURCE_FILE@0..118 LET_STMT@32..54 LET_KW@32..35 "let" WHITESPACE@35..36 " " - PLACEHOLDER_PAT@36..37 + WILDCARD_PAT@36..37 UNDERSCORE@36..37 "_" WHITESPACE@37..38 " " EQ@38..39 "=" @@ -69,7 +69,7 @@ SOURCE_FILE@0..118 LET_STMT@59..84 LET_KW@59..62 "let" WHITESPACE@62..63 " " - PLACEHOLDER_PAT@63..64 + WILDCARD_PAT@63..64 UNDERSCORE@63..64 "_" WHITESPACE@64..65 " " EQ@65..66 "=" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast index de2016f18..c34cfeb31 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..91 LET_STMT@15..25 LET_KW@15..18 "let" WHITESPACE@18..19 " " - PLACEHOLDER_PAT@19..20 + WILDCARD_PAT@19..20 UNDERSCORE@19..20 "_" WHITESPACE@20..21 " " EQ@21..22 "=" @@ -29,7 +29,7 @@ SOURCE_FILE@0..91 LET_STMT@30..43 LET_KW@30..33 "let" WHITESPACE@33..34 " " - PLACEHOLDER_PAT@34..35 + WILDCARD_PAT@34..35 UNDERSCORE@34..35 "_" WHITESPACE@35..36 " " EQ@36..37 "=" @@ -49,7 +49,7 @@ SOURCE_FILE@0..91 LET_STMT@48..65 LET_KW@48..51 "let" WHITESPACE@51..52 " " - PLACEHOLDER_PAT@52..53 + WILDCARD_PAT@52..53 UNDERSCORE@52..53 "_" WHITESPACE@53..54 " " EQ@54..55 "=" @@ -75,7 +75,7 @@ SOURCE_FILE@0..91 LET_STMT@70..88 LET_KW@70..73 "let" WHITESPACE@73..74 " " - PLACEHOLDER_PAT@74..75 + WILDCARD_PAT@74..75 UNDERSCORE@74..75 "_" WHITESPACE@75..76 " " EQ@76..77 "=" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast index fa659c19b..984829317 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast @@ -22,7 +22,7 @@ SOURCE_FILE@0..83 L_CURLY@24..25 "{" WHITESPACE@25..34 "\n " MATCH_ARM@34..41 - PLACEHOLDER_PAT@34..35 + WILDCARD_PAT@34..35 UNDERSCORE@34..35 "_" WHITESPACE@35..36 " " FAT_ARROW@36..38 "=>" @@ -33,7 +33,7 @@ SOURCE_FILE@0..83 COMMA@41..42 "," WHITESPACE@42..51 "\n " MATCH_ARM@51..58 - PLACEHOLDER_PAT@51..52 + WILDCARD_PAT@51..52 UNDERSCORE@51..52 "_" WHITESPACE@52..53 " " FAT_ARROW@53..55 "=>" @@ -43,7 +43,7 @@ SOURCE_FILE@0..83 R_CURLY@57..58 "}" WHITESPACE@58..67 "\n " MATCH_ARM@67..74 - PLACEHOLDER_PAT@67..68 + WILDCARD_PAT@67..68 UNDERSCORE@67..68 "_" WHITESPACE@68..69 " " FAT_ARROW@69..71 "=>" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast index 37ca478e6..d873a7ecb 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast @@ -23,7 +23,7 @@ SOURCE_FILE@0..167 L_CURLY@24..25 "{" WHITESPACE@25..34 "\n " MATCH_ARM@34..41 - PLACEHOLDER_PAT@34..35 + WILDCARD_PAT@34..35 UNDERSCORE@34..35 "_" WHITESPACE@35..36 " " FAT_ARROW@36..38 "=>" @@ -34,7 +34,7 @@ SOURCE_FILE@0..167 COMMA@41..42 "," WHITESPACE@42..51 "\n " MATCH_ARM@51..83 - PLACEHOLDER_PAT@51..52 + WILDCARD_PAT@51..52 UNDERSCORE@51..52 "_" WHITESPACE@52..53 " " MATCH_GUARD@53..77 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast index 4c1165dc8..36c9cd5bb 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..46 LET_STMT@15..31 LET_KW@15..18 "let" WHITESPACE@18..19 " " - PLACEHOLDER_PAT@19..20 + WILDCARD_PAT@19..20 UNDERSCORE@19..20 "_" WHITESPACE@20..21 " " EQ@21..22 "=" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast index 673d396ee..d34d98ced 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast @@ -53,7 +53,7 @@ SOURCE_FILE@0..97 L_CURLY@59..60 "{" WHITESPACE@60..61 " " MATCH_ARM@61..68 - PLACEHOLDER_PAT@61..62 + WILDCARD_PAT@61..62 UNDERSCORE@61..62 "_" WHITESPACE@62..63 " " FAT_ARROW@63..65 "=>" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast index 3ca70f021..3a789b9f5 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast @@ -22,7 +22,7 @@ SOURCE_FILE@0..84 L_CURLY@24..25 "{" WHITESPACE@25..34 "\n " MATCH_ARM@34..41 - PLACEHOLDER_PAT@34..35 + WILDCARD_PAT@34..35 UNDERSCORE@34..35 "_" WHITESPACE@35..36 " " FAT_ARROW@36..38 "=>" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast index 5cefc5076..e847ce9b2 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast @@ -27,7 +27,7 @@ SOURCE_FILE@0..65 LET_STMT@19..29 LET_KW@19..22 "let" WHITESPACE@22..23 " " - PLACEHOLDER_PAT@23..24 + WILDCARD_PAT@23..24 UNDERSCORE@23..24 "_" WHITESPACE@24..25 " " EQ@25..26 "=" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast index 3c80846db..0c19d29c6 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast @@ -39,7 +39,7 @@ SOURCE_FILE@0..89 L_CURLY@42..43 "{" WHITESPACE@43..44 " " MATCH_ARM@44..51 - PLACEHOLDER_PAT@44..45 + WILDCARD_PAT@44..45 UNDERSCORE@44..45 "_" WHITESPACE@45..46 " " FAT_ARROW@46..48 "=>" @@ -79,7 +79,7 @@ SOURCE_FILE@0..89 L_CURLY@74..75 "{" WHITESPACE@75..76 " " MATCH_ARM@76..83 - PLACEHOLDER_PAT@76..77 + WILDCARD_PAT@76..77 UNDERSCORE@76..77 "_" WHITESPACE@77..78 " " FAT_ARROW@78..80 "=>" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast index 1563b1988..70b975c0b 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast @@ -16,7 +16,7 @@ SOURCE_FILE@0..200 LET_STMT@41..52 LET_KW@41..44 "let" WHITESPACE@44..45 " " - PLACEHOLDER_PAT@45..46 + WILDCARD_PAT@45..46 UNDERSCORE@45..46 "_" WHITESPACE@46..47 " " EQ@47..48 "=" @@ -30,7 +30,7 @@ SOURCE_FILE@0..200 LET_STMT@57..75 LET_KW@57..60 "let" WHITESPACE@60..61 " " - PLACEHOLDER_PAT@61..62 + WILDCARD_PAT@61..62 UNDERSCORE@61..62 "_" WHITESPACE@62..63 " " EQ@63..64 "=" @@ -55,7 +55,7 @@ SOURCE_FILE@0..200 LET_STMT@80..93 LET_KW@80..83 "let" WHITESPACE@83..84 " " - PLACEHOLDER_PAT@84..85 + WILDCARD_PAT@84..85 UNDERSCORE@84..85 "_" WHITESPACE@85..86 " " EQ@86..87 "=" @@ -72,7 +72,7 @@ SOURCE_FILE@0..200 LET_STMT@98..113 LET_KW@98..101 "let" WHITESPACE@101..102 " " - PLACEHOLDER_PAT@102..103 + WILDCARD_PAT@102..103 UNDERSCORE@102..103 "_" WHITESPACE@103..104 " " EQ@104..105 "=" @@ -95,7 +95,7 @@ SOURCE_FILE@0..200 LET_STMT@148..169 LET_KW@148..151 "let" WHITESPACE@151..152 " " - PLACEHOLDER_PAT@152..153 + WILDCARD_PAT@152..153 UNDERSCORE@152..153 "_" WHITESPACE@153..154 " " EQ@154..155 "=" @@ -116,7 +116,7 @@ SOURCE_FILE@0..200 LET_STMT@174..197 LET_KW@174..177 "let" WHITESPACE@177..178 " " - PLACEHOLDER_PAT@178..179 + WILDCARD_PAT@178..179 UNDERSCORE@178..179 "_" WHITESPACE@179..180 " " EQ@180..181 "=" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast index ded36949a..9a87b5b93 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..189 LET_STMT@15..28 LET_KW@15..18 "let" WHITESPACE@18..19 " " - PLACEHOLDER_PAT@19..20 + WILDCARD_PAT@19..20 UNDERSCORE@19..20 "_" WHITESPACE@20..21 " " EQ@21..22 "=" @@ -26,7 +26,7 @@ SOURCE_FILE@0..189 LET_STMT@33..47 LET_KW@33..36 "let" WHITESPACE@36..37 " " - PLACEHOLDER_PAT@37..38 + WILDCARD_PAT@37..38 UNDERSCORE@37..38 "_" WHITESPACE@38..39 " " EQ@39..40 "=" @@ -38,7 +38,7 @@ SOURCE_FILE@0..189 LET_STMT@52..62 LET_KW@52..55 "let" WHITESPACE@55..56 " " - PLACEHOLDER_PAT@56..57 + WILDCARD_PAT@56..57 UNDERSCORE@56..57 "_" WHITESPACE@57..58 " " EQ@58..59 "=" @@ -50,7 +50,7 @@ SOURCE_FILE@0..189 LET_STMT@67..79 LET_KW@67..70 "let" WHITESPACE@70..71 " " - PLACEHOLDER_PAT@71..72 + WILDCARD_PAT@71..72 UNDERSCORE@71..72 "_" WHITESPACE@72..73 " " EQ@73..74 "=" @@ -62,7 +62,7 @@ SOURCE_FILE@0..189 LET_STMT@84..97 LET_KW@84..87 "let" WHITESPACE@87..88 " " - PLACEHOLDER_PAT@88..89 + WILDCARD_PAT@88..89 UNDERSCORE@88..89 "_" WHITESPACE@89..90 " " EQ@90..91 "=" @@ -74,7 +74,7 @@ SOURCE_FILE@0..189 LET_STMT@102..114 LET_KW@102..105 "let" WHITESPACE@105..106 " " - PLACEHOLDER_PAT@106..107 + WILDCARD_PAT@106..107 UNDERSCORE@106..107 "_" WHITESPACE@107..108 " " EQ@108..109 "=" @@ -86,7 +86,7 @@ SOURCE_FILE@0..189 LET_STMT@119..131 LET_KW@119..122 "let" WHITESPACE@122..123 " " - PLACEHOLDER_PAT@123..124 + WILDCARD_PAT@123..124 UNDERSCORE@123..124 "_" WHITESPACE@124..125 " " EQ@125..126 "=" @@ -98,7 +98,7 @@ SOURCE_FILE@0..189 LET_STMT@136..149 LET_KW@136..139 "let" WHITESPACE@139..140 " " - PLACEHOLDER_PAT@140..141 + WILDCARD_PAT@140..141 UNDERSCORE@140..141 "_" WHITESPACE@141..142 " " EQ@142..143 "=" @@ -110,7 +110,7 @@ SOURCE_FILE@0..189 LET_STMT@154..167 LET_KW@154..157 "let" WHITESPACE@157..158 " " - PLACEHOLDER_PAT@158..159 + WILDCARD_PAT@158..159 UNDERSCORE@158..159 "_" WHITESPACE@159..160 " " EQ@160..161 "=" @@ -122,7 +122,7 @@ SOURCE_FILE@0..189 LET_STMT@172..186 LET_KW@172..175 "let" WHITESPACE@175..176 " " - PLACEHOLDER_PAT@176..177 + WILDCARD_PAT@176..177 UNDERSCORE@176..177 "_" WHITESPACE@177..178 " " EQ@178..179 "=" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast index 25706d2a4..c1fdc6e25 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..26 LET_STMT@12..23 LET_KW@12..15 "let" WHITESPACE@15..16 " " - PLACEHOLDER_PAT@16..17 + WILDCARD_PAT@16..17 UNDERSCORE@16..17 "_" WHITESPACE@17..18 " " EQ@18..19 "=" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast index cb5316a0d..e757249f0 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast @@ -59,7 +59,7 @@ SOURCE_FILE@0..167 FOR_EXPR@76..90 FOR_KW@76..79 "for" WHITESPACE@79..80 " " - PLACEHOLDER_PAT@80..81 + WILDCARD_PAT@80..81 UNDERSCORE@80..81 "_" WHITESPACE@81..82 " " IN_KW@82..84 "in" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast index 003c517ac..d0f70e9d7 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast @@ -84,7 +84,7 @@ SOURCE_FILE@0..119 IDENT@75..76 "h" COLON@76..77 ":" WHITESPACE@77..78 " " - PLACEHOLDER_PAT@78..79 + WILDCARD_PAT@78..79 UNDERSCORE@78..79 "_" COMMA@79..80 "," WHITESPACE@80..81 " " @@ -115,7 +115,7 @@ SOURCE_FILE@0..119 IDENT@103..104 "h" COLON@104..105 ":" WHITESPACE@105..106 " " - PLACEHOLDER_PAT@106..107 + WILDCARD_PAT@106..107 UNDERSCORE@106..107 "_" COMMA@107..108 "," WHITESPACE@108..109 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast index 3cd554d45..65d5944c0 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast @@ -84,7 +84,7 @@ SOURCE_FILE@0..146 WHITESPACE@101..102 " " AT@102..103 "@" WHITESPACE@103..104 " " - PLACEHOLDER_PAT@104..105 + WILDCARD_PAT@104..105 UNDERSCORE@104..105 "_" WHITESPACE@105..106 " " EQ@106..107 "=" @@ -113,7 +113,7 @@ SOURCE_FILE@0..146 WHITESPACE@133..134 " " AT@134..135 "@" WHITESPACE@135..136 " " - PLACEHOLDER_PAT@136..137 + WILDCARD_PAT@136..137 UNDERSCORE@136..137 "_" WHITESPACE@137..138 " " EQ@138..139 "=" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast index aaaf803b7..0cf4eb0a5 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast @@ -22,7 +22,7 @@ SOURCE_FILE@0..58 L_CURLY@24..25 "{" WHITESPACE@25..34 "\n " MATCH_ARM@34..48 - PLACEHOLDER_PAT@34..35 + WILDCARD_PAT@34..35 UNDERSCORE@34..35 "_" WHITESPACE@35..36 " " MATCH_GUARD@36..42 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast index 4b5f9cdc9..ec7a00f1d 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast @@ -64,7 +64,7 @@ SOURCE_FILE@0..139 R_BRACK@112..113 "]" WHITESPACE@113..122 "\n " MATCH_ARM@122..129 - PLACEHOLDER_PAT@122..123 + WILDCARD_PAT@122..123 UNDERSCORE@122..123 "_" WHITESPACE@123..124 " " FAT_ARROW@124..126 "=>" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast index 54cc3be3a..97924da05 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast @@ -39,7 +39,7 @@ SOURCE_FILE@0..259 R_PAREN@56..57 ")" R_BRACK@57..58 "]" WHITESPACE@58..67 "\n " - PLACEHOLDER_PAT@67..68 + WILDCARD_PAT@67..68 UNDERSCORE@67..68 "_" WHITESPACE@68..69 " " FAT_ARROW@69..71 "=>" @@ -67,7 +67,7 @@ SOURCE_FILE@0..259 R_PAREN@107..108 ")" R_BRACK@108..109 "]" WHITESPACE@109..118 "\n " - PLACEHOLDER_PAT@118..119 + WILDCARD_PAT@118..119 UNDERSCORE@118..119 "_" WHITESPACE@119..120 " " FAT_ARROW@120..122 "=>" @@ -129,7 +129,7 @@ SOURCE_FILE@0..259 R_PAREN@231..232 ")" R_BRACK@232..233 "]" WHITESPACE@233..242 "\n " - PLACEHOLDER_PAT@242..243 + WILDCARD_PAT@242..243 UNDERSCORE@242..243 "_" WHITESPACE@243..244 " " FAT_ARROW@244..246 "=>" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast index edac8d5d9..8d029b592 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast @@ -43,7 +43,7 @@ SOURCE_FILE@0..64 PARAM_LIST@49..59 L_PAREN@49..50 "(" PARAM@50..58 - PLACEHOLDER_PAT@50..51 + WILDCARD_PAT@50..51 UNDERSCORE@50..51 "_" COLON@51..52 ":" WHITESPACE@52..53 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast index d2fd6e567..16d616bd4 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast @@ -82,7 +82,7 @@ SOURCE_FILE@0..135 LET_STMT@93..107 LET_KW@93..96 "let" WHITESPACE@96..97 " " - PLACEHOLDER_PAT@97..98 + WILDCARD_PAT@97..98 UNDERSCORE@97..98 "_" COLON@98..99 ":" WHITESPACE@99..100 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast index 0fe3bf582..ffdffe2f8 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..33 LET_STMT@15..30 LET_KW@15..18 "let" WHITESPACE@18..19 " " - PLACEHOLDER_PAT@19..20 + WILDCARD_PAT@19..20 UNDERSCORE@19..20 "_" WHITESPACE@20..21 " " EQ@21..22 "=" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast index 2d0c83458..ca739825a 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..43 LET_STMT@15..40 LET_KW@15..18 "let" WHITESPACE@18..19 " " - PLACEHOLDER_PAT@19..20 + WILDCARD_PAT@19..20 UNDERSCORE@19..20 "_" WHITESPACE@20..21 " " EQ@21..22 "=" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast b/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast index 4d4c41f1a..88a513cee 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast @@ -25,12 +25,12 @@ SOURCE_FILE@0..130 PAREN_PAT@35..42 L_PAREN@35..36 "(" OR_PAT@36..41 - PLACEHOLDER_PAT@36..37 + WILDCARD_PAT@36..37 UNDERSCORE@36..37 "_" WHITESPACE@37..38 " " PIPE@38..39 "|" WHITESPACE@39..40 " " - PLACEHOLDER_PAT@40..41 + WILDCARD_PAT@40..41 UNDERSCORE@40..41 "_" R_PAREN@41..42 ")" WHITESPACE@42..43 " " @@ -47,12 +47,12 @@ SOURCE_FILE@0..130 PAREN_PAT@59..66 L_PAREN@59..60 "(" OR_PAT@60..65 - PLACEHOLDER_PAT@60..61 + WILDCARD_PAT@60..61 UNDERSCORE@60..61 "_" WHITESPACE@61..62 " " PIPE@62..63 "|" WHITESPACE@63..64 " " - PLACEHOLDER_PAT@64..65 + WILDCARD_PAT@64..65 UNDERSCORE@64..65 "_" R_PAREN@65..66 ")" WHITESPACE@66..67 " " @@ -67,12 +67,12 @@ SOURCE_FILE@0..130 TUPLE_PAT@82..90 L_PAREN@82..83 "(" OR_PAT@83..88 - PLACEHOLDER_PAT@83..84 + WILDCARD_PAT@83..84 UNDERSCORE@83..84 "_" WHITESPACE@84..85 " " PIPE@85..86 "|" WHITESPACE@86..87 " " - PLACEHOLDER_PAT@87..88 + WILDCARD_PAT@87..88 UNDERSCORE@87..88 "_" COMMA@88..89 "," R_PAREN@89..90 ")" @@ -88,12 +88,12 @@ SOURCE_FILE@0..130 SLICE_PAT@106..114 L_BRACK@106..107 "[" OR_PAT@107..112 - PLACEHOLDER_PAT@107..108 + WILDCARD_PAT@107..108 UNDERSCORE@107..108 "_" WHITESPACE@108..109 " " PIPE@109..110 "|" WHITESPACE@110..111 " " - PLACEHOLDER_PAT@111..112 + WILDCARD_PAT@111..112 UNDERSCORE@111..112 "_" COMMA@112..113 "," R_BRACK@113..114 "]" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast index ccca045b6..3079e5bf8 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast @@ -12,7 +12,7 @@ SOURCE_FILE@0..23 PARAM_LIST@13..21 L_PAREN@13..14 "(" PARAM@14..20 - PLACEHOLDER_PAT@14..15 + WILDCARD_PAT@14..15 UNDERSCORE@14..15 "_" COLON@15..16 ":" WHITESPACE@16..17 " " -- cgit v1.2.3 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/inline/ok/0006_self_param.rast | 2 +- .../test_data/parser/inline/ok/0024_slice_pat.rast | 4 +- .../parser/inline/ok/0026_tuple_pat_fields.rast | 2 +- .../test_data/parser/inline/ok/0027_ref_pat.rast | 4 +- .../parser/inline/ok/0031_while_expr.rast | 2 +- .../test_data/parser/inline/ok/0066_match_arm.rast | 10 ++--- .../parser/inline/ok/0080_postfix_range.rast | 2 +- .../parser/inline/ok/0088_break_ambiguity.rast | 2 +- .../parser/inline/ok/0099_param_list.rast | 8 ++-- .../test_data/parser/inline/ok/0100_for_expr.rast | 2 +- .../inline/ok/0102_record_field_pat_list.rast | 4 +- .../parser/inline/ok/0106_lambda_expr.rast | 4 +- .../test_data/parser/inline/ok/0109_label.rast | 2 +- .../test_data/parser/inline/ok/0111_tuple_pat.rast | 6 +-- .../test_data/parser/inline/ok/0112_bind_pat.rast | 14 +++---- .../parser/inline/ok/0123_param_list_vararg.rast | 2 +- .../test_data/parser/inline/ok/0130_let_stmt.rast | 12 +++--- .../test_data/parser/inline/ok/0132_box_expr.rast | 6 +-- .../inline/ok/0138_associated_type_bounds.rast | 2 +- .../inline/ok/0138_expression_after_block.rast | 2 +- .../parser/inline/ok/0139_param_outer_arg.rast | 2 +- .../parser/inline/ok/0142_for_range_from.rast | 2 +- .../test_data/parser/inline/ok/0143_box_pat.rast | 8 ++-- .../parser/inline/ok/0144_dot_dot_pat.rast | 44 +++++++++++----------- .../ok/0154_fn_pointer_param_ident_path.rast | 2 +- .../parser/inline/ok/0155_closure_params.rast | 8 ++-- .../parser/inline/ok/0156_fn_def_param.rast | 4 +- 27 files changed, 81 insertions(+), 81 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/inline/ok') diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast index ae61cbad8..d24ad7423 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast @@ -79,7 +79,7 @@ SOURCE_FILE@0..128 COMMA@91..92 "," WHITESPACE@92..93 " " PARAM@93..99 - BIND_PAT@93..94 + IDENT_PAT@93..94 NAME@93..94 IDENT@93..94 "x" COLON@94..95 ":" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast index dea0c73f7..66f906fae 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast @@ -16,12 +16,12 @@ SOURCE_FILE@0..39 WHITESPACE@19..20 " " SLICE_PAT@20..30 L_BRACK@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" COMMA@25..26 "," diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast index 45d17e800..e049e4df7 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast @@ -88,7 +88,7 @@ SOURCE_FILE@0..97 WHITESPACE@83..84 " " COMMA@84..85 "," WHITESPACE@85..86 " " - BIND_PAT@86..87 + IDENT_PAT@86..87 NAME@86..87 IDENT@86..87 "x" R_PAREN@87..88 ")" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast index 9e76d881e..348b54dc9 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast @@ -16,7 +16,7 @@ SOURCE_FILE@0..52 WHITESPACE@19..20 " " REF_PAT@20..22 AMP@20..21 "&" - BIND_PAT@21..22 + IDENT_PAT@21..22 NAME@21..22 IDENT@21..22 "a" WHITESPACE@22..23 " " @@ -34,7 +34,7 @@ SOURCE_FILE@0..52 AMP@37..38 "&" MUT_KW@38..41 "mut" WHITESPACE@41..42 " " - BIND_PAT@42..43 + IDENT_PAT@42..43 NAME@42..43 IDENT@42..43 "b" WHITESPACE@43..44 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast index ffe1a3a01..173cecf6d 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast @@ -37,7 +37,7 @@ SOURCE_FILE@0..93 NAME_REF@44..48 IDENT@44..48 "Some" L_PAREN@48..49 "(" - BIND_PAT@49..50 + IDENT_PAT@49..50 NAME@49..50 IDENT@49..50 "x" R_PAREN@50..51 ")" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast index d873a7ecb..57d0661a5 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast @@ -74,13 +74,13 @@ SOURCE_FILE@0..167 WHITESPACE@84..93 "\n " MATCH_ARM@93..109 OR_PAT@93..98 - BIND_PAT@93..94 + IDENT_PAT@93..94 NAME@93..94 IDENT@93..94 "X" WHITESPACE@94..95 " " PIPE@95..96 "|" WHITESPACE@96..97 " " - BIND_PAT@97..98 + IDENT_PAT@97..98 NAME@97..98 IDENT@97..98 "Y" WHITESPACE@98..99 " " @@ -104,13 +104,13 @@ SOURCE_FILE@0..167 PIPE@119..120 "|" WHITESPACE@120..121 " " OR_PAT@121..126 - BIND_PAT@121..122 + IDENT_PAT@121..122 NAME@121..122 IDENT@121..122 "X" WHITESPACE@122..123 " " PIPE@123..124 "|" WHITESPACE@124..125 " " - BIND_PAT@125..126 + IDENT_PAT@125..126 NAME@125..126 IDENT@125..126 "Y" WHITESPACE@126..127 " " @@ -133,7 +133,7 @@ SOURCE_FILE@0..167 MATCH_ARM@147..156 PIPE@147..148 "|" WHITESPACE@148..149 " " - BIND_PAT@149..150 + IDENT_PAT@149..150 NAME@149..150 IDENT@149..150 "X" WHITESPACE@150..151 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast index 0c19d29c6..b3003577c 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..89 LET_STMT@15..27 LET_KW@15..18 "let" WHITESPACE@18..19 " " - BIND_PAT@19..20 + IDENT_PAT@19..20 NAME@19..20 IDENT@19..20 "x" WHITESPACE@20..21 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast index 34f520994..f7b839303 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast @@ -38,7 +38,7 @@ SOURCE_FILE@0..88 FOR_EXPR@49..66 FOR_KW@49..52 "for" WHITESPACE@52..53 " " - BIND_PAT@53..54 + IDENT_PAT@53..54 NAME@53..54 IDENT@53..54 "i" WHITESPACE@54..55 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast index 1627556c8..f19e9fd52 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast @@ -20,7 +20,7 @@ SOURCE_FILE@0..67 PARAM_LIST@14..22 L_PAREN@14..15 "(" PARAM@15..21 - BIND_PAT@15..16 + IDENT_PAT@15..16 NAME@15..16 IDENT@15..16 "x" COLON@16..17 ":" @@ -44,7 +44,7 @@ SOURCE_FILE@0..67 PARAM_LIST@30..40 L_PAREN@30..31 "(" PARAM@31..37 - BIND_PAT@31..32 + IDENT_PAT@31..32 NAME@31..32 IDENT@31..32 "x" COLON@32..33 ":" @@ -70,7 +70,7 @@ SOURCE_FILE@0..67 PARAM_LIST@48..63 L_PAREN@48..49 "(" PARAM@49..55 - BIND_PAT@49..50 + IDENT_PAT@49..50 NAME@49..50 IDENT@49..50 "x" COLON@50..51 ":" @@ -83,7 +83,7 @@ SOURCE_FILE@0..67 COMMA@55..56 "," WHITESPACE@56..57 " " PARAM@57..62 - BIND_PAT@57..58 + IDENT_PAT@57..58 NAME@57..58 IDENT@57..58 "y" COLON@58..59 ":" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast index 766de4efe..5c4055e44 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast @@ -15,7 +15,7 @@ SOURCE_FILE@0..33 FOR_EXPR@15..29 FOR_KW@15..18 "for" WHITESPACE@18..19 " " - BIND_PAT@19..20 + IDENT_PAT@19..20 NAME@19..20 IDENT@19..20 "x" WHITESPACE@20..21 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast index d0f70e9d7..866e60ed8 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast @@ -44,13 +44,13 @@ SOURCE_FILE@0..119 L_CURLY@40..41 "{" WHITESPACE@41..42 " " RECORD_PAT_FIELD@42..43 - BIND_PAT@42..43 + IDENT_PAT@42..43 NAME@42..43 IDENT@42..43 "f" COMMA@43..44 "," WHITESPACE@44..45 " " RECORD_PAT_FIELD@45..54 - BIND_PAT@45..54 + IDENT_PAT@45..54 REF_KW@45..48 "ref" WHITESPACE@48..49 " " MUT_KW@49..52 "mut" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast index a80d79563..9b8381619 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast @@ -51,7 +51,7 @@ SOURCE_FILE@0..134 PARAM_LIST@48..51 PIPE@48..49 "|" PARAM@49..50 - BIND_PAT@49..50 + IDENT_PAT@49..50 NAME@49..50 IDENT@49..50 "x" PIPE@50..51 "|" @@ -70,7 +70,7 @@ SOURCE_FILE@0..134 PARAM_LIST@64..73 PIPE@64..65 "|" PARAM@65..71 - BIND_PAT@65..66 + IDENT_PAT@65..66 NAME@65..66 IDENT@65..66 "x" COLON@66..67 ":" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast index a6a169f1b..c9588025c 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast @@ -46,7 +46,7 @@ SOURCE_FILE@0..74 WHITESPACE@56..57 " " FOR_KW@57..60 "for" WHITESPACE@60..61 " " - BIND_PAT@61..62 + IDENT_PAT@61..62 NAME@61..62 IDENT@61..62 "x" WHITESPACE@62..63 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast index 432318da0..f94a2ebde 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast @@ -16,12 +16,12 @@ SOURCE_FILE@0..94 WHITESPACE@19..20 " " TUPLE_PAT@20..30 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" COMMA@25..26 "," @@ -42,7 +42,7 @@ SOURCE_FILE@0..94 WHITESPACE@44..45 " " TUPLE_PAT@45..49 L_PAREN@45..46 "(" - BIND_PAT@46..47 + IDENT_PAT@46..47 NAME@46..47 IDENT@46..47 "a" COMMA@47..48 "," diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast index 65d5944c0..7b9a498c8 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..146 LET_STMT@16..27 LET_KW@16..19 "let" WHITESPACE@19..20 " " - BIND_PAT@20..21 + IDENT_PAT@20..21 NAME@20..21 IDENT@20..21 "a" WHITESPACE@21..22 " " @@ -28,7 +28,7 @@ SOURCE_FILE@0..146 LET_STMT@32..47 LET_KW@32..35 "let" WHITESPACE@35..36 " " - BIND_PAT@36..41 + IDENT_PAT@36..41 MUT_KW@36..39 "mut" WHITESPACE@39..40 " " NAME@40..41 @@ -44,7 +44,7 @@ SOURCE_FILE@0..146 LET_STMT@52..67 LET_KW@52..55 "let" WHITESPACE@55..56 " " - BIND_PAT@56..61 + IDENT_PAT@56..61 REF_KW@56..59 "ref" WHITESPACE@59..60 " " NAME@60..61 @@ -60,7 +60,7 @@ SOURCE_FILE@0..146 LET_STMT@72..91 LET_KW@72..75 "let" WHITESPACE@75..76 " " - BIND_PAT@76..85 + IDENT_PAT@76..85 REF_KW@76..79 "ref" WHITESPACE@79..80 " " MUT_KW@80..83 "mut" @@ -78,7 +78,7 @@ SOURCE_FILE@0..146 LET_STMT@96..111 LET_KW@96..99 "let" WHITESPACE@99..100 " " - BIND_PAT@100..105 + IDENT_PAT@100..105 NAME@100..101 IDENT@100..101 "e" WHITESPACE@101..102 " " @@ -97,7 +97,7 @@ SOURCE_FILE@0..146 LET_STMT@116..143 LET_KW@116..119 "let" WHITESPACE@119..120 " " - BIND_PAT@120..137 + IDENT_PAT@120..137 REF_KW@120..123 "ref" WHITESPACE@123..124 " " MUT_KW@124..127 "mut" @@ -107,7 +107,7 @@ SOURCE_FILE@0..146 WHITESPACE@129..130 " " AT@130..131 "@" WHITESPACE@131..132 " " - BIND_PAT@132..137 + IDENT_PAT@132..137 NAME@132..133 IDENT@132..133 "g" WHITESPACE@133..134 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast index f155743cf..27c4f141f 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast @@ -16,7 +16,7 @@ SOURCE_FILE@0..57 PARAM_LIST@22..46 L_PAREN@22..23 "(" PARAM@23..40 - BIND_PAT@23..29 + IDENT_PAT@23..29 NAME@23..29 IDENT@23..29 "format" COLON@29..30 ":" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast index 16d616bd4..4c07cefa6 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..135 LET_STMT@15..21 LET_KW@15..18 "let" WHITESPACE@18..19 " " - BIND_PAT@19..20 + IDENT_PAT@19..20 NAME@19..20 IDENT@19..20 "a" SEMICOLON@20..21 ";" @@ -22,7 +22,7 @@ SOURCE_FILE@0..135 LET_STMT@26..37 LET_KW@26..29 "let" WHITESPACE@29..30 " " - BIND_PAT@30..31 + IDENT_PAT@30..31 NAME@30..31 IDENT@30..31 "b" COLON@31..32 ":" @@ -37,7 +37,7 @@ SOURCE_FILE@0..135 LET_STMT@42..53 LET_KW@42..45 "let" WHITESPACE@45..46 " " - BIND_PAT@46..47 + IDENT_PAT@46..47 NAME@46..47 IDENT@46..47 "c" WHITESPACE@47..48 " " @@ -50,7 +50,7 @@ SOURCE_FILE@0..135 LET_STMT@58..74 LET_KW@58..61 "let" WHITESPACE@61..62 " " - BIND_PAT@62..63 + IDENT_PAT@62..63 NAME@62..63 IDENT@62..63 "d" COLON@63..64 ":" @@ -70,7 +70,7 @@ SOURCE_FILE@0..135 LET_STMT@79..88 LET_KW@79..82 "let" WHITESPACE@82..83 " " - BIND_PAT@83..84 + IDENT_PAT@83..84 NAME@83..84 IDENT@83..84 "e" COLON@84..85 ":" @@ -99,7 +99,7 @@ SOURCE_FILE@0..135 LET_STMT@112..132 LET_KW@112..115 "let" WHITESPACE@115..116 " " - BIND_PAT@116..117 + IDENT_PAT@116..117 NAME@116..117 IDENT@116..117 "f" WHITESPACE@117..118 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast index 48f483813..c55038247 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..106 LET_STMT@15..32 LET_KW@15..18 "let" WHITESPACE@18..19 " " - BIND_PAT@19..20 + IDENT_PAT@19..20 NAME@19..20 IDENT@19..20 "x" WHITESPACE@20..21 " " @@ -30,7 +30,7 @@ SOURCE_FILE@0..106 LET_STMT@37..66 LET_KW@37..40 "let" WHITESPACE@40..41 " " - BIND_PAT@41..42 + IDENT_PAT@41..42 NAME@41..42 IDENT@41..42 "y" WHITESPACE@42..43 " " @@ -56,7 +56,7 @@ SOURCE_FILE@0..106 LET_STMT@71..103 LET_KW@71..74 "let" WHITESPACE@74..75 " " - BIND_PAT@75..76 + IDENT_PAT@75..76 NAME@75..76 IDENT@75..76 "z" WHITESPACE@76..77 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast index e0a82df75..3870ec135 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast @@ -37,7 +37,7 @@ SOURCE_FILE@0..59 PARAM_LIST@40..55 L_PAREN@40..41 "(" PARAM@41..54 - BIND_PAT@41..51 + IDENT_PAT@41..51 NAME@41..51 IDENT@41..51 "printables" COLON@51..52 ":" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast index a7f87c020..f7c0e0ab0 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..52 LET_STMT@14..34 LET_KW@14..17 "let" WHITESPACE@17..18 " " - BIND_PAT@18..23 + IDENT_PAT@18..23 MUT_KW@18..21 "mut" WHITESPACE@21..22 " " NAME@22..23 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast index 36fd2997b..495e4c51b 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast @@ -16,7 +16,7 @@ SOURCE_FILE@0..28 R_BRACK@12..13 "]" WHITESPACE@13..14 " " PARAM@14..23 - BIND_PAT@14..17 + IDENT_PAT@14..17 NAME@14..17 IDENT@14..17 "pat" COLON@17..18 ":" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast b/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast index d11019076..36e448c94 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..51 FOR_EXPR@14..48 FOR_KW@14..17 "for" WHITESPACE@17..18 " " - BIND_PAT@18..19 + IDENT_PAT@18..19 NAME@18..19 IDENT@18..19 "x" WHITESPACE@19..20 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast index caae3e2dc..65887b962 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast @@ -17,7 +17,7 @@ SOURCE_FILE@0..118 BOX_PAT@20..25 BOX_KW@20..23 "box" WHITESPACE@23..24 " " - BIND_PAT@24..25 + IDENT_PAT@24..25 NAME@24..25 IDENT@24..25 "i" WHITESPACE@25..26 " " @@ -47,7 +47,7 @@ SOURCE_FILE@0..118 BOX_PAT@52..57 BOX_KW@52..55 "box" WHITESPACE@55..56 " " - BIND_PAT@56..57 + IDENT_PAT@56..57 NAME@56..57 IDENT@56..57 "i" COMMA@57..58 "," @@ -71,7 +71,7 @@ SOURCE_FILE@0..118 WHITESPACE@75..76 " " REF_PAT@76..78 AMP@76..77 "&" - BIND_PAT@77..78 + IDENT_PAT@77..78 NAME@77..78 IDENT@77..78 "x" R_PAREN@78..79 ")" @@ -91,7 +91,7 @@ SOURCE_FILE@0..118 BOX_PAT@96..109 BOX_KW@96..99 "box" WHITESPACE@99..100 " " - BIND_PAT@100..109 + IDENT_PAT@100..109 REF_KW@100..103 "ref" WHITESPACE@103..104 " " MUT_KW@104..107 "mut" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast index 8d0f1ead5..8fb0db031 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast @@ -35,7 +35,7 @@ SOURCE_FILE@0..555 WHITESPACE@64..65 " " TUPLE_PAT@65..72 L_PAREN@65..66 "(" - BIND_PAT@66..67 + IDENT_PAT@66..67 NAME@66..67 IDENT@66..67 "a" COMMA@67..68 "," @@ -56,7 +56,7 @@ SOURCE_FILE@0..555 WHITESPACE@86..87 " " TUPLE_PAT@87..95 L_PAREN@87..88 "(" - BIND_PAT@88..89 + IDENT_PAT@88..89 NAME@88..89 IDENT@88..89 "a" COMMA@89..90 "," @@ -82,7 +82,7 @@ SOURCE_FILE@0..555 NAME_REF@110..115 IDENT@110..115 "Tuple" L_PAREN@115..116 "(" - BIND_PAT@116..117 + IDENT_PAT@116..117 NAME@116..117 IDENT@116..117 "a" COMMA@117..118 "," @@ -107,7 +107,7 @@ SOURCE_FILE@0..555 NAME_REF@137..142 IDENT@137..142 "Tuple" L_PAREN@142..143 "(" - BIND_PAT@143..144 + IDENT_PAT@143..144 NAME@143..144 IDENT@143..144 "a" COMMA@144..145 "," @@ -177,7 +177,7 @@ SOURCE_FILE@0..555 DOT2@217..219 ".." COMMA@219..220 "," WHITESPACE@220..221 " " - BIND_PAT@221..222 + IDENT_PAT@221..222 NAME@221..222 IDENT@221..222 "a" COMMA@222..223 "," @@ -206,7 +206,7 @@ SOURCE_FILE@0..555 DOT2@248..250 ".." COMMA@250..251 "," WHITESPACE@251..252 " " - BIND_PAT@252..253 + IDENT_PAT@252..253 NAME@252..253 IDENT@252..253 "a" COMMA@253..254 "," @@ -249,7 +249,7 @@ SOURCE_FILE@0..555 WHITESPACE@319..320 " " SLICE_PAT@320..330 L_BRACK@320..321 "[" - BIND_PAT@321..325 + IDENT_PAT@321..325 NAME@321..325 IDENT@321..325 "head" COMMA@325..326 "," @@ -270,12 +270,12 @@ SOURCE_FILE@0..555 WHITESPACE@344..345 " " SLICE_PAT@345..362 L_BRACK@345..346 "[" - BIND_PAT@346..350 + IDENT_PAT@346..350 NAME@346..350 IDENT@346..350 "head" COMMA@350..351 "," WHITESPACE@351..352 " " - BIND_PAT@352..361 + IDENT_PAT@352..361 NAME@352..356 IDENT@352..356 "tail" WHITESPACE@356..357 " " @@ -297,7 +297,7 @@ SOURCE_FILE@0..555 WHITESPACE@376..377 " " SLICE_PAT@377..393 L_BRACK@377..378 "[" - BIND_PAT@378..382 + IDENT_PAT@378..382 NAME@378..382 IDENT@378..382 "head" COMMA@382..383 "," @@ -306,7 +306,7 @@ SOURCE_FILE@0..555 DOT2@384..386 ".." COMMA@386..387 "," WHITESPACE@387..388 " " - BIND_PAT@388..392 + IDENT_PAT@388..392 NAME@388..392 IDENT@388..392 "cons" R_BRACK@392..393 "]" @@ -323,12 +323,12 @@ SOURCE_FILE@0..555 WHITESPACE@407..408 " " SLICE_PAT@408..430 L_BRACK@408..409 "[" - BIND_PAT@409..413 + IDENT_PAT@409..413 NAME@409..413 IDENT@409..413 "head" COMMA@413..414 "," WHITESPACE@414..415 " " - BIND_PAT@415..423 + IDENT_PAT@415..423 NAME@415..418 IDENT@415..418 "mid" WHITESPACE@418..419 " " @@ -338,7 +338,7 @@ SOURCE_FILE@0..555 DOT2@421..423 ".." COMMA@423..424 "," WHITESPACE@424..425 " " - BIND_PAT@425..429 + IDENT_PAT@425..429 NAME@425..429 IDENT@425..429 "cons" R_BRACK@429..430 "]" @@ -355,7 +355,7 @@ SOURCE_FILE@0..555 WHITESPACE@444..445 " " SLICE_PAT@445..465 L_BRACK@445..446 "[" - BIND_PAT@446..450 + IDENT_PAT@446..450 NAME@446..450 IDENT@446..450 "head" COMMA@450..451 "," @@ -368,7 +368,7 @@ SOURCE_FILE@0..555 DOT2@456..458 ".." COMMA@458..459 "," WHITESPACE@459..460 " " - BIND_PAT@460..464 + IDENT_PAT@460..464 NAME@460..464 IDENT@460..464 "cons" R_BRACK@464..465 "]" @@ -385,7 +385,7 @@ SOURCE_FILE@0..555 WHITESPACE@479..480 " " SLICE_PAT@480..506 L_BRACK@480..481 "[" - BIND_PAT@481..485 + IDENT_PAT@481..485 NAME@481..485 IDENT@481..485 "head" COMMA@485..486 "," @@ -394,12 +394,12 @@ SOURCE_FILE@0..555 DOT2@487..489 ".." COMMA@489..490 "," WHITESPACE@490..491 " " - BIND_PAT@491..494 + IDENT_PAT@491..494 NAME@491..494 IDENT@491..494 "mid" COMMA@494..495 "," WHITESPACE@495..496 " " - BIND_PAT@496..505 + IDENT_PAT@496..505 NAME@496..500 IDENT@496..500 "tail" WHITESPACE@500..501 " " @@ -421,7 +421,7 @@ SOURCE_FILE@0..555 WHITESPACE@520..521 " " SLICE_PAT@521..546 L_BRACK@521..522 "[" - BIND_PAT@522..526 + IDENT_PAT@522..526 NAME@522..526 IDENT@522..526 "head" COMMA@526..527 "," @@ -430,7 +430,7 @@ SOURCE_FILE@0..555 DOT2@528..530 ".." COMMA@530..531 "," WHITESPACE@531..532 " " - BIND_PAT@532..535 + IDENT_PAT@532..535 NAME@532..535 IDENT@532..535 "mid" COMMA@535..536 "," @@ -439,7 +439,7 @@ SOURCE_FILE@0..555 DOT2@537..539 ".." COMMA@539..540 "," WHITESPACE@540..541 " " - BIND_PAT@541..545 + IDENT_PAT@541..545 NAME@541..545 IDENT@541..545 "cons" R_BRACK@545..546 "]" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast index 69b4d73d7..c48fed03e 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast @@ -38,7 +38,7 @@ SOURCE_FILE@0..55 PARAM_LIST@38..53 L_PAREN@38..39 "(" PARAM@39..52 - BIND_PAT@39..42 + IDENT_PAT@39..42 NAME@39..42 IDENT@39..42 "baz" COLON@42..43 ":" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast index 0a9f7c137..31671b420 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..63 LET_STMT@15..60 LET_KW@15..18 "let" WHITESPACE@18..19 " " - BIND_PAT@19..22 + IDENT_PAT@19..22 NAME@19..22 IDENT@19..22 "foo" WHITESPACE@22..23 " " @@ -24,13 +24,13 @@ SOURCE_FILE@0..63 PARAM_LIST@25..56 PIPE@25..26 "|" PARAM@26..29 - BIND_PAT@26..29 + IDENT_PAT@26..29 NAME@26..29 IDENT@26..29 "bar" COMMA@29..30 "," WHITESPACE@30..31 " " PARAM@31..39 - BIND_PAT@31..34 + IDENT_PAT@31..34 NAME@31..34 IDENT@31..34 "baz" COLON@34..35 ":" @@ -43,7 +43,7 @@ SOURCE_FILE@0..63 COMMA@39..40 "," WHITESPACE@40..41 " " PARAM@41..55 - BIND_PAT@41..44 + IDENT_PAT@41..44 NAME@41..44 IDENT@41..44 "qux" COLON@44..45 ":" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast index 3b8dfefc6..508b4aca7 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast @@ -9,12 +9,12 @@ SOURCE_FILE@0..30 PARAM@7..25 TUPLE_PAT@7..13 L_PAREN@7..8 "(" - BIND_PAT@8..9 + IDENT_PAT@8..9 NAME@8..9 IDENT@8..9 "x" COMMA@9..10 "," WHITESPACE@10..11 " " - BIND_PAT@11..12 + IDENT_PAT@11..12 NAME@11..12 IDENT@11..12 "y" R_PAREN@12..13 ")" -- cgit v1.2.3