Merge pull request #45 from AeneasVerif/son_merge_types

Big cleanup

4 files changed, 179 insertions, 132 deletions

diff --git a/tests/fstar/hashmap/Hashmap.Clauses.Template.fst b/tests/fstar/hashmap/Hashmap.Clauses.Template.fst
index a1f81666..2733b371 100644
--- a/tests/fstar/hashmap/Hashmap.Clauses.Template.fst
+++ b/tests/fstar/hashmap/Hashmap.Clauses.Template.fst
@@ -6,55 +6,64 @@ open Hashmap.Types
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
-(** [hashmap::HashMap::{0}::allocate_slots]: decreases clause *)
+(** [hashmap::{hashmap::HashMap<T>}::allocate_slots]: decreases clause
+    Source: 'src/hashmap.rs', lines 50:4-56:5 *)
 unfold
 let hashMap_allocate_slots_loop_decreases (t : Type0)
   (slots : alloc_vec_Vec (list_t t)) (n : usize) : nat =
   admit ()
 
-(** [hashmap::HashMap::{0}::clear]: decreases clause *)
+(** [hashmap::{hashmap::HashMap<T>}::clear]: decreases clause
+    Source: 'src/hashmap.rs', lines 80:4-88:5 *)
 unfold
 let hashMap_clear_loop_decreases (t : Type0) (slots : alloc_vec_Vec (list_t t))
   (i : usize) : nat =
   admit ()
 
-(** [hashmap::HashMap::{0}::insert_in_list]: decreases clause *)
+(** [hashmap::{hashmap::HashMap<T>}::insert_in_list]: decreases clause
+    Source: 'src/hashmap.rs', lines 97:4-114:5 *)
 unfold
 let hashMap_insert_in_list_loop_decreases (t : Type0) (key : usize) (value : t)
   (ls : list_t t) : nat =
   admit ()
 
