From c00d337f48cbaf56a5b81f396c2f18ae811aee5a Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Wed, 26 Jun 2024 16:24:27 +0200 Subject: Update charon --- 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 +- 15 files changed, 21 insertions(+), 21 deletions(-) (limited to 'tests') 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 *) 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#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#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 *) 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#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#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 -/ 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#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#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 -- cgit v1.2.3