Merge pull request #47 from AeneasVerif/son_panics

Update following some changes in Charon

8 files changed, 155 insertions, 134 deletions

diff --git a/flake.lock b/flake.lock
index 8a34cfcb..eedf152d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1701097924,
-        "narHash": "sha256-fIXlINGdx8228emfCSkbqLN7f6mrLvoJc4gmqcyACU0=",
+        "lastModified": 1701263140,
+        "narHash": "sha256-rxfTrlSCGZVwcHNV+zqRk8Wh92lojYfdXWmE9oUSp0w=",
         "owner": "aeneasverif",
         "repo": "charon",
-        "rev": "a635cdc69aa3c17e06ebc42e0694b0fcb7fa0fbb",
+        "rev": "e3718f07206e54458b3fcf0642089c32ee2381f0",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1699548976,
-        "narHash": "sha256-xnpxms0koM8mQpxIup9JnT0F7GrKdvv0QvtxvRuOYR4=",
+        "lastModified": 1701220101,
+        "narHash": "sha256-EBuCZ/Vjp3ovx8ZvfALfuUk4/76Ey/6cJmzmeXBRmDk=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "6849911446e18e520970cc6b7a691e64ee90d649",
+        "rev": "514cd663e5af505a244e55ad013733638574aff9",
         "type": "github"
       },
       "original": {
@@ -131,11 +131,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1700646441,
-        "narHash": "sha256-yZe9nDY+0nAWATQLorXSJB7yZ6yNyIlz9mT/qxHgNac=",
+        "lastModified": 1701214966,
+        "narHash": "sha256-AmvqisPtId4Ej+xga5djjSzdxpRzx7K9CL7JvjE5BLs=",
         "owner": "fstarlang",
         "repo": "fstar",
-        "rev": "fe6dec16fc4f0234663da63de26d9d2e72fe14df",
+        "rev": "3ad64126966f25423c7fb897412faebc540b864a",
         "type": "github"
       },
       "original": {
@@ -164,11 +164,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700661621,
-        "narHash": "sha256-XON6e4x5QRviofMGRyEwd+5PTVWAp/LdFFveC0LQhkY=",
+        "lastModified": 1701086382,
+        "narHash": "sha256-g40c06xDz7dkaJIH6Sjo95FN39hJ42O5ANPmYO974D4=",
         "owner": "hacl-star",
         "repo": "hacl-star",
-        "rev": "95112e8dcb1ea3fe7d254290f8864b8f8e2fb6b2",
+        "rev": "071512259483ac2c8bbb5948634408b523b31335",
         "type": "github"
       },
       "original": {
@@ -194,11 +194,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700702143,
-        "narHash": "sha256-BadYV0m36o3T0I7gB8rp7vos2HL6N+9I23+HAZdoZFM=",
+        "lastModified": 1701220603,
+        "narHash": "sha256-vQYLDG4+QRpRODMeZ7WLARtoM+IaRmi0hgTmZg4vhl0=",
         "owner": "hacl-star",
         "repo": "hacl-nix",
-        "rev": "84b572dc55ec16eb8403ada9934987fd7ff44f76",
+        "rev": "05f5ca8e7e4c12cc0bc322b3f6b8c0f8433e232a",
         "type": "github"
       },
       "original": {
@@ -223,11 +223,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1698968585,
-        "narHash": "sha256-x3ZaGrmuKF5+7xaWHu0yDikl4mrawkY5tQnfovgyPh8=",
+        "lastModified": 1701110212,
+        "narHash": "sha256-OrlMYgA8609l8orB41VAFJKDj/0WtiAfdOOaQjMhefs=",
         "owner": "fstarlang",
         "repo": "karamel",
-        "rev": "a7be2a7c43eca637ceb57fe8f3ffd16fc6627ebd",
+        "rev": "4ad701968346033a986f92d9d91a837e9af95c4e",
         "type": "github"
       },
       "original": {
@@ -265,11 +265,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1701086558,
-        "narHash": "sha256-Y5d0Ba09Bs8J6rxfH9gTEWEZ/pqDfIPwg73VYWpxIs8=",
+        "lastModified": 1701259400,
+        "narHash": "sha256-BZxLzC6mapqUUpL4SUiEy4ZqszTehcTDQRAhThDCMAY=",
         "owner": "leanprover",
         "repo": "lean4",
-        "rev": "9769ad65723866093b35cd2c8875cc45e65d477a",
+        "rev": "4f2f704962f960c42ca2bc3ca81c4c43767b22f2",
         "type": "github"
       },
       "original": {
@@ -318,11 +318,11 @@
         "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1701086558,
-        "narHash": "sha256-Y5d0Ba09Bs8J6rxfH9gTEWEZ/pqDfIPwg73VYWpxIs8=",
+        "lastModified": 1701259400,
+        "narHash": "sha256-BZxLzC6mapqUUpL4SUiEy4ZqszTehcTDQRAhThDCMAY=",
         "owner": "leanprover",
         "repo": "lean4",
-        "rev": "9769ad65723866093b35cd2c8875cc45e65d477a",
+        "rev": "4f2f704962f960c42ca2bc3ca81c4c43767b22f2",
         "type": "github"
       },
       "original": {
@@ -405,11 +405,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1699099776,
-        "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
+        "lastModified": 1701068326,
+        "narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
+        "rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c",
         "type": "github"
       },
       "original": {
@@ -573,11 +573,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1699582387,
-        "narHash": "sha256-sPmUXPDl+cEi+zFtM5lnAs7dWOdRn0ptZ4a/qHwvNDk=",
+        "lastModified": 1701224160,
+        "narHash": "sha256-qnMmxNMKmd6Soel0cfauyMJ+LzuZbvmiDQPSIuTbQ+M=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "41f7b0618052430d3a050e8f937030d00a2fcced",
+        "rev": "4a080e26d55eaedb95ab1bf8eeaeb84149c10f12",
         "type": "github"
       },
       "original": {
diff --git a/tests/coq/array/Array.v b/tests/coq/array/Array.v
index 105ce21f..1f2cc0e0 100644
--- a/tests/coq/array/Array.v
+++ b/tests/coq/array/Array.v
@@ -256,8 +256,21 @@ Definition take_slice (s : slice u32) : result unit :=
 Definition take_mut_slice (s : slice u32) : result (slice u32) :=
   Return s.
 
+(** [array::const_array]: forward function
+    Source: 'src/array.rs', lines 127:0-127:32 *)
+Definition const_array : result (array u32 2%usize) :=
+  Return (mk_array u32 2%usize [ 0%u32; 0%u32 ])
+.
+
+(** [array::const_slice]: forward function
+    Source: 'src/array.rs', lines 131:0-131:20 *)
+Definition const_slice : result unit :=
+  _ <- array_to_slice u32 2%usize (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
+  Return tt
+.
+
 (** [array::take_all]: forward function
-    Source: 'src/array.rs', lines 127:0-127:17 *)
+    Source: 'src/array.rs', lines 141:0-141:17 *)
 Definition take_all : result unit :=
   _ <- take_array (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
   _ <- take_array_borrow (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
@@ -270,37 +283,37 @@ Definition take_all : result unit :=
 .
 
 (** [array::index_array]: forward function
-    Source: 'src/array.rs', lines 141:0-141:38 *)
+    Source: 'src/array.rs', lines 155:0-155:38 *)
 Definition index_array (x : array u32 2%usize) : result u32 :=
   array_index_usize u32 2%usize x 0%usize
 .
 
 (** [array::index_array_borrow]: forward function
-    Source: 'src/array.rs', lines 144:0-144:46 *)
+    Source: 'src/array.rs', lines 158:0-158:46 *)
 Definition index_array_borrow (x : array u32 2%usize) : result u32 :=
   array_index_usize u32 2%usize x 0%usize
 .
 
 (** [array::index_slice_u32_0]: forward function
-    Source: 'src/array.rs', lines 148:0-148:42 *)
+    Source: 'src/array.rs', lines 162:0-162:42 *)
 Definition index_slice_u32_0 (x : slice u32) : result u32 :=
   slice_index_usize u32 x 0%usize
 .
 
 (** [array::index_mut_slice_u32_0]: forward function
-    Source: 'src/array.rs', lines 152:0-152:50 *)
+    Source: 'src/array.rs', lines 166:0-166:50 *)
 Definition index_mut_slice_u32_0 (x : slice u32) : result u32 :=
   slice_index_usize u32 x 0%usize
 .
 
 (** [array::index_mut_slice_u32_0]: backward function 0
-    Source: 'src/array.rs', lines 152:0-152:50 *)
+    Source: 'src/array.rs', lines 166:0-166:50 *)
 Definition index_mut_slice_u32_0_back (x : slice u32) : result (slice u32) :=
   _ <- slice_index_usize u32 x 0%usize; Return x
 .
 
 (** [array::index_all]: forward function
-    Source: 'src/array.rs', lines 156:0-156:25 *)
+    Source: 'src/array.rs', lines 170:0-170:25 *)
 Definition index_all : result u32 :=
   i <- index_array (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
   i0 <- index_array (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
@@ -319,14 +332,14 @@ Definition index_all : result u32 :=
 .
 
 (** [array::update_array]: forward function
-    Source: 'src/array.rs', lines 170:0-170:36 *)
+    Source: 'src/array.rs', lines 184:0-184:36 *)
 Definition update_array (x : array u32 2%usize) : result unit :=
   _ <- array_update_usize u32 2%usize x 0%usize 1%u32; Return tt
 .
 
 (** [array::update_array_mut_borrow]: merged forward/backward function
     (there is a single backward function, and the forward function returns ())
-    Source: 'src/array.rs', lines 173:0-173:48 *)
+    Source: 'src/array.rs', lines 187:0-187:48 *)
 Definition update_array_mut_borrow
   (x : array u32 2%usize) : result (array u32 2%usize) :=
   array_update_usize u32 2%usize x 0%usize 1%u32
