Regenerate the translated files for Lean

6 files changed, 137 insertions, 145 deletions

diff --git a/tests/lean/hashmap_on_disk/HashmapMain/Clauses/Clauses.lean b/tests/lean/hashmap_on_disk/HashmapMain/Clauses/Clauses.lean
index 1b69eb2f..a4dc996a 100644
--- a/tests/lean/hashmap_on_disk/HashmapMain/Clauses/Clauses.lean
+++ b/tests/lean/hashmap_on_disk/HashmapMain/Clauses/Clauses.lean
@@ -1,39 +1,37 @@
--- [hashmap_main]: the decreases clauses
 import Base.Primitives
 import HashmapMain.Types
 
 /- [hashmap_main::hashmap::HashMap::{0}::allocate_slots]: termination measure -/
 @[simp]
 def hashmap_hash_map_allocate_slots_loop_terminates (T : Type)
-  (slots : Vec (hashmap_list_t T)) (n : USize) :=
+  (slots : Vec (hashmap_list_t T)) (n : Usize) :=
   (slots, n)
 
+/- [hashmap_main::hashmap::HashMap::{0}::allocate_slots]: decreases_by tactic -/
 syntax "hashmap_hash_map_allocate_slots_loop_decreases" term+ : tactic
-
 macro_rules
 | `(tactic| hashmap_hash_map_allocate_slots_loop_decreases $slots $n) =>
   `(tactic| sorry)
 
-/- [hashmap_main::hashmap::HashMap::{0}::clear_slots]: termination measure -/
+/- [hashmap_main::hashmap::HashMap::{0}::clear]: termination measure -/
 @[simp]
-def hashmap_hash_map_clear_slots_loop_terminates (T : Type)
-  (slots : Vec (hashmap_list_t T)) (i : USize) :=
+def hashmap_hash_map_clear_loop_terminates (T : Type)
+  (slots : Vec (hashmap_list_t T)) (i : Usize) :=
   (slots, i)
 
-syntax "hashmap_hash_map_clear_slots_loop_decreases" term+ : tactic
-
+/- [hashmap_main::hashmap::HashMap::{0}::clear]: decreases_by tactic -/
+syntax "hashmap_hash_map_clear_loop_decreases" term+ : tactic
 macro_rules
-| `(tactic| hashmap_hash_map_clear_slots_loop_decreases $slots $i) =>
-  `(tactic| sorry)
+| `(tactic| hashmap_hash_map_clear_loop_decreases $slots $i) =>`(tactic| sorry)
 
 /- [hashmap_main::hashmap::HashMap::{0}::insert_in_list]: termination measure -/
 @[simp]
-def hashmap_hash_map_insert_in_list_loop_terminates (T : Type) (key : USize)
+def hashmap_hash_map_insert_in_list_loop_terminates (T : Type) (key : Usize)
   (value : T) (ls : hashmap_list_t T) :=
   (key, value, ls)
 
+/- [hashmap_main::hashmap::HashMap::{0}::insert_in_list]: decreases_by tactic -/
 syntax "hashmap_hash_map_insert_in_list_loop_decreases" term+ : tactic
-
 macro_rules
 | `(tactic| hashmap_hash_map_insert_in_list_loop_decreases $key $value $ls) =>
   `(tactic| sorry)
@@ -44,8 +42,8 @@ def hashmap_hash_map_move_elements_from_list_loop_terminates (T : Type)
   (ntable : hashmap_hash_map_t T) (ls : hashmap_list_t T) :=
   (ntable, ls)
 
+/- [hashmap_main::hashmap::HashMap::{0}::move_elements_from_list]: decreases_by tactic -/
 syntax "hashmap_hash_map_move_elements_from_list_loop_decreases" term+ : tactic
-
 macro_rules
 | `(tactic| hashmap_hash_map_move_elements_from_list_loop_decreases $ntable
 $ls) =>`(tactic| sorry)
