Merge pull request #68 from AeneasVerif/son/update_lean

Update Lean to v4.6.0-rc1

6 files changed, 132 insertions, 132 deletions

diff --git a/tests/fstar/array/Array.Clauses.Template.fst b/tests/fstar/arrays/Arrays.Clauses.Template.fst
index b2f2649c..8cc32583 100644
--- a/tests/fstar/array/Array.Clauses.Template.fst
+++ b/tests/fstar/arrays/Arrays.Clauses.Template.fst
@@ -1,19 +1,19 @@
 (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [array]: templates for the decreases clauses *)
-module Array.Clauses.Template
+(** [arrays]: templates for the decreases clauses *)
+module Arrays.Clauses.Template
 open Primitives
-open Array.Types
+open Arrays.Types
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
-(** [array::sum]: decreases clause
-    Source: 'src/array.rs', lines 242:0-250:1 *)
+(** [arrays::sum]: decreases clause
+    Source: 'src/arrays.rs', lines 242:0-250:1 *)
 unfold
 let sum_loop_decreases (s : slice u32) (sum1 : u32) (i : usize) : nat =
   admit ()
 
-(** [array::sum2]: decreases clause
-    Source: 'src/array.rs', lines 252:0-261:1 *)
+(** [arrays::sum2]: decreases clause
+    Source: 'src/arrays.rs', lines 252:0-261:1 *)
 unfold
 let sum2_loop_decreases (s : slice u32) (s2 : slice u32) (sum1 : u32)
   (i : usize) : nat =
diff --git a/tests/fstar/array/Array.Clauses.fst b/tests/fstar/arrays/Arrays.Clauses.fst
index 68cbf216..aca328c2 100644
--- a/tests/fstar/array/Array.Clauses.fst
+++ b/tests/fstar/arrays/Arrays.Clauses.fst
@@ -1,17 +1,17 @@
-(** [array]: decreases clauses *)
-module Array.Clauses
+(** [arrays]: decreases clauses *)
+module Arrays.Clauses
 open Primitives
-open Array.Types
+open Arrays.Types
 open FStar.List.Tot
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
-(** [array::sum]: decreases clause *)
+(** [arrays::sum]: decreases clause *)
 unfold
 let sum_loop_decreases (s : slice u32) (sum : u32) (i : usize) : nat =
   if i < length s then length s - i else 0
 
-(** [array::sum2]: decreases clause *)
+(** [arrays::sum2]: decreases clause *)
 unfold
 let sum2_loop_decreases (s : slice u32) (s2 : slice u32) (sum : u32)
   (i : usize) : nat =
diff --git a/tests/fstar/array/Array.Funs.fst b/tests/fstar/arrays/Arrays.Funs.fst
index 4193ba7d..b0df7fc2 100644
--- a/tests/fstar/array/Array.Funs.fst
+++ b/tests/fstar/arrays/Arrays.Funs.fst
@@ -1,24 +1,24 @@
 (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [array]: function definitions *)
-module Array.Funs
+(** [arrays]: function definitions *)
+module Arrays.Funs
 open Primitives
-include Array.Types
-include Array.Clauses
+include Arrays.Types
+include Arrays.Clauses
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
-(** [array::incr]:
-    Source: 'src/array.rs', lines 8:0-8:24 *)
+(** [arrays::incr]:
+    Source: 'src/arrays.rs', lines 8:0-8:24 *)
 let incr (x : u32) : result u32 =
   u32_add x 1
 
-(** [array::array_to_shared_slice_]:
-    Source: 'src/array.rs', lines 16:0-16:53 *)
+(** [arrays::array_to_shared_slice_]:
+    Source: 'src/arrays.rs', lines 16:0-16:53 *)
 let array_to_shared_slice_ (t : Type0) (s : array t 32) : result (slice t) =
   array_to_slice t 32 s
 
