Merge branch 'main' into option-take

1 files changed, 56 insertions, 157 deletions

diff --git a/tests/fstar/misc/NoNestedBorrows.fst b/tests/fstar/misc/NoNestedBorrows.fst
index ac443a99..7d965944 100644
--- a/tests/fstar/misc/NoNestedBorrows.fst
+++ b/tests/fstar/misc/NoNestedBorrows.fst
@@ -37,124 +37,23 @@ type sum_t (t1 t2 : Type0) =
 | Sum_Left : t1 -> sum_t t1 t2
 | Sum_Right : t2 -> sum_t t1 t2
 
-(** [no_nested_borrows::neg_test]:
-    Source: 'src/no_nested_borrows.rs', lines 48:0-48:30 *)
-let neg_test (x : i32) : result i32 =
-  i32_neg x
-
-(** [no_nested_borrows::add_u32]:
-    Source: 'src/no_nested_borrows.rs', lines 54:0-54:37 *)
-let add_u32 (x : u32) (y : u32) : result u32 =
-  u32_add x y
-
-(** [no_nested_borrows::subs_u32]:
-    Source: 'src/no_nested_borrows.rs', lines 60:0-60:38 *)
-let subs_u32 (x : u32) (y : u32) : result u32 =
-  u32_sub x y
-
-(** [no_nested_borrows::div_u32]:
-    Source: 'src/no_nested_borrows.rs', lines 66:0-66:37 *)
-let div_u32 (x : u32) (y : u32) : result u32 =
-  u32_div x y
-
-(** [no_nested_borrows::div_u32_const]:
-    Source: 'src/no_nested_borrows.rs', lines 73:0-73:35 *)
-let div_u32_const (x : u32) : result u32 =
-  u32_div x 2
-
-(** [no_nested_borrows::rem_u32]:
-    Source: 'src/no_nested_borrows.rs', lines 78:0-78:37 *)
-let rem_u32 (x : u32) (y : u32) : result u32 =
-  u32_rem x y
-
-(** [no_nested_borrows::mul_u32]:
-    Source: 'src/no_nested_borrows.rs', lines 82:0-82:37 *)
-let mul_u32 (x : u32) (y : u32) : result u32 =
-  u32_mul x y
-
-(** [no_nested_borrows::add_i32]:
-    Source: 'src/no_nested_borrows.rs', lines 88:0-88:37 *)
-let add_i32 (x : i32) (y : i32) : result i32 =
-  i32_add x y
-
-(** [no_nested_borrows::subs_i32]:
-    Source: 'src/no_nested_borrows.rs', lines 92:0-92:38 *)
-let subs_i32 (x : i32) (y : i32) : result i32 =
-  i32_sub x y
-
-(** [no_nested_borrows::div_i32]:
-    Source: 'src/no_nested_borrows.rs', lines 96:0-96:37 *)
-let div_i32 (x : i32) (y : i32) : result i32 =
-  i32_div x y
-
-(** [no_nested_borrows::div_i32_const]:
-    Source: 'src/no_nested_borrows.rs', lines 100:0-100:35 *)
-let div_i32_const (x : i32) : result i32 =
-  i32_div x 2
-
-(** [no_nested_borrows::rem_i32]:
-    Source: 'src/no_nested_borrows.rs', lines 104:0-104:37 *)
-let rem_i32 (x : i32) (y : i32) : result i32 =
-  i32_rem x y
-
-(** [no_nested_borrows::mul_i32]:
-    Source: 'src/no_nested_borrows.rs', lines 108:0-108:37 *)
-let mul_i32 (x : i32) (y : i32) : result i32 =
-  i32_mul x y
-
-(** [no_nested_borrows::mix_arith_u32]:
-    Source: 'src/no_nested_borrows.rs', lines 112:0-112:51 *)
-let mix_arith_u32 (x : u32) (y : u32) (z : u32) : result u32 =
-  let* i = u32_add x y in
-  let* i1 = u32_div x y in
-  let* i2 = u32_mul i i1 in
-  let* i3 = u32_rem z y in
-  let* i4 = u32_sub x i3 in
-  let* i5 = u32_add i2 i4 in
-  let* i6 = u32_add x y in
-  let* i7 = u32_add i6 z in
-  u32_rem i5 i7
-
-(** [no_nested_borrows::mix_arith_i32]:
-    Source: 'src/no_nested_borrows.rs', lines 116:0-116:51 *)
-let mix_arith_i32 (x : i32) (y : i32) (z : i32) : result i32 =
-  let* i = i32_add x y in
-  let* i1 = i32_div x y in
-  let* i2 = i32_mul i i1 in
-  let* i3 = i32_rem z y in
-  let* i4 = i32_sub x i3 in
-  let* i5 = i32_add i2 i4 in
-  let* i6 = i32_add x y in
-  let* i7 = i32_add i6 z in
-  i32_rem i5 i7
-
-(** [no_nested_borrows::CONST0]
-    Source: 'src/no_nested_borrows.rs', lines 125:0-125:23 *)
-let const0_body : result usize = usize_add 1 1
-let const0 : usize = eval_global const0_body
-
-(** [no_nested_borrows::CONST1]
-    Source: 'src/no_nested_borrows.rs', lines 126:0-126:23 *)
-let const1_body : result usize = usize_mul 2 2
-let const1 : usize = eval_global const1_body
-
 (** [no_nested_borrows::cast_u32_to_i32]:
-    Source: 'src/no_nested_borrows.rs', lines 128:0-128:37 *)
+    Source: 'src/no_nested_borrows.rs', lines 46:0-46:37 *)
 let cast_u32_to_i32 (x : u32) : result i32 =
   scalar_cast U32 I32 x
 
 (** [no_nested_borrows::cast_bool_to_i32]:
-    Source: 'src/no_nested_borrows.rs', lines 132:0-132:39 *)
+    Source: 'src/no_nested_borrows.rs', lines 50:0-50:39 *)
 let cast_bool_to_i32 (x : bool) : result i32 =
   scalar_cast_bool I32 x
 
 (** [no_nested_borrows::cast_bool_to_bool]:
-    Source: 'src/no_nested_borrows.rs', lines 137:0-137:41 *)
+    Source: 'src/no_nested_borrows.rs', lines 55:0-55:41 *)
 let cast_bool_to_bool (x : bool) : result bool =
   Ok x
 
 (** [no_nested_borrows::test2]:
-    Source: 'src/no_nested_borrows.rs', lines 142:0-142:14 *)
+    Source: 'src/no_nested_borrows.rs', lines 60:0-60:14 *)
 let test2 : result unit =
   let* _ = u32_add 23 44 in Ok ()
 