@@ -334,13 +347,13 @@ Definition update_array_mut_borrow
 
 (** [array::update_mut_slice]: merged forward/backward function
     (there is a single backward function, and the forward function returns ())
-    Source: 'src/array.rs', lines 176:0-176:38 *)
+    Source: 'src/array.rs', lines 190:0-190:38 *)
 Definition update_mut_slice (x : slice u32) : result (slice u32) :=
   slice_update_usize u32 x 0%usize 1%u32
 .
 
 (** [array::update_all]: forward function
-    Source: 'src/array.rs', lines 180:0-180:19 *)
+    Source: 'src/array.rs', lines 194:0-194:19 *)
 Definition update_all : result unit :=
   _ <- update_array (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
   x <- update_array_mut_borrow (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
@@ -351,7 +364,7 @@ Definition update_all : result unit :=
 .
 
 (** [array::range_all]: forward function
-    Source: 'src/array.rs', lines 191:0-191:18 *)
+    Source: 'src/array.rs', lines 205:0-205:18 *)
 Definition range_all : result unit :=
   s <-
     core_array_Array_index_mut u32 (core_ops_range_Range usize) 4%usize
@@ -376,37 +389,37 @@ Definition range_all : result unit :=
 .
 
 (** [array::deref_array_borrow]: forward function
-    Source: 'src/array.rs', lines 200:0-200:46 *)
+    Source: 'src/array.rs', lines 214:0-214:46 *)
 Definition deref_array_borrow (x : array u32 2%usize) : result u32 :=
   array_index_usize u32 2%usize x 0%usize
 .
 
 (** [array::deref_array_mut_borrow]: forward function
-    Source: 'src/array.rs', lines 205:0-205:54 *)
+    Source: 'src/array.rs', lines 219:0-219:54 *)
 Definition deref_array_mut_borrow (x : array u32 2%usize) : result u32 :=
   array_index_usize u32 2%usize x 0%usize
 .
 
 (** [array::deref_array_mut_borrow]: backward function 0
-    Source: 'src/array.rs', lines 205:0-205:54 *)
+    Source: 'src/array.rs', lines 219:0-219:54 *)
 Definition deref_array_mut_borrow_back
   (x : array u32 2%usize) : result (array u32 2%usize) :=
   _ <- array_index_usize u32 2%usize x 0%usize; Return x
 .
 
 (** [array::take_array_t]: forward function
-    Source: 'src/array.rs', lines 213:0-213:31 *)
+    Source: 'src/array.rs', lines 227:0-227:31 *)
 Definition take_array_t (a : array AB_t 2%usize) : result unit :=
   Return tt.
 
 (** [array::non_copyable_array]: forward function
-    Source: 'src/array.rs', lines 215:0-215:27 *)
+    Source: 'src/array.rs', lines 229:0-229:27 *)
 Definition non_copyable_array : result unit :=
   _ <- take_array_t (mk_array AB_t 2%usize [ AB_A; AB_B ]); Return tt
 .
 
 (** [array::sum]: loop 0: forward function
-    Source: 'src/array.rs', lines 228:0-236:1 *)
+    Source: 'src/array.rs', lines 242:0-250:1 *)
 Fixpoint sum_loop
   (n : nat) (s : slice u32) (sum0 : u32) (i : usize) : result u32 :=
   match n with
