Merge branch 'main' into option-take

3 files changed, 56 insertions, 161 deletions

diff --git a/tests/lean/External/Opaque.lean b/tests/lean/External/Opaque.lean
index d0297523..6cec334f 100644
--- a/tests/lean/External/Opaque.lean
+++ b/tests/lean/External/Opaque.lean
@@ -1,4 +1,3 @@
--- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS
 -- [external]: opaque function definitions
 import Base
 import External.Types
diff --git a/tests/lean/HashmapMain/Opaque.lean b/tests/lean/HashmapMain/Opaque.lean
index abf04c94..a410b253 100644
--- a/tests/lean/HashmapMain/Opaque.lean
+++ b/tests/lean/HashmapMain/Opaque.lean
@@ -1,4 +1,3 @@
--- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS
 -- [hashmap_main]: opaque function definitions
 import Base
 import HashmapMain.Types
diff --git a/tests/lean/NoNestedBorrows.lean b/tests/lean/NoNestedBorrows.lean
index 7d28f7f9..66ec917b 100644
--- a/tests/lean/NoNestedBorrows.lean
+++ b/tests/lean/NoNestedBorrows.lean
@@ -43,126 +43,23 @@ inductive Sum (T1 T2 : Type) :=
 | Left : T1 → Sum T1 T2
 | Right : T2 → Sum T1 T2
 
-/- [no_nested_borrows::neg_test]:
-   Source: 'src/no_nested_borrows.rs', lines 48:0-48:30 -/
-def neg_test (x : I32) : Result I32 :=
-  -. x
-
-/- [no_nested_borrows::add_u32]:
-   Source: 'src/no_nested_borrows.rs', lines 54:0-54:37 -/
-def add_u32 (x : U32) (y : U32) : Result U32 :=
-  x + y
-
-/- [no_nested_borrows::subs_u32]:
-   Source: 'src/no_nested_borrows.rs', lines 60:0-60:38 -/
-def subs_u32 (x : U32) (y : U32) : Result U32 :=
-  x - y
-
-/- [no_nested_borrows::div_u32]:
-   Source: 'src/no_nested_borrows.rs', lines 66:0-66:37 -/
-def div_u32 (x : U32) (y : U32) : Result U32 :=
-  x / y
-
-/- [no_nested_borrows::div_u32_const]:
-   Source: 'src/no_nested_borrows.rs', lines 73:0-73:35 -/
-def div_u32_const (x : U32) : Result U32 :=
-  x / 2#u32
-
-/- [no_nested_borrows::rem_u32]:
-   Source: 'src/no_nested_borrows.rs', lines 78:0-78:37 -/
-def rem_u32 (x : U32) (y : U32) : Result U32 :=
-  x % y
-
-/- [no_nested_borrows::mul_u32]:
-   Source: 'src/no_nested_borrows.rs', lines 82:0-82:37 -/
-def mul_u32 (x : U32) (y : U32) : Result U32 :=
-  x * y
-
-/- [no_nested_borrows::add_i32]:
-   Source: 'src/no_nested_borrows.rs', lines 88:0-88:37 -/
-def add_i32 (x : I32) (y : I32) : Result I32 :=
-  x + y
-
-/- [no_nested_borrows::subs_i32]:
-   Source: 'src/no_nested_borrows.rs', lines 92:0-92:38 -/
-def subs_i32 (x : I32) (y : I32) : Result I32 :=
-  x - y
-
-/- [no_nested_borrows::div_i32]:
-   Source: 'src/no_nested_borrows.rs', lines 96:0-96:37 -/
-def div_i32 (x : I32) (y : I32) : Result I32 :=
-  x / y
-
-/- [no_nested_borrows::div_i32_const]:
-   Source: 'src/no_nested_borrows.rs', lines 100:0-100:35 -/
-def div_i32_const (x : I32) : Result I32 :=
-  x / 2#i32
-
-/- [no_nested_borrows::rem_i32]:
-   Source: 'src/no_nested_borrows.rs', lines 104:0-104:37 -/
-def rem_i32 (x : I32) (y : I32) : Result I32 :=
-  x % y
-
-/- [no_nested_borrows::mul_i32]:
-   Source: 'src/no_nested_borrows.rs', lines 108:0-108:37 -/
-def mul_i32 (x : I32) (y : I32) : Result I32 :=
-  x * y
-
-/- [no_nested_borrows::mix_arith_u32]:
-   Source: 'src/no_nested_borrows.rs', lines 112:0-112:51 -/
-def mix_arith_u32 (x : U32) (y : U32) (z : U32) : Result U32 :=
-  do
-  let i ← x + y
-  let i1 ← x / y
-  let i2 ← i * i1
-  let i3 ← z % y
-  let i4 ← x - i3
-  let i5 ← i2 + i4
-  let i6 ← x + y
-  let i7 ← i6 + z
-  i5 % i7
-
-/- [no_nested_borrows::mix_arith_i32]:
-   Source: 'src/no_nested_borrows.rs', lines 116:0-116:51 -/
-def mix_arith_i32 (x : I32) (y : I32) (z : I32) : Result I32 :=
-  do
-  let i ← x + y
-  let i1 ← x / y
-  let i2 ← i * i1
-  let i3 ← z % y
-  let i4 ← x - i3
-  let i5 ← i2 + i4
-  let i6 ← x + y
-  let i7 ← i6 + z
-  i5 % i7
-
-/- [no_nested_borrows::CONST0]
-   Source: 'src/no_nested_borrows.rs', lines 125:0-125:23 -/
-def CONST0_body : Result Usize := 1#usize + 1#usize
-def CONST0 : Usize := eval_global CONST0_body
-
-/- [no_nested_borrows::CONST1]
-   Source: 'src/no_nested_borrows.rs', lines 126:0-126:23 -/
-def CONST1_body : Result Usize := 2#usize * 2#usize
-def 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 -/
 def cast_u32_to_i32 (x : U32) : Result I32 :=
   Scalar.cast .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 -/
 def 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 -/
 def cast_bool_to_bool (x : Bool) : Result Bool :=
   Result.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 -/
 def test2 : Result Unit :=
   do
   let _ ← 23#u32 + 44#u32
