Merge pull request #244 from Nadrieril/bump-charon

11 files changed, 13 insertions, 13 deletions

diff --git a/charon-pin b/charon-pin
index e4f6e42a..ad45dea7 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.
-61685783db8135df945e53b302dc3e364b7892ee
+2e74074eaa0528f3203dc1c160ccdba0f44b563a
diff --git a/flake.lock b/flake.lock
index a35ba103..19263560 100644
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1718979132,
-        "narHash": "sha256-MZbG1JOuKpV47fVfi+OhUsf3uRG+ln2KseMNitxqHmQ=",
+        "lastModified": 1719218135,
+        "narHash": "sha256-ICbwKLkfAjuIivmruHF6srfn9MBjo/zO+IpLeKtH5d4=",
         "owner": "aeneasverif",
         "repo": "charon",
-        "rev": "61685783db8135df945e53b302dc3e364b7892ee",
+        "rev": "2e74074eaa0528f3203dc1c160ccdba0f44b563a",
         "type": "github"
       },
       "original": {
diff --git a/tests/coq/misc/External_Funs.v b/tests/coq/misc/External_Funs.v
index 699db6a7..c68488db 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/library/core/src/marker.rs', lines 47:29-47:65
+    Source: '/rustc/library/core/src/marker.rs', lines 47:29-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_Types.v b/tests/coq/misc/External_Types.v
index 00256a42..d332bfff 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 465:0-465:21
+    Source: '/rustc/library/core/src/marker.rs', lines 472:0-472: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/traits/Traits.v b/tests/coq/traits/Traits.v
index 2469fbf7..b1fa353f 100644
--- a/tests/coq/traits/Traits.v
+++ b/tests/coq/traits/Traits.v
@@ -275,7 +275,7 @@ Definition toTypetraitsBoolWrapperT_to_type
 .
 
 (** Trait implementation: [traits::{(traits::ToType<T> for traits::BoolWrapper)#7}]
-    Source: 'tests/src/traits.rs', lines 153:0-153:33 *)
+    Source: 'tests/src/traits.rs', lines 153:0-155:20 *)
 Definition ToTypetraitsBoolWrapperT (T : Type) (toTypeBoolTInst : ToType_t bool
   T) : ToType_t BoolWrapper_t T := {|
   ToType_t_to_type := toTypetraitsBoolWrapperT_to_type T toTypeBoolTInst;
diff --git a/tests/fstar/misc/External.Funs.fst b/tests/fstar/misc/External.Funs.fst
index ac4aeeb4..bddddf04 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/library/core/src/marker.rs', lines 47:29-47:65
+    Source: '/rustc/library/core/src/marker.rs', lines 47:29-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.Types.fst b/tests/fstar/misc/External.Types.fst
index c42c03bd..d14b219d 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 465:0-465:21
+    Source: '/rustc/library/core/src/marker.rs', lines 472:0-472:21
     Name pattern: core::marker::Copy *)
 noeq type core_marker_Copy_t (self : Type0) = {
   cloneCloneInst : core_clone_Clone self;
diff --git a/tests/fstar/traits/Traits.fst b/tests/fstar/traits/Traits.fst
index 6b892d13..4d0d1c55 100644
--- a/tests/fstar/traits/Traits.fst
+++ b/tests/fstar/traits/Traits.fst
@@ -221,7 +221,7 @@ let toTypetraitsBoolWrapperT_to_type
   toTypeBoolTInst.to_type self
 
 (** Trait implementation: [traits::{(traits::ToType<T> for traits::BoolWrapper)#7}]
-    Source: 'tests/src/traits.rs', lines 153:0-153:33 *)
+    Source: 'tests/src/traits.rs', lines 153:0-155:20 *)
 let toTypetraitsBoolWrapperT (t : Type0) (toTypeBoolTInst : toType_t bool t) :
   toType_t boolWrapper_t t = {
   to_type = toTypetraitsBoolWrapperT_to_type t toTypeBoolTInst;
diff --git a/tests/lean/External/Funs.lean b/tests/lean/External/Funs.lean
index d97e5286..15655b6c 100644
--- a/tests/lean/External/Funs.lean
+++ b/tests/lean/External/Funs.lean
@@ -11,7 +11,7 @@ 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:65
+   Source: '/rustc/library/core/src/marker.rs', lines 47:29-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/Types.lean b/tests/lean/External/Types.lean
index f92e3335..43c8a165 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 465:0-465:21
+   Source: '/rustc/library/core/src/marker.rs', lines 472:0-472:21
    Name pattern: core::marker::Copy -/
 structure core.marker.Copy (Self : Type) where
   cloneCloneInst : core.clone.Clone Self
diff --git a/tests/lean/Traits.lean b/tests/lean/Traits.lean
index b40d2a6f..4ea6e78f 100644
--- a/tests/lean/Traits.lean
+++ b/tests/lean/Traits.lean
@@ -237,7 +237,7 @@ def ToTypetraitsBoolWrapperT.to_type
   ToTypeBoolTInst.to_type self
 
 /- Trait implementation: [traits::{(traits::ToType<T> for traits::BoolWrapper)#7}]
-   Source: 'tests/src/traits.rs', lines 153:0-153:33 -/
+   Source: 'tests/src/traits.rs', lines 153:0-155:20 -/
 def ToTypetraitsBoolWrapperT (T : Type) (ToTypeBoolTInst : ToType Bool T) :
   ToType BoolWrapper T := {
   to_type := ToTypetraitsBoolWrapperT.to_type T ToTypeBoolTInst