Merge #2140

2140: move builtin types to hir_def r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 11 insertions, 5 deletions

diff --git a/crates/ra_hir/src/ty/lower.rs b/crates/ra_hir/src/ty/lower.rs
index 0f49a0e54..dd7cd979f 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},
 };
@@ -24,10 +25,13 @@ use crate::{
     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,
-    Trait, TypeAlias, Union,
+    Const, Enum, EnumVariant, Function, ModuleDef, Path, Static, Struct, StructField, Trait,
+    TypeAlias, Union,
 };
 
 impl Ty {
@@ -643,8 +647,10 @@ 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()),
     })
 }