From 71a1ab3e2fa9581314328b4fdb7aa2ca3caa4e20 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Thu, 23 May 2024 10:42:54 +0200
Subject: Bump charon version

---
 charon-pin                                       | 2 +-
 flake.lock                                       | 6 +++---
 tests/coq/misc/External_Funs.v                   | 4 ++--
 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/traits/Traits.v                        | 2 +-
 tests/fstar/misc/External.Funs.fst               | 4 ++--
 tests/fstar/misc/External.FunsExternal.fsti      | 4 ++--
 tests/fstar/misc/External.Types.fst              | 2 +-
 tests/fstar/misc/External.TypesExternal.fsti     | 2 +-
 tests/fstar/traits/Traits.fst                    | 2 +-
 tests/lean/External/Funs.lean                    | 4 ++--
 tests/lean/External/FunsExternal_Template.lean   | 4 ++--
 tests/lean/External/Types.lean                   | 2 +-
 tests/lean/External/TypesExternal_Template.lean  | 2 +-
 tests/lean/Traits.lean                           | 2 +-
 17 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/charon-pin b/charon-pin
index 31dbf214..2b45bb6d 100644
--- a/charon-pin
+++ b/charon-pin
@@ -1,2 +1,2 @@
 # This is the commit from https://github.com/AeneasVerif/charon that should be used with this version of aeneas.
-30ff93c24e5a1a6151d1c76f94c1d61ff1c34f70
+c049120c15567d22520c94f570363eb4948d849f
diff --git a/flake.lock b/flake.lock
index 89f8b5a0..cad633ea 100644
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1715695299,
-        "narHash": "sha256-50VuITmseECX64vbupU8bW4nG+TcEvUjL1FRmfSjyLw=",
+        "lastModified": 1716398715,
+        "narHash": "sha256-z4COmDxa3DY6pVLgB85n6EVWFPkx87tr+xkJGiQvpV8=",
         "owner": "aeneasverif",
         "repo": "charon",
-        "rev": "30ff93c24e5a1a6151d1c76f94c1d61ff1c34f70",
+        "rev": "c049120c15567d22520c94f570363eb4948d849f",
         "type": "github"
       },
       "original": {
diff --git a/tests/coq/misc/External_Funs.v b/tests/coq/misc/External_Funs.v
index c4f70f75..85f6e4d1 100644
--- a/tests/coq/misc/External_Funs.v
+++ b/tests/coq/misc/External_Funs.v
@@ -12,8 +12,8 @@ Require Import External_FunsExternal.
 Include External_FunsExternal.
 Module External_Funs.
 
-(** Trait implementation: [core::marker::{(core::marker::Copy for u32)#40}]
-    Source: '/rustc/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/marker.rs', lines 47:29-47:65
+(** Trait implementation: [core::marker::{(core::marker::Copy for u32)#61}]
+    Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/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 b3e4a129..1ce677c5 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/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/cell.rs', lines 497:4-497:26
+    Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/cell.rs', lines 497:4-497: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/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/cell.rs', lines 574:4-574:39
+    Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/cell.rs', lines 574:4-574: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 5b233c62..a49399bf 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/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/marker.rs', lines 450:0-450:21
+    Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/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 87b1c826..decdd169 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/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/cell.rs', lines 293:0-293:26
+    Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/cell.rs', lines 293:0-293:26
     Name pattern: core::cell::Cell *)
 Axiom core_cell_Cell_t : forall (T : Type), Type.
 
diff --git a/tests/coq/traits/Traits.v b/tests/coq/traits/Traits.v
index fb37a507..18b06bc1 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/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/result.rs', lines 502:0-502:21
+    Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/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/misc/External.Funs.fst b/tests/fstar/misc/External.Funs.fst
index d8457ce3..3b99ef25 100644
--- a/tests/fstar/misc/External.Funs.fst
+++ b/tests/fstar/misc/External.Funs.fst
@@ -7,8 +7,8 @@ include External.FunsExternal
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
-(** Trait implementation: [core::marker::{(core::marker::Copy for u32)#40}]
-    Source: '/rustc/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/marker.rs', lines 47:29-47:65
+(** Trait implementation: [core::marker::{(core::marker::Copy for u32)#61}]
+    Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/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 9436cf86..f005b657 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/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/cell.rs', lines 497:4-497:26
+    Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/cell.rs', lines 497:4-497: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/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/cell.rs', lines 574:4-574:39
+    Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/cell.rs', lines 574:4-574: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 143f24dd..211dfda7 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/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/marker.rs', lines 450:0-450:21
+    Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/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 c0b7e43f..188eb8e8 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/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/cell.rs', lines 293:0-293:26
+    Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/cell.rs', lines 293:0-293:26
     Name pattern: core::cell::Cell *)
 val core_cell_Cell_t (t : Type0) : Type0
 
diff --git a/tests/fstar/traits/Traits.fst b/tests/fstar/traits/Traits.fst
index 1f0293a0..0904e506 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/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/result.rs', lines 502:0-502:21
+    Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/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/External/Funs.lean b/tests/lean/External/Funs.lean
index 20c4b8e5..0b0a2476 100644
--- a/tests/lean/External/Funs.lean
+++ b/tests/lean/External/Funs.lean
@@ -7,8 +7,8 @@ open Primitives
 
 namespace external
 
-/- Trait implementation: [core::marker::{(core::marker::Copy for u32)#40}]
-   Source: '/rustc/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/marker.rs', lines 47:29-47:65
+/- Trait implementation: [core::marker::{(core::marker::Copy for u32)#61}]
+   Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/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 a6163c96..077e22a9 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/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/cell.rs', lines 497:4-497:26
+   Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/cell.rs', lines 497:4-497: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/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/cell.rs', lines 574:4-574:39
+   Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/cell.rs', lines 574:4-574: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 5d4cfc77..bcb1d22c 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/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/marker.rs', lines 450:0-450:21
+   Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/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 2e6ed6e0..f91044be 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/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/cell.rs', lines 293:0-293:26
+   Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/library/core/src/cell.rs', lines 293:0-293:26
    Name pattern: core::cell::Cell -/
 axiom core.cell.Cell (T : Type) : Type
 
diff --git a/tests/lean/Traits.lean b/tests/lean/Traits.lean
index 0076e6f6..3746d494 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/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/result.rs', lines 502:0-502:21
+   Source: '/rustc/ad963232d9b987d66a6f8e6ec4141f672b8b9900/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