Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes

1 files changed, 3 insertions, 3 deletions

diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs
index 6f24cfad6..ff6030ac4 100644
--- a/crates/ra_hir/src/ty.rs
+++ b/crates/ra_hir/src/ty.rs
@@ -21,7 +21,7 @@ use crate::{
     expr::ExprId,
     generics::{GenericParams, HasGenericParams},
     util::make_mut_slice,
-    Adt, Crate, DefWithBody, Mutability, Name, Trait, TypeAlias,
+    Adt, Crate, DefWithBody, FloatTy, IntTy, Mutability, Name, Trait, TypeAlias, Uncertain,
 };
 use display::{HirDisplay, HirFormatter};
 
@@ -47,10 +47,10 @@ pub enum TypeCtor {
     Char,
 
     /// A primitive integer type. For example, `i32`.
-    Int(primitive::UncertainIntTy),
+    Int(Uncertain<IntTy>),
 
     /// A primitive floating-point type. For example, `f64`.
-    Float(primitive::UncertainFloatTy),
+    Float(Uncertain<FloatTy>),
 
     /// Structures, enumerations and unions.
     Adt(Adt),