From 5862542dedd5aca9bbdcba19c5f8cd895591005d Mon Sep 17 00:00:00 2001
From: Florian Diebold <flodiebold@gmail.com>
Date: Sun, 13 Jan 2019 00:19:20 +0100
Subject: Add AST/HIR for type args in path segments

---
 crates/ra_hir/src/code_model_impl/module.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'crates/ra_hir/src/code_model_impl')

diff --git a/crates/ra_hir/src/code_model_impl/module.rs b/crates/ra_hir/src/code_model_impl/module.rs
index 7215236f9..2014f1090 100644
--- a/crates/ra_hir/src/code_model_impl/module.rs
+++ b/crates/ra_hir/src/code_model_impl/module.rs
@@ -147,7 +147,7 @@ impl Module {
             .def_id,
         );
 
-        for name in path.segments.iter() {
+        for segment in path.segments.iter() {
             let curr = match curr_per_ns.as_ref().take_types() {
                 Some(r) => r,
                 None => {
@@ -163,15 +163,17 @@ impl Module {
             curr_per_ns = match curr.resolve(db) {
                 Def::Module(m) => {
                     let scope = m.scope(db);
-                    match scope.get(&name) {
+                    match scope.get(&segment.name) {
                         Some(r) => r.def_id,
                         None => PerNs::none(),
                     }
                 }
                 Def::Enum(e) => {
                     // enum variant
-                    let matching_variant =
-                        e.variants(db).into_iter().find(|(n, _variant)| n == name);
+                    let matching_variant = e
+                        .variants(db)
+                        .into_iter()
+                        .find(|(n, _variant)| n == &segment.name);
 
                     match matching_variant {
                         Some((_n, variant)) => PerNs::both(variant.def_id(), e.def_id()),
-- 
cgit v1.2.3