-(** [array::array_to_mut_slice_]:
-    Source: 'src/array.rs', lines 21:0-21:58 *)
+(** [arrays::array_to_mut_slice_]:
+    Source: 'src/arrays.rs', lines 21:0-21:58 *)
 let array_to_mut_slice_
   (t : Type0) (s : array t 32) :
   result ((slice t) & (slice t -> result (array t 32)))
@@ -26,38 +26,38 @@ let array_to_mut_slice_
   let* (s1, to_slice_mut_back) = array_to_slice_mut t 32 s in
   Return (s1, to_slice_mut_back)
 
-(** [array::array_len]:
-    Source: 'src/array.rs', lines 25:0-25:40 *)
+(** [arrays::array_len]:
+    Source: 'src/arrays.rs', lines 25:0-25:40 *)
 let array_len (t : Type0) (s : array t 32) : result usize =
   let* s1 = array_to_slice t 32 s in let i = slice_len t s1 in Return i
 
-(** [array::shared_array_len]:
-    Source: 'src/array.rs', lines 29:0-29:48 *)
+(** [arrays::shared_array_len]:
+    Source: 'src/arrays.rs', lines 29:0-29:48 *)
 let shared_array_len (t : Type0) (s : array t 32) : result usize =
   let* s1 = array_to_slice t 32 s in let i = slice_len t s1 in Return i
 
-(** [array::shared_slice_len]:
-    Source: 'src/array.rs', lines 33:0-33:44 *)
+(** [arrays::shared_slice_len]:
+    Source: 'src/arrays.rs', lines 33:0-33:44 *)
 let shared_slice_len (t : Type0) (s : slice t) : result usize =
   let i = slice_len t s in Return i
 
-(** [array::index_array_shared]:
-    Source: 'src/array.rs', lines 37:0-37:57 *)
+(** [arrays::index_array_shared]:
+    Source: 'src/arrays.rs', lines 37:0-37:57 *)
 let index_array_shared (t : Type0) (s : array t 32) (i : usize) : result t =
   array_index_usize t 32 s i
 
-(** [array::index_array_u32]:
-    Source: 'src/array.rs', lines 44:0-44:53 *)
+(** [arrays::index_array_u32]:
+    Source: 'src/arrays.rs', lines 44:0-44:53 *)
 let index_array_u32 (s : array u32 32) (i : usize) : result u32 =
   array_index_usize u32 32 s i
 
-(** [array::index_array_copy]:
-    Source: 'src/array.rs', lines 48:0-48:45 *)
+(** [arrays::index_array_copy]:
+    Source: 'src/arrays.rs', lines 48:0-48:45 *)
 let index_array_copy (x : array u32 32) : result u32 =
   array_index_usize u32 32 x 0
 
-(** [array::index_mut_array]:
-    Source: 'src/array.rs', lines 52:0-52:62 *)
+(** [arrays::index_mut_array]:
+    Source: 'src/arrays.rs', lines 52:0-52:62 *)
 let index_mut_array
   (t : Type0) (s : array t 32) (i : usize) :
   result (t & (t -> result (array t 32)))
@@ -65,13 +65,13 @@ let index_mut_array
   let* (x, index_mut_back) = array_index_mut_usize t 32 s i in
   Return (x, index_mut_back)
 
-(** [array::index_slice]:
-    Source: 'src/array.rs', lines 56:0-56:46 *)
+(** [arrays::index_slice]:
+    Source: 'src/arrays.rs', lines 56:0-56:46 *)
 let index_slice (t : Type0) (s : slice t) (i : usize) : result t =
   slice_index_usize t s i
 
-(** [array::index_mut_slice]:
-    Source: 'src/array.rs', lines 60:0-60:58 *)
+(** [arrays::index_mut_slice]:
+    Source: 'src/arrays.rs', lines 60:0-60:58 *)
 let index_mut_slice
   (t : Type0) (s : slice t) (i : usize) :
   result (t & (t -> result (slice t)))
@@ -79,16 +79,16 @@ let index_mut_slice
   let* (x, index_mut_back) = slice_index_mut_usize t s i in
   Return (x, index_mut_back)
 
