From 8a1adfb37d2cf295d8caed1dfdd4f7475bb19283 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 4 Jun 2024 17:42:46 +0200
Subject: Update charon
---
tests/coq/arrays/Arrays.v | 2 +-
tests/coq/hashmap/Hashmap_Funs.v | 34 ++---
tests/coq/misc/External_Funs.v | 2 +-
tests/coq/misc/External_FunsExternal_Template.v | 4 +-
tests/coq/misc/External_Types.v | 2 +-
tests/coq/misc/External_TypesExternal_Template.v | 2 +-
tests/coq/misc/NoNestedBorrows.v | 108 ++++++++--------
tests/coq/misc/Paper.v | 16 +--
tests/coq/traits/Traits.v | 2 +-
tests/fstar/arrays/Arrays.Funs.fst | 2 +-
tests/fstar/hashmap/Hashmap.Funs.fst | 32 ++---
tests/fstar/misc/External.Funs.fst | 2 +-
tests/fstar/misc/External.FunsExternal.fsti | 4 +-
tests/fstar/misc/External.Types.fst | 2 +-
tests/fstar/misc/External.TypesExternal.fsti | 2 +-
tests/fstar/misc/NoNestedBorrows.fst | 99 +++++++--------
tests/fstar/misc/Paper.fst | 14 +--
tests/fstar/traits/Traits.fst | 2 +-
tests/lean/Arrays.lean | 6 +-
tests/lean/External/Funs.lean | 2 +-
tests/lean/External/FunsExternal_Template.lean | 4 +-
tests/lean/External/Types.lean | 2 +-
tests/lean/External/TypesExternal_Template.lean | 2 +-
tests/lean/Hashmap/Funs.lean | 36 +++---
tests/lean/NoNestedBorrows.lean | 152 +++++++++++------------
tests/lean/Paper.lean | 28 ++---
tests/lean/Traits.lean | 2 +-
27 files changed, 278 insertions(+), 287 deletions(-)
(limited to 'tests')
diff --git a/tests/coq/arrays/Arrays.v b/tests/coq/arrays/Arrays.v
index 6e4ab188..5ff17341 100644
--- a/tests/coq/arrays/Arrays.v
+++ b/tests/coq/arrays/Arrays.v
@@ -426,7 +426,7 @@ Fixpoint sum2_loop
Definition sum2 (n : nat) (s : slice u32) (s2 : slice u32) : result u32 :=
let i := slice_len u32 s in
let i1 := slice_len u32 s2 in
- if negb (i s= i1) then Fail_ Failure else sum2_loop n s s2 0%u32 0%usize
+ if i s= i1 then sum2_loop n s s2 0%u32 0%usize else Fail_ Failure
.
(** [arrays::f0]:
diff --git a/tests/coq/hashmap/Hashmap_Funs.v b/tests/coq/hashmap/Hashmap_Funs.v
index 04df873a..02aa0269 100644
--- a/tests/coq/hashmap/Hashmap_Funs.v
+++ b/tests/coq/hashmap/Hashmap_Funs.v
@@ -523,35 +523,35 @@ Definition test1 (n : nat) : result unit :=
hm3 <- hashMap_insert u64 n hm2 1024%usize 138%u64;
hm4 <- hashMap_insert u64 n hm3 1056%usize 256%u64;
i <- hashMap_get u64 n hm4 128%usize;
- if negb (i s= 18%u64)
- then Fail_ Failure
- else (
+ if i s= 18%u64
+ then (
p <- hashMap_get_mut u64 n hm4 1024%usize;
let (_, get_mut_back) := p in
hm5 <- get_mut_back 56%u64;
i1 <- hashMap_get u64 n hm5 1024%usize;
- if negb (i1 s= 56%u64)
- then Fail_ Failure
- else (
+ if i1 s= 56%u64
+ then (
p1 <- hashMap_remove u64 n hm5 1024%usize;
let (x, hm6) := p1 in
match x with
| None => Fail_ Failure
| Some x1 =>
- if negb (x1 s= 56%u64)
- then Fail_ Failure
- else (
+ if x1 s= 56%u64
+ then (
i2 <- hashMap_get u64 n hm6 0%usize;
- if negb (i2 s= 42%u64)
- then Fail_ Failure
- else (
+ if i2 s= 42%u64
+ then (
i3 <- hashMap_get u64 n hm6 128%usize;
- if negb (i3 s= 18%u64)
- then Fail_ Failure
- else (
+ if i3 s= 18%u64
+ then (
i4 <- hashMap_get u64 n hm6 1056%usize;
- if negb (i4 s= 256%u64) then Fail_ Failure else Ok tt)))
- end))
+ if i4 s= 256%u64 then Ok tt else Fail_ Failure)
+ else Fail_ Failure)
+ else Fail_ Failure)
+ else Fail_ Failure
+ end)
+ else Fail_ Failure)
+ else Fail_ Failure
.
End Hashmap_Funs.
diff --git a/tests/coq/misc/External_Funs.v b/tests/coq/misc/External_Funs.v
index 7b9a9842..6c5bbdd2 100644
--- a/tests/coq/misc/External_Funs.v
+++ b/tests/coq/misc/External_Funs.v
@@ -13,7 +13,7 @@ Include External_FunsExternal.
Module External_Funs.
(** 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> *)
Definition core_marker_CopyU32 : core_marker_Copy_t u32 := {|
core_marker_Copy_tcore_marker_Copy_t_cloneCloneInst := core_clone_CloneU32;
diff --git a/tests/coq/misc/External_FunsExternal_Template.v b/tests/coq/misc/External_FunsExternal_Template.v
index 1ce677c5..5fcfa8fa 100644
--- a/tests/coq/misc/External_FunsExternal_Template.v
+++ b/tests/coq/misc/External_FunsExternal_Template.v
@@ -12,7 +12,7 @@ Include External_Types.
Module External_FunsExternal_Template.
(** [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 :
forall(T : Type) (markerCopyInst : core_marker_Copy_t T),
@@ -20,7 +20,7 @@ Axiom core_cell_Cell_get :
.
(** [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 :
forall(T : Type),
diff --git a/tests/coq/misc/External_Types.v b/tests/coq/misc/External_Types.v
index a49399bf..7dac29cc 100644
--- a/tests/coq/misc/External_Types.v
+++ b/tests/coq/misc/External_Types.v
@@ -11,7 +11,7 @@ Include External_TypesExternal.
Module External_Types.
(** 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 *)
Record core_marker_Copy_t (Self : Type) := mkcore_marker_Copy_t {
core_marker_Copy_tcore_marker_Copy_t_cloneCloneInst : core_clone_Clone Self;
diff --git a/tests/coq/misc/External_TypesExternal_Template.v b/tests/coq/misc/External_TypesExternal_Template.v
index decdd169..9392ce25 100644
--- a/tests/coq/misc/External_TypesExternal_Template.v
+++ b/tests/coq/misc/External_TypesExternal_Template.v
@@ -10,7 +10,7 @@ Local Open Scope Primitives_scope.
Module External_TypesExternal_Template.
(** [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 : forall (T : Type), Type.
diff --git a/tests/coq/misc/NoNestedBorrows.v b/tests/coq/misc/NoNestedBorrows.v
index b3e59172..46b08184 100644
--- a/tests/coq/misc/NoNestedBorrows.v
+++ b/tests/coq/misc/NoNestedBorrows.v
@@ -89,7 +89,7 @@ Definition test3 : result unit :=
x <- get_max 4%u32 3%u32;
y <- get_max 10%u32 11%u32;
z <- u32_add x y;
- if negb (z s= 15%u32) then Fail_ Failure else Ok tt
+ if z s= 15%u32 then Ok tt else Fail_ Failure
.
(** Unit test for [no_nested_borrows::test3] *)
@@ -98,7 +98,7 @@ Check (test3 )%return.
(** [no_nested_borrows::test_neg1]:
Source: 'tests/src/no_nested_borrows.rs', lines 90:0-90:18 *)
Definition test_neg1 : result unit :=
- y <- i32_neg 3%i32; if negb (y s= (-3)%i32) then Fail_ Failure else Ok tt
+ y <- i32_neg 3%i32; if y s= (-3)%i32 then Ok tt else Fail_ Failure
.
(** Unit test for [no_nested_borrows::test_neg1] *)
@@ -107,7 +107,7 @@ Check (test_neg1 )%return.
(** [no_nested_borrows::refs_test1]:
Source: 'tests/src/no_nested_borrows.rs', lines 97:0-97:19 *)
Definition refs_test1 : result unit :=
- if negb (1%i32 s= 1%i32) then Fail_ Failure else Ok tt
+ if 1%i32 s= 1%i32 then Ok tt else Fail_ Failure
.
(** Unit test for [no_nested_borrows::refs_test1] *)
@@ -116,15 +116,15 @@ Check (refs_test1 )%return.
(** [no_nested_borrows::refs_test2]:
Source: 'tests/src/no_nested_borrows.rs', lines 108:0-108:19 *)
Definition refs_test2 : result unit :=
- if negb (2%i32 s= 2%i32)
- then Fail_ Failure
- else
- if negb (0%i32 s= 0%i32)
- then Fail_ Failure
- else
- if negb (2%i32 s= 2%i32)
- then Fail_ Failure
- else if negb (2%i32 s= 2%i32) then Fail_ Failure else Ok tt
+ if 2%i32 s= 2%i32
+ then
+ if 0%i32 s= 0%i32
+ then
+ if 2%i32 s= 2%i32
+ then if 2%i32 s= 2%i32 then Ok tt else Fail_ Failure
+ else Fail_ Failure
+ else Fail_ Failure
+ else Fail_ Failure
.
(** Unit test for [no_nested_borrows::refs_test2] *)
@@ -145,7 +145,7 @@ Definition test_box1 : result unit :=
let (_, deref_mut_back) := p in
b <- deref_mut_back 1%i32;
x <- alloc_boxed_Box_deref i32 b;
- if negb (x s= 1%i32) then Fail_ Failure else Ok tt
+ if x s= 1%i32 then Ok tt else Fail_ Failure
.
(** Unit test for [no_nested_borrows::test_box1] *)
@@ -171,7 +171,7 @@ Definition test_panic (b : bool) : result unit :=
(** [no_nested_borrows::test_copy_int]:
Source: 'tests/src/no_nested_borrows.rs', lines 160:0-160:22 *)
Definition test_copy_int : result unit :=
- y <- copy_int 0%i32; if negb (0%i32 s= y) then Fail_ Failure else Ok tt
+ y <- copy_int 0%i32; if 0%i32 s= y then Ok tt else Fail_ Failure
.
(** Unit test for [no_nested_borrows::test_copy_int] *)
@@ -187,7 +187,7 @@ Definition is_cons (T : Type) (l : List_t T) : result bool :=
Source: 'tests/src/no_nested_borrows.rs', lines 174:0-174:21 *)
Definition test_is_cons : result unit :=
b <- is_cons i32 (List_Cons 0%i32 List_Nil);
- if negb b then Fail_ Failure else Ok tt
+ if b then Ok tt else Fail_ Failure
.
(** Unit test for [no_nested_borrows::test_is_cons] *)
@@ -204,7 +204,7 @@ Definition split_list (T : Type) (l : List_t T) : result (T * (List_t T)) :=
Definition test_split_list : result unit :=
p <- split_list i32 (List_Cons 0%i32 List_Nil);
let (hd, _) := p in
- if negb (hd s= 0%i32) then Fail_ Failure else Ok tt
+ if hd s= 0%i32 then Ok tt else Fail_ Failure
.
(** Unit test for [no_nested_borrows::test_split_list] *)
@@ -225,14 +225,14 @@ Definition choose_test : result unit :=
p <- choose i32 true 0%i32 0%i32;
let (z, choose_back) := p in
z1 <- i32_add z 1%i32;
- if negb (z1 s= 1%i32)
- then Fail_ Failure
- else (
+ if z1 s= 1%i32
+ then (
p1 <- choose_back z1;
let (x, y) := p1 in
- if negb (x s= 1%i32)
- then Fail_ Failure
- else if negb (y s= 0%i32) then Fail_ Failure else Ok tt)
+ if x s= 1%i32
+ then if y s= 0%i32 then Ok tt else Fail_ Failure
+ else Fail_ Failure)
+ else Fail_ Failure
.
(** Unit test for [no_nested_borrows::choose_test] *)
@@ -332,34 +332,34 @@ Definition test_list_functions : result unit :=
let l := List_Cons 2%i32 List_Nil in
let l1 := List_Cons 1%i32 l in
i <- list_length i32 (List_Cons 0%i32 l1);
- if negb (i s= 3%u32)
- then Fail_ Failure
- else (
+ if i s= 3%u32
+ then (
i1 <- list_nth_shared i32 (List_Cons 0%i32 l1) 0%u32;
- if negb (i1 s= 0%i32)
- then Fail_ Failure
- else (
+ if i1 s= 0%i32
+ then (
i2 <- list_nth_shared i32 (List_Cons 0%i32 l1) 1%u32;
- if negb (i2 s= 1%i32)
- then Fail_ Failure
- else (
+ if i2 s= 1%i32
+ then (
i3 <- list_nth_shared i32 (List_Cons 0%i32 l1) 2%u32;
- if negb (i3 s= 2%i32)
- then Fail_ Failure
- else (
+ if i3 s= 2%i32
+ then (
p <- list_nth_mut i32 (List_Cons 0%i32 l1) 1%u32;
let (_, list_nth_mut_back) := p in
ls <- list_nth_mut_back 3%i32;
i4 <- list_nth_shared i32 ls 0%u32;
- if negb (i4 s= 0%i32)
- then Fail_ Failure
- else (
+ if i4 s= 0%i32
+ then (
i5 <- list_nth_shared i32 ls 1%u32;
- if negb (i5 s= 3%i32)
- then Fail_ Failure
- else (
+ if i5 s= 3%i32
+ then (
i6 <- list_nth_shared i32 ls 2%u32;
- if negb (i6 s= 2%i32) then Fail_ Failure else Ok tt))))))
+ if i6 s= 2%i32 then Ok tt else Fail_ Failure)
+ else Fail_ Failure)
+ else Fail_ Failure)
+ else Fail_ Failure)
+ else Fail_ Failure)
+ else Fail_ Failure)
+ else Fail_ Failure
.
(** Unit test for [no_nested_borrows::test_list_functions] *)
@@ -452,23 +452,23 @@ Definition new_pair1 : result (StructWithPair_t u32 u32) :=
Definition test_constants : result unit :=
swt <- new_tuple1;
let (i, _) := swt.(structWithTuple_p) in
- if negb (i s= 1%u32)
- then Fail_ Failure
- else (
+ if i s= 1%u32
+ then (
swt1 <- new_tuple2;
let (i1, _) := swt1.(structWithTuple_p) in
- if negb (i1 s= 1%i16)
- then Fail_ Failure
- else (
+ if i1 s= 1%i16
+ then (
swt2 <- new_tuple3;
let (i2, _) := swt2.(structWithTuple_p) in
- if negb (i2 s= 1%u64)
- then Fail_ Failure
- else (
+ if i2 s= 1%u64
+ then (
swp <- new_pair1;
- if negb (swp.(structWithPair_p).(pair_x) s= 1%u32)
- then Fail_ Failure
- else Ok tt)))
+ if swp.(structWithPair_p).(pair_x) s= 1%u32
+ then Ok tt
+ else Fail_ Failure)
+ else Fail_ Failure)
+ else Fail_ Failure)
+ else Fail_ Failure
.
(** Unit test for [no_nested_borrows::test_constants] *)
@@ -486,7 +486,7 @@ Check (test_weird_borrows1 )%return.
Source: 'tests/src/no_nested_borrows.rs', lines 407:0-407: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
+ if y s= 0%u32 then Ok 2%u32 else Fail_ Failure
.
(** [no_nested_borrows::test_shared_borrow_bool1]:
diff --git a/tests/coq/misc/Paper.v b/tests/coq/misc/Paper.v
index e5728364..4588facd 100644
--- a/tests/coq/misc/Paper.v
+++ b/tests/coq/misc/Paper.v
@@ -16,7 +16,7 @@ Definition ref_incr (x : i32) : result i32 :=
(** [paper::test_incr]:
Source: 'tests/src/paper.rs', lines 11:0-11:18 *)
Definition test_incr : result unit :=
- x <- ref_incr 0%i32; if negb (x s= 1%i32) then Fail_ Failure else Ok tt
+ x <- ref_incr 0%i32; if x s= 1%i32 then Ok tt else Fail_ Failure
.
(** Unit test for [paper::test_incr] *)
@@ -37,14 +37,14 @@ Definition test_choose : result unit :=
p <- choose i32 true 0%i32 0%i32;
let (z, choose_back) := p in
z1 <- i32_add z 1%i32;
- if negb (z1 s= 1%i32)
- then Fail_ Failure
- else (
+ if z1 s= 1%i32
+ then (
p1 <- choose_back z1;
let (x, y) := p1 in
- if negb (x s= 1%i32)
- then Fail_ Failure
- else if negb (y s= 0%i32) then Fail_ Failure else Ok tt)
+ if x s= 1%i32
+ then if y s= 0%i32 then Ok tt else Fail_ Failure
+ else Fail_ Failure)
+ else Fail_ Failure
.
(** Unit test for [paper::test_choose] *)
@@ -100,7 +100,7 @@ Definition test_nth : result unit :=
x1 <- i32_add x 1%i32;
l2 <- list_nth_mut_back x1;
i <- sum l2;
- if negb (i s= 7%i32) then Fail_ Failure else Ok tt
+ if i s= 7%i32 then Ok tt else Fail_ Failure
.
(** Unit test for [paper::test_nth] *)
diff --git a/tests/coq/traits/Traits.v b/tests/coq/traits/Traits.v
index ad1be7ef..9ae95411 100644
--- a/tests/coq/traits/Traits.v
+++ b/tests/coq/traits/Traits.v
@@ -669,7 +669,7 @@ Arguments foo_x { _ _ }.
Arguments foo_y { _ _ }.
(** [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 (T E : Type) :=
| Core_result_Result_Ok : T -> core_result_Result_t T E
diff --git a/tests/fstar/arrays/Arrays.Funs.fst b/tests/fstar/arrays/Arrays.Funs.fst
index 26a695bb..a4f2e19f 100644
--- a/tests/fstar/arrays/Arrays.Funs.fst
+++ b/tests/fstar/arrays/Arrays.Funs.fst
@@ -348,7 +348,7 @@ let rec sum2_loop
let sum2 (s : slice u32) (s2 : slice u32) : result u32 =
let i = slice_len u32 s in
let i1 = slice_len u32 s2 in
- if not (i = i1) then Fail Failure else sum2_loop s s2 0 0
+ if i = i1 then sum2_loop s s2 0 0 else Fail Failure
(** [arrays::f0]:
Source: 'tests/src/arrays.rs', lines 266:0-266:11 *)
diff --git a/tests/fstar/hashmap/Hashmap.Funs.fst b/tests/fstar/hashmap/Hashmap.Funs.fst
index 0e991720..fb77c7ef 100644
--- a/tests/fstar/hashmap/Hashmap.Funs.fst
+++ b/tests/fstar/hashmap/Hashmap.Funs.fst
@@ -393,31 +393,31 @@ let test1 : result unit =
let* hm3 = hashMap_insert u64 hm2 1024 138 in
let* hm4 = hashMap_insert u64 hm3 1056 256 in
let* i = hashMap_get u64 hm4 128 in
- if not (i = 18)
- then Fail Failure
- else
+ if i = 18
+ then
let* (_, get_mut_back) = hashMap_get_mut u64 hm4 1024 in
let* hm5 = get_mut_back 56 in
let* i1 = hashMap_get u64 hm5 1024 in
- if not (i1 = 56)
- then Fail Failure
- else
+ if i1 = 56
+ then
let* (x, hm6) = hashMap_remove u64 hm5 1024 in
begin match x with
| None -> Fail Failure
| Some x1 ->
- if not (x1 = 56)
- then Fail Failure
- else
+ if x1 = 56
+ then
let* i2 = hashMap_get u64 hm6 0 in
- if not (i2 = 42)
- then Fail Failure
- else
+ if i2 = 42
+ then
let* i3 = hashMap_get u64 hm6 128 in
- if not (i3 = 18)
- then Fail Failure
- else
+ if i3 = 18
+ then
let* i4 = hashMap_get u64 hm6 1056 in
- if not (i4 = 256) then Fail Failure else Ok ()
+ if i4 = 256 then Ok () else Fail Failure
+ else Fail Failure
+ else Fail Failure
+ else Fail Failure
end
+ else Fail Failure
+ else Fail Failure
diff --git a/tests/fstar/misc/External.Funs.fst b/tests/fstar/misc/External.Funs.fst
index f5e8d4b7..bc68426a 100644
--- a/tests/fstar/misc/External.Funs.fst
+++ b/tests/fstar/misc/External.Funs.fst
@@ -8,7 +8,7 @@ include External.FunsExternal
#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
(** 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> *)
let core_marker_CopyU32 : core_marker_Copy_t u32 = {
cloneCloneInst = core_clone_CloneU32;
diff --git a/tests/fstar/misc/External.FunsExternal.fsti b/tests/fstar/misc/External.FunsExternal.fsti
index f005b657..62f063ea 100644
--- a/tests/fstar/misc/External.FunsExternal.fsti
+++ b/tests/fstar/misc/External.FunsExternal.fsti
@@ -7,14 +7,14 @@ include External.Types
#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
(** [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 *)
val core_cell_Cell_get
(t : Type0) (markerCopyInst : core_marker_Copy_t t) :
core_cell_Cell_t 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 *)
val core_cell_Cell_get_mut
(t : Type0) :
diff --git a/tests/fstar/misc/External.Types.fst b/tests/fstar/misc/External.Types.fst
index 211dfda7..6e58cfe4 100644
--- a/tests/fstar/misc/External.Types.fst
+++ b/tests/fstar/misc/External.Types.fst
@@ -7,7 +7,7 @@ include External.TypesExternal
#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
(** 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 *)
noeq type core_marker_Copy_t (self : Type0) = {
cloneCloneInst : core_clone_Clone self;
diff --git a/tests/fstar/misc/External.TypesExternal.fsti b/tests/fstar/misc/External.TypesExternal.fsti
index 188eb8e8..8a6a5ddd 100644
--- a/tests/fstar/misc/External.TypesExternal.fsti
+++ b/tests/fstar/misc/External.TypesExternal.fsti
@@ -6,7 +6,7 @@ open Primitives
#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
(** [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 *)
val core_cell_Cell_t (t : Type0) : Type0
diff --git a/tests/fstar/misc/NoNestedBorrows.fst b/tests/fstar/misc/NoNestedBorrows.fst
index 7506a13b..a5ba31bc 100644
--- a/tests/fstar/misc/NoNestedBorrows.fst
+++ b/tests/fstar/misc/NoNestedBorrows.fst
@@ -71,7 +71,7 @@ let test3 : result unit =
let* x = get_max 4 3 in
let* y = get_max 10 11 in
let* z = u32_add x y in
- if not (z = 15) then Fail Failure else Ok ()
+ if z = 15 then Ok () else Fail Failure
(** Unit test for [no_nested_borrows::test3] *)
let _ = assert_norm (test3 = Ok ())
@@ -79,7 +79,7 @@ let _ = assert_norm (test3 = Ok ())
(** [no_nested_borrows::test_neg1]:
Source: 'tests/src/no_nested_borrows.rs', lines 90:0-90:18 *)
let test_neg1 : result unit =
- let* y = i32_neg 3 in if not (y = -3) then Fail Failure else Ok ()
+ let* y = i32_neg 3 in if y = -3 then Ok () else Fail Failure
(** Unit test for [no_nested_borrows::test_neg1] *)
let _ = assert_norm (test_neg1 = Ok ())
@@ -87,7 +87,7 @@ let _ = assert_norm (test_neg1 = Ok ())
(** [no_nested_borrows::refs_test1]:
Source: 'tests/src/no_nested_borrows.rs', lines 97:0-97:19 *)
let refs_test1 : result unit =
- if not (1 = 1) then Fail Failure else Ok ()
+ if 1 = 1 then Ok () else Fail Failure
(** Unit test for [no_nested_borrows::refs_test1] *)
let _ = assert_norm (refs_test1 = Ok ())
@@ -95,15 +95,12 @@ let _ = assert_norm (refs_test1 = Ok ())
(** [no_nested_borrows::refs_test2]:
Source: 'tests/src/no_nested_borrows.rs', lines 108:0-108:19 *)
let refs_test2 : result unit =
- if not (2 = 2)
- then Fail Failure
- else
- if not (0 = 0)
- then Fail Failure
- else
- if not (2 = 2)
- then Fail Failure
- else if not (2 = 2) then Fail Failure else Ok ()
+ if 2 = 2
+ then
+ if 0 = 0
+ then if 2 = 2 then if 2 = 2 then Ok () else Fail Failure else Fail Failure
+ else Fail Failure
+ else Fail Failure
(** Unit test for [no_nested_borrows::refs_test2] *)
let _ = assert_norm (refs_test2 = Ok ())
@@ -122,7 +119,7 @@ let test_box1 : result unit =
let* (_, deref_mut_back) = alloc_boxed_Box_deref_mut i32 0 in
let* b = deref_mut_back 1 in
let* x = alloc_boxed_Box_deref i32 b in
- if not (x = 1) then Fail Failure else Ok ()
+ if x = 1 then Ok () else Fail Failure
(** Unit test for [no_nested_borrows::test_box1] *)
let _ = assert_norm (test_box1 = Ok ())
@@ -145,7 +142,7 @@ let test_panic (b : bool) : result unit =
(** [no_nested_borrows::test_copy_int]:
Source: 'tests/src/no_nested_borrows.rs', lines 160:0-160:22 *)
let test_copy_int : result unit =
- let* y = copy_int 0 in if not (0 = y) then Fail Failure else Ok ()
+ let* y = copy_int 0 in if 0 = y then Ok () else Fail Failure
(** Unit test for [no_nested_borrows::test_copy_int] *)
let _ = assert_norm (test_copy_int = Ok ())
@@ -159,7 +156,7 @@ let is_cons (t : Type0) (l : list_t t) : result bool =
Source: 'tests/src/no_nested_borrows.rs', lines 174:0-174:21 *)
let test_is_cons : result unit =
let* b = is_cons i32 (List_Cons 0 List_Nil) in
- if not b then Fail Failure else Ok ()
+ if b then Ok () else Fail Failure
(** Unit test for [no_nested_borrows::test_is_cons] *)
let _ = assert_norm (test_is_cons = Ok ())
@@ -177,7 +174,7 @@ let split_list (t : Type0) (l : list_t t) : result (t & (list_t t)) =
let test_split_list : result unit =
let* p = split_list i32 (List_Cons 0 List_Nil) in
let (hd, _) = p in
- if not (hd = 0) then Fail Failure else Ok ()
+ if hd = 0 then Ok () else Fail Failure
(** Unit test for [no_nested_borrows::test_split_list] *)
let _ = assert_norm (test_split_list = Ok ())
@@ -195,13 +192,11 @@ let choose
let choose_test : result unit =
let* (z, choose_back) = choose i32 true 0 0 in
let* z1 = i32_add z 1 in
- if not (z1 = 1)
- then Fail Failure
- else
+ if z1 = 1
+ then
let* (x, y) = choose_back z1 in
- if not (x = 1)
- then Fail Failure
- else if not (y = 0) then Fail Failure else Ok ()
+ if x = 1 then if y = 0 then Ok () else Fail Failure else Fail Failure
+ else Fail Failure
(** Unit test for [no_nested_borrows::choose_test] *)
let _ = assert_norm (choose_test = Ok ())
@@ -285,33 +280,33 @@ let test_list_functions : result unit =
let l = List_Cons 2 List_Nil in
let l1 = List_Cons 1 l in
let* i = list_length i32 (List_Cons 0 l1) in
- if not (i = 3)
- then Fail Failure
- else
+ if i = 3
+ then
let* i1 = list_nth_shared i32 (List_Cons 0 l1) 0 in
- if not (i1 = 0)
- then Fail Failure
- else
+ if i1 = 0
+ then
let* i2 = list_nth_shared i32 (List_Cons 0 l1) 1 in
- if not (i2 = 1)
- then Fail Failure
- else
+ if i2 = 1
+ then
let* i3 = list_nth_shared i32 (List_Cons 0 l1) 2 in
- if not (i3 = 2)
- then Fail Failure
- else
+ if i3 = 2
+ then
let* (_, list_nth_mut_back) = list_nth_mut i32 (List_Cons 0 l1) 1 in
let* ls = list_nth_mut_back 3 in
let* i4 = list_nth_shared i32 ls 0 in
- if not (i4 = 0)
- then Fail Failure
- else
+ if i4 = 0
+ then
let* i5 = list_nth_shared i32 ls 1 in
- if not (i5 = 3)
- then Fail Failure
- else
+ if i5 = 3
+ then
let* i6 = list_nth_shared i32 ls 2 in
- if not (i6 = 2) then Fail Failure else Ok ()
+ if i6 = 2 then Ok () else Fail Failure
+ else Fail Failure
+ else Fail Failure
+ else Fail Failure
+ else Fail Failure
+ else Fail Failure
+ else Fail Failure
(** Unit test for [no_nested_borrows::test_list_functions] *)
let _ = assert_norm (test_list_functions = Ok ())
@@ -381,21 +376,19 @@ let new_pair1 : result (structWithPair_t u32 u32) =
let test_constants : result unit =
let* swt = new_tuple1 in
let (i, _) = swt.p in
- if not (i = 1)
- then Fail Failure
- else
+ if i = 1
+ then
let* swt1 = new_tuple2 in
let (i1, _) = swt1.p in
- if not (i1 = 1)
- then Fail Failure
- else
+ if i1 = 1
+ then
let* swt2 = new_tuple3 in
let (i2, _) = swt2.p in
- if not (i2 = 1)
- then Fail Failure
- else
- let* swp = new_pair1 in
- if not (swp.p.x = 1) then Fail Failure else Ok ()
+ if i2 = 1
+ then let* swp = new_pair1 in if swp.p.x = 1 then Ok () else Fail Failure
+ else Fail Failure
+ else Fail Failure
+ else Fail Failure
(** Unit test for [no_nested_borrows::test_constants] *)
let _ = assert_norm (test_constants = Ok ())
@@ -412,7 +405,7 @@ let _ = assert_norm (test_weird_borrows1 = Ok ())
Source: 'tests/src/no_nested_borrows.rs', lines 407:0-407: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
+ if y = 0 then Ok 2 else Fail Failure
(** [no_nested_borrows::test_shared_borrow_bool1]:
Source: 'tests/src/no_nested_borrows.rs', lines 414:0-414:47 *)
diff --git a/tests/fstar/misc/Paper.fst b/tests/fstar/misc/Paper.fst
index e2412076..3566c5e2 100644
--- a/tests/fstar/misc/Paper.fst
+++ b/tests/fstar/misc/Paper.fst
@@ -13,7 +13,7 @@ let ref_incr (x : i32) : result i32 =
(** [paper::test_incr]:
Source: 'tests/src/paper.rs', lines 11:0-11:18 *)
let test_incr : result unit =
- let* x = ref_incr 0 in if not (x = 1) then Fail Failure else Ok ()
+ let* x = ref_incr 0 in if x = 1 then Ok () else Fail Failure
(** Unit test for [paper::test_incr] *)
let _ = assert_norm (test_incr = Ok ())
@@ -31,13 +31,11 @@ let choose
let test_choose : result unit =
let* (z, choose_back) = choose i32 true 0 0 in
let* z1 = i32_add z 1 in
- if not (z1 = 1)
- then Fail Failure
- else
+ if z1 = 1
+ then
let* (x, y) = choose_back z1 in
- if not (x = 1)
- then Fail Failure
- else if not (y = 0) then Fail Failure else Ok ()
+ if x = 1 then if y = 0 then Ok () else Fail Failure else Fail Failure
+ else Fail Failure
(** Unit test for [paper::test_choose] *)
let _ = assert_norm (test_choose = Ok ())
@@ -84,7 +82,7 @@ let test_nth : result unit =
let* x1 = i32_add x 1 in
let* l2 = list_nth_mut_back x1 in
let* i = sum l2 in
- if not (i = 7) then Fail Failure else Ok ()
+ if i = 7 then Ok () else Fail Failure
(** Unit test for [paper::test_nth] *)
let _ = assert_norm (test_nth = Ok ())
diff --git a/tests/fstar/traits/Traits.fst b/tests/fstar/traits/Traits.fst
index 70c345ba..556a26ac 100644
--- a/tests/fstar/traits/Traits.fst
+++ b/tests/fstar/traits/Traits.fst
@@ -503,7 +503,7 @@ let use_wrapper_len (t : Type0) (traitInst : trait_t t) : result usize =
type foo_t (t u : Type0) = { x : t; 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 *)
type core_result_Result_t (t e : Type0) =
| Core_result_Result_Ok : t -> core_result_Result_t t e
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 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 -/
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
--
cgit v1.2.3