summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--charon-pin2
-rw-r--r--flake.lock6
-rw-r--r--tests/coq/misc/External_Funs.v2
-rw-r--r--tests/coq/misc/External_FunsExternal_Template.v4
-rw-r--r--tests/coq/misc/External_Types.v2
-rw-r--r--tests/coq/misc/External_TypesExternal_Template.v2
-rw-r--r--tests/coq/traits/Traits.v2
-rw-r--r--tests/fstar/misc/External.Funs.fst2
-rw-r--r--tests/fstar/misc/External.FunsExternal.fsti4
-rw-r--r--tests/fstar/misc/External.Types.fst2
-rw-r--r--tests/fstar/misc/External.TypesExternal.fsti2
-rw-r--r--tests/fstar/traits/Traits.fst2
-rw-r--r--tests/lean/External/Funs.lean2
-rw-r--r--tests/lean/External/FunsExternal_Template.lean4
-rw-r--r--tests/lean/External/Types.lean2
-rw-r--r--tests/lean/External/TypesExternal_Template.lean2
-rw-r--r--tests/lean/Traits.lean2
17 files changed, 22 insertions, 22 deletions
diff --git a/charon-pin b/charon-pin
index 2f35e2cf..f5d57d2f 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.
-335f6d7423c2c2a3863440bfd19507b5d2452aac
+3c1b7e2c8e2e8d936d1054cd3803a64d50cfb905
diff --git a/flake.lock b/flake.lock
index fa417e87..8ec4ba9b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
- "lastModified": 1717573936,
- "narHash": "sha256-PDfOISJ5hmlbM4j4jy8k0BTBYF6hPikM3ob4TbKCE/A=",
+ "lastModified": 1718613525,
+ "narHash": "sha256-E2YhvmpEEcytnSJkSq3LsA2q3uJbe0NC2TCHaRVJFX4=",
"owner": "aeneasverif",
"repo": "charon",
- "rev": "335f6d7423c2c2a3863440bfd19507b5d2452aac",
+ "rev": "3c1b7e2c8e2e8d936d1054cd3803a64d50cfb905",
"type": "github"
},
"original": {
diff --git a/tests/coq/misc/External_Funs.v b/tests/coq/misc/External_Funs.v
index 6c5bbdd2..699db6a7 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/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/marker.rs', lines 47:29-47:65
+ Source: '/rustc/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 5fcfa8fa..03df2656 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/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/cell.rs', lines 510:4-510:26
+ Source: '/rustc/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/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/cell.rs', lines 588:4-588:39
+ Source: '/rustc/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 7dac29cc..00256a42 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/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/marker.rs', lines 465:0-465:21
+ Source: '/rustc/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 9392ce25..e4faffbd 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/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/cell.rs', lines 294:0-294:26
+ Source: '/rustc/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/traits/Traits.v b/tests/coq/traits/Traits.v
index 9ae95411..2469fbf7 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/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/result.rs', lines 502:0-502:21
+ Source: '/rustc/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 bc68426a..ac4aeeb4 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/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/marker.rs', lines 47:29-47:65
+ Source: '/rustc/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 62f063ea..fa9d5d70 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/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/cell.rs', lines 510:4-510:26
+ Source: '/rustc/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/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/cell.rs', lines 588:4-588:39
+ Source: '/rustc/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 6e58cfe4..c42c03bd 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/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/marker.rs', lines 465:0-465:21
+ Source: '/rustc/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 8a6a5ddd..f2564ba0 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/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/cell.rs', lines 294:0-294:26
+ Source: '/rustc/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/traits/Traits.fst b/tests/fstar/traits/Traits.fst
index 556a26ac..6b892d13 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/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/result.rs', lines 502:0-502:21
+ Source: '/rustc/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 1b1d5cdf..8cc2f5f3 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/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/marker.rs', lines 47:29-47:65
+ Source: '/rustc/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 870a79c0..476519a3 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/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/cell.rs', lines 510:4-510:26
+ Source: '/rustc/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/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/cell.rs', lines 588:4-588:39
+ Source: '/rustc/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 836ddff0..d711dfce 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/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/marker.rs', lines 465:0-465:21
+ Source: '/rustc/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 24687d83..cfd031a3 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/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/cell.rs', lines 294:0-294:26
+ Source: '/rustc/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/Traits.lean b/tests/lean/Traits.lean
index 0dd692fe..c95037b1 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/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/result.rs', lines 502:0-502:21
+ Source: '/rustc/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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 10:46:06 +0000