Drop more high-order stuff

1 files changed, 29 insertions, 30 deletions

diff --git a/src/parser/event_parser/grammar/paths.rs b/src/parser/event_parser/grammar/paths.rs
index 45f3cb779..f5124cfce 100644
--- a/src/parser/event_parser/grammar/paths.rs
+++ b/src/parser/event_parser/grammar/paths.rs
@@ -1,6 +1,6 @@
 use super::*;
 
-pub (crate) fn is_path_start(p: &Parser) -> bool {
+pub(crate) fn is_path_start(p: &Parser) -> bool {
     AnyOf(&[IDENT, SELF_KW, SUPER_KW, COLONCOLON]).is_ahead(p)
 }
 
@@ -9,39 +9,38 @@ pub(crate) fn use_path(p: &mut Parser) {
         return;
     }
     let mut prev = p.mark();
-    node(p, PATH, |p| {
-        path_segment(p, true);
-    });
-    repeat(p, |p| {
+    p.start(PATH);
+    path_segment(p, true);
+    p.finish();
+    loop {
         let curr = p.mark();
-        if p.current() == COLONCOLON && !items::is_use_tree_start(p.raw_lookahead(1)) {
-            node(p, PATH, |p| {
-                p.bump();
-                path_segment(p, false);
-                p.forward_parent(prev, curr);
-                prev = curr;
-            });
-            true
+        if p.at(COLONCOLON) && !items::is_use_tree_start(p.raw_lookahead(1)) {
+            p.start(PATH);
+            p.bump();
+            path_segment(p, false);
+            p.forward_parent(prev, curr);
+            prev = curr;
+            p.finish();
         } else {
-            false
+            break;
         }
-    });
+    }
 }
 
 fn path_segment(p: &mut Parser, first: bool) {
-    node(p, PATH_SEGMENT, |p| {
-        if first {
-            p.eat(COLONCOLON);
+    p.start(PATH_SEGMENT);
+    if first {
+        p.eat(COLONCOLON);
+    }
+    match p.current() {
+        IDENT | SELF_KW | SUPER_KW => {
+            p.bump();
         }
-        match p.current() {
-            IDENT | SELF_KW | SUPER_KW => {
-                p.bump();
-            },
-            _ => {
-                p.error()
-                    .message("expected identifier")
-                    .emit();
-            }
-        };
-    })
-}
\ No newline at end of file
+        _ => {
+            p.error()
+                .message("expected identifier")
+                .emit();
+        }
+    };
+    p.finish();
+}