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/items/consts.rs | 2 +- crates/ra_parser/src/grammar/items/nominal.rs | 12 ++++++------ crates/ra_parser/src/grammar/items/traits.rs | 8 ++++---- crates/ra_parser/src/grammar/items/use_item.rs | 16 ++++++++-------- 4 files changed, 19 insertions(+), 19 deletions(-) (limited to 'crates/ra_parser/src/grammar/items') diff --git a/crates/ra_parser/src/grammar/items/consts.rs b/crates/ra_parser/src/grammar/items/consts.rs index b4908ebba..e11546333 100644 --- a/crates/ra_parser/src/grammar/items/consts.rs +++ b/crates/ra_parser/src/grammar/items/consts.rs @@ -10,7 +10,7 @@ pub(super) fn const_def(p: &mut Parser, m: Marker) { fn const_or_static(p: &mut Parser, m: Marker, kw: SyntaxKind, def: SyntaxKind) { assert!(p.at(kw)); - p.bump(); + p.bump_any(); p.eat(T![mut]); // FIXME: validator to forbid const mut name(p); types::ascription(p); diff --git a/crates/ra_parser/src/grammar/items/nominal.rs b/crates/ra_parser/src/grammar/items/nominal.rs index 54f02c7c9..460acd65e 100644 --- a/crates/ra_parser/src/grammar/items/nominal.rs +++ b/crates/ra_parser/src/grammar/items/nominal.rs @@ -11,7 +11,7 @@ pub(super) fn struct_def(p: &mut Parser, m: Marker, kind: SyntaxKind) { type_params::opt_where_clause(p); match p.current() { T![;] => { - p.bump(); + p.bump_any(); } T!['{'] => record_field_def_list(p), _ => { @@ -21,7 +21,7 @@ pub(super) fn struct_def(p: &mut Parser, m: Marker, kind: SyntaxKind) { } } T![;] if kind == T![struct] => { - p.bump(); + p.bump_any(); } T!['{'] => record_field_def_list(p), T!['('] if kind == T![struct] => { @@ -44,7 +44,7 @@ pub(super) fn struct_def(p: &mut Parser, m: Marker, kind: SyntaxKind) { pub(super) fn enum_def(p: &mut Parser, m: Marker) { assert!(p.at(T![enum])); - p.bump(); + p.bump_any(); name_r(p, ITEM_RECOVERY_SET); type_params::opt_type_param_list(p); type_params::opt_where_clause(p); @@ -59,7 +59,7 @@ pub(super) fn enum_def(p: &mut Parser, m: Marker) { pub(crate) fn enum_variant_list(p: &mut Parser) { assert!(p.at(T!['{'])); let m = p.start(); - p.bump(); + p.bump_any(); while !p.at(EOF) && !p.at(T!['}']) { if p.at(T!['{']) { error_block(p, "expected enum variant"); @@ -73,7 +73,7 @@ pub(crate) fn enum_variant_list(p: &mut Parser) { T!['{'] => record_field_def_list(p), T!['('] => tuple_field_def_list(p), T![=] => { - p.bump(); + p.bump_any(); expressions::expr(p); } _ => (), @@ -94,7 +94,7 @@ pub(crate) fn enum_variant_list(p: &mut Parser) { pub(crate) fn record_field_def_list(p: &mut Parser) { assert!(p.at(T!['{'])); let m = p.start(); - p.bump(); + p.bump_any(); while !p.at(T!['}']) && !p.at(EOF) { if p.at(T!['{']) { error_block(p, "expected field"); diff --git a/crates/ra_parser/src/grammar/items/traits.rs b/crates/ra_parser/src/grammar/items/traits.rs index 5fcacfbff..b49221a4b 100644 --- a/crates/ra_parser/src/grammar/items/traits.rs +++ b/crates/ra_parser/src/grammar/items/traits.rs @@ -5,7 +5,7 @@ use super::*; // trait X: Hash + Clone where U: Copy {} pub(super) fn trait_def(p: &mut Parser) { assert!(p.at(T![trait])); - p.bump(); + p.bump_any(); name_r(p, ITEM_RECOVERY_SET); type_params::opt_type_param_list(p); if p.at(T![:]) { @@ -29,7 +29,7 @@ pub(super) fn trait_def(p: &mut Parser) { pub(crate) fn trait_item_list(p: &mut Parser) { assert!(p.at(T!['{'])); let m = p.start(); - p.bump(); + p.bump_any(); while !p.at(EOF) && !p.at(T!['}']) { if p.at(T!['{']) { error_block(p, "expected an item"); @@ -45,7 +45,7 @@ pub(crate) fn trait_item_list(p: &mut Parser) { // impl Foo {} pub(super) fn impl_block(p: &mut Parser) { assert!(p.at(T![impl])); - p.bump(); + p.bump_any(); if choose_type_params_over_qpath(p) { type_params::opt_type_param_list(p); } @@ -78,7 +78,7 @@ pub(super) fn impl_block(p: &mut Parser) { pub(crate) fn impl_item_list(p: &mut Parser) { assert!(p.at(T!['{'])); let m = p.start(); - p.bump(); + p.bump_any(); // test impl_inner_attributes // enum F{} // impl F { diff --git a/crates/ra_parser/src/grammar/items/use_item.rs b/crates/ra_parser/src/grammar/items/use_item.rs index 83a65e226..7a1693a34 100644 --- a/crates/ra_parser/src/grammar/items/use_item.rs +++ b/crates/ra_parser/src/grammar/items/use_item.rs @@ -2,7 +2,7 @@ use super::*; pub(super) fn use_item(p: &mut Parser, m: Marker) { assert!(p.at(T![use])); - p.bump(); + p.bump_any(); use_tree(p); p.expect(T![;]); m.complete(p, USE_ITEM); @@ -28,15 +28,15 @@ fn use_tree(p: &mut Parser) { // use ::*; // use some::path::{*}; // use some::path::{::*}; - (T![*], _) => p.bump(), + (T![*], _) => p.bump_any(), (T![::], T![*]) => { // Parse `use ::*;`, which imports all from the crate root in Rust 2015 // This is invalid inside a use_tree_list, (e.g. `use some::path::{::*}`) // but still parses and errors later: ('crate root in paths can only be used in start position') // FIXME: Add this error (if not out of scope) // In Rust 2018, it is always invalid (see above) - p.bump(); - p.bump(); + p.bump_any(); + p.bump_any(); } // Open a use tree list // Handles cases such as `use {some::path};` or `{inner::path}` in @@ -49,7 +49,7 @@ fn use_tree(p: &mut Parser) { // use ::{{{crate::export}}}; // Nonsensical but perfectly legal nestnig (T!['{'], _) | (T![::], T!['{']) => { if p.at(T![::]) { - p.bump(); + p.bump_any(); } use_tree_list(p); } @@ -81,10 +81,10 @@ fn use_tree(p: &mut Parser) { opt_alias(p); } T![::] => { - p.bump(); + p.bump_any(); match p.current() { T![*] => { - p.bump(); + p.bump_any(); } // test use_tree_list_after_path // use crate::{Item}; @@ -114,7 +114,7 @@ fn use_tree(p: &mut Parser) { pub(crate) fn use_tree_list(p: &mut Parser) { assert!(p.at(T!['{'])); let m = p.start(); - p.bump(); + p.bump_any(); while !p.at(EOF) && !p.at(T!['}']) { use_tree(p); if !p.at(T!['}']) { -- cgit v1.2.3