@@ -53,12 +51,12 @@ $ls) =>`(tactic| sorry)
 /- [hashmap_main::hashmap::HashMap::{0}::move_elements]: termination measure -/
 @[simp]
 def hashmap_hash_map_move_elements_loop_terminates (T : Type)
-  (ntable : hashmap_hash_map_t T) (slots : Vec (hashmap_list_t T)) (i : USize)
+  (ntable : hashmap_hash_map_t T) (slots : Vec (hashmap_list_t T)) (i : Usize)
   :=
   (ntable, slots, i)
 
+/- [hashmap_main::hashmap::HashMap::{0}::move_elements]: decreases_by tactic -/
 syntax "hashmap_hash_map_move_elements_loop_decreases" term+ : tactic
-
 macro_rules
 | `(tactic| hashmap_hash_map_move_elements_loop_decreases $ntable $slots $i) =>
   `(tactic| sorry)
@@ -66,46 +64,46 @@ macro_rules
 /- [hashmap_main::hashmap::HashMap::{0}::contains_key_in_list]: termination measure -/
 @[simp]
 def hashmap_hash_map_contains_key_in_list_loop_terminates (T : Type)
-  (key : USize) (ls : hashmap_list_t T) :=
+  (key : Usize) (ls : hashmap_list_t T) :=
   (key, ls)
 
+/- [hashmap_main::hashmap::HashMap::{0}::contains_key_in_list]: decreases_by tactic -/
 syntax "hashmap_hash_map_contains_key_in_list_loop_decreases" term+ : tactic
-
 macro_rules
 | `(tactic| hashmap_hash_map_contains_key_in_list_loop_decreases $key $ls) =>
   `(tactic| sorry)
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_in_list]: termination measure -/
 @[simp]
-def hashmap_hash_map_get_in_list_loop_terminates (T : Type) (key : USize)
+def hashmap_hash_map_get_in_list_loop_terminates (T : Type) (key : Usize)
   (ls : hashmap_list_t T) :=
   (key, ls)
 
+/- [hashmap_main::hashmap::HashMap::{0}::get_in_list]: decreases_by tactic -/
 syntax "hashmap_hash_map_get_in_list_loop_decreases" term+ : tactic
-
 macro_rules
 | `(tactic| hashmap_hash_map_get_in_list_loop_decreases $key $ls) =>`(tactic| sorry)
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list]: termination measure -/
 @[simp]
 def hashmap_hash_map_get_mut_in_list_loop_terminates (T : Type)
-  (ls : hashmap_list_t T) (key : USize) :=
+  (ls : hashmap_list_t T) (key : Usize) :=
   (ls, key)
 
+/- [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list]: decreases_by tactic -/
 syntax "hashmap_hash_map_get_mut_in_list_loop_decreases" term+ : tactic
-
 macro_rules
 | `(tactic| hashmap_hash_map_get_mut_in_list_loop_decreases $ls $key) =>
   `(tactic| sorry)
 
 /- [hashmap_main::hashmap::HashMap::{0}::remove_from_list]: termination measure -/
 @[simp]
-def hashmap_hash_map_remove_from_list_loop_terminates (T : Type) (key : USize)
+def hashmap_hash_map_remove_from_list_loop_terminates (T : Type) (key : Usize)
   (ls : hashmap_list_t T) :=
   (key, ls)
 
+/- [hashmap_main::hashmap::HashMap::{0}::remove_from_list]: decreases_by tactic -/
 syntax "hashmap_hash_map_remove_from_list_loop_decreases" term+ : tactic
-
 macro_rules
 | `(tactic| hashmap_hash_map_remove_from_list_loop_decreases $key $ls) =>
   `(tactic| sorry)
diff --git a/tests/lean/hashmap_on_disk/HashmapMain/Clauses/Template.lean b/tests/lean/hashmap_on_disk/HashmapMain/Clauses/Template.lean
index 753c92ac..33802597 100644
--- a/tests/lean/hashmap_on_disk/HashmapMain/Clauses/Template.lean
+++ b/tests/lean/hashmap_on_disk/HashmapMain/Clauses/Template.lean
@@ -6,7 +6,7 @@ import HashmapMain.Types
 /- [hashmap_main::hashmap::HashMap::{0}::allocate_slots]: termination measure -/
 @[simp]
 def hashmap_hash_map_allocate_slots_loop_terminates (T : Type)
-  (slots : Vec (hashmap_list_t T)) (n : USize) :=
+  (slots : Vec (hashmap_list_t T)) (n : Usize) :=
   (slots, n)
 
 /- [hashmap_main::hashmap::HashMap::{0}::allocate_slots]: decreases_by tactic -/
@@ -18,7 +18,7 @@ macro_rules
 /- [hashmap_main::hashmap::HashMap::{0}::clear]: termination measure -/
 @[simp]
 def hashmap_hash_map_clear_loop_terminates (T : Type)
-  (slots : Vec (hashmap_list_t T)) (i : USize) :=
+  (slots : Vec (hashmap_list_t T)) (i : Usize) :=
   (slots, i)
 
 /- [hashmap_main::hashmap::HashMap::{0}::clear]: decreases_by tactic -/
@@ -28,7 +28,7 @@ macro_rules
 
 /- [hashmap_main::hashmap::HashMap::{0}::insert_in_list]: termination measure -/
 @[simp]
-def hashmap_hash_map_insert_in_list_loop_terminates (T : Type) (key : USize)
+def hashmap_hash_map_insert_in_list_loop_terminates (T : Type) (key : Usize)
   (value : T) (ls : hashmap_list_t T) :=
   (key, value, ls)
 
@@ -53,7 +53,7 @@ $ls) =>`(tactic| sorry)
 /- [hashmap_main::hashmap::HashMap::{0}::move_elements]: termination measure -/
 @[simp]
 def hashmap_hash_map_move_elements_loop_terminates (T : Type)
-  (ntable : hashmap_hash_map_t T) (slots : Vec (hashmap_list_t T)) (i : USize)
+  (ntable : hashmap_hash_map_t T) (slots : Vec (hashmap_list_t T)) (i : Usize)
   :=
   (ntable, slots, i)
 
@@ -66,7 +66,7 @@ macro_rules
 /- [hashmap_main::hashmap::HashMap::{0}::contains_key_in_list]: termination measure -/
 @[simp]
 def hashmap_hash_map_contains_key_in_list_loop_terminates (T : Type)
-  (key : USize) (ls : hashmap_list_t T) :=
+  (key : Usize) (ls : hashmap_list_t T) :=
   (key, ls)
 
 /- [hashmap_main::hashmap::HashMap::{0}::contains_key_in_list]: decreases_by tactic -/
@@ -77,7 +77,7 @@ macro_rules
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_in_list]: termination measure -/
 @[simp]
-def hashmap_hash_map_get_in_list_loop_terminates (T : Type) (key : USize)
+def hashmap_hash_map_get_in_list_loop_terminates (T : Type) (key : Usize)
   (ls : hashmap_list_t T) :=
   (key, ls)
 
@@ -89,7 +89,7 @@ macro_rules
 /- [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list]: termination measure -/
 @[simp]
 def hashmap_hash_map_get_mut_in_list_loop_terminates (T : Type)
-  (ls : hashmap_list_t T) (key : USize) :=
+  (ls : hashmap_list_t T) (key : Usize) :=
   (ls, key)
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list]: decreases_by tactic -/
@@ -100,7 +100,7 @@ macro_rules
 
 /- [hashmap_main::hashmap::HashMap::{0}::remove_from_list]: termination measure -/
 @[simp]
