diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-19 21:01:19 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-19 21:01:19 +0100 |
commit | 58dc3b16496cbcce14101605aa1214e263b91c87 (patch) | |
tree | fc95ce3365f3adc3f289e188eaa8a590a253eb7e /crates/ra_parser/src/grammar/patterns.rs | |
parent | cd9b222ba0555424d73d549eac43d9aaf1765d7d (diff) | |
parent | 883edd002eaddc138a402918d0d765278e9bc2c9 (diff) |
Merge #1877
1877: Replace usages of bump_any with bump r=matklad a=kjeremy
Fixes #1854
Co-authored-by: kjeremy <[email protected]>
Diffstat (limited to 'crates/ra_parser/src/grammar/patterns.rs')
-rw-r--r-- | crates/ra_parser/src/grammar/patterns.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crates/ra_parser/src/grammar/patterns.rs b/crates/ra_parser/src/grammar/patterns.rs index 919b0f37d..a4ffd6960 100644 --- a/crates/ra_parser/src/grammar/patterns.rs +++ b/crates/ra_parser/src/grammar/patterns.rs | |||
@@ -106,7 +106,7 @@ fn literal_pat(p: &mut Parser) -> CompletedMarker { | |||
106 | assert!(is_literal_pat_start(p)); | 106 | assert!(is_literal_pat_start(p)); |
107 | let m = p.start(); | 107 | let m = p.start(); |
108 | if p.at(T![-]) { | 108 | if p.at(T![-]) { |
109 | p.bump_any(); | 109 | p.bump(T![-]); |
110 | } | 110 | } |
111 | expressions::literal(p); | 111 | expressions::literal(p); |
112 | m.complete(p, LITERAL_PAT) | 112 | m.complete(p, LITERAL_PAT) |
@@ -146,7 +146,7 @@ fn path_pat(p: &mut Parser) -> CompletedMarker { | |||
146 | // } | 146 | // } |
147 | fn tuple_pat_fields(p: &mut Parser) { | 147 | fn tuple_pat_fields(p: &mut Parser) { |
148 | assert!(p.at(T!['('])); | 148 | assert!(p.at(T!['('])); |
149 | p.bump_any(); | 149 | p.bump(T!['(']); |
150 | pat_list(p, T![')']); | 150 | pat_list(p, T![')']); |
151 | p.expect(T![')']); | 151 | p.expect(T![')']); |
152 | } | 152 | } |
@@ -161,7 +161,7 @@ fn tuple_pat_fields(p: &mut Parser) { | |||
161 | fn record_field_pat_list(p: &mut Parser) { | 161 | fn record_field_pat_list(p: &mut Parser) { |
162 | assert!(p.at(T!['{'])); | 162 | assert!(p.at(T!['{'])); |
163 | let m = p.start(); | 163 | let m = p.start(); |
164 | p.bump_any(); | 164 | p.bump(T!['{']); |
165 | while !p.at(EOF) && !p.at(T!['}']) { | 165 | while !p.at(EOF) && !p.at(T!['}']) { |
166 | match p.current() { | 166 | match p.current() { |
167 | // A trailing `..` is *not* treated as a DOT_DOT_PAT. | 167 | // A trailing `..` is *not* treated as a DOT_DOT_PAT. |
@@ -200,7 +200,7 @@ fn record_field_pat(p: &mut Parser) { | |||
200 | fn placeholder_pat(p: &mut Parser) -> CompletedMarker { | 200 | fn placeholder_pat(p: &mut Parser) -> CompletedMarker { |
201 | assert!(p.at(T![_])); | 201 | assert!(p.at(T![_])); |
202 | let m = p.start(); | 202 | let m = p.start(); |
203 | p.bump_any(); | 203 | p.bump(T![_]); |
204 | m.complete(p, PLACEHOLDER_PAT) | 204 | m.complete(p, PLACEHOLDER_PAT) |
205 | } | 205 | } |
206 | 206 | ||
@@ -245,7 +245,7 @@ fn dot_dot_pat(p: &mut Parser) -> CompletedMarker { | |||
245 | fn ref_pat(p: &mut Parser) -> CompletedMarker { | 245 | fn ref_pat(p: &mut Parser) -> CompletedMarker { |
246 | assert!(p.at(T![&])); | 246 | assert!(p.at(T![&])); |
247 | let m = p.start(); | 247 | let m = p.start(); |
248 | p.bump_any(); | 248 | p.bump(T![&]); |
249 | p.eat(T![mut]); | 249 | p.eat(T![mut]); |
250 | pattern(p); | 250 | pattern(p); |
251 | m.complete(p, REF_PAT) | 251 | m.complete(p, REF_PAT) |
@@ -269,7 +269,7 @@ fn tuple_pat(p: &mut Parser) -> CompletedMarker { | |||
269 | fn slice_pat(p: &mut Parser) -> CompletedMarker { | 269 | fn slice_pat(p: &mut Parser) -> CompletedMarker { |
270 | assert!(p.at(T!['['])); | 270 | assert!(p.at(T!['['])); |
271 | let m = p.start(); | 271 | let m = p.start(); |
272 | p.bump_any(); | 272 | p.bump(T!['[']); |
273 | pat_list(p, T![']']); | 273 | pat_list(p, T![']']); |
274 | p.expect(T![']']); | 274 | p.expect(T![']']); |
275 | m.complete(p, SLICE_PAT) | 275 | m.complete(p, SLICE_PAT) |
@@ -318,7 +318,7 @@ fn bind_pat(p: &mut Parser, with_at: bool) -> CompletedMarker { | |||
318 | fn box_pat(p: &mut Parser) -> CompletedMarker { | 318 | fn box_pat(p: &mut Parser) -> CompletedMarker { |
319 | assert!(p.at(T![box])); | 319 | assert!(p.at(T![box])); |
320 | let m = p.start(); | 320 | let m = p.start(); |
321 | p.bump_any(); | 321 | p.bump(T![box]); |
322 | pattern(p); | 322 | pattern(p); |
323 | m.complete(p, BOX_PAT) | 323 | m.complete(p, BOX_PAT) |
324 | } | 324 | } |