diff options
author | Aleksey Kladov <[email protected]> | 2020-07-31 19:07:21 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2020-07-31 19:07:21 +0100 |
commit | 6791eb9685375da94556bb910ea71f78b08be5ec (patch) | |
tree | 5b1b11a96815d381e366685bb641185e81a1c9c4 | |
parent | d7f75db90d99216c13000681ff2c4a887451c4b2 (diff) |
Rename PalceholderPat -> WildcardPat
50 files changed, 132 insertions, 135 deletions
diff --git a/crates/ra_assists/src/handlers/fill_match_arms.rs b/crates/ra_assists/src/handlers/fill_match_arms.rs index 708e1bc6c..36658f104 100644 --- a/crates/ra_assists/src/handlers/fill_match_arms.rs +++ b/crates/ra_assists/src/handlers/fill_match_arms.rs | |||
@@ -43,7 +43,7 @@ pub(crate) fn fill_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option< | |||
43 | 43 | ||
44 | let mut arms: Vec<MatchArm> = match_arm_list.arms().collect(); | 44 | let mut arms: Vec<MatchArm> = match_arm_list.arms().collect(); |
45 | if arms.len() == 1 { | 45 | if arms.len() == 1 { |
46 | if let Some(Pat::PlaceholderPat(..)) = arms[0].pat() { | 46 | if let Some(Pat::WildcardPat(..)) = arms[0].pat() { |
47 | arms.clear(); | 47 | arms.clear(); |
48 | } | 48 | } |
49 | } | 49 | } |
@@ -116,17 +116,15 @@ pub(crate) fn fill_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option< | |||
116 | match (first_new_arm, ctx.config.snippet_cap) { | 116 | match (first_new_arm, ctx.config.snippet_cap) { |
117 | (Some(first_new_arm), Some(cap)) => { | 117 | (Some(first_new_arm), Some(cap)) => { |
118 | let extend_lifetime; | 118 | let extend_lifetime; |
119 | let cursor = match first_new_arm | 119 | let cursor = |
120 | .syntax() | 120 | match first_new_arm.syntax().descendants().find_map(ast::WildcardPat::cast) |
121 | .descendants() | 121 | { |
122 | .find_map(ast::PlaceholderPat::cast) | 122 | Some(it) => { |
123 | { | 123 | extend_lifetime = it.syntax().clone(); |
124 | Some(it) => { | 124 | Cursor::Replace(&extend_lifetime) |
125 | extend_lifetime = it.syntax().clone(); | 125 | } |
126 | Cursor::Replace(&extend_lifetime) | 126 | None => Cursor::Before(first_new_arm.syntax()), |
127 | } | 127 | }; |
128 | None => Cursor::Before(first_new_arm.syntax()), | ||
129 | }; | ||
130 | let snippet = render_snippet(cap, new_arm_list.syntax(), cursor); | 128 | let snippet = render_snippet(cap, new_arm_list.syntax(), cursor); |
131 | builder.replace_snippet(cap, old_range, snippet); | 129 | builder.replace_snippet(cap, old_range, snippet); |
132 | } | 130 | } |
diff --git a/crates/ra_assists/src/handlers/merge_match_arms.rs b/crates/ra_assists/src/handlers/merge_match_arms.rs index 186a1f618..563292282 100644 --- a/crates/ra_assists/src/handlers/merge_match_arms.rs +++ b/crates/ra_assists/src/handlers/merge_match_arms.rs | |||
@@ -86,7 +86,7 @@ pub(crate) fn merge_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option | |||
86 | } | 86 | } |
87 | 87 | ||
88 | fn contains_placeholder(a: &ast::MatchArm) -> bool { | 88 | fn contains_placeholder(a: &ast::MatchArm) -> bool { |
89 | matches!(a.pat(), Some(ast::Pat::PlaceholderPat(..))) | 89 | matches!(a.pat(), Some(ast::Pat::WildcardPat(..))) |
90 | } | 90 | } |
91 | 91 | ||
92 | #[cfg(test)] | 92 | #[cfg(test)] |
diff --git a/crates/ra_assists/src/handlers/replace_let_with_if_let.rs b/crates/ra_assists/src/handlers/replace_let_with_if_let.rs index a49292c97..64ad15a23 100644 --- a/crates/ra_assists/src/handlers/replace_let_with_if_let.rs +++ b/crates/ra_assists/src/handlers/replace_let_with_if_let.rs | |||
@@ -62,8 +62,7 @@ pub(crate) fn replace_let_with_if_let(acc: &mut Assists, ctx: &AssistContext) -> | |||
62 | let if_ = make::expr_if(make::condition(init, Some(with_placeholder)), block); | 62 | let if_ = make::expr_if(make::condition(init, Some(with_placeholder)), block); |
63 | let stmt = make::expr_stmt(if_); | 63 | let stmt = make::expr_stmt(if_); |
64 | 64 | ||
65 | let placeholder = | 65 | let placeholder = stmt.syntax().descendants().find_map(ast::WildcardPat::cast).unwrap(); |
66 | stmt.syntax().descendants().find_map(ast::PlaceholderPat::cast).unwrap(); | ||
67 | let stmt = stmt.replace_descendant(placeholder.into(), original_pat); | 66 | let stmt = stmt.replace_descendant(placeholder.into(), original_pat); |
68 | 67 | ||
69 | edit.replace_ast(ast::Stmt::from(let_stmt), ast::Stmt::from(stmt)); | 68 | edit.replace_ast(ast::Stmt::from(let_stmt), ast::Stmt::from(stmt)); |
diff --git a/crates/ra_hir_def/src/body/lower.rs b/crates/ra_hir_def/src/body/lower.rs index ef1c0df01..7b988ae33 100644 --- a/crates/ra_hir_def/src/body/lower.rs +++ b/crates/ra_hir_def/src/body/lower.rs | |||
@@ -783,7 +783,7 @@ impl ExprCollector<'_> { | |||
783 | let (args, ellipsis) = self.collect_tuple_pat(p.args()); | 783 | let (args, ellipsis) = self.collect_tuple_pat(p.args()); |
784 | Pat::Tuple { args, ellipsis } | 784 | Pat::Tuple { args, ellipsis } |
785 | } | 785 | } |
786 | ast::Pat::PlaceholderPat(_) => Pat::Wild, | 786 | ast::Pat::WildcardPat(_) => Pat::Wild, |
787 | ast::Pat::RecordPat(p) => { | 787 | ast::Pat::RecordPat(p) => { |
788 | let path = p.path().and_then(|path| self.expander.parse_path(path)); | 788 | let path = p.path().and_then(|path| self.expander.parse_path(path)); |
789 | let args: Vec<_> = p | 789 | let args: Vec<_> = p |
diff --git a/crates/ra_parser/src/grammar/patterns.rs b/crates/ra_parser/src/grammar/patterns.rs index d5dd9ffa2..51e413cd6 100644 --- a/crates/ra_parser/src/grammar/patterns.rs +++ b/crates/ra_parser/src/grammar/patterns.rs | |||
@@ -234,7 +234,7 @@ fn placeholder_pat(p: &mut Parser) -> CompletedMarker { | |||
234 | assert!(p.at(T![_])); | 234 | assert!(p.at(T![_])); |
235 | let m = p.start(); | 235 | let m = p.start(); |
236 | p.bump(T![_]); | 236 | p.bump(T![_]); |
237 | m.complete(p, PLACEHOLDER_PAT) | 237 | m.complete(p, WILDCARD_PAT) |
238 | } | 238 | } |
239 | 239 | ||
240 | // test dot_dot_pat | 240 | // test dot_dot_pat |
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs index 9db328dc3..c24611f4b 100644 --- a/crates/ra_parser/src/syntax_kind/generated.rs +++ b/crates/ra_parser/src/syntax_kind/generated.rs | |||
@@ -157,7 +157,7 @@ pub enum SyntaxKind { | |||
157 | REF_PAT, | 157 | REF_PAT, |
158 | BOX_PAT, | 158 | BOX_PAT, |
159 | BIND_PAT, | 159 | BIND_PAT, |
160 | PLACEHOLDER_PAT, | 160 | WILDCARD_PAT, |
161 | DOT_DOT_PAT, | 161 | DOT_DOT_PAT, |
162 | PATH_PAT, | 162 | PATH_PAT, |
163 | RECORD_PAT, | 163 | RECORD_PAT, |
diff --git a/crates/ra_syntax/src/ast/edit.rs b/crates/ra_syntax/src/ast/edit.rs index 04746ef8f..667a9294f 100644 --- a/crates/ra_syntax/src/ast/edit.rs +++ b/crates/ra_syntax/src/ast/edit.rs | |||
@@ -390,7 +390,7 @@ impl ast::MatchArmList { | |||
390 | #[must_use] | 390 | #[must_use] |
391 | pub fn remove_placeholder(&self) -> ast::MatchArmList { | 391 | pub fn remove_placeholder(&self) -> ast::MatchArmList { |
392 | let placeholder = | 392 | let placeholder = |
393 | self.arms().find(|arm| matches!(arm.pat(), Some(ast::Pat::PlaceholderPat(_)))); | 393 | self.arms().find(|arm| matches!(arm.pat(), Some(ast::Pat::WildcardPat(_)))); |
394 | if let Some(placeholder) = placeholder { | 394 | if let Some(placeholder) = placeholder { |
395 | self.remove_arm(&placeholder) | 395 | self.remove_arm(&placeholder) |
396 | } else { | 396 | } else { |
diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs index 713aebcfa..f6b3fa6ef 100644 --- a/crates/ra_syntax/src/ast/generated/nodes.rs +++ b/crates/ra_syntax/src/ast/generated/nodes.rs | |||
@@ -1175,10 +1175,10 @@ impl PathPat { | |||
1175 | pub fn path(&self) -> Option<Path> { support::child(&self.syntax) } | 1175 | pub fn path(&self) -> Option<Path> { support::child(&self.syntax) } |
1176 | } | 1176 | } |
1177 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1177 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1178 | pub struct PlaceholderPat { | 1178 | pub struct WildcardPat { |
1179 | pub(crate) syntax: SyntaxNode, | 1179 | pub(crate) syntax: SyntaxNode, |
1180 | } | 1180 | } |
1181 | impl PlaceholderPat { | 1181 | impl WildcardPat { |
1182 | pub fn underscore_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![_]) } | 1182 | pub fn underscore_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![_]) } |
1183 | } | 1183 | } |
1184 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1184 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
@@ -1343,7 +1343,7 @@ pub enum Pat { | |||
1343 | OrPat(OrPat), | 1343 | OrPat(OrPat), |
1344 | ParenPat(ParenPat), | 1344 | ParenPat(ParenPat), |
1345 | PathPat(PathPat), | 1345 | PathPat(PathPat), |
1346 | PlaceholderPat(PlaceholderPat), | 1346 | WildcardPat(WildcardPat), |
1347 | RangePat(RangePat), | 1347 | RangePat(RangePat), |
1348 | RecordPat(RecordPat), | 1348 | RecordPat(RecordPat), |
1349 | RefPat(RefPat), | 1349 | RefPat(RefPat), |
@@ -2644,8 +2644,8 @@ impl AstNode for PathPat { | |||
2644 | } | 2644 | } |
2645 | fn syntax(&self) -> &SyntaxNode { &self.syntax } | 2645 | fn syntax(&self) -> &SyntaxNode { &self.syntax } |
2646 | } | 2646 | } |
2647 | impl AstNode for PlaceholderPat { | 2647 | impl AstNode for WildcardPat { |
2648 | fn can_cast(kind: SyntaxKind) -> bool { kind == PLACEHOLDER_PAT } | 2648 | fn can_cast(kind: SyntaxKind) -> bool { kind == WILDCARD_PAT } |
2649 | fn cast(syntax: SyntaxNode) -> Option<Self> { | 2649 | fn cast(syntax: SyntaxNode) -> Option<Self> { |
2650 | if Self::can_cast(syntax.kind()) { | 2650 | if Self::can_cast(syntax.kind()) { |
2651 | Some(Self { syntax }) | 2651 | Some(Self { syntax }) |
@@ -3160,8 +3160,8 @@ impl From<ParenPat> for Pat { | |||
3160 | impl From<PathPat> for Pat { | 3160 | impl From<PathPat> for Pat { |
3161 | fn from(node: PathPat) -> Pat { Pat::PathPat(node) } | 3161 | fn from(node: PathPat) -> Pat { Pat::PathPat(node) } |
3162 | } | 3162 | } |
3163 | impl From<PlaceholderPat> for Pat { | 3163 | impl From<WildcardPat> for Pat { |
3164 | fn from(node: PlaceholderPat) -> Pat { Pat::PlaceholderPat(node) } | 3164 | fn from(node: WildcardPat) -> Pat { Pat::WildcardPat(node) } |
3165 | } | 3165 | } |
3166 | impl From<RangePat> for Pat { | 3166 | impl From<RangePat> for Pat { |
3167 | fn from(node: RangePat) -> Pat { Pat::RangePat(node) } | 3167 | fn from(node: RangePat) -> Pat { Pat::RangePat(node) } |
@@ -3185,7 +3185,7 @@ impl AstNode for Pat { | |||
3185 | fn can_cast(kind: SyntaxKind) -> bool { | 3185 | fn can_cast(kind: SyntaxKind) -> bool { |
3186 | match kind { | 3186 | match kind { |
3187 | BIND_PAT | BOX_PAT | DOT_DOT_PAT | LITERAL_PAT | MACRO_PAT | OR_PAT | PAREN_PAT | 3187 | BIND_PAT | BOX_PAT | DOT_DOT_PAT | LITERAL_PAT | MACRO_PAT | OR_PAT | PAREN_PAT |
3188 | | PATH_PAT | PLACEHOLDER_PAT | RANGE_PAT | RECORD_PAT | REF_PAT | SLICE_PAT | 3188 | | PATH_PAT | WILDCARD_PAT | RANGE_PAT | RECORD_PAT | REF_PAT | SLICE_PAT |
3189 | | TUPLE_PAT | TUPLE_STRUCT_PAT => true, | 3189 | | TUPLE_PAT | TUPLE_STRUCT_PAT => true, |
3190 | _ => false, | 3190 | _ => false, |
3191 | } | 3191 | } |
@@ -3200,7 +3200,7 @@ impl AstNode for Pat { | |||
3200 | OR_PAT => Pat::OrPat(OrPat { syntax }), | 3200 | OR_PAT => Pat::OrPat(OrPat { syntax }), |
3201 | PAREN_PAT => Pat::ParenPat(ParenPat { syntax }), | 3201 | PAREN_PAT => Pat::ParenPat(ParenPat { syntax }), |
3202 | PATH_PAT => Pat::PathPat(PathPat { syntax }), | 3202 | PATH_PAT => Pat::PathPat(PathPat { syntax }), |
3203 | PLACEHOLDER_PAT => Pat::PlaceholderPat(PlaceholderPat { syntax }), | 3203 | WILDCARD_PAT => Pat::WildcardPat(WildcardPat { syntax }), |
3204 | RANGE_PAT => Pat::RangePat(RangePat { syntax }), | 3204 | RANGE_PAT => Pat::RangePat(RangePat { syntax }), |
3205 | RECORD_PAT => Pat::RecordPat(RecordPat { syntax }), | 3205 | RECORD_PAT => Pat::RecordPat(RecordPat { syntax }), |
3206 | REF_PAT => Pat::RefPat(RefPat { syntax }), | 3206 | REF_PAT => Pat::RefPat(RefPat { syntax }), |
@@ -3221,7 +3221,7 @@ impl AstNode for Pat { | |||
3221 | Pat::OrPat(it) => &it.syntax, | 3221 | Pat::OrPat(it) => &it.syntax, |
3222 | Pat::ParenPat(it) => &it.syntax, | 3222 | Pat::ParenPat(it) => &it.syntax, |
3223 | Pat::PathPat(it) => &it.syntax, | 3223 | Pat::PathPat(it) => &it.syntax, |
3224 | Pat::PlaceholderPat(it) => &it.syntax, | 3224 | Pat::WildcardPat(it) => &it.syntax, |
3225 | Pat::RangePat(it) => &it.syntax, | 3225 | Pat::RangePat(it) => &it.syntax, |
3226 | Pat::RecordPat(it) => &it.syntax, | 3226 | Pat::RecordPat(it) => &it.syntax, |
3227 | Pat::RefPat(it) => &it.syntax, | 3227 | Pat::RefPat(it) => &it.syntax, |
@@ -4021,7 +4021,7 @@ impl std::fmt::Display for PathPat { | |||
4021 | std::fmt::Display::fmt(self.syntax(), f) | 4021 | std::fmt::Display::fmt(self.syntax(), f) |
4022 | } | 4022 | } |
4023 | } | 4023 | } |
4024 | impl std::fmt::Display for PlaceholderPat { | 4024 | impl std::fmt::Display for WildcardPat { |
4025 | fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { | 4025 | fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { |
4026 | std::fmt::Display::fmt(self.syntax(), f) | 4026 | std::fmt::Display::fmt(self.syntax(), f) |
4027 | } | 4027 | } |
diff --git a/crates/ra_syntax/src/ast/make.rs b/crates/ra_syntax/src/ast/make.rs index 3d4fed64c..efb2cb4a3 100644 --- a/crates/ra_syntax/src/ast/make.rs +++ b/crates/ra_syntax/src/ast/make.rs | |||
@@ -156,10 +156,10 @@ pub fn bind_pat(name: ast::Name) -> ast::BindPat { | |||
156 | } | 156 | } |
157 | } | 157 | } |
158 | 158 | ||
159 | pub fn placeholder_pat() -> ast::PlaceholderPat { | 159 | pub fn placeholder_pat() -> ast::WildcardPat { |
160 | return from_text("_"); | 160 | return from_text("_"); |
161 | 161 | ||
162 | fn from_text(text: &str) -> ast::PlaceholderPat { | 162 | fn from_text(text: &str) -> ast::WildcardPat { |
163 | ast_from_text(&format!("fn f({}: ())", text)) | 163 | ast_from_text(&format!("fn f({}: ())", text)) |
164 | } | 164 | } |
165 | } | 165 | } |
diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast index 1cb1e9757..e3be6b22e 100644 --- a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast +++ b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast | |||
@@ -80,7 +80,7 @@ [email protected] | |||
80 | [email protected] | 80 | [email protected] |
81 | [email protected] "let" | 81 | [email protected] "let" |
82 | [email protected] " " | 82 | [email protected] " " |
83 | PLACEHOLDE[email protected] | 83 | WILDCARD[email protected] |
84 | [email protected] "_" | 84 | [email protected] "_" |
85 | [email protected] ":" | 85 | [email protected] ":" |
86 | [email protected] " " | 86 | [email protected] " " |
@@ -147,7 +147,7 @@ [email protected] | |||
147 | [email protected] | 147 | [email protected] |
148 | [email protected] "let" | 148 | [email protected] "let" |
149 | [email protected] " " | 149 | [email protected] " " |
150 | PLACEHOLDE[email protected] | 150 | WILDCARD[email protected] |
151 | [email protected] "_" | 151 | [email protected] "_" |
152 | [email protected] ":" | 152 | [email protected] ":" |
153 | [email protected] " " | 153 | [email protected] " " |
@@ -223,7 +223,7 @@ [email protected] | |||
223 | [email protected] | 223 | [email protected] |
224 | [email protected] "let" | 224 | [email protected] "let" |
225 | [email protected] " " | 225 | [email protected] " " |
226 | PLACEHOLDE[email protected] | 226 | WILDCARD[email protected] |
227 | [email protected] "_" | 227 | [email protected] "_" |
228 | [email protected] ":" | 228 | [email protected] ":" |
229 | [email protected] " " | 229 | [email protected] " " |
diff --git a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast index ec9f556aa..672dd054a 100644 --- a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast +++ b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast | |||
@@ -23,7 +23,7 @@ [email protected] | |||
23 | [email protected] "{" | 23 | [email protected] "{" |
24 | [email protected] "\n " | 24 | [email protected] "\n " |
25 | [email protected] | 25 | [email protected] |
26 | PLACEHOLDE[email protected] | 26 | WILDCARD[email protected] |
27 | [email protected] "_" | 27 | [email protected] "_" |
28 | [email protected] " " | 28 | [email protected] " " |
29 | [email protected] "=>" | 29 | [email protected] "=>" |
@@ -54,7 +54,7 @@ [email protected] | |||
54 | [email protected] "]" | 54 | [email protected] "]" |
55 | [email protected] "\n " | 55 | [email protected] "\n " |
56 | [email protected] | 56 | [email protected] |
57 | PLACEHOLDE[email protected] | 57 | WILDCARD[email protected] |
58 | [email protected] "_" | 58 | [email protected] "_" |
59 | [email protected] " " | 59 | [email protected] " " |
60 | [email protected] "=>" | 60 | [email protected] "=>" |
@@ -78,7 +78,7 @@ [email protected] | |||
78 | [email protected] "{" | 78 | [email protected] "{" |
79 | [email protected] "\n " | 79 | [email protected] "\n " |
80 | [email protected] | 80 | [email protected] |
81 | PLACEHOLDE[email protected] | 81 | WILDCARD[email protected] |
82 | [email protected] "_" | 82 | [email protected] "_" |
83 | [email protected] " " | 83 | [email protected] " " |
84 | [email protected] "=>" | 84 | [email protected] "=>" |
@@ -89,7 +89,7 @@ [email protected] | |||
89 | [email protected] "," | 89 | [email protected] "," |
90 | [email protected] "\n " | 90 | [email protected] "\n " |
91 | [email protected] | 91 | [email protected] |
92 | PLACEHOLDE[email protected] | 92 | WILDCARD[email protected] |
93 | [email protected] "_" | 93 | [email protected] "_" |
94 | [email protected] " " | 94 | [email protected] " " |
95 | [email protected] "=>" | 95 | [email protected] "=>" |
@@ -165,7 +165,7 @@ [email protected] | |||
165 | [email protected] "]" | 165 | [email protected] "]" |
166 | [email protected] "\n " | 166 | [email protected] "\n " |
167 | [email protected] | 167 | [email protected] |
168 | PLACEHOLDE[email protected] | 168 | WILDCARD[email protected] |
169 | [email protected] "_" | 169 | [email protected] "_" |
170 | [email protected] " " | 170 | [email protected] " " |
171 | [email protected] "=>" | 171 | [email protected] "=>" |
@@ -176,7 +176,7 @@ [email protected] | |||
176 | [email protected] "," | 176 | [email protected] "," |
177 | [email protected] "\n " | 177 | [email protected] "\n " |
178 | [email protected] | 178 | [email protected] |
179 | PLACEHOLDE[email protected] | 179 | WILDCARD[email protected] |
180 | [email protected] "_" | 180 | [email protected] "_" |
181 | [email protected] " " | 181 | [email protected] " " |
182 | [email protected] "=>" | 182 | [email protected] "=>" |
diff --git a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast index 063532e02..33bb085e9 100644 --- a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast +++ b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast | |||
@@ -22,7 +22,7 @@ [email protected] | |||
22 | [email protected] "{" | 22 | [email protected] "{" |
23 | [email protected] "\n " | 23 | [email protected] "\n " |
24 | [email protected] | 24 | [email protected] |
25 | PLACEHOLDE[email protected] | 25 | WILDCARD[email protected] |
26 | [email protected] "_" | 26 | [email protected] "_" |
27 | [email protected] " " | 27 | [email protected] " " |
28 | [email protected] "=>" | 28 | [email protected] "=>" |
@@ -33,7 +33,7 @@ [email protected] | |||
33 | [email protected] "," | 33 | [email protected] "," |
34 | [email protected] "\n " | 34 | [email protected] "\n " |
35 | [email protected] | 35 | [email protected] |
36 | PLACEHOLDE[email protected] | 36 | WILDCARD[email protected] |
37 | [email protected] "_" | 37 | [email protected] "_" |
38 | [email protected] " " | 38 | [email protected] " " |
39 | [email protected] "=>" | 39 | [email protected] "=>" |
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 @@ [email protected] | |||
14 | [email protected] | 14 | [email protected] |
15 | [email protected] "let" | 15 | [email protected] "let" |
16 | [email protected] " " | 16 | [email protected] " " |
17 | PLACEHOLDE[email protected] | 17 | WILDCARD[email protected] |
18 | [email protected] "_" | 18 | [email protected] "_" |
19 | [email protected] " " | 19 | [email protected] " " |
20 | [email protected] "=" | 20 | [email protected] "=" |
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 @@ [email protected] | |||
38 | [email protected] | 38 | [email protected] |
39 | [email protected] "S" | 39 | [email protected] "S" |
40 | [email protected] "(" | 40 | [email protected] "(" |
41 | PLACEHOLDE[email protected] | 41 | WILDCARD[email protected] |
42 | [email protected] "_" | 42 | [email protected] "_" |
43 | [email protected] ")" | 43 | [email protected] ")" |
44 | [email protected] " " | 44 | [email protected] " " |
@@ -58,7 +58,7 @@ [email protected] | |||
58 | [email protected] | 58 | [email protected] |
59 | [email protected] "S" | 59 | [email protected] "S" |
60 | [email protected] "(" | 60 | [email protected] "(" |
61 | PLACEHOLDE[email protected] | 61 | WILDCARD[email protected] |
62 | [email protected] "_" | 62 | [email protected] "_" |
63 | [email protected] "," | 63 | [email protected] "," |
64 | [email protected] ")" | 64 | [email protected] ")" |
@@ -79,7 +79,7 @@ [email protected] | |||
79 | [email protected] | 79 | [email protected] |
80 | [email protected] "S" | 80 | [email protected] "S" |
81 | [email protected] "(" | 81 | [email protected] "(" |
82 | PLACEHOLDE[email protected] | 82 | WILDCARD[email protected] |
83 | [email protected] "_" | 83 | [email protected] "_" |
84 | [email protected] "," | 84 | [email protected] "," |
85 | [email protected] " " | 85 | [email protected] " " |
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 @@ [email protected] | |||
23 | [email protected] | 23 | [email protected] |
24 | [email protected] "Some" | 24 | [email protected] "Some" |
25 | [email protected] "(" | 25 | [email protected] "(" |
26 | PLACEHOLDE[email protected] | 26 | WILDCARD[email protected] |
27 | [email protected] "_" | 27 | [email protected] "_" |
28 | [email protected] ")" | 28 | [email protected] ")" |
29 | [email protected] " " | 29 | [email protected] " " |
@@ -67,7 +67,7 @@ [email protected] | |||
67 | [email protected] | 67 | [email protected] |
68 | [email protected] "Some" | 68 | [email protected] "Some" |
69 | [email protected] "(" | 69 | [email protected] "(" |
70 | PLACEHOLDE[email protected] | 70 | WILDCARD[email protected] |
71 | [email protected] "_" | 71 | [email protected] "_" |
72 | [email protected] ")" | 72 | [email protected] ")" |
73 | [email protected] " " | 73 | [email protected] " " |
@@ -79,7 +79,7 @@ [email protected] | |||
79 | [email protected] | 79 | [email protected] |
80 | [email protected] "Some" | 80 | [email protected] "Some" |
81 | [email protected] "(" | 81 | [email protected] "(" |
82 | PLACEHOLDE[email protected] | 82 | WILDCARD[email protected] |
83 | [email protected] "_" | 83 | [email protected] "_" |
84 | [email protected] ")" | 84 | [email protected] ")" |
85 | [email protected] " " | 85 | [email protected] " " |
@@ -110,7 +110,7 @@ [email protected] | |||
110 | [email protected] | 110 | [email protected] |
111 | [email protected] "Some" | 111 | [email protected] "Some" |
112 | [email protected] "(" | 112 | [email protected] "(" |
113 | PLACEHOLDE[email protected] | 113 | WILDCARD[email protected] |
114 | [email protected] "_" | 114 | [email protected] "_" |
115 | [email protected] ")" | 115 | [email protected] ")" |
116 | [email protected] " " | 116 | [email protected] " " |
@@ -140,7 +140,7 @@ [email protected] | |||
140 | [email protected] | 140 | [email protected] |
141 | [email protected] "Some" | 141 | [email protected] "Some" |
142 | [email protected] "(" | 142 | [email protected] "(" |
143 | PLACEHOLDE[email protected] | 143 | WILDCARD[email protected] |
144 | [email protected] "_" | 144 | [email protected] "_" |
145 | [email protected] ")" | 145 | [email protected] ")" |
146 | [email protected] " " | 146 | [email protected] " " |
@@ -152,7 +152,7 @@ [email protected] | |||
152 | [email protected] | 152 | [email protected] |
153 | [email protected] "Some" | 153 | [email protected] "Some" |
154 | [email protected] "(" | 154 | [email protected] "(" |
155 | PLACEHOLDE[email protected] | 155 | WILDCARD[email protected] |
156 | [email protected] "_" | 156 | [email protected] "_" |
157 | [email protected] ")" | 157 | [email protected] ")" |
158 | [email protected] " " | 158 | [email protected] " " |
@@ -182,7 +182,7 @@ [email protected] | |||
182 | [email protected] | 182 | [email protected] |
183 | [email protected] "Some" | 183 | [email protected] "Some" |
184 | [email protected] "(" | 184 | [email protected] "(" |
185 | PLACEHOLDE[email protected] | 185 | WILDCARD[email protected] |
186 | [email protected] "_" | 186 | [email protected] "_" |
187 | [email protected] ")" | 187 | [email protected] ")" |
188 | [email protected] " " | 188 | [email protected] " " |
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 @@ [email protected] | |||
14 | [email protected] | 14 | [email protected] |
15 | [email protected] "let" | 15 | [email protected] "let" |
16 | [email protected] " " | 16 | [email protected] " " |
17 | PLACEHOLDE[email protected] | 17 | WILDCARD[email protected] |
18 | [email protected] "_" | 18 | [email protected] "_" |
19 | [email protected] " " | 19 | [email protected] " " |
20 | [email protected] "=" | 20 | [email protected] "=" |
@@ -33,7 +33,7 @@ [email protected] | |||
33 | [email protected] | 33 | [email protected] |
34 | [email protected] "let" | 34 | [email protected] "let" |
35 | [email protected] " " | 35 | [email protected] " " |
36 | PLACEHOLDE[email protected] | 36 | WILDCARD[email protected] |
37 | [email protected] "_" | 37 | [email protected] "_" |
38 | [email protected] " " | 38 | [email protected] " " |
39 | [email protected] "=" | 39 | [email protected] "=" |
@@ -69,7 +69,7 @@ [email protected] | |||
69 | [email protected] | 69 | [email protected] |
70 | [email protected] "let" | 70 | [email protected] "let" |
71 | [email protected] " " | 71 | [email protected] " " |
72 | PLACEHOLDE[email protected] | 72 | WILDCARD[email protected] |
73 | [email protected] "_" | 73 | [email protected] "_" |
74 | [email protected] " " | 74 | [email protected] " " |
75 | [email protected] "=" | 75 | [email protected] "=" |
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 @@ [email protected] | |||
14 | [email protected] | 14 | [email protected] |
15 | [email protected] "let" | 15 | [email protected] "let" |
16 | [email protected] " " | 16 | [email protected] " " |
17 | PLACEHOLDE[email protected] | 17 | WILDCARD[email protected] |
18 | [email protected] "_" | 18 | [email protected] "_" |
19 | [email protected] " " | 19 | [email protected] " " |
20 | [email protected] "=" | 20 | [email protected] "=" |
@@ -29,7 +29,7 @@ [email protected] | |||
29 | [email protected] | 29 | [email protected] |
30 | [email protected] "let" | 30 | [email protected] "let" |
31 | [email protected] " " | 31 | [email protected] " " |
32 | PLACEHOLDE[email protected] | 32 | WILDCARD[email protected] |
33 | [email protected] "_" | 33 | [email protected] "_" |
34 | [email protected] " " | 34 | [email protected] " " |
35 | [email protected] "=" | 35 | [email protected] "=" |
@@ -49,7 +49,7 @@ [email protected] | |||
49 | [email protected] | 49 | [email protected] |
50 | [email protected] "let" | 50 | [email protected] "let" |
51 | [email protected] " " | 51 | [email protected] " " |
52 | PLACEHOLDE[email protected] | 52 | WILDCARD[email protected] |
53 | [email protected] "_" | 53 | [email protected] "_" |
54 | [email protected] " " | 54 | [email protected] " " |
55 | [email protected] "=" | 55 | [email protected] "=" |
@@ -75,7 +75,7 @@ [email protected] | |||
75 | [email protected] | 75 | [email protected] |
76 | [email protected] "let" | 76 | [email protected] "let" |
77 | [email protected] " " | 77 | [email protected] " " |
78 | PLACEHOLDE[email protected] | 78 | WILDCARD[email protected] |
79 | [email protected] "_" | 79 | [email protected] "_" |
80 | [email protected] " " | 80 | [email protected] " " |
81 | [email protected] "=" | 81 | [email protected] "=" |
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 @@ [email protected] | |||
22 | [email protected] "{" | 22 | [email protected] "{" |
23 | [email protected] "\n " | 23 | [email protected] "\n " |
24 | [email protected] | 24 | [email protected] |
25 | PLACEHOLDE[email protected] | 25 | WILDCARD[email protected] |
26 | [email protected] "_" | 26 | [email protected] "_" |
27 | [email protected] " " | 27 | [email protected] " " |
28 | [email protected] "=>" | 28 | [email protected] "=>" |
@@ -33,7 +33,7 @@ [email protected] | |||
33 | [email protected] "," | 33 | [email protected] "," |
34 | [email protected] "\n " | 34 | [email protected] "\n " |
35 | [email protected] | 35 | [email protected] |
36 | PLACEHOLDE[email protected] | 36 | WILDCARD[email protected] |
37 | [email protected] "_" | 37 | [email protected] "_" |
38 | [email protected] " " | 38 | [email protected] " " |
39 | [email protected] "=>" | 39 | [email protected] "=>" |
@@ -43,7 +43,7 @@ [email protected] | |||
43 | [email protected] "}" | 43 | [email protected] "}" |
44 | [email protected] "\n " | 44 | [email protected] "\n " |
45 | [email protected] | 45 | [email protected] |
46 | PLACEHOLDE[email protected] | 46 | WILDCARD[email protected] |
47 | [email protected] "_" | 47 | [email protected] "_" |
48 | [email protected] " " | 48 | [email protected] " " |
49 | [email protected] "=>" | 49 | [email protected] "=>" |
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 @@ [email protected] | |||
23 | [email protected] "{" | 23 | [email protected] "{" |
24 | [email protected] "\n " | 24 | [email protected] "\n " |
25 | [email protected] | 25 | [email protected] |
26 | PLACEHOLDE[email protected] | 26 | WILDCARD[email protected] |
27 | [email protected] "_" | 27 | [email protected] "_" |
28 | [email protected] " " | 28 | [email protected] " " |
29 | [email protected] "=>" | 29 | [email protected] "=>" |
@@ -34,7 +34,7 @@ [email protected] | |||
34 | [email protected] "," | 34 | [email protected] "," |
35 | [email protected] "\n " | 35 | [email protected] "\n " |
36 | [email protected] | 36 | [email protected] |
37 | PLACEHOLDE[email protected] | 37 | WILDCARD[email protected] |
38 | [email protected] "_" | 38 | [email protected] "_" |
39 | [email protected] " " | 39 | [email protected] " " |
40 | [email protected] | 40 | [email protected] |
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 @@ [email protected] | |||
14 | [email protected] | 14 | [email protected] |
15 | [email protected] "let" | 15 | [email protected] "let" |
16 | [email protected] " " | 16 | [email protected] " " |
17 | PLACEHOLDE[email protected] | 17 | WILDCARD[email protected] |
18 | [email protected] "_" | 18 | [email protected] "_" |
19 | [email protected] " " | 19 | [email protected] " " |
20 | [email protected] "=" | 20 | [email protected] "=" |
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 @@ [email protected] | |||
53 | [email protected] "{" | 53 | [email protected] "{" |
54 | [email protected] " " | 54 | [email protected] " " |
55 | [email protected] | 55 | [email protected] |
56 | PLACEHOLDE[email protected] | 56 | WILDCARD[email protected] |
57 | [email protected] "_" | 57 | [email protected] "_" |
58 | [email protected] " " | 58 | [email protected] " " |
59 | [email protected] "=>" | 59 | [email protected] "=>" |
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 @@ [email protected] | |||
22 | [email protected] "{" | 22 | [email protected] "{" |
23 | [email protected] "\n " | 23 | [email protected] "\n " |
24 | [email protected] | 24 | [email protected] |
25 | PLACEHOLDE[email protected] | 25 | WILDCARD[email protected] |
26 | [email protected] "_" | 26 | [email protected] "_" |
27 | [email protected] " " | 27 | [email protected] " " |
28 | [email protected] "=>" | 28 | [email protected] "=>" |
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 @@ [email protected] | |||
27 | [email protected] | 27 | [email protected] |
28 | [email protected] "let" | 28 | [email protected] "let" |
29 | [email protected] " " | 29 | [email protected] " " |
30 | PLACEHOLDE[email protected] | 30 | WILDCARD[email protected] |
31 | [email protected] "_" | 31 | [email protected] "_" |
32 | [email protected] " " | 32 | [email protected] " " |
33 | [email protected] "=" | 33 | [email protected] "=" |
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 @@ [email protected] | |||
39 | [email protected] "{" | 39 | [email protected] "{" |
40 | [email protected] " " | 40 | [email protected] " " |
41 | [email protected] | 41 | [email protected] |
42 | PLACEHOLDE[email protected] | 42 | WILDCARD[email protected] |
43 | [email protected] "_" | 43 | [email protected] "_" |
44 | [email protected] " " | 44 | [email protected] " " |
45 | [email protected] "=>" | 45 | [email protected] "=>" |
@@ -79,7 +79,7 @@ [email protected] | |||
79 | [email protected] "{" | 79 | [email protected] "{" |
80 | [email protected] " " | 80 | [email protected] " " |
81 | [email protected] | 81 | [email protected] |
82 | PLACEHOLDE[email protected] | 82 | WILDCARD[email protected] |
83 | [email protected] "_" | 83 | [email protected] "_" |
84 | [email protected] " " | 84 | [email protected] " " |
85 | [email protected] "=>" | 85 | [email protected] "=>" |
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 @@ [email protected] | |||
16 | [email protected] | 16 | [email protected] |
17 | [email protected] "let" | 17 | [email protected] "let" |
18 | [email protected] " " | 18 | [email protected] " " |
19 | PLACEHOLDE[email protected] | 19 | WILDCARD[email protected] |
20 | [email protected] "_" | 20 | [email protected] "_" |
21 | [email protected] " " | 21 | [email protected] " " |
22 | [email protected] "=" | 22 | [email protected] "=" |
@@ -30,7 +30,7 @@ [email protected] | |||
30 | [email protected] | 30 | [email protected] |
31 | [email protected] "let" | 31 | [email protected] "let" |
32 | [email protected] " " | 32 | [email protected] " " |
33 | PLACEHOLDE[email protected] | 33 | WILDCARD[email protected] |
34 | [email protected] "_" | 34 | [email protected] "_" |
35 | [email protected] " " | 35 | [email protected] " " |
36 | [email protected] "=" | 36 | [email protected] "=" |
@@ -55,7 +55,7 @@ [email protected] | |||
55 | [email protected] | 55 | [email protected] |
56 | [email protected] "let" | 56 | [email protected] "let" |
57 | [email protected] " " | 57 | [email protected] " " |
58 | PLACEHOLDE[email protected] | 58 | WILDCARD[email protected] |
59 | [email protected] "_" | 59 | [email protected] "_" |
60 | [email protected] " " | 60 | [email protected] " " |
61 | [email protected] "=" | 61 | [email protected] "=" |
@@ -72,7 +72,7 @@ [email protected] | |||
72 | [email protected] | 72 | [email protected] |
73 | [email protected] "let" | 73 | [email protected] "let" |
74 | [email protected] " " | 74 | [email protected] " " |
75 | PLACEHOLDE[email protected] | 75 | WILDCARD[email protected] |
76 | [email protected] "_" | 76 | [email protected] "_" |
77 | [email protected] " " | 77 | [email protected] " " |
78 | [email protected] "=" | 78 | [email protected] "=" |
@@ -95,7 +95,7 @@ [email protected] | |||
95 | [email protected] | 95 | [email protected] |
96 | [email protected] "let" | 96 | [email protected] "let" |
97 | [email protected] " " | 97 | [email protected] " " |
98 | PLACEHOLDE[email protected] | 98 | WILDCARD[email protected] |
99 | [email protected] "_" | 99 | [email protected] "_" |
100 | [email protected] " " | 100 | [email protected] " " |
101 | [email protected] "=" | 101 | [email protected] "=" |
@@ -116,7 +116,7 @@ [email protected] | |||
116 | [email protected] | 116 | [email protected] |
117 | [email protected] "let" | 117 | [email protected] "let" |
118 | [email protected] " " | 118 | [email protected] " " |
119 | PLACEHOLDE[email protected] | 119 | WILDCARD[email protected] |
120 | [email protected] "_" | 120 | [email protected] "_" |
121 | [email protected] " " | 121 | [email protected] " " |
122 | [email protected] "=" | 122 | [email protected] "=" |
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 @@ [email protected] | |||
14 | [email protected] | 14 | [email protected] |
15 | [email protected] "let" | 15 | [email protected] "let" |
16 | [email protected] " " | 16 | [email protected] " " |
17 | PLACEHOLDE[email protected] | 17 | WILDCARD[email protected] |
18 | [email protected] "_" | 18 | [email protected] "_" |
19 | [email protected] " " | 19 | [email protected] " " |
20 | [email protected] "=" | 20 | [email protected] "=" |
@@ -26,7 +26,7 @@ [email protected] | |||
26 | [email protected] | 26 | [email protected] |
27 | [email protected] "let" | 27 | [email protected] "let" |
28 | [email protected] " " | 28 | [email protected] " " |
29 | PLACEHOLDE[email protected] | 29 | WILDCARD[email protected] |
30 | [email protected] "_" | 30 | [email protected] "_" |
31 | [email protected] " " | 31 | [email protected] " " |
32 | [email protected] "=" | 32 | [email protected] "=" |
@@ -38,7 +38,7 @@ [email protected] | |||
38 | [email protected] | 38 | [email protected] |
39 | [email protected] "let" | 39 | [email protected] "let" |
40 | [email protected] " " | 40 | [email protected] " " |
41 | PLACEHOLDE[email protected] | 41 | WILDCARD[email protected] |
42 | [email protected] "_" | 42 | [email protected] "_" |
43 | [email protected] " " | 43 | [email protected] " " |
44 | [email protected] "=" | 44 | [email protected] "=" |
@@ -50,7 +50,7 @@ [email protected] | |||
50 | [email protected] | 50 | [email protected] |
51 | [email protected] "let" | 51 | [email protected] "let" |
52 | [email protected] " " | 52 | [email protected] " " |
53 | PLACEHOLDE[email protected] | 53 | WILDCARD[email protected] |
54 | [email protected] "_" | 54 | [email protected] "_" |
55 | [email protected] " " | 55 | [email protected] " " |
56 | [email protected] "=" | 56 | [email protected] "=" |
@@ -62,7 +62,7 @@ [email protected] | |||
62 | [email protected] | 62 | [email protected] |
63 | [email protected] "let" | 63 | [email protected] "let" |
64 | [email protected] " " | 64 | [email protected] " " |
65 | PLACEHOLDE[email protected] | 65 | WILDCARD[email protected] |
66 | [email protected] "_" | 66 | [email protected] "_" |
67 | [email protected] " " | 67 | [email protected] " " |
68 | [email protected] "=" | 68 | [email protected] "=" |
@@ -74,7 +74,7 @@ [email protected] | |||
74 | [email protected] | 74 | [email protected] |
75 | [email protected] "let" | 75 | [email protected] "let" |
76 | [email protected] " " | 76 | [email protected] " " |
77 | PLACEHOLDE[email protected] | 77 | WILDCARD[email protected] |
78 | [email protected] "_" | 78 | [email protected] "_" |
79 | [email protected] " " | 79 | [email protected] " " |
80 | [email protected] "=" | 80 | [email protected] "=" |
@@ -86,7 +86,7 @@ [email protected] | |||
86 | [email protected] | 86 | [email protected] |
87 | [email protected] "let" | 87 | [email protected] "let" |
88 | [email protected] " " | 88 | [email protected] " " |
89 | PLACEHOLDE[email protected] | 89 | WILDCARD[email protected] |
90 | [email protected] "_" | 90 | [email protected] "_" |
91 | [email protected] " " | 91 | [email protected] " " |
92 | [email protected] "=" | 92 | [email protected] "=" |
@@ -98,7 +98,7 @@ [email protected] | |||
98 | [email protected] | 98 | [email protected] |
99 | [email protected] "let" | 99 | [email protected] "let" |
100 | [email protected] " " | 100 | [email protected] " " |
101 | PLACEHOLDE[email protected] | 101 | WILDCARD[email protected] |
102 | [email protected] "_" | 102 | [email protected] "_" |
103 | [email protected] " " | 103 | [email protected] " " |
104 | [email protected] "=" | 104 | [email protected] "=" |
@@ -110,7 +110,7 @@ [email protected] | |||
110 | [email protected] | 110 | [email protected] |
111 | [email protected] "let" | 111 | [email protected] "let" |
112 | [email protected] " " | 112 | [email protected] " " |
113 | PLACEHOLDE[email protected] | 113 | WILDCARD[email protected] |
114 | [email protected] "_" | 114 | [email protected] "_" |
115 | [email protected] " " | 115 | [email protected] " " |
116 | [email protected] "=" | 116 | [email protected] "=" |
@@ -122,7 +122,7 @@ [email protected] | |||
122 | [email protected] | 122 | [email protected] |
123 | [email protected] "let" | 123 | [email protected] "let" |
124 | [email protected] " " | 124 | [email protected] " " |
125 | PLACEHOLDE[email protected] | 125 | WILDCARD[email protected] |
126 | [email protected] "_" | 126 | [email protected] "_" |
127 | [email protected] " " | 127 | [email protected] " " |
128 | [email protected] "=" | 128 | [email protected] "=" |
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 @@ [email protected] | |||
14 | [email protected] | 14 | [email protected] |
15 | [email protected] "let" | 15 | [email protected] "let" |
16 | [email protected] " " | 16 | [email protected] " " |
17 | PLACEHOLDE[email protected] | 17 | WILDCARD[email protected] |
18 | [email protected] "_" | 18 | [email protected] "_" |
19 | [email protected] " " | 19 | [email protected] " " |
20 | [email protected] "=" | 20 | [email protected] "=" |
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 @@ [email protected] | |||
59 | [email protected] | 59 | [email protected] |
60 | [email protected] "for" | 60 | [email protected] "for" |
61 | [email protected] " " | 61 | [email protected] " " |
62 | PLACEHOLDE[email protected] | 62 | WILDCARD[email protected] |
63 | [email protected] "_" | 63 | [email protected] "_" |
64 | [email protected] " " | 64 | [email protected] " " |
65 | [email protected] "in" | 65 | [email protected] "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 @@ [email protected] | |||
84 | [email protected] "h" | 84 | [email protected] "h" |
85 | [email protected] ":" | 85 | [email protected] ":" |
86 | [email protected] " " | 86 | [email protected] " " |
87 | PLACEHOLDE[email protected] | 87 | WILDCARD[email protected] |
88 | [email protected] "_" | 88 | [email protected] "_" |
89 | [email protected] "," | 89 | [email protected] "," |
90 | [email protected] " " | 90 | [email protected] " " |
@@ -115,7 +115,7 @@ [email protected] | |||
115 | [email protected] "h" | 115 | [email protected] "h" |
116 | [email protected] ":" | 116 | [email protected] ":" |
117 | [email protected] " " | 117 | [email protected] " " |
118 | PLACEHOLDE[email protected] | 118 | WILDCARD[email protected] |
119 | [email protected] "_" | 119 | [email protected] "_" |
120 | [email protected] "," | 120 | [email protected] "," |
121 | [email protected] " " | 121 | [email protected] " " |
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 @@ [email protected] | |||
84 | [email protected] " " | 84 | [email protected] " " |
85 | [email protected] "@" | 85 | [email protected] "@" |
86 | [email protected] " " | 86 | [email protected] " " |
87 | PLACEHOLDE[email protected] | 87 | WILDCARD[email protected] |
88 | [email protected] "_" | 88 | [email protected] "_" |
89 | [email protected] " " | 89 | [email protected] " " |
90 | [email protected] "=" | 90 | [email protected] "=" |
@@ -113,7 +113,7 @@ [email protected] | |||
113 | [email protected] " " | 113 | [email protected] " " |
114 | [email protected] "@" | 114 | [email protected] "@" |
115 | [email protected] " " | 115 | [email protected] " " |
116 | PLACEHOLDE[email protected] | 116 | WILDCARD[email protected] |
117 | [email protected] "_" | 117 | [email protected] "_" |
118 | [email protected] " " | 118 | [email protected] " " |
119 | [email protected] "=" | 119 | [email protected] "=" |
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 @@ [email protected] | |||
22 | [email protected] "{" | 22 | [email protected] "{" |
23 | [email protected] "\n " | 23 | [email protected] "\n " |
24 | [email protected] | 24 | [email protected] |
25 | PLACEHOLDE[email protected] | 25 | WILDCARD[email protected] |
26 | [email protected] "_" | 26 | [email protected] "_" |
27 | [email protected] " " | 27 | [email protected] " " |
28 | [email protected] | 28 | [email protected] |
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 @@ [email protected] | |||
64 | [email protected] "]" | 64 | [email protected] "]" |
65 | [email protected] "\n " | 65 | [email protected] "\n " |
66 | [email protected] | 66 | [email protected] |
67 | PLACEHOLDE[email protected] | 67 | WILDCARD[email protected] |
68 | [email protected] "_" | 68 | [email protected] "_" |
69 | [email protected] " " | 69 | [email protected] " " |
70 | [email protected] "=>" | 70 | [email protected] "=>" |
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 @@ [email protected] | |||
39 | [email protected] ")" | 39 | [email protected] ")" |
40 | [email protected] "]" | 40 | [email protected] "]" |
41 | [email protected] "\n " | 41 | [email protected] "\n " |
42 | PLACEHOLDE[email protected] | 42 | WILDCARD[email protected] |
43 | [email protected] "_" | 43 | [email protected] "_" |
44 | [email protected] " " | 44 | [email protected] " " |
45 | [email protected] "=>" | 45 | [email protected] "=>" |
@@ -67,7 +67,7 @@ [email protected] | |||
67 | [email protected] ")" | 67 | [email protected] ")" |
68 | [email protected] "]" | 68 | [email protected] "]" |
69 | [email protected] "\n " | 69 | [email protected] "\n " |
70 | PLACEHOLDE[email protected] | 70 | WILDCARD[email protected] |
71 | [email protected] "_" | 71 | [email protected] "_" |
72 | [email protected] " " | 72 | [email protected] " " |
73 | [email protected] "=>" | 73 | [email protected] "=>" |
@@ -129,7 +129,7 @@ [email protected] | |||
129 | [email protected] ")" | 129 | [email protected] ")" |
130 | [email protected] "]" | 130 | [email protected] "]" |
131 | [email protected] "\n " | 131 | [email protected] "\n " |
132 | PLACEHOLDE[email protected] | 132 | WILDCARD[email protected] |
133 | [email protected] "_" | 133 | [email protected] "_" |
134 | [email protected] " " | 134 | [email protected] " " |
135 | [email protected] "=>" | 135 | [email protected] "=>" |
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 @@ [email protected] | |||
43 | [email protected] | 43 | [email protected] |
44 | [email protected] "(" | 44 | [email protected] "(" |
45 | [email protected] | 45 | [email protected] |
46 | PLACEHOLDE[email protected] | 46 | WILDCARD[email protected] |
47 | [email protected] "_" | 47 | [email protected] "_" |
48 | [email protected] ":" | 48 | [email protected] ":" |
49 | [email protected] " " | 49 | [email protected] " " |
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 @@ [email protected] | |||
82 | [email protected] | 82 | [email protected] |
83 | [email protected] "let" | 83 | [email protected] "let" |
84 | [email protected] " " | 84 | [email protected] " " |
85 | PLACEHOLDE[email protected] | 85 | WILDCARD[email protected] |
86 | [email protected] "_" | 86 | [email protected] "_" |
87 | [email protected] ":" | 87 | [email protected] ":" |
88 | [email protected] " " | 88 | [email protected] " " |
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 @@ [email protected] | |||
14 | [email protected] | 14 | [email protected] |
15 | [email protected] "let" | 15 | [email protected] "let" |
16 | [email protected] " " | 16 | [email protected] " " |
17 | PLACEHOLDE[email protected] | 17 | WILDCARD[email protected] |
18 | [email protected] "_" | 18 | [email protected] "_" |
19 | [email protected] " " | 19 | [email protected] " " |
20 | [email protected] "=" | 20 | [email protected] "=" |
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 @@ [email protected] | |||
14 | [email protected] | 14 | [email protected] |
15 | [email protected] "let" | 15 | [email protected] "let" |
16 | [email protected] " " | 16 | [email protected] " " |
17 | PLACEHOLDE[email protected] | 17 | WILDCARD[email protected] |
18 | [email protected] "_" | 18 | [email protected] "_" |
19 | [email protected] " " | 19 | [email protected] " " |
20 | [email protected] "=" | 20 | [email protected] "=" |
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 @@ [email protected] | |||
25 | [email protected] | 25 | [email protected] |
26 | [email protected] "(" | 26 | [email protected] "(" |
27 | [email protected] | 27 | [email protected] |
28 | PLACEHOLDE[email protected] | 28 | WILDCARD[email protected] |
29 | [email protected] "_" | 29 | [email protected] "_" |
30 | [email protected] " " | 30 | [email protected] " " |
31 | [email protected] "|" | 31 | [email protected] "|" |
32 | [email protected] " " | 32 | [email protected] " " |
33 | PLACEHOLDE[email protected] | 33 | WILDCARD[email protected] |
34 | [email protected] "_" | 34 | [email protected] "_" |
35 | [email protected] ")" | 35 | [email protected] ")" |
36 | [email protected] " " | 36 | [email protected] " " |
@@ -47,12 +47,12 @@ [email protected] | |||
47 | [email protected] | 47 | [email protected] |
48 | [email protected] "(" | 48 | [email protected] "(" |
49 | [email protected] | 49 | [email protected] |
50 | PLACEHOLDE[email protected] | 50 | WILDCARD[email protected] |
51 | [email protected] "_" | 51 | [email protected] "_" |
52 | [email protected] " " | 52 | [email protected] " " |
53 | [email protected] "|" | 53 | [email protected] "|" |
54 | [email protected] " " | 54 | [email protected] " " |
55 | PLACEHOLDE[email protected] | 55 | WILDCARD[email protected] |
56 | [email protected] "_" | 56 | [email protected] "_" |
57 | [email protected] ")" | 57 | [email protected] ")" |
58 | [email protected] " " | 58 | [email protected] " " |
@@ -67,12 +67,12 @@ [email protected] | |||
67 | [email protected] | 67 | [email protected] |
68 | [email protected] "(" | 68 | [email protected] "(" |
69 | [email protected] | 69 | [email protected] |
70 | PLACEHOLDE[email protected] | 70 | WILDCARD[email protected] |
71 | [email protected] "_" | 71 | [email protected] "_" |
72 | [email protected] " " | 72 | [email protected] " " |
73 | [email protected] "|" | 73 | [email protected] "|" |
74 | [email protected] " " | 74 | [email protected] " " |
75 | PLACEHOLDE[email protected] | 75 | WILDCARD[email protected] |
76 | [email protected] "_" | 76 | [email protected] "_" |
77 | [email protected] "," | 77 | [email protected] "," |
78 | [email protected] ")" | 78 | [email protected] ")" |
@@ -88,12 +88,12 @@ [email protected] | |||
88 | [email protected] | 88 | [email protected] |
89 | [email protected] "[" | 89 | [email protected] "[" |
90 | [email protected] | 90 | [email protected] |
91 | PLACEHOLDE[email protected] | 91 | WILDCARD[email protected] |
92 | [email protected] "_" | 92 | [email protected] "_" |
93 | [email protected] " " | 93 | [email protected] " " |
94 | [email protected] "|" | 94 | [email protected] "|" |
95 | [email protected] " " | 95 | [email protected] " " |
96 | PLACEHOLDE[email protected] | 96 | WILDCARD[email protected] |
97 | [email protected] "_" | 97 | [email protected] "_" |
98 | [email protected] "," | 98 | [email protected] "," |
99 | [email protected] "]" | 99 | [email protected] "]" |
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 @@ [email protected] | |||
12 | [email protected] | 12 | [email protected] |
13 | [email protected] "(" | 13 | [email protected] "(" |
14 | [email protected] | 14 | [email protected] |
15 | PLACEHOLDE[email protected] | 15 | WILDCARD[email protected] |
16 | [email protected] "_" | 16 | [email protected] "_" |
17 | [email protected] ":" | 17 | [email protected] ":" |
18 | [email protected] " " | 18 | [email protected] " " |
diff --git a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast index 93f766149..80f7f5942 100644 --- a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast +++ b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast | |||
@@ -14,7 +14,7 @@ [email protected] | |||
14 | [email protected] | 14 | [email protected] |
15 | [email protected] "let" | 15 | [email protected] "let" |
16 | [email protected] " " | 16 | [email protected] " " |
17 | PLACEHOLDE[email protected] | 17 | WILDCARD[email protected] |
18 | [email protected] "_" | 18 | [email protected] "_" |
19 | [email protected] " " | 19 | [email protected] " " |
20 | [email protected] "=" | 20 | [email protected] "=" |
@@ -26,7 +26,7 @@ [email protected] | |||
26 | [email protected] | 26 | [email protected] |
27 | [email protected] "let" | 27 | [email protected] "let" |
28 | [email protected] " " | 28 | [email protected] " " |
29 | PLACEHOLDE[email protected] | 29 | WILDCARD[email protected] |
30 | [email protected] "_" | 30 | [email protected] "_" |
31 | [email protected] " " | 31 | [email protected] " " |
32 | [email protected] "=" | 32 | [email protected] "=" |
@@ -38,7 +38,7 @@ [email protected] | |||
38 | [email protected] | 38 | [email protected] |
39 | [email protected] "let" | 39 | [email protected] "let" |
40 | [email protected] " " | 40 | [email protected] " " |
41 | PLACEHOLDE[email protected] | 41 | WILDCARD[email protected] |
42 | [email protected] "_" | 42 | [email protected] "_" |
43 | [email protected] " " | 43 | [email protected] " " |
44 | [email protected] "=" | 44 | [email protected] "=" |
@@ -50,7 +50,7 @@ [email protected] | |||
50 | [email protected] | 50 | [email protected] |
51 | [email protected] "let" | 51 | [email protected] "let" |
52 | [email protected] " " | 52 | [email protected] " " |
53 | PLACEHOLDE[email protected] | 53 | WILDCARD[email protected] |
54 | [email protected] "_" | 54 | [email protected] "_" |
55 | [email protected] " " | 55 | [email protected] " " |
56 | [email protected] "=" | 56 | [email protected] "=" |
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 0e0c8c9dc..d48f638cd 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 | |||
@@ -506,7 +506,7 @@ [email protected] | |||
506 | [email protected] "}" | 506 | [email protected] "}" |
507 | [email protected] "\n " | 507 | [email protected] "\n " |
508 | [email protected] | 508 | [email protected] |
509 | PLACEHOLDE[email protected] | 509 | WILDCARD[email protected] |
510 | [email protected] "_" | 510 | [email protected] "_" |
511 | [email protected] " " | 511 | [email protected] " " |
512 | [email protected] "=>" | 512 | [email protected] "=>" |
@@ -1102,7 +1102,7 @@ [email protected] | |||
1102 | [email protected] "," | 1102 | [email protected] "," |
1103 | [email protected] " " | 1103 | [email protected] " " |
1104 | [email protected] | 1104 | [email protected] |
1105 | PLACEHOLDE[email protected] | 1105 | WILDCARD[email protected] |
1106 | [email protected] "_" | 1106 | [email protected] "_" |
1107 | [email protected] " " | 1107 | [email protected] " " |
1108 | [email protected] "=>" | 1108 | [email protected] "=>" |
@@ -1652,7 +1652,7 @@ [email protected] | |||
1652 | [email protected] | 1652 | [email protected] |
1653 | [email protected] "__" | 1653 | [email protected] "__" |
1654 | [email protected] "@" | 1654 | [email protected] "@" |
1655 | PLACEHOLDE[email protected] | 1655 | WILDCARD[email protected] |
1656 | [email protected] "_" | 1656 | [email protected] "_" |
1657 | [email protected] "|" | 1657 | [email protected] "|" |
1658 | [email protected] | 1658 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast index ed29b0812..e71e069f1 100644 --- a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast +++ b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast | |||
@@ -63,7 +63,7 @@ [email protected] | |||
63 | [email protected] | 63 | [email protected] |
64 | [email protected] "(" | 64 | [email protected] "(" |
65 | [email protected] | 65 | [email protected] |
66 | PLACEHOLDE[email protected] | 66 | WILDCARD[email protected] |
67 | [email protected] "_" | 67 | [email protected] "_" |
68 | [email protected] ":" | 68 | [email protected] ":" |
69 | [email protected] " " | 69 | [email protected] " " |
diff --git a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast index 7a54fa113..4f8dff909 100644 --- a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast +++ b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast | |||
@@ -55,7 +55,7 @@ [email protected] | |||
55 | [email protected] "," | 55 | [email protected] "," |
56 | [email protected] "\n " | 56 | [email protected] "\n " |
57 | [email protected] | 57 | [email protected] |
58 | PLACEHOLDE[email protected] | 58 | WILDCARD[email protected] |
59 | [email protected] "_" | 59 | [email protected] "_" |
60 | [email protected] " " | 60 | [email protected] " " |
61 | [email protected] "=>" | 61 | [email protected] "=>" |
@@ -127,7 +127,7 @@ [email protected] | |||
127 | [email protected] "," | 127 | [email protected] "," |
128 | [email protected] "\n " | 128 | [email protected] "\n " |
129 | [email protected] | 129 | [email protected] |
130 | PLACEHOLDE[email protected] | 130 | WILDCARD[email protected] |
131 | [email protected] "_" | 131 | [email protected] "_" |
132 | [email protected] " " | 132 | [email protected] " " |
133 | [email protected] "=>" | 133 | [email protected] "=>" |
@@ -203,7 +203,7 @@ [email protected] | |||
203 | [email protected] "," | 203 | [email protected] "," |
204 | [email protected] "\n " | 204 | [email protected] "\n " |
205 | [email protected] | 205 | [email protected] |
206 | PLACEHOLDE[email protected] | 206 | WILDCARD[email protected] |
207 | [email protected] "_" | 207 | [email protected] "_" |
208 | [email protected] " " | 208 | [email protected] " " |
209 | [email protected] "=>" | 209 | [email protected] "=>" |
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 706ccdc39..a80a6cd7a 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 | |||
@@ -212,7 +212,7 @@ [email protected] | |||
212 | [email protected] "]" | 212 | [email protected] "]" |
213 | [email protected] " " | 213 | [email protected] " " |
214 | [email protected] | 214 | [email protected] |
215 | PLACEHOLDE[email protected] | 215 | WILDCARD[email protected] |
216 | [email protected] "_" | 216 | [email protected] "_" |
217 | [email protected] ":" | 217 | [email protected] ":" |
218 | [email protected] " " | 218 | [email protected] " " |
diff --git a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast index 0d48c7e81..f71ceecd7 100644 --- a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast +++ b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast | |||
@@ -43,7 +43,7 @@ [email protected] | |||
43 | [email protected] | 43 | [email protected] |
44 | [email protected] "(" | 44 | [email protected] "(" |
45 | [email protected] | 45 | [email protected] |
46 | PLACEHOLDE[email protected] | 46 | WILDCARD[email protected] |
47 | [email protected] "_" | 47 | [email protected] "_" |
48 | [email protected] ":" | 48 | [email protected] ":" |
49 | [email protected] " " | 49 | [email protected] " " |
@@ -85,7 +85,7 @@ [email protected] | |||
85 | [email protected] | 85 | [email protected] |
86 | [email protected] "(" | 86 | [email protected] "(" |
87 | [email protected] | 87 | [email protected] |
88 | PLACEHOLDE[email protected] | 88 | WILDCARD[email protected] |
89 | [email protected] "_" | 89 | [email protected] "_" |
90 | [email protected] ":" | 90 | [email protected] ":" |
91 | [email protected] " " | 91 | [email protected] " " |
diff --git a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast b/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast index 767b516a2..213f7b381 100644 --- a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast +++ b/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast | |||
@@ -23,7 +23,7 @@ [email protected] | |||
23 | [email protected] | 23 | [email protected] |
24 | [email protected] "for" | 24 | [email protected] "for" |
25 | [email protected] " " | 25 | [email protected] " " |
26 | PLACEHOLDE[email protected] | 26 | WILDCARD[email protected] |
27 | [email protected] "_" | 27 | [email protected] "_" |
28 | [email protected] " " | 28 | [email protected] " " |
29 | [email protected] "in" | 29 | [email protected] "in" |
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 7c5467289..9d88e4cbf 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 | |||
@@ -163,7 +163,7 @@ [email protected] | |||
163 | [email protected] | 163 | [email protected] |
164 | [email protected] "(" | 164 | [email protected] "(" |
165 | [email protected] | 165 | [email protected] |
166 | PLACEHOLDE[email protected] | 166 | WILDCARD[email protected] |
167 | [email protected] "_" | 167 | [email protected] "_" |
168 | [email protected] ":" | 168 | [email protected] ":" |
169 | [email protected] " " | 169 | [email protected] " " |
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 7adedb02e..d8bf1f8c8 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 | |||
@@ -16,7 +16,7 @@ [email protected] | |||
16 | [email protected] | 16 | [email protected] |
17 | [email protected] "(" | 17 | [email protected] "(" |
18 | [email protected] | 18 | [email protected] |
19 | PLACEHOLDE[email protected] | 19 | WILDCARD[email protected] |
20 | [email protected] "_" | 20 | [email protected] "_" |
21 | [email protected] ":" | 21 | [email protected] ":" |
22 | [email protected] " " | 22 | [email protected] " " |
@@ -45,7 +45,7 @@ [email protected] | |||
45 | [email protected] | 45 | [email protected] |
46 | [email protected] "(" | 46 | [email protected] "(" |
47 | [email protected] | 47 | [email protected] |
48 | PLACEHOLDE[email protected] | 48 | WILDCARD[email protected] |
49 | [email protected] "_" | 49 | [email protected] "_" |
50 | [email protected] ":" | 50 | [email protected] ":" |
51 | [email protected] " " | 51 | [email protected] " " |
@@ -61,7 +61,7 @@ [email protected] | |||
61 | [email protected] "," | 61 | [email protected] "," |
62 | [email protected] " " | 62 | [email protected] " " |
63 | [email protected] | 63 | [email protected] |
64 | PLACEHOLDE[email protected] | 64 | WILDCARD[email protected] |
65 | [email protected] "_" | 65 | [email protected] "_" |
66 | [email protected] ":" | 66 | [email protected] ":" |
67 | [email protected] " " | 67 | [email protected] " " |
@@ -77,7 +77,7 @@ [email protected] | |||
77 | [email protected] | 77 | [email protected] |
78 | [email protected] "(" | 78 | [email protected] "(" |
79 | [email protected] | 79 | [email protected] |
80 | PLACEHOLDE[email protected] | 80 | WILDCARD[email protected] |
81 | [email protected] "_" | 81 | [email protected] "_" |
82 | [email protected] ":" | 82 | [email protected] ":" |
83 | [email protected] " " | 83 | [email protected] " " |
diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs index 869bdaa0d..fbe36d2f5 100644 --- a/xtask/src/ast_src.rs +++ b/xtask/src/ast_src.rs | |||
@@ -127,7 +127,7 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc { | |||
127 | "REF_PAT", | 127 | "REF_PAT", |
128 | "BOX_PAT", | 128 | "BOX_PAT", |
129 | "BIND_PAT", | 129 | "BIND_PAT", |
130 | "PLACEHOLDER_PAT", | 130 | "WILDCARD_PAT", |
131 | "DOT_DOT_PAT", | 131 | "DOT_DOT_PAT", |
132 | "PATH_PAT", | 132 | "PATH_PAT", |
133 | "RECORD_PAT", | 133 | "RECORD_PAT", |
diff --git a/xtask/src/codegen/rust.ungram b/xtask/src/codegen/rust.ungram index cb8a307fe..7c814240a 100644 --- a/xtask/src/codegen/rust.ungram +++ b/xtask/src/codegen/rust.ungram | |||
@@ -505,7 +505,7 @@ Pat = | |||
505 | | OrPat | 505 | | OrPat |
506 | | ParenPat | 506 | | ParenPat |
507 | | PathPat | 507 | | PathPat |
508 | | PlaceholderPat | 508 | | WildcardPat |
509 | | RangePat | 509 | | RangePat |
510 | | RecordPat | 510 | | RecordPat |
511 | | RefPat | 511 | | RefPat |
@@ -519,7 +519,7 @@ LiteralPat = | |||
519 | BindPat = | 519 | BindPat = |
520 | Attr* 'ref'? 'mut'? Name ('@' Pat)? | 520 | Attr* 'ref'? 'mut'? Name ('@' Pat)? |
521 | 521 | ||
522 | PlaceholderPat = | 522 | WildcardPat = |
523 | '_' | 523 | '_' |
524 | 524 | ||
525 | RangePat = | 525 | RangePat = |