-def hashmap_hash_map_remove_from_list_loop_terminates (T : Type) (key : USize)
+def hashmap_hash_map_remove_from_list_loop_terminates (T : Type) (key : Usize)
   (ls : hashmap_list_t T) :=
   (key, ls)
 
diff --git a/tests/lean/hashmap_on_disk/HashmapMain/ExternalFuns.lean b/tests/lean/hashmap_on_disk/HashmapMain/ExternalFuns.lean
new file mode 100644
index 00000000..a5103acc
--- /dev/null
+++ b/tests/lean/hashmap_on_disk/HashmapMain/ExternalFuns.lean
@@ -0,0 +1,5 @@
+import Base.Primitives
+import HashmapMain.Types
+import HashmapMain.Opaque
+
+def opaque_defs : OpaqueDefs := by sorry
diff --git a/tests/lean/hashmap_on_disk/HashmapMain/Funs.lean b/tests/lean/hashmap_on_disk/HashmapMain/Funs.lean
index 2be03d98..342c3833 100644
--- a/tests/lean/hashmap_on_disk/HashmapMain/Funs.lean
+++ b/tests/lean/hashmap_on_disk/HashmapMain/Funs.lean
@@ -2,25 +2,23 @@
 -- [hashmap_main]: function definitions
 import Base.Primitives
 import HashmapMain.Types
-import HashmapMain.Opaque
+import HashmapMain.ExternalFuns
 import HashmapMain.Clauses.Clauses
 
-section variable (opaque_defs: OpaqueDefs)
-
 /- [hashmap_main::hashmap::hash_key] -/
-def hashmap_hash_key_fwd (k : USize) : Result USize :=
+def hashmap_hash_key_fwd (k : Usize) : Result Usize :=
   Result.ret k
 
 /- [hashmap_main::hashmap::HashMap::{0}::allocate_slots] -/
 def hashmap_hash_map_allocate_slots_loop_fwd
-  (T : Type) (slots : Vec (hashmap_list_t T)) (n : USize) :
+  (T : Type) (slots : Vec (hashmap_list_t T)) (n : Usize) :
   (Result (Vec (hashmap_list_t T)))
   :=
-  if h: n > (USize.ofNatCore 0 (by intlit))
+  if h: n > (Usize.ofInt 0 (by intlit))
   then
     do
       let slots0 ← vec_push_back (hashmap_list_t T) slots hashmap_list_t.Nil
-      let n0 ← USize.checked_sub n (USize.ofNatCore 1 (by intlit))
+      let n0 ← n - (Usize.ofInt 1 (by intlit))
       hashmap_hash_map_allocate_slots_loop_fwd T slots0 n0
   else Result.ret slots
 termination_by hashmap_hash_map_allocate_slots_loop_fwd slots n =>
@@ -29,25 +27,25 @@ decreasing_by hashmap_hash_map_allocate_slots_loop_decreases slots n
 
 /- [hashmap_main::hashmap::HashMap::{0}::allocate_slots] -/
 def hashmap_hash_map_allocate_slots_fwd
-  (T : Type) (slots : Vec (hashmap_list_t T)) (n : USize) :
+  (T : Type) (slots : Vec (hashmap_list_t T)) (n : Usize) :
   Result (Vec (hashmap_list_t T))
   :=
   hashmap_hash_map_allocate_slots_loop_fwd T slots n
 
 /- [hashmap_main::hashmap::HashMap::{0}::new_with_capacity] -/
 def hashmap_hash_map_new_with_capacity_fwd
-  (T : Type) (capacity : USize) (max_load_dividend : USize)
-  (max_load_divisor : USize) :
+  (T : Type) (capacity : Usize) (max_load_dividend : Usize)
+  (max_load_divisor : Usize) :
   Result (hashmap_hash_map_t T)
   :=
   do
     let v := vec_new (hashmap_list_t T)
     let slots ← hashmap_hash_map_allocate_slots_fwd T v capacity
