1 files changed, 15 insertions, 30 deletions

diff --git a/crates/hir_ty/src/lib.rs b/crates/hir_ty/src/lib.rs
index 50d248674..676519594 100644
--- a/crates/hir_ty/src/lib.rs
+++ b/crates/hir_ty/src/lib.rs
@@ -38,7 +38,6 @@ use itertools::Itertools;
 use crate::{
     db::HirDatabase,
     display::HirDisplay,
-    primitive::{FloatTy, IntTy},
     utils::{generics, make_mut_slice, Generics},
 };
 
@@ -50,7 +49,7 @@ pub use lower::{
 };
 pub use traits::{InEnvironment, Obligation, ProjectionPredicate, TraitEnvironment};
 
-pub use chalk_ir::{BoundVar, DebruijnIndex};
+pub use chalk_ir::{BoundVar, DebruijnIndex, Scalar};
 
 #[derive(Clone, PartialEq, Eq, Debug, Hash)]
 pub enum Lifetime {
@@ -63,18 +62,8 @@ pub enum Lifetime {
 /// tuples.
 #[derive(Copy, Clone, PartialEq, Eq, Debug, Hash)]
 pub enum TypeCtor {
-    /// The primitive boolean type. Written as `bool`.
-    Bool,
-
-    /// The primitive character type; holds a Unicode scalar value
-    /// (a non-surrogate code point). Written as `char`.
-    Char,
-
-    /// A primitive integer type. For example, `i32`.
-    Int(IntTy),
-
-    /// A primitive floating-point type. For example, `f64`.
-    Float(FloatTy),
+    /// a scalar type like `bool` or `u32`
+    Scalar(Scalar),
 
     /// Structures, enumerations and unions.
     Adt(AdtId),
@@ -152,10 +141,7 @@ pub enum TypeCtor {
 impl TypeCtor {
     pub fn num_ty_params(self, db: &dyn HirDatabase) -> usize {
         match self {
-            TypeCtor::Bool
-            | TypeCtor::Char
-            | TypeCtor::Int(_)
-            | TypeCtor::Float(_)
+            TypeCtor::Scalar(_)
             | TypeCtor::Str
             | TypeCtor::Never => 0,
             TypeCtor::Slice
@@ -197,10 +183,7 @@ impl TypeCtor {
 
     pub fn krate(self, db: &dyn HirDatabase) -> Option<CrateId> {
         match self {
-            TypeCtor::Bool
-            | TypeCtor::Char
-            | TypeCtor::Int(_)
-            | TypeCtor::Float(_)
+            TypeCtor::Scalar(_)
             | TypeCtor::Str
             | TypeCtor::Never
             | TypeCtor::Slice
@@ -232,10 +215,7 @@ impl TypeCtor {
 
     pub fn as_generic_def(self) -> Option<GenericDefId> {
         match self {
-            TypeCtor::Bool
-            | TypeCtor::Char
-            | TypeCtor::Int(_)
-            | TypeCtor::Float(_)
+            TypeCtor::Scalar(_)
             | TypeCtor::Str
             | TypeCtor::Never
             | TypeCtor::Slice
@@ -741,11 +721,16 @@ impl Ty {
     }
     pub fn builtin(builtin: BuiltinType) -> Self {
         Ty::simple(match builtin {
-            BuiltinType::Char => TypeCtor::Char,
-            BuiltinType::Bool => TypeCtor::Bool,
+            BuiltinType::Char => TypeCtor::Scalar(Scalar::Char),
+            BuiltinType::Bool => TypeCtor::Scalar(Scalar::Bool),
             BuiltinType::Str => TypeCtor::Str,
-            BuiltinType::Int(t) => TypeCtor::Int(IntTy::from(t).into()),
-            BuiltinType::Float(t) => TypeCtor::Float(FloatTy::from(t).into()),
+            BuiltinType::Int(t) => TypeCtor::Scalar(Scalar::Int(primitive::int_ty_from_builtin(t))),
+            BuiltinType::Uint(t) => {
+                TypeCtor::Scalar(Scalar::Uint(primitive::uint_ty_from_builtin(t)))
+            }
+            BuiltinType::Float(t) => {
+                TypeCtor::Scalar(Scalar::Float(primitive::float_ty_from_builtin(t)))
+            }
         })
     }