@@ -424,13 +437,13 @@ Fixpoint sum_loop
 .
 
 (** [array::sum]: forward function
-    Source: 'src/array.rs', lines 228:0-228:28 *)
+    Source: 'src/array.rs', lines 242:0-242:28 *)
 Definition sum (n : nat) (s : slice u32) : result u32 :=
   sum_loop n s 0%u32 0%usize
 .
 
 (** [array::sum2]: loop 0: forward function
-    Source: 'src/array.rs', lines 238:0-247:1 *)
+    Source: 'src/array.rs', lines 252:0-261:1 *)
 Fixpoint sum2_loop
   (n : nat) (s : slice u32) (s2 : slice u32) (sum0 : u32) (i : usize) :
   result u32
@@ -452,7 +465,7 @@ Fixpoint sum2_loop
 .
 
 (** [array::sum2]: forward function
-    Source: 'src/array.rs', lines 238:0-238:41 *)
+    Source: 'src/array.rs', lines 252:0-252:41 *)
 Definition sum2 (n : nat) (s : slice u32) (s2 : slice u32) : result u32 :=
   let i := slice_len u32 s in
   let i0 := slice_len u32 s2 in
@@ -460,7 +473,7 @@ Definition sum2 (n : nat) (s : slice u32) (s2 : slice u32) : result u32 :=
 .
 
 (** [array::f0]: forward function
-    Source: 'src/array.rs', lines 249:0-249:11 *)
+    Source: 'src/array.rs', lines 263:0-263:11 *)
 Definition f0 : result unit :=
   s <- array_to_slice u32 2%usize (mk_array u32 2%usize [ 1%u32; 2%u32 ]);
   s0 <- slice_update_usize u32 s 0%usize 1%u32;
@@ -469,7 +482,7 @@ Definition f0 : result unit :=
 .
 
 (** [array::f1]: forward function
-    Source: 'src/array.rs', lines 254:0-254:11 *)
+    Source: 'src/array.rs', lines 268:0-268:11 *)
 Definition f1 : result unit :=
   _ <-
     array_update_usize u32 2%usize (mk_array u32 2%usize [ 1%u32; 2%u32 ])