@@ -162,12 +61,12 @@ let test2 : result unit =
 let _ = assert_norm (test2 = Ok ())
 
 (** [no_nested_borrows::get_max]:
-    Source: 'src/no_nested_borrows.rs', lines 154:0-154:37 *)
+    Source: 'src/no_nested_borrows.rs', lines 72:0-72:37 *)
 let get_max (x : u32) (y : u32) : result u32 =
   if x >= y then Ok x else Ok y
 
 (** [no_nested_borrows::test3]:
-    Source: 'src/no_nested_borrows.rs', lines 162:0-162:14 *)
+    Source: 'src/no_nested_borrows.rs', lines 80:0-80:14 *)
 let test3 : result unit =
   let* x = get_max 4 3 in
   let* y = get_max 10 11 in
@@ -178,7 +77,7 @@ let test3 : result unit =
 let _ = assert_norm (test3 = Ok ())
 
 (** [no_nested_borrows::test_neg1]:
-    Source: 'src/no_nested_borrows.rs', lines 169:0-169:18 *)
+    Source: 'src/no_nested_borrows.rs', lines 87:0-87:18 *)
 let test_neg1 : result unit =
   let* y = i32_neg 3 in if not (y = -3) then Fail Failure else Ok ()
 
@@ -186,7 +85,7 @@ let test_neg1 : result unit =
 let _ = assert_norm (test_neg1 = Ok ())
 
 (** [no_nested_borrows::refs_test1]:
-    Source: 'src/no_nested_borrows.rs', lines 176:0-176:19 *)
+    Source: 'src/no_nested_borrows.rs', lines 94:0-94:19 *)
 let refs_test1 : result unit =
   if not (1 = 1) then Fail Failure else Ok ()
 
