diff options
author | kjeremy <[email protected]> | 2019-09-19 20:51:46 +0100 |
---|---|---|
committer | kjeremy <[email protected]> | 2019-09-19 20:51:46 +0100 |
commit | 883edd002eaddc138a402918d0d765278e9bc2c9 (patch) | |
tree | fc95ce3365f3adc3f289e188eaa8a590a253eb7e /crates/ra_parser/src/grammar.rs | |
parent | cd9b222ba0555424d73d549eac43d9aaf1765d7d (diff) |
Replace usages of bump_any with bump
Diffstat (limited to 'crates/ra_parser/src/grammar.rs')
-rw-r--r-- | crates/ra_parser/src/grammar.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs index 0158f9b8a..e2355aff9 100644 --- a/crates/ra_parser/src/grammar.rs +++ b/crates/ra_parser/src/grammar.rs | |||
@@ -212,7 +212,7 @@ fn opt_visibility(p: &mut Parser) -> bool { | |||
212 | // fn foo() { crate::foo(); } | 212 | // fn foo() { crate::foo(); } |
213 | T![crate] if !p.nth_at(1, T![::]) => { | 213 | T![crate] if !p.nth_at(1, T![::]) => { |
214 | let m = p.start(); | 214 | let m = p.start(); |
215 | p.bump_any(); | 215 | p.bump(T![crate]); |
216 | m.complete(p, VISIBILITY); | 216 | m.complete(p, VISIBILITY); |
217 | } | 217 | } |
218 | _ => return false, | 218 | _ => return false, |
@@ -223,7 +223,7 @@ fn opt_visibility(p: &mut Parser) -> bool { | |||
223 | fn opt_alias(p: &mut Parser) { | 223 | fn opt_alias(p: &mut Parser) { |
224 | if p.at(T![as]) { | 224 | if p.at(T![as]) { |
225 | let m = p.start(); | 225 | let m = p.start(); |
226 | p.bump_any(); | 226 | p.bump(T![as]); |
227 | if !p.eat(T![_]) { | 227 | if !p.eat(T![_]) { |
228 | name(p); | 228 | name(p); |
229 | } | 229 | } |
@@ -234,7 +234,7 @@ fn opt_alias(p: &mut Parser) { | |||
234 | fn abi(p: &mut Parser) { | 234 | fn abi(p: &mut Parser) { |
235 | assert!(p.at(T![extern])); | 235 | assert!(p.at(T![extern])); |
236 | let abi = p.start(); | 236 | let abi = p.start(); |
237 | p.bump_any(); | 237 | p.bump(T![extern]); |
238 | match p.current() { | 238 | match p.current() { |
239 | STRING | RAW_STRING => p.bump_any(), | 239 | STRING | RAW_STRING => p.bump_any(), |
240 | _ => (), | 240 | _ => (), |
@@ -257,7 +257,7 @@ fn opt_fn_ret_type(p: &mut Parser) -> bool { | |||
257 | fn name_r(p: &mut Parser, recovery: TokenSet) { | 257 | fn name_r(p: &mut Parser, recovery: TokenSet) { |
258 | if p.at(IDENT) { | 258 | if p.at(IDENT) { |
259 | let m = p.start(); | 259 | let m = p.start(); |
260 | p.bump_any(); | 260 | p.bump(IDENT); |
261 | m.complete(p, NAME); | 261 | m.complete(p, NAME); |
262 | } else { | 262 | } else { |
263 | p.err_recover("expected a name", recovery); | 263 | p.err_recover("expected a name", recovery); |
@@ -271,11 +271,11 @@ fn name(p: &mut Parser) { | |||
271 | fn name_ref(p: &mut Parser) { | 271 | fn name_ref(p: &mut Parser) { |
272 | if p.at(IDENT) { | 272 | if p.at(IDENT) { |
273 | let m = p.start(); | 273 | let m = p.start(); |
274 | p.bump_any(); | 274 | p.bump(IDENT); |
275 | m.complete(p, NAME_REF); | 275 | m.complete(p, NAME_REF); |
276 | } else if p.at(T![self]) { | 276 | } else if p.at(T![self]) { |
277 | let m = p.start(); | 277 | let m = p.start(); |
278 | p.bump_any(); | 278 | p.bump(T![self]); |
279 | m.complete(p, T![self]); | 279 | m.complete(p, T![self]); |
280 | } else { | 280 | } else { |
281 | p.err_and_bump("expected identifier"); | 281 | p.err_and_bump("expected identifier"); |
@@ -296,7 +296,7 @@ fn error_block(p: &mut Parser, message: &str) { | |||
296 | assert!(p.at(T!['{'])); | 296 | assert!(p.at(T!['{'])); |
297 | let m = p.start(); | 297 | let m = p.start(); |
298 | p.error(message); | 298 | p.error(message); |
299 | p.bump_any(); | 299 | p.bump(T!['{']); |
300 | expressions::expr_block_contents(p); | 300 | expressions::expr_block_contents(p); |
301 | p.eat(T!['}']); | 301 | p.eat(T!['}']); |
302 | m.complete(p, ERROR); | 302 | m.complete(p, ERROR); |