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 --- .../inline/err/0007_async_without_semicolon.rast | 2 +- .../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 +- 27 files changed, 69 insertions(+), 69 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/inline') diff --git a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast index 3f3a7f1b9..2c9570678 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast @@ -14,7 +14,7 @@ SOURCE_FILE@0..30 LET_STMT@11..27 LET_KW@11..14 "let" WHITESPACE@14..15 " " - PLACEHOLDER_PAT@15..16 + WILDCARD_PAT@15..16 UNDERSCORE@15..16 "_" WHITESPACE@16..17 " " EQ@17..18 "=" 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