-    let i ← USize.checked_mul capacity max_load_dividend
-    let i0 ← USize.checked_div i max_load_divisor
+    let i ← capacity * max_load_dividend
+    let i0 ← i / max_load_divisor
     Result.ret
       {
-        hashmap_hash_map_num_entries := (USize.ofNatCore 0 (by intlit)),
+        hashmap_hash_map_num_entries := (Usize.ofInt 0 (by intlit)),
         hashmap_hash_map_max_load_factor :=
           (max_load_dividend, max_load_divisor),
         hashmap_hash_map_max_load := i0,
@@ -56,19 +54,19 @@ def hashmap_hash_map_new_with_capacity_fwd
 
 /- [hashmap_main::hashmap::HashMap::{0}::new] -/
 def hashmap_hash_map_new_fwd (T : Type) : Result (hashmap_hash_map_t T) :=
-  hashmap_hash_map_new_with_capacity_fwd T (USize.ofNatCore 32 (by intlit))
-    (USize.ofNatCore 4 (by intlit)) (USize.ofNatCore 5 (by intlit))
+  hashmap_hash_map_new_with_capacity_fwd T (Usize.ofInt 32 (by intlit))
+    (Usize.ofInt 4 (by intlit)) (Usize.ofInt 5 (by intlit))
 
 /- [hashmap_main::hashmap::HashMap::{0}::clear] -/
 def hashmap_hash_map_clear_loop_fwd_back
-  (T : Type) (slots : Vec (hashmap_list_t T)) (i : USize) :
+  (T : Type) (slots : Vec (hashmap_list_t T)) (i : Usize) :
   (Result (Vec (hashmap_list_t T)))
   :=
   let i0 := vec_len (hashmap_list_t T) slots
   if h: i < i0
   then
     do
-      let i1 ← USize.checked_add i (USize.ofNatCore 1 (by intlit))
+      let i1 ← i + (Usize.ofInt 1 (by intlit))
       let slots0 ←
         vec_index_mut_back (hashmap_list_t T) slots i hashmap_list_t.Nil
       hashmap_hash_map_clear_loop_fwd_back T slots0 i1
@@ -83,23 +81,23 @@ def hashmap_hash_map_clear_fwd_back
   do
     let v ←
       hashmap_hash_map_clear_loop_fwd_back T self.hashmap_hash_map_slots
-        (USize.ofNatCore 0 (by intlit))
+        (Usize.ofInt 0 (by intlit))
     Result.ret
       {
         self
           with
-          hashmap_hash_map_num_entries := (USize.ofNatCore 0 (by intlit)),
+          hashmap_hash_map_num_entries := (Usize.ofInt 0 (by intlit)),
           hashmap_hash_map_slots := v
       }
 
 /- [hashmap_main::hashmap::HashMap::{0}::len] -/
 def hashmap_hash_map_len_fwd
-  (T : Type) (self : hashmap_hash_map_t T) : Result USize :=
+  (T : Type) (self : hashmap_hash_map_t T) : Result Usize :=
   Result.ret self.hashmap_hash_map_num_entries
 
 /- [hashmap_main::hashmap::HashMap::{0}::insert_in_list] -/
 def hashmap_hash_map_insert_in_list_loop_fwd
-  (T : Type) (key : USize) (value : T) (ls : hashmap_list_t T) :
+  (T : Type) (key : Usize) (value : T) (ls : hashmap_list_t T) :
   (Result Bool)
   :=
   match h: ls with
@@ -114,12 +112,12 @@ decreasing_by hashmap_hash_map_insert_in_list_loop_decreases key value ls
 
 /- [hashmap_main::hashmap::HashMap::{0}::insert_in_list] -/
 def hashmap_hash_map_insert_in_list_fwd
-  (T : Type) (key : USize) (value : T) (ls : hashmap_list_t T) : Result Bool :=
+  (T : Type) (key : Usize) (value : T) (ls : hashmap_list_t T) : Result Bool :=
   hashmap_hash_map_insert_in_list_loop_fwd T key value ls
 
 /- [hashmap_main::hashmap::HashMap::{0}::insert_in_list] -/
 def hashmap_hash_map_insert_in_list_loop_back
-  (T : Type) (key : USize) (value : T) (ls : hashmap_list_t T) :
+  (T : Type) (key : Usize) (value : T) (ls : hashmap_list_t T) :
   (Result (hashmap_list_t T))
   :=
   match h: ls with
@@ -139,28 +137,28 @@ decreasing_by hashmap_hash_map_insert_in_list_loop_decreases key value ls
 
 /- [hashmap_main::hashmap::HashMap::{0}::insert_in_list] -/
 def hashmap_hash_map_insert_in_list_back
-  (T : Type) (key : USize) (value : T) (ls : hashmap_list_t T) :
+  (T : Type) (key : Usize) (value : T) (ls : hashmap_list_t T) :
   Result (hashmap_list_t T)
   :=
   hashmap_hash_map_insert_in_list_loop_back T key value ls
 
 /- [hashmap_main::hashmap::HashMap::{0}::insert_no_resize] -/
 def hashmap_hash_map_insert_no_resize_fwd_back
-  (T : Type) (self : hashmap_hash_map_t T) (key : USize) (value : T) :
+  (T : Type) (self : hashmap_hash_map_t T) (key : Usize) (value : T) :
   Result (hashmap_hash_map_t T)
   :=
   do
     let hash ← hashmap_hash_key_fwd key
     let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots
-    let hash_mod ← USize.checked_rem hash i
+    let hash_mod ← hash % i
     let l ←
       vec_index_mut_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod
     let inserted ← hashmap_hash_map_insert_in_list_fwd T key value l
     if h: inserted
     then
       do
-        let i0 ← USize.checked_add self.hashmap_hash_map_num_entries
-          (USize.ofNatCore 1 (by intlit))
+        let i0 ← self.hashmap_hash_map_num_entries +
+          (Usize.ofInt 1 (by intlit))
         let l0 ← hashmap_hash_map_insert_in_list_back T key value l
         let v ←
           vec_index_mut_back (hashmap_list_t T) self.hashmap_hash_map_slots
@@ -180,9 +178,9 @@ def hashmap_hash_map_insert_no_resize_fwd_back
         Result.ret { self with hashmap_hash_map_slots := v }
 
 /- [core::num::u32::{9}::MAX] -/
-def core_num_u32_max_body : Result UInt32 :=
-  Result.ret (UInt32.ofNatCore 4294967295 (by intlit))
-def core_num_u32_max_c : UInt32 := eval_global core_num_u32_max_body (by simp)
+def core_num_u32_max_body : Result U32 :=
+  Result.ret (U32.ofInt 4294967295 (by intlit))
+def core_num_u32_max_c : U32 := eval_global core_num_u32_max_body (by simp)
 
 /- [hashmap_main::hashmap::HashMap::{0}::move_elements_from_list] -/
 def hashmap_hash_map_move_elements_from_list_loop_fwd_back
@@ -210,7 +208,7 @@ def hashmap_hash_map_move_elements_from_list_fwd_back
 /- [hashmap_main::hashmap::HashMap::{0}::move_elements] -/
 def hashmap_hash_map_move_elements_loop_fwd_back
   (T : Type) (ntable : hashmap_hash_map_t T) (slots : Vec (hashmap_list_t T))
-  (i : USize) :
+  (i : Usize) :
   (Result ((hashmap_hash_map_t T) × (Vec (hashmap_list_t T))))
   :=
   let i0 := vec_len (hashmap_list_t T) slots
@@ -221,7 +219,7 @@ def hashmap_hash_map_move_elements_loop_fwd_back
       let ls := mem_replace_fwd (hashmap_list_t T) l hashmap_list_t.Nil
       let ntable0 ←
         hashmap_hash_map_move_elements_from_list_fwd_back T ntable ls
-      let i1 ← USize.checked_add i (USize.ofNatCore 1 (by intlit))
+      let i1 ← i + (Usize.ofInt 1 (by intlit))
       let l0 := mem_replace_back (hashmap_list_t T) l hashmap_list_t.Nil
       let slots0 ← vec_index_mut_back (hashmap_list_t T) slots i l0
       hashmap_hash_map_move_elements_loop_fwd_back T ntable0 slots0 i1
@@ -233,7 +231,7 @@ decreasing_by hashmap_hash_map_move_elements_loop_decreases ntable slots i
 /- [hashmap_main::hashmap::HashMap::{0}::move_elements] -/
 def hashmap_hash_map_move_elements_fwd_back
   (T : Type) (ntable : hashmap_hash_map_t T) (slots : Vec (hashmap_list_t T))
-  (i : USize) :
+  (i : Usize) :
   Result ((hashmap_hash_map_t T) × (Vec (hashmap_list_t T)))
   :=
   hashmap_hash_map_move_elements_loop_fwd_back T ntable slots i
@@ -242,19 +240,19 @@ def hashmap_hash_map_move_elements_fwd_back
 def hashmap_hash_map_try_resize_fwd_back
   (T : Type) (self : hashmap_hash_map_t T) : Result (hashmap_hash_map_t T) :=
   do
-    let max_usize ← scalar_cast USize core_num_u32_max_c
+    let max_usize ← Scalar.cast .Usize core_num_u32_max_c
     let capacity := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots
-    let n1 ← USize.checked_div max_usize (USize.ofNatCore 2 (by intlit))
+    let n1 ← max_usize / (Usize.ofInt 2 (by intlit))
     let (i, i0) := self.hashmap_hash_map_max_load_factor
-    let i1 ← USize.checked_div n1 i
+    let i1 ← n1 / i
     if h: capacity <= i1
     then
       do
-        let i2 ← USize.checked_mul capacity (USize.ofNatCore 2 (by intlit))
+        let i2 ← capacity * (Usize.ofInt 2 (by intlit))
         let ntable ← hashmap_hash_map_new_with_capacity_fwd T i2 i i0
         let (ntable0, _) ←
           hashmap_hash_map_move_elements_fwd_back T ntable
-            self.hashmap_hash_map_slots (USize.ofNatCore 0 (by intlit))
+            self.hashmap_hash_map_slots (Usize.ofInt 0 (by intlit))
         Result.ret
           {
             ntable0
@@ -266,7 +264,7 @@ def hashmap_hash_map_try_resize_fwd_back
 
 /- [hashmap_main::hashmap::HashMap::{0}::insert] -/
 def hashmap_hash_map_insert_fwd_back
-  (T : Type) (self : hashmap_hash_map_t T) (key : USize) (value : T) :
+  (T : Type) (self : hashmap_hash_map_t T) (key : Usize) (value : T) :
   Result (hashmap_hash_map_t T)
   :=
   do
@@ -278,7 +276,7 @@ def hashmap_hash_map_insert_fwd_back
 
 /- [hashmap_main::hashmap::HashMap::{0}::contains_key_in_list] -/
 def hashmap_hash_map_contains_key_in_list_loop_fwd
-  (T : Type) (key : USize) (ls : hashmap_list_t T) : (Result Bool) :=
+  (T : Type) (key : Usize) (ls : hashmap_list_t T) : (Result Bool) :=
   match h: ls with
   | hashmap_list_t.Cons ckey t tl =>
     if h: ckey = key
@@ -291,23 +289,23 @@ decreasing_by hashmap_hash_map_contains_key_in_list_loop_decreases key ls
 
 /- [hashmap_main::hashmap::HashMap::{0}::contains_key_in_list] -/
 def hashmap_hash_map_contains_key_in_list_fwd
-  (T : Type) (key : USize) (ls : hashmap_list_t T) : Result Bool :=
+  (T : Type) (key : Usize) (ls : hashmap_list_t T) : Result Bool :=
   hashmap_hash_map_contains_key_in_list_loop_fwd T key ls
 
 /- [hashmap_main::hashmap::HashMap::{0}::contains_key] -/
 def hashmap_hash_map_contains_key_fwd
-  (T : Type) (self : hashmap_hash_map_t T) (key : USize) : Result Bool :=
+  (T : Type) (self : hashmap_hash_map_t T) (key : Usize) : Result Bool :=
   do
     let hash ← hashmap_hash_key_fwd key
     let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots
-    let hash_mod ← USize.checked_rem hash i
+    let hash_mod ← hash % i
     let l ←
       vec_index_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod
     hashmap_hash_map_contains_key_in_list_fwd T key l
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_in_list] -/
 def hashmap_hash_map_get_in_list_loop_fwd
-  (T : Type) (key : USize) (ls : hashmap_list_t T) : (Result T) :=
+  (T : Type) (key : Usize) (ls : hashmap_list_t T) : (Result T) :=
   match h: ls with
   | hashmap_list_t.Cons ckey cvalue tl =>
     if h: ckey = key
@@ -320,23 +318,23 @@ decreasing_by hashmap_hash_map_get_in_list_loop_decreases key ls
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_in_list] -/
 def hashmap_hash_map_get_in_list_fwd
