Merge #1015

1015: Change primitive integers to have signedness and bitness r=matklad a=yanchith

Fixes #1004 

This creates enums: `Signedness`, `IntBitness` and `FloatBitness`, and condenses `UintTy` with `IntTy`, making use of the created enums. `FloatTy` is also changed from an enum into a struct containing `FloatBitness`.

`UncertainIntTy` and `UncertainFloatTy` now look much more similar.

`Ord` was removed from the types because `{u,i}size` aren't easily orderable with the rest. Fortunately this wasn't depended on anywhere.

Co-authored-by: yanchith <[email protected]>

1 files changed, 4 insertions, 4 deletions

diff --git a/crates/ra_hir/src/ty/lower.rs b/crates/ra_hir/src/ty/lower.rs
index 72b1234bf..7f9af307b 100644
--- a/crates/ra_hir/src/ty/lower.rs
+++ b/crates/ra_hir/src/ty/lower.rs
@@ -61,10 +61,10 @@ impl Ty {
     pub(crate) fn from_hir_path(db: &impl HirDatabase, resolver: &Resolver, path: &Path) -> Self {
         if let Some(name) = path.as_ident() {
             // TODO handle primitive type names in resolver as well?
-            if let Some(int_ty) = primitive::UncertainIntTy::from_type_name(name) {
-                return Ty::simple(TypeCtor::Int(int_ty));
-            } else if let Some(float_ty) = primitive::UncertainFloatTy::from_type_name(name) {
-                return Ty::simple(TypeCtor::Float(float_ty));
+            if let Some(int_ty) = primitive::IntTy::from_type_name(name) {
+                return Ty::simple(TypeCtor::Int(primitive::UncertainIntTy::Known(int_ty)));
+            } else if let Some(float_ty) = primitive::FloatTy::from_type_name(name) {
+                return Ty::simple(TypeCtor::Float(primitive::UncertainFloatTy::Known(float_ty)));
             } else if let Some(known) = name.as_known_name() {
                 match known {
                     KnownName::Bool => return Ty::simple(TypeCtor::Bool),