@@ -194,7 +93,7 @@ let refs_test1 : result unit =
 let _ = assert_norm (refs_test1 = Ok ())
 
 (** [no_nested_borrows::refs_test2]:
-    Source: 'src/no_nested_borrows.rs', lines 187:0-187:19 *)
+    Source: 'src/no_nested_borrows.rs', lines 105:0-105:19 *)
 let refs_test2 : result unit =
   if not (2 = 2)
   then Fail Failure
@@ -210,7 +109,7 @@ let refs_test2 : result unit =
 let _ = assert_norm (refs_test2 = Ok ())
 
 (** [no_nested_borrows::test_list1]:
-    Source: 'src/no_nested_borrows.rs', lines 203:0-203:19 *)
+    Source: 'src/no_nested_borrows.rs', lines 121:0-121:19 *)
 let test_list1 : result unit =
   Ok ()
 
@@ -218,7 +117,7 @@ let test_list1 : result unit =
 let _ = assert_norm (test_list1 = Ok ())
 
 (** [no_nested_borrows::test_box1]:
-    Source: 'src/no_nested_borrows.rs', lines 208:0-208:18 *)
+    Source: 'src/no_nested_borrows.rs', lines 126:0-126:18 *)
 let test_box1 : result unit =
   let* (_, deref_mut_back) = alloc_boxed_Box_deref_mut i32 0 in
   let* b = deref_mut_back 1 in
@@ -229,22 +128,22 @@ let test_box1 : result unit =
 let _ = assert_norm (test_box1 = Ok ())
 
 (** [no_nested_borrows::copy_int]:
-    Source: 'src/no_nested_borrows.rs', lines 218:0-218:30 *)
+    Source: 'src/no_nested_borrows.rs', lines 136:0-136:30 *)
 let copy_int (x : i32) : result i32 =
   Ok x
 
 (** [no_nested_borrows::test_unreachable]:
-    Source: 'src/no_nested_borrows.rs', lines 224:0-224:32 *)
+    Source: 'src/no_nested_borrows.rs', lines 142:0-142:32 *)
 let test_unreachable (b : bool) : result unit =
   if b then Fail Failure else Ok ()
 
 (** [no_nested_borrows::test_panic]:
-    Source: 'src/no_nested_borrows.rs', lines 232:0-232:26 *)
+    Source: 'src/no_nested_borrows.rs', lines 150:0-150:26 *)
 let test_panic (b : bool) : result unit =
   if b then Fail Failure else Ok ()
 
 (** [no_nested_borrows::test_copy_int]:
-    Source: 'src/no_nested_borrows.rs', lines 239:0-239:22 *)
+    Source: 'src/no_nested_borrows.rs', lines 157:0-157:22 *)
 let test_copy_int : result unit =
   let* y = copy_int 0 in if not (0 = y) then Fail Failure else Ok ()
 
@@ -252,12 +151,12 @@ let test_copy_int : result unit =
 let _ = assert_norm (test_copy_int = Ok ())
 
 (** [no_nested_borrows::is_cons]:
-    Source: 'src/no_nested_borrows.rs', lines 246:0-246:38 *)
+    Source: 'src/no_nested_borrows.rs', lines 164:0-164:38 *)
 let is_cons (t : Type0) (l : list_t t) : result bool =
   begin match l with | List_Cons _ _ -> Ok true | List_Nil -> Ok false end
 
 (** [no_nested_borrows::test_is_cons]:
-    Source: 'src/no_nested_borrows.rs', lines 253:0-253:21 *)
+    Source: 'src/no_nested_borrows.rs', lines 171:0-171:21 *)
 let test_is_cons : result unit =
   let* b = is_cons i32 (List_Cons 0 List_Nil) in
   if not b then Fail Failure else Ok ()
