diff options
Diffstat (limited to 'tests/lean')
| -rw-r--r-- | tests/lean/Arrays.lean | 6 | ||||
| -rw-r--r-- | tests/lean/External/Funs.lean | 2 | ||||
| -rw-r--r-- | tests/lean/External/FunsExternal_Template.lean | 4 | ||||
| -rw-r--r-- | tests/lean/External/Types.lean | 2 | ||||
| -rw-r--r-- | tests/lean/External/TypesExternal_Template.lean | 2 | ||||
| -rw-r--r-- | tests/lean/Hashmap/Funs.lean | 36 | ||||
| -rw-r--r-- | tests/lean/NoNestedBorrows.lean | 225 | ||||
| -rw-r--r-- | tests/lean/Paper.lean | 28 | ||||
| -rw-r--r-- | tests/lean/Traits.lean | 2 |
9 files changed, 156 insertions, 151 deletions
diff --git a/tests/lean/Arrays.lean b/tests/lean/Arrays.lean index c2c3ac90..9748919e 100644 --- a/tests/lean/Arrays.lean +++ b/tests/lean/Arrays.lean @@ -384,9 +384,9 @@ divergent def sum2_loop def sum2 (s : Slice U32) (s2 : Slice U32) : Result U32 := let i := Slice.len U32 s let i1 := Slice.len U32 s2 - if ¬ (i = i1) - then Result.fail .panic - else sum2_loop s s2 0#u32 0#usize + if i = i1 + then sum2_loop s s2 0#u32 0#usize + else Result.fail .panic /- [arrays::f0]: Source: 'tests/src/arrays.rs', lines 266:0-266:11 -/ diff --git a/tests/lean/External/Funs.lean b/tests/lean/External/Funs.lean index 1acb9707..1b1d5cdf 100644 --- a/tests/lean/External/Funs.lean +++ b/tests/lean/External/Funs.lean @@ -8,7 +8,7 @@ open Primitives namespace external /- Trait implementation: [core::marker::{(core::marker::Copy for u32)#61}] - Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/marker.rs', lines 47:29-47:65 + Source: '/rustc/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/marker.rs', lines 47:29-47:65 Name pattern: core::marker::Copy<u32> -/ def core.marker.CopyU32 : core.marker.Copy U32 := { cloneCloneInst := core.clone.CloneU32 diff --git a/tests/lean/External/FunsExternal_Template.lean b/tests/lean/External/FunsExternal_Template.lean index 077e22a9..870a79c0 100644 --- a/tests/lean/External/FunsExternal_Template.lean +++ b/tests/lean/External/FunsExternal_Template.lean @@ -7,14 +7,14 @@ open Primitives open external /- [core::cell::{core::cell::Cell<T>#10}::get]: - Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/cell.rs', lines 497:4-497:26 + Source: '/rustc/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/cell.rs', lines 510:4-510:26 Name pattern: core::cell::{core::cell::Cell<@T>}::get -/ axiom core.cell.Cell.get (T : Type) (markerCopyInst : core.marker.Copy T) : core.cell.Cell T → State → Result (State × T) /- [core::cell::{core::cell::Cell<T>#11}::get_mut]: - Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/cell.rs', lines 574:4-574:39 + Source: '/rustc/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/cell.rs', lines 588:4-588:39 Name pattern: core::cell::{core::cell::Cell<@T>}::get_mut -/ axiom core.cell.Cell.get_mut (T : Type) : diff --git a/tests/lean/External/Types.lean b/tests/lean/External/Types.lean index bcb1d22c..836ddff0 100644 --- a/tests/lean/External/Types.lean +++ b/tests/lean/External/Types.lean @@ -7,7 +7,7 @@ open Primitives namespace external /- Trait declaration: [core::marker::Copy] - Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/marker.rs', lines 465:0-465:21 + Source: '/rustc/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/marker.rs', lines 465:0-465:21 Name pattern: core::marker::Copy -/ structure core.marker.Copy (Self : Type) where cloneCloneInst : core.clone.Clone Self diff --git a/tests/lean/External/TypesExternal_Template.lean b/tests/lean/External/TypesExternal_Template.lean index f91044be..24687d83 100644 --- a/tests/lean/External/TypesExternal_Template.lean +++ b/tests/lean/External/TypesExternal_Template.lean @@ -5,7 +5,7 @@ import Base open Primitives /- [core::cell::Cell] - Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/cell.rs', lines 293:0-293:26 + Source: '/rustc/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/cell.rs', lines 294:0-294:26 Name pattern: core::cell::Cell -/ axiom core.cell.Cell (T : Type) : Type diff --git a/tests/lean/Hashmap/Funs.lean b/tests/lean/Hashmap/Funs.lean index d7ac3b05..612e1848 100644 --- a/tests/lean/Hashmap/Funs.lean +++ b/tests/lean/Hashmap/Funs.lean @@ -400,38 +400,38 @@ def test1 : Result Unit := let hm3 ← HashMap.insert U64 hm2 1024#usize 138#u64 let hm4 ← HashMap.insert U64 hm3 1056#usize 256#u64 let i ← HashMap.get U64 hm4 128#usize - if ¬ (i = 18#u64) - then Result.fail .panic - else + if i = 18#u64 + then do let (_, get_mut_back) ← HashMap.get_mut U64 hm4 1024#usize let hm5 ← get_mut_back 56#u64 let i1 ← HashMap.get U64 hm5 1024#usize - if ¬ (i1 = 56#u64) - then Result.fail .panic - else + if i1 = 56#u64 + then do let (x, hm6) ← HashMap.remove U64 hm5 1024#usize match x with | none => Result.fail .panic | some x1 => - if ¬ (x1 = 56#u64) - then Result.fail .panic - else + if x1 = 56#u64 + then do let i2 ← HashMap.get U64 hm6 0#usize - if ¬ (i2 = 42#u64) - then Result.fail .panic - else + if i2 = 42#u64 + then do let i3 ← HashMap.get U64 hm6 128#usize - if ¬ (i3 = 18#u64) - then Result.fail .panic - else + if i3 = 18#u64 + then do let i4 ← HashMap.get U64 hm6 1056#usize - if ¬ (i4 = 256#u64) - then Result.fail .panic - else Result.ok () + if i4 = 256#u64 + 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 end hashmap diff --git a/tests/lean/NoNestedBorrows.lean b/tests/lean/NoNestedBorrows.lean index 022b32fb..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 ()) @@ -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 220:0-220: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 220:0-220:16 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 225:0-225: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 225:0-225:20 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 230:0-230: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 260:0-260:48 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 265:0-265: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 268:0-268:62 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 273:0-273: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 284:0-284:67 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 289:0-289: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 300:0-300:63 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 305:0-305:63 -/ divergent def list_rev_aux (T : Type) (li : List T) (lo : List T) : Result (List T) := match li with @@ -326,60 +331,60 @@ divergent def list_rev_aux | List.Nil => Result.ok lo /- [no_nested_borrows::list_rev]: - Source: 'tests/src/no_nested_borrows.rs', lines 314:0-314:42 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 319:0-319: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 319:0-319:28 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 324:0-324:28 -/ def test_list_functions : Result Unit := do 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 ()) /- [no_nested_borrows::id_mut_pair1]: - Source: 'tests/src/no_nested_borrows.rs', lines 335:0-335:89 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 340:0-340: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 339:0-339:88 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 344:0-344: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 343:0-343:93 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 348:0-348: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 347:0-347:92 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 352:0-352:92 -/ def id_mut_pair4 (T1 T2 : Type) (p : (T1 × T2)) : Result ((T1 × T2) × (T1 → Result T1) × (T2 → Result T2)) @@ -413,67 +418,67 @@ def id_mut_pair4 Result.ok ((t, t1), Result.ok, Result.ok) /- [no_nested_borrows::StructWithTuple] - Source: 'tests/src/no_nested_borrows.rs', lines 354:0-354:34 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 359:0-359:34 -/ structure StructWithTuple (T1 T2 : Type) where p : (T1 × T2) /- [no_nested_borrows::new_tuple1]: - Source: 'tests/src/no_nested_borrows.rs', lines 358:0-358:48 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 363:0-363: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 362:0-362:48 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 367:0-367: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 366:0-366:48 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 371:0-371: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 371:0-371:33 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 376:0-376:33 -/ structure StructWithPair (T1 T2 : Type) where p : Pair T1 T2 /- [no_nested_borrows::new_pair1]: - Source: 'tests/src/no_nested_borrows.rs', lines 375:0-375:46 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 380:0-380: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 383:0-383:23 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 388:0-388:23 -/ 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 ()) /- [no_nested_borrows::test_weird_borrows1]: - Source: 'tests/src/no_nested_borrows.rs', lines 392:0-392:28 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 397:0-397:28 -/ def test_weird_borrows1 : Result Unit := Result.ok () @@ -481,79 +486,79 @@ 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 402:0-402:37 -/ + 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 409:0-409:47 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 414:0-414: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 422:0-422:40 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 427:0-427: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 437:0-437:52 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 442:0-442: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 449:0-449:40 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 454:0-454:40 -/ def test_shared_borrow_enum2 : Result U32 := Result.ok 0#u32 /- [no_nested_borrows::incr]: - Source: 'tests/src/no_nested_borrows.rs', lines 460:0-460:24 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 465:0-465:24 -/ def incr (x : U32) : Result U32 := x + 1#u32 /- [no_nested_borrows::call_incr]: - Source: 'tests/src/no_nested_borrows.rs', lines 464:0-464:35 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 469:0-469:35 -/ def call_incr (x : U32) : Result U32 := incr x /- [no_nested_borrows::read_then_incr]: - Source: 'tests/src/no_nested_borrows.rs', lines 469:0-469:41 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 474:0-474: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 475:0-475:24 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 480:0-480:24 -/ def Tuple (T1 T2 : Type) := T1 × T2 /- [no_nested_borrows::use_tuple_struct]: - Source: 'tests/src/no_nested_borrows.rs', lines 477:0-477:48 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 482:0-482: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 481:0-481:61 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 486:0-486: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 486:0-486:20 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 491:0-491:20 -/ @[reducible] def IdType (T : Type) := T /- [no_nested_borrows::use_id_type]: - Source: 'tests/src/no_nested_borrows.rs', lines 488:0-488:40 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 493:0-493: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 492:0-492:43 -/ + Source: 'tests/src/no_nested_borrows.rs', lines 497:0-497:43 -/ def create_id_type (T : Type) (x : T) : Result (IdType T) := Result.ok x diff --git a/tests/lean/Paper.lean b/tests/lean/Paper.lean index dbd56f3e..03b96903 100644 --- a/tests/lean/Paper.lean +++ b/tests/lean/Paper.lean @@ -15,9 +15,9 @@ def ref_incr (x : I32) : Result I32 := def test_incr : Result Unit := do let x ← ref_incr 0#i32 - 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 [paper::test_incr] -/ #assert (test_incr == Result.ok ()) @@ -40,16 +40,16 @@ def test_choose : 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 [paper::test_choose] -/ #assert (test_choose == Result.ok ()) @@ -101,9 +101,9 @@ def test_nth : Result Unit := let x1 ← x + 1#i32 let l2 ← list_nth_mut_back x1 let i ← sum l2 - if ¬ (i = 7#i32) - then Result.fail .panic - else Result.ok () + if i = 7#i32 + then Result.ok () + else Result.fail .panic /- Unit test for [paper::test_nth] -/ #assert (test_nth == Result.ok ()) diff --git a/tests/lean/Traits.lean b/tests/lean/Traits.lean index 7cacb836..0dd692fe 100644 --- a/tests/lean/Traits.lean +++ b/tests/lean/Traits.lean @@ -512,7 +512,7 @@ structure Foo (T U : Type) where y : U /- [core::result::Result] - Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/result.rs', lines 502:0-502:21 + Source: '/rustc/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/result.rs', lines 502:0-502:21 Name pattern: core::result::Result -/ inductive core.result.Result (T E : Type) := | Ok : T → core.result.Result T E |