1 files changed, 24 insertions, 22 deletions

diff --git a/crates/ra_hir/src/ty/infer/path.rs b/crates/ra_hir/src/ty/infer/path.rs
index 6165eba4f..be2067dd4 100644
--- a/crates/ra_hir/src/ty/infer/path.rs
+++ b/crates/ra_hir/src/ty/infer/path.rs
@@ -7,7 +7,7 @@ use hir_def::{
 
 use crate::{
     db::HirDatabase,
-    ty::{method_resolution, Namespace, Substs, Ty, TypableDef, TypeWalk},
+    ty::{method_resolution, Substs, Ty, TypeWalk, ValueTyDefId},
     AssocItem, Container, Function, Name, Path,
 };
 
@@ -56,7 +56,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
             }
         };
 
-        let typable: TypableDef = match value {
+        let typable: ValueTyDefId = match value {
             ValueNs::LocalBinding(pat) => {
                 let ty = self.result.type_of_pat.get(pat)?.clone();
                 let ty = self.resolve_ty_as_possible(&mut vec![], ty);
@@ -69,11 +69,10 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
             ValueNs::EnumVariantId(it) => it.into(),
         };
 
-        let mut ty = self.db.type_for_def(typable, Namespace::Values);
+        let mut ty = self.db.value_ty(typable);
         if let Some(self_subst) = self_subst {
             ty = ty.subst(&self_subst);
         }
-
         let substs = Ty::substs_from_path(self.db, &self.resolver, path, typable);
         let ty = ty.subst(&substs);
         Some(ty)
@@ -143,24 +142,27 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
         id: ExprOrPatId,
     ) -> Option<(ValueNs, Option<Substs>)> {
         let trait_ = trait_ref.trait_;
-        let item = trait_.items(self.db).iter().copied().find_map(|item| match item {
-            AssocItem::Function(func) => {
-                if segment.name == func.name(self.db) {
-                    Some(AssocItem::Function(func))
-                } else {
-                    None
-                }
-            }
+        let item =
+            self.db.trait_data(trait_).items.iter().map(|(_name, id)| (*id).into()).find_map(
+                |item| match item {
+                    AssocItem::Function(func) => {
+                        if segment.name == func.name(self.db) {
+                            Some(AssocItem::Function(func))
+                        } else {
+                            None
+                        }
+                    }
 
-            AssocItem::Const(konst) => {
-                if konst.name(self.db).map_or(false, |n| n == segment.name) {
-                    Some(AssocItem::Const(konst))
-                } else {
-                    None
-                }
-            }
-            AssocItem::TypeAlias(_) => None,
-        })?;
+                    AssocItem::Const(konst) => {
+                        if konst.name(self.db).map_or(false, |n| n == segment.name) {
+                            Some(AssocItem::Const(konst))
+                        } else {
+                            None
+                        }
+                    }
+                    AssocItem::TypeAlias(_) => None,
+                },
+            )?;
         let def = match item {
             AssocItem::Function(f) => ValueNs::FunctionId(f.id),
             AssocItem::Const(c) => ValueNs::ConstId(c.id),
@@ -212,7 +214,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                             .fill_with_params()
                             .build();
                         self.obligations.push(super::Obligation::Trait(TraitRef {
-                            trait_: t,
+                            trait_: t.id,
                             substs: trait_substs,
                         }));
                         Some(substs)