Skip to content

Commit 58dc3b1

Browse files
bors[bot]kjeremy
bors[bot]
and
kjeremy
authored
Merge #1877
1877: Replace usages of bump_any with bump r=matklad a=kjeremy Fixes #1854 Co-authored-by: kjeremy <[email protected]>
2 parents cd9b222 + 883edd0 commit 58dc3b1

File tree

14 files changed

+87
-87
lines changed

14 files changed

+87
-87
lines changed

‎crates/ra_parser/src/grammar.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ fn opt_visibility(p: &mut Parser) -> bool {
212212
// fn foo() { crate::foo(); }
213213
T![crate] if !p.nth_at(1, T![::]) => {
214214
let m = p.start();
215-
p.bump_any();
215+
p.bump(T![crate]);
216216
m.complete(p, VISIBILITY);
217217
}
218218
_ => return false,
@@ -223,7 +223,7 @@ fn opt_visibility(p: &mut Parser) -> bool {
223223
fn opt_alias(p: &mut Parser) {
224224
if p.at(T![as]) {
225225
let m = p.start();
226-
p.bump_any();
226+
p.bump(T![as]);
227227
if !p.eat(T![_]) {
228228
name(p);
229229
}
@@ -234,7 +234,7 @@ fn opt_alias(p: &mut Parser) {
234234
fn abi(p: &mut Parser) {
235235
assert!(p.at(T![extern]));
236236
let abi = p.start();
237-
p.bump_any();
237+
p.bump(T![extern]);
238238
match p.current() {
239239
STRING | RAW_STRING => p.bump_any(),
240240
_ => (),
@@ -257,7 +257,7 @@ fn opt_fn_ret_type(p: &mut Parser) -> bool {
257257
fn name_r(p: &mut Parser, recovery: TokenSet) {
258258
if p.at(IDENT) {
259259
let m = p.start();
260-
p.bump_any();
260+
p.bump(IDENT);
261261
m.complete(p, NAME);
262262
} else {
263263
p.err_recover("expected a name", recovery);
@@ -271,11 +271,11 @@ fn name(p: &mut Parser) {
271271
fn name_ref(p: &mut Parser) {
272272
if p.at(IDENT) {
273273
let m = p.start();
274-
p.bump_any();
274+
p.bump(IDENT);
275275
m.complete(p, NAME_REF);
276276
} else if p.at(T![self]) {
277277
let m = p.start();
278-
p.bump_any();
278+
p.bump(T![self]);
279279
m.complete(p, T![self]);
280280
} else {
281281
p.err_and_bump("expected identifier");
@@ -296,7 +296,7 @@ fn error_block(p: &mut Parser, message: &str) {
296296
assert!(p.at(T!['{']));
297297
let m = p.start();
298298
p.error(message);
299-
p.bump_any();
299+
p.bump(T!['{']);
300300
expressions::expr_block_contents(p);
301301
p.eat(T!['}']);
302302
m.complete(p, ERROR);

‎crates/ra_parser/src/grammar/attributes.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ pub(super) fn outer_attributes(p: &mut Parser) {
1515
fn attribute(p: &mut Parser, inner: bool) {
1616
let attr = p.start();
1717
assert!(p.at(T![#]));
18-
p.bump_any();
18+
p.bump(T![#]);
1919

2020
if inner {
2121
assert!(p.at(T![!]));
22-
p.bump_any();
22+
p.bump(T![!]);
2323
}
2424

2525
if p.at(T!['[']) {

‎crates/ra_parser/src/grammar/expressions.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pub(crate) fn block(p: &mut Parser) {
4343
pub(crate) fn naked_block(p: &mut Parser) {
4444
assert!(p.at(T!['{']));
4545
let m = p.start();
46-
p.bump_any();
46+
p.bump(T!['{']);
4747
expr_block_contents(p);
4848
p.expect(T!['}']);
4949
m.complete(p, BLOCK);
@@ -150,7 +150,7 @@ pub(super) fn stmt(p: &mut Parser, with_semi: StmtWithSemi) {
150150
// }
151151
fn let_stmt(p: &mut Parser, m: Marker, with_semi: StmtWithSemi) {
152152
assert!(p.at(T![let]));
153-
p.bump_any();
153+
p.bump(T![let]);
154154
patterns::pattern(p);
155155
if p.at(T![:]) {
156156
types::ascription(p);
@@ -195,7 +195,7 @@ pub(crate) fn expr_block_contents(p: &mut Parser) {
195195
// }
196196

197197
if p.at(T![;]) {
198-
p.bump_any();
198+
p.bump(T![;]);
199199
continue;
200200
}
201201

@@ -297,7 +297,7 @@ fn lhs(p: &mut Parser, r: Restrictions) -> Option<(CompletedMarker, BlockLike)>
297297
// }
298298
T![&] => {
299299
m = p.start();
300-
p.bump_any();
300+
p.bump(T![&]);
301301
p.eat(T![mut]);
302302
REF_EXPR
303303
}
@@ -438,7 +438,7 @@ fn call_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker {
438438
fn index_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker {
439439
assert!(p.at(T!['[']));
440440
let m = lhs.precede(p);
441-
p.bump_any();
441+
p.bump(T!['[']);
442442
expr(p);
443443
p.expect(T![']']);
444444
m.complete(p, INDEX_EXPR)
@@ -478,7 +478,7 @@ fn method_call_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker {
478478
fn field_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker {
479479
assert!(p.at(T![.]));
480480
let m = lhs.precede(p);
481-
p.bump_any();
481+
p.bump(T![.]);
482482
if p.at(IDENT) || p.at(INT_NUMBER) {
483483
name_ref_or_index(p)
484484
} else if p.at(FLOAT_NUMBER) {
@@ -497,7 +497,7 @@ fn field_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker {
497497
fn try_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker {
498498
assert!(p.at(T![?]));
499499
let m = lhs.precede(p);
500-
p.bump_any();
500+
p.bump(T![?]);
501501
m.complete(p, TRY_EXPR)
502502
}
503503

@@ -511,7 +511,7 @@ fn try_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker {
511511
fn cast_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker {
512512
assert!(p.at(T![as]));
513513
let m = lhs.precede(p);
514-
p.bump_any();
514+
p.bump(T![as]);
515515
// Use type_no_bounds(), because cast expressions are not
516516
// allowed to have bounds.
517517
types::type_no_bounds(p);
@@ -521,7 +521,7 @@ fn cast_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker {
521521
fn arg_list(p: &mut Parser) {
522522
assert!(p.at(T!['(']));
523523
let m = p.start();
524-
p.bump_any();
524+
p.bump(T!['(']);
525525
while !p.at(T![')']) && !p.at(EOF) {
526526
if !p.at_ts(EXPR_FIRST) {
527527
p.error("expected expression");
@@ -570,7 +570,7 @@ fn path_expr(p: &mut Parser, r: Restrictions) -> (CompletedMarker, BlockLike) {
570570
pub(crate) fn record_field_list(p: &mut Parser) {
571571
assert!(p.at(T!['{']));
572572
let m = p.start();
573-
p.bump_any();
573+
p.bump(T!['{']);
574574
while !p.at(EOF) && !p.at(T!['}']) {
575575
match p.current() {
576576
// test record_literal_field_with_attr

‎crates/ra_parser/src/grammar/expressions/atom.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,14 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMar
101101
}
102102
T![async] if la == T!['{'] || (la == T![move] && p.nth(2) == T!['{']) => {
103103
let m = p.start();
104-
p.bump_any();
104+
p.bump(T![async]);
105105
p.eat(T![move]);
106106
block_expr(p, Some(m))
107107
}
108108
T![match] => match_expr(p),
109109
T![unsafe] if la == T!['{'] => {
110110
let m = p.start();
111-
p.bump_any();
111+
p.bump(T![unsafe]);
112112
block_expr(p, Some(m))
113113
}
114114
T!['{'] => {
@@ -180,7 +180,7 @@ fn tuple_expr(p: &mut Parser) -> CompletedMarker {
180180
fn array_expr(p: &mut Parser) -> CompletedMarker {
181181
assert!(p.at(T!['[']));
182182
let m = p.start();
183-
p.bump_any();
183+
p.bump(T!['[']);
184184
if p.eat(T![']']) {
185185
return m.complete(p, ARRAY_EXPR);
186186
}
@@ -262,11 +262,11 @@ fn lambda_expr(p: &mut Parser) -> CompletedMarker {
262262
fn if_expr(p: &mut Parser) -> CompletedMarker {
263263
assert!(p.at(T![if]));
264264
let m = p.start();
265-
p.bump_any();
265+
p.bump(T![if]);
266266
cond(p);
267267
block(p);
268268
if p.at(T![else]) {
269-
p.bump_any();
269+
p.bump(T![else]);
270270
if p.at(T![if]) {
271271
if_expr(p);
272272
} else {
@@ -285,7 +285,7 @@ fn if_expr(p: &mut Parser) -> CompletedMarker {
285285
fn label(p: &mut Parser) {
286286
assert!(p.at(LIFETIME) && p.nth(1) == T![:]);
287287
let m = p.start();
288-
p.bump_any();
288+
p.bump(LIFETIME);
289289
p.bump_any();
290290
m.complete(p, LABEL);
291291
}
@@ -297,7 +297,7 @@ fn label(p: &mut Parser) {
297297
fn loop_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
298298
assert!(p.at(T![loop]));
299299
let m = m.unwrap_or_else(|| p.start());
300-
p.bump_any();
300+
p.bump(T![loop]);
301301
block(p);
302302
m.complete(p, LOOP_EXPR)
303303
}
@@ -310,7 +310,7 @@ fn loop_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
310310
fn while_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
311311
assert!(p.at(T![while]));
312312
let m = m.unwrap_or_else(|| p.start());
313-
p.bump_any();
313+
p.bump(T![while]);
314314
cond(p);
315315
block(p);
316316
m.complete(p, WHILE_EXPR)
@@ -323,7 +323,7 @@ fn while_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
323323
fn for_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
324324
assert!(p.at(T![for]));
325325
let m = m.unwrap_or_else(|| p.start());
326-
p.bump_any();
326+
p.bump(T![for]);
327327
patterns::pattern(p);
328328
p.expect(T![in]);
329329
expr_no_struct(p);
@@ -357,7 +357,7 @@ fn cond(p: &mut Parser) {
357357
fn match_expr(p: &mut Parser) -> CompletedMarker {
358358
assert!(p.at(T![match]));
359359
let m = p.start();
360-
p.bump_any();
360+
p.bump(T![match]);
361361
expr_no_struct(p);
362362
if p.at(T!['{']) {
363363
match_arm_list(p);
@@ -453,7 +453,7 @@ fn match_arm(p: &mut Parser) -> BlockLike {
453453
fn match_guard(p: &mut Parser) -> CompletedMarker {
454454
assert!(p.at(T![if]));
455455
let m = p.start();
456-
p.bump_any();
456+
p.bump(T![if]);
457457
expr(p);
458458
m.complete(p, MATCH_GUARD)
459459
}
@@ -479,7 +479,7 @@ pub(super) fn block_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
479479
fn return_expr(p: &mut Parser) -> CompletedMarker {
480480
assert!(p.at(T![return]));
481481
let m = p.start();
482-
p.bump_any();
482+
p.bump(T![return]);
483483
if p.at_ts(EXPR_FIRST) {
484484
expr(p);
485485
}
@@ -496,7 +496,7 @@ fn return_expr(p: &mut Parser) -> CompletedMarker {
496496
fn continue_expr(p: &mut Parser) -> CompletedMarker {
497497
assert!(p.at(T![continue]));
498498
let m = p.start();
499-
p.bump_any();
499+
p.bump(T![continue]);
500500
p.eat(LIFETIME);
501501
m.complete(p, CONTINUE_EXPR)
502502
}
@@ -513,7 +513,7 @@ fn continue_expr(p: &mut Parser) -> CompletedMarker {
513513
fn break_expr(p: &mut Parser, r: Restrictions) -> CompletedMarker {
514514
assert!(p.at(T![break]));
515515
let m = p.start();
516-
p.bump_any();
516+
p.bump(T![break]);
517517
p.eat(LIFETIME);
518518
// test break_ambiguity
519519
// fn foo(){
@@ -535,7 +535,7 @@ fn break_expr(p: &mut Parser, r: Restrictions) -> CompletedMarker {
535535
fn try_block_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
536536
assert!(p.at(T![try]));
537537
let m = m.unwrap_or_else(|| p.start());
538-
p.bump_any();
538+
p.bump(T![try]);
539539
block(p);
540540
m.complete(p, TRY_EXPR)
541541
}
@@ -549,7 +549,7 @@ fn try_block_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
549549
fn box_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
550550
assert!(p.at(T![box]));
551551
let m = m.unwrap_or_else(|| p.start());
552-
p.bump_any();
552+
p.bump(T![box]);
553553
if p.at_ts(EXPR_FIRST) {
554554
expr(p);
555555
}

‎crates/ra_parser/src/grammar/items.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ pub(super) fn item_or_macro(p: &mut Parser, stop_on_r_curly: bool, flavor: ItemF
6464
} else if p.at(T!['}']) && !stop_on_r_curly {
6565
let e = p.start();
6666
p.error("unmatched `}`");
67-
p.bump_any();
67+
p.bump(T!['}']);
6868
e.complete(p, ERROR);
6969
} else if !p.at(EOF) && !p.at(T!['}']) {
7070
p.err_and_bump("expected an item");
@@ -276,9 +276,9 @@ fn items_without_modifiers(p: &mut Parser, m: Marker) -> Result<(), Marker> {
276276

277277
fn extern_crate_item(p: &mut Parser, m: Marker) {
278278
assert!(p.at(T![extern]));
279-
p.bump_any();
279+
p.bump(T![extern]);
280280
assert!(p.at(T![crate]));
281-
p.bump_any();
281+
p.bump(T![crate]);
282282
name_ref(p);
283283
opt_alias(p);
284284
p.expect(T![;]);
@@ -288,15 +288,15 @@ fn extern_crate_item(p: &mut Parser, m: Marker) {
288288
pub(crate) fn extern_item_list(p: &mut Parser) {
289289
assert!(p.at(T!['{']));
290290
let m = p.start();
291-
p.bump_any();
291+
p.bump(T!['{']);
292292
mod_contents(p, true);
293293
p.expect(T!['}']);
294294
m.complete(p, EXTERN_ITEM_LIST);
295295
}
296296

297297
fn fn_def(p: &mut Parser, flavor: ItemFlavor) {
298298
assert!(p.at(T![fn]));
299-
p.bump_any();
299+
p.bump(T![fn]);
300300

301301
name_r(p, ITEM_RECOVERY_SET);
302302
// test function_type_params
@@ -323,7 +323,7 @@ fn fn_def(p: &mut Parser, flavor: ItemFlavor) {
323323
// test fn_decl
324324
// trait T { fn foo(); }
325325
if p.at(T![;]) {
326-
p.bump_any();
326+
p.bump(T![;]);
327327
} else {
328328
expressions::block(p)
329329
}
@@ -333,7 +333,7 @@ fn fn_def(p: &mut Parser, flavor: ItemFlavor) {
333333
// type Foo = Bar;
334334
fn type_def(p: &mut Parser, m: Marker) {
335335
assert!(p.at(T![type]));
336-
p.bump_any();
336+
p.bump(T![type]);
337337

338338
name(p);
339339

@@ -357,7 +357,7 @@ fn type_def(p: &mut Parser, m: Marker) {
357357

358358
pub(crate) fn mod_item(p: &mut Parser, m: Marker) {
359359
assert!(p.at(T![mod]));
360-
p.bump_any();
360+
p.bump(T![mod]);
361361

362362
name(p);
363363
if p.at(T!['{']) {
@@ -371,7 +371,7 @@ pub(crate) fn mod_item(p: &mut Parser, m: Marker) {
371371
pub(crate) fn mod_item_list(p: &mut Parser) {
372372
assert!(p.at(T!['{']));
373373
let m = p.start();
374-
p.bump_any();
374+
p.bump(T!['{']);
375375
mod_contents(p, true);
376376
p.expect(T!['}']);
377377
m.complete(p, ITEM_LIST);

‎crates/ra_parser/src/grammar/items/consts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub(super) fn const_def(p: &mut Parser, m: Marker) {
1010

1111
fn const_or_static(p: &mut Parser, m: Marker, kw: SyntaxKind, def: SyntaxKind) {
1212
assert!(p.at(kw));
13-
p.bump_any();
13+
p.bump(kw);
1414
p.eat(T![mut]); // FIXME: validator to forbid const mut
1515

1616
// Allow `_` in place of an identifier in a `const`.

0 commit comments

Comments
 (0)