Fix rebase error

Author: tiif

crates/formality-check/src/mini_rust_check.rs

@@ -1,18 +1,17 @@
 use std::iter::zip;
 
 use formality_core::{judgment_fn, Fallible, Map, Upcast};
-use formality_prove::{prove_normalize, Constraints, Decls, Env};
-use formality_core::{Fallible, Map, Upcast};
-use formality_prove::{AdtDeclBoundData, AdtDeclVariant, Env};
+use formality_prove::{prove_normalize, AdtDeclBoundData, AdtDeclVariant, Constraints, Decls, Env};
 use formality_rust::grammar::minirust::ArgumentExpression::{ByValue, InPlace};
 use formality_rust::grammar::minirust::PlaceExpression::*;
 use formality_rust::grammar::minirust::ValueExpression::{Constant, Fn, Load, Struct};
 use formality_rust::grammar::minirust::{
     self, ArgumentExpression, BasicBlock, BbId, LocalId, PlaceExpression, ValueExpression,
 };
 use formality_rust::grammar::FnBoundData;
-use formality_types::grammar::{CrateId, FnId};
-use formality_types::grammar::{Relation, Ty, VariantId, Wcs};
+use formality_types::grammar::{
+    CrateId, FnId, Parameter, Relation, RigidName, RigidTy, Ty, VariantId, Wcs,
+};
 
 use crate::{Check, CrateItem};
 use anyhow::bail;
@@ -494,3 +493,34 @@ struct TypeckEnv {
     /// LocalId of function argument.
     fn_args: Vec<LocalId>,
 }
+
+judgment_fn! {
+    fn ty_is_int(
+        _decls: Decls,
+        env: Env,
+        assumptions: Wcs,
+        ty: Parameter,
+    ) => Constraints {
+        debug(assumptions, ty, env)
+        // If the type that we are currently checking is rigid, check if it is an int.
+        // If the type can be normalized, normalize until rigid then check if it is an int.
+        // For the rest of the case, it should fail.
+
+        (
+            (prove_normalize(&decl, &env, &assumptions, ty) => (c1, p))!
+            (let assumptions = c1.substitution().apply(&assumptions))
+            (ty_is_int(&decl, &env, assumptions, p) => c2)
+            ----------------------------- ("alias_ty is int")
+            (ty_is_int(decl, env, assumptions, ty) => c2)
+        )
+
+        (
+            (if id.is_int())
+            ----------------------------- ("rigid_ty is int")
+            (ty_is_int(_decls, _env, _assumptions, RigidTy {name: RigidName::ScalarId(id), parameters: _}) => Constraints::none(env))
+        )
+
+    }
+}
+
+mod test;