1 files changed, 14 insertions, 9 deletions

diff --git a/crates/ra_hir/src/ty/lower.rs b/crates/ra_hir/src/ty/lower.rs
index 0f49a0e54..e29ab8492 100644
--- a/crates/ra_hir/src/ty/lower.rs
+++ b/crates/ra_hir/src/ty/lower.rs
@@ -9,6 +9,7 @@ use std::iter;
 use std::sync::Arc;
 
 use hir_def::{
+    builtin_type::BuiltinType,
     path::{GenericArg, PathSegment},
     type_ref::{TypeBound, TypeRef},
 };
@@ -22,11 +23,13 @@ use crate::{
     db::HirDatabase,
     generics::HasGenericParams,
     generics::{GenericDef, WherePredicate},
-    nameres::Namespace,
     resolve::{Resolver, TypeNs},
-    ty::Adt,
+    ty::{
+        primitive::{FloatTy, IntTy},
+        Adt,
+    },
     util::make_mut_slice,
-    BuiltinType, Const, Enum, EnumVariant, Function, ModuleDef, Path, Static, Struct, StructField,
+    Const, Enum, EnumVariant, Function, ModuleDef, Namespace, Path, Static, Struct, StructField,
     Trait, TypeAlias, Union,
 };
 
@@ -643,14 +646,16 @@ fn type_for_builtin(def: BuiltinType) -> Ty {
         BuiltinType::Char => TypeCtor::Char,
         BuiltinType::Bool => TypeCtor::Bool,
         BuiltinType::Str => TypeCtor::Str,
-        BuiltinType::Int(ty) => TypeCtor::Int(ty.into()),
-        BuiltinType::Float(ty) => TypeCtor::Float(ty.into()),
+        BuiltinType::Int { signedness, bitness } => {
+            TypeCtor::Int(IntTy { signedness, bitness }.into())
+        }
+        BuiltinType::Float { bitness } => TypeCtor::Float(FloatTy { bitness }.into()),
     })
 }
 
 fn fn_sig_for_struct_constructor(db: &impl HirDatabase, def: Struct) -> FnSig {
-    let var_data = def.variant_data(db);
-    let fields = match var_data.fields() {
+    let struct_data = db.struct_data(def.id);
+    let fields = match struct_data.variant_data.fields() {
         Some(fields) => fields,
         None => panic!("fn_sig_for_struct_constructor called on unit struct"),
     };
@@ -665,8 +670,8 @@ fn fn_sig_for_struct_constructor(db: &impl HirDatabase, def: Struct) -> FnSig {
 
 /// Build the type of a tuple struct constructor.
 fn type_for_struct_constructor(db: &impl HirDatabase, def: Struct) -> Ty {
-    let var_data = def.variant_data(db);
-    if var_data.fields().is_none() {
+    let struct_data = db.struct_data(def.id);
+    if struct_data.variant_data.fields().is_none() {
         return type_for_adt(db, def); // Unit struct
     }
     let generics = def.generic_params(db);