-(** [array::slice_subslice_shared_]:
-    Source: 'src/array.rs', lines 64:0-64:70 *)
+(** [arrays::slice_subslice_shared_]:
+    Source: 'src/arrays.rs', lines 64:0-64:70 *)
 let slice_subslice_shared_
   (x : slice u32) (y : usize) (z : usize) : result (slice u32) =
   core_slice_index_Slice_index u32 (core_ops_range_Range usize)
     (core_slice_index_SliceIndexRangeUsizeSliceTInst u32) x
     { start = y; end_ = z }
 
-(** [array::slice_subslice_mut_]:
-    Source: 'src/array.rs', lines 68:0-68:75 *)
+(** [arrays::slice_subslice_mut_]:
+    Source: 'src/arrays.rs', lines 68:0-68:75 *)
 let slice_subslice_mut_
   (x : slice u32) (y : usize) (z : usize) :
   result ((slice u32) & (slice u32 -> result (slice u32)))
@@ -99,13 +99,13 @@ let slice_subslice_mut_
       { start = y; end_ = z } in
   Return (s, index_mut_back)
 
-(** [array::array_to_slice_shared_]:
-    Source: 'src/array.rs', lines 72:0-72:54 *)
+(** [arrays::array_to_slice_shared_]:
+    Source: 'src/arrays.rs', lines 72:0-72:54 *)
 let array_to_slice_shared_ (x : array u32 32) : result (slice u32) =
   array_to_slice u32 32 x
 
-(** [array::array_to_slice_mut_]:
-    Source: 'src/array.rs', lines 76:0-76:59 *)
+(** [arrays::array_to_slice_mut_]:
+    Source: 'src/arrays.rs', lines 76:0-76:59 *)
 let array_to_slice_mut_
   (x : array u32 32) :
   result ((slice u32) & (slice u32 -> result (array u32 32)))
@@ -113,8 +113,8 @@ let array_to_slice_mut_
   let* (s, to_slice_mut_back) = array_to_slice_mut u32 32 x in
   Return (s, to_slice_mut_back)
 
-(** [array::array_subslice_shared_]:
-    Source: 'src/array.rs', lines 80:0-80:74 *)
+(** [arrays::array_subslice_shared_]:
+    Source: 'src/arrays.rs', lines 80:0-80:74 *)
 let array_subslice_shared_
   (x : array u32 32) (y : usize) (z : usize) : result (slice u32) =
   core_array_Array_index u32 (core_ops_range_Range usize) 32
@@ -122,8 +122,8 @@ let array_subslice_shared_
     (core_slice_index_SliceIndexRangeUsizeSliceTInst u32)) x
     { start = y; end_ = z }
 
-(** [array::array_subslice_mut_]:
-    Source: 'src/array.rs', lines 84:0-84:79 *)
+(** [arrays::array_subslice_mut_]:
+    Source: 'src/arrays.rs', lines 84:0-84:79 *)
 let array_subslice_mut_
   (x : array u32 32) (y : usize) (z : usize) :
   result ((slice u32) & (slice u32 -> result (array u32 32)))
@@ -135,25 +135,25 @@ let array_subslice_mut_
       { start = y; end_ = z } in
   Return (s, index_mut_back)
 
-(** [array::index_slice_0]:
-    Source: 'src/array.rs', lines 88:0-88:38 *)
+(** [arrays::index_slice_0]:
+    Source: 'src/arrays.rs', lines 88:0-88:38 *)
 let index_slice_0 (t : Type0) (s : slice t) : result t =
   slice_index_usize t s 0
 
-(** [array::index_array_0]:
-    Source: 'src/array.rs', lines 92:0-92:42 *)
+(** [arrays::index_array_0]:
+    Source: 'src/arrays.rs', lines 92:0-92:42 *)
 let index_array_0 (t : Type0) (s : array t 32) : result t =
   array_index_usize t 32 s 0
 