@@ -478,12 +491,12 @@ Definition f1 : result unit :=
 .
 
 (** [array::f2]: forward function
-    Source: 'src/array.rs', lines 259:0-259:17 *)
+    Source: 'src/array.rs', lines 273:0-273:17 *)
 Definition f2 (i : u32) : result unit :=
   Return tt.
 
 (** [array::f4]: forward function
-    Source: 'src/array.rs', lines 268:0-268:54 *)
+    Source: 'src/array.rs', lines 282:0-282:54 *)
 Definition f4
   (x : array u32 32%usize) (y : usize) (z : usize) : result (slice u32) :=
   core_array_Array_index u32 (core_ops_range_Range usize) 32%usize
@@ -493,7 +506,7 @@ Definition f4
 .
 
 (** [array::f3]: forward function
-    Source: 'src/array.rs', lines 261:0-261:18 *)
+    Source: 'src/array.rs', lines 275:0-275:18 *)
 Definition f3 (n : nat) : result u32 :=
   i <-
     array_index_usize u32 2%usize (mk_array u32 2%usize [ 1%u32; 2%u32 ])
@@ -506,18 +519,18 @@ Definition f3 (n : nat) : result u32 :=
 .
 
 (** [array::SZ]
-    Source: 'src/array.rs', lines 272:0-272:19 *)
+    Source: 'src/array.rs', lines 286:0-286:19 *)
 Definition sz_body : result usize := Return 32%usize.
 Definition sz_c : usize := sz_body%global.
 
 (** [array::f5]: forward function
-    Source: 'src/array.rs', lines 275:0-275:31 *)
+    Source: 'src/array.rs', lines 289:0-289:31 *)
 Definition f5 (x : array u32 32%usize) : result u32 :=
   array_index_usize u32 32%usize x 0%usize
 .
 
 (** [array::ite]: forward function
-    Source: 'src/array.rs', lines 280:0-280:12 *)
+    Source: 'src/array.rs', lines 294:0-294:12 *)
 Definition ite : result unit :=
   s <- array_to_slice u32 2%usize (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
   s0 <- array_to_slice u32 2%usize (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
diff --git a/tests/coq/traits/Traits.v b/tests/coq/traits/Traits.v
index ebdca4ec..549a7116 100644
--- a/tests/coq/traits/Traits.v
+++ b/tests/coq/traits/Traits.v
@@ -606,9 +606,4 @@ Arguments mkCFn_t { _ _ }.
 Arguments CFn_tCFn_t_CFnMutSelfArgsInst { _ _ }.
 Arguments CFn_t_call_mut { _ _ }.
 
-(** [traits::incr_u32]: forward function
-    Source: 'src/traits.rs', lines 300:0-300:30 *)
-Definition incr_u32 (x : u32) : result u32 :=
-  u32_add x 1%u32.
-
 End Traits.
diff --git a/tests/fstar/array/Array.Clauses.Template.fst b/tests/fstar/array/Array.Clauses.Template.fst
index 08a2925f..84347ab9 100644
--- a/tests/fstar/array/Array.Clauses.Template.fst
+++ b/tests/fstar/array/Array.Clauses.Template.fst
@@ -7,13 +7,13 @@ open Array.Types
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** [array::sum]: decreases clause
-    Source: 'src/array.rs', lines 228:0-236:1 *)
+    Source: 'src/array.rs', lines 242:0-250:1 *)
 unfold
 let sum_loop_decreases (s : slice u32) (sum0 : u32) (i : usize) : nat =
   admit ()
 
 (** [array::sum2]: decreases clause
-    Source: 'src/array.rs', lines 238:0-247:1 *)
+    Source: 'src/array.rs', lines 252:0-261:1 *)
 unfold
 let sum2_loop_decreases (s : slice u32) (s2 : slice u32) (sum0 : u32)
   (i : usize) : nat =
diff --git a/tests/fstar/array/Array.Funs.fst b/tests/fstar/array/Array.Funs.fst
index a8722a4f..935bd9c9 100644
--- a/tests/fstar/array/Array.Funs.fst
+++ b/tests/fstar/array/Array.Funs.fst
@@ -209,8 +209,18 @@ let take_slice (s : slice u32) : result unit =
 let take_mut_slice (s : slice u32) : result (slice u32) =
   Return s
 
+(** [array::const_array]: forward function
+    Source: 'src/array.rs', lines 127:0-127:32 *)
+let const_array : result (array u32 2) =
+  Return (mk_array u32 2 [ 0; 0 ])
+
+(** [array::const_slice]: forward function
+    Source: 'src/array.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]: forward function
-    Source: 'src/array.rs', lines 127:0-127:17 *)
+    Source: 'src/array.rs', lines 141:0-141:17 *)
 let take_all : result unit =
   let* _ = take_array (mk_array u32 2 [ 0; 0 ]) in
   let* _ = take_array_borrow (mk_array u32 2 [ 0; 0 ]) in
