Inline TypeCtor into Ty

1 files changed, 13 insertions, 26 deletions

diff --git a/crates/hir_ty/src/op.rs b/crates/hir_ty/src/op.rs
index a4999c51d..1c01a67ad 100644
--- a/crates/hir_ty/src/op.rs
+++ b/crates/hir_ty/src/op.rs
@@ -1,30 +1,23 @@
 //! Helper functions for binary operator type inference.
 use hir_def::expr::{ArithOp, BinaryOp, CmpOp};
 
-use super::{InferTy, Ty, TypeCtor};
-use crate::{ApplicationTy, Scalar};
+use crate::{InferTy, Scalar, Ty};
 
 pub(super) fn binary_op_return_ty(op: BinaryOp, lhs_ty: Ty, rhs_ty: Ty) -> Ty {
     match op {
-        BinaryOp::LogicOp(_) | BinaryOp::CmpOp(_) => Ty::simple(TypeCtor::Scalar(Scalar::Bool)),
+        BinaryOp::LogicOp(_) | BinaryOp::CmpOp(_) => Ty::Scalar(Scalar::Bool),
         BinaryOp::Assignment { .. } => Ty::unit(),
         BinaryOp::ArithOp(ArithOp::Shl) | BinaryOp::ArithOp(ArithOp::Shr) => match lhs_ty {
-            Ty::Apply(ApplicationTy { ctor, .. }) => match ctor {
-                TypeCtor::Scalar(Scalar::Int(_))
-                | TypeCtor::Scalar(Scalar::Uint(_))
-                | TypeCtor::Scalar(Scalar::Float(_)) => lhs_ty,
-                _ => Ty::Unknown,
-            },
+            Ty::Scalar(Scalar::Int(_))
+            | Ty::Scalar(Scalar::Uint(_))
+            | Ty::Scalar(Scalar::Float(_)) => lhs_ty,
             Ty::Infer(InferTy::IntVar(..)) | Ty::Infer(InferTy::FloatVar(..)) => lhs_ty,
             _ => Ty::Unknown,
         },
         BinaryOp::ArithOp(_) => match rhs_ty {
-            Ty::Apply(ApplicationTy { ctor, .. }) => match ctor {
-                TypeCtor::Scalar(Scalar::Int(_))
-                | TypeCtor::Scalar(Scalar::Uint(_))
-                | TypeCtor::Scalar(Scalar::Float(_)) => rhs_ty,
-                _ => Ty::Unknown,
-            },
+            Ty::Scalar(Scalar::Int(_))
+            | Ty::Scalar(Scalar::Uint(_))
+            | Ty::Scalar(Scalar::Float(_)) => rhs_ty,
             Ty::Infer(InferTy::IntVar(..)) | Ty::Infer(InferTy::FloatVar(..)) => rhs_ty,
             _ => Ty::Unknown,
         },
@@ -33,13 +26,10 @@ pub(super) fn binary_op_return_ty(op: BinaryOp, lhs_ty: Ty, rhs_ty: Ty) -> Ty {
 
 pub(super) fn binary_op_rhs_expectation(op: BinaryOp, lhs_ty: Ty) -> Ty {
     match op {
-        BinaryOp::LogicOp(..) => Ty::simple(TypeCtor::Scalar(Scalar::Bool)),
+        BinaryOp::LogicOp(..) => Ty::Scalar(Scalar::Bool),
         BinaryOp::Assignment { op: None } => lhs_ty,
         BinaryOp::CmpOp(CmpOp::Eq { .. }) => match lhs_ty {
-            Ty::Apply(ApplicationTy { ctor, .. }) => match ctor {
-                TypeCtor::Scalar(_) | TypeCtor::Str => lhs_ty,
-                _ => Ty::Unknown,
-            },
+            Ty::Scalar(_) | Ty::Str => lhs_ty,
             Ty::Infer(InferTy::IntVar(..)) | Ty::Infer(InferTy::FloatVar(..)) => lhs_ty,
             _ => Ty::Unknown,
         },
@@ -47,12 +37,9 @@ pub(super) fn binary_op_rhs_expectation(op: BinaryOp, lhs_ty: Ty) -> Ty {
         BinaryOp::CmpOp(CmpOp::Ord { .. })
         | BinaryOp::Assignment { op: Some(_) }
         | BinaryOp::ArithOp(_) => match lhs_ty {
-            Ty::Apply(ApplicationTy { ctor, .. }) => match ctor {
-                TypeCtor::Scalar(Scalar::Int(_))
-                | TypeCtor::Scalar(Scalar::Uint(_))
-                | TypeCtor::Scalar(Scalar::Float(_)) => lhs_ty,
-                _ => Ty::Unknown,
-            },
+            Ty::Scalar(Scalar::Int(_))
+            | Ty::Scalar(Scalar::Uint(_))
+            | Ty::Scalar(Scalar::Float(_)) => lhs_ty,
             Ty::Infer(InferTy::IntVar(..)) | Ty::Infer(InferTy::FloatVar(..)) => lhs_ty,
             _ => Ty::Unknown,
         },