Update charon

9 files changed, 117 insertions, 117 deletions

diff --git a/tests/lean/Arrays.lean b/tests/lean/Arrays.lean
index c2c3ac90..9748919e 100644
--- a/tests/lean/Arrays.lean
+++ b/tests/lean/Arrays.lean
@@ -384,9 +384,9 @@ divergent def sum2_loop
 def sum2 (s : Slice U32) (s2 : Slice U32) : Result U32 :=
   let i := Slice.len U32 s
   let i1 := Slice.len U32 s2
-  if ¬ (i = i1)
-  then Result.fail .panic
-  else sum2_loop s s2 0#u32 0#usize
+  if i = i1
+  then sum2_loop s s2 0#u32 0#usize
+  else Result.fail .panic
 
 /- [arrays::f0]:
    Source: 'tests/src/arrays.rs', lines 266:0-266:11 -/
diff --git a/tests/lean/External/Funs.lean b/tests/lean/External/Funs.lean
index 1acb9707..1b1d5cdf 100644
--- a/tests/lean/External/Funs.lean
+++ b/tests/lean/External/Funs.lean
@@ -8,7 +8,7 @@ open Primitives
 namespace external
 
 /- Trait implementation: [core::marker::{(core::marker::Copy for u32)#61}]
-   Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/marker.rs', lines 47:29-47:65
+   Source: '/rustc/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/marker.rs', lines 47:29-47:65
    Name pattern: core::marker::Copy<u32> -/
 def core.marker.CopyU32 : core.marker.Copy U32 := {
   cloneCloneInst := core.clone.CloneU32
diff --git a/tests/lean/External/FunsExternal_Template.lean b/tests/lean/External/FunsExternal_Template.lean
index 077e22a9..870a79c0 100644
--- a/tests/lean/External/FunsExternal_Template.lean
+++ b/tests/lean/External/FunsExternal_Template.lean
@@ -7,14 +7,14 @@ open Primitives
 open external
 
 /- [core::cell::{core::cell::Cell<T>#10}::get]:
-   Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/cell.rs', lines 497:4-497:26
+   Source: '/rustc/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/cell.rs', lines 510:4-510:26
    Name pattern: core::cell::{core::cell::Cell<@T>}::get -/
 axiom core.cell.Cell.get
   (T : Type) (markerCopyInst : core.marker.Copy T) :
   core.cell.Cell T → State → Result (State × T)
 
 /- [core::cell::{core::cell::Cell<T>#11}::get_mut]:
-   Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/cell.rs', lines 574:4-574:39
+   Source: '/rustc/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/cell.rs', lines 588:4-588:39
    Name pattern: core::cell::{core::cell::Cell<@T>}::get_mut -/
 axiom core.cell.Cell.get_mut
   (T : Type) :
diff --git a/tests/lean/External/Types.lean b/tests/lean/External/Types.lean
index bcb1d22c..836ddff0 100644
--- a/tests/lean/External/Types.lean
+++ b/tests/lean/External/Types.lean
@@ -7,7 +7,7 @@ open Primitives
 namespace external
 
 /- Trait declaration: [core::marker::Copy]
-   Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/marker.rs', lines 465:0-465:21
+   Source: '/rustc/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/marker.rs', lines 465:0-465:21
    Name pattern: core::marker::Copy -/
 structure core.marker.Copy (Self : Type) where
   cloneCloneInst : core.clone.Clone Self
diff --git a/tests/lean/External/TypesExternal_Template.lean b/tests/lean/External/TypesExternal_Template.lean
index f91044be..24687d83 100644
--- a/tests/lean/External/TypesExternal_Template.lean
+++ b/tests/lean/External/TypesExternal_Template.lean
@@ -5,7 +5,7 @@ import Base
 open Primitives
 
 /- [core::cell::Cell]
-   Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/cell.rs', lines 293:0-293:26
+   Source: '/rustc/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/cell.rs', lines 294:0-294:26
    Name pattern: core::cell::Cell -/
 axiom core.cell.Cell (T : Type) : Type
 
diff --git a/tests/lean/Hashmap/Funs.lean b/tests/lean/Hashmap/Funs.lean
index d7ac3b05..612e1848 100644
--- a/tests/lean/Hashmap/Funs.lean
+++ b/tests/lean/Hashmap/Funs.lean
@@ -400,38 +400,38 @@ def test1 : Result Unit :=
   let hm3 ← HashMap.insert U64 hm2 1024#usize 138#u64
   let hm4 ← HashMap.insert U64 hm3 1056#usize 256#u64
   let i ← HashMap.get U64 hm4 128#usize
-  if ¬ (i = 18#u64)
-  then Result.fail .panic
-  else
+  if i = 18#u64
+  then
     do
     let (_, get_mut_back) ← HashMap.get_mut U64 hm4 1024#usize
     let hm5 ← get_mut_back 56#u64
     let i1 ← HashMap.get U64 hm5 1024#usize
-    if ¬ (i1 = 56#u64)
-    then Result.fail .panic
-    else
+    if i1 = 56#u64
+    then
       do
       let (x, hm6) ← HashMap.remove U64 hm5 1024#usize
       match x with
       | none => Result.fail .panic
       | some x1 =>
-        if ¬ (x1 = 56#u64)
-        then Result.fail .panic
-        else
+        if x1 = 56#u64
+        then
           do
           let i2 ← HashMap.get U64 hm6 0#usize
-          if ¬ (i2 = 42#u64)
-          then Result.fail .panic
-          else
+          if i2 = 42#u64
+          then
             do
             let i3 ← HashMap.get U64 hm6 128#usize
-            if ¬ (i3 = 18#u64)
-            then Result.fail .panic
-            else
+            if i3 = 18#u64
+            then
               do
               let i4 ← HashMap.get U64 hm6 1056#usize
-              if ¬ (i4 = 256#u64)
-              then Result.fail .panic
-              else Result.ok ()
+              if i4 = 256#u64
+              then Result.ok ()
+              else Result.fail .panic
+            else Result.fail .panic
+          else Result.fail .panic
+        else Result.fail .panic
+    else Result.fail .panic
+  else Result.fail .panic
 
 end hashmap
diff --git a/tests/lean/NoNestedBorrows.lean b/tests/lean/NoNestedBorrows.lean
index 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