-(** [hashmap::HashMap::{0}::move_elements_from_list]: decreases clause *)
+(** [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: decreases clause
+    Source: 'src/hashmap.rs', lines 183:4-196:5 *)
 unfold
 let hashMap_move_elements_from_list_loop_decreases (t : Type0)
   (ntable : hashMap_t t) (ls : list_t t) : nat =
   admit ()
 
-(** [hashmap::HashMap::{0}::move_elements]: decreases clause *)
+(** [hashmap::{hashmap::HashMap<T>}::move_elements]: decreases clause
+    Source: 'src/hashmap.rs', lines 171:4-180:5 *)
 unfold
 let hashMap_move_elements_loop_decreases (t : Type0) (ntable : hashMap_t t)
   (slots : alloc_vec_Vec (list_t t)) (i : usize) : nat =
   admit ()
 
-(** [hashmap::HashMap::{0}::contains_key_in_list]: decreases clause *)
+(** [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: decreases clause
+    Source: 'src/hashmap.rs', lines 206:4-219:5 *)
 unfold
 let hashMap_contains_key_in_list_loop_decreases (t : Type0) (key : usize)
   (ls : list_t t) : nat =
   admit ()
 
-(** [hashmap::HashMap::{0}::get_in_list]: decreases clause *)
+(** [hashmap::{hashmap::HashMap<T>}::get_in_list]: decreases clause
+    Source: 'src/hashmap.rs', lines 224:4-237:5 *)
 unfold
 let hashMap_get_in_list_loop_decreases (t : Type0) (key : usize)
   (ls : list_t t) : nat =
   admit ()
 
-(** [hashmap::HashMap::{0}::get_mut_in_list]: decreases clause *)
+(** [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: decreases clause
+    Source: 'src/hashmap.rs', lines 245:4-254:5 *)
 unfold
 let hashMap_get_mut_in_list_loop_decreases (t : Type0) (ls : list_t t)
   (key : usize) : nat =
   admit ()
 
-(** [hashmap::HashMap::{0}::remove_from_list]: decreases clause *)
+(** [hashmap::{hashmap::HashMap<T>}::remove_from_list]: decreases clause
+    Source: 'src/hashmap.rs', lines 265:4-291:5 *)
 unfold
 let hashMap_remove_from_list_loop_decreases (t : Type0) (key : usize)
   (ls : list_t t) : nat =
diff --git a/tests/fstar/hashmap/Hashmap.Funs.fst b/tests/fstar/hashmap/Hashmap.Funs.fst
index 0e31e364..e6cd1411 100644
--- a/tests/fstar/hashmap/Hashmap.Funs.fst
+++ b/tests/fstar/hashmap/Hashmap.Funs.fst
@@ -7,11 +7,13 @@ include Hashmap.Clauses
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
-(** [hashmap::hash_key]: forward function *)
+(** [hashmap::hash_key]: forward function
+    Source: 'src/hashmap.rs', lines 27:0-27:32 *)
 let hash_key (k : usize) : result usize =
   Return k
 
-(** [hashmap::HashMap::{0}::allocate_slots]: loop 0: forward function *)
+(** [hashmap::{hashmap::HashMap<T>}::allocate_slots]: loop 0: forward function
+    Source: 'src/hashmap.rs', lines 50:4-56:5 *)
 let rec hashMap_allocate_slots_loop
   (t : Type0) (slots : alloc_vec_Vec (list_t t)) (n : usize) :
   Tot (result (alloc_vec_Vec (list_t t)))
@@ -24,14 +26,16 @@ let rec hashMap_allocate_slots_loop
     hashMap_allocate_slots_loop t slots0 n0
   else Return slots
 
-(** [hashmap::HashMap::{0}::allocate_slots]: forward function *)
+(** [hashmap::{hashmap::HashMap<T>}::allocate_slots]: forward function
+    Source: 'src/hashmap.rs', lines 50:4-50:76 *)
 let hashMap_allocate_slots
   (t : Type0) (slots : alloc_vec_Vec (list_t t)) (n : usize) :
   result (alloc_vec_Vec (list_t t))
   =
   hashMap_allocate_slots_loop t slots n
 
-(** [hashmap::HashMap::{0}::new_with_capacity]: forward function *)
+(** [hashmap::{hashmap::HashMap<T>}::new_with_capacity]: forward function
+    Source: 'src/hashmap.rs', lines 59:4-63:13 *)
 let hashMap_new_with_capacity
   (t : Type0) (capacity : usize) (max_load_dividend : usize)
   (max_load_divisor : usize) :
@@ -49,12 +53,14 @@ let hashMap_new_with_capacity
       slots = slots
     }
 
-(** [hashmap::HashMap::{0}::new]: forward function *)
+(** [hashmap::{hashmap::HashMap<T>}::new]: forward function
+    Source: 'src/hashmap.rs', lines 75:4-75:24 *)
 let hashMap_new (t : Type0) : result (hashMap_t t) =
   hashMap_new_with_capacity t 32 4 5
 
-(** [hashmap::HashMap::{0}::clear]: loop 0: merged forward/backward function
-    (there is a single backward function, and the forward function returns ()) *)
+(** [hashmap::{hashmap::HashMap<T>}::clear]: loop 0: merged forward/backward function
+    (there is a single backward function, and the forward function returns ())
+    Source: 'src/hashmap.rs', lines 80:4-88:5 *)
 let rec hashMap_clear_loop
   (t : Type0) (slots : alloc_vec_Vec (list_t t)) (i : usize) :
   Tot (result (alloc_vec_Vec (list_t t)))
@@ -66,22 +72,25 @@ let rec hashMap_clear_loop
     let* i1 = usize_add i 1 in
     let* slots0 =
       alloc_vec_Vec_index_mut_back (list_t t) usize
-        (core_slice_index_usize_coresliceindexSliceIndexInst (list_t t)) slots
-        i List_Nil in
+        (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) slots i
+        List_Nil in
     hashMap_clear_loop t slots0 i1
   else Return slots
 
-(** [hashmap::HashMap::{0}::clear]: merged forward/backward function
-    (there is a single backward function, and the forward function returns ()) *)
+(** [hashmap::{hashmap::HashMap<T>}::clear]: merged forward/backward function
+    (there is a single backward function, and the forward function returns ())
+    Source: 'src/hashmap.rs', lines 80:4-80:27 *)
 let hashMap_clear (t : Type0) (self : hashMap_t t) : result (hashMap_t t) =
   let* v = hashMap_clear_loop t self.slots 0 in
   Return { self with num_entries = 0; slots = v }
 
-(** [hashmap::HashMap::{0}::len]: forward function *)
+(** [hashmap::{hashmap::HashMap<T>}::len]: forward function
+    Source: 'src/hashmap.rs', lines 90:4-90:30 *)
 let hashMap_len (t : Type0) (self : hashMap_t t) : result usize =
   Return self.num_entries
 
-(** [hashmap::HashMap::{0}::insert_in_list]: loop 0: forward function *)
+(** [hashmap::{hashmap::HashMap<T>}::insert_in_list]: loop 0: forward function
+    Source: 'src/hashmap.rs', lines 97:4-114:5 *)
 let rec hashMap_insert_in_list_loop
   (t : Type0) (key : usize) (value : t) (ls : list_t t) :
   Tot (result bool)
@@ -95,12 +104,14 @@ let rec hashMap_insert_in_list_loop
   | List_Nil -> Return true
   end
 
-(** [hashmap::HashMap::{0}::insert_in_list]: forward function *)
+(** [hashmap::{hashmap::HashMap<T>}::insert_in_list]: forward function
+    Source: 'src/hashmap.rs', lines 97:4-97:71 *)
 let hashMap_insert_in_list
   (t : Type0) (key : usize) (value : t) (ls : list_t t) : result bool =
   hashMap_insert_in_list_loop t key value ls
 
-(** [hashmap::HashMap::{0}::insert_in_list]: loop 0: backward function 0 *)
+(** [hashmap::{hashmap::HashMap<T>}::insert_in_list]: loop 0: backward function 0
+    Source: 'src/hashmap.rs', lines 97:4-114:5 *)
 let rec hashMap_insert_in_list_loop_back
   (t : Type0) (key : usize) (value : t) (ls : list_t t) :
   Tot (result (list_t t))
@@ -116,13 +127,15 @@ let rec hashMap_insert_in_list_loop_back
   | List_Nil -> let l = List_Nil in Return (List_Cons key value l)
   end
 
-(** [hashmap::HashMap::{0}::insert_in_list]: backward function 0 *)
+(** [hashmap::{hashmap::HashMap<T>}::insert_in_list]: backward function 0
+    Source: 'src/hashmap.rs', lines 97:4-97:71 *)
 let hashMap_insert_in_list_back
   (t : Type0) (key : usize) (value : t) (ls : list_t t) : result (list_t t) =
   hashMap_insert_in_list_loop_back t key value ls
 
-(** [hashmap::HashMap::{0}::insert_no_resize]: merged forward/backward function
-    (there is a single backward function, and the forward function returns ()) *)
+(** [hashmap::{hashmap::HashMap<T>}::insert_no_resize]: merged forward/backward function
+    (there is a single backward function, and the forward function returns ())
+    Source: 'src/hashmap.rs', lines 117:4-117:54 *)
 let hashMap_insert_no_resize
   (t : Type0) (self : hashMap_t t) (key : usize) (value : t) :
   result (hashMap_t t)
@@ -132,8 +145,8 @@ let hashMap_insert_no_resize
   let* hash_mod = usize_rem hash i in
   let* l =
     alloc_vec_Vec_index_mut (list_t t) usize
-      (core_slice_index_usize_coresliceindexSliceIndexInst (list_t t))
-      self.slots hash_mod in
+      (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) self.slots
+      hash_mod in
   let* inserted = hashMap_insert_in_list t key value l in
   if inserted
   then
@@ -141,19 +154,20 @@ let hashMap_insert_no_resize
     let* l0 = hashMap_insert_in_list_back t key value l in
     let* v =
       alloc_vec_Vec_index_mut_back (list_t t) usize
-        (core_slice_index_usize_coresliceindexSliceIndexInst (list_t t))
-        self.slots hash_mod l0 in
+        (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) self.slots
+        hash_mod l0 in
     Return { self with num_entries = i0; slots = v }
   else
     let* l0 = hashMap_insert_in_list_back t key value l in
     let* v =
       alloc_vec_Vec_index_mut_back (list_t t) usize
-        (core_slice_index_usize_coresliceindexSliceIndexInst (list_t t))
-        self.slots hash_mod l0 in
+        (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) self.slots
+        hash_mod l0 in
     Return { self with slots = v }
 
-(** [hashmap::HashMap::{0}::move_elements_from_list]: loop 0: merged forward/backward function
-    (there is a single backward function, and the forward function returns ()) *)
+(** [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: loop 0: merged forward/backward function
+    (there is a single backward function, and the forward function returns ())
+    Source: 'src/hashmap.rs', lines 183:4-196:5 *)
 let rec hashMap_move_elements_from_list_loop
   (t : Type0) (ntable : hashMap_t t) (ls : list_t t) :
   Tot (result (hashMap_t t))
@@ -166,14 +180,16 @@ let rec hashMap_move_elements_from_list_loop
   | List_Nil -> Return ntable
   end
 
-(** [hashmap::HashMap::{0}::move_elements_from_list]: merged forward/backward function
-    (there is a single backward function, and the forward function returns ()) *)
+(** [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: merged forward/backward function
+    (there is a single backward function, and the forward function returns ())
+    Source: 'src/hashmap.rs', lines 183:4-183:72 *)
 let hashMap_move_elements_from_list
   (t : Type0) (ntable : hashMap_t t) (ls : list_t t) : result (hashMap_t t) =
   hashMap_move_elements_from_list_loop t ntable ls
 
-(** [hashmap::HashMap::{0}::move_elements]: loop 0: merged forward/backward function
-    (there is a single backward function, and the forward function returns ()) *)
+(** [hashmap::{hashmap::HashMap<T>}::move_elements]: loop 0: merged forward/backward function
+    (there is a single backward function, and the forward function returns ())
+    Source: 'src/hashmap.rs', lines 171:4-180:5 *)
 let rec hashMap_move_elements_loop
   (t : Type0) (ntable : hashMap_t t) (slots : alloc_vec_Vec (list_t t))
   (i : usize) :
@@ -185,21 +201,20 @@ let rec hashMap_move_elements_loop
   then
     let* l =
       alloc_vec_Vec_index_mut (list_t t) usize
-        (core_slice_index_usize_coresliceindexSliceIndexInst (list_t t)) slots
-        i in
+        (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) slots i in
     let ls = core_mem_replace (list_t t) l List_Nil in
     let* ntable0 = hashMap_move_elements_from_list t ntable ls in
     let* i1 = usize_add i 1 in
     let l0 = core_mem_replace_back (list_t t) l List_Nil in
     let* slots0 =
       alloc_vec_Vec_index_mut_back (list_t t) usize
-        (core_slice_index_usize_coresliceindexSliceIndexInst (list_t t)) slots
-        i l0 in
+        (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) slots i l0 in
     hashMap_move_elements_loop t ntable0 slots0 i1
   else Return (ntable, slots)
 
-(** [hashmap::HashMap::{0}::move_elements]: merged forward/backward function
-    (there is a single backward function, and the forward function returns ()) *)
+(** [hashmap::{hashmap::HashMap<T>}::move_elements]: merged forward/backward function
+    (there is a single backward function, and the forward function returns ())
+    Source: 'src/hashmap.rs', lines 171:4-171:95 *)
 let hashMap_move_elements
   (t : Type0) (ntable : hashMap_t t) (slots : alloc_vec_Vec (list_t t))
   (i : usize) :
@@ -207,8 +222,9 @@ let hashMap_move_elements
   =
   hashMap_move_elements_loop t ntable slots i
 
-(** [hashmap::HashMap::{0}::try_resize]: merged forward/backward function
-    (there is a single backward function, and the forward function returns ()) *)
+(** [hashmap::{hashmap::HashMap<T>}::try_resize]: merged forward/backward function
+    (there is a single backward function, and the forward function returns ())
+    Source: 'src/hashmap.rs', lines 140:4-140:28 *)
 let hashMap_try_resize
   (t : Type0) (self : hashMap_t t) : result (hashMap_t t) =
   let* max_usize = scalar_cast U32 Usize core_u32_max in
@@ -226,8 +242,9 @@ let hashMap_try_resize
       }
   else Return { self with max_load_factor = (i, i0) }
 
-(** [hashmap::HashMap::{0}::insert]: merged forward/backward function
-    (there is a single backward function, and the forward function returns ()) *)
+(** [hashmap::{hashmap::HashMap<T>}::insert]: merged forward/backward function
+    (there is a single backward function, and the forward function returns ())
+    Source: 'src/hashmap.rs', lines 129:4-129:48 *)
 let hashMap_insert
   (t : Type0) (self : hashMap_t t) (key : usize) (value : t) :
   result (hashMap_t t)
@@ -236,7 +253,8 @@ let hashMap_insert
   let* i = hashMap_len t self0 in
   if i > self0.max_load then hashMap_try_resize t self0 else Return self0
 
-(** [hashmap::HashMap::{0}::contains_key_in_list]: loop 0: forward function *)
+(** [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: loop 0: forward function
+    Source: 'src/hashmap.rs', lines 206:4-219:5 *)
 let rec hashMap_contains_key_in_list_loop
   (t : Type0) (key : usize) (ls : list_t t) :
   Tot (result bool)
@@ -250,12 +268,14 @@ let rec hashMap_contains_key_in_list_loop
   | List_Nil -> Return false
   end
 
-(** [hashmap::HashMap::{0}::contains_key_in_list]: forward function *)
+(** [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: forward function
+    Source: 'src/hashmap.rs', lines 206:4-206:68 *)
 let hashMap_contains_key_in_list
   (t : Type0) (key : usize) (ls : list_t t) : result bool =
   hashMap_contains_key_in_list_loop t key ls
 
-(** [hashmap::HashMap::{0}::contains_key]: forward function *)
+(** [hashmap::{hashmap::HashMap<T>}::contains_key]: forward function
+    Source: 'src/hashmap.rs', lines 199:4-199:49 *)
 let hashMap_contains_key
   (t : Type0) (self : hashMap_t t) (key : usize) : result bool =
   let* hash = hash_key key in
@@ -263,11 +283,12 @@ let hashMap_contains_key
   let* hash_mod = usize_rem hash i in
   let* l =
     alloc_vec_Vec_index (list_t t) usize
-      (core_slice_index_usize_coresliceindexSliceIndexInst (list_t t))
-      self.slots hash_mod in
+      (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) self.slots
+      hash_mod in
   hashMap_contains_key_in_list t key l
 
-(** [hashmap::HashMap::{0}::get_in_list]: loop 0: forward function *)
+(** [hashmap::{hashmap::HashMap<T>}::get_in_list]: loop 0: forward function
+    Source: 'src/hashmap.rs', lines 224:4-237:5 *)
 let rec hashMap_get_in_list_loop
   (t : Type0) (key : usize) (ls : list_t t) :
   Tot (result t) (decreases (hashMap_get_in_list_loop_decreases t key ls))
@@ -278,22 +299,25 @@ let rec hashMap_get_in_list_loop
   | List_Nil -> Fail Failure
   end
 
-(** [hashmap::HashMap::{0}::get_in_list]: forward function *)
+(** [hashmap::{hashmap::HashMap<T>}::get_in_list]: forward function
+    Source: 'src/hashmap.rs', lines 224:4-224:70 *)
 let hashMap_get_in_list (t : Type0) (key : usize) (ls : list_t t) : result t =
   hashMap_get_in_list_loop t key ls
 
-(** [hashmap::HashMap::{0}::get]: forward function *)
+(** [hashmap::{hashmap::HashMap<T>}::get]: forward function
+    Source: 'src/hashmap.rs', lines 239:4-239:55 *)
 let hashMap_get (t : Type0) (self : hashMap_t t) (key : usize) : result t =
   let* hash = hash_key key in
   let i = alloc_vec_Vec_len (list_t t) self.slots in
   let* hash_mod = usize_rem hash i in
   let* l =
     alloc_vec_Vec_index (list_t t) usize
-      (core_slice_index_usize_coresliceindexSliceIndexInst (list_t t))
-      self.slots hash_mod in
+      (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) self.slots
+      hash_mod in
   hashMap_get_in_list t key l
 
-(** [hashmap::HashMap::{0}::get_mut_in_list]: loop 0: forward function *)
+(** [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: loop 0: forward function
+    Source: 'src/hashmap.rs', lines 245:4-254:5 *)
 let rec hashMap_get_mut_in_list_loop
   (t : Type0) (ls : list_t t) (key : usize) :
   Tot (result t) (decreases (hashMap_get_mut_in_list_loop_decreases t ls key))
@@ -304,12 +328,14 @@ let rec hashMap_get_mut_in_list_loop
   | List_Nil -> Fail Failure
   end
 
-(** [hashmap::HashMap::{0}::get_mut_in_list]: forward function *)
+(** [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: forward function
+    Source: 'src/hashmap.rs', lines 245:4-245:86 *)
 let hashMap_get_mut_in_list
   (t : Type0) (ls : list_t t) (key : usize) : result t =
   hashMap_get_mut_in_list_loop t ls key
 
-(** [hashmap::HashMap::{0}::get_mut_in_list]: loop 0: backward function 0 *)
+(** [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: loop 0: backward function 0
+    Source: 'src/hashmap.rs', lines 245:4-254:5 *)
 let rec hashMap_get_mut_in_list_loop_back
   (t : Type0) (ls : list_t t) (key : usize) (ret : t) :
   Tot (result (list_t t))
@@ -325,23 +351,26 @@ let rec hashMap_get_mut_in_list_loop_back
   | List_Nil -> Fail Failure
   end
 
-(** [hashmap::HashMap::{0}::get_mut_in_list]: backward function 0 *)
+(** [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: backward function 0
+    Source: 'src/hashmap.rs', lines 245:4-245:86 *)
 let hashMap_get_mut_in_list_back
   (t : Type0) (ls : list_t t) (key : usize) (ret : t) : result (list_t t) =
   hashMap_get_mut_in_list_loop_back t ls key ret
 
-(** [hashmap::HashMap::{0}::get_mut]: forward function *)
+(** [hashmap::{hashmap::HashMap<T>}::get_mut]: forward function
+    Source: 'src/hashmap.rs', lines 257:4-257:67 *)
 let hashMap_get_mut (t : Type0) (self : hashMap_t t) (key : usize) : result t =
   let* hash = hash_key key in
   let i = alloc_vec_Vec_len (list_t t) self.slots in
   let* hash_mod = usize_rem hash i in
   let* l =
     alloc_vec_Vec_index_mut (list_t t) usize
-      (core_slice_index_usize_coresliceindexSliceIndexInst (list_t t))
-      self.slots hash_mod in
+      (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) self.slots
+      hash_mod in
   hashMap_get_mut_in_list t l key
 
-(** [hashmap::HashMap::{0}::get_mut]: backward function 0 *)
+(** [hashmap::{hashmap::HashMap<T>}::get_mut]: backward function 0
+    Source: 'src/hashmap.rs', lines 257:4-257:67 *)
 let hashMap_get_mut_back
   (t : Type0) (self : hashMap_t t) (key : usize) (ret : t) :
   result (hashMap_t t)
@@ -351,16 +380,17 @@ let hashMap_get_mut_back
   let* hash_mod = usize_rem hash i in
   let* l =
     alloc_vec_Vec_index_mut (list_t t) usize
-      (core_slice_index_usize_coresliceindexSliceIndexInst (list_t t))
-      self.slots hash_mod in
+      (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) self.slots
+      hash_mod in
   let* l0 = hashMap_get_mut_in_list_back t l key ret in
   let* v =
     alloc_vec_Vec_index_mut_back (list_t t) usize
-      (core_slice_index_usize_coresliceindexSliceIndexInst (list_t t))
-      self.slots hash_mod l0 in
+      (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) self.slots
+      hash_mod l0 in
   Return { self with slots = v }
 
-(** [hashmap::HashMap::{0}::remove_from_list]: loop 0: forward function *)
+(** [hashmap::{hashmap::HashMap<T>}::remove_from_list]: loop 0: forward function
+    Source: 'src/hashmap.rs', lines 265:4-291:5 *)
 let rec hashMap_remove_from_list_loop
   (t : Type0) (key : usize) (ls : list_t t) :
   Tot (result (option t))
@@ -379,12 +409,14 @@ let rec hashMap_remove_from_list_loop
   | List_Nil -> Return None
   end
 
-(** [hashmap::HashMap::{0}::remove_from_list]: forward function *)
+(** [hashmap::{hashmap::HashMap<T>}::remove_from_list]: forward function
+    Source: 'src/hashmap.rs', lines 265:4-265:69 *)
 let hashMap_remove_from_list
   (t : Type0) (key : usize) (ls : list_t t) : result (option t) =
   hashMap_remove_from_list_loop t key ls
 
-(** [hashmap::HashMap::{0}::remove_from_list]: loop 0: backward function 1 *)
+(** [hashmap::{hashmap::HashMap<T>}::remove_from_list]: loop 0: backward function 1
+    Source: 'src/hashmap.rs', lines 265:4-291:5 *)
 let rec hashMap_remove_from_list_loop_back
   (t : Type0) (key : usize) (ls : list_t t) :
   Tot (result (list_t t))
@@ -405,12 +437,14 @@ let rec hashMap_remove_from_list_loop_back
   | List_Nil -> Return List_Nil
   end
 
-(** [hashmap::HashMap::{0}::remove_from_list]: backward function 1 *)
+(** [hashmap::{hashmap::HashMap<T>}::remove_from_list]: backward function 1
+    Source: 'src/hashmap.rs', lines 265:4-265:69 *)
 let hashMap_remove_from_list_back
   (t : Type0) (key : usize) (ls : list_t t) : result (list_t t) =
   hashMap_remove_from_list_loop_back t key ls
 
-(** [hashmap::HashMap::{0}::remove]: forward function *)
+(** [hashmap::{hashmap::HashMap<T>}::remove]: forward function
+    Source: 'src/hashmap.rs', lines 294:4-294:52 *)
 let hashMap_remove
   (t : Type0) (self : hashMap_t t) (key : usize) : result (option t) =
   let* hash = hash_key key in
@@ -418,15 +452,16 @@ let hashMap_remove
   let* hash_mod = usize_rem hash i in
   let* l =
     alloc_vec_Vec_index_mut (list_t t) usize
-      (core_slice_index_usize_coresliceindexSliceIndexInst (list_t t))
-      self.slots hash_mod in
+      (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) self.slots
+      hash_mod in
   let* x = hashMap_remove_from_list t key l in
   begin match x with
   | None -> Return None
   | Some x0 -> let* _ = usize_sub self.num_entries 1 in Return (Some x0)
   end
 
-(** [hashmap::HashMap::{0}::remove]: backward function 0 *)
+(** [hashmap::{hashmap::HashMap<T>}::remove]: backward function 0
+    Source: 'src/hashmap.rs', lines 294:4-294:52 *)
 let hashMap_remove_back
   (t : Type0) (self : hashMap_t t) (key : usize) : result (hashMap_t t) =
   let* hash = hash_key key in
@@ -434,28 +469,29 @@ let hashMap_remove_back
   let* hash_mod = usize_rem hash i in
   let* l =
     alloc_vec_Vec_index_mut (list_t t) usize
-      (core_slice_index_usize_coresliceindexSliceIndexInst (list_t t))
-      self.slots hash_mod in
+      (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) self.slots
+      hash_mod in
   let* x = hashMap_remove_from_list t key l in
   begin match x with
   | None ->
     let* l0 = hashMap_remove_from_list_back t key l in
     let* v =
       alloc_vec_Vec_index_mut_back (list_t t) usize
-        (core_slice_index_usize_coresliceindexSliceIndexInst (list_t t))
-        self.slots hash_mod l0 in
+        (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) self.slots
+        hash_mod l0 in
     Return { self with slots = v }
   | Some x0 ->
     let* i0 = usize_sub self.num_entries 1 in
     let* l0 = hashMap_remove_from_list_back t key l in
     let* v =
       alloc_vec_Vec_index_mut_back (list_t t) usize
-        (core_slice_index_usize_coresliceindexSliceIndexInst (list_t t))
-        self.slots hash_mod l0 in
+        (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) self.slots
+        hash_mod l0 in
     Return { self with num_entries = i0; slots = v }
   end
 
-(** [hashmap::test1]: forward function *)
+(** [hashmap::test1]: forward function
+    Source: 'src/hashmap.rs', lines 315:0-315:10 *)
 let test1 : result unit =
   let* hm = hashMap_new u64 in
   let* hm0 = hashMap_insert u64 hm 0 42 in
diff --git a/tests/fstar/hashmap/Hashmap.Types.fst b/tests/fstar/hashmap/Hashmap.Types.fst
index 753730fe..ef96b1e9 100644
--- a/tests/fstar/hashmap/Hashmap.Types.fst
+++ b/tests/fstar/hashmap/Hashmap.Types.fst
@@ -5,12 +5,14 @@ open Primitives
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
-(** [hashmap::List] *)
+(** [hashmap::List]
+    Source: 'src/hashmap.rs', lines 19:0-19:16 *)
 type list_t (t : Type0) =
 | List_Cons : usize -> t -> list_t t -> list_t t
 | List_Nil : list_t t
 
-(** [hashmap::HashMap] *)
+(** [hashmap::HashMap]
+    Source: 'src/hashmap.rs', lines 35:0-35:21 *)
 type hashMap_t (t : Type0) =
 {
   num_entries : usize;
diff --git a/tests/fstar/hashmap/Primitives.fst b/tests/fstar/hashmap/Primitives.fst
index 3297803c..94322ead 100644
--- a/tests/fstar/hashmap/Primitives.fst
+++ b/tests/fstar/hashmap/Primitives.fst
@@ -351,14 +351,14 @@ let alloc_boxed_Box_deref_mut (t : Type0) (x : t) : result t = Return x
 let alloc_boxed_Box_deref_mut_back (t : Type) (_ : t) (x : t) : result t = Return x
 
 // Trait instance
-let alloc_boxed_Box_coreOpsDerefInst (self : Type0) : core_ops_deref_Deref self = {
+let alloc_boxed_Box_coreopsDerefInst (self : Type0) : core_ops_deref_Deref self = {
   target = self;
   deref = alloc_boxed_Box_deref self;
 }
 
 // Trait instance
-let alloc_boxed_Box_coreOpsDerefMutInst (self : Type0) : core_ops_deref_DerefMut self = {
-  derefInst = alloc_boxed_Box_coreOpsDerefInst self;
+let alloc_boxed_Box_coreopsDerefMutInst (self : Type0) : core_ops_deref_DerefMut self = {
+  derefInst = alloc_boxed_Box_coreopsDerefInst self;
   deref_mut = alloc_boxed_Box_deref_mut self;
   deref_mut_back = alloc_boxed_Box_deref_mut_back self;
 }
@@ -483,23 +483,23 @@ let core_slice_index_Slice_index
   | Some x -> Return x
 
 // [core::slice::index::Range:::get]: forward function
-let core_slice_index_Range_get (t : Type0) (i : core_ops_range_Range usize) (s : slice t) :
+let core_slice_index_RangeUsize_get (t : Type0) (i : core_ops_range_Range usize) (s : slice t) :
   result (option (slice t)) =
   admit () // TODO
 
 // [core::slice::index::Range::get_mut]: forward function
-let core_slice_index_Range_get_mut
+let core_slice_index_RangeUsize_get_mut
   (t : Type0) : core_ops_range_Range usize → slice t → result (option (slice t)) =
   admit () // TODO
 
 // [core::slice::index::Range::get_mut]: backward function 0
-let core_slice_index_Range_get_mut_back
+let core_slice_index_RangeUsize_get_mut_back
   (t : Type0) :
   core_ops_range_Range usize → slice t → option (slice t) → result (slice t) =
   admit () // TODO
 
 // [core::slice::index::Range::get_unchecked]: forward function
-let core_slice_index_Range_get_unchecked
+let core_slice_index_RangeUsize_get_unchecked
   (t : Type0) :
   core_ops_range_Range usize → const_raw_ptr (slice t) → result (const_raw_ptr (slice t)) =
   // Don't know what the model should be - for now we always fail to make
@@ -507,7 +507,7 @@ let core_slice_index_Range_get_unchecked
   fun _ _ -> Fail Failure
 
 // [core::slice::index::Range::get_unchecked_mut]: forward function
-let core_slice_index_Range_get_unchecked_mut
+let core_slice_index_RangeUsize_get_unchecked_mut
   (t : Type0) :
   core_ops_range_Range usize → mut_raw_ptr (slice t) → result (mut_raw_ptr (slice t)) =
   // Don't know what the model should be - for now we always fail to make
@@ -515,17 +515,17 @@ let core_slice_index_Range_get_unchecked_mut
   fun _ _ -> Fail Failure
 
 // [core::slice::index::Range::index]: forward function
-let core_slice_index_Range_index
+let core_slice_index_RangeUsize_index
   (t : Type0) : core_ops_range_Range usize → slice t → result (slice t) =
   admit () // TODO
 
 // [core::slice::index::Range::index_mut]: forward function
-let core_slice_index_Range_index_mut
+let core_slice_index_RangeUsize_index_mut
   (t : Type0) : core_ops_range_Range usize → slice t → result (slice t) =
   admit () // TODO
 
 // [core::slice::index::Range::index_mut]: backward function 0
-let core_slice_index_Range_index_mut_back
+let core_slice_index_RangeUsize_index_mut_back
   (t : Type0) : core_ops_range_Range usize → slice t → slice t → result (slice t) =
   admit () // TODO
 
@@ -559,44 +559,44 @@ let core_array_Array_index_mut_back
   (a : array t n) (i : idx) (x : inst.indexInst.output) : result (array t n) =
   admit () // TODO
 
-// Trait implementation: [core::slice::index::[T]]
-let core_slice_index_Slice_coreopsindexIndexInst (t idx : Type0)
-  (inst : core_slice_index_SliceIndex idx (slice t)) :
-  core_ops_index_Index (slice t) idx = {
-  output = inst.output;
-  index = core_slice_index_Slice_index t idx inst;
-}
-
 // Trait implementation: [core::slice::index::private_slice_index::Range]
-let core_slice_index_private_slice_index_Range_coresliceindexprivate_slice_indexSealedInst
+let core_slice_index_private_slice_index_SealedRangeUsizeInst
   : core_slice_index_private_slice_index_Sealed (core_ops_range_Range usize) = ()
 
 // Trait implementation: [core::slice::index::Range]
-let core_slice_index_Range_coresliceindexSliceIndexInst (t : Type0) :
+let core_slice_index_SliceIndexRangeUsizeSliceTInst (t : Type0) :
   core_slice_index_SliceIndex (core_ops_range_Range usize) (slice t) = {
-  sealedInst = core_slice_index_private_slice_index_Range_coresliceindexprivate_slice_indexSealedInst;
+  sealedInst = core_slice_index_private_slice_index_SealedRangeUsizeInst;
   output = slice t;
-  get = core_slice_index_Range_get t;
-  get_mut = core_slice_index_Range_get_mut t;
-  get_mut_back = core_slice_index_Range_get_mut_back t;
-  get_unchecked = core_slice_index_Range_get_unchecked t;
-  get_unchecked_mut = core_slice_index_Range_get_unchecked_mut t;
-  index = core_slice_index_Range_index t;
-  index_mut = core_slice_index_Range_index_mut t;
-  index_mut_back = core_slice_index_Range_index_mut_back t;
+  get = core_slice_index_RangeUsize_get t;
+  get_mut = core_slice_index_RangeUsize_get_mut t;
+  get_mut_back = core_slice_index_RangeUsize_get_mut_back t;
+  get_unchecked = core_slice_index_RangeUsize_get_unchecked t;
+  get_unchecked_mut = core_slice_index_RangeUsize_get_unchecked_mut t;
+  index = core_slice_index_RangeUsize_index t;
+  index_mut = core_slice_index_RangeUsize_index_mut t;
+  index_mut_back = core_slice_index_RangeUsize_index_mut_back t;
+}
+
+// Trait implementation: [core::slice::index::[T]]
+let core_ops_index_IndexSliceTIInst (t idx : Type0)
+  (inst : core_slice_index_SliceIndex idx (slice t)) :
+  core_ops_index_Index (slice t) idx = {
+  output = inst.output;
+  index = core_slice_index_Slice_index t idx inst;
 }
 
 // Trait implementation: [core::slice::index::[T]]
-let core_slice_index_Slice_coreopsindexIndexMutInst (t idx : Type0)
+let core_ops_index_IndexMutSliceTIInst (t idx : Type0)
   (inst : core_slice_index_SliceIndex idx (slice t)) :
   core_ops_index_IndexMut (slice t) idx = {
-  indexInst = core_slice_index_Slice_coreopsindexIndexInst t idx inst;
+  indexInst = core_ops_index_IndexSliceTIInst t idx inst;
   index_mut = core_slice_index_Slice_index_mut t idx inst;
   index_mut_back = core_slice_index_Slice_index_mut_back t idx inst;
 }
 
 // Trait implementation: [core::array::[T; N]]
-let core_array_Array_coreopsindexIndexInst (t idx : Type0) (n : usize)
+let core_ops_index_IndexArrayInst (t idx : Type0) (n : usize)
   (inst : core_ops_index_Index (slice t) idx) :
   core_ops_index_Index (array t n) idx = {
   output = inst.output;
@@ -604,10 +604,10 @@ let core_array_Array_coreopsindexIndexInst (t idx : Type0) (n : usize)
 }
 
 // Trait implementation: [core::array::[T; N]]
-let core_array_Array_coreopsindexIndexMutInst (t idx : Type0) (n : usize)
+let core_ops_index_IndexMutArrayIInst (t idx : Type0) (n : usize)
   (inst : core_ops_index_IndexMut (slice t) idx) :
   core_ops_index_IndexMut (array t n) idx = {
-  indexInst = core_array_Array_coreopsindexIndexInst t idx n inst.indexInst;
+  indexInst = core_ops_index_IndexArrayInst t idx n inst.indexInst;
   index_mut = core_array_Array_index_mut t idx n inst;
   index_mut_back = core_array_Array_index_mut_back t idx n inst;
 }
@@ -651,13 +651,13 @@ let core_slice_index_usize_index_mut_back
   admit () // TODO
 
 // Trait implementation: [core::slice::index::private_slice_index::usize]
-let core_slice_index_private_slice_index_usize_coresliceindexprivate_slice_indexSealedInst
+let core_slice_index_private_slice_index_SealedUsizeInst
   : core_slice_index_private_slice_index_Sealed usize = ()
 
 // Trait implementation: [core::slice::index::usize]
-let core_slice_index_usize_coresliceindexSliceIndexInst (t : Type0) :
+let core_slice_index_SliceIndexUsizeSliceTInst (t : Type0) :
   core_slice_index_SliceIndex usize (slice t) = {
-  sealedInst = core_slice_index_private_slice_index_usize_coresliceindexprivate_slice_indexSealedInst;
+  sealedInst = core_slice_index_private_slice_index_SealedUsizeInst;
   output = t;
   get = core_slice_index_usize_get t;
   get_mut = core_slice_index_usize_get_mut t;
@@ -706,24 +706,24 @@ let alloc_vec_Vec_coreopsindexIndexMutInst (t idx : Type0)
 
 let alloc_vec_Vec_index_eq (#a : Type0) (v : alloc_vec_Vec a) (i : usize) :
   Lemma (
-    alloc_vec_Vec_index a usize (core_slice_index_usize_coresliceindexSliceIndexInst a) v i ==
+    alloc_vec_Vec_index a usize (core_slice_index_SliceIndexUsizeSliceTInst a) v i ==
       alloc_vec_Vec_index_usize v i)
-  [SMTPat (alloc_vec_Vec_index a usize (core_slice_index_usize_coresliceindexSliceIndexInst a) v i)]
+  [SMTPat (alloc_vec_Vec_index a usize (core_slice_index_SliceIndexUsizeSliceTInst a) v i)]
   =
   admit()
 
 let alloc_vec_Vec_index_mut_eq (#a : Type0) (v : alloc_vec_Vec a) (i : usize) :
   Lemma (
-    alloc_vec_Vec_index_mut a usize (core_slice_index_usize_coresliceindexSliceIndexInst a) v i ==
+    alloc_vec_Vec_index_mut a usize (core_slice_index_SliceIndexUsizeSliceTInst a) v i ==
       alloc_vec_Vec_index_usize v i)
-  [SMTPat (alloc_vec_Vec_index_mut a usize (core_slice_index_usize_coresliceindexSliceIndexInst a) v i)]
+  [SMTPat (alloc_vec_Vec_index_mut a usize (core_slice_index_SliceIndexUsizeSliceTInst a) v i)]
   =
   admit()
 
 let alloc_vec_Vec_index_mut_back_eq (#a : Type0) (v : alloc_vec_Vec a) (i : usize) (x : a) :
   Lemma (
-    alloc_vec_Vec_index_mut_back a usize (core_slice_index_usize_coresliceindexSliceIndexInst a) v i x ==
+    alloc_vec_Vec_index_mut_back a usize (core_slice_index_SliceIndexUsizeSliceTInst a) v i x ==
       alloc_vec_Vec_update_usize v i x)
-  [SMTPat (alloc_vec_Vec_index_mut_back a usize (core_slice_index_usize_coresliceindexSliceIndexInst a) v i x)]
+  [SMTPat (alloc_vec_Vec_index_mut_back a usize (core_slice_index_SliceIndexUsizeSliceTInst a) v i x)]
   =
   admit()