From a443b5033c2e95ee58bf086f7093ddc610d4f78f Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 26 Nov 2019 14:29:12 +0300
Subject: Id-ify Ty::Adt

---
 crates/ra_hir/src/ty.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs
index 388530f31..bd03055b9 100644
--- a/crates/ra_hir/src/ty.rs
+++ b/crates/ra_hir/src/ty.rs
@@ -58,7 +58,7 @@ pub enum TypeCtor {
     Float(Uncertain<FloatTy>),
 
     /// Structures, enumerations and unions.
-    Adt(Adt),
+    Adt(AdtId),
 
     /// The pointee of a string slice. Written as `str`.
     Str,
@@ -174,7 +174,7 @@ impl TypeCtor {
             | TypeCtor::Tuple { .. } => None,
             // Closure's krate is irrelevant for coherence I would think?
             TypeCtor::Closure { .. } => None,
-            TypeCtor::Adt(adt) => adt.krate(db),
+            TypeCtor::Adt(adt) => Some(adt.module(db).krate.into()),
             TypeCtor::FnDef(callable) => Some(callable.krate(db).into()),
             TypeCtor::AssociatedType(type_alias) => {
                 Some(type_alias.lookup(db).module(db).krate.into())
@@ -598,7 +598,7 @@ impl Ty {
     pub fn as_adt(&self) -> Option<(Adt, &Substs)> {
         match self {
             Ty::Apply(ApplicationTy { ctor: TypeCtor::Adt(adt_def), parameters }) => {
-                Some((*adt_def, parameters))
+                Some(((*adt_def).into(), parameters))
             }
             _ => None,
         }
@@ -889,9 +889,9 @@ impl HirDisplay for ApplicationTy {
             }
             TypeCtor::Adt(def_id) => {
                 let name = match def_id {
-                    Adt::Struct(s) => s.name(f.db),
-                    Adt::Union(u) => u.name(f.db),
-                    Adt::Enum(e) => e.name(f.db),
+                    AdtId::StructId(it) => f.db.struct_data(it).name.clone(),
+                    AdtId::UnionId(it) => f.db.union_data(it).name.clone(),
+                    AdtId::EnumId(it) => f.db.enum_data(it).name.clone(),
                 }
                 .unwrap_or_else(Name::missing);
                 write!(f, "{}", name)?;
-- 
cgit v1.2.3