1 files changed, 8 insertions, 5 deletions

diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs
index 2a2dc26b4..3711068fa 100644
--- a/crates/ra_hir/src/ty.rs
+++ b/crates/ra_hir/src/ty.rs
@@ -26,7 +26,7 @@ use ra_db::{impl_intern_key, salsa};
 
 use crate::{
     db::HirDatabase, expr::ExprId, util::make_mut_slice, Adt, Crate, FloatTy, IntTy, Mutability,
-    Name, Trait, Uncertain,
+    Name, Uncertain,
 };
 use display::{HirDisplay, HirFormatter};
 
@@ -445,7 +445,7 @@ impl Deref for Substs {
 #[derive(Clone, PartialEq, Eq, Debug, Hash)]
 pub struct TraitRef {
     /// FIXME name?
-    pub trait_: Trait,
+    pub trait_: TraitId,
     pub substs: Substs,
 }
 
@@ -676,7 +676,7 @@ impl Ty {
     }
 
     /// If this is an `impl Trait` or `dyn Trait`, returns that trait.
-    pub fn inherent_trait(&self) -> Option<Trait> {
+    pub fn inherent_trait(&self) -> Option<TraitId> {
         match self {
             Ty::Dyn(predicates) | Ty::Opaque(predicates) => {
                 predicates.iter().find_map(|pred| match pred {
@@ -988,7 +988,10 @@ impl HirDisplay for Ty {
                             write!(
                                 f,
                                 "{}",
-                                trait_ref.trait_.name(f.db).unwrap_or_else(Name::missing)
+                                f.db.trait_data(trait_ref.trait_)
+                                    .name
+                                    .clone()
+                                    .unwrap_or_else(Name::missing)
                             )?;
                             if trait_ref.substs.len() > 1 {
                                 write!(f, "<")?;
@@ -1049,7 +1052,7 @@ impl TraitRef {
         } else {
             write!(f, ": ")?;
         }
-        write!(f, "{}", self.trait_.name(f.db).unwrap_or_else(Name::missing))?;
+        write!(f, "{}", f.db.trait_data(self.trait_).name.clone().unwrap_or_else(Name::missing))?;
         if self.substs.len() > 1 {
             write!(f, "<")?;
             f.write_joined(&self.substs[1..], ", ")?;