@@ -222,32 +232,32 @@ let take_all : result unit =
   Return ()
 
 (** [array::index_array]: forward function
-    Source: 'src/array.rs', lines 141:0-141:38 *)
+    Source: 'src/array.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]: forward function
-    Source: 'src/array.rs', lines 144:0-144:46 *)
+    Source: 'src/array.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]: forward function
-    Source: 'src/array.rs', lines 148:0-148:42 *)
+    Source: 'src/array.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]: forward function
-    Source: 'src/array.rs', lines 152:0-152:50 *)
+    Source: 'src/array.rs', lines 166:0-166:50 *)
 let index_mut_slice_u32_0 (x : slice u32) : result u32 =
   slice_index_usize u32 x 0
 
 (** [array::index_mut_slice_u32_0]: backward function 0
-    Source: 'src/array.rs', lines 152:0-152:50 *)
+    Source: 'src/array.rs', lines 166:0-166:50 *)
 let index_mut_slice_u32_0_back (x : slice u32) : result (slice u32) =
   let* _ = slice_index_usize u32 x 0 in Return x
 
 (** [array::index_all]: forward function
-    Source: 'src/array.rs', lines 156:0-156:25 *)
+    Source: 'src/array.rs', lines 170:0-170:25 *)
 let index_all : result u32 =
   let* i = index_array (mk_array u32 2 [ 0; 0 ]) in
   let* i0 = index_array (mk_array u32 2 [ 0; 0 ]) in
@@ -265,24 +275,24 @@ let index_all : result u32 =
   Return i7
 
 (** [array::update_array]: forward function
-    Source: 'src/array.rs', lines 170:0-170:36 *)
+    Source: 'src/array.rs', lines 184:0-184:36 *)
 let update_array (x : array u32 2) : result unit =
   let* _ = array_update_usize u32 2 x 0 1 in Return ()
 
 (** [array::update_array_mut_borrow]: merged forward/backward function
     (there is a single backward function, and the forward function returns ())
-    Source: 'src/array.rs', lines 173:0-173:48 *)
+    Source: 'src/array.rs', lines 187:0-187:48 *)
 let update_array_mut_borrow (x : array u32 2) : result (array u32 2) =
   array_update_usize u32 2 x 0 1
 
 (** [array::update_mut_slice]: merged forward/backward function
     (there is a single backward function, and the forward function returns ())
-    Source: 'src/array.rs', lines 176:0-176:38 *)
+    Source: 'src/array.rs', lines 190:0-190:38 *)
 let update_mut_slice (x : slice u32) : result (slice u32) =
   slice_update_usize u32 x 0 1
 
 (** [array::update_all]: forward function
-    Source: 'src/array.rs', lines 180:0-180:19 *)
+    Source: 'src/array.rs', lines 194:0-194:19 *)
 let update_all : result unit =
   let* _ = update_array (mk_array u32 2 [ 0; 0 ]) in
   let* x = update_array_mut_borrow (mk_array u32 2 [ 0; 0 ]) in
@@ -292,7 +302,7 @@ let update_all : result unit =
   Return ()
 
 (** [array::range_all]: forward function
-    Source: 'src/array.rs', lines 191:0-191:18 *)
+    Source: 'src/array.rs', lines 205:0-205:18 *)
 let range_all : result unit =
   let* s =
     core_array_Array_index_mut u32 (core_ops_range_Range usize) 4
@@ -308,32 +318,32 @@ let range_all : result unit =
   Return ()
 
 (** [array::deref_array_borrow]: forward function
-    Source: 'src/array.rs', lines 200:0-200:46 *)
+    Source: 'src/array.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]: forward function
-    Source: 'src/array.rs', lines 205:0-205:54 *)
+    Source: 'src/array.rs', lines 219:0-219:54 *)
 let deref_array_mut_borrow (x : array u32 2) : result u32 =
   array_index_usize u32 2 x 0
 
 (** [array::deref_array_mut_borrow]: backward function 0
-    Source: 'src/array.rs', lines 205:0-205:54 *)
+    Source: 'src/array.rs', lines 219:0-219:54 *)
 let deref_array_mut_borrow_back (x : array u32 2) : result (array u32 2) =
   let* _ = array_index_usize u32 2 x 0 in Return x
 
 (** [array::take_array_t]: forward function
-    Source: 'src/array.rs', lines 213:0-213:31 *)
+    Source: 'src/array.rs', lines 227:0-227:31 *)
 let take_array_t (a : array aB_t 2) : result unit =
   Return ()
 
 (** [array::non_copyable_array]: forward function
-    Source: 'src/array.rs', lines 215:0-215:27 *)
+    Source: 'src/array.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: forward function
-    Source: 'src/array.rs', lines 228:0-236:1 *)
+    Source: 'src/array.rs', lines 242:0-250:1 *)
 let rec sum_loop
   (s : slice u32) (sum0 : u32) (i : usize) :
   Tot (result u32) (decreases (sum_loop_decreases s sum0 i))
@@ -348,12 +358,12 @@ let rec sum_loop
   else Return sum0
 
 (** [array::sum]: forward function
-    Source: 'src/array.rs', lines 228:0-228:28 *)
+    Source: 'src/array.rs', lines 242:0-242:28 *)
 let sum (s : slice u32) : result u32 =
   sum_loop s 0 0
 
 (** [array::sum2]: loop 0: forward function
-    Source: 'src/array.rs', lines 238:0-247:1 *)
+    Source: 'src/array.rs', lines 252:0-261:1 *)
 let rec sum2_loop
   (s : slice u32) (s2 : slice u32) (sum0 : u32) (i : usize) :
   Tot (result u32) (decreases (sum2_loop_decreases s s2 sum0 i))
