language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 22:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Replace usages of bump_any with bump

Browse source
This commit is contained in:
kjeremy 2019-09-19 15:51:46 -04:00
parent cd9b222ba0
commit 883edd002e
14 changed files with 87 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

32
crates/ra_parser/src/grammar/expressions/atom.rs
View file

@ -101,14 +101,14 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMar
}
T![async] if la == T!['{'] || (la == T![move] && p.nth(2) == T!['{']) => {
let m = p.start();
p.bump_any();
p.bump(T![async]);
p.eat(T![move]);
block_expr(p, Some(m))
}
T![match] => match_expr(p),
T![unsafe] if la == T!['{'] => {
let m = p.start();
p.bump_any();
p.bump(T![unsafe]);
block_expr(p, Some(m))
}
T!['{'] => {
@ -180,7 +180,7 @@ fn tuple_expr(p: &mut Parser) -> CompletedMarker {
fn array_expr(p: &mut Parser) -> CompletedMarker {
assert!(p.at(T!['[']));
let m = p.start();
p.bump_any();
p.bump(T!['[']);
if p.eat(T![']']) {
return m.complete(p, ARRAY_EXPR);
}
@ -262,11 +262,11 @@ fn lambda_expr(p: &mut Parser) -> CompletedMarker {
fn if_expr(p: &mut Parser) -> CompletedMarker {
assert!(p.at(T![if]));
let m = p.start();
p.bump_any();
p.bump(T![if]);
cond(p);
block(p);
if p.at(T![else]) {
p.bump_any();
p.bump(T![else]);
if p.at(T![if]) {
if_expr(p);
} else {
@ -285,7 +285,7 @@ fn if_expr(p: &mut Parser) -> CompletedMarker {
fn label(p: &mut Parser) {
assert!(p.at(LIFETIME) && p.nth(1) == T![:]);
let m = p.start();
p.bump_any();
p.bump(LIFETIME);
p.bump_any();
m.complete(p, LABEL);
}
@ -297,7 +297,7 @@ fn label(p: &mut Parser) {
fn loop_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
assert!(p.at(T![loop]));
let m = m.unwrap_or_else(|| p.start());
p.bump_any();
p.bump(T![loop]);
block(p);
m.complete(p, LOOP_EXPR)
}
@ -310,7 +310,7 @@ fn loop_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
fn while_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
assert!(p.at(T![while]));
let m = m.unwrap_or_else(|| p.start());
p.bump_any();
p.bump(T![while]);
cond(p);
block(p);
m.complete(p, WHILE_EXPR)
@ -323,7 +323,7 @@ fn while_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
fn for_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
assert!(p.at(T![for]));
let m = m.unwrap_or_else(|| p.start());
p.bump_any();
p.bump(T![for]);
patterns::pattern(p);
p.expect(T![in]);
expr_no_struct(p);
@ -357,7 +357,7 @@ fn cond(p: &mut Parser) {
fn match_expr(p: &mut Parser) -> CompletedMarker {
assert!(p.at(T![match]));
let m = p.start();
p.bump_any();
p.bump(T![match]);
expr_no_struct(p);
if p.at(T!['{']) {
match_arm_list(p);
@ -453,7 +453,7 @@ fn match_arm(p: &mut Parser) -> BlockLike {
fn match_guard(p: &mut Parser) -> CompletedMarker {
assert!(p.at(T![if]));
let m = p.start();
p.bump_any();
p.bump(T![if]);
expr(p);
m.complete(p, MATCH_GUARD)
}
@ -479,7 +479,7 @@ pub(super) fn block_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
fn return_expr(p: &mut Parser) -> CompletedMarker {
assert!(p.at(T![return]));
let m = p.start();
p.bump_any();
p.bump(T![return]);
if p.at_ts(EXPR_FIRST) {
expr(p);
}
@ -496,7 +496,7 @@ fn return_expr(p: &mut Parser) -> CompletedMarker {
fn continue_expr(p: &mut Parser) -> CompletedMarker {
assert!(p.at(T![continue]));
let m = p.start();
p.bump_any();
p.bump(T![continue]);
p.eat(LIFETIME);
m.complete(p, CONTINUE_EXPR)
}
@ -513,7 +513,7 @@ fn continue_expr(p: &mut Parser) -> CompletedMarker {
fn break_expr(p: &mut Parser, r: Restrictions) -> CompletedMarker {
assert!(p.at(T![break]));
let m = p.start();
p.bump_any();
p.bump(T![break]);
p.eat(LIFETIME);
// test break_ambiguity
// fn foo(){
@ -535,7 +535,7 @@ fn break_expr(p: &mut Parser, r: Restrictions) -> CompletedMarker {
fn try_block_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
assert!(p.at(T![try]));
let m = m.unwrap_or_else(|| p.start());
p.bump_any();
p.bump(T![try]);
block(p);
m.complete(p, TRY_EXPR)
}
@ -549,7 +549,7 @@ fn try_block_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
fn box_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
assert!(p.at(T![box]));
let m = m.unwrap_or_else(|| p.start());
p.bump_any();
p.bump(T![box]);
if p.at_ts(EXPR_FIRST) {
expr(p);
}