-(** [array::index_index_array]:
-    Source: 'src/array.rs', lines 103:0-103:71 *)
+(** [arrays::index_index_array]:
+    Source: 'src/arrays.rs', lines 103:0-103:71 *)
 let index_index_array
   (s : array (array u32 32) 32) (i : usize) (j : usize) : result u32 =
   let* a = array_index_usize (array u32 32) 32 s i in
   array_index_usize u32 32 a j
 
-(** [array::update_update_array]:
-    Source: 'src/array.rs', lines 114:0-114:70 *)
+(** [arrays::update_update_array]:
+    Source: 'src/arrays.rs', lines 114:0-114:70 *)
 let update_update_array
   (s : array (array u32 32) 32) (i : usize) (j : usize) : result unit =
   let* (a, index_mut_back) = array_index_mut_usize (array u32 32) 32 s i in
@@ -162,43 +162,43 @@ let update_update_array
   let* _ = index_mut_back a1 in
   Return ()
 
-(** [array::array_local_deep_copy]:
-    Source: 'src/array.rs', lines 118:0-118:43 *)
+(** [arrays::array_local_deep_copy]:
+    Source: 'src/arrays.rs', lines 118:0-118:43 *)
 let array_local_deep_copy (x : array u32 32) : result unit =
   Return ()
 
-(** [array::take_array]:
-    Source: 'src/array.rs', lines 122:0-122:30 *)
+(** [arrays::take_array]:
+    Source: 'src/arrays.rs', lines 122:0-122:30 *)
 let take_array (a : array u32 2) : result unit =
   Return ()
 
-(** [array::take_array_borrow]:
-    Source: 'src/array.rs', lines 123:0-123:38 *)
+(** [arrays::take_array_borrow]:
+    Source: 'src/arrays.rs', lines 123:0-123:38 *)
 let take_array_borrow (a : array u32 2) : result unit =
   Return ()
 
-(** [array::take_slice]:
-    Source: 'src/array.rs', lines 124:0-124:28 *)
+(** [arrays::take_slice]:
+    Source: 'src/arrays.rs', lines 124:0-124:28 *)
 let take_slice (s : slice u32) : result unit =
   Return ()
 
-(** [array::take_mut_slice]:
-    Source: 'src/array.rs', lines 125:0-125:36 *)
+(** [arrays::take_mut_slice]:
+    Source: 'src/arrays.rs', lines 125:0-125:36 *)
 let take_mut_slice (s : slice u32) : result (slice u32) =
   Return s
 
-(** [array::const_array]:
-    Source: 'src/array.rs', lines 127:0-127:32 *)
+(** [arrays::const_array]:
+    Source: 'src/arrays.rs', lines 127:0-127:32 *)
 let const_array : result (array u32 2) =
   Return (mk_array u32 2 [ 0; 0 ])
 
-(** [array::const_slice]:
-    Source: 'src/array.rs', lines 131:0-131:20 *)
+(** [arrays::const_slice]:
+    Source: 'src/arrays.rs', lines 131:0-131:20 *)
 let const_slice : result unit =
   let* _ = array_to_slice u32 2 (mk_array u32 2 [ 0; 0 ]) in Return ()
 
-(** [array::take_all]:
-    Source: 'src/array.rs', lines 141:0-141:17 *)
+(** [arrays::take_all]:
+    Source: 'src/arrays.rs', lines 141:0-141:17 *)
 let take_all : result unit =
   let* _ = take_array (mk_array u32 2 [ 0; 0 ]) in
   let* _ = take_array (mk_array u32 2 [ 0; 0 ]) in
@@ -211,28 +211,28 @@ let take_all : result unit =
   let* _ = to_slice_mut_back s2 in
   Return ()
 
-(** [array::index_array]:
-    Source: 'src/array.rs', lines 155:0-155:38 *)
+(** [arrays::index_array]:
+    Source: 'src/arrays.rs', lines 155:0-155:38 *)
 let index_array (x : array u32 2) : result u32 =
   array_index_usize u32 2 x 0
 