@@ -266,7 +165,7 @@ let test_is_cons : result unit =
 let _ = assert_norm (test_is_cons = Ok ())
 
 (** [no_nested_borrows::split_list]:
-    Source: 'src/no_nested_borrows.rs', lines 259:0-259:48 *)
+    Source: 'src/no_nested_borrows.rs', lines 177:0-177:48 *)
 let split_list (t : Type0) (l : list_t t) : result (t & (list_t t)) =
   begin match l with
   | List_Cons hd tl -> Ok (hd, tl)
@@ -274,7 +173,7 @@ let split_list (t : Type0) (l : list_t t) : result (t & (list_t t)) =
   end
 
 (** [no_nested_borrows::test_split_list]:
-    Source: 'src/no_nested_borrows.rs', lines 267:0-267:24 *)
+    Source: 'src/no_nested_borrows.rs', lines 185:0-185:24 *)
 let test_split_list : result unit =
   let* p = split_list i32 (List_Cons 0 List_Nil) in
   let (hd, _) = p in
@@ -284,7 +183,7 @@ let test_split_list : result unit =
 let _ = assert_norm (test_split_list = Ok ())
 
 (** [no_nested_borrows::choose]:
-    Source: 'src/no_nested_borrows.rs', lines 274:0-274:70 *)
+    Source: 'src/no_nested_borrows.rs', lines 192:0-192:70 *)
 let choose
   (t : Type0) (b : bool) (x : t) (y : t) : result (t & (t -> result (t & t))) =
   if b
@@ -292,7 +191,7 @@ let choose
   else let back = fun ret -> Ok (x, ret) in Ok (y, back)
 
 (** [no_nested_borrows::choose_test]:
-    Source: 'src/no_nested_borrows.rs', lines 282:0-282:20 *)
+    Source: 'src/no_nested_borrows.rs', lines 200:0-200:20 *)
 let choose_test : result unit =
   let* (z, choose_back) = choose i32 true 0 0 in
   let* z1 = i32_add z 1 in
@@ -308,24 +207,24 @@ let choose_test : result unit =
 let _ = assert_norm (choose_test = Ok ())
 
 (** [no_nested_borrows::test_char]:
-    Source: 'src/no_nested_borrows.rs', lines 294:0-294:26 *)
+    Source: 'src/no_nested_borrows.rs', lines 212:0-212:26 *)
 let test_char : result char =
   Ok 'a'
 
 (** [no_nested_borrows::Tree]
-    Source: 'src/no_nested_borrows.rs', lines 299:0-299:16 *)
+    Source: 'src/no_nested_borrows.rs', lines 217:0-217:16 *)
 type tree_t (t : Type0) =
 | Tree_Leaf : t -> tree_t t
 | Tree_Node : t -> nodeElem_t t -> tree_t t -> tree_t t
 
 (** [no_nested_borrows::NodeElem]
-    Source: 'src/no_nested_borrows.rs', lines 304:0-304:20 *)
+    Source: 'src/no_nested_borrows.rs', lines 222:0-222:20 *)
 and nodeElem_t (t : Type0) =
 | NodeElem_Cons : tree_t t -> nodeElem_t t -> nodeElem_t t
 | NodeElem_Nil : nodeElem_t t
 
 (** [no_nested_borrows::list_length]:
-    Source: 'src/no_nested_borrows.rs', lines 339:0-339:48 *)
+    Source: 'src/no_nested_borrows.rs', lines 257:0-257:48 *)
 let rec list_length (t : Type0) (l : list_t t) : result u32 =
   begin match l with
   | List_Cons _ l1 -> let* i = list_length t l1 in u32_add 1 i
@@ -333,7 +232,7 @@ let rec list_length (t : Type0) (l : list_t t) : result u32 =
   end
 
 (** [no_nested_borrows::list_nth_shared]:
-    Source: 'src/no_nested_borrows.rs', lines 347:0-347:62 *)
+    Source: 'src/no_nested_borrows.rs', lines 265:0-265:62 *)
 let rec list_nth_shared (t : Type0) (l : list_t t) (i : u32) : result t =
   begin match l with
   | List_Cons x tl ->
