From 374eb6fe2e35791e4f18e415cd8d761d89a8bec5 Mon Sep 17 00:00:00 2001 From: Son Ho Date: Mon, 3 Jun 2024 21:29:08 +0200 Subject: Add a test --- tests/lean/NoNestedBorrows.lean | 73 ++++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 34 deletions(-) (limited to 'tests/lean/NoNestedBorrows.lean') 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 -- cgit v1.2.3 From 8a1adfb37d2cf295d8caed1dfdd4f7475bb19283 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Tue, 4 Jun 2024 17:42:46 +0200 Subject: Update charon --- tests/lean/NoNestedBorrows.lean | 152 ++++++++++++++++++++-------------------- 1 file changed, 76 insertions(+), 76 deletions(-) (limited to 'tests/lean/NoNestedBorrows.lean') diff --git a/tests/lean/NoNestedBorrows.lean b/tests/lean/NoNestedBorrows.lean index aa782009..b8fbcff0 100644 --- a/tests/lean/NoNestedBorrows.lean +++ b/tests/lean/NoNestedBorrows.lean @@ -82,9 +82,9 @@ def test3 : Result Unit := let x ← get_max 4#u32 3#u32 let y ← get_max 10#u32 11#u32 let z ← x + y - if ¬ (z = 15#u32) - then Result.fail .panic - else Result.ok () + if z = 15#u32 + then Result.ok () + else Result.fail .panic /- Unit test for [no_nested_borrows::test3] -/ #assert (test3 == Result.ok ()) @@ -94,9 +94,9 @@ def test3 : Result Unit := def test_neg1 : Result Unit := do let y ← -. 3#i32 - if ¬ (y = (-3)#i32) - then Result.fail .panic - else Result.ok () + if y = (-3)#i32 + then Result.ok () + else Result.fail .panic /- Unit test for [no_nested_borrows::test_neg1] -/ #assert (test_neg1 == Result.ok ()) @@ -104,9 +104,9 @@ def test_neg1 : Result Unit := /- [no_nested_borrows::refs_test1]: Source: 'tests/src/no_nested_borrows.rs', lines 97:0-97:19 -/ def refs_test1 : Result Unit := - if ¬ (1#i32 = 1#i32) - then Result.fail .panic - else Result.ok () + if 1#i32 = 1#i32 + then Result.ok () + else Result.fail .panic /- Unit test for [no_nested_borrows::refs_test1] -/ #assert (refs_test1 == Result.ok ()) @@ -114,17 +114,17 @@ def refs_test1 : Result Unit := /- [no_nested_borrows::refs_test2]: Source: 'tests/src/no_nested_borrows.rs', lines 108:0-108:19 -/ def refs_test2 : Result Unit := - if ¬ (2#i32 = 2#i32) - then Result.fail .panic - else - if ¬ (0#i32 = 0#i32) - then Result.fail .panic - else - if ¬ (2#i32 = 2#i32) - then Result.fail .panic - else if ¬ (2#i32 = 2#i32) - then Result.fail .panic - else Result.ok () + if 2#i32 = 2#i32 + then + if 0#i32 = 0#i32 + then + if 2#i32 = 2#i32 + then if 2#i32 = 2#i32 + then Result.ok () + else Result.fail .panic + else Result.fail .panic + else Result.fail .panic + else Result.fail .panic /- Unit test for [no_nested_borrows::refs_test2] -/ #assert (refs_test2 == Result.ok ()) @@ -144,9 +144,9 @@ def test_box1 : Result Unit := let (_, deref_mut_back) ← alloc.boxed.Box.deref_mut I32 0#i32 let b ← deref_mut_back 1#i32 let x ← alloc.boxed.Box.deref I32 b - if ¬ (x = 1#i32) - then Result.fail .panic - else Result.ok () + if x = 1#i32 + then Result.ok () + else Result.fail .panic /- Unit test for [no_nested_borrows::test_box1] -/ #assert (test_box1 == Result.ok ()) @@ -175,9 +175,9 @@ def test_panic (b : Bool) : Result Unit := def test_copy_int : Result Unit := do let y ← copy_int 0#i32 - if ¬ (0#i32 = y) - then Result.fail .panic - else Result.ok () + if 0#i32 = y + then Result.ok () + else Result.fail .panic /- Unit test for [no_nested_borrows::test_copy_int] -/ #assert (test_copy_int == Result.ok ()) @@ -194,9 +194,9 @@ def is_cons (T : Type) (l : List T) : Result Bool := def test_is_cons : Result Unit := do let b ← is_cons I32 (List.Cons 0#i32 List.Nil) - if ¬ b - then Result.fail .panic - else Result.ok () + if b + then Result.ok () + else Result.fail .panic /- Unit test for [no_nested_borrows::test_is_cons] -/ #assert (test_is_cons == Result.ok ()) @@ -214,9 +214,9 @@ def test_split_list : Result Unit := do let p ← split_list I32 (List.Cons 0#i32 List.Nil) let (hd, _) := p - if ¬ (hd = 0#i32) - then Result.fail .panic - else Result.ok () + if hd = 0#i32 + then Result.ok () + else Result.fail .panic /- Unit test for [no_nested_borrows::test_split_list] -/ #assert (test_split_list == Result.ok ()) @@ -239,16 +239,16 @@ def choose_test : Result Unit := do let (z, choose_back) ← choose I32 true 0#i32 0#i32 let z1 ← z + 1#i32 - if ¬ (z1 = 1#i32) - then Result.fail .panic - else + if z1 = 1#i32 + then do let (x, y) ← choose_back z1 - if ¬ (x = 1#i32) - then Result.fail .panic - else if ¬ (y = 0#i32) - then Result.fail .panic - else Result.ok () + if x = 1#i32 + then if y = 0#i32 + then Result.ok () + else Result.fail .panic + else Result.fail .panic + else Result.fail .panic /- Unit test for [no_nested_borrows::choose_test] -/ #assert (choose_test == Result.ok ()) @@ -343,42 +343,42 @@ def test_list_functions : Result Unit := let l := List.Cons 2#i32 List.Nil let l1 := List.Cons 1#i32 l let i ← list_length I32 (List.Cons 0#i32 l1) - if ¬ (i = 3#u32) - then Result.fail .panic - else + if i = 3#u32 + then do let i1 ← list_nth_shared I32 (List.Cons 0#i32 l1) 0#u32 - if ¬ (i1 = 0#i32) - then Result.fail .panic - else + if i1 = 0#i32 + then do let i2 ← list_nth_shared I32 (List.Cons 0#i32 l1) 1#u32 - if ¬ (i2 = 1#i32) - then Result.fail .panic - else + if i2 = 1#i32 + then do let i3 ← list_nth_shared I32 (List.Cons 0#i32 l1) 2#u32 - if ¬ (i3 = 2#i32) - then Result.fail .panic - else + if i3 = 2#i32 + then do let (_, list_nth_mut_back) ← list_nth_mut I32 (List.Cons 0#i32 l1) 1#u32 let ls ← list_nth_mut_back 3#i32 let i4 ← list_nth_shared I32 ls 0#u32 - if ¬ (i4 = 0#i32) - then Result.fail .panic - else + if i4 = 0#i32 + then do let i5 ← list_nth_shared I32 ls 1#u32 - if ¬ (i5 = 3#i32) - then Result.fail .panic - else + if i5 = 3#i32 + then do let i6 ← list_nth_shared I32 ls 2#u32 - if ¬ (i6 = 2#i32) - then Result.fail .panic - else Result.ok () + if i6 = 2#i32 + then Result.ok () + else Result.fail .panic + else Result.fail .panic + else Result.fail .panic + else Result.fail .panic + else Result.fail .panic + else Result.fail .panic + else Result.fail .panic /- Unit test for [no_nested_borrows::test_list_functions] -/ #assert (test_list_functions == Result.ok ()) @@ -453,26 +453,26 @@ def test_constants : Result Unit := do let swt ← new_tuple1 let (i, _) := swt.p - if ¬ (i = 1#u32) - then Result.fail .panic - else + if i = 1#u32 + then do let swt1 ← new_tuple2 let (i1, _) := swt1.p - if ¬ (i1 = 1#i16) - then Result.fail .panic - else + if i1 = 1#i16 + then do let swt2 ← new_tuple3 let (i2, _) := swt2.p - if ¬ (i2 = 1#u64) - then Result.fail .panic - else + if i2 = 1#u64 + then do let swp ← new_pair1 - if ¬ (swp.p.x = 1#u32) - then Result.fail .panic - else Result.ok () + if swp.p.x = 1#u32 + then Result.ok () + else Result.fail .panic + else Result.fail .panic + else Result.fail .panic + else Result.fail .panic /- Unit test for [no_nested_borrows::test_constants] -/ #assert (test_constants == Result.ok ()) @@ -489,9 +489,9 @@ def test_weird_borrows1 : Result Unit := Source: 'tests/src/no_nested_borrows.rs', lines 407:0-407:37 -/ def test_mem_replace (px : U32) : Result U32 := let (y, _) := core.mem.replace U32 px 1#u32 - if ¬ (y = 0#u32) - then Result.fail .panic - else Result.ok 2#u32 + if y = 0#u32 + then Result.ok 2#u32 + else Result.fail .panic /- [no_nested_borrows::test_shared_borrow_bool1]: Source: 'tests/src/no_nested_borrows.rs', lines 414:0-414:47 -/ -- cgit v1.2.3