-(** [array::index_array_borrow]:
-    Source: 'src/array.rs', lines 158:0-158:46 *)
+(** [arrays::index_array_borrow]:
+    Source: 'src/arrays.rs', lines 158:0-158:46 *)
 let index_array_borrow (x : array u32 2) : result u32 =
   array_index_usize u32 2 x 0
 
-(** [array::index_slice_u32_0]:
-    Source: 'src/array.rs', lines 162:0-162:42 *)
+(** [arrays::index_slice_u32_0]:
+    Source: 'src/arrays.rs', lines 162:0-162:42 *)
 let index_slice_u32_0 (x : slice u32) : result u32 =
   slice_index_usize u32 x 0
 
-(** [array::index_mut_slice_u32_0]:
-    Source: 'src/array.rs', lines 166:0-166:50 *)
+(** [arrays::index_mut_slice_u32_0]:
+    Source: 'src/arrays.rs', lines 166:0-166:50 *)
 let index_mut_slice_u32_0 (x : slice u32) : result (u32 & (slice u32)) =
   let* i = slice_index_usize u32 x 0 in Return (i, x)
 
-(** [array::index_all]:
-    Source: 'src/array.rs', lines 170:0-170:25 *)
+(** [arrays::index_all]:
+    Source: 'src/arrays.rs', lines 170:0-170:25 *)
 let index_all : result u32 =
   let* i = index_array (mk_array u32 2 [ 0; 0 ]) in
   let* i1 = index_array (mk_array u32 2 [ 0; 0 ]) in
@@ -249,26 +249,26 @@ let index_all : result u32 =
   let* _ = to_slice_mut_back s2 in
   Return i8
 
-(** [array::update_array]:
-    Source: 'src/array.rs', lines 184:0-184:36 *)
+(** [arrays::update_array]:
+    Source: 'src/arrays.rs', lines 184:0-184:36 *)
 let update_array (x : array u32 2) : result unit =
   let* (_, index_mut_back) = array_index_mut_usize u32 2 x 0 in
   let* _ = index_mut_back 1 in
   Return ()
 
-(** [array::update_array_mut_borrow]:
-    Source: 'src/array.rs', lines 187:0-187:48 *)
+(** [arrays::update_array_mut_borrow]:
+    Source: 'src/arrays.rs', lines 187:0-187:48 *)
 let update_array_mut_borrow (x : array u32 2) : result (array u32 2) =
   let* (_, index_mut_back) = array_index_mut_usize u32 2 x 0 in
   index_mut_back 1
 
-(** [array::update_mut_slice]:
-    Source: 'src/array.rs', lines 190:0-190:38 *)
+(** [arrays::update_mut_slice]:
+    Source: 'src/arrays.rs', lines 190:0-190:38 *)
 let update_mut_slice (x : slice u32) : result (slice u32) =
   let* (_, index_mut_back) = slice_index_mut_usize u32 x 0 in index_mut_back 1
 
-(** [array::update_all]:
-    Source: 'src/array.rs', lines 194:0-194:19 *)
+(** [arrays::update_all]:
+    Source: 'src/arrays.rs', lines 194:0-194:19 *)
 let update_all : result unit =
   let* _ = update_array (mk_array u32 2 [ 0; 0 ]) in
   let* _ = update_array (mk_array u32 2 [ 0; 0 ]) in
@@ -278,8 +278,8 @@ let update_all : result unit =
   let* _ = to_slice_mut_back s1 in
   Return ()
 
-(** [array::range_all]:
-    Source: 'src/array.rs', lines 205:0-205:18 *)
+(** [arrays::range_all]:
+    Source: 'src/arrays.rs', lines 205:0-205:18 *)
 let range_all : result unit =
   let* (s, index_mut_back) =
     core_array_Array_index_mut u32 (core_ops_range_Range usize) 4
@@ -290,28 +290,28 @@ let range_all : result unit =
   let* _ = index_mut_back s1 in
   Return ()
 
