1 files changed, 25 insertions, 7 deletions

diff --git a/src/parser/grammar/paths.rs b/src/parser/grammar/paths.rs
index d3eb20ea1..69ed84665 100644
--- a/src/parser/grammar/paths.rs
+++ b/src/parser/grammar/paths.rs
@@ -8,19 +8,26 @@ pub(super) fn is_path_start(p: &Parser) -> bool {
 }
 
 pub(super) fn use_path(p: &mut Parser) {
-    path(p)
+    path(p, Mode::Use)
 }
 
 pub(super) fn type_path(p: &mut Parser) {
-    path(p)
+    path(p, Mode::Type)
 }
 
-fn path(p: &mut Parser) {
+pub(super) fn expr_path(p: &mut Parser) {
+    path(p, Mode::Expr)
+}
+
+#[derive(Clone, Copy, Eq, PartialEq)]
+enum Mode { Use, Type, Expr }
+
+fn path(p: &mut Parser, mode: Mode) {
     if !is_path_start(p) {
         return;
     }
     let path = p.start();
-    path_segment(p, true);
+    path_segment(p, mode, true);
     let mut qual = path.complete(p, PATH);
     loop {
         let use_tree = match p.nth(1) {
@@ -30,7 +37,7 @@ fn path(p: &mut Parser) {
         if p.at(COLONCOLON) && !use_tree {
             let path = qual.precede(p);
             p.bump();
-            path_segment(p, false);
+            path_segment(p, mode, false);
             let path = path.complete(p, PATH);
             qual = path;
         } else {
@@ -39,13 +46,16 @@ fn path(p: &mut Parser) {
     }
 }
 
-fn path_segment(p: &mut Parser, first: bool) {
+fn path_segment(p: &mut Parser, mode: Mode, first: bool) {
     let segment = p.start();
     if first {
         p.eat(COLONCOLON);
     }
     match p.current() {
-        IDENT => name_ref(p),
+        IDENT => {
+            name_ref(p);
+            path_generic_args(p, mode);
+        },
         SELF_KW | SUPER_KW => p.bump(),
         _ => {
             p.error("expected identifier");
@@ -53,3 +63,11 @@ fn path_segment(p: &mut Parser, first: bool) {
     };
     segment.complete(p, PATH_SEGMENT);
 }
+
+fn path_generic_args(p: &mut Parser, mode: Mode) {
+    match mode {
+        Mode::Use => return,
+        Mode::Type => type_args::list(p, false),
+        Mode::Expr => type_args::list(p, true),
+    }
+}