Merge branch 'main' into son/clean-synthesis

33 files changed, 418 insertions, 407 deletions

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/arrays/_CoqProject b/tests/coq/arrays/_CoqProject
index a4e82408..4ccc7663 100644
--- a/tests/coq/arrays/_CoqProject
+++ b/tests/coq/arrays/_CoqProject
@@ -3,5 +3,5 @@
 -arg -w
 -arg all
 
-Arrays.v
+Arrays.v 
 Primitives.v
diff --git a/tests/coq/demo/_CoqProject b/tests/coq/demo/_CoqProject
index 62554699..67e4f2a4 100644
--- a/tests/coq/demo/_CoqProject
+++ b/tests/coq/demo/_CoqProject
@@ -3,5 +3,5 @@
 -arg -w
 -arg all
 
-Demo.v
+Demo.v 
 Primitives.v
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/hashmap/_CoqProject b/tests/coq/hashmap/_CoqProject
index 7f80afbf..5d98662a 100644
--- a/tests/coq/hashmap/_CoqProject
+++ b/tests/coq/hashmap/_CoqProject
@@ -3,6 +3,6 @@
 -arg -w
 -arg all
 
-Hashmap_Types.v
+Hashmap_Funs.v 
+Hashmap_Types.v 
 Primitives.v
-Hashmap_Funs.v
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 2cc6af6c..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] *)
@@ -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 220:0-220:36 *)
+Definition panic_mut_borrow (i : u32) : result u32 :=
+  Fail_ Failure.
+
 (** [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 (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 225:0-225:20 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 230:0-230: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 260:0-260:48 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 265:0-265: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 268:0-268:62 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 273:0-273: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 284:0-284:67 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 289:0-289: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 300:0-300:63 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 305:0-305:63 *)
 Fixpoint list_rev_aux
   (T : Type) (li : List_t T) (lo : List_t T) : result (List_t T) :=
   match li with
@@ -315,53 +320,53 @@ Fixpoint list_rev_aux
 .
 
 (** [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 *)
 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 319:0-319:28 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 324:0-324:28 *)
 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] *)
 Check (test_list_functions )%return.
 
 (** [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 *)
 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 339:0-339:88 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 344:0-344: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 343:0-343:93 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 348:0-348: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 347:0-347:92 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 352:0-352: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 354:0-354:34 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 359:0-359: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 358:0-358:48 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 363:0-363: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 362:0-362:48 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 367:0-367: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 366:0-366:48 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 371:0-371: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 371:0-371:33 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 376:0-376:33 *)
 Record StructWithPair_t (T1 T2 : Type) :=
 mkStructWithPair_t {
   structWithPair_p : Pair_t T1 T2;
@@ -437,40 +442,40 @@ Arguments mkStructWithPair_t { _ _ }.
 Arguments structWithPair_p { _ _ }.
 
 (** [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 *)
 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 383:0-383:23 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 388:0-388:23 *)
 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] *)
 Check (test_constants )%return.
 
 (** [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 *)
 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 402:0-402:37 *)
+    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]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 409:0-409:47 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 414:0-414: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 422:0-422:40 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 427:0-427: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 437:0-437:52 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 442:0-442: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 449:0-449:40 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 454:0-454:40 *)
 Definition test_shared_borrow_enum2 : result u32 :=
   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 *)
 Definition incr (x : u32) : result u32 :=
   u32_add 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 *)
 Definition 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 *)
 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 475:0-475:24 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 480:0-480:24 *)
 Definition Tuple_t (T1 T2 : Type) : 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 *)
 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 481:0-481:61 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 486:0-486: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 486:0-486:20 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 491:0-491:20 *)
 Definition IdType_t (T : Type) : 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 *)
 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 492:0-492:43 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 497:0-497:43 *)
 Definition create_id_type (T : Type) (x : T) : result (IdType_t T) :=
   Ok x.
 
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/misc/_CoqProject b/tests/coq/misc/_CoqProject
index 308de4f4..bffb6699 100644
--- a/tests/coq/misc/_CoqProject
+++ b/tests/coq/misc/_CoqProject
@@ -3,16 +3,16 @@
 -arg -w
 -arg all
 
-External_FunsExternal_Template.v
-Loops.v
-External_Types.v
+Bitwise.v 
+Constants.v 
+External_Funs.v 
+External_FunsExternal.v 
+External_FunsExternal_Template.v 
+External_Types.v 
+External_TypesExternal.v 
+External_TypesExternal_Template.v 
+Loops.v 
+NoNestedBorrows.v 
+Paper.v 
+PoloniusList.v 
 Primitives.v