-(** [array::deref_array_borrow]:
-    Source: 'src/array.rs', lines 214:0-214:46 *)
+(** [arrays::deref_array_borrow]:
+    Source: 'src/arrays.rs', lines 214:0-214:46 *)
 let deref_array_borrow (x : array u32 2) : result u32 =
   array_index_usize u32 2 x 0
 
-(** [array::deref_array_mut_borrow]:
-    Source: 'src/array.rs', lines 219:0-219:54 *)
+(** [arrays::deref_array_mut_borrow]:
+    Source: 'src/arrays.rs', lines 219:0-219:54 *)
 let deref_array_mut_borrow (x : array u32 2) : result (u32 & (array u32 2)) =
   let* i = array_index_usize u32 2 x 0 in Return (i, x)
 
-(** [array::take_array_t]:
-    Source: 'src/array.rs', lines 227:0-227:31 *)
+(** [arrays::take_array_t]:
+    Source: 'src/arrays.rs', lines 227:0-227:31 *)
 let take_array_t (a : array aB_t 2) : result unit =
   Return ()
 
-(** [array::non_copyable_array]:
-    Source: 'src/array.rs', lines 229:0-229:27 *)
+(** [arrays::non_copyable_array]:
+    Source: 'src/arrays.rs', lines 229:0-229:27 *)
 let non_copyable_array : result unit =
   let* _ = take_array_t (mk_array aB_t 2 [ AB_A; AB_B ]) in Return ()
 
-(** [array::sum]: loop 0:
-    Source: 'src/array.rs', lines 242:0-250:1 *)
+(** [arrays::sum]: loop 0:
+    Source: 'src/arrays.rs', lines 242:0-250:1 *)
 let rec sum_loop
   (s : slice u32) (sum1 : u32) (i : usize) :
   Tot (result u32) (decreases (sum_loop_decreases s sum1 i))
@@ -325,13 +325,13 @@ let rec sum_loop
     sum_loop s sum3 i3
   else Return sum1
 
-(** [array::sum]:
-    Source: 'src/array.rs', lines 242:0-242:28 *)
+(** [arrays::sum]:
+    Source: 'src/arrays.rs', lines 242:0-242:28 *)
 let sum (s : slice u32) : result u32 =
   sum_loop s 0 0
 
-(** [array::sum2]: loop 0:
-    Source: 'src/array.rs', lines 252:0-261:1 *)
+(** [arrays::sum2]: loop 0:
+    Source: 'src/arrays.rs', lines 252:0-261:1 *)
 let rec sum2_loop
   (s : slice u32) (s2 : slice u32) (sum1 : u32) (i : usize) :
   Tot (result u32) (decreases (sum2_loop_decreases s s2 sum1 i))
@@ -347,15 +347,15 @@ let rec sum2_loop
     sum2_loop s s2 sum3 i5
   else Return sum1
 
-(** [array::sum2]:
-    Source: 'src/array.rs', lines 252:0-252:41 *)
+(** [arrays::sum2]:
+    Source: 'src/arrays.rs', lines 252:0-252:41 *)
 let sum2 (s : slice u32) (s2 : slice u32) : result u32 =
   let i = slice_len u32 s in
   let i1 = slice_len u32 s2 in
   if not (i = i1) then Fail Failure else sum2_loop s s2 0 0
 
-(** [array::f0]:
-    Source: 'src/array.rs', lines 263:0-263:11 *)
+(** [arrays::f0]:
+    Source: 'src/arrays.rs', lines 263:0-263:11 *)
 let f0 : result unit =
   let* (s, to_slice_mut_back) =
     array_to_slice_mut u32 2 (mk_array u32 2 [ 1; 2 ]) in
@@ -364,29 +364,29 @@ let f0 : result unit =
   let* _ = to_slice_mut_back s1 in
   Return ()
 