-  (T : Type) (key : USize) (ls : hashmap_list_t T) : Result T :=
+  (T : Type) (key : Usize) (ls : hashmap_list_t T) : Result T :=
   hashmap_hash_map_get_in_list_loop_fwd T key ls
 
 /- [hashmap_main::hashmap::HashMap::{0}::get] -/
 def hashmap_hash_map_get_fwd
-  (T : Type) (self : hashmap_hash_map_t T) (key : USize) : Result T :=
+  (T : Type) (self : hashmap_hash_map_t T) (key : Usize) : Result T :=
   do
     let hash ← hashmap_hash_key_fwd key
     let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots
-    let hash_mod ← USize.checked_rem hash i
+    let hash_mod ← hash % i
     let l ←
       vec_index_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod
     hashmap_hash_map_get_in_list_fwd T key l
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list] -/
 def hashmap_hash_map_get_mut_in_list_loop_fwd
-  (T : Type) (ls : hashmap_list_t T) (key : USize) : (Result T) :=
+  (T : Type) (ls : hashmap_list_t T) (key : Usize) : (Result T) :=
   match h: ls with
   | hashmap_list_t.Cons ckey cvalue tl =>
     if h: ckey = key
@@ -349,12 +347,12 @@ decreasing_by hashmap_hash_map_get_mut_in_list_loop_decreases ls key
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list] -/
 def hashmap_hash_map_get_mut_in_list_fwd