@@ -172,14 +69,14 @@ def test2 : Result Unit :=
 #assert (test2 == Result.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 -/
 def get_max (x : U32) (y : U32) : Result U32 :=
   if x >= y
   then Result.ok x
   else Result.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 -/
 def test3 : Result Unit :=
   do
   let x ← get_max 4#u32 3#u32
@@ -193,7 +90,7 @@ def test3 : Result Unit :=
 #assert (test3 == Result.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 -/
 def test_neg1 : Result Unit :=
   do
   let y ← -. 3#i32
@@ -205,7 +102,7 @@ def test_neg1 : Result Unit :=
 #assert (test_neg1 == Result.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 -/
 def refs_test1 : Result Unit :=
   if ¬ (1#i32 = 1#i32)
   then Result.fail .panic
@@ -215,7 +112,7 @@ def refs_test1 : Result Unit :=
 #assert (refs_test1 == Result.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 -/
 def refs_test2 : Result Unit :=
   if ¬ (2#i32 = 2#i32)
   then Result.fail .panic
@@ -233,7 +130,7 @@ def refs_test2 : Result Unit :=
 #assert (refs_test2 == Result.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 -/
 def test_list1 : Result Unit :=
   Result.ok ()
 
@@ -241,7 +138,7 @@ def test_list1 : Result Unit :=
 #assert (test_list1 == Result.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 -/
 def test_box1 : Result Unit :=
   do
   let (_, deref_mut_back) ← alloc.boxed.Box.deref_mut I32 0#i32
@@ -255,26 +152,26 @@ def test_box1 : Result Unit :=
 #assert (test_box1 == Result.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 -/
 def copy_int (x : I32) : Result I32 :=
   Result.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 -/
 def test_unreachable (b : Bool) : Result Unit :=
   if b
   then Result.fail .panic
   else Result.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 -/
 def test_panic (b : Bool) : Result Unit :=
   if b
   then Result.fail .panic
   else Result.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 -/
 def test_copy_int : Result Unit :=
   do
   let y ← copy_int 0#i32
@@ -286,14 +183,14 @@ def test_copy_int : Result Unit :=
 #assert (test_copy_int == Result.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 -/
 def is_cons (T : Type) (l : List T) : Result Bool :=
   match l with
   | List.Cons _ _ => Result.ok true
   | List.Nil => Result.ok false
 
 /- [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 -/
 def test_is_cons : Result Unit :=
   do
   let b ← is_cons I32 (List.Cons 0#i32 List.Nil)
@@ -305,14 +202,14 @@ def test_is_cons : Result Unit :=
 #assert (test_is_cons == Result.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 -/
 def split_list (T : Type) (l : List T) : Result (T × (List T)) :=
   match l with
   | List.Cons hd tl => Result.ok (hd, tl)
   | List.Nil => Result.fail .panic
 
 /- [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 -/
 def test_split_list : Result Unit :=
   do
   let p ← split_list I32 (List.Cons 0#i32 List.Nil)
@@ -325,7 +222,7 @@ def test_split_list : Result Unit :=
 #assert (test_split_list == Result.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 -/
 def choose
   (T : Type) (b : Bool) (x : T) (y : T) :
   Result (T × (T → Result (T × T)))
@@ -337,7 +234,7 @@ def choose
        Result.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 -/
 def choose_test : Result Unit :=
   do
   let (z, choose_back) ← choose I32 true 0#i32 0#i32
@@ -357,20 +254,20 @@ def choose_test : Result Unit :=
 #assert (choose_test == Result.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 -/
 def test_char : Result Char :=
   Result.ok 'a'
 
 mutual
 
 /- [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 -/
 inductive Tree (T : Type) :=
 | Leaf : T → Tree T
 | Node : T → NodeElem T → Tree T → Tree 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 -/
 inductive NodeElem (T : Type) :=
 | Cons : Tree T → NodeElem T → NodeElem T
 | Nil : NodeElem T
@@ -378,7 +275,7 @@ inductive NodeElem (T : Type) :=
 end
 
 /- [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 -/
 divergent def list_length (T : Type) (l : List T) : Result U32 :=
   match l with
   | List.Cons _ l1 => do
@@ -387,7 +284,7 @@ divergent def list_length (T : Type) (l : List T) : Result U32 :=
   | List.Nil => Result.ok 0#u32
 
 /- [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 -/
 divergent def list_nth_shared (T : Type) (l : List T) (i : U32) : Result T :=
   match l with
   | List.Cons x tl =>
@@ -399,7 +296,7 @@ divergent def list_nth_shared (T : Type) (l : List T) (i : U32) : Result T :=
   | List.Nil => Result.fail .panic
 
 /- [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 -/
 divergent def list_nth_mut
   (T : Type) (l : List T) (i : U32) : Result (T × (T → Result (List T))) :=
   match l with
@@ -421,7 +318,7 @@ divergent def list_nth_mut
   | List.Nil => Result.fail .panic
 
 /- [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 -/
 divergent def list_rev_aux
   (T : Type) (li : List T) (lo : List T) : Result (List T) :=
   match li with
@@ -429,13 +326,13 @@ divergent def list_rev_aux
   | List.Nil => Result.ok lo
 
 /- [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 -/
 def list_rev (T : Type) (l : List T) : Result (List T) :=
   let (li, _) := core.mem.replace (List T) l List.Nil
   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 -/
 def test_list_functions : Result Unit :=
   do
   let l := List.Cons 2#i32 List.Nil
@@ -482,7 +379,7 @@ def test_list_functions : Result Unit :=
 #assert (test_list_functions == Result.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 -/
 def id_mut_pair1
   (T1 T2 : Type) (x : T1) (y : T2) :
   Result ((T1 × T2) × ((T1 × T2) → Result (T1 × T2)))
@@ -490,7 +387,7 @@ def id_mut_pair1
   Result.ok ((x, y), Result.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 -/
 def id_mut_pair2
   (T1 T2 : Type) (p : (T1 × T2)) :
   Result ((T1 × T2) × ((T1 × T2) → Result (T1 × T2)))
@@ -499,7 +396,7 @@ def id_mut_pair2
   Result.ok ((t, t1), Result.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 -/
 def id_mut_pair3
   (T1 T2 : Type) (x : T1) (y : T2) :
   Result ((T1 × T2) × (T1 → Result T1) × (T2 → Result T2))
@@ -507,7 +404,7 @@ def id_mut_pair3
   Result.ok ((x, y), Result.ok, Result.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 -/
 def id_mut_pair4
   (T1 T2 : Type) (p : (T1 × T2)) :
   Result ((T1 × T2) × (T1 → Result T1) × (T2 → Result T2))
@@ -516,37 +413,37 @@ def id_mut_pair4
   Result.ok ((t, t1), Result.ok, Result.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 -/
 structure StructWithTuple (T1 T2 : Type) where
   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 -/
 def new_tuple1 : Result (StructWithTuple U32 U32) :=
   Result.ok { p := (1#u32, 2#u32) }
 
 /- [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 -/
 def new_tuple2 : Result (StructWithTuple I16 I16) :=
   Result.ok { p := (1#i16, 2#i16) }
 
 /- [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 -/
 def new_tuple3 : Result (StructWithTuple U64 I64) :=
   Result.ok { p := (1#u64, 2#i64) }
 
 /- [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 -/
 structure StructWithPair (T1 T2 : Type) where
   p : Pair 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 -/
 def new_pair1 : Result (StructWithPair U32 U32) :=
   Result.ok { p := { x := 1#u32, y := 2#u32 } }
 
 /- [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 -/
 def test_constants : Result Unit :=
   do
   let swt ← new_tuple1
@@ -576,7 +473,7 @@ def test_constants : Result Unit :=
 #assert (test_constants == Result.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 -/
 def test_weird_borrows1 : Result Unit :=
   Result.ok ()
 
@@ -584,7 +481,7 @@ def test_weird_borrows1 : Result Unit :=
 #assert (test_weird_borrows1 == Result.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 -/
 def test_mem_replace (px : U32) : Result U32 :=
   let (y, _) := core.mem.replace U32 px 1#u32
   if ¬ (y = 0#u32)
@@ -592,71 +489,71 @@ def test_mem_replace (px : U32) : Result U32 :=
   else Result.ok 2#u32
 
 /- [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 -/
 def test_shared_borrow_bool1 (b : Bool) : Result U32 :=
   if b
   then Result.ok 0#u32
   else Result.ok 1#u32
 
 /- [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 -/
 def test_shared_borrow_bool2 : Result U32 :=
   Result.ok 0#u32
 
 /- [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 -/
 def test_shared_borrow_enum1 (l : List U32) : Result U32 :=
   match l with
   | List.Cons _ _ => Result.ok 1#u32
   | List.Nil => Result.ok 0#u32
 
 /- [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 -/
 def test_shared_borrow_enum2 : Result U32 :=
   Result.ok 0#u32
 
 /- [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 -/
 def incr (x : U32) : Result U32 :=
   x + 1#u32
 
 /- [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 -/
 def 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 -/
 def read_then_incr (x : U32) : Result (U32 × U32) :=
   do
   let x1 ← x + 1#u32
   Result.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 -/
 def Tuple (T1 T2 : Type) := 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 -/
 def use_tuple_struct (x : Tuple U32 U32) : Result (Tuple U32 U32) :=
   Result.ok (1#u32, x.#1)
 
 /- [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 -/
 def create_tuple_struct (x : U32) (y : U64) : Result (Tuple U32 U64) :=
   Result.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 -/
 @[reducible] def IdType (T : Type) := 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 -/
 def use_id_type (T : Type) (x : IdType T) : Result T :=
   Result.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 -/
 def create_id_type (T : Type) (x : T) : Result (IdType T) :=
   Result.ok x