@@ -342,7 +241,7 @@ let rec list_nth_shared (t : Type0) (l : list_t t) (i : u32) : result t =
   end
 
 (** [no_nested_borrows::list_nth_mut]:
-    Source: 'src/no_nested_borrows.rs', lines 363:0-363:67 *)
+    Source: 'src/no_nested_borrows.rs', lines 281:0-281:67 *)
 let rec list_nth_mut
   (t : Type0) (l : list_t t) (i : u32) :
   result (t & (t -> result (list_t t)))
@@ -361,7 +260,7 @@ let rec list_nth_mut
   end
 
 (** [no_nested_borrows::list_rev_aux]:
-    Source: 'src/no_nested_borrows.rs', lines 379:0-379:63 *)
+    Source: 'src/no_nested_borrows.rs', lines 297:0-297:63 *)
 let rec list_rev_aux
   (t : Type0) (li : list_t t) (lo : list_t t) : result (list_t t) =
   begin match li with
@@ -370,13 +269,13 @@ let rec list_rev_aux
   end
 
 (** [no_nested_borrows::list_rev]:
-    Source: 'src/no_nested_borrows.rs', lines 393:0-393:42 *)
+    Source: 'src/no_nested_borrows.rs', lines 311:0-311:42 *)
 let list_rev (t : Type0) (l : list_t t) : result (list_t t) =
   let (li, _) = core_mem_replace (list_t t) l List_Nil in
   list_rev_aux t li List_Nil
 
 (** [no_nested_borrows::test_list_functions]:
-    Source: 'src/no_nested_borrows.rs', lines 398:0-398:28 *)
+    Source: 'src/no_nested_borrows.rs', lines 316:0-316:28 *)
 let test_list_functions : result unit =
   let l = List_Cons 2 List_Nil in
   let l1 = List_Cons 1 l in
@@ -413,7 +312,7 @@ let test_list_functions : result unit =
 let _ = assert_norm (test_list_functions = Ok ())
 
 (** [no_nested_borrows::id_mut_pair1]:
-    Source: 'src/no_nested_borrows.rs', lines 414:0-414:89 *)
+    Source: 'src/no_nested_borrows.rs', lines 332:0-332:89 *)
 let id_mut_pair1
   (t1 t2 : Type0) (x : t1) (y : t2) :
   result ((t1 & t2) & ((t1 & t2) -> result (t1 & t2)))
@@ -421,7 +320,7 @@ let id_mut_pair1
   Ok ((x, y), Ok)
 
 (** [no_nested_borrows::id_mut_pair2]:
-    Source: 'src/no_nested_borrows.rs', lines 418:0-418:88 *)
+    Source: 'src/no_nested_borrows.rs', lines 336:0-336:88 *)
 let id_mut_pair2
   (t1 t2 : Type0) (p : (t1 & t2)) :
   result ((t1 & t2) & ((t1 & t2) -> result (t1 & t2)))
@@ -429,7 +328,7 @@ let id_mut_pair2
   let (x, x1) = p in Ok ((x, x1), Ok)
 
 (** [no_nested_borrows::id_mut_pair3]:
-    Source: 'src/no_nested_borrows.rs', lines 422:0-422:93 *)
+    Source: 'src/no_nested_borrows.rs', lines 340:0-340:93 *)
 let id_mut_pair3
   (t1 t2 : Type0) (x : t1) (y : t2) :
   result ((t1 & t2) & (t1 -> result t1) & (t2 -> result t2))
@@ -437,7 +336,7 @@ let id_mut_pair3
   Ok ((x, y), Ok, Ok)
 
 (** [no_nested_borrows::id_mut_pair4]:
-    Source: 'src/no_nested_borrows.rs', lines 426:0-426:92 *)
+    Source: 'src/no_nested_borrows.rs', lines 344:0-344:92 *)
 let id_mut_pair4
   (t1 t2 : Type0) (p : (t1 & t2)) :
   result ((t1 & t2) & (t1 -> result t1) & (t2 -> result t2))