-  (T : Type) (ls : hashmap_list_t T) (key : USize) : Result T :=
+  (T : Type) (ls : hashmap_list_t T) (key : Usize) : Result T :=
   hashmap_hash_map_get_mut_in_list_loop_fwd T ls key
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list] -/
 def hashmap_hash_map_get_mut_in_list_loop_back
-  (T : Type) (ls : hashmap_list_t T) (key : USize) (ret0 : T) :
+  (T : Type) (ls : hashmap_list_t T) (key : Usize) (ret0 : T) :
   (Result (hashmap_list_t T))
   :=
   match h: ls with
@@ -372,31 +370,31 @@ decreasing_by hashmap_hash_map_get_mut_in_list_loop_decreases ls key
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list] -/
 def hashmap_hash_map_get_mut_in_list_back
-  (T : Type) (ls : hashmap_list_t T) (key : USize) (ret0 : T) :
+  (T : Type) (ls : hashmap_list_t T) (key : Usize) (ret0 : T) :
   Result (hashmap_list_t T)
   :=
   hashmap_hash_map_get_mut_in_list_loop_back T ls key ret0
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_mut] -/
 def hashmap_hash_map_get_mut_fwd
-  (T : Type) (self : hashmap_hash_map_t T) (key : USize) : Result T :=
+  (T : Type) (self : hashmap_hash_map_t T) (key : Usize) : Result T :=
   do
     let hash ← hashmap_hash_key_fwd key
     let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots
-    let hash_mod ← USize.checked_rem hash i
+    let hash_mod ← hash % i
     let l ←
       vec_index_mut_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod
     hashmap_hash_map_get_mut_in_list_fwd T l key
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_mut] -/
 def hashmap_hash_map_get_mut_back
-  (T : Type) (self : hashmap_hash_map_t T) (key : USize) (ret0 : T) :
+  (T : Type) (self : hashmap_hash_map_t T) (key : Usize) (ret0 : T) :
   Result (hashmap_hash_map_t T)
   :=
   do
     let hash ← hashmap_hash_key_fwd key
     let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots
-    let hash_mod ← USize.checked_rem hash i
+    let hash_mod ← hash % i
     let l ←
       vec_index_mut_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod
     let l0 ← hashmap_hash_map_get_mut_in_list_back T l key ret0
@@ -407,7 +405,7 @@ def hashmap_hash_map_get_mut_back
 
 /- [hashmap_main::hashmap::HashMap::{0}::remove_from_list] -/
 def hashmap_hash_map_remove_from_list_loop_fwd
-  (T : Type) (key : USize) (ls : hashmap_list_t T) : (Result (Option T)) :=
+  (T : Type) (key : Usize) (ls : hashmap_list_t T) : (Result (Option T)) :=
   match h: ls with
   | hashmap_list_t.Cons ckey t tl =>
     if h: ckey = key
@@ -426,12 +424,12 @@ decreasing_by hashmap_hash_map_remove_from_list_loop_decreases key ls
 
 /- [hashmap_main::hashmap::HashMap::{0}::remove_from_list] -/
 def hashmap_hash_map_remove_from_list_fwd
-  (T : Type) (key : USize) (ls : hashmap_list_t T) : Result (Option T) :=
+  (T : Type) (key : Usize) (ls : hashmap_list_t T) : Result (Option T) :=
   hashmap_hash_map_remove_from_list_loop_fwd T key ls
 
 /- [hashmap_main::hashmap::HashMap::{0}::remove_from_list] -/
 def hashmap_hash_map_remove_from_list_loop_back
-  (T : Type) (key : USize) (ls : hashmap_list_t T) :
+  (T : Type) (key : Usize) (ls : hashmap_list_t T) :
   (Result (hashmap_list_t T))
   :=
   match h: ls with
@@ -455,18 +453,18 @@ decreasing_by hashmap_hash_map_remove_from_list_loop_decreases key ls
 
 /- [hashmap_main::hashmap::HashMap::{0}::remove_from_list] -/
 def hashmap_hash_map_remove_from_list_back