-(** [array::f1]:
-    Source: 'src/array.rs', lines 268:0-268:11 *)
+(** [arrays::f1]:
+    Source: 'src/arrays.rs', lines 268:0-268:11 *)
 let f1 : result unit =
   let* (_, index_mut_back) =
     array_index_mut_usize u32 2 (mk_array u32 2 [ 1; 2 ]) 0 in
   let* _ = index_mut_back 1 in
   Return ()
 
-(** [array::f2]:
-    Source: 'src/array.rs', lines 273:0-273:17 *)
+(** [arrays::f2]:
+    Source: 'src/arrays.rs', lines 273:0-273:17 *)
 let f2 (i : u32) : result unit =
   Return ()
 
-(** [array::f4]:
-    Source: 'src/array.rs', lines 282:0-282:54 *)
+(** [arrays::f4]:
+    Source: 'src/arrays.rs', lines 282:0-282:54 *)
 let f4 (x : array u32 32) (y : usize) (z : usize) : result (slice u32) =
   core_array_Array_index u32 (core_ops_range_Range usize) 32
     (core_ops_index_IndexSliceTIInst u32 (core_ops_range_Range usize)
     (core_slice_index_SliceIndexRangeUsizeSliceTInst u32)) x
     { start = y; end_ = z }
 
-(** [array::f3]:
-    Source: 'src/array.rs', lines 275:0-275:18 *)
+(** [arrays::f3]:
+    Source: 'src/arrays.rs', lines 275:0-275:18 *)
 let f3 : result u32 =
   let* i = array_index_usize u32 2 (mk_array u32 2 [ 1; 2 ]) 0 in
   let* _ = f2 i in
@@ -395,18 +395,18 @@ let f3 : result u32 =
   let* s1 = f4 b 16 18 in
   sum2 s s1
 
-(** [array::SZ]
-    Source: 'src/array.rs', lines 286:0-286:19 *)
+(** [arrays::SZ]
+    Source: 'src/arrays.rs', lines 286:0-286:19 *)
 let sz_body : result usize = Return 32
 let sz_c : usize = eval_global sz_body
 
-(** [array::f5]:
-    Source: 'src/array.rs', lines 289:0-289:31 *)
+(** [arrays::f5]:
+    Source: 'src/arrays.rs', lines 289:0-289:31 *)
 let f5 (x : array u32 32) : result u32 =
   array_index_usize u32 32 x 0
 
-(** [array::ite]:
-    Source: 'src/array.rs', lines 294:0-294:12 *)
+(** [arrays::ite]:
+    Source: 'src/arrays.rs', lines 294:0-294:12 *)
 let ite : result unit =
   let* (s, to_slice_mut_back) =
     array_to_slice_mut u32 2 (mk_array u32 2 [ 0; 0 ]) in
diff --git a/tests/fstar-split/array/Array.Types.fst b/tests/fstar/arrays/Arrays.Types.fst
index 312f6018..d3596e92 100644
--- a/tests/fstar-split/array/Array.Types.fst
+++ b/tests/fstar/arrays/Arrays.Types.fst
@@ -1,11 +1,11 @@
 (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [array]: type definitions *)
-module Array.Types
+(** [arrays]: type definitions *)
+module Arrays.Types
 open Primitives
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
-(** [array::AB]
-    Source: 'src/array.rs', lines 3:0-3:11 *)
+(** [arrays::AB]
+    Source: 'src/arrays.rs', lines 3:0-3:11 *)
 type aB_t = | AB_A : aB_t | AB_B : aB_t
 
diff --git a/tests/fstar/array/Makefile b/tests/fstar/arrays/Makefile
index fa7d1f36..fa7d1f36 100644
--- a/tests/fstar/array/Makefile
+++ b/tests/fstar/arrays/Makefile
diff --git a/tests/fstar/array/Primitives.fst b/tests/fstar/arrays/Primitives.fst
index fca80829..fca80829 100644
--- a/tests/fstar/array/Primitives.fst
+++ b/tests/fstar/arrays/Primitives.fst