@@ -445,35 +344,35 @@ let id_mut_pair4
   let (x, x1) = p in Ok ((x, x1), Ok, Ok)
 
 (** [no_nested_borrows::StructWithTuple]
-    Source: 'src/no_nested_borrows.rs', lines 433:0-433:34 *)
+    Source: 'src/no_nested_borrows.rs', lines 351:0-351:34 *)
 type structWithTuple_t (t1 t2 : Type0) = { p : (t1 & t2); }
 
 (** [no_nested_borrows::new_tuple1]:
-    Source: 'src/no_nested_borrows.rs', lines 437:0-437:48 *)
+    Source: 'src/no_nested_borrows.rs', lines 355:0-355:48 *)
 let new_tuple1 : result (structWithTuple_t u32 u32) =
   Ok { p = (1, 2) }
 
 (** [no_nested_borrows::new_tuple2]:
-    Source: 'src/no_nested_borrows.rs', lines 441:0-441:48 *)
+    Source: 'src/no_nested_borrows.rs', lines 359:0-359:48 *)
 let new_tuple2 : result (structWithTuple_t i16 i16) =
   Ok { p = (1, 2) }
 
 (** [no_nested_borrows::new_tuple3]:
-    Source: 'src/no_nested_borrows.rs', lines 445:0-445:48 *)
+    Source: 'src/no_nested_borrows.rs', lines 363:0-363:48 *)
 let new_tuple3 : result (structWithTuple_t u64 i64) =
   Ok { p = (1, 2) }
 
 (** [no_nested_borrows::StructWithPair]
-    Source: 'src/no_nested_borrows.rs', lines 450:0-450:33 *)
+    Source: 'src/no_nested_borrows.rs', lines 368:0-368:33 *)
 type structWithPair_t (t1 t2 : Type0) = { p : pair_t t1 t2; }
 
 (** [no_nested_borrows::new_pair1]:
-    Source: 'src/no_nested_borrows.rs', lines 454:0-454:46 *)
+    Source: 'src/no_nested_borrows.rs', lines 372:0-372:46 *)
 let new_pair1 : result (structWithPair_t u32 u32) =
   Ok { p = { x = 1; y = 2 } }
 
 (** [no_nested_borrows::test_constants]:
-    Source: 'src/no_nested_borrows.rs', lines 462:0-462:23 *)
+    Source: 'src/no_nested_borrows.rs', lines 380:0-380:23 *)
 let test_constants : result unit =
   let* swt = new_tuple1 in
   let (i, _) = swt.p in
@@ -497,7 +396,7 @@ let test_constants : result unit =
 let _ = assert_norm (test_constants = Ok ())
 
 (** [no_nested_borrows::test_weird_borrows1]:
-    Source: 'src/no_nested_borrows.rs', lines 471:0-471:28 *)
+    Source: 'src/no_nested_borrows.rs', lines 389:0-389:28 *)
 let test_weird_borrows1 : result unit =
   Ok ()
 