-  (T : Type) (key : USize) (ls : hashmap_list_t T) :
+  (T : Type) (key : Usize) (ls : hashmap_list_t T) :
   Result (hashmap_list_t T)
   :=
   hashmap_hash_map_remove_from_list_loop_back T key ls
 
 /- [hashmap_main::hashmap::HashMap::{0}::remove] -/
 def hashmap_hash_map_remove_fwd
-  (T : Type) (self : hashmap_hash_map_t T) (key : USize) : Result (Option T) :=
+  (T : Type) (self : hashmap_hash_map_t T) (key : Usize) : Result (Option T) :=
   do
     let hash ← hashmap_hash_key_fwd key
     let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots
-    let hash_mod ← USize.checked_rem hash i
+    let hash_mod ← hash % i
     let l ←
       vec_index_mut_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod
     let x ← hashmap_hash_map_remove_from_list_fwd T key l
@@ -474,19 +472,19 @@ def hashmap_hash_map_remove_fwd
     | Option.none => Result.ret Option.none
     | Option.some x0 =>
       do
-        let _ ← USize.checked_sub self.hashmap_hash_map_num_entries
-          (USize.ofNatCore 1 (by intlit))
+        let _ ← self.hashmap_hash_map_num_entries -
+          (Usize.ofInt 1 (by intlit))
         Result.ret (Option.some x0)
 
 /- [hashmap_main::hashmap::HashMap::{0}::remove] -/
 def hashmap_hash_map_remove_back
-  (T : Type) (self : hashmap_hash_map_t T) (key : USize) :
+  (T : Type) (self : hashmap_hash_map_t T) (key : Usize) :
   Result (hashmap_hash_map_t T)
   :=
   do
     let hash ← hashmap_hash_key_fwd key
     let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots
-    let hash_mod ← USize.checked_rem hash i
+    let hash_mod ← hash % i
     let l ←
       vec_index_mut_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod
     let x ← hashmap_hash_map_remove_from_list_fwd T key l
@@ -500,8 +498,8 @@ def hashmap_hash_map_remove_back
         Result.ret { self with hashmap_hash_map_slots := v }
     | Option.some x0 =>
       do
-        let i0 ← USize.checked_sub self.hashmap_hash_map_num_entries
-          (USize.ofNatCore 1 (by intlit))
+        let i0 ← self.hashmap_hash_map_num_entries -
+          (Usize.ofInt 1 (by intlit))
         let l0 ← hashmap_hash_map_remove_from_list_back T key l
         let v ←
           vec_index_mut_back (hashmap_list_t T) self.hashmap_hash_map_slots
@@ -516,79 +514,73 @@ def hashmap_hash_map_remove_back
 /- [hashmap_main::hashmap::test1] -/
 def hashmap_test1_fwd : Result Unit :=
   do
-    let hm ← hashmap_hash_map_new_fwd UInt64
+    let hm ← hashmap_hash_map_new_fwd U64
     let hm0 ←
-      hashmap_hash_map_insert_fwd_back UInt64 hm
-        (USize.ofNatCore 0 (by intlit)) (UInt64.ofNatCore 42 (by intlit))
+      hashmap_hash_map_insert_fwd_back U64 hm (Usize.ofInt 0 (by intlit))
+        (U64.ofInt 42 (by intlit))
     let hm1 ←
-      hashmap_hash_map_insert_fwd_back UInt64 hm0
-        (USize.ofNatCore 128 (by intlit)) (UInt64.ofNatCore 18 (by intlit))
+      hashmap_hash_map_insert_fwd_back U64 hm0 (Usize.ofInt 128 (by intlit))
+        (U64.ofInt 18 (by intlit))
     let hm2 ←
-      hashmap_hash_map_insert_fwd_back UInt64 hm1
-        (USize.ofNatCore 1024 (by intlit)) (UInt64.ofNatCore 138 (by intlit))
+      hashmap_hash_map_insert_fwd_back U64 hm1 (Usize.ofInt 1024 (by intlit))
+        (U64.ofInt 138 (by intlit))
     let hm3 ←
-      hashmap_hash_map_insert_fwd_back UInt64 hm2
-        (USize.ofNatCore 1056 (by intlit)) (UInt64.ofNatCore 256 (by intlit))
-    let i ←
-      hashmap_hash_map_get_fwd UInt64 hm3 (USize.ofNatCore 128 (by intlit))
-    if h: not (i = (UInt64.ofNatCore 18 (by intlit)))
+      hashmap_hash_map_insert_fwd_back U64 hm2 (Usize.ofInt 1056 (by intlit))
+        (U64.ofInt 256 (by intlit))
+    let i ← hashmap_hash_map_get_fwd U64 hm3 (Usize.ofInt 128 (by intlit))
+    if h: not (i = (U64.ofInt 18 (by intlit)))
     then Result.fail Error.panic
     else
       do
         let hm4 ←
-          hashmap_hash_map_get_mut_back UInt64 hm3
-            (USize.ofNatCore 1024 (by intlit))
-            (UInt64.ofNatCore 56 (by intlit))
+          hashmap_hash_map_get_mut_back U64 hm3 (Usize.ofInt 1024 (by intlit))
+            (U64.ofInt 56 (by intlit))
         let i0 ←
-          hashmap_hash_map_get_fwd UInt64 hm4
-            (USize.ofNatCore 1024 (by intlit))
-        if h: not (i0 = (UInt64.ofNatCore 56 (by intlit)))
+          hashmap_hash_map_get_fwd U64 hm4 (Usize.ofInt 1024 (by intlit))
+        if h: not (i0 = (U64.ofInt 56 (by intlit)))
         then Result.fail Error.panic
         else
           do
             let x ←