@@ -370,14 +380,14 @@ let rec sum2_loop
   else Return sum0
 
 (** [array::sum2]: forward function
-    Source: 'src/array.rs', lines 238:0-238:41 *)
+    Source: 'src/array.rs', lines 252:0-252:41 *)
 let sum2 (s : slice u32) (s2 : slice u32) : result u32 =
   let i = slice_len u32 s in
   let i0 = slice_len u32 s2 in
   if not (i = i0) then Fail Failure else sum2_loop s s2 0 0
 
 (** [array::f0]: forward function
-    Source: 'src/array.rs', lines 249:0-249:11 *)
+    Source: 'src/array.rs', lines 263:0-263:11 *)
 let f0 : result unit =
   let* s = array_to_slice u32 2 (mk_array u32 2 [ 1; 2 ]) in
   let* s0 = slice_update_usize u32 s 0 1 in
@@ -385,17 +395,17 @@ let f0 : result unit =
   Return ()
 
 (** [array::f1]: forward function
-    Source: 'src/array.rs', lines 254:0-254:11 *)
+    Source: 'src/array.rs', lines 268:0-268:11 *)
 let f1 : result unit =
   let* _ = array_update_usize u32 2 (mk_array u32 2 [ 1; 2 ]) 0 1 in Return ()
 
 (** [array::f2]: forward function
-    Source: 'src/array.rs', lines 259:0-259:17 *)
+    Source: 'src/array.rs', lines 273:0-273:17 *)
 let f2 (i : u32) : result unit =
   Return ()
 
 (** [array::f4]: forward function
-    Source: 'src/array.rs', lines 268:0-268:54 *)
+    Source: 'src/array.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)
@@ -403,7 +413,7 @@ let f4 (x : array u32 32) (y : usize) (z : usize) : result (slice u32) =
     { start = y; end_ = z }
 
 (** [array::f3]: forward function
-    Source: 'src/array.rs', lines 261:0-261:18 *)
+    Source: 'src/array.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
@@ -413,17 +423,17 @@ let f3 : result u32 =
   sum2 s s0
 
 (** [array::SZ]
-    Source: 'src/array.rs', lines 272:0-272:19 *)
+    Source: 'src/array.rs', lines 286:0-286:19 *)
 let sz_body : result usize = Return 32
 let sz_c : usize = eval_global sz_body
 
 (** [array::f5]: forward function
-    Source: 'src/array.rs', lines 275:0-275:31 *)
+    Source: 'src/array.rs', lines 289:0-289:31 *)
 let f5 (x : array u32 32) : result u32 =
   array_index_usize u32 32 x 0
 
 (** [array::ite]: forward function
-    Source: 'src/array.rs', lines 280:0-280:12 *)
+    Source: 'src/array.rs', lines 294:0-294:12 *)
 let ite : result unit =
   let* s = array_to_slice u32 2 (mk_array u32 2 [ 0; 0 ]) in
   let* s0 = array_to_slice u32 2 (mk_array u32 2 [ 0; 0 ]) in
diff --git a/tests/fstar/traits/Traits.fst b/tests/fstar/traits/Traits.fst
index 895a1cac..8252aad4 100644
--- a/tests/fstar/traits/Traits.fst
+++ b/tests/fstar/traits/Traits.fst
@@ -454,8 +454,3 @@ noeq type cFn_t (self args : Type0) = {
     cFnMutSelfArgsInst.cFnOnceSelfArgsInst.tOutput;
 }
 
-(** [traits::incr_u32]: forward function
-    Source: 'src/traits.rs', lines 300:0-300:30 *)
-let incr_u32 (x : u32) : result u32 =
-  u32_add x 1
-
diff --git a/tests/lean/Array.lean b/tests/lean/Array.lean
index b49add96..25dad3cf 100644
--- a/tests/lean/Array.lean
+++ b/tests/lean/Array.lean
@@ -232,8 +232,21 @@ def take_slice (s : Slice U32) : Result Unit :=
 def take_mut_slice (s : Slice U32) : Result (Slice U32) :=
   Result.ret s
 
