1 files changed, 2 insertions, 141 deletions

diff --git a/src/parser/event_parser/grammar/items/mod.rs b/src/parser/event_parser/grammar/items/mod.rs
index a6d8f375c..35825e7c4 100644
--- a/src/parser/event_parser/grammar/items/mod.rs
+++ b/src/parser/event_parser/grammar/items/mod.rs
@@ -1,6 +1,7 @@
 use super::*;
 
 mod structs;
+mod use_item;
 
 pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) {
     attributes::inner_attributes(p);
@@ -20,7 +21,7 @@ fn item(p: &mut Parser) {
     let la = p.nth(1);
     let item_kind = match p.current() {
         USE_KW => {
-            use_item(p);
+            use_item::use_item(p);
             USE_ITEM
         }
         EXTERN_KW if la == CRATE_KW => {
@@ -82,76 +83,6 @@ fn item(p: &mut Parser) {
     item.complete(p, item_kind);
 }
 
-fn type_param_list(p: &mut Parser) {
-    if !p.at(L_ANGLE) {
-        return;
-    }
-    let m = p.start();
-    p.bump();
-
-    while !p.at(EOF) && !p.at(R_ANGLE) {
-        match p.current() {
-            LIFETIME => lifetime_param(p),
-            IDENT => type_param(p),
-            _ => p.err_and_bump("expected type parameter"),
-        }
-        if !p.at(R_ANGLE) && !p.expect(COMMA) {
-            break;
-        }
-    }
-    p.expect(R_ANGLE);
-    m.complete(p, TYPE_PARAM_LIST);
-
-    fn lifetime_param(p: &mut Parser) {
-        assert!(p.at(LIFETIME));
-        let m = p.start();
-        p.bump();
-        if p.eat(COLON) {
-            while p.at(LIFETIME) {
-                p.bump();
-                if !p.eat(PLUS) {
-                    break;
-                }
-            }
-        }
-        m.complete(p, LIFETIME_PARAM);
-    }
-
-    fn type_param(p: &mut Parser) {
-        assert!(p.at(IDENT));
-        let m = p.start();
-        p.bump();
-        if p.eat(COLON) {
-            loop {
-                let has_paren = p.eat(L_PAREN);
-                p.eat(QUESTION);
-                if p.at(FOR_KW) {
-                    //TODO
-                }
-                if p.at(LIFETIME) {
-                    p.bump();
-                } else if paths::is_path_start(p) {
-                    paths::type_path(p);
-                } else {
-                    break;
-                }
-                if has_paren {
-                    p.expect(R_PAREN);
-                }
-                if !p.eat(PLUS) {
-                    break;
-                }
-            }
-        }
-        if p.at(EQ) {
-            types::type_ref(p)
-        }
-        m.complete(p, TYPE_PARAM);
-    }
-}
-
-fn where_clause(_: &mut Parser) {}
-
 fn extern_crate_item(p: &mut Parser) {
     assert!(p.at(EXTERN_KW));
     p.bump();
@@ -179,76 +110,6 @@ fn extern_block(p: &mut Parser) {
     p.expect(R_CURLY);
 }
 
-pub(super) fn is_use_tree_start(kind: SyntaxKind) -> bool {
-    kind == STAR || kind == L_CURLY
-}
-
-fn use_item(p: &mut Parser) {
-    assert!(p.at(USE_KW));
-    p.bump();
-
-    use_tree(p);
-    p.expect(SEMI);
-
-    fn use_tree(p: &mut Parser) {
-        let la = p.nth(1);
-        let m = p.start();
-        match (p.current(), la) {
-            (STAR, _) => p.bump(),
-            (COLONCOLON, STAR) => {
-                p.bump();
-                p.bump();
-            }
-            (L_CURLY, _) | (COLONCOLON, L_CURLY) => {
-                if p.at(COLONCOLON) {
-                    p.bump();
-                }
-                nested_trees(p);
-            }
-            _ if paths::is_path_start(p) => {
-                paths::use_path(p);
-                match p.current() {
-                    AS_KW => {
-                        alias(p);
-                    }
-                    COLONCOLON => {
-                        p.bump();
-                        match p.current() {
-                            STAR => {
-                                p.bump();
-                            }
-                            L_CURLY => nested_trees(p),
-                            _ => {
-                                // is this unreachable?
-                                p.error().message("expected `{` or `*`").emit();
-                            }
-                        }
-                    }
-                    _ => (),
-                }
-            }
-            _ => {
-                m.abandon(p);
-                p.err_and_bump("expected one of `*`, `::`, `{`, `self`, `super`, `indent`");
-                return;
-            }
-        }
-        m.complete(p, USE_TREE);
-    }
-
-    fn nested_trees(p: &mut Parser) {
-        assert!(p.at(L_CURLY));
-        p.bump();
-        while !p.at(EOF) && !p.at(R_CURLY) {
-            use_tree(p);
-            if !p.at(R_CURLY) {
-                p.expect(COMMA);
-            }
-        }
-        p.expect(R_CURLY);
-    }
-}
-
 fn abi(p: &mut Parser) {
     assert!(p.at(EXTERN_KW));
     let abi = p.start();