-              hashmap_hash_map_remove_fwd UInt64 hm4
-                (USize.ofNatCore 1024 (by intlit))
+              hashmap_hash_map_remove_fwd U64 hm4
+                (Usize.ofInt 1024 (by intlit))
             match h: x with
             | Option.none => Result.fail Error.panic
             | Option.some x0 =>
-              if h: not (x0 = (UInt64.ofNatCore 56 (by intlit)))
+              if h: not (x0 = (U64.ofInt 56 (by intlit)))
               then Result.fail Error.panic
               else
                 do
                   let hm5 ←
-                    hashmap_hash_map_remove_back UInt64 hm4
-                      (USize.ofNatCore 1024 (by intlit))
+                    hashmap_hash_map_remove_back U64 hm4
+                      (Usize.ofInt 1024 (by intlit))
                   let i1 ←
-                    hashmap_hash_map_get_fwd UInt64 hm5
-                      (USize.ofNatCore 0 (by intlit))
-                  if h: not (i1 = (UInt64.ofNatCore 42 (by intlit)))
+                    hashmap_hash_map_get_fwd U64 hm5
+                      (Usize.ofInt 0 (by intlit))
+                  if h: not (i1 = (U64.ofInt 42 (by intlit)))
                   then Result.fail Error.panic
                   else
                     do
                       let i2 ←
-                        hashmap_hash_map_get_fwd UInt64 hm5
-                          (USize.ofNatCore 128 (by intlit))
-                      if h: not (i2 = (UInt64.ofNatCore 18 (by intlit)))
+                        hashmap_hash_map_get_fwd U64 hm5
+                          (Usize.ofInt 128 (by intlit))
+                      if h: not (i2 = (U64.ofInt 18 (by intlit)))
                       then Result.fail Error.panic
                       else
                         do
                           let i3 ←
-                            hashmap_hash_map_get_fwd UInt64 hm5
-                              (USize.ofNatCore 1056 (by intlit))
-                          if h: not (i3 = (UInt64.ofNatCore 256 (by intlit)))
+                            hashmap_hash_map_get_fwd U64 hm5
+                              (Usize.ofInt 1056 (by intlit))
+                          if h: not (i3 = (U64.ofInt 256 (by intlit)))
                           then Result.fail Error.panic
                           else Result.ret ()
 
-/- Unit test for [hashmap_main::hashmap::test1] -/
-#assert (hashmap_test1_fwd == .ret ())
-
 /- [hashmap_main::insert_on_disk] -/
 def insert_on_disk_fwd
-  (key : USize) (value : UInt64) (st : State) : Result (State × Unit) :=
+  (key : Usize) (value : U64) (st : State) : Result (State × Unit) :=
   do
     let (st0, hm) ← opaque_defs.hashmap_utils_deserialize_fwd st
-    let hm0 ← hashmap_hash_map_insert_fwd_back UInt64 hm key value
+    let hm0 ← hashmap_hash_map_insert_fwd_back U64 hm key value
     let (st1, _) ← opaque_defs.hashmap_utils_serialize_fwd hm0 st0
     Result.ret (st1, ())
 
@@ -596,6 +588,3 @@ def insert_on_disk_fwd
 def main_fwd : Result Unit :=
   Result.ret ()
 
-/- Unit test for [hashmap_main::main] -/
-#assert (main_fwd == .ret ())
-
diff --git a/tests/lean/hashmap_on_disk/HashmapMain/Opaque.lean b/tests/lean/hashmap_on_disk/HashmapMain/Opaque.lean
index 3531e6e0..d98f431a 100644
--- a/tests/lean/hashmap_on_disk/HashmapMain/Opaque.lean
+++ b/tests/lean/hashmap_on_disk/HashmapMain/Opaque.lean
@@ -7,9 +7,9 @@ structure OpaqueDefs where
   
   /- [hashmap_main::hashmap_utils::deserialize] -/
   hashmap_utils_deserialize_fwd
-    : State -> Result (State × (hashmap_hash_map_t UInt64))
+    : State -> Result (State × (hashmap_hash_map_t U64))
   
   /- [hashmap_main::hashmap_utils::serialize] -/
   hashmap_utils_serialize_fwd
-    : hashmap_hash_map_t UInt64 -> State -> Result (State × Unit)
+    : hashmap_hash_map_t U64 -> State -> Result (State × Unit)
   
diff --git a/tests/lean/hashmap_on_disk/HashmapMain/Types.lean b/tests/lean/hashmap_on_disk/HashmapMain/Types.lean
index 989dd2a9..0509fbbd 100644
--- a/tests/lean/hashmap_on_disk/HashmapMain/Types.lean
+++ b/tests/lean/hashmap_on_disk/HashmapMain/Types.lean
@@ -4,14 +4,14 @@ import Base.Primitives
 
 /- [hashmap_main::hashmap::List] -/
 inductive hashmap_list_t (T : Type) :=
-| Cons : USize -> T -> hashmap_list_t T -> hashmap_list_t T
+| Cons : Usize -> T -> hashmap_list_t T -> hashmap_list_t T
 | Nil : hashmap_list_t T
 
 /- [hashmap_main::hashmap::HashMap] -/
 structure hashmap_hash_map_t (T : Type) where
-  hashmap_hash_map_num_entries : USize
-  hashmap_hash_map_max_load_factor : (USize × USize)
-  hashmap_hash_map_max_load : USize
+  hashmap_hash_map_num_entries : Usize
+  hashmap_hash_map_max_load_factor : (Usize × Usize)
+  hashmap_hash_map_max_load : Usize
   hashmap_hash_map_slots : Vec (hashmap_list_t T)
 
 /- The state type used in the state-error monad -/