-External_Funs.v
-External_TypesExternal.v
-Constants.v
-PoloniusList.v
-NoNestedBorrows.v
-External_FunsExternal.v
-Bitwise.v
-External_TypesExternal_Template.v
-Paper.v
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/coq/traits/_CoqProject b/tests/coq/traits/_CoqProject
index 5b6199fc..14a91aa8 100644
--- a/tests/coq/traits/_CoqProject
+++ b/tests/coq/traits/_CoqProject
@@ -3,5 +3,5 @@
 -arg -w
 -arg all
 
+Primitives.v 
 Traits.v
-Primitives.v
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 7e333b56..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 ())
@@ -211,20 +206,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 220:0-220:36 *)
+let panic_mut_borrow (i : u32) : result u32 =
+  Fail Failure
+
 (** [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 *)
 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 225:0-225:20 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 230:0-230: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 260:0-260:48 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 265:0-265: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 +232,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 268:0-268:62 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 273:0-273: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 +241,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 284:0-284:67 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 289:0-289:67 *)
 let rec list_nth_mut
   (t : Type0) (l : list_t t) (i : u32) :
   result (t & (t -> result (list_t t)))
@@ -260,7 +260,7 @@ let rec list_nth_mut
   end
 
 (** [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 *)
 let rec list_rev_aux
   (t : Type0) (li : list_t t) (lo : list_t t) : result (list_t t) =
   begin match li with
@@ -269,50 +269,50 @@ let rec list_rev_aux
   end
 
 (** [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 *)
 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 319:0-319:28 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 324:0-324:28 *)
 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 ())
 
 (** [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 *)
 let id_mut_pair1
   (t1 t2 : Type0) (x : t1) (y : t2) :
   result ((t1 & t2) & ((t1 & t2) -> result (t1 & t2)))
@@ -320,7 +320,7 @@ let id_mut_pair1
   Ok ((x, y), 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 *)
 let id_mut_pair2
   (t1 t2 : Type0) (p : (t1 & t2)) :
   result ((t1 & t2) & ((t1 & t2) -> result (t1 & t2)))
@@ -328,7 +328,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 343:0-343:93 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 348:0-348:93 *)
 let id_mut_pair3
   (t1 t2 : Type0) (x : t1) (y : t2) :
   result ((t1 & t2) & (t1 -> result t1) & (t2 -> result t2))
@@ -336,7 +336,7 @@ let id_mut_pair3
   Ok ((x, y), Ok, 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 *)
 let id_mut_pair4
   (t1 t2 : Type0) (p : (t1 & t2)) :
   result ((t1 & t2) & (t1 -> result t1) & (t2 -> result t2))
@@ -344,59 +344,57 @@ 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 354:0-354:34 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 359:0-359:34 *)
 type structWithTuple_t (t1 t2 : Type0) = { 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 *)
 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 362:0-362:48 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 367:0-367: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 366:0-366:48 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 371:0-371: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 371:0-371:33 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 376:0-376: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 375:0-375:46 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 380:0-380: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 383:0-383:23 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 388:0-388:23 *)
 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 ())
 
 (** [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 *)
 let test_weird_borrows1 : result unit =
   Ok ()
 
@@ -404,71 +402,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 402:0-402:37 *)
+    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 409:0-409:47 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 414:0-414: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 422:0-422:40 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 427:0-427: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 437:0-437:52 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 442:0-442: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 449:0-449:40 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 454:0-454:40 *)
 let test_shared_borrow_enum2 : result u32 =
   Ok 0
 
 (** [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 *)
 let incr (x : u32) : result u32 =
   u32_add x 1
 
 (** [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 *)
 let 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 *)
 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 475:0-475:24 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 480:0-480:24 *)
 type tuple_t (t1 t2 : Type0) = 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 *)
 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 481:0-481:61 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 486:0-486: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 486:0-486:20 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 491:0-491:20 *)
 type idType_t (t : Type0) = 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 *)
 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 492:0-492:43 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 497:0-497:43 *)
 let create_id_type (t : Type0) (x : t) : result (idType_t t) =
   Ok x
 
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 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
diff --git a/tests/src/no_nested_borrows.rs b/tests/src/no_nested_borrows.rs
index a250748c..6d3074ef 100644
--- a/tests/src/no_nested_borrows.rs
+++ b/tests/src/no_nested_borrows.rs
@@ -216,6 +216,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),
@@ -228,7 +233,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