+/- [array::const_array]: forward function
+   Source: 'src/array.rs', lines 127:0-127:32 -/
+def const_array : Result (Array U32 2#usize) :=
+  Result.ret (Array.make U32 2#usize [ 0#u32, 0#u32 ])
+
+/- [array::const_slice]: forward function
+   Source: 'src/array.rs', lines 131:0-131:20 -/
+def const_slice : Result Unit :=
+  do
+    let _ ←
+      Array.to_slice U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
+    Result.ret ()
+
 /- [array::take_all]: forward function
-   Source: 'src/array.rs', lines 127:0-127:17 -/
+   Source: 'src/array.rs', lines 141:0-141:17 -/
 def take_all : Result Unit :=
   do
     let _ ← take_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
@@ -249,34 +262,34 @@ def take_all : Result Unit :=
     Result.ret ()
 
 /- [array::index_array]: forward function
-   Source: 'src/array.rs', lines 141:0-141:38 -/
+   Source: 'src/array.rs', lines 155:0-155:38 -/
 def index_array (x : Array U32 2#usize) : Result U32 :=
   Array.index_usize U32 2#usize x 0#usize
 
 /- [array::index_array_borrow]: forward function
-   Source: 'src/array.rs', lines 144:0-144:46 -/
+   Source: 'src/array.rs', lines 158:0-158:46 -/
 def index_array_borrow (x : Array U32 2#usize) : Result U32 :=
   Array.index_usize U32 2#usize x 0#usize
 
 /- [array::index_slice_u32_0]: forward function
-   Source: 'src/array.rs', lines 148:0-148:42 -/
+   Source: 'src/array.rs', lines 162:0-162:42 -/
 def index_slice_u32_0 (x : Slice U32) : Result U32 :=
   Slice.index_usize U32 x 0#usize
 
 /- [array::index_mut_slice_u32_0]: forward function
-   Source: 'src/array.rs', lines 152:0-152:50 -/
+   Source: 'src/array.rs', lines 166:0-166:50 -/
 def index_mut_slice_u32_0 (x : Slice U32) : Result U32 :=
   Slice.index_usize U32 x 0#usize
 
 /- [array::index_mut_slice_u32_0]: backward function 0
-   Source: 'src/array.rs', lines 152:0-152:50 -/
+   Source: 'src/array.rs', lines 166:0-166:50 -/
 def index_mut_slice_u32_0_back (x : Slice U32) : Result (Slice U32) :=
   do
     let _ ← Slice.index_usize U32 x 0#usize
     Result.ret x
 
 /- [array::index_all]: forward function
-   Source: 'src/array.rs', lines 156:0-156:25 -/
+   Source: 'src/array.rs', lines 170:0-170:25 -/
 def index_all : Result U32 :=
   do
     let i ← index_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
@@ -298,7 +311,7 @@ def index_all : Result U32 :=
     Result.ret i7
 
 /- [array::update_array]: forward function
-   Source: 'src/array.rs', lines 170:0-170:36 -/
+   Source: 'src/array.rs', lines 184:0-184:36 -/
 def update_array (x : Array U32 2#usize) : Result Unit :=
   do
     let _ ← Array.update_usize U32 2#usize x 0#usize 1#u32
@@ -306,19 +319,19 @@ def update_array (x : Array U32 2#usize) : Result Unit :=
 
 /- [array::update_array_mut_borrow]: merged forward/backward function
    (there is a single backward function, and the forward function returns ())
-   Source: 'src/array.rs', lines 173:0-173:48 -/
+   Source: 'src/array.rs', lines 187:0-187:48 -/
 def update_array_mut_borrow
   (x : Array U32 2#usize) : Result (Array U32 2#usize) :=
   Array.update_usize U32 2#usize x 0#usize 1#u32
 
 /- [array::update_mut_slice]: merged forward/backward function
    (there is a single backward function, and the forward function returns ())
-   Source: 'src/array.rs', lines 176:0-176:38 -/
+   Source: 'src/array.rs', lines 190:0-190:38 -/
 def update_mut_slice (x : Slice U32) : Result (Slice U32) :=
   Slice.update_usize U32 x 0#usize 1#u32
 
 /- [array::update_all]: forward function
-   Source: 'src/array.rs', lines 180:0-180:19 -/
+   Source: 'src/array.rs', lines 194:0-194:19 -/
 def update_all : Result Unit :=
   do
     let _ ← update_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
@@ -329,7 +342,7 @@ def update_all : Result Unit :=
     Result.ret ()
 
 /- [array::range_all]: forward function
-   Source: 'src/array.rs', lines 191:0-191:18 -/
+   Source: 'src/array.rs', lines 205:0-205:18 -/
 def range_all : Result Unit :=
   do
     let s ←
@@ -348,17 +361,17 @@ def range_all : Result Unit :=
     Result.ret ()
 
 /- [array::deref_array_borrow]: forward function
-   Source: 'src/array.rs', lines 200:0-200:46 -/
+   Source: 'src/array.rs', lines 214:0-214:46 -/
 def deref_array_borrow (x : Array U32 2#usize) : Result U32 :=
   Array.index_usize U32 2#usize x 0#usize
 
 /- [array::deref_array_mut_borrow]: forward function
-   Source: 'src/array.rs', lines 205:0-205:54 -/
+   Source: 'src/array.rs', lines 219:0-219:54 -/
 def deref_array_mut_borrow (x : Array U32 2#usize) : Result U32 :=
   Array.index_usize U32 2#usize x 0#usize
 
 /- [array::deref_array_mut_borrow]: backward function 0
-   Source: 'src/array.rs', lines 205:0-205:54 -/
+   Source: 'src/array.rs', lines 219:0-219:54 -/
 def deref_array_mut_borrow_back
   (x : Array U32 2#usize) : Result (Array U32 2#usize) :=
   do
@@ -366,19 +379,19 @@ def deref_array_mut_borrow_back
     Result.ret x
 
 /- [array::take_array_t]: forward function
-   Source: 'src/array.rs', lines 213:0-213:31 -/
+   Source: 'src/array.rs', lines 227:0-227:31 -/
 def take_array_t (a : Array AB 2#usize) : Result Unit :=
   Result.ret ()
 
 /- [array::non_copyable_array]: forward function
-   Source: 'src/array.rs', lines 215:0-215:27 -/
+   Source: 'src/array.rs', lines 229:0-229:27 -/
 def non_copyable_array : Result Unit :=
   do
     let _ ← take_array_t (Array.make AB 2#usize [ AB.A, AB.B ])
     Result.ret ()
 
 /- [array::sum]: loop 0: forward function
-   Source: 'src/array.rs', lines 228:0-236:1 -/
+   Source: 'src/array.rs', lines 242:0-250:1 -/
 divergent def sum_loop (s : Slice U32) (sum0 : U32) (i : Usize) : Result U32 :=
   let i0 := Slice.len U32 s
   if i < i0
@@ -391,12 +404,12 @@ divergent def sum_loop (s : Slice U32) (sum0 : U32) (i : Usize) : Result U32 :=
   else Result.ret sum0
 
 /- [array::sum]: forward function
-   Source: 'src/array.rs', lines 228:0-228:28 -/
+   Source: 'src/array.rs', lines 242:0-242:28 -/
 def sum (s : Slice U32) : Result U32 :=
   sum_loop s 0#u32 0#usize
 
 /- [array::sum2]: loop 0: forward function
-   Source: 'src/array.rs', lines 238:0-247:1 -/
+   Source: 'src/array.rs', lines 252:0-261:1 -/
 divergent def sum2_loop
   (s : Slice U32) (s2 : Slice U32) (sum0 : U32) (i : Usize) : Result U32 :=
   let i0 := Slice.len U32 s
@@ -412,7 +425,7 @@ divergent def sum2_loop
   else Result.ret sum0
 
 /- [array::sum2]: forward function
-   Source: 'src/array.rs', lines 238:0-238:41 -/
+   Source: 'src/array.rs', lines 252:0-252:41 -/
 def sum2 (s : Slice U32) (s2 : Slice U32) : Result U32 :=
   let i := Slice.len U32 s
   let i0 := Slice.len U32 s2
@@ -421,7 +434,7 @@ def sum2 (s : Slice U32) (s2 : Slice U32) : Result U32 :=
   else sum2_loop s s2 0#u32 0#usize
 
 /- [array::f0]: forward function
-   Source: 'src/array.rs', lines 249:0-249:11 -/
+   Source: 'src/array.rs', lines 263:0-263:11 -/
 def f0 : Result Unit :=
   do
     let s ←
@@ -432,7 +445,7 @@ def f0 : Result Unit :=
     Result.ret ()
 
 /- [array::f1]: forward function
-   Source: 'src/array.rs', lines 254:0-254:11 -/
+   Source: 'src/array.rs', lines 268:0-268:11 -/
 def f1 : Result Unit :=
   do
     let _ ←
@@ -441,12 +454,12 @@ def f1 : Result Unit :=
     Result.ret ()
 
 /- [array::f2]: forward function
-   Source: 'src/array.rs', lines 259:0-259:17 -/
+   Source: 'src/array.rs', lines 273:0-273:17 -/
 def f2 (i : U32) : Result Unit :=
   Result.ret ()
 
 /- [array::f4]: forward function
-   Source: 'src/array.rs', lines 268:0-268:54 -/
+   Source: 'src/array.rs', lines 282:0-282:54 -/
 def f4 (x : Array U32 32#usize) (y : Usize) (z : Usize) : Result (Slice U32) :=
   core.array.Array.index U32 (core.ops.range.Range Usize) 32#usize
     (core.ops.index.IndexSliceTIInst U32 (core.ops.range.Range Usize)
@@ -454,7 +467,7 @@ def f4 (x : Array U32 32#usize) (y : Usize) (z : Usize) : Result (Slice U32) :=
     { start := y, end_ := z }
 
 /- [array::f3]: forward function
-   Source: 'src/array.rs', lines 261:0-261:18 -/
+   Source: 'src/array.rs', lines 275:0-275:18 -/
 def f3 : Result U32 :=
   do
     let i ←
@@ -468,17 +481,17 @@ def f3 : Result U32 :=
     sum2 s s0
 
 /- [array::SZ]
-   Source: 'src/array.rs', lines 272:0-272:19 -/
+   Source: 'src/array.rs', lines 286:0-286:19 -/
 def sz_body : Result Usize := Result.ret 32#usize
 def sz_c : Usize := eval_global sz_body (by simp)
 
 /- [array::f5]: forward function
-   Source: 'src/array.rs', lines 275:0-275:31 -/
+   Source: 'src/array.rs', lines 289:0-289:31 -/
 def f5 (x : Array U32 32#usize) : Result U32 :=
   Array.index_usize U32 32#usize x 0#usize
 
 /- [array::ite]: forward function
-   Source: 'src/array.rs', lines 280:0-280:12 -/
+   Source: 'src/array.rs', lines 294:0-294:12 -/
 def ite : Result Unit :=
   do
     let s ←
diff --git a/tests/lean/Traits.lean b/tests/lean/Traits.lean
index e7795d9c..653384d6 100644
--- a/tests/lean/Traits.lean
+++ b/tests/lean/Traits.lean
@@ -468,9 +468,4 @@ structure CFn (Self Args : Type) where
   call_mut : Self → Args → Result
     CFnMutSelfArgsInst.CFnOnceSelfArgsInst.Output
 
-/- [traits::incr_u32]: forward function
-   Source: 'src/traits.rs', lines 300:0-300:30 -/
-def incr_u32 (x : U32) : Result U32 :=
-  x + 1#u32
-
 end traits