@@ -505,71 +404,71 @@ let test_weird_borrows1 : result unit =
 let _ = assert_norm (test_weird_borrows1 = Ok ())
 
 (** [no_nested_borrows::test_mem_replace]:
-    Source: 'src/no_nested_borrows.rs', lines 481:0-481:37 *)
+    Source: 'src/no_nested_borrows.rs', lines 399:0-399:37 *)
 let test_mem_replace (px : u32) : result u32 =
   let (y, _) = core_mem_replace u32 px 1 in
   if not (y = 0) then Fail Failure else Ok 2
 
 (** [no_nested_borrows::test_shared_borrow_bool1]:
-    Source: 'src/no_nested_borrows.rs', lines 488:0-488:47 *)
+    Source: 'src/no_nested_borrows.rs', lines 406:0-406:47 *)
 let test_shared_borrow_bool1 (b : bool) : result u32 =
   if b then Ok 0 else Ok 1
 
 (** [no_nested_borrows::test_shared_borrow_bool2]:
-    Source: 'src/no_nested_borrows.rs', lines 501:0-501:40 *)
+    Source: 'src/no_nested_borrows.rs', lines 419:0-419:40 *)
 let test_shared_borrow_bool2 : result u32 =
   Ok 0
 
 (** [no_nested_borrows::test_shared_borrow_enum1]:
-    Source: 'src/no_nested_borrows.rs', lines 516:0-516:52 *)
+    Source: 'src/no_nested_borrows.rs', lines 434:0-434:52 *)
 let test_shared_borrow_enum1 (l : list_t u32) : result u32 =
   begin match l with | List_Cons _ _ -> Ok 1 | List_Nil -> Ok 0 end
 
 (** [no_nested_borrows::test_shared_borrow_enum2]:
-    Source: 'src/no_nested_borrows.rs', lines 528:0-528:40 *)
+    Source: 'src/no_nested_borrows.rs', lines 446:0-446:40 *)
 let test_shared_borrow_enum2 : result u32 =
   Ok 0
 
 (** [no_nested_borrows::incr]:
-    Source: 'src/no_nested_borrows.rs', lines 539:0-539:24 *)
+    Source: 'src/no_nested_borrows.rs', lines 457:0-457:24 *)
 let incr (x : u32) : result u32 =
   u32_add x 1
 
 (** [no_nested_borrows::call_incr]:
-    Source: 'src/no_nested_borrows.rs', lines 543:0-543:35 *)
+    Source: 'src/no_nested_borrows.rs', lines 461:0-461:35 *)
 let call_incr (x : u32) : result u32 =
   incr x
 
 (** [no_nested_borrows::read_then_incr]:
-    Source: 'src/no_nested_borrows.rs', lines 548:0-548:41 *)
+    Source: 'src/no_nested_borrows.rs', lines 466:0-466:41 *)
 let read_then_incr (x : u32) : result (u32 & u32) =
   let* x1 = u32_add x 1 in Ok (x, x1)
 
 (** [no_nested_borrows::Tuple]
-    Source: 'src/no_nested_borrows.rs', lines 554:0-554:24 *)
+    Source: 'src/no_nested_borrows.rs', lines 472:0-472:24 *)
 type tuple_t (t1 t2 : Type0) = t1 * t2
 
 (** [no_nested_borrows::use_tuple_struct]:
-    Source: 'src/no_nested_borrows.rs', lines 556:0-556:48 *)
+    Source: 'src/no_nested_borrows.rs', lines 474:0-474:48 *)
 let use_tuple_struct (x : tuple_t u32 u32) : result (tuple_t u32 u32) =
   let (_, i) = x in Ok (1, i)
 
 (** [no_nested_borrows::create_tuple_struct]:
-    Source: 'src/no_nested_borrows.rs', lines 560:0-560:61 *)
+    Source: 'src/no_nested_borrows.rs', lines 478:0-478:61 *)
 let create_tuple_struct (x : u32) (y : u64) : result (tuple_t u32 u64) =
   Ok (x, y)
 
 (** [no_nested_borrows::IdType]
-    Source: 'src/no_nested_borrows.rs', lines 565:0-565:20 *)
+    Source: 'src/no_nested_borrows.rs', lines 483:0-483:20 *)
 type idType_t (t : Type0) = t
 
 (** [no_nested_borrows::use_id_type]:
-    Source: 'src/no_nested_borrows.rs', lines 567:0-567:40 *)
+    Source: 'src/no_nested_borrows.rs', lines 485:0-485:40 *)
 let use_id_type (t : Type0) (x : idType_t t) : result t =
   Ok x
 
 (** [no_nested_borrows::create_id_type]:
-    Source: 'src/no_nested_borrows.rs', lines 571:0-571:43 *)
+    Source: 'src/no_nested_borrows.rs', lines 489:0-489:43 *)
 let create_id_type (t : Type0) (x : t) : result (idType_t t) =
   Ok x