From e85ee60c42db57368e24ad9ac24840c2494d383c Mon Sep 17 00:00:00 2001
From: Marco Groppo <marco.groppo@gmail.com>
Date: Mon, 15 Apr 2019 00:03:54 +0200
Subject: Initial support for lang items.

---
 crates/ra_hir/src/ty/infer.rs | 54 +++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

(limited to 'crates/ra_hir/src/ty/infer.rs')

diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs
index 7ca1ff595..2275ac151 100644
--- a/crates/ra_hir/src/ty/infer.rs
+++ b/crates/ra_hir/src/ty/infer.rs
@@ -462,6 +462,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
         let remaining_index = remaining_index.unwrap_or(path.segments.len());
         let mut actual_def_ty: Option<Ty> = None;
 
+        let krate = resolver.module().map(|t| t.0.krate());
         // resolve intermediate segments
         for (i, segment) in path.segments[remaining_index..].iter().enumerate() {
             let ty = match resolved {
@@ -500,38 +501,41 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
             // Attempt to find an impl_item for the type which has a name matching
             // the current segment
             log::debug!("looking for path segment: {:?}", segment);
+
             actual_def_ty = Some(ty.clone());
 
-            let item: crate::ModuleDef = ty.iterate_impl_items(self.db, |item| {
-                let matching_def: Option<crate::ModuleDef> = match item {
-                    crate::ImplItem::Method(func) => {
-                        let sig = func.signature(self.db);
-                        if segment.name == *sig.name() {
-                            Some(func.into())
-                        } else {
-                            None
+            let item: crate::ModuleDef = krate.and_then(|k| {
+                ty.iterate_impl_items(self.db, k, |item| {
+                    let matching_def: Option<crate::ModuleDef> = match item {
+                        crate::ImplItem::Method(func) => {
+                            let sig = func.signature(self.db);
+                            if segment.name == *sig.name() {
+                                Some(func.into())
+                            } else {
+                                None
+                            }
                         }
-                    }
 
-                    crate::ImplItem::Const(konst) => {
-                        let sig = konst.signature(self.db);
-                        if segment.name == *sig.name() {
-                            Some(konst.into())
-                        } else {
-                            None
+                        crate::ImplItem::Const(konst) => {
+                            let sig = konst.signature(self.db);
+                            if segment.name == *sig.name() {
+                                Some(konst.into())
+                            } else {
+                                None
+                            }
                         }
-                    }
 
-                    // FIXME: Resolve associated types
-                    crate::ImplItem::TypeAlias(_) => None,
-                };
-                match matching_def {
-                    Some(_) => {
-                        self.write_assoc_resolution(id, item);
-                        return matching_def;
+                        // FIXME: Resolve associated types
+                        crate::ImplItem::TypeAlias(_) => None,
+                    };
+                    match matching_def {
+                        Some(_) => {
+                            self.write_assoc_resolution(id, item);
+                            return matching_def;
+                        }
+                        None => None,
                     }
-                    None => None,
-                }
+                })
             })?;
 
             resolved = Resolution::Def(item.into());
-- 
cgit v1.2.3