Merge #1803

1803: introduce bump as a better-checked alternative to bump_any r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 9 insertions, 3 deletions

diff --git a/crates/ra_parser/src/parser.rs b/crates/ra_parser/src/parser.rs
index 393586561..d8567e84b 100644
--- a/crates/ra_parser/src/parser.rs
+++ b/crates/ra_parser/src/parser.rs
@@ -148,7 +148,7 @@ impl<'t> Parser<'t> {
     }
 
     /// Advances the parser by one token with composite puncts handled
-    pub(crate) fn bump(&mut self) {
+    pub(crate) fn bump_any(&mut self) {
         let kind = self.nth(0);
         if kind == EOF {
             return;
@@ -170,6 +170,12 @@ impl<'t> Parser<'t> {
         }
     }
 
+    /// Advances the parser by one token, asserting that it is exactly the expected token
+    pub(crate) fn bump(&mut self, expected: SyntaxKind) {
+        debug_assert!(self.nth(0) == expected);
+        self.bump_any()
+    }
+
     /// Advances the parser by one token, remapping its kind.
     /// This is useful to create contextual keywords from
     /// identifiers. For example, the lexer creates an `union`
@@ -205,7 +211,7 @@ impl<'t> Parser<'t> {
         if !self.at(kind) {
             return false;
         }
-        self.bump();
+        self.bump_any();
         true
     }
 
@@ -231,7 +237,7 @@ impl<'t> Parser<'t> {
         } else {
             let m = self.start();
             self.error(message);
-            self.bump();
+            self.bump_any();
             m.complete(self, ERROR);
         };
     }