Merge pull request #271 from Nadrieril/update-charon2

17 files changed, 28 insertions, 32 deletions

diff --git a/charon-pin b/charon-pin
index 345f441e..bb394c7f 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.
-ae55966c01a1a4b185a1a34da7861ba5db74c8ad
+0fb1b5de2ba2d3fc53feb152c6469df9a4c5eb74
diff --git a/flake.lock b/flake.lock
index 08b53bad..eff66cd5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1719316648,
-        "narHash": "sha256-OUlAPxAyNruZZ7b7MxRdi4udvTOwUQW2kn6rg9Xn7fk=",
+        "lastModified": 1719555491,
+        "narHash": "sha256-fhUvQpSx5STuzNt9Fn2kmYQxESZjkdWU1F5icXKISVQ=",
         "owner": "aeneasverif",
         "repo": "charon",
-        "rev": "ae55966c01a1a4b185a1a34da7861ba5db74c8ad",
+        "rev": "0fb1b5de2ba2d3fc53feb152c6469df9a4c5eb74",
         "type": "github"
       },
       "original": {
@@ -266,21 +266,17 @@
     },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": [
-          "charon",
-          "flake-utils"
-        ],
         "nixpkgs": [
           "charon",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1701656211,
-        "narHash": "sha256-lfFXsLWH4hVbEKR6K+UcDiKxeS6Lz4FkC1DZ9LHqf9Y=",
+        "lastModified": 1719454714,
+        "narHash": "sha256-MojqG0lyUINkEk0b3kM2drsU5vyaF8DFZe/FAlZVOGs=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "47a276e820ae4ae1b8d98a503bf09d2ceb52dfd8",
+        "rev": "d1c527659cf076ecc4b96a91c702d080b213801e",
         "type": "github"
       },
       "original": {
diff --git a/tests/coq/misc/External_Funs.v b/tests/coq/misc/External_Funs.v
index c68488db..777ed6a4 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)#61}]
-    Source: '/rustc/library/core/src/marker.rs', lines 47:29-47:62
+(** Trait implementation: [core::marker::{(core::marker::Copy for u32)#41}]
+    Source: '/rustc/library/core/src/marker.rs', lines 47:25-47:62
     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 03df2656..7be1240a 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/library/core/src/cell.rs', lines 510:4-510:26
+    Source: '/rustc/library/core/src/cell.rs', lines 533:4-533: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/library/core/src/cell.rs', lines 588:4-588:39
+    Source: '/rustc/library/core/src/cell.rs', lines 611:4-611: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 d332bfff..91486abb 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/library/core/src/marker.rs', lines 472:0-472:21
+    Source: '/rustc/library/core/src/marker.rs', lines 403:0-403: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 e4faffbd..7f5a9f56 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/library/core/src/cell.rs', lines 294:0-294:26
+    Source: '/rustc/library/core/src/cell.rs', lines 308:0-308: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 b1fa353f..29063c13 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/library/core/src/result.rs', lines 502:0-502:21
+    Source: '/rustc/library/core/src/result.rs', lines 527:0-527: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 bddddf04..dac1e09a 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)#61}]
-    Source: '/rustc/library/core/src/marker.rs', lines 47:29-47:62
+(** Trait implementation: [core::marker::{(core::marker::Copy for u32)#41}]
+    Source: '/rustc/library/core/src/marker.rs', lines 47:25-47:62
     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 fa9d5d70..fd99a275 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/library/core/src/cell.rs', lines 510:4-510:26
+    Source: '/rustc/library/core/src/cell.rs', lines 533:4-533: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/library/core/src/cell.rs', lines 588:4-588:39
+    Source: '/rustc/library/core/src/cell.rs', lines 611:4-611: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 d14b219d..f7b30f27 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/library/core/src/marker.rs', lines 472:0-472:21
+    Source: '/rustc/library/core/src/marker.rs', lines 403:0-403: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 f2564ba0..62c496ce 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/library/core/src/cell.rs', lines 294:0-294:26
+    Source: '/rustc/library/core/src/cell.rs', lines 308:0-308: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 4d0d1c55..3de74912 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/library/core/src/result.rs', lines 502:0-502:21
+    Source: '/rustc/library/core/src/result.rs', lines 527:0-527: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 15655b6c..937bd212 100644
--- a/tests/lean/External/Funs.lean
+++ b/tests/lean/External/Funs.lean
@@ -10,8 +10,8 @@ set_option linter.unusedVariables false
 
 namespace external
 
-/- Trait implementation: [core::marker::{(core::marker::Copy for u32)#61}]
-   Source: '/rustc/library/core/src/marker.rs', lines 47:29-47:62
+/- Trait implementation: [core::marker::{(core::marker::Copy for u32)#41}]
+   Source: '/rustc/library/core/src/marker.rs', lines 47:25-47:62
    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 ce2cfe47..40583df2 100644
--- a/tests/lean/External/FunsExternal_Template.lean
+++ b/tests/lean/External/FunsExternal_Template.lean
@@ -10,14 +10,14 @@ set_option linter.unusedVariables false
 open external
 
 /- [core::cell::{core::cell::Cell<T>#10}::get]:
-   Source: '/rustc/library/core/src/cell.rs', lines 510:4-510:26
+   Source: '/rustc/library/core/src/cell.rs', lines 533:4-533: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/library/core/src/cell.rs', lines 588:4-588:39
+   Source: '/rustc/library/core/src/cell.rs', lines 611:4-611: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 43c8a165..7ed56940 100644
--- a/tests/lean/External/Types.lean
+++ b/tests/lean/External/Types.lean
@@ -10,7 +10,7 @@ set_option linter.unusedVariables false
 namespace external
 
 /- Trait declaration: [core::marker::Copy]
-   Source: '/rustc/library/core/src/marker.rs', lines 472:0-472:21
+   Source: '/rustc/library/core/src/marker.rs', lines 403:0-403: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 4f499117..045a0de3 100644
--- a/tests/lean/External/TypesExternal_Template.lean
+++ b/tests/lean/External/TypesExternal_Template.lean
@@ -8,7 +8,7 @@ set_option linter.hashCommand false
 set_option linter.unusedVariables false
 
 /- [core::cell::Cell]
-   Source: '/rustc/library/core/src/cell.rs', lines 294:0-294:26
+   Source: '/rustc/library/core/src/cell.rs', lines 308:0-308: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 4ea6e78f..b220042f 100644
--- a/tests/lean/Traits.lean
+++ b/tests/lean/Traits.lean
@@ -515,7 +515,7 @@ structure Foo (T U : Type) where
   y : U
 
 /- [core::result::Result]
-   Source: '/rustc/library/core/src/result.rs', lines 502:0-502:21
+   Source: '/rustc/library/core/src/result.rs', lines 527:0-527:21
    Name pattern: core::result::Result -/
 inductive core.result.Result (T E : Type) :=
 | Ok : T → core.result.Result T E