From e2b378ef7e0ed82b0f0c874f98032a368fd5f30f Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 10 Sep 2019 00:59:29 +0300 Subject: rename bump -> bump_any --- crates/ra_parser/src/grammar/type_params.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'crates/ra_parser/src/grammar/type_params.rs') diff --git a/crates/ra_parser/src/grammar/type_params.rs b/crates/ra_parser/src/grammar/type_params.rs index cf54344c6..31d709d81 100644 --- a/crates/ra_parser/src/grammar/type_params.rs +++ b/crates/ra_parser/src/grammar/type_params.rs @@ -10,7 +10,7 @@ pub(super) fn opt_type_param_list(p: &mut Parser) { fn type_param_list(p: &mut Parser) { assert!(p.at(T![<])); let m = p.start(); - p.bump(); + p.bump_any(); while !p.at(EOF) && !p.at(T![>]) { let m = p.start(); @@ -38,7 +38,7 @@ fn type_param_list(p: &mut Parser) { fn lifetime_param(p: &mut Parser, m: Marker) { assert!(p.at(LIFETIME)); - p.bump(); + p.bump_any(); if p.at(T![:]) { lifetime_bounds(p); } @@ -54,7 +54,7 @@ fn type_param(p: &mut Parser, m: Marker) { // test type_param_default // struct S; if p.at(T![=]) { - p.bump(); + p.bump_any(); types::type_(p) } m.complete(p, TYPE_PARAM); @@ -64,15 +64,15 @@ fn type_param(p: &mut Parser, m: Marker) { // struct S; pub(super) fn bounds(p: &mut Parser) { assert!(p.at(T![:])); - p.bump(); + p.bump_any(); bounds_without_colon(p); } fn lifetime_bounds(p: &mut Parser) { assert!(p.at(T![:])); - p.bump(); + p.bump_any(); while p.at(LIFETIME) { - p.bump(); + p.bump_any(); if !p.eat(T![+]) { break; } @@ -99,7 +99,7 @@ fn type_bound(p: &mut Parser) -> bool { let has_paren = p.eat(T!['(']); p.eat(T![?]); match p.current() { - LIFETIME => p.bump(), + LIFETIME => p.bump_any(), T![for] => types::for_type(p), _ if paths::is_use_path_start(p) => types::path_type_(p, false), _ => { @@ -128,7 +128,7 @@ pub(super) fn opt_where_clause(p: &mut Parser) { return; } let m = p.start(); - p.bump(); + p.bump_any(); while is_where_predicate(p) { where_predicate(p); @@ -166,7 +166,7 @@ fn where_predicate(p: &mut Parser) { let m = p.start(); match p.current() { LIFETIME => { - p.bump(); + p.bump_any(); if p.at(T![:]) { bounds(p); } else { -- cgit v1.2.3