diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-31 20:47:23 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-31 20:47:23 +0100 |
commit | 1914d0aa7b5518c743e7403da6d7eea3fe28e955 (patch) | |
tree | ae48a497fbe6ef49c5b8a9a0431c778953c428a0 /crates/ra_parser | |
parent | 215b9b9cccd66c9e9413e7581931371daa0c94e5 (diff) | |
parent | 22d295ceaaee76dbd555cdeedc0ed7578e66279d (diff) |
Merge #5633
5633: Rename DotDotPat -> RestPat r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_parser')
-rw-r--r-- | crates/ra_parser/src/grammar/patterns.rs | 4 | ||||
-rw-r--r-- | crates/ra_parser/src/syntax_kind/generated.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_parser/src/grammar/patterns.rs b/crates/ra_parser/src/grammar/patterns.rs index 623e8d6d4..716bdc978 100644 --- a/crates/ra_parser/src/grammar/patterns.rs +++ b/crates/ra_parser/src/grammar/patterns.rs | |||
@@ -192,7 +192,7 @@ fn record_field_pat_list(p: &mut Parser) { | |||
192 | p.bump(T!['{']); | 192 | p.bump(T!['{']); |
193 | while !p.at(EOF) && !p.at(T!['}']) { | 193 | while !p.at(EOF) && !p.at(T!['}']) { |
194 | match p.current() { | 194 | match p.current() { |
195 | // A trailing `..` is *not* treated as a DOT_DOT_PAT. | 195 | // A trailing `..` is *not* treated as a REST_PAT. |
196 | T![.] if p.at(T![..]) => p.bump(T![..]), | 196 | T![.] if p.at(T![..]) => p.bump(T![..]), |
197 | T!['{'] => error_block(p, "expected ident"), | 197 | T!['{'] => error_block(p, "expected ident"), |
198 | 198 | ||
@@ -267,7 +267,7 @@ fn dot_dot_pat(p: &mut Parser) -> CompletedMarker { | |||
267 | assert!(p.at(T![..])); | 267 | assert!(p.at(T![..])); |
268 | let m = p.start(); | 268 | let m = p.start(); |
269 | p.bump(T![..]); | 269 | p.bump(T![..]); |
270 | m.complete(p, DOT_DOT_PAT) | 270 | m.complete(p, REST_PAT) |
271 | } | 271 | } |
272 | 272 | ||
273 | // test ref_pat | 273 | // test ref_pat |
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs index b5dda25a9..b18653aa5 100644 --- a/crates/ra_parser/src/syntax_kind/generated.rs +++ b/crates/ra_parser/src/syntax_kind/generated.rs | |||
@@ -158,7 +158,7 @@ pub enum SyntaxKind { | |||
158 | BOX_PAT, | 158 | BOX_PAT, |
159 | IDENT_PAT, | 159 | IDENT_PAT, |
160 | WILDCARD_PAT, | 160 | WILDCARD_PAT, |
161 | DOT_DOT_PAT, | 161 | REST_PAT, |
162 | PATH_PAT, | 162 | PATH_PAT, |
163 | RECORD_PAT, | 163 | RECORD_PAT, |
164 | RECORD_PAT_FIELD_LIST, | 164 | RECORD_PAT_FIELD_LIST, |