summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/coq/misc/NoNestedBorrows.v73
-rw-r--r--tests/fstar/misc/NoNestedBorrows.fst73
-rw-r--r--tests/lean/NoNestedBorrows.lean73
-rw-r--r--tests/src/no_nested_borrows.rs7
4 files changed, 123 insertions, 103 deletions
diff --git a/tests/coq/misc/NoNestedBorrows.v b/tests/coq/misc/NoNestedBorrows.v
index a83347a7..de31fec7 100644
--- a/tests/coq/misc/NoNestedBorrows.v
+++ b/tests/coq/misc/NoNestedBorrows.v
@@ -243,14 +243,19 @@ Check (choose_test )%return.
Definition test_char : result char :=
Ok (char_of_byte Coq.Init.Byte.x61).
+(** [no_nested_borrows::panic_mut_borrow]:
+ Source: 'tests/src/no_nested_borrows.rs', lines 217:0-217:36 *)
+Definition panic_mut_borrow (i : u32) : result u32 :=
+ Fail_ Failure.
+
(** [no_nested_borrows::Tree]
- Source: 'tests/src/no_nested_borrows.rs', lines 217:0-217:16 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 222:0-222:16 *)
Inductive Tree_t (T : Type) :=
| Tree_Leaf : T -> Tree_t T
| Tree_Node : T -> NodeElem_t T -> Tree_t T -> Tree_t T
(** [no_nested_borrows::NodeElem]
- Source: 'tests/src/no_nested_borrows.rs', lines 222:0-222:20 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 227:0-227:20 *)
with NodeElem_t (T : Type) :=
| NodeElem_Cons : Tree_t T -> NodeElem_t T -> NodeElem_t T
| NodeElem_Nil : NodeElem_t T
@@ -263,7 +268,7 @@ Arguments NodeElem_Cons { _ }.
Arguments NodeElem_Nil { _ }.
(** [no_nested_borrows::list_length]:
- Source: 'tests/src/no_nested_borrows.rs', lines 257:0-257:48 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 262:0-262:48 *)
Fixpoint list_length (T : Type) (l : List_t T) : result u32 :=
match l with
| List_Cons _ l1 => i <- list_length T l1; u32_add 1%u32 i
@@ -272,7 +277,7 @@ Fixpoint list_length (T : Type) (l : List_t T) : result u32 :=
.
(** [no_nested_borrows::list_nth_shared]:
- Source: 'tests/src/no_nested_borrows.rs', lines 265:0-265:62 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 270:0-270:62 *)
Fixpoint list_nth_shared (T : Type) (l : List_t T) (i : u32) : result T :=
match l with
| List_Cons x tl =>
@@ -284,7 +289,7 @@ Fixpoint list_nth_shared (T : Type) (l : List_t T) (i : u32) : result T :=
.
(** [no_nested_borrows::list_nth_mut]:
- Source: 'tests/src/no_nested_borrows.rs', lines 281:0-281:67 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 286:0-286:67 *)
Fixpoint list_nth_mut
(T : Type) (l : List_t T) (i : u32) :
result (T * (T -> result (List_t T)))
@@ -305,7 +310,7 @@ Fixpoint list_nth_mut
.
(** [no_nested_borrows::list_rev_aux]:
- Source: 'tests/src/no_nested_borrows.rs', lines 297:0-297:63 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 302:0-302:63 *)
Fixpoint list_rev_aux
(T : Type) (li : List_t T) (lo : List_t T) : result (List_t T) :=
match li with
@@ -315,14 +320,14 @@ Fixpoint list_rev_aux
.
(** [no_nested_borrows::list_rev]:
- Source: 'tests/src/no_nested_borrows.rs', lines 311:0-311:42 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 316:0-316:42 *)
Definition list_rev (T : Type) (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: 'tests/src/no_nested_borrows.rs', lines 316:0-316:28 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 321:0-321:28 *)
Definition test_list_functions : result unit :=
let l := List_Cons 2%i32 List_Nil in
let l1 := List_Cons 1%i32 l in
@@ -361,7 +366,7 @@ Definition test_list_functions : result unit :=
Check (test_list_functions )%return.
(** [no_nested_borrows::id_mut_pair1]:
- Source: 'tests/src/no_nested_borrows.rs', lines 332:0-332:89 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 337:0-337:89 *)
Definition id_mut_pair1
(T1 T2 : Type) (x : T1) (y : T2) :
result ((T1 * T2) * ((T1 * T2) -> result (T1 * T2)))
@@ -370,7 +375,7 @@ Definition id_mut_pair1
.
(** [no_nested_borrows::id_mut_pair2]:
- Source: 'tests/src/no_nested_borrows.rs', lines 336:0-336:88 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 341:0-341:88 *)
Definition id_mut_pair2
(T1 T2 : Type) (p : (T1 * T2)) :
result ((T1 * T2) * ((T1 * T2) -> result (T1 * T2)))
@@ -379,7 +384,7 @@ Definition id_mut_pair2
.
(** [no_nested_borrows::id_mut_pair3]:
- Source: 'tests/src/no_nested_borrows.rs', lines 340:0-340:93 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 345:0-345:93 *)
Definition id_mut_pair3
(T1 T2 : Type) (x : T1) (y : T2) :
result ((T1 * T2) * (T1 -> result T1) * (T2 -> result T2))
@@ -388,7 +393,7 @@ Definition id_mut_pair3
.
(** [no_nested_borrows::id_mut_pair4]:
- Source: 'tests/src/no_nested_borrows.rs', lines 344:0-344:92 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 349:0-349:92 *)
Definition id_mut_pair4
(T1 T2 : Type) (p : (T1 * T2)) :
result ((T1 * T2) * (T1 -> result T1) * (T2 -> result T2))
@@ -397,7 +402,7 @@ Definition id_mut_pair4
.
(** [no_nested_borrows::StructWithTuple]
- Source: 'tests/src/no_nested_borrows.rs', lines 351:0-351:34 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 356:0-356:34 *)
Record StructWithTuple_t (T1 T2 : Type) :=
mkStructWithTuple_t {
structWithTuple_p : (T1 * T2);
@@ -408,25 +413,25 @@ Arguments mkStructWithTuple_t { _ _ }.
Arguments structWithTuple_p { _ _ }.
(** [no_nested_borrows::new_tuple1]:
- Source: 'tests/src/no_nested_borrows.rs', lines 355:0-355:48 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 360:0-360:48 *)
Definition new_tuple1 : result (StructWithTuple_t u32 u32) :=
Ok {| structWithTuple_p := (1%u32, 2%u32) |}
.
(** [no_nested_borrows::new_tuple2]:
- Source: 'tests/src/no_nested_borrows.rs', lines 359:0-359:48 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 364:0-364:48 *)
Definition new_tuple2 : result (StructWithTuple_t i16 i16) :=
Ok {| structWithTuple_p := (1%i16, 2%i16) |}
.
(** [no_nested_borrows::new_tuple3]:
- Source: 'tests/src/no_nested_borrows.rs', lines 363:0-363:48 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 368:0-368:48 *)
Definition new_tuple3 : result (StructWithTuple_t u64 i64) :=
Ok {| structWithTuple_p := (1%u64, 2%i64) |}
.
(** [no_nested_borrows::StructWithPair]
- Source: 'tests/src/no_nested_borrows.rs', lines 368:0-368:33 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 373:0-373:33 *)
Record StructWithPair_t (T1 T2 : Type) :=
mkStructWithPair_t {
structWithPair_p : Pair_t T1 T2;
@@ -437,13 +442,13 @@ Arguments mkStructWithPair_t { _ _ }.
Arguments structWithPair_p { _ _ }.
(** [no_nested_borrows::new_pair1]:
- Source: 'tests/src/no_nested_borrows.rs', lines 372:0-372:46 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 377:0-377:46 *)
Definition new_pair1 : result (StructWithPair_t u32 u32) :=
Ok {| structWithPair_p := {| pair_x := 1%u32; pair_y := 2%u32 |} |}
.
(** [no_nested_borrows::test_constants]:
- Source: 'tests/src/no_nested_borrows.rs', lines 380:0-380:23 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 385:0-385:23 *)
Definition test_constants : result unit :=
swt <- new_tuple1;
let (i, _) := swt.(structWithTuple_p) in
@@ -470,7 +475,7 @@ Definition test_constants : result unit :=
Check (test_constants )%return.
(** [no_nested_borrows::test_weird_borrows1]:
- Source: 'tests/src/no_nested_borrows.rs', lines 389:0-389:28 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 394:0-394:28 *)
Definition test_weird_borrows1 : result unit :=
Ok tt.
@@ -478,78 +483,78 @@ Definition test_weird_borrows1 : result unit :=
Check (test_weird_borrows1 )%return.
(** [no_nested_borrows::test_mem_replace]:
- Source: 'tests/src/no_nested_borrows.rs', lines 399:0-399:37 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 404:0-404:37 *)
Definition test_mem_replace (px : u32) : result u32 :=
let (y, _) := core_mem_replace u32 px 1%u32 in
if negb (y s= 0%u32) then Fail_ Failure else Ok 2%u32
.
(** [no_nested_borrows::test_shared_borrow_bool1]:
- Source: 'tests/src/no_nested_borrows.rs', lines 406:0-406:47 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 411:0-411:47 *)
Definition test_shared_borrow_bool1 (b : bool) : result u32 :=
if b then Ok 0%u32 else Ok 1%u32
.
(** [no_nested_borrows::test_shared_borrow_bool2]:
- Source: 'tests/src/no_nested_borrows.rs', lines 419:0-419:40 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 424:0-424:40 *)
Definition test_shared_borrow_bool2 : result u32 :=
Ok 0%u32.
(** [no_nested_borrows::test_shared_borrow_enum1]:
- Source: 'tests/src/no_nested_borrows.rs', lines 434:0-434:52 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 439:0-439:52 *)
Definition test_shared_borrow_enum1 (l : List_t u32) : result u32 :=
match l with | List_Cons _ _ => Ok 1%u32 | List_Nil => Ok 0%u32 end
.
(** [no_nested_borrows::test_shared_borrow_enum2]:
- Source: 'tests/src/no_nested_borrows.rs', lines 446:0-446:40 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 451:0-451:40 *)
Definition test_shared_borrow_enum2 : result u32 :=
Ok 0%u32.
(** [no_nested_borrows::incr]:
- Source: 'tests/src/no_nested_borrows.rs', lines 457:0-457:24 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 462:0-462:24 *)
Definition incr (x : u32) : result u32 :=
u32_add x 1%u32.
(** [no_nested_borrows::call_incr]:
- Source: 'tests/src/no_nested_borrows.rs', lines 461:0-461:35 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 466:0-466:35 *)
Definition call_incr (x : u32) : result u32 :=
incr x.
(** [no_nested_borrows::read_then_incr]:
- Source: 'tests/src/no_nested_borrows.rs', lines 466:0-466:41 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 471:0-471:41 *)
Definition read_then_incr (x : u32) : result (u32 * u32) :=
x1 <- u32_add x 1%u32; Ok (x, x1)
.
(** [no_nested_borrows::Tuple]
- Source: 'tests/src/no_nested_borrows.rs', lines 472:0-472:24 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 477:0-477:24 *)
Definition Tuple_t (T1 T2 : Type) : Type := T1 * T2.
(** [no_nested_borrows::use_tuple_struct]:
- Source: 'tests/src/no_nested_borrows.rs', lines 474:0-474:48 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 479:0-479:48 *)
Definition use_tuple_struct (x : Tuple_t u32 u32) : result (Tuple_t u32 u32) :=
let (_, i) := x in Ok (1%u32, i)
.
(** [no_nested_borrows::create_tuple_struct]:
- Source: 'tests/src/no_nested_borrows.rs', lines 478:0-478:61 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 483:0-483:61 *)
Definition create_tuple_struct
(x : u32) (y : u64) : result (Tuple_t u32 u64) :=
Ok (x, y)
.
(** [no_nested_borrows::IdType]
- Source: 'tests/src/no_nested_borrows.rs', lines 483:0-483:20 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 488:0-488:20 *)
Definition IdType_t (T : Type) : Type := T.
(** [no_nested_borrows::use_id_type]:
- Source: 'tests/src/no_nested_borrows.rs', lines 485:0-485:40 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 490:0-490:40 *)
Definition use_id_type (T : Type) (x : IdType_t T) : result T :=
Ok x.
(** [no_nested_borrows::create_id_type]:
- Source: 'tests/src/no_nested_borrows.rs', lines 489:0-489:43 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 494:0-494:43 *)
Definition create_id_type (T : Type) (x : T) : result (IdType_t T) :=
Ok x.
diff --git a/tests/fstar/misc/NoNestedBorrows.fst b/tests/fstar/misc/NoNestedBorrows.fst
index 340dd293..5fd775cb 100644
--- a/tests/fstar/misc/NoNestedBorrows.fst
+++ b/tests/fstar/misc/NoNestedBorrows.fst
@@ -211,20 +211,25 @@ let _ = assert_norm (choose_test = Ok ())
let test_char : result char =
Ok 'a'
+(** [no_nested_borrows::panic_mut_borrow]:
+ Source: 'tests/src/no_nested_borrows.rs', lines 217:0-217:36 *)
+let panic_mut_borrow (i : u32) : result u32 =
+ Fail Failure
+
(** [no_nested_borrows::Tree]
- Source: 'tests/src/no_nested_borrows.rs', lines 217:0-217:16 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 222:0-222: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: 'tests/src/no_nested_borrows.rs', lines 222:0-222:20 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 227:0-227: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: 'tests/src/no_nested_borrows.rs', lines 257:0-257:48 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 262:0-262: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
@@ -232,7 +237,7 @@ let rec list_length (t : Type0) (l : list_t t) : result u32 =
end
(** [no_nested_borrows::list_nth_shared]:
- Source: 'tests/src/no_nested_borrows.rs', lines 265:0-265:62 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 270:0-270:62 *)
let rec list_nth_shared (t : Type0) (l : list_t t) (i : u32) : result t =
begin match l with
| List_Cons x tl ->
@@ -241,7 +246,7 @@ let rec list_nth_shared (t : Type0) (l : list_t t) (i : u32) : result t =
end
(** [no_nested_borrows::list_nth_mut]:
- Source: 'tests/src/no_nested_borrows.rs', lines 281:0-281:67 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 286:0-286:67 *)
let rec list_nth_mut
(t : Type0) (l : list_t t) (i : u32) :
result (t & (t -> result (list_t t)))
@@ -260,7 +265,7 @@ let rec list_nth_mut
end
(** [no_nested_borrows::list_rev_aux]:
- Source: 'tests/src/no_nested_borrows.rs', lines 297:0-297:63 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 302:0-302:63 *)
let rec list_rev_aux
(t : Type0) (li : list_t t) (lo : list_t t) : result (list_t t) =
begin match li with
@@ -269,13 +274,13 @@ let rec list_rev_aux
end
(** [no_nested_borrows::list_rev]:
- Source: 'tests/src/no_nested_borrows.rs', lines 311:0-311:42 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 316:0-316: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: 'tests/src/no_nested_borrows.rs', lines 316:0-316:28 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 321:0-321:28 *)
let test_list_functions : result unit =
let l = List_Cons 2 List_Nil in
let l1 = List_Cons 1 l in
@@ -312,7 +317,7 @@ let test_list_functions : result unit =
let _ = assert_norm (test_list_functions = Ok ())
(** [no_nested_borrows::id_mut_pair1]:
- Source: 'tests/src/no_nested_borrows.rs', lines 332:0-332:89 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 337:0-337:89 *)
let id_mut_pair1
(t1 t2 : Type0) (x : t1) (y : t2) :
result ((t1 & t2) & ((t1 & t2) -> result (t1 & t2)))
@@ -320,7 +325,7 @@ let id_mut_pair1
Ok ((x, y), Ok)
(** [no_nested_borrows::id_mut_pair2]:
- Source: 'tests/src/no_nested_borrows.rs', lines 336:0-336:88 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 341:0-341:88 *)
let id_mut_pair2
(t1 t2 : Type0) (p : (t1 & t2)) :
result ((t1 & t2) & ((t1 & t2) -> result (t1 & t2)))
@@ -328,7 +333,7 @@ let id_mut_pair2
let (x, x1) = p in Ok ((x, x1), Ok)
(** [no_nested_borrows::id_mut_pair3]:
- Source: 'tests/src/no_nested_borrows.rs', lines 340:0-340:93 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 345:0-345:93 *)
let id_mut_pair3
(t1 t2 : Type0) (x : t1) (y : t2) :
result ((t1 & t2) & (t1 -> result t1) & (t2 -> result t2))
@@ -336,7 +341,7 @@ let id_mut_pair3
Ok ((x, y), Ok, Ok)
(** [no_nested_borrows::id_mut_pair4]:
- Source: 'tests/src/no_nested_borrows.rs', lines 344:0-344:92 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 349:0-349:92 *)
let id_mut_pair4
(t1 t2 : Type0) (p : (t1 & t2)) :
result ((t1 & t2) & (t1 -> result t1) & (t2 -> result t2))
@@ -344,35 +349,35 @@ let id_mut_pair4
let (x, x1) = p in Ok ((x, x1), Ok, Ok)
(** [no_nested_borrows::StructWithTuple]
- Source: 'tests/src/no_nested_borrows.rs', lines 351:0-351:34 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 356:0-356:34 *)
type structWithTuple_t (t1 t2 : Type0) = { p : (t1 & t2); }
(** [no_nested_borrows::new_tuple1]:
- Source: 'tests/src/no_nested_borrows.rs', lines 355:0-355:48 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 360:0-360:48 *)
let new_tuple1 : result (structWithTuple_t u32 u32) =
Ok { p = (1, 2) }
(** [no_nested_borrows::new_tuple2]:
- Source: 'tests/src/no_nested_borrows.rs', lines 359:0-359:48 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 364:0-364:48 *)
let new_tuple2 : result (structWithTuple_t i16 i16) =
Ok { p = (1, 2) }
(** [no_nested_borrows::new_tuple3]:
- Source: 'tests/src/no_nested_borrows.rs', lines 363:0-363:48 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 368:0-368:48 *)
let new_tuple3 : result (structWithTuple_t u64 i64) =
Ok { p = (1, 2) }
(** [no_nested_borrows::StructWithPair]
- Source: 'tests/src/no_nested_borrows.rs', lines 368:0-368:33 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 373:0-373:33 *)
type structWithPair_t (t1 t2 : Type0) = { p : pair_t t1 t2; }
(** [no_nested_borrows::new_pair1]:
- Source: 'tests/src/no_nested_borrows.rs', lines 372:0-372:46 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 377:0-377:46 *)
let new_pair1 : result (structWithPair_t u32 u32) =
Ok { p = { x = 1; y = 2 } }
(** [no_nested_borrows::test_constants]:
- Source: 'tests/src/no_nested_borrows.rs', lines 380:0-380:23 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 385:0-385:23 *)
let test_constants : result unit =
let* swt = new_tuple1 in
let (i, _) = swt.p in
@@ -396,7 +401,7 @@ let test_constants : result unit =
let _ = assert_norm (test_constants = Ok ())
(** [no_nested_borrows::test_weird_borrows1]:
- Source: 'tests/src/no_nested_borrows.rs', lines 389:0-389:28 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 394:0-394:28 *)
let test_weird_borrows1 : result unit =
Ok ()
@@ -404,71 +409,71 @@ let test_weird_borrows1 : result unit =
let _ = assert_norm (test_weird_borrows1 = Ok ())
(** [no_nested_borrows::test_mem_replace]:
- Source: 'tests/src/no_nested_borrows.rs', lines 399:0-399:37 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 404:0-404: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: 'tests/src/no_nested_borrows.rs', lines 406:0-406:47 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 411:0-411: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: 'tests/src/no_nested_borrows.rs', lines 419:0-419:40 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 424:0-424:40 *)
let test_shared_borrow_bool2 : result u32 =
Ok 0
(** [no_nested_borrows::test_shared_borrow_enum1]:
- Source: 'tests/src/no_nested_borrows.rs', lines 434:0-434:52 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 439:0-439: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: 'tests/src/no_nested_borrows.rs', lines 446:0-446:40 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 451:0-451:40 *)
let test_shared_borrow_enum2 : result u32 =
Ok 0
(** [no_nested_borrows::incr]:
- Source: 'tests/src/no_nested_borrows.rs', lines 457:0-457:24 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 462:0-462:24 *)
let incr (x : u32) : result u32 =
u32_add x 1
(** [no_nested_borrows::call_incr]:
- Source: 'tests/src/no_nested_borrows.rs', lines 461:0-461:35 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 466:0-466:35 *)
let call_incr (x : u32) : result u32 =
incr x
(** [no_nested_borrows::read_then_incr]:
- Source: 'tests/src/no_nested_borrows.rs', lines 466:0-466:41 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 471:0-471: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: 'tests/src/no_nested_borrows.rs', lines 472:0-472:24 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 477:0-477:24 *)
type tuple_t (t1 t2 : Type0) = t1 * t2
(** [no_nested_borrows::use_tuple_struct]:
- Source: 'tests/src/no_nested_borrows.rs', lines 474:0-474:48 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 479:0-479: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: 'tests/src/no_nested_borrows.rs', lines 478:0-478:61 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 483:0-483:61 *)
let create_tuple_struct (x : u32) (y : u64) : result (tuple_t u32 u64) =
Ok (x, y)
(** [no_nested_borrows::IdType]
- Source: 'tests/src/no_nested_borrows.rs', lines 483:0-483:20 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 488:0-488:20 *)
type idType_t (t : Type0) = t
(** [no_nested_borrows::use_id_type]:
- Source: 'tests/src/no_nested_borrows.rs', lines 485:0-485:40 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 490:0-490:40 *)
let use_id_type (t : Type0) (x : idType_t t) : result t =
Ok x
(** [no_nested_borrows::create_id_type]:
- Source: 'tests/src/no_nested_borrows.rs', lines 489:0-489:43 *)
+ Source: 'tests/src/no_nested_borrows.rs', lines 494:0-494:43 *)
let create_id_type (t : Type0) (x : t) : result (idType_t t) =
Ok x
diff --git a/tests/lean/NoNestedBorrows.lean b/tests/lean/NoNestedBorrows.lean
index 5ae22055..0f11092d 100644
--- a/tests/lean/NoNestedBorrows.lean
+++ b/tests/lean/NoNestedBorrows.lean
@@ -258,16 +258,21 @@ def choose_test : Result Unit :=
def test_char : Result Char :=
Result.ok 'a'
+/- [no_nested_borrows::panic_mut_borrow]:
+ Source: 'tests/src/no_nested_borrows.rs', lines 217:0-217:36 -/
+def panic_mut_borrow (i : U32) : Result U32 :=
+ Result.fail .panic
+
mutual
/- [no_nested_borrows::Tree]
- Source: 'tests/src/no_nested_borrows.rs', lines 217:0-217:16 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 222:0-222:16 -/
inductive Tree (T : Type) :=
| Leaf : T → Tree T
| Node : T → NodeElem T → Tree T → Tree T
/- [no_nested_borrows::NodeElem]
- Source: 'tests/src/no_nested_borrows.rs', lines 222:0-222:20 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 227:0-227:20 -/
inductive NodeElem (T : Type) :=
| Cons : Tree T → NodeElem T → NodeElem T
| Nil : NodeElem T
@@ -275,7 +280,7 @@ inductive NodeElem (T : Type) :=
end
/- [no_nested_borrows::list_length]:
- Source: 'tests/src/no_nested_borrows.rs', lines 257:0-257:48 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 262:0-262:48 -/
divergent def list_length (T : Type) (l : List T) : Result U32 :=
match l with
| List.Cons _ l1 => do
@@ -284,7 +289,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: 'tests/src/no_nested_borrows.rs', lines 265:0-265:62 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 270:0-270:62 -/
divergent def list_nth_shared (T : Type) (l : List T) (i : U32) : Result T :=
match l with
| List.Cons x tl =>
@@ -296,7 +301,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: 'tests/src/no_nested_borrows.rs', lines 281:0-281:67 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 286:0-286:67 -/
divergent def list_nth_mut
(T : Type) (l : List T) (i : U32) : Result (T × (T → Result (List T))) :=
match l with
@@ -318,7 +323,7 @@ divergent def list_nth_mut
| List.Nil => Result.fail .panic
/- [no_nested_borrows::list_rev_aux]:
- Source: 'tests/src/no_nested_borrows.rs', lines 297:0-297:63 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 302:0-302:63 -/
divergent def list_rev_aux
(T : Type) (li : List T) (lo : List T) : Result (List T) :=
match li with
@@ -326,13 +331,13 @@ divergent def list_rev_aux
| List.Nil => Result.ok lo
/- [no_nested_borrows::list_rev]:
- Source: 'tests/src/no_nested_borrows.rs', lines 311:0-311:42 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 316:0-316: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: 'tests/src/no_nested_borrows.rs', lines 316:0-316:28 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 321:0-321:28 -/
def test_list_functions : Result Unit :=
do
let l := List.Cons 2#i32 List.Nil
@@ -379,7 +384,7 @@ def test_list_functions : Result Unit :=
#assert (test_list_functions == Result.ok ())
/- [no_nested_borrows::id_mut_pair1]:
- Source: 'tests/src/no_nested_borrows.rs', lines 332:0-332:89 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 337:0-337:89 -/
def id_mut_pair1
(T1 T2 : Type) (x : T1) (y : T2) :
Result ((T1 × T2) × ((T1 × T2) → Result (T1 × T2)))
@@ -387,7 +392,7 @@ def id_mut_pair1
Result.ok ((x, y), Result.ok)
/- [no_nested_borrows::id_mut_pair2]:
- Source: 'tests/src/no_nested_borrows.rs', lines 336:0-336:88 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 341:0-341:88 -/
def id_mut_pair2
(T1 T2 : Type) (p : (T1 × T2)) :
Result ((T1 × T2) × ((T1 × T2) → Result (T1 × T2)))
@@ -396,7 +401,7 @@ def id_mut_pair2
Result.ok ((t, t1), Result.ok)
/- [no_nested_borrows::id_mut_pair3]:
- Source: 'tests/src/no_nested_borrows.rs', lines 340:0-340:93 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 345:0-345:93 -/
def id_mut_pair3
(T1 T2 : Type) (x : T1) (y : T2) :
Result ((T1 × T2) × (T1 → Result T1) × (T2 → Result T2))
@@ -404,7 +409,7 @@ def id_mut_pair3
Result.ok ((x, y), Result.ok, Result.ok)
/- [no_nested_borrows::id_mut_pair4]:
- Source: 'tests/src/no_nested_borrows.rs', lines 344:0-344:92 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 349:0-349:92 -/
def id_mut_pair4
(T1 T2 : Type) (p : (T1 × T2)) :
Result ((T1 × T2) × (T1 → Result T1) × (T2 → Result T2))
@@ -413,37 +418,37 @@ def id_mut_pair4
Result.ok ((t, t1), Result.ok, Result.ok)
/- [no_nested_borrows::StructWithTuple]
- Source: 'tests/src/no_nested_borrows.rs', lines 351:0-351:34 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 356:0-356:34 -/
structure StructWithTuple (T1 T2 : Type) where
p : (T1 × T2)
/- [no_nested_borrows::new_tuple1]:
- Source: 'tests/src/no_nested_borrows.rs', lines 355:0-355:48 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 360:0-360:48 -/
def new_tuple1 : Result (StructWithTuple U32 U32) :=
Result.ok { p := (1#u32, 2#u32) }
/- [no_nested_borrows::new_tuple2]:
- Source: 'tests/src/no_nested_borrows.rs', lines 359:0-359:48 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 364:0-364:48 -/
def new_tuple2 : Result (StructWithTuple I16 I16) :=
Result.ok { p := (1#i16, 2#i16) }
/- [no_nested_borrows::new_tuple3]:
- Source: 'tests/src/no_nested_borrows.rs', lines 363:0-363:48 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 368:0-368:48 -/
def new_tuple3 : Result (StructWithTuple U64 I64) :=
Result.ok { p := (1#u64, 2#i64) }
/- [no_nested_borrows::StructWithPair]
- Source: 'tests/src/no_nested_borrows.rs', lines 368:0-368:33 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 373:0-373:33 -/
structure StructWithPair (T1 T2 : Type) where
p : Pair T1 T2
/- [no_nested_borrows::new_pair1]:
- Source: 'tests/src/no_nested_borrows.rs', lines 372:0-372:46 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 377:0-377:46 -/
def new_pair1 : Result (StructWithPair U32 U32) :=
Result.ok { p := { x := 1#u32, y := 2#u32 } }
/- [no_nested_borrows::test_constants]:
- Source: 'tests/src/no_nested_borrows.rs', lines 380:0-380:23 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 385:0-385:23 -/
def test_constants : Result Unit :=
do
let swt ← new_tuple1
@@ -473,7 +478,7 @@ def test_constants : Result Unit :=
#assert (test_constants == Result.ok ())
/- [no_nested_borrows::test_weird_borrows1]:
- Source: 'tests/src/no_nested_borrows.rs', lines 389:0-389:28 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 394:0-394:28 -/
def test_weird_borrows1 : Result Unit :=
Result.ok ()
@@ -481,7 +486,7 @@ def test_weird_borrows1 : Result Unit :=
#assert (test_weird_borrows1 == Result.ok ())
/- [no_nested_borrows::test_mem_replace]:
- Source: 'tests/src/no_nested_borrows.rs', lines 399:0-399:37 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 404:0-404:37 -/
def test_mem_replace (px : U32) : Result U32 :=
let (y, _) := core.mem.replace U32 px 1#u32
if ¬ (y = 0#u32)
@@ -489,71 +494,71 @@ def test_mem_replace (px : U32) : Result U32 :=
else Result.ok 2#u32
/- [no_nested_borrows::test_shared_borrow_bool1]:
- Source: 'tests/src/no_nested_borrows.rs', lines 406:0-406:47 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 411:0-411: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: 'tests/src/no_nested_borrows.rs', lines 419:0-419:40 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 424:0-424:40 -/
def test_shared_borrow_bool2 : Result U32 :=
Result.ok 0#u32
/- [no_nested_borrows::test_shared_borrow_enum1]:
- Source: 'tests/src/no_nested_borrows.rs', lines 434:0-434:52 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 439:0-439: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: 'tests/src/no_nested_borrows.rs', lines 446:0-446:40 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 451:0-451:40 -/
def test_shared_borrow_enum2 : Result U32 :=
Result.ok 0#u32
/- [no_nested_borrows::incr]:
- Source: 'tests/src/no_nested_borrows.rs', lines 457:0-457:24 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 462:0-462:24 -/
def incr (x : U32) : Result U32 :=
x + 1#u32
/- [no_nested_borrows::call_incr]:
- Source: 'tests/src/no_nested_borrows.rs', lines 461:0-461:35 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 466:0-466:35 -/
def call_incr (x : U32) : Result U32 :=
incr x
/- [no_nested_borrows::read_then_incr]:
- Source: 'tests/src/no_nested_borrows.rs', lines 466:0-466:41 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 471:0-471: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: 'tests/src/no_nested_borrows.rs', lines 472:0-472:24 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 477:0-477:24 -/
def Tuple (T1 T2 : Type) := T1 × T2
/- [no_nested_borrows::use_tuple_struct]:
- Source: 'tests/src/no_nested_borrows.rs', lines 474:0-474:48 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 479:0-479: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: 'tests/src/no_nested_borrows.rs', lines 478:0-478:61 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 483:0-483:61 -/
def create_tuple_struct (x : U32) (y : U64) : Result (Tuple U32 U64) :=
Result.ok (x, y)
/- [no_nested_borrows::IdType]
- Source: 'tests/src/no_nested_borrows.rs', lines 483:0-483:20 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 488:0-488:20 -/
@[reducible] def IdType (T : Type) := T
/- [no_nested_borrows::use_id_type]:
- Source: 'tests/src/no_nested_borrows.rs', lines 485:0-485:40 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 490:0-490:40 -/
def use_id_type (T : Type) (x : IdType T) : Result T :=
Result.ok x
/- [no_nested_borrows::create_id_type]:
- Source: 'tests/src/no_nested_borrows.rs', lines 489:0-489:43 -/
+ Source: 'tests/src/no_nested_borrows.rs', lines 494:0-494:43 -/
def create_id_type (T : Type) (x : T) : Result (IdType T) :=
Result.ok x
diff --git a/tests/src/no_nested_borrows.rs b/tests/src/no_nested_borrows.rs
index 9a7604e6..88c0bc09 100644
--- a/tests/src/no_nested_borrows.rs
+++ b/tests/src/no_nested_borrows.rs
@@ -213,6 +213,11 @@ pub fn test_char() -> char {
'a'
}
+/// This triggered a bug at some point
+pub fn panic_mut_borrow(_: &mut u32) {
+ panic!()
+}
+
/// Mutually recursive types
pub enum Tree<T> {
Leaf(T),
@@ -225,7 +230,7 @@ pub enum NodeElem<T> {
}
/*
-// TODO: those definitions requires semantic termination (breaks the Coq backend
+// TODO: those definitions require semantic termination (breaks the Coq backend
// because we don't use fuel in this case).
/// Mutually recursive functions
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 17:45:00 +0000