From ce771a79cffcb06b904bffa06fbc3f3504e9938b Mon Sep 17 00:00:00 2001 From: Guillaume Claret Date: Fri, 18 Apr 2025 09:28:35 +0200 Subject: [PATCH 1/2] revm: handle more instructions for links --- CoqOfRust/core/links/cmp.v | 66 +++++++ CoqOfRust/links/M.v | 8 +- .../links/journaled_state.v | 178 ++++++++++++++++-- .../instructions/links/contract.v | 4 +- .../instructions/links/host.v | 35 ++-- .../instructions/links/memory.v | 31 +-- .../instructions/links/progress_on_links.md | 14 +- .../instructions/links/utility.v | 1 + .../links/interpreter_types.v | 42 +++-- 9 files changed, 292 insertions(+), 87 deletions(-) diff --git a/CoqOfRust/core/links/cmp.v b/CoqOfRust/core/links/cmp.v index cb2091a41..1828d84a3 100644 --- a/CoqOfRust/core/links/cmp.v +++ b/CoqOfRust/core/links/cmp.v @@ -216,6 +216,72 @@ Module Impl_Ord_for_u64. End Impl_Ord_for_u64. Export Impl_Ord_for_u64. +Module Impl_Ord_for_usize. + Definition Self : Set := Usize.t. + + Definition run_cmp : Ord.Run_cmp Self. + Proof. + eexists. + { eapply IsTraitMethod.Defined. + { apply cmp.impls.Impl_core_cmp_Ord_for_usize.Implements. } + { reflexivity. } + } + { constructor. + run_symbolic. + } + Defined. + + Definition run_max : Ord.Run_max Self. + Proof. + eexists. + { eapply IsTraitMethod.Provided. + { apply cmp.impls.Impl_core_cmp_Ord_for_usize.Implements. } + { reflexivity. } + { apply cmp.Ord.ProvidedMethod_max. } + } + { constructor. + apply Ord.run_max. + apply run_cmp. + } + Defined. + + Definition run_min : Ord.Run_min Self. + Proof. + eexists. + { eapply IsTraitMethod.Provided. + { apply cmp.impls.Impl_core_cmp_Ord_for_usize.Implements. } + { reflexivity. } + { apply cmp.Ord.ProvidedMethod_min. } + } + { constructor. + apply Ord.run_min. + apply run_cmp. + } + Defined. + + Definition run_clamp : Ord.Run_clamp Self. + Proof. + eexists. + { eapply IsTraitMethod.Provided. + { apply cmp.impls.Impl_core_cmp_Ord_for_usize.Implements. } + { reflexivity. } + { apply cmp.Ord.ProvidedMethod_clamp. } + } + { constructor. + apply Ord.run_clamp. + apply run_cmp. + } + Defined. + + Instance run : Ord.Run Self := { + Ord.cmp := run_cmp; + Ord.max := run_max; + Ord.min := run_min; + Ord.clamp := run_clamp; + }. +End Impl_Ord_for_usize. +Export Impl_Ord_for_usize. + (* pub trait PartialOrd: PartialEq { fn partial_cmp(&self, other: &Rhs) -> Option; diff --git a/CoqOfRust/links/M.v b/CoqOfRust/links/M.v index 10ba31e82..091d4cf4f 100644 --- a/CoqOfRust/links/M.v +++ b/CoqOfRust/links/M.v @@ -1308,10 +1308,12 @@ Ltac run_main_rewrites := Ref.rewrite_borrow_eq || Ref.rewrite_cast_cast_eq || rewrite_if_then_else_bool_eq || - erewrite IsTraitAssociatedType_eq - by match goal with - | H : _ |- _ => apply H + (repeat ( + erewrite IsTraitAssociatedType_eq || + match goal with + | H : _ |- _ => exact H end + )) )); reflexivity |]. diff --git a/CoqOfRust/revm/revm_context_interface/links/journaled_state.v b/CoqOfRust/revm/revm_context_interface/links/journaled_state.v index dcba7a27d..aea4c2bff 100644 --- a/CoqOfRust/revm/revm_context_interface/links/journaled_state.v +++ b/CoqOfRust/revm/revm_context_interface/links/journaled_state.v @@ -1,6 +1,84 @@ Require Import CoqOfRust.CoqOfRust. Require Import CoqOfRust.links.M. -Require Import CoqOfRust.revm.revm_context_interface.journaled_state. +Require Import core.links.option. +Require Import revm.revm_context_interface.journaled_state. + +(* +pub struct StateLoad { + pub data: T, + pub is_cold: bool, +} +*) +Module StateLoad. + Record t {T : Set} : Set := { + data : T; + is_cold : bool; + }. + Arguments t : clear implicits. + + Global Instance IsLink {T : Set} `{Link T} : Link (t T) := { + Φ := Ty.apply (Ty.path "revm_context_interface::journaled_state::StateLoad") [] [Φ T]; + φ x := + Value.StructRecord "revm_context_interface::journaled_state::StateLoad" [ + ("data", φ x.(data)); + ("is_cold", φ x.(is_cold)) + ]; + }. + + Definition of_ty (T_ty : Ty.t) : + OfTy.t T_ty -> + OfTy.t (Ty.apply (Ty.path "revm_context_interface::journaled_state::StateLoad") [] [T_ty]). + Proof. + intros [T]. + eapply OfTy.Make with (A := t T). + now subst. + Defined. + Smpl Add apply of_ty : of_ty. + + Lemma of_value_with (T : Set) `{Link T} + (data : T) data' + (is_cold : bool) is_cold' : + data' = φ data -> + is_cold' = φ is_cold -> + Value.StructRecord "revm_context_interface::journaled_state::StateLoad" [ + ("data", data'); + ("is_cold", is_cold') + ] = φ (Build_t _ data is_cold). + Proof. + now intros; subst. + Qed. + Smpl Add eapply of_value_with : of_value. + + Module SubPointer. + Definition get_data (T : Set) `{Link T} : SubPointer.Runner.t (t T) + (Pointer.Index.StructRecord "revm_context_interface::journaled_state::StateLoad" "data") := + {| + SubPointer.Runner.projection x := Some x.(data); + SubPointer.Runner.injection x y := Some (x <| data := y |>); + |}. + + Lemma get_data_is_valid (T : Set) `{Link T} : + SubPointer.Runner.Valid.t (get_data T). + Proof. + now constructor. + Qed. + Smpl Add apply get_data_is_valid : run_sub_pointer. + + Definition get_is_cold (T : Set) `{Link T} : SubPointer.Runner.t (t T) + (Pointer.Index.StructRecord "revm_context_interface::journaled_state::StateLoad" "is_cold") := + {| + SubPointer.Runner.projection x := Some x.(is_cold); + SubPointer.Runner.injection x y := Some (x <| is_cold := y |>); + |}. + + Lemma get_is_cold_is_valid (T : Set) `{Link T} : + SubPointer.Runner.Valid.t (get_is_cold T). + Proof. + now constructor. + Qed. + Smpl Add apply get_is_cold_is_valid : run_sub_pointer. + End SubPointer. +End StateLoad. (* pub struct Eip7702CodeLoad { @@ -9,12 +87,91 @@ pub struct Eip7702CodeLoad { } *) Module Eip7702CodeLoad. - Parameter t : forall (T : Set), Set. + Record t {T : Set} : Set := { + state_load : StateLoad.t T; + is_delegate_account_cold : option bool; + }. + Arguments t : clear implicits. - Global Instance IsLink {T : Set} `{Link T} : Link (t T). - Admitted. + Global Instance IsLink {T : Set} `{Link T} : Link (t T) := + { + Φ := Ty.apply (Ty.path "revm_context_interface::journaled_state::Eip7702CodeLoad") [] [Φ T]; + φ x := + Value.StructRecord "revm_context_interface::journaled_state::Eip7702CodeLoad" [ + ("state_load", φ x.(state_load)); + ("is_delegate_account_cold", φ x.(is_delegate_account_cold)) + ]; + }. + + Definition of_ty (T_ty : Ty.t) : + OfTy.t T_ty -> + OfTy.t (Ty.apply (Ty.path "revm_context_interface::journaled_state::Eip7702CodeLoad") [] [T_ty]). + Proof. + intros [T]. + eapply OfTy.Make with (A := t T). + now subst. + Defined. + Smpl Add apply of_ty : of_ty. + + Lemma of_value_with state_load state_load' is_delegate_account_cold is_delegate_account_cold' : + state_load' = φ state_load -> + is_delegate_account_cold' = φ is_delegate_account_cold -> + Value.StructRecord "revm_context_interface::journaled_state::Eip7702CodeLoad" [ + ("state_load", state_load'); + ("is_delegate_account_cold", is_delegate_account_cold') + ] = φ (Build_t _ state_load is_delegate_account_cold). + Proof. + now intros; subst. + Qed. + Smpl Add apply of_value_with : of_value. + + Module SubPointer. + Definition get_state_load (T : Set) `{Link T} : SubPointer.Runner.t (t T) + (Pointer.Index.StructRecord "revm_context_interface::journaled_state::Eip7702CodeLoad" "state_load") := + {| + SubPointer.Runner.projection x := Some x.(state_load); + SubPointer.Runner.injection x y := Some (x <| state_load := y |>); + |}. + + Lemma get_state_load_is_valid (T : Set) `{Link T} : + SubPointer.Runner.Valid.t (get_state_load T). + Proof. + now constructor. + Qed. + Smpl Add apply get_state_load_is_valid : run_sub_pointer. + + Definition get_is_delegate_account_cold (T : Set) `{Link T} : SubPointer.Runner.t (t T) + (Pointer.Index.StructRecord "revm_context_interface::journaled_state::Eip7702CodeLoad" "is_delegate_account_cold") := + {| + SubPointer.Runner.projection x := Some x.(is_delegate_account_cold); + SubPointer.Runner.injection x y := Some (x <| is_delegate_account_cold := y |>); + |}. + + Lemma get_is_delegate_account_cold_is_valid (T : Set) `{Link T} : + SubPointer.Runner.Valid.t (get_is_delegate_account_cold T). + Proof. + now constructor. + Qed. + Smpl Add apply get_is_delegate_account_cold_is_valid : run_sub_pointer. + End SubPointer. End Eip7702CodeLoad. +Module Impl_Eip7702CodeLoad. + Definition Self (T : Set) `{Link T} : Set := + Eip7702CodeLoad.t T. + + (* pub fn into_components(self) -> (T, Eip7702CodeLoad<()>) *) + Instance run_into_components (T : Set) `{Link T} (self : Self T) : + Run.Trait + (journaled_state.Impl_revm_context_interface_journaled_state_Eip7702CodeLoad_T.into_components (Φ T)) + [] [] [ φ self ] (T * Self unit). + Proof. + constructor. + run_symbolic. + Admitted. +End Impl_Eip7702CodeLoad. +Export Impl_Eip7702CodeLoad. + (* pub struct AccountLoad { pub load: Eip7702CodeLoad<()>, @@ -100,16 +257,3 @@ Module AccountLoad. Smpl Add apply get_is_empty_is_valid : run_sub_pointer. End SubPointer. End AccountLoad. - -(* -pub struct StateLoad { - pub data: T, - pub is_cold: bool, -} -*) -Module StateLoad. - Parameter t : forall (T : Set), Set. - - Global Instance IsLink {T : Set} `{Link T} : Link (t T). - Admitted. -End StateLoad. diff --git a/CoqOfRust/revm/revm_interpreter/instructions/links/contract.v b/CoqOfRust/revm/revm_interpreter/instructions/links/contract.v index 1f4bf0d88..67da0c866 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/links/contract.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/links/contract.v @@ -57,6 +57,7 @@ Proof. constructor. destruct run_InterpreterTypes_for_WIRE eqn:?. destruct run_StackTrait_for_Stack. + destruct run_MemoryTrait_for_Memory. destruct run_LoopControl_for_Control. destruct run_Immediates_for_Bytecode. destruct run_Jumps_for_Bytecode. @@ -68,9 +69,6 @@ Proof. destruct links.mod.Impl_Deref_for_Bytes.run. destruct (Impl_Into_for_From_T.run Impl_From_Vec_u8_for_Bytes.run). run_symbolic. - (* "synthetic" values appearing in the translation *) - admit. - all: fail. Admitted. (* diff --git a/CoqOfRust/revm/revm_interpreter/instructions/links/host.v b/CoqOfRust/revm/revm_interpreter/instructions/links/host.v index 3f52e24a9..d82aa7d18 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/links/host.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/links/host.v @@ -1,8 +1,11 @@ Require Import CoqOfRust.CoqOfRust. Require Import CoqOfRust.links.M. +Require Import alloy_primitives.bytes.links.mod. Require Import alloy_primitives.links.aliases. +Require Import bytes.links.bytes. Require Import revm.revm_context_interface.links.host. Require Import revm.revm_context_interface.links.journaled_state. +Require Import revm.revm_interpreter.gas.links.calc. Require Import revm.revm_interpreter.gas.links.constants. Require Import revm.revm_interpreter.instructions.host. Require Import revm.revm_interpreter.instructions.links.utility. @@ -10,6 +13,7 @@ Require Import revm.revm_interpreter.links.gas. Require Import revm.revm_interpreter.links.interpreter. Require Import revm.revm_interpreter.links.interpreter_types. Require Import revm.revm_specification.links.hardfork. +Require Import ruint.links.from. (* pub fn balance( @@ -32,20 +36,12 @@ Proof. constructor. destruct run_InterpreterTypes_for_WIRE. destruct run_StackTrait_for_Stack. + destruct run_LoopControl_for_Control. + destruct run_RuntimeFlag_for_RuntimeFlag. destruct run_Host_for_H. destruct Impl_IntoAddress_for_U256.run. - (* - {{LowM.CallClosure - (Ty.apply - (Ty.path - "core::option::Option") [] - [Ty.apply - (Ty.path - "revm_context_interface::journaled_state::StateLoad") - Seems like LowM has some issue to make calls properly after the type annotation update?... - *) run_symbolic. -Admitted. +Defined. (* pub fn selfbalance( @@ -53,7 +49,6 @@ pub fn selfbalance( _host: &mut H, ) *) - Instance run_selfbalance {WIRE H : Set} `{Link WIRE} `{Link H} {WIRE_types : InterpreterTypes.Types.t} `{InterpreterTypes.Types.AreLinks WIRE_types} @@ -72,11 +67,9 @@ Proof. destruct run_Host_for_H. destruct run_RuntimeFlag_for_RuntimeFlag. destruct run_LoopControl_for_Control. - (* NOTE: for this instance of `Self`, Coq will complain that it is not a inductive definition *) - (* destruct (links.interpreter_types.InputsTrait.Run_target_address - WIRE_types.(InterpreterTypes.Types.Input)). *) + destruct run_InputsTrait_for_Input. run_symbolic. -Admitted. +Defined. (* pub fn extcodesize( @@ -89,6 +82,7 @@ Instance run_extcodesize {WIRE_types : InterpreterTypes.Types.t} `{InterpreterTypes.Types.AreLinks WIRE_types} {H_types : Host.Types.t} `{Host.Types.AreLinks H_types} (run_InterpreterTypes_for_WIRE : InterpreterTypes.Run WIRE WIRE_types) + (run_Host_for_H : Host.Run H H_types) (interpreter : Ref.t Pointer.Kind.MutRef (Interpreter.t WIRE WIRE_types)) (host : Ref.t Pointer.Kind.MutRef H) : Run.Trait @@ -98,14 +92,13 @@ Proof. constructor. destruct run_InterpreterTypes_for_WIRE. destruct run_StackTrait_for_Stack. - (* destruct run_Host_for_H. *) destruct run_RuntimeFlag_for_RuntimeFlag. destruct run_LoopControl_for_Control. - (* TODO: "revm_interpreter::instructions::utility::IntoAddress::into_address" *) + destruct run_Host_for_H. + destruct Impl_IntoAddress_for_U256.run. + destruct alloy_primitives.bytes.links.mod.Impl_Deref_for_Bytes.run. run_symbolic. - (* - apply aliases.U256.t. - Coq seems to say the goal being a Type while U256.t being defined is a Set?... - *) + (* Errors in the type annotations *) Admitted. (* diff --git a/CoqOfRust/revm/revm_interpreter/instructions/links/memory.v b/CoqOfRust/revm/revm_interpreter/instructions/links/memory.v index 8af0e3c76..82d5e3677 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/links/memory.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/links/memory.v @@ -2,6 +2,7 @@ Require Import CoqOfRust.CoqOfRust. Require Import CoqOfRust.links.M. Require Import core.convert.links.mod. Require Import core.links.cmp. +Require Import core.links.option. Require Import core.num.links.mod. Require Import revm.revm_context_interface.links.host. Require Import revm.revm_interpreter.gas.links.calc. @@ -37,14 +38,10 @@ Proof. destruct run_StackTrait_for_Stack. destruct run_RuntimeFlag_for_RuntimeFlag. destruct run_MemoryTrait_for_Memory. - (* NOTE: Stuck on - {{CoqOfRust.M.LowM.CallPrimitive - (Primitive.GetTraitMethod "core::convert::AsRef" - (Ty.apply (Ty.path "slice") [] [Ty.path "u8"]) [] - [Ty.apply (Ty.path "slice") [] [Ty.path "u8"]] "as_ref" [] []) - *) + destruct run_Deref_for_Synthetic1. + destruct (Impl_AsRef_for_Slice.run U8.t). run_symbolic. -Admitted. +Defined. (* pub fn mstore( interpreter: &mut Interpreter, @@ -67,17 +64,8 @@ Proof. destruct run_StackTrait_for_Stack. destruct run_RuntimeFlag_for_RuntimeFlag. destruct run_MemoryTrait_for_Memory. - (* - TODO: resolve the link issue for `set`, seemly coming from `MemoryTrait.set`... - Trait set.(TraitMethod.method) [] [] - [Ref.IsLink.(φ) - (Ref.cast_to Pointer.Kind.MutRef sub_ref3); - Integer.IsLink.(φ) value1; - Ref.IsLink.(φ) - (Ref.cast_to Pointer.Kind.Ref - (Ref.immediate Pointer.Kind.Raw output4))] unit - *) run_symbolic. + (* pointer_coercion *) Admitted. (* pub fn mstore8( @@ -102,10 +90,7 @@ Proof. destruct run_RuntimeFlag_for_RuntimeFlag. destruct run_MemoryTrait_for_Memory. run_symbolic. - (* NOTE: - - After correctly defined `ruint::Uint::byte`'s link, the goal seems to be - asking for its proof of being an associated function...? - *) + (* pointer_coercion *) Admitted. (* pub fn msize( @@ -152,7 +137,5 @@ Proof. destruct run_StackTrait_for_Stack. destruct run_RuntimeFlag_for_RuntimeFlag. destruct run_MemoryTrait_for_Memory. - (* NOTE: This command seems to be exploded? *) - (* destruct core.links.cmp.run_max. *) run_symbolic. -Admitted. +Defined. diff --git a/CoqOfRust/revm/revm_interpreter/instructions/links/progress_on_links.md b/CoqOfRust/revm/revm_interpreter/instructions/links/progress_on_links.md index 491e40e04..7c5096539 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/links/progress_on_links.md +++ b/CoqOfRust/revm/revm_interpreter/instructions/links/progress_on_links.md @@ -88,8 +88,8 @@ ## Host -- [ ] `balance` -- [ ] `selfbalance` +- [x] `balance` +- [x] `selfbalance` - [ ] `extcodesize` - [ ] `extcodehash` - [ ] `extcodecopy` @@ -117,11 +117,11 @@ ## Memory -- [ ] `mload` +- [x] `mload` - [ ] `mstore` - [ ] `mstore8` - [x] `msize` -- [ ] `mcopy` +- [x] `mcopy` ## Stack @@ -164,6 +164,6 @@ ## Summary - Total: 120 -- Admitted: 37 -- Defined: 83 -- Percentage: 69.17% +- Admitted: 33 +- Defined: 87 +- Percentage: 72.50% diff --git a/CoqOfRust/revm/revm_interpreter/instructions/links/utility.v b/CoqOfRust/revm/revm_interpreter/instructions/links/utility.v index f0672b480..5ee4086eb 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/links/utility.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/links/utility.v @@ -142,3 +142,4 @@ Module Impl_IntoAddress_for_U256. IntoAddress.into_address := run_into_address; }. End Impl_IntoAddress_for_U256. +Export Impl_IntoAddress_for_U256. diff --git a/CoqOfRust/revm/revm_interpreter/links/interpreter_types.v b/CoqOfRust/revm/revm_interpreter/links/interpreter_types.v index 3508ca57b..b325ea1b4 100644 --- a/CoqOfRust/revm/revm_interpreter/links/interpreter_types.v +++ b/CoqOfRust/revm/revm_interpreter/links/interpreter_types.v @@ -162,24 +162,20 @@ Module MemoryTrait. Run.Trait method [] [] [ φ self; φ destination; φ source; φ len ] unit ). - Definition Run_slice (Self : Set) `{Link Self} : Set := + Definition Run_slice (Self Synthetic : Set) `{Link Self} `{Link Synthetic} : Set := TraitMethod.C (trait Self) "slice" (fun method => forall - (Output : Set) `(Link Output) - (run_Deref_for_Output : deref.Deref.Run Output (list U8.t)) (self : Ref.t Pointer.Kind.Ref Self) (range : Ref.t Pointer.Kind.Ref (range.Range.t Usize.t)), - Run.Trait method [] [ Φ Output ] [ φ self; φ range ] Output + Run.Trait method [] [] [ φ self; φ range ] Synthetic ). - Definition Run_slice_len (Self : Set) `{Link Self} : Set := + Definition Run_slice_len (Self Synthetic1 : Set) `{Link Self} `{Link Synthetic1} : Set := TraitMethod.C (trait Self) "slice_len" (fun method => forall - (Output : Set) `(Link Output) - (run_Deref_for_Output : deref.Deref.Run Output (list U8.t)) (self : Ref.t Pointer.Kind.Ref Self) (offset len : Usize.t), - Run.Trait method [] [ Φ Output ] [ φ self; φ offset; φ len ] Output + Run.Trait method [] [] [ φ self; φ offset; φ len ] Synthetic1 ). Definition Run_resize (Self : Set) `{Link Self} : Set := @@ -188,13 +184,23 @@ Module MemoryTrait. Run.Trait method [] [] [ φ self; φ new_size ] bool ). - Class Run (Self : Set) `{Link Self} : Set := { + Class Run (Self Synthetic Synthetic1 : Set) + `{Link Self} `{Link Synthetic} `{Link Synthetic1} : + Set := { set_data : Run_set_data Self; set : Run_set Self; size : Run_size Self; copy : Run_copy Self; - slice : Run_slice Self; - slice_len : Run_slice_len Self; + Synthetic_IsAssociated : + IsTraitAssociatedType "revm_interpreter::interpreter_types::MemoryTrait" [] [] (Φ Self) + "{{synthetic}}" (Φ Synthetic); + run_Deref_for_Synthetic : deref.Deref.Run Synthetic (list U8.t); + slice : Run_slice Self Synthetic; + Synthetic1_IsAssociated : + IsTraitAssociatedType "revm_interpreter::interpreter_types::MemoryTrait" [] [] (Φ Self) + "{{synthetic}}'1" (Φ Synthetic1); + run_Deref_for_Synthetic1 : deref.Deref.Run Synthetic1 (list U8.t); + slice_len : Run_slice_len Self Synthetic1; resize : Run_resize Self; }. End MemoryTrait. @@ -680,6 +686,8 @@ Module InterpreterTypes. Record t : Type := { Stack : Set; Memory : Set; + Memory_Synthetic : Set; + Memory_Synthetic1 : Set; Bytecode : Set; ReturnData : Set; Input : Set; @@ -692,6 +700,8 @@ Module InterpreterTypes. Class AreLinks (types : t) : Set := { H_Stack : Link types.(Stack); H_Memory : Link types.(Memory); + H_Memory_Synthetic : Link types.(Memory_Synthetic); + H_Memory_Synthetic1 : Link types.(Memory_Synthetic1); H_Bytecode : Link types.(Bytecode); H_ReturnData : Link types.(ReturnData); H_Input : Link types.(Input); @@ -705,6 +715,10 @@ Module InterpreterTypes. H.(H_Stack _). Global Instance IsLinkMemory (types : t) (H : AreLinks types) : Link types.(Memory) := H.(H_Memory _). + Global Instance IsLinkMemory_Synthetic (types : t) (H : AreLinks types) : Link types.(Memory_Synthetic) := + H.(H_Memory_Synthetic _). + Global Instance IsLinkMemory_Synthetic1 (types : t) (H : AreLinks types) : Link types.(Memory_Synthetic1) := + H.(H_Memory_Synthetic1 _). Global Instance IsLinkBytecode (types : t) (H : AreLinks types) : Link types.(Bytecode) := H.(H_Bytecode _). Global Instance IsLinkReturnData (types : t) (H : AreLinks types) : Link types.(ReturnData) := @@ -734,7 +748,11 @@ Module InterpreterTypes. IsTraitAssociatedType "revm_interpreter::interpreter_types::InterpreterTypes" [] [] (Φ Self) "Memory" (Φ types.(Types.Memory)); - run_MemoryTrait_for_Memory : MemoryTrait.Run types.(Types.Memory); + run_MemoryTrait_for_Memory : + MemoryTrait.Run + types.(Types.Memory) + types.(Types.Memory_Synthetic) + types.(Types.Memory_Synthetic1); Bytecode_IsAssociated : IsTraitAssociatedType "revm_interpreter::interpreter_types::InterpreterTypes" [] [] (Φ Self) From 3aaedad44a1ec28bfc47d654325e81bd0cf602ab Mon Sep 17 00:00:00 2001 From: Guillaume Claret Date: Wed, 30 Apr 2025 14:54:27 -0400 Subject: [PATCH 2/2] feat: add type annotations for constructors --- CoqOfRust/M.v | 23 +- CoqOfRust/alloc/alloc.v | 74 +- CoqOfRust/alloc/borrow.v | 14 + CoqOfRust/alloc/boxed.v | 227 +- CoqOfRust/alloc/boxed/convert.v | 178 +- CoqOfRust/alloc/boxed/iter.v | 6 +- CoqOfRust/alloc/boxed/thin.v | 67 +- CoqOfRust/alloc/collections/binary_heap/mod.v | 97 +- CoqOfRust/alloc/collections/btree/append.v | 4 + CoqOfRust/alloc/collections/btree/borrow.v | 9 +- .../collections/btree/dedup_sorted_iter.v | 12 +- CoqOfRust/alloc/collections/btree/fix.v | 323 +- CoqOfRust/alloc/collections/btree/map.v | 1746 +++++++++- CoqOfRust/alloc/collections/btree/map/entry.v | 13 +- CoqOfRust/alloc/collections/btree/mem.v | 2 +- .../alloc/collections/btree/merge_iter.v | 46 +- CoqOfRust/alloc/collections/btree/navigate.v | 840 ++++- CoqOfRust/alloc/collections/btree/node.v | 999 +++++- CoqOfRust/alloc/collections/btree/remove.v | 4 + CoqOfRust/alloc/collections/btree/search.v | 177 + CoqOfRust/alloc/collections/btree/set.v | 193 +- CoqOfRust/alloc/collections/btree/set/entry.v | 6 +- CoqOfRust/alloc/collections/btree/set_val.v | 11 +- CoqOfRust/alloc/collections/btree/split.v | 16 + CoqOfRust/alloc/collections/linked_list.v | 782 ++++- CoqOfRust/alloc/collections/mod.v | 14 +- CoqOfRust/alloc/collections/vec_deque/drain.v | 27 +- .../alloc/collections/vec_deque/into_iter.v | 80 +- CoqOfRust/alloc/collections/vec_deque/iter.v | 40 +- .../alloc/collections/vec_deque/iter_mut.v | 38 +- .../alloc/collections/vec_deque/macros.v | 12 +- CoqOfRust/alloc/collections/vec_deque/mod.v | 176 +- .../alloc/collections/vec_deque/spec_extend.v | 14 + CoqOfRust/alloc/ffi/c_str.v | 69 +- CoqOfRust/alloc/raw_vec.v | 218 +- CoqOfRust/alloc/rc.v | 257 +- CoqOfRust/alloc/slice.v | 14 +- CoqOfRust/alloc/str.v | 38 +- CoqOfRust/alloc/string.v | 246 +- CoqOfRust/alloc/sync.v | 387 ++- CoqOfRust/alloc/vec/cow.v | 14 +- CoqOfRust/alloc/vec/drain.v | 2 + CoqOfRust/alloc/vec/extract_if.v | 6 +- CoqOfRust/alloc/vec/in_place_collect.v | 65 +- CoqOfRust/alloc/vec/in_place_drop.v | 2 +- CoqOfRust/alloc/vec/into_iter.v | 103 +- CoqOfRust/alloc/vec/mod.v | 97 +- CoqOfRust/alloc/vec/partial_eq.v | 96 +- CoqOfRust/alloc/vec/set_len_on_drop.v | 2 + CoqOfRust/alloc/vec/spec_from_elem.v | 6 + CoqOfRust/alloc/vec/splice.v | 7 + CoqOfRust/alloy_primitives/bits/address.v | 72 +- CoqOfRust/alloy_primitives/bits/bloom.v | 4 + CoqOfRust/alloy_primitives/bits/fixed.v | 96 +- CoqOfRust/alloy_primitives/bits/function.v | 22 +- CoqOfRust/alloy_primitives/bits/macros.v | 239 +- CoqOfRust/alloy_primitives/bytes/mod.v | 38 +- CoqOfRust/alloy_primitives/common.v | 30 +- CoqOfRust/alloy_primitives/links/common.v | 4 +- CoqOfRust/alloy_primitives/log/mod.v | 22 + CoqOfRust/alloy_primitives/map/fixed.v | 32 +- CoqOfRust/alloy_primitives/sealed.v | 8 + CoqOfRust/alloy_primitives/signature/error.v | 22 +- CoqOfRust/alloy_primitives/signature/parity.v | 62 +- .../signature/primitive_sig.v | 45 +- CoqOfRust/alloy_primitives/signature/sig.v | 42 +- CoqOfRust/alloy_primitives/signature/utils.v | 10 +- .../alloy_primitives/signed/conversions.v | 242 +- CoqOfRust/alloy_primitives/signed/errors.v | 24 +- CoqOfRust/alloy_primitives/signed/int.v | 88 +- CoqOfRust/alloy_primitives/signed/ops.v | 329 +- CoqOfRust/alloy_primitives/signed/sign.v | 22 +- CoqOfRust/alloy_primitives/signed/utils.v | 8 + CoqOfRust/alloy_primitives/utils/mod.v | 46 +- CoqOfRust/alloy_primitives/utils/units.v | 168 +- CoqOfRust/bytes/buf/buf_impl.v | 68 + CoqOfRust/bytes/buf/buf_mut.v | 20 + CoqOfRust/bytes/buf/chain.v | 4 + CoqOfRust/bytes/buf/iter.v | 28 +- CoqOfRust/bytes/buf/limit.v | 4 + CoqOfRust/bytes/buf/reader.v | 17 +- CoqOfRust/bytes/buf/take.v | 4 + CoqOfRust/bytes/buf/uninit_slice.v | 14 +- CoqOfRust/bytes/buf/vec_deque.v | 6 +- CoqOfRust/bytes/buf/writer.v | 18 +- CoqOfRust/bytes/bytes.v | 122 +- CoqOfRust/bytes/bytes_mut.v | 119 +- CoqOfRust/bytes/fmt/debug.v | 23 +- CoqOfRust/bytes/fmt/hex.v | 36 +- CoqOfRust/core/alloc/layout.v | 76 +- CoqOfRust/core/alloc/mod.v | 56 +- CoqOfRust/core/any.v | 30 +- CoqOfRust/core/array/ascii.v | 30 +- CoqOfRust/core/array/drain.v | 10 +- CoqOfRust/core/array/equality.v | 8 +- CoqOfRust/core/array/iter.v | 52 +- CoqOfRust/core/array/links/iter.v | 2 +- CoqOfRust/core/array/mod.v | 77 +- CoqOfRust/core/ascii.v | 14 +- CoqOfRust/core/ascii/ascii_char.v | 97 +- CoqOfRust/core/asserting.v | 8 +- CoqOfRust/core/async_iter/async_iter.v | 21 +- CoqOfRust/core/async_iter/from_iter.v | 12 + CoqOfRust/core/bool.v | 10 +- CoqOfRust/core/cell.v | 158 +- CoqOfRust/core/cell/lazy.v | 42 +- CoqOfRust/core/cell/once.v | 41 +- CoqOfRust/core/char/convert.v | 49 +- CoqOfRust/core/char/decode.v | 92 +- CoqOfRust/core/char/methods.v | 60 +- CoqOfRust/core/char/mod.v | 80 +- CoqOfRust/core/clone/uninit.v | 10 + CoqOfRust/core/cmp.v | 130 +- CoqOfRust/core/convert/mod.v | 2 + CoqOfRust/core/convert/num.v | 1357 +++++++- CoqOfRust/core/default.v | 2 +- CoqOfRust/core/error.v | 112 +- CoqOfRust/core/escape.v | 53 +- CoqOfRust/core/ffi/c_str.v | 78 +- CoqOfRust/core/ffi/va_list.v | 9 +- CoqOfRust/core/fmt/builders.v | 82 +- CoqOfRust/core/fmt/float.v | 44 +- CoqOfRust/core/fmt/mod.v | 223 +- CoqOfRust/core/fmt/num.v | 126 +- CoqOfRust/core/fmt/rt.v | 31 +- CoqOfRust/core/future/async_drop.v | 46 +- CoqOfRust/core/future/join.v | 35 +- CoqOfRust/core/future/pending.v | 10 +- CoqOfRust/core/future/poll_fn.v | 2 +- CoqOfRust/core/future/ready.v | 8 +- CoqOfRust/core/hash/mod.v | 8 +- CoqOfRust/core/hash/sip.v | 34 +- CoqOfRust/core/internal_macros.v | 2 + CoqOfRust/core/intrinsics/mod.v | 70 +- CoqOfRust/core/io/borrowed_buf.v | 26 + CoqOfRust/core/iter/adapters/array_chunks.v | 76 +- CoqOfRust/core/iter/adapters/chain.v | 88 +- CoqOfRust/core/iter/adapters/cloned.v | 4 + CoqOfRust/core/iter/adapters/copied.v | 41 + CoqOfRust/core/iter/adapters/cycle.v | 56 +- CoqOfRust/core/iter/adapters/enumerate.v | 56 + CoqOfRust/core/iter/adapters/filter.v | 60 + CoqOfRust/core/iter/adapters/filter_map.v | 22 + CoqOfRust/core/iter/adapters/flatten.v | 222 +- CoqOfRust/core/iter/adapters/fuse.v | 34 +- CoqOfRust/core/iter/adapters/inspect.v | 4 + CoqOfRust/core/iter/adapters/intersperse.v | 106 +- CoqOfRust/core/iter/adapters/map.v | 4 + CoqOfRust/core/iter/adapters/map_while.v | 6 + CoqOfRust/core/iter/adapters/map_windows.v | 39 +- CoqOfRust/core/iter/adapters/mod.v | 28 +- CoqOfRust/core/iter/adapters/peekable.v | 158 +- CoqOfRust/core/iter/adapters/rev.v | 8 +- CoqOfRust/core/iter/adapters/scan.v | 4 + CoqOfRust/core/iter/adapters/skip.v | 78 +- CoqOfRust/core/iter/adapters/skip_while.v | 4 + CoqOfRust/core/iter/adapters/step_by.v | 142 +- CoqOfRust/core/iter/adapters/take.v | 108 +- CoqOfRust/core/iter/adapters/take_while.v | 43 +- CoqOfRust/core/iter/adapters/zip.v | 325 +- CoqOfRust/core/iter/range.v | 466 ++- CoqOfRust/core/iter/sources/empty.v | 18 +- CoqOfRust/core/iter/sources/from_coroutine.v | 32 +- CoqOfRust/core/iter/sources/from_fn.v | 4 +- CoqOfRust/core/iter/sources/once.v | 7 +- CoqOfRust/core/iter/sources/once_with.v | 11 +- CoqOfRust/core/iter/sources/repeat.v | 38 +- CoqOfRust/core/iter/sources/repeat_n.v | 48 +- CoqOfRust/core/iter/sources/repeat_with.v | 8 +- CoqOfRust/core/iter/sources/successors.v | 14 +- CoqOfRust/core/iter/traits/accum.v | 96 + CoqOfRust/core/iter/traits/collect.v | 6 +- CoqOfRust/core/iter/traits/double_ended.v | 35 +- CoqOfRust/core/iter/traits/exact_size.v | 6 + CoqOfRust/core/iter/traits/iterator.v | 160 +- CoqOfRust/core/links/cmpOrdering.v | 18 +- CoqOfRust/core/links/option.v | 55 +- CoqOfRust/core/links/panicking.v | 18 +- CoqOfRust/core/links/result.v | 97 +- CoqOfRust/core/marker.v | 14 +- CoqOfRust/core/mem/manually_drop.v | 6 + CoqOfRust/core/mem/maybe_uninit.v | 26 +- CoqOfRust/core/mem/mod.v | 2 + CoqOfRust/core/mem/transmutability.v | 8 + CoqOfRust/core/net/display_buffer.v | 16 +- CoqOfRust/core/net/ip_addr.v | 138 +- CoqOfRust/core/net/parser.v | 127 +- CoqOfRust/core/net/socket_addr.v | 24 +- CoqOfRust/core/num/bignum.v | 144 +- CoqOfRust/core/num/dec2flt/common.v | 8 + CoqOfRust/core/num/dec2flt/decimal.v | 16 + CoqOfRust/core/num/dec2flt/lemire.v | 4 + CoqOfRust/core/num/dec2flt/mod.v | 34 +- CoqOfRust/core/num/dec2flt/number.v | 14 +- CoqOfRust/core/num/dec2flt/parse.v | 66 +- CoqOfRust/core/num/dec2flt/slow.v | 2 + CoqOfRust/core/num/diy_float.v | 18 +- CoqOfRust/core/num/error.v | 16 +- CoqOfRust/core/num/f128.v | 10 +- CoqOfRust/core/num/f16.v | 10 +- CoqOfRust/core/num/f32.v | 10 +- CoqOfRust/core/num/f64.v | 10 +- CoqOfRust/core/num/flt2dec/decoder.v | 18 + CoqOfRust/core/num/flt2dec/mod.v | 209 +- CoqOfRust/core/num/flt2dec/strategy/dragon.v | 34 +- CoqOfRust/core/num/flt2dec/strategy/grisu.v | 215 +- CoqOfRust/core/num/fmt.v | 36 +- CoqOfRust/core/num/links/nonzero.v | 2 +- CoqOfRust/core/num/mod.v | 2994 ++++++++++++++-- CoqOfRust/core/num/nonzero.v | 584 +++- CoqOfRust/core/num/saturating.v | 1096 +++++- CoqOfRust/core/num/wrapping.v | 1168 ++++++- CoqOfRust/core/ops/control_flow.v | 46 +- CoqOfRust/core/ops/coroutine.v | 4 + CoqOfRust/core/ops/index_range.v | 62 +- CoqOfRust/core/ops/links/control_flow.v | 56 +- CoqOfRust/core/ops/links/index_range.v | 6 +- CoqOfRust/core/ops/links/range.v | 32 +- CoqOfRust/core/ops/range.v | 208 +- CoqOfRust/core/ops/try_trait.v | 14 +- CoqOfRust/core/option.v | 230 +- CoqOfRust/core/panic.v | 6 +- CoqOfRust/core/panic/location.v | 2 + CoqOfRust/core/panic/panic_info.v | 16 +- CoqOfRust/core/panic/unwind_safe.v | 2 + CoqOfRust/core/panicking.v | 24 +- CoqOfRust/core/pin.v | 6 +- CoqOfRust/core/ptr/alignment.v | 18 +- CoqOfRust/core/ptr/const_ptr.v | 118 +- CoqOfRust/core/ptr/metadata.v | 2 + CoqOfRust/core/ptr/mut_ptr.v | 168 +- CoqOfRust/core/ptr/non_null.v | 28 +- CoqOfRust/core/ptr/unique.v | 31 +- CoqOfRust/core/range.v | 76 +- CoqOfRust/core/range/iter.v | 28 +- CoqOfRust/core/result.v | 160 +- CoqOfRust/core/slice/ascii.v | 46 +- CoqOfRust/core/slice/cmp.v | 16 + CoqOfRust/core/slice/index.v | 122 +- CoqOfRust/core/slice/iter.v | 1168 ++++++- CoqOfRust/core/slice/iter/macros.v | 212 +- CoqOfRust/core/slice/memchr.v | 12 +- CoqOfRust/core/slice/mod.v | 660 +++- CoqOfRust/core/slice/rotate.v | 2 + CoqOfRust/core/slice/sort/select.v | 20 +- CoqOfRust/core/slice/sort/shared/smallsort.v | 8 + CoqOfRust/core/slice/sort/stable/drift.v | 28 +- CoqOfRust/core/slice/sort/stable/merge.v | 2 + CoqOfRust/core/slice/sort/stable/mod.v | 2 + CoqOfRust/core/slice/sort/stable/quicksort.v | 12 +- CoqOfRust/core/slice/sort/unstable/heapsort.v | 4 + CoqOfRust/core/slice/sort/unstable/mod.v | 6 +- .../core/slice/sort/unstable/quicksort.v | 33 +- CoqOfRust/core/str/converts.v | 28 +- CoqOfRust/core/str/error.v | 8 +- CoqOfRust/core/str/iter.v | 225 +- CoqOfRust/core/str/lossy.v | 33 +- CoqOfRust/core/str/mod.v | 178 +- CoqOfRust/core/str/pattern.v | 500 ++- CoqOfRust/core/str/traits.v | 166 +- CoqOfRust/core/str/validations.v | 179 +- CoqOfRust/core/sync/atomic.v | 258 +- CoqOfRust/core/sync/exclusive.v | 8 +- CoqOfRust/core/task/poll.v | 312 +- CoqOfRust/core/task/wake.v | 81 +- CoqOfRust/core/time.v | 141 +- CoqOfRust/core/tuple.v | 3012 ++++++++++++++++- CoqOfRust/core/unicode/printable.v | 2 + CoqOfRust/core/unicode/unicode_data.v | 2 + .../examples/custom/constructor_as_function.v | 2 +- .../default/examples/custom/hello_world.v | 10 +- .../default/examples/custom/mutual_loop.v | 4 +- .../custom/pattern_in_function_parameters.v | 8 +- .../custom/polymorphic_associated_function.v | 12 +- .../examples/custom/polymorphic_constants.v | 20 +- .../default/examples/custom/provided_method.v | 16 +- .../ink_contracts/basic_contract_caller.v | 6 + .../examples/ink_contracts/call_runtime.v | 10 +- .../ink_contracts/conditional_compilation.v | 22 + .../ink_contracts/contract_terminate.v | 5 +- .../ink_contracts/contract_transfer.v | 4 +- .../examples/ink_contracts/custom_allocator.v | 2 + .../ink_contracts/custom_environment.v | 8 +- .../default/examples/ink_contracts/dns.v | 54 +- .../examples/ink_contracts/e2e_call_runtime.v | 6 +- .../default/examples/ink_contracts/erc1155.v | 184 +- .../default/examples/ink_contracts/erc20.v | 70 +- .../default/examples/ink_contracts/erc721.v | 116 +- .../default/examples/ink_contracts/flipper.v | 2 +- .../examples/ink_contracts/incrementer.v | 2 +- .../lang_err_integration_tests/call_builder.v | 24 +- .../call_builder_delegate.v | 10 +- .../constructors_return_value.v | 50 +- .../lang_err_integration_tests/contract_ref.v | 22 +- .../integration_flipper.v | 26 +- .../ink_contracts/mapping_integration_tests.v | 8 + .../default/examples/ink_contracts/mother.v | 56 +- .../default/examples/ink_contracts/multisig.v | 87 +- .../examples/ink_contracts/payment_channel.v | 109 +- .../examples/ink_contracts/set_code_hash.v | 2 + .../set_code_hash/updated_incrementer.v | 2 + .../examples/ink_contracts/trait_erc20.v | 80 +- .../examples/ink_contracts/trait_flipper.v | 2 + .../ink_contracts/trait_incrementer.v | 6 +- .../ink_contracts/wildcard_selector.v | 3 +- .../monadic_transformation/example05.v | 4 +- .../rust_book/cargo/concurrent_tests.v | 4 + .../conversion/converting_to_string.v | 2 + .../examples/rust_book/conversion/from.v | 2 +- .../examples/rust_book/conversion/into.v | 2 +- .../conversion/try_from_and_try_into.v | 73 +- .../examples/rust_book/custom_types/enums.v | 12 +- .../rust_book/custom_types/enums_c_like.v | 20 +- .../custom_types/enums_testcase_linked_list.v | 5 +- .../custom_types/enums_type_aliases_v1.v | 2 + .../rust_book/custom_types/enums_use.v | 4 +- .../rust_book/custom_types/structures.v | 12 +- .../rust_book/error_handling/boxing_errors.v | 4 +- .../error_handling/combinators_and_then.v | 62 +- .../error_handling/combinators_map.v | 56 +- .../error_handling/defining_an_error_type.v | 6 +- .../rust_book/error_handling/early_returns.v | 14 +- .../introducing_question_mark.v | 2 + ...ark_is_an_replacement_for_deprecated_try.v | 6 + .../error_handling/map_in_result_via_match.v | 16 +- .../error_handling/option_and_unwrap.v | 38 +- .../other_uses_of_question_mark.v | 10 +- ...ut_of_options_with_stop_error_processing.v | 12 +- .../error_handling/result_use_in_main.v | 14 +- ...g_options_and_defaults_via_get_or_insert.v | 14 +- ...ions_and_defaults_via_get_or_insert_with.v | 14 +- .../unpacking_options_and_defaults_via_or.v | 16 +- ...packing_options_and_defaults_via_or_else.v | 26 +- .../unpacking_options_via_question_mark.v | 22 +- .../error_handling/wrapping_errors.v | 16 +- .../for_and_range_inclusive_to_exclusive.v | 2 + .../rust_book/flow_of_control/if_let.v | 10 +- .../flow_of_control/if_let_challenge.v | 2 +- .../flow_of_control/if_let_dont_use_match.v | 6 +- .../if_let_match_enum_values.v | 6 +- .../loop_returning_from_loops.v | 8 +- .../match_binding_destructure_enum_variants.v | 6 +- .../match_destructuring_enums.v | 2 + .../match_destructuring_structs.v | 2 + .../rust_book/flow_of_control/match_guards.v | 2 + .../rust_book/flow_of_control/while_let.v | 14 +- .../while_let_match_is_weird.v | 14 +- .../associated_functions_and_methods.v | 10 + ...erging_functions_example_sum_odd_numbers.v | 2 + ...hing_through_iterators_Iterator_position.v | 22 +- .../rust_book/functions/functions_order.v | 16 +- .../functions/higher_order_functions.v | 4 + .../examples/rust_book/generics/generics.v | 22 +- .../generics_associated_types_problem.v | 2 + .../generics_associated_types_solution.v | 2 + .../rust_book/generics/generics_bounds.v | 4 + .../generics_bounds_test_case_empty_bounds.v | 12 +- .../rust_book/generics/generics_functions.v | 32 +- .../generics/generics_implementation.v | 4 + .../generics/generics_new_type_idiom.v | 10 +- .../generics_new_type_idiom_as_base_type.v | 2 + .../generics/generics_phantom_type.v | 22 +- ...hantom_type_test_case_unit_clarification.v | 28 +- .../rust_book/generics/generics_traits.v | 4 +- .../generics/generics_where_clauses.v | 2 + .../rust_book/hello_world/formatted_print.v | 36 +- .../rust_book/modules/struct_visibility.v | 4 + .../rust_book/primitives/arrays_and_slices.v | 22 +- .../rust_book/primitives/literals_operators.v | 30 +- .../examples/rust_book/primitives/tuples.v | 2 + .../scoping_rules_borrowing_aliasing.v | 2 + .../scoping_rules_borrowing_mutablity.v | 2 + .../scoping_rules_borrowing_the_ref_pattern.v | 2 + .../scoping_rules_lifetimes_bounds.v | 2 + .../scoping_rules_lifetimes_methods.v | 2 + .../scoping_rules_lifetimes_structs.v | 12 +- .../scoping_rules_lifetimes_traits.v | 2 + ..._rules_ownership_and_rules_partial_moves.v | 2 + .../scoping_rules/scoping_rules_raii.v | 2 + .../scoping_rules_raii_desctructor.v | 2 +- .../rust_book/std_library_types/arc.v | 2 + .../std_library_types/box_stack_heap.v | 12 + .../hash_map_alternate_or_custom_key_types.v | 6 + .../rust_book/std_library_types/option.v | 16 +- .../rust_book/std_library_types/result.v | 25 +- .../result_chaining_with_question_mark.v | 36 + .../rust_book/std_library_types/vectors.v | 2 + .../examples/rust_book/std_misc/channels.v | 4 + .../file_io_read_lines_efficient_method.v | 13 + .../std_misc/filesystem_operations.v | 32 +- .../std_misc/foreign_function_interface.v | 2 + .../rust_book/std_misc/program_arguments.v | 2 + .../std_misc/program_arguments_parsing.v | 2 +- .../examples/rust_book/std_misc/threads.v | 2 + .../examples/rust_book/testing/unit_testing.v | 16 +- .../default/examples/rust_book/traits/clone.v | 6 +- .../examples/rust_book/traits/derive.v | 12 +- .../disambiguating_overlapping_traits.v | 18 +- .../default/examples/rust_book/traits/drop.v | 14 +- .../default/examples/rust_book/traits/hash.v | 4 + .../traits/impl_trait_as_return_type.v | 50 +- .../examples/rust_book/traits/iterators.v | 14 +- .../rust_book/traits/operator_overloading.v | 28 +- .../traits/returning_traits_with_dyn.v | 4 +- .../examples/rust_book/traits/traits.v | 2 + .../calling_unsafe_functions.v | 8 +- ...line_assembly_inlateout_case_implemented.v | 8 +- .../inline_assembly_inlateout_case_non_used.v | 8 +- .../unsafe_operations/inline_assembly_inout.v | 8 +- .../inline_assembly_inputs_and_outputs.v | 8 +- ...embly_inputs_and_outputs_another_example.v | 8 +- ..._and_outputs_another_example_without_mov.v | 8 +- .../inline_assembly_labels.v | 8 +- .../inline_assembly_options.v | 8 +- ...ine_assembly_register_template_modifiers.v | 8 +- .../inline_assembly_scratch_register.v | 8 +- CoqOfRust/examples/default/examples/subtle.v | 25 +- CoqOfRust/links/M.v | 18 +- .../translations/move_abstract_stack/lib.v | 42 +- .../move_binary_format/binary_config.v | 14 + .../move_binary_format/check_bounds.v | 316 +- .../move_binary_format/compatibility.v | 60 +- .../move_binary_format/constant.v | 100 +- .../move_binary_format/control_flow_graph.v | 34 +- .../move_binary_format/deserializer.v | 2025 ++++++++++- .../translations/move_binary_format/errors.v | 91 +- .../move_binary_format/file_format.v | 863 ++++- .../move_binary_format/file_format_common.v | 291 +- .../translations/move_binary_format/lib.v | 52 +- .../move_binary_format/normalized.v | 1327 +++++++- .../move_binary_format/serializer.v | 388 ++- .../ability_field_requirements.v | 20 +- .../move_bytecode_verifier/absint.v | 78 +- .../acquires_list_verifier.v | 79 +- .../check_duplication.v | 293 +- .../code_unit_verifier.v | 64 +- .../move_bytecode_verifier/constants.v | 46 +- .../move_bytecode_verifier/control_flow.v | 57 +- .../move_bytecode_verifier/control_flow_v5.v | 138 +- .../cyclic_dependencies.v | 41 +- .../move_bytecode_verifier/dependencies.v | 242 +- .../move_bytecode_verifier/friends.v | 24 +- .../instantiation_loops.v | 120 +- .../instruction_consistency.v | 67 +- .../move_bytecode_verifier/limits.v | 151 +- .../locals_safety/abstract_state.v | 50 + .../locals_safety/mod.v | 58 +- .../move_bytecode_verifier/loop_summary.v | 37 + .../reference_safety/abstract_state.v | 489 ++- .../reference_safety/mod.v | 912 ++++- .../move_bytecode_verifier/script_signature.v | 50 +- .../move_bytecode_verifier/signature.v | 170 +- .../stack_usage_verifier.v | 67 +- .../move_bytecode_verifier/struct_defs.v | 84 +- .../move_bytecode_verifier/type_safety.v | 1356 +++++++- .../move_bytecode_verifier/verifier.v | 56 +- .../move_bytecode_verifier_meter/bound.v | 23 +- .../move_bytecode_verifier_meter/dummy.v | 12 +- .../move_bytecode_verifier_meter/lib.v | 28 +- .../translations/move_core_types/abi.v | 363 +- .../move_core_types/account_address.v | 78 +- .../move_core_types/annotated_value.v | 505 ++- .../move_core_types/annotated_visitor.v | 343 +- .../translations/move_core_types/effects.v | 108 +- .../translations/move_core_types/errmap.v | 178 +- .../move_core_types/gas_algebra.v | 115 +- .../translations/move_core_types/identifier.v | 48 +- .../move_core_types/language_storage.v | 287 +- .../translations/move_core_types/lib.v | 8 +- .../translations/move_core_types/metadata.v | 63 +- .../move_core_types/move_resource.v | 2 + .../translations/move_core_types/parser.v | 481 ++- .../translations/move_core_types/resolver.v | 10 + .../move_core_types/runtime_value.v | 324 +- .../move_core_types/transaction_argument.v | 122 +- .../translations/move_core_types/u256.v | 123 +- .../translations/move_core_types/vm_status.v | 1569 ++++++++- CoqOfRust/plonky3/air/air.v | 13 +- CoqOfRust/plonky3/air/utils.v | 4 + CoqOfRust/plonky3/air/virtual_column.v | 22 +- CoqOfRust/plonky3/blake3-air/air.v | 36 + CoqOfRust/plonky3/blake3-air/columns.v | 16 + CoqOfRust/plonky3/blake3-air/constants.v | 2 + CoqOfRust/plonky3/blake3-air/generation.v | 12 + CoqOfRust/plonky3/field/array.v | 34 +- CoqOfRust/plonky3/field/batch_inverse.v | 28 +- CoqOfRust/plonky3/field/coset.v | 25 +- .../field/extension/binomial_extension.v | 120 +- CoqOfRust/plonky3/field/extension/mod.v | 8 +- .../extension/packed_binomial_extension.v | 98 +- CoqOfRust/plonky3/field/field.v | 64 +- CoqOfRust/plonky3/field/packed.v | 42 +- CoqOfRust/plonky3/matrix/bitrev.v | 4 + CoqOfRust/plonky3/matrix/dense.v | 74 +- CoqOfRust/plonky3/matrix/extension.v | 15 +- .../plonky3/matrix/horizontally_truncated.v | 4 +- CoqOfRust/plonky3/matrix/lib.v | 45 + CoqOfRust/plonky3/matrix/mul.v | 6 +- CoqOfRust/plonky3/matrix/row_index_mapped.v | 4 + CoqOfRust/plonky3/matrix/sparse.v | 6 + CoqOfRust/plonky3/matrix/stack.v | 64 +- CoqOfRust/plonky3/matrix/strided.v | 4 + CoqOfRust/plonky3/matrix/util.v | 6 + CoqOfRust/plonky3/util/array_serialization.v | 28 +- CoqOfRust/plonky3/util/lib.v | 28 +- CoqOfRust/plonky3/util/linear_map.v | 6 +- CoqOfRust/plonky3/util/transpose.v | 8 + CoqOfRust/plonky3/util/zip_eq.v | 58 +- CoqOfRust/revm/revm_bytecode/bytecode.v | 91 +- CoqOfRust/revm/revm_bytecode/decode_errors.v | 4 + CoqOfRust/revm/revm_bytecode/eip7702.v | 34 + CoqOfRust/revm/revm_bytecode/eof.v | 43 +- CoqOfRust/revm/revm_bytecode/eof/body.v | 51 +- .../revm/revm_bytecode/eof/decode_helpers.v | 54 + CoqOfRust/revm/revm_bytecode/eof/header.v | 405 +++ CoqOfRust/revm/revm_bytecode/eof/links/body.v | 6 +- .../revm_bytecode/eof/links/body_EofBody.v | 6 +- .../revm/revm_bytecode/eof/links/header.v | 2 +- .../revm_bytecode/eof/links/types_section.v | 6 +- CoqOfRust/revm/revm_bytecode/eof/printer.v | 2 + .../revm/revm_bytecode/eof/types_section.v | 40 +- .../revm/revm_bytecode/eof/verification.v | 327 +- .../revm/revm_bytecode/legacy/analyzed.v | 14 + .../revm/revm_bytecode/legacy/jump_map.v | 6 + CoqOfRust/revm/revm_bytecode/legacy/raw.v | 8 + CoqOfRust/revm/revm_bytecode/links/eof.v | 46 +- CoqOfRust/revm/revm_bytecode/links/opcode.v | 6 +- CoqOfRust/revm/revm_bytecode/opcode.v | 76 +- CoqOfRust/revm/revm_bytecode/opcode/parse.v | 6 +- .../revm/revm_context_interface/block/blob.v | 6 +- .../revm_context_interface/block/links/blob.v | 6 +- CoqOfRust/revm/revm_context_interface/cfg.v | 11 +- CoqOfRust/revm/revm_context_interface/host.v | 8 + .../revm/revm_context_interface/host/dummy.v | 94 + .../revm_context_interface/journaled_state.v | 32 +- .../revm/revm_context_interface/links/cfg.v | 12 +- .../links/journaled_state.v | 14 +- .../revm/revm_context_interface/result.v | 174 +- .../revm/revm_context_interface/transaction.v | 80 +- .../transaction/links/transaction_type.v | 42 +- CoqOfRust/revm/revm_interpreter/gas.v | 24 +- CoqOfRust/revm/revm_interpreter/gas/calc.v | 100 +- .../revm_interpreter/instruction_result.v | 275 +- .../instructions/arithmetic.v | 24 + .../revm_interpreter/instructions/bitwise.v | 44 +- .../instructions/block_info.v | 52 +- .../revm_interpreter/instructions/contract.v | 240 +- .../instructions/contract/call_helpers.v | 69 +- .../revm_interpreter/instructions/control.v | 68 + .../revm/revm_interpreter/instructions/data.v | 34 + .../revm/revm_interpreter/instructions/host.v | 100 + .../revm/revm_interpreter/instructions/i256.v | 20 +- .../instructions/links/i256.v | 18 +- .../revm_interpreter/instructions/memory.v | 38 + .../revm_interpreter/instructions/stack.v | 40 + .../revm_interpreter/instructions/system.v | 114 +- .../revm_interpreter/instructions/tx_info.v | 16 + .../revm_interpreter/instructions/utility.v | 6 + CoqOfRust/revm/revm_interpreter/interpreter.v | 23 + .../interpreter/ext_bytecode.v | 2 + .../revm/revm_interpreter/interpreter/input.v | 4 + .../interpreter/links/shared_memory.v | 2 +- .../interpreter/links/stack.v | 6 +- .../interpreter/loop_control.v | 6 + .../interpreter/return_data.v | 4 + .../interpreter/shared_memory.v | 20 +- .../revm/revm_interpreter/interpreter/stack.v | 187 +- .../interpreter/subroutine_stack.v | 12 + .../revm_interpreter/interpreter_action.v | 33 +- .../interpreter_action/call_inputs.v | 68 +- .../interpreter_action/call_outcome.v | 4 + .../interpreter_action/create_inputs.v | 2 + .../interpreter_action/create_outcome.v | 4 + .../interpreter_action/eof_create_inputs.v | 34 +- .../interpreter_action/links/call_inputs.v | 42 +- .../interpreter_action/links/create_inputs.v | 6 +- .../links/eof_create_inputs.v | 6 +- .../revm/revm_interpreter/interpreter_types.v | 2 + CoqOfRust/revm/revm_interpreter/links/gas.v | 32 +- .../links/instruction_result.v | 246 +- .../links/interpreter_Interpreter.v | 24 +- .../links/interpreter_InterpreterResult.v | 6 +- .../links/interpreter_action.v | 36 +- CoqOfRust/revm/revm_interpreter/table.v | 2 + CoqOfRust/revm/revm_precompile/blake2.v | 56 +- CoqOfRust/revm/revm_precompile/bls12_381/g1.v | 53 +- .../revm/revm_precompile/bls12_381/g1_add.v | 25 + .../revm/revm_precompile/bls12_381/g1_msm.v | 35 + .../revm/revm_precompile/bls12_381/g1_mul.v | 25 + CoqOfRust/revm/revm_precompile/bls12_381/g2.v | 64 +- .../revm/revm_precompile/bls12_381/g2_add.v | 25 + .../revm/revm_precompile/bls12_381/g2_msm.v | 35 + .../revm/revm_precompile/bls12_381/g2_mul.v | 25 + .../revm_precompile/bls12_381/map_fp2_to_g2.v | 25 + .../revm_precompile/bls12_381/map_fp_to_g1.v | 21 + .../revm/revm_precompile/bls12_381/pairing.v | 27 + .../revm/revm_precompile/bls12_381/utils.v | 77 +- CoqOfRust/revm/revm_precompile/bn128.v | 97 + CoqOfRust/revm/revm_precompile/hash.v | 30 + CoqOfRust/revm/revm_precompile/identity.v | 14 + CoqOfRust/revm/revm_precompile/interface.v | 44 +- .../revm_precompile/kzg_point_evaluation.v | 45 + CoqOfRust/revm/revm_precompile/lib.v | 38 +- .../revm/revm_precompile/links/interface.v | 78 +- CoqOfRust/revm/revm_precompile/modexp.v | 45 + CoqOfRust/revm/revm_precompile/secp256k1.v | 43 +- CoqOfRust/revm/revm_precompile/utilities.v | 60 +- .../eip7702/authorization_list.v | 20 + .../eip7702/recovered_authorization.v | 4 + CoqOfRust/revm/revm_specification/hardfork.v | 231 +- .../revm/revm_specification/links/hardfork.v | 126 +- CoqOfRust/ruint/add.v | 45 +- CoqOfRust/ruint/algorithms/add.v | 4 + CoqOfRust/ruint/algorithms/div/knuth.v | 66 + CoqOfRust/ruint/algorithms/div/mod.v | 7 + CoqOfRust/ruint/algorithms/div/reciprocal.v | 24 +- CoqOfRust/ruint/algorithms/div/small.v | 12 + CoqOfRust/ruint/algorithms/gcd/matrix.v | 22 + CoqOfRust/ruint/algorithms/gcd/mod.v | 26 +- CoqOfRust/ruint/algorithms/mod.v | 10 + CoqOfRust/ruint/algorithms/mul.v | 125 +- CoqOfRust/ruint/algorithms/mul_redc.v | 24 + CoqOfRust/ruint/base_convert.v | 141 +- CoqOfRust/ruint/bit_arr.v | 10 +- CoqOfRust/ruint/bits.v | 58 +- CoqOfRust/ruint/bytes.v | 50 +- CoqOfRust/ruint/cmp.v | 2 + CoqOfRust/ruint/div.v | 20 +- CoqOfRust/ruint/fmt.v | 46 +- CoqOfRust/ruint/from.v | 636 +++- CoqOfRust/ruint/lib.v | 22 +- CoqOfRust/ruint/links/lib.v | 2 +- CoqOfRust/ruint/log.v | 10 +- CoqOfRust/ruint/modular.v | 12 +- CoqOfRust/ruint/mul.v | 53 +- CoqOfRust/ruint/pow.v | 31 +- CoqOfRust/ruint/special.v | 22 +- CoqOfRust/ruint/string.v | 78 +- CoqOfRust/ruint/utils.v | 2 + lib/src/expression.rs | 82 +- lib/src/thir_expression.rs | 54 +- 641 files changed, 53012 insertions(+), 4621 deletions(-) diff --git a/CoqOfRust/M.v b/CoqOfRust/M.v index c84e2a2a8..83e71c762 100644 --- a/CoqOfRust/M.v +++ b/CoqOfRust/M.v @@ -180,8 +180,8 @@ Module Value. | String : string -> t | Tuple : list t -> t | Array : list t -> t - | StructRecord : string -> list (string * t) -> t - | StructTuple : string -> list t -> t + | StructRecord : string -> list t -> list Ty.t ->list (string * t) -> t + | StructTuple : string -> list t -> list Ty.t -> list t -> t | Pointer : Pointer.t t -> t (** The two existential types of the closure must be [Value.t] and [M]. We cannot enforce this constraint there yet, but we will do when defining the @@ -214,7 +214,7 @@ Module Value. end | Pointer.Index.StructRecord constructor field => match value with - | StructRecord c fields => + | StructRecord c _ _ fields => if String.eqb c constructor then List.assoc fields field else @@ -223,7 +223,7 @@ Module Value. end | Pointer.Index.StructTuple constructor index => match value with - | StructTuple c fields => + | StructTuple c _ _ fields => if String.eqb c constructor then List.nth_error fields (Z.to_nat index) else @@ -254,18 +254,18 @@ Module Value. end | Pointer.Index.StructRecord constructor field => match value with - | StructRecord c fields => + | StructRecord c consts tys fields => if String.eqb c constructor then - Some (StructRecord c (List.assoc_replace fields field update)) + Some (StructRecord c consts tys (List.assoc_replace fields field update)) else None | _ => None end | Pointer.Index.StructTuple constructor index => match value with - | StructTuple c fields => + | StructTuple c consts tys fields => if String.eqb c constructor then - Some (StructTuple c (List.replace_at fields (Z.to_nat index) update)) + Some (StructTuple c consts tys (List.replace_at fields (Z.to_nat index) update)) else None | _ => None @@ -860,7 +860,7 @@ Definition is_struct_tuple (value : Value.t) (constructor : string) : M := let* value := deref value in let* value := read value in match value with - | Value.StructTuple current_constructor _ => + | Value.StructTuple current_constructor _ _ _ => if String.eqb current_constructor constructor then pure (Value.Tuple []) else @@ -882,9 +882,10 @@ Parameter cast : Ty.t -> Value.t -> Value.t. Definition closure (f : list Value.t -> M) : Value.t := Value.Closure (existS (_, _) f). -Definition constructor_as_closure (constructor : string) : Value.t := +Definition constructor_as_closure (constructor : string) (consts : list Value.t) (tys : list Ty.t) : + Value.t := closure (fun args => - pure (Value.StructTuple constructor args)). + pure (Value.StructTuple constructor consts tys args)). Parameter struct_record_update : Value.t -> list (string * Value.t) -> Value.t. diff --git a/CoqOfRust/alloc/alloc.v b/CoqOfRust/alloc/alloc.v index 9c05535e5..7476904e9 100644 --- a/CoqOfRust/alloc/alloc.v +++ b/CoqOfRust/alloc/alloc.v @@ -82,7 +82,7 @@ Module alloc. (* Default *) Definition default (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "alloc::alloc::Global" [])) + | [], [], [] => ltac:(M.monadic (Value.StructTuple "alloc::alloc::Global" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -442,6 +442,14 @@ Module alloc. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -624,7 +632,7 @@ Module alloc. |), [ M.read (| raw_ptr |) ] |); - Value.StructTuple "core::alloc::AllocError" [] + Value.StructTuple "core::alloc::AllocError" [] [] [] ] |) ] @@ -709,6 +717,14 @@ Module alloc. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -1172,7 +1188,7 @@ Module alloc. |), [ M.read (| raw_ptr |) ] |); - Value.StructTuple "core::alloc::AllocError" [] + Value.StructTuple "core::alloc::AllocError" [] [] [] ] |) ] @@ -1304,6 +1320,14 @@ Module alloc. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -1552,7 +1576,17 @@ Module alloc. |) |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| new_ptr |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.path "core::alloc::AllocError" + ] + [ M.read (| new_ptr |) ] |))) ] |) @@ -2010,6 +2044,14 @@ Module alloc. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -2236,7 +2278,7 @@ Module alloc. |), [ M.read (| raw_ptr |) ] |); - Value.StructTuple "core::alloc::AllocError" [] + Value.StructTuple "core::alloc::AllocError" [] [] [] ] |) ] @@ -2321,6 +2363,14 @@ Module alloc. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -2571,7 +2621,17 @@ Module alloc. |) |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| new_ptr |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.path "core::alloc::AllocError" + ] + [ M.read (| new_ptr |) ] |))) ] |) @@ -2652,7 +2712,7 @@ Module alloc. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "alloc::alloc::Global" [] |) + M.alloc (| Value.StructTuple "alloc::alloc::Global" [] [] [] |) |); M.read (| layout |) ] diff --git a/CoqOfRust/alloc/borrow.v b/CoqOfRust/alloc/borrow.v index 3f5719f65..194b55782 100644 --- a/CoqOfRust/alloc/borrow.v +++ b/CoqOfRust/alloc/borrow.v @@ -217,6 +217,8 @@ Module borrow. M.alloc (| Value.StructTuple "alloc::borrow::Cow::Borrowed" + [] + [ B ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| b |) |) |) ] |))); fun γ => @@ -248,6 +250,8 @@ Module borrow. M.alloc (| Value.StructTuple "alloc::borrow::Cow::Owned" + [] + [ B ] [ M.call_closure (| Ty.associated_in_trait "alloc::borrow::ToOwned" [] [] B "Owned", @@ -528,6 +532,8 @@ Module borrow. M.deref (| M.read (| self |) |), Value.StructTuple "alloc::borrow::Cow::Owned" + [] + [ B ] [ M.call_closure (| Ty.associated_in_trait @@ -1297,6 +1303,8 @@ Module borrow. ltac:(M.monadic (Value.StructTuple "alloc::borrow::Cow::Owned" + [] + [ B ] [ M.call_closure (| Ty.associated_in_trait "alloc::borrow::ToOwned" [] [] B "Owned", @@ -1596,6 +1604,8 @@ Module borrow. M.deref (| M.read (| self |) |), Value.StructTuple "alloc::borrow::Cow::Borrowed" + [] + [ Ty.path "str" ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| rhs |) |) |) ] |) |))); @@ -1724,6 +1734,8 @@ Module borrow. M.deref (| M.read (| self |) |), Value.StructTuple "alloc::borrow::Cow::Owned" + [] + [ Ty.path "str" ] [ M.read (| s |) ] |) |) in @@ -2018,6 +2030,8 @@ Module borrow. M.deref (| M.read (| self |) |), Value.StructTuple "alloc::borrow::Cow::Owned" + [] + [ Ty.path "str" ] [ M.read (| s |) ] |) |) in diff --git a/CoqOfRust/alloc/boxed.v b/CoqOfRust/alloc/boxed.v index 4cfdad6dc..f67b30fcf 100644 --- a/CoqOfRust/alloc/boxed.v +++ b/CoqOfRust/alloc/boxed.v @@ -71,7 +71,7 @@ Module boxed. [], [] |), - [ Value.StructTuple "alloc::alloc::Global" [] ] + [ Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -106,7 +106,7 @@ Module boxed. [], [] |), - [ Value.StructTuple "alloc::alloc::Global" [] ] + [ Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -195,7 +195,7 @@ Module boxed. [], [] |), - [ M.read (| x |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| x |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -241,7 +241,7 @@ Module boxed. [], [] |), - [ Value.StructTuple "alloc::alloc::Global" [] ] + [ Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -287,7 +287,7 @@ Module boxed. [], [] |), - [ Value.StructTuple "alloc::alloc::Global" [] ] + [ Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -316,7 +316,7 @@ Module boxed. [], [] |), - [ M.read (| raw |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| raw |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -687,6 +687,11 @@ Module boxed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "alloc::boxed::Box") [] [ T; A ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply (Ty.path "alloc::boxed::Box") [] [ T; A ], @@ -1137,6 +1142,14 @@ Module boxed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ]; A ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -1610,6 +1623,14 @@ Module boxed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ]; A ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -1835,6 +1856,8 @@ Module boxed. let alloc := M.alloc (| alloc |) in Value.StructTuple "alloc::boxed::Box" + [] + [ T; A ] [ M.call_closure (| Ty.apply (Ty.path "core::ptr::unique::Unique") [] [ T ], @@ -2744,7 +2767,33 @@ Module boxed. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::alloc::AllocError" [] ] + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ + Ty.apply + (Ty.path + "core::mem::maybe_uninit::MaybeUninit") + [] + [ T ] + ]; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "core::alloc::AllocError" + ] + [ + Value.StructTuple + "core::alloc::AllocError" + [] + [] + [] + ] |) |) |) @@ -2839,7 +2888,11 @@ Module boxed. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.StructTuple "alloc::alloc::Global" [] + Value.StructTuple + "alloc::alloc::Global" + [] + [] + [] |) |); M.read (| layout |) @@ -2951,6 +3004,20 @@ Module boxed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ] ]; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -3000,7 +3067,7 @@ Module boxed. [ M.read (| ptr |) ] |); M.read (| len |); - Value.StructTuple "alloc::alloc::Global" [] + Value.StructTuple "alloc::alloc::Global" [] [] [] ] |); M.read (| len |) @@ -3171,7 +3238,33 @@ Module boxed. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::alloc::AllocError" [] ] + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ + Ty.apply + (Ty.path + "core::mem::maybe_uninit::MaybeUninit") + [] + [ T ] + ]; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "core::alloc::AllocError" + ] + [ + Value.StructTuple + "core::alloc::AllocError" + [] + [] + [] + ] |) |) |) @@ -3266,7 +3359,11 @@ Module boxed. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.StructTuple "alloc::alloc::Global" [] + Value.StructTuple + "alloc::alloc::Global" + [] + [] + [] |) |); M.read (| layout |) @@ -3378,6 +3475,20 @@ Module boxed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ] ]; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -3427,7 +3538,7 @@ Module boxed. [ M.read (| ptr |) ] |); M.read (| len |); - Value.StructTuple "alloc::alloc::Global" [] + Value.StructTuple "alloc::alloc::Global" [] [] [] ] |); M.read (| len |) @@ -3721,7 +3832,33 @@ Module boxed. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::alloc::AllocError" [] ] + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ + Ty.apply + (Ty.path + "core::mem::maybe_uninit::MaybeUninit") + [] + [ T ] + ]; + A + ]; + Ty.path "core::alloc::AllocError" + ] + [ + Value.StructTuple + "core::alloc::AllocError" + [] + [] + [] + ] |) |) |) @@ -3923,6 +4060,20 @@ Module boxed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ] ]; + A + ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -4138,7 +4289,33 @@ Module boxed. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::alloc::AllocError" [] ] + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ + Ty.apply + (Ty.path + "core::mem::maybe_uninit::MaybeUninit") + [] + [ T ] + ]; + A + ]; + Ty.path "core::alloc::AllocError" + ] + [ + Value.StructTuple + "core::alloc::AllocError" + [] + [] + [] + ] |) |) |) @@ -4340,6 +4517,20 @@ Module boxed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ] ]; + A + ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -4932,7 +5123,9 @@ Module boxed. M.alloc (| Value.StructTuple "alloc::boxed::Box" - [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] ] + [] + [ Ty.apply (Ty.path "slice") [] [ T ]; Ty.path "alloc::alloc::Global" ] + [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5048,7 +5241,9 @@ Module boxed. M.alloc (| Value.StructTuple "alloc::boxed::Box" - [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] ] + [] + [ Ty.path "str"; Ty.path "alloc::alloc::Global" ] + [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/alloc/boxed/convert.v b/CoqOfRust/alloc/boxed/convert.v index 2719f120d..cb7f433f2 100644 --- a/CoqOfRust/alloc/boxed/convert.v +++ b/CoqOfRust/alloc/boxed/convert.v @@ -1005,6 +1005,8 @@ Module boxed. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1037,6 +1039,8 @@ Module boxed. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -1214,6 +1218,21 @@ Module boxed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply (Ty.path "array") [ N ] [ T ]; + Ty.path "alloc::alloc::Global" + ]; + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ Ty.apply (Ty.path "slice") [] [ T ]; Ty.path "alloc::alloc::Global" + ] + ] [ M.call_closure (| Ty.apply @@ -1235,7 +1254,24 @@ Module boxed. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| boxed_slice |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply (Ty.path "array") [ N ] [ T ]; + Ty.path "alloc::alloc::Global" + ]; + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ Ty.apply (Ty.path "slice") [] [ T ]; Ty.path "alloc::alloc::Global" + ] + ] + [ M.read (| boxed_slice |) ] |))) ] |) @@ -1381,6 +1417,20 @@ Module boxed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply (Ty.path "array") [ N ] [ T ]; + Ty.path "alloc::alloc::Global" + ]; + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ T; Ty.path "alloc::alloc::Global" ] + ] [ M.call_closure (| Ty.apply @@ -1402,7 +1452,23 @@ Module boxed. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| vec |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply (Ty.path "array") [ N ] [ T ]; + Ty.path "alloc::alloc::Global" + ]; + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ T; Ty.path "alloc::alloc::Global" ] + ] + [ M.read (| vec |) ] |))) ] |) @@ -1479,6 +1545,14 @@ Module boxed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "alloc::boxed::Box") [] [ T; A ]; + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ Ty.dyn [ ("core::any::Any::Trait", []) ]; A ] + ] [ M.call_closure (| Ty.apply (Ty.path "alloc::boxed::Box") [] [ T; A ], @@ -1500,6 +1574,14 @@ Module boxed. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "alloc::boxed::Box") [] [ T; A ]; + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ Ty.dyn [ ("core::any::Any::Trait", []) ]; A ] + ] [ (* Unsize *) M.pointer_coercion (M.read (| self |)) ] |))) ] @@ -1713,6 +1795,21 @@ Module boxed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "alloc::boxed::Box") [] [ T; A ]; + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.dyn + [ + ("core::any::Any::Trait", []); + ("core::marker::Send::AutoTrait", []) + ]; + A + ] + ] [ M.call_closure (| Ty.apply (Ty.path "alloc::boxed::Box") [] [ T; A ], @@ -1741,6 +1838,21 @@ Module boxed. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "alloc::boxed::Box") [] [ T; A ]; + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.dyn + [ + ("core::any::Any::Trait", []); + ("core::marker::Send::AutoTrait", []) + ]; + A + ] + ] [ (* Unsize *) M.pointer_coercion (M.read (| self |)) ] |))) ] @@ -1984,6 +2096,22 @@ Module boxed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "alloc::boxed::Box") [] [ T; A ]; + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.dyn + [ + ("core::any::Any::Trait", []); + ("core::marker::Sync::AutoTrait", []); + ("core::marker::Send::AutoTrait", []) + ]; + A + ] + ] [ M.call_closure (| Ty.apply (Ty.path "alloc::boxed::Box") [] [ T; A ], @@ -2013,6 +2141,22 @@ Module boxed. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "alloc::boxed::Box") [] [ T; A ]; + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.dyn + [ + ("core::any::Any::Trait", []); + ("core::marker::Sync::AutoTrait", []); + ("core::marker::Send::AutoTrait", []) + ]; + A + ] + ] [ (* Unsize *) M.pointer_coercion (M.read (| self |)) ] |))) ] @@ -2358,6 +2502,8 @@ Module boxed. [ Value.StructTuple "alloc::boxed::convert::from::StringError" + [] + [] [ M.read (| err |) ] ] |))))) @@ -2884,6 +3030,20 @@ Module boxed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ T; Ty.path "alloc::alloc::Global" ]; + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.dyn [ ("core::error::Error::Trait", []) ]; + Ty.path "alloc::alloc::Global" + ] + ] [ M.call_closure (| Ty.apply @@ -2908,6 +3068,20 @@ Module boxed. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ T; Ty.path "alloc::alloc::Global" ]; + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.dyn [ ("core::error::Error::Trait", []) ]; + Ty.path "alloc::alloc::Global" + ] + ] [ (* Unsize *) M.pointer_coercion (M.read (| self |)) ] |))) ] diff --git a/CoqOfRust/alloc/boxed/iter.v b/CoqOfRust/alloc/boxed/iter.v index 7f643a492..042acff85 100644 --- a/CoqOfRust/alloc/boxed/iter.v +++ b/CoqOfRust/alloc/boxed/iter.v @@ -237,7 +237,11 @@ Module boxed. |), [ M.read (| self |); - Value.StructTuple "core::option::Option::None" []; + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.associated_in_trait "core::iter::traits::iterator::Iterator" [] [] I "Item" ] + []; M.get_associated_function (| Self, "some.last", [], [] |) ] |))) diff --git a/CoqOfRust/alloc/boxed/thin.v b/CoqOfRust/alloc/boxed/thin.v index 0af12cf0f..66a771d3d 100644 --- a/CoqOfRust/alloc/boxed/thin.v +++ b/CoqOfRust/alloc/boxed/thin.v @@ -91,9 +91,11 @@ Module boxed. M.alloc (| Value.StructRecord "alloc::boxed::thin::ThinBox" + [] + [ T ] [ ("ptr", M.read (| ptr |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ T ] []) ] |) |))) @@ -198,10 +200,16 @@ Module boxed. (let ptr := M.copy (| γ |) in Value.StructRecord "alloc::boxed::thin::ThinBox" + [] + [ T ] [ ("ptr", M.read (| ptr |)); ("_marker", - Value.StructTuple "core::marker::PhantomData" []) + Value.StructTuple + "core::marker::PhantomData" + [] + [ T ] + []) ])) ] |))) @@ -490,9 +498,11 @@ Module boxed. M.alloc (| Value.StructRecord "alloc::boxed::thin::ThinBox" + [] + [ Dyn ] [ ("ptr", M.read (| ptr |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ Dyn ] []) ] |))); fun γ => @@ -566,9 +576,11 @@ Module boxed. M.alloc (| Value.StructRecord "alloc::boxed::thin::ThinBox" + [] + [ Dyn ] [ ("ptr", M.read (| ptr |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ Dyn ] []) ] |))) ] @@ -1051,6 +1063,8 @@ Module boxed. M.alloc (| Value.StructTuple "alloc::boxed::thin::WithOpaqueHeader" + [] + [] [ M.read (| M.SubPointer.get_struct_tuple_field (| @@ -1119,6 +1133,8 @@ Module boxed. M.alloc (| Value.StructTuple "alloc::boxed::thin::WithOpaqueHeader" + [] + [] [ M.read (| M.SubPointer.get_struct_tuple_field (| @@ -1215,6 +1231,8 @@ Module boxed. (let ptr := M.copy (| γ |) in Value.StructTuple "alloc::boxed::thin::WithOpaqueHeader" + [] + [] [ M.read (| M.SubPointer.get_struct_tuple_field (| @@ -1592,7 +1610,12 @@ Module boxed. M.alloc (| Value.StructTuple "alloc::boxed::thin::WithHeader" - [ M.read (| ptr |); Value.StructTuple "core::marker::PhantomData" [] ] + [] + [ H ] + [ + M.read (| ptr |); + Value.StructTuple "core::marker::PhantomData" [] [ H ] [] + ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.alloc (| @@ -1997,10 +2020,21 @@ Module boxed. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path + "alloc::boxed::thin::WithHeader") + [] + [ H ]; + Ty.path "core::alloc::AllocError" + ] [ Value.StructTuple "core::alloc::AllocError" [] + [] + [] ] |) |) @@ -2057,7 +2091,11 @@ Module boxed. M.alloc (| Value.StructTuple "alloc::boxed::thin::WithHeader" - [ M.read (| ptr |); Value.StructTuple "core::marker::PhantomData" [] + [] + [ H ] + [ + M.read (| ptr |); + Value.StructTuple "core::marker::PhantomData" [] [ H ] [] ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -2115,7 +2153,14 @@ Module boxed. |) |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| result |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "alloc::boxed::thin::WithHeader") [] [ H ]; + Ty.path "core::alloc::AllocError" + ] + [ M.read (| result |) ] |))) ] |) @@ -2348,6 +2393,8 @@ Module boxed. M.alloc (| Value.StructTuple "alloc::boxed::thin::WithHeader" + [] + [ H ] [ M.call_closure (| Ty.apply (Ty.path "core::ptr::non_null::NonNull") [] [ Ty.path "u8" ], @@ -2388,7 +2435,7 @@ Module boxed. |) ] |); - Value.StructTuple "core::marker::PhantomData" [] + Value.StructTuple "core::marker::PhantomData" [] [ H ] [] ] |) |))) @@ -2458,6 +2505,8 @@ Module boxed. M.alloc (| Value.StructRecord "alloc::boxed::thin::drop::DropGuard" + [] + [ H ] [ ("ptr", M.read (| @@ -2478,7 +2527,7 @@ Module boxed. |), [ (* MutToConstPointer *) M.pointer_coercion (M.read (| value |)) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ H ] []) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := diff --git a/CoqOfRust/alloc/collections/binary_heap/mod.v b/CoqOfRust/alloc/collections/binary_heap/mod.v index 1ed071dbf..fdf1894d9 100644 --- a/CoqOfRust/alloc/collections/binary_heap/mod.v +++ b/CoqOfRust/alloc/collections/binary_heap/mod.v @@ -625,6 +625,13 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] [ M.call_closure (| Ty.apply @@ -952,6 +959,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::binary_heap::BinaryHeap" + [] + [ T; A ] [ ("data", M.call_closure (| @@ -1290,6 +1299,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::binary_heap::BinaryHeap" + [] + [ T; Ty.path "alloc::alloc::Global" ] [ ("data", M.call_closure (| @@ -1330,6 +1341,8 @@ Module collections. (let capacity := M.alloc (| capacity |) in Value.StructRecord "alloc::collections::binary_heap::BinaryHeap" + [] + [ T; Ty.path "alloc::alloc::Global" ] [ ("data", M.call_closure (| @@ -1370,6 +1383,8 @@ Module collections. (let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::collections::binary_heap::BinaryHeap" + [] + [ T; A ] [ ("data", M.call_closure (| @@ -1411,6 +1426,8 @@ Module collections. let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::collections::binary_heap::BinaryHeap" + [] + [ T; A ] [ ("data", M.call_closure (| @@ -1477,22 +1494,52 @@ Module collections. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::collections::binary_heap::PeekMut") + [] + [ T; A ] + ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::binary_heap::PeekMut") + [] + [ T; A ] + ] [ Value.StructRecord "alloc::collections::binary_heap::PeekMut" + [] + [ T; A ] [ ("heap", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |)); - ("original_len", Value.StructTuple "core::option::Option::None" []) + ("original_len", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] + []) ] ] |))) @@ -3606,6 +3653,8 @@ Module collections. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", @@ -4060,6 +4109,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::binary_heap::DrainSorted" + [] + [ T; A ] [ ("inner", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4111,6 +4162,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::binary_heap::RebuildOnDrop" + [] + [ T; A ] [ ("rebuild_from", M.call_closure (| @@ -4307,6 +4360,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::binary_heap::Iter" + [] + [ T ] [ ("iter", M.call_closure (| @@ -4375,6 +4430,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::binary_heap::IntoIterSorted" + [] + [ T; A ] [ ("inner", M.read (| self |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4981,6 +5038,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::binary_heap::Drain" + [] + [ T; A ] [ ("iter", M.call_closure (| @@ -5000,7 +5059,7 @@ Module collections. "data" |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |)) ])) @@ -5183,6 +5242,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::binary_heap::Hole" + [] + [ T ] [ ("data", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| data |) |) |)); ("elt", @@ -5867,6 +5928,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::binary_heap::Iter" + [] + [ T ] [ ("iter", M.call_closure (| @@ -6024,6 +6087,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::binary_heap::Iter" + [] + [ T ] [ ("iter", M.call_closure (| @@ -6329,6 +6394,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::binary_heap::IntoIter" + [] + [ T; A ] [ ("iter", M.call_closure (| @@ -6781,6 +6848,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::binary_heap::IntoIter" + [] + [ T; Ty.path "alloc::alloc::Global" ] [ ("iter", M.call_closure (| @@ -7016,6 +7085,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::binary_heap::IntoIterSorted" + [] + [ T; A ] [ ("inner", M.call_closure (| @@ -7249,7 +7320,11 @@ Module collections. Value.Tuple [ M.read (| exact |); - Value.StructTuple "core::option::Option::Some" [ M.read (| exact |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| exact |) ] ] |) |))) @@ -7858,6 +7933,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::binary_heap::drop::DropGuard" + [] + [ T; A ] [ M.borrow (| Pointer.Kind.MutRef, @@ -8006,7 +8083,11 @@ Module collections. Value.Tuple [ M.read (| exact |); - Value.StructTuple "core::option::Option::Some" [ M.read (| exact |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| exact |) ] ] |) |))) @@ -8097,6 +8178,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::binary_heap::BinaryHeap" + [] + [ T; A ] [ ("data", M.read (| vec |)) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -8331,6 +8414,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::binary_heap::IntoIter" + [] + [ T; A ] [ ("iter", M.call_closure (| @@ -8457,6 +8542,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::binary_heap::RebuildOnDrop" + [] + [ T; A ] [ ("rebuild_from", M.call_closure (| diff --git a/CoqOfRust/alloc/collections/btree/append.v b/CoqOfRust/alloc/collections/btree/append.v index a24cd174c..a530a5c04 100644 --- a/CoqOfRust/alloc/collections/btree/append.v +++ b/CoqOfRust/alloc/collections/btree/append.v @@ -63,6 +63,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::append::MergeIter" + [] + [ K; V; I ] [ M.call_closure (| Ty.apply @@ -1024,6 +1026,8 @@ Module collections. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer diff --git a/CoqOfRust/alloc/collections/btree/borrow.v b/CoqOfRust/alloc/collections/btree/borrow.v index fa8771dce..6211f7bdc 100644 --- a/CoqOfRust/alloc/collections/btree/borrow.v +++ b/CoqOfRust/alloc/collections/btree/borrow.v @@ -117,9 +117,16 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| new_ref |) |) |); Value.StructRecord "alloc::collections::btree::borrow::DormantMutRef" + [] + [ T ] [ ("ptr", M.read (| ptr |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + []) ] ] |) diff --git a/CoqOfRust/alloc/collections/btree/dedup_sorted_iter.v b/CoqOfRust/alloc/collections/btree/dedup_sorted_iter.v index 15ccfdd51..a0e53a4de 100644 --- a/CoqOfRust/alloc/collections/btree/dedup_sorted_iter.v +++ b/CoqOfRust/alloc/collections/btree/dedup_sorted_iter.v @@ -33,6 +33,8 @@ Module collections. (let iter := M.alloc (| iter |) in Value.StructRecord "alloc::collections::btree::dedup_sorted_iter::DedupSortedIter" + [] + [ K; V; I ] [ ("iter", M.call_closure (| @@ -154,7 +156,11 @@ Module collections. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.tuple [ K; V ] ] + [] |) |) |) @@ -221,6 +227,8 @@ Module collections. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.tuple [ K; V ] ] [ M.read (| next |) ] |) |) @@ -275,6 +283,8 @@ Module collections. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.tuple [ K; V ] ] [ M.read (| next |) ] |) |) diff --git a/CoqOfRust/alloc/collections/btree/fix.v b/CoqOfRust/alloc/collections/btree/fix.v index 357e016ae..4a23374cc 100644 --- a/CoqOfRust/alloc/collections/btree/fix.v +++ b/CoqOfRust/alloc/collections/btree/fix.v @@ -148,7 +148,49 @@ Module collections. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "core::option::Option::None" [] ] + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Internal" + ] + ]; + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] + [ + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Internal" + ] + ] + [] + ] |))); fun γ => ltac:(M.monadic @@ -361,9 +403,55 @@ Module collections. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Internal" + ] + ]; + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] [ Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Internal" + ] + ] [ M.read (| parent |) ] ] |))); @@ -404,7 +492,57 @@ Module collections. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "core::option::Option::None" [] ] + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Internal" + ] + ]; + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] + [ + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Internal" + ] + ] + [] + ] |))) ] |))); @@ -535,9 +673,55 @@ Module collections. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Internal" + ] + ]; + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] [ Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Internal" + ] + ] [ M.read (| parent |) ] ] |))); @@ -578,7 +762,57 @@ Module collections. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "core::option::Option::None" [] ] + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Internal" + ] + ]; + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] + [ + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Internal" + ] + ] + [] + ] |))) ] |))); @@ -653,13 +887,94 @@ Module collections. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "core::option::Option::None" [] ] + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Internal" + ] + ]; + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] + [ + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Internal" + ] + ] + [] + ] |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Internal" + ] + ]; + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] [ M.read (| root |) ] |))) ] diff --git a/CoqOfRust/alloc/collections/btree/map.v b/CoqOfRust/alloc/collections/btree/map.v index d318a4096..8f50a61d4 100644 --- a/CoqOfRust/alloc/collections/btree/map.v +++ b/CoqOfRust/alloc/collections/btree/map.v @@ -907,6 +907,8 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ K ] [ M.call_closure (| K, @@ -995,11 +997,41 @@ Module collections. [ Value.StructRecord "alloc::collections::btree::map::entry::VacantEntry" + [] + [ + K; + Ty.path "alloc::collections::btree::set_val::SetValZST"; + A + ] [ ("key", M.read (| key |)); ("handle", Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + Ty.path + "alloc::collections::btree::set_val::SetValZST"; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.read (| handle |) ]); ("dormant_map", M.read (| dormant_map |)); ("alloc", @@ -1049,15 +1081,35 @@ Module collections. ] |)); ("_marker", - Value.StructTuple "core::marker::PhantomData" []) + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ + Ty.tuple + [ + K; + Ty.path + "alloc::collections::btree::set_val::SetValZST" + ] + ] + ] + []) ]; Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] + [] + [] ] |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ K ] [] + |))) ] |))) ] @@ -1682,11 +1734,42 @@ Module collections. [ Value.StructRecord "alloc::collections::btree::map::entry::VacantEntry" + [] + [ + K; + Ty.path + "alloc::collections::btree::set_val::SetValZST"; + A + ] [ ("key", M.read (| key |)); ("handle", Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + Ty.path + "alloc::collections::btree::set_val::SetValZST"; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.read (| handle |) ]); ("dormant_map", M.read (| dormant_map |)); ("alloc", @@ -1738,11 +1821,27 @@ Module collections. ("_marker", Value.StructTuple "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ + Ty.tuple + [ + K; + Ty.path + "alloc::collections::btree::set_val::SetValZST" + ] + ] + ] []) ]; Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] + [] + [] ] |) ] @@ -1888,6 +1987,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::btree::map::Iter" + [] + [ K; V ] [ ("range", M.call_closure (| @@ -1971,6 +2072,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::map::Iter" + [] + [ K; V ] [ ("range", M.call_closure (| @@ -2102,6 +2205,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::btree::map::IterMut" + [] + [ K; V ] [ ("range", M.call_closure (| @@ -2124,7 +2229,12 @@ Module collections. [] |)); ("length", Value.Integer IntegerKind.Usize 0); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.tuple [ K; V ] ] ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2173,6 +2283,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::map::Iter" + [] + [ K; V ] [ ("range", M.call_closure (| @@ -2339,7 +2451,30 @@ Module collections. ] |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Dying"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ]; + Ty.path "alloc::collections::btree::node::marker::KV" + ] + ] + [] + |))); fun γ => ltac:(M.monadic (let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -2362,6 +2497,25 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Dying"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ]; + Ty.path "alloc::collections::btree::node::marker::KV" + ] + ] [ M.call_closure (| Ty.apply @@ -2559,7 +2713,30 @@ Module collections. ] |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Dying"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ]; + Ty.path "alloc::collections::btree::node::marker::KV" + ] + ] + [] + |))); fun γ => ltac:(M.monadic (let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -2582,6 +2759,25 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Dying"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ]; + Ty.path "alloc::collections::btree::node::marker::KV" + ] + ] [ M.call_closure (| Ty.apply @@ -2770,6 +2966,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::btree::map::IntoIter" + [] + [ K; V; A ] [ ("range", M.call_closure (| @@ -3833,6 +4031,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::map::Range" + [] + [ K; V ] [ ("inner", M.call_closure (| @@ -3959,8 +4159,25 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::btree::map::BTreeMap" + [] + [ K; V; Ty.path "alloc::alloc::Global" ] [ - ("root", Value.StructTuple "core::option::Option::None" []); + ("root", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Owned"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] + []); ("length", Value.Integer IntegerKind.Usize 0); ("alloc", M.call_closure (| @@ -3977,9 +4194,19 @@ Module collections. [], [] |), - [ Value.StructTuple "alloc::alloc::Global" [] ] + [ Value.StructTuple "alloc::alloc::Global" [] [] [] ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ Ty.tuple [ K; V ]; Ty.path "alloc::alloc::Global" ] + ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4030,6 +4257,8 @@ Module collections. [ Value.StructRecord "alloc::collections::btree::map::BTreeMap" + [] + [ K; V; A ] [ ("root", M.call_closure (| @@ -4084,7 +4313,22 @@ Module collections. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Owned"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] + [] ] |)); ("length", @@ -4137,7 +4381,13 @@ Module collections. |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "alloc::boxed::Box") [] [ Ty.tuple [ K; V ]; A ] + ] + []) ] ] |) @@ -4171,8 +4421,25 @@ Module collections. (let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::collections::btree::map::BTreeMap" + [] + [ K; V; A ] [ - ("root", Value.StructTuple "core::option::Option::None" []); + ("root", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Owned"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] + []); ("length", Value.Integer IntegerKind.Usize 0); ("alloc", M.call_closure (| @@ -4185,7 +4452,12 @@ Module collections. |), [ M.read (| alloc |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "alloc::boxed::Box") [] [ Ty.tuple [ K; V ]; A ] ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4522,6 +4794,8 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ V ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -4578,7 +4852,13 @@ Module collections. "alloc::collections::btree::search::SearchResult::GoDown", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ V ] ] + [] + |))) ] |) |))) @@ -4940,6 +5220,14 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ K ]; + Ty.apply (Ty.path "&") [] [ V ] + ] + ] [ M.call_closure (| Ty.tuple @@ -4981,7 +5269,19 @@ Module collections. "alloc::collections::btree::search::SearchResult::GoDown", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ K ]; + Ty.apply (Ty.path "&") [] [ V ] + ] + ] + [] + |))) ] |) |))) @@ -6268,9 +6568,18 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::map::entry::OccupiedEntry") + [] + [ K; V; A ] + ] [ Value.StructRecord "alloc::collections::btree::map::entry::OccupiedEntry" + [] + [ K; V; A ] [ ("handle", M.call_closure (| @@ -6364,7 +6673,12 @@ Module collections. |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.tuple [ K; V ] ] ] + []) ] ] |))) @@ -7779,9 +8093,18 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::map::entry::OccupiedEntry") + [] + [ K; V; A ] + ] [ Value.StructRecord "alloc::collections::btree::map::entry::OccupiedEntry" + [] + [ K; V; A ] [ ("handle", M.call_closure (| @@ -7875,7 +8198,12 @@ Module collections. |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.tuple [ K; V ] ] ] + []) ] ] |))) @@ -8414,6 +8742,8 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ V ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -8456,7 +8786,13 @@ Module collections. "alloc::collections::btree::search::SearchResult::GoDown", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ V ] ] + [] + |))) ] |) |))) @@ -8534,6 +8870,8 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ V ] [ M.call_closure (| V, @@ -8575,7 +8913,7 @@ Module collections. [ M.read (| entry |); M.read (| value |) ] |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ V ] [] |))) ] |) |))) @@ -8663,9 +9001,19 @@ Module collections. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "&mut") [] [ V ]; + Ty.apply + (Ty.path "alloc::collections::btree::map::entry::OccupiedError") + [] + [ K; V; A ] + ] [ Value.StructRecord "alloc::collections::btree::map::entry::OccupiedError" + [] + [ K; V; A ] [ ("entry", M.read (| entry |)); ("value", M.read (| value |)) ] ] |))); @@ -8681,6 +9029,14 @@ Module collections. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "&mut") [] [ V ]; + Ty.apply + (Ty.path "alloc::collections::btree::map::entry::OccupiedError") + [] + [ K; V; A ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -9186,6 +9542,8 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.tuple [ K; V ] ] [ M.call_closure (| Ty.tuple [ K; V ], @@ -9202,6 +9560,8 @@ Module collections. [ Value.StructRecord "alloc::collections::btree::map::entry::OccupiedEntry" + [] + [ K; V; A ] [ ("handle", M.read (| handle |)); ("dormant_map", M.read (| dormant_map |)); @@ -9254,6 +9614,13 @@ Module collections. ("_marker", Value.StructTuple "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.tuple [ K; V ] ] + ] []) ] ] @@ -9269,7 +9636,11 @@ Module collections. 0 |) in M.alloc (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.tuple [ K; V ] ] + [] |))) ] |))) @@ -10198,6 +10569,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::map::Range" + [] + [ K; V ] [ ("inner", M.call_closure (| @@ -10266,6 +10639,8 @@ Module collections. (M.alloc (| Value.StructRecord "alloc::collections::btree::map::Range" + [] + [ K; V ] [ ("inner", M.call_closure (| @@ -10361,6 +10736,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::map::RangeMut" + [] + [ K; V ] [ ("inner", M.call_closure (| @@ -10425,7 +10802,12 @@ Module collections. M.read (| range |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.tuple [ K; V ] ] ] + []) ] |))); fun γ => @@ -10433,6 +10815,8 @@ Module collections. (M.alloc (| Value.StructRecord "alloc::collections::btree::map::RangeMut" + [] + [ K; V ] [ ("inner", M.call_closure (| @@ -10459,7 +10843,12 @@ Module collections. |), [] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.tuple [ K; V ] ] ] + []) ] |))) ] @@ -10593,13 +10982,42 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::map::entry::Entry::Vacant" + [] + [ K; V; A ] [ Value.StructRecord "alloc::collections::btree::map::entry::VacantEntry" + [] + [ K; V; A ] [ ("key", M.read (| key |)); ("handle", - Value.StructTuple "core::option::Option::None" []); + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] + []); ("dormant_map", M.read (| dormant_map |)); ("alloc", M.call_closure (| @@ -10648,7 +11066,11 @@ Module collections. ] |)); ("_marker", - Value.StructTuple "core::marker::PhantomData" []) + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.tuple [ K; V ] ] ] + []) ] ] |))); @@ -10755,9 +11177,13 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::map::entry::Entry::Occupied" + [] + [ K; V; A ] [ Value.StructRecord "alloc::collections::btree::map::entry::OccupiedEntry" + [] + [ K; V; A ] [ ("handle", M.read (| handle |)); ("dormant_map", M.read (| dormant_map |)); @@ -10810,6 +11236,13 @@ Module collections. ("_marker", Value.StructTuple "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.tuple [ K; V ] ] + ] []) ] ] @@ -10826,14 +11259,41 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::map::entry::Entry::Vacant" + [] + [ K; V; A ] [ Value.StructRecord "alloc::collections::btree::map::entry::VacantEntry" + [] + [ K; V; A ] [ ("key", M.read (| key |)); ("handle", Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.read (| handle |) ]); ("dormant_map", M.read (| dormant_map |)); ("alloc", @@ -10885,6 +11345,13 @@ Module collections. ("_marker", Value.StructTuple "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.tuple [ K; V ] ] + ] []) ] ] @@ -11343,10 +11810,26 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::map::BTreeMap" + [] + [ K; V; A ] [ ("root", Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Owned"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] [ M.read (| right_root |) ]); ("length", M.read (| right_len |)); ("alloc", @@ -11378,7 +11861,17 @@ Module collections. |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ Ty.tuple [ K; V ]; A ] + ] + []) ] |))) ] @@ -11459,6 +11952,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::map::ExtractIf" + [] + [ K; V; F; A ] [ ("pred", M.read (| pred |)); ("inner", M.read (| inner |)); @@ -11778,6 +12273,8 @@ Module collections. [ Value.StructRecord "alloc::collections::btree::map::ExtractIfInner" + [] + [ K; V ] [ ("length", M.borrow (| @@ -11796,10 +12293,54 @@ Module collections. ("dormant_root", Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::borrow::DormantMutRef") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Owned"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] + ] [ M.read (| dormant_root |) ]); ("cur_leaf_edge", Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.read (| front |) ]) ]; M.call_closure (| @@ -11858,6 +12399,8 @@ Module collections. [ Value.StructRecord "alloc::collections::btree::map::ExtractIfInner" + [] + [ K; V ] [ ("length", M.borrow (| @@ -11874,9 +12417,53 @@ Module collections. |) |)); ("dormant_root", - Value.StructTuple "core::option::Option::None" []); + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::borrow::DormantMutRef") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Owned"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] + ] + []); ("cur_leaf_edge", - Value.StructTuple "core::option::Option::None" []) + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] + []) ]; M.call_closure (| A, @@ -11954,6 +12541,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::map::IntoKeys" + [] + [ K; V; A ] [ ("inner", M.call_closure (| @@ -12000,6 +12589,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::map::IntoValues" + [] + [ K; V; A ] [ ("inner", M.call_closure (| @@ -12210,9 +12801,25 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::map::BTreeMap" + [] + [ K; V; A ] [ ("root", - Value.StructTuple "core::option::Option::Some" [ M.read (| root |) ]); + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Owned"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] + [ M.read (| root |) ]); ("length", M.read (| length |)); ("alloc", M.call_closure (| @@ -12225,7 +12832,12 @@ Module collections. |), [ M.read (| alloc |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "alloc::boxed::Box") [] [ Ty.tuple [ K; V ]; A ] ] + []) ] |) |))) @@ -12353,6 +12965,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::map::Iter" + [] + [ K; V ] [ ("range", M.read (| full_range |)); ("length", @@ -12370,6 +12984,8 @@ Module collections. (M.alloc (| Value.StructRecord "alloc::collections::btree::map::Iter" + [] + [ K; V ] [ ("range", M.call_closure (| @@ -12531,6 +13147,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::map::IterMut" + [] + [ K; V ] [ ("range", M.read (| full_range |)); ("length", @@ -12541,7 +13159,12 @@ Module collections. "length" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.tuple [ K; V ] ] ] + []) ] |))); fun γ => @@ -12549,6 +13172,8 @@ Module collections. (M.alloc (| Value.StructRecord "alloc::collections::btree::map::IterMut" + [] + [ K; V ] [ ("range", M.call_closure (| @@ -12576,7 +13201,12 @@ Module collections. [] |)); ("length", Value.Integer IntegerKind.Usize 0); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.tuple [ K; V ] ] ] + []) ] |))) ] @@ -12604,6 +13234,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::map::Keys" + [] + [ K; V ] [ ("inner", M.call_closure (| @@ -12647,6 +13279,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::map::Values" + [] + [ K; V ] [ ("inner", M.call_closure (| @@ -12690,6 +13324,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::map::ValuesMut" + [] + [ K; V ] [ ("inner", M.call_closure (| @@ -12909,11 +13545,60 @@ Module collections. M.return_ (| Value.StructRecord "alloc::collections::btree::map::Cursor" + [] + [ K; V ] [ ("current", - Value.StructTuple "core::option::Option::None" []); + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Immut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] + []); ("root", - Value.StructTuple "core::option::Option::None" []) + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Owned"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] + ] + []) ] |) |) @@ -13042,9 +13727,31 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::map::Cursor" + [] + [ K; V ] [ ("current", - Value.StructTuple "core::option::Option::Some" [ M.read (| edge |) ]); + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Immut"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] + [ M.read (| edge |) ]); ("root", M.call_closure (| Ty.apply @@ -13358,14 +14065,41 @@ Module collections. M.return_ (| Value.StructRecord "alloc::collections::btree::map::CursorMut" + [] + [ K; V; A ] [ ("inner", Value.StructRecord "alloc::collections::btree::map::CursorMutKey" + [] + [ K; V; A ] [ ("current", Value.StructTuple "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] []); ("root", M.read (| dormant_root |)); ("length", @@ -13556,14 +14290,40 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::map::CursorMut" + [] + [ K; V; A ] [ ("inner", Value.StructRecord "alloc::collections::btree::map::CursorMutKey" + [] + [ K; V; A ] [ ("current", Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.read (| edge |) ]); ("root", M.read (| dormant_root |)); ("length", @@ -13758,11 +14518,60 @@ Module collections. M.return_ (| Value.StructRecord "alloc::collections::btree::map::Cursor" + [] + [ K; V ] [ ("current", - Value.StructTuple "core::option::Option::None" []); + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Immut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] + []); ("root", - Value.StructTuple "core::option::Option::None" []) + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Owned"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] + ] + []) ] |) |) @@ -13891,9 +14700,31 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::map::Cursor" + [] + [ K; V ] [ ("current", - Value.StructTuple "core::option::Option::Some" [ M.read (| edge |) ]); + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Immut"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] + [ M.read (| edge |) ]); ("root", M.call_closure (| Ty.apply @@ -14207,14 +15038,41 @@ Module collections. M.return_ (| Value.StructRecord "alloc::collections::btree::map::CursorMut" + [] + [ K; V; A ] [ ("inner", Value.StructRecord "alloc::collections::btree::map::CursorMutKey" + [] + [ K; V; A ] [ ("current", Value.StructTuple "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] []); ("root", M.read (| dormant_root |)); ("length", @@ -14405,14 +15263,40 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::map::CursorMut" + [] + [ K; V; A ] [ ("inner", Value.StructRecord "alloc::collections::btree::map::CursorMutKey" + [] + [ K; V; A ] [ ("current", Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.read (| edge |) ]); ("root", M.read (| dormant_root |)); ("length", @@ -14604,7 +15488,16 @@ Module collections. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ Ty.apply (Ty.path "&") [] [ K ]; Ty.apply (Ty.path "&") [] [ V ] ] + ] + [] + |))); fun γ => ltac:(M.monadic (let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -14627,6 +15520,11 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ Ty.apply (Ty.path "&") [] [ K ]; Ty.apply (Ty.path "&") [] [ V ] ] + ] [ M.call_closure (| Ty.tuple @@ -14688,6 +15586,8 @@ Module collections. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -14891,7 +15791,16 @@ Module collections. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ Ty.apply (Ty.path "&") [] [ K ]; Ty.apply (Ty.path "&") [] [ V ] ] + ] + [] + |))); fun γ => ltac:(M.monadic (let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -14914,6 +15823,11 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ Ty.apply (Ty.path "&") [] [ K ]; Ty.apply (Ty.path "&") [] [ V ] ] + ] [ M.call_closure (| Ty.tuple @@ -15010,6 +15924,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::map::Iter" + [] + [ K; V ] [ ("range", M.call_closure (| @@ -15182,7 +16098,19 @@ Module collections. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ K ]; + Ty.apply (Ty.path "&mut") [] [ V ] + ] + ] + [] + |))); fun γ => ltac:(M.monadic (let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -15205,6 +16133,14 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ K ]; + Ty.apply (Ty.path "&mut") [] [ V ] + ] + ] [ M.call_closure (| Ty.tuple @@ -15271,6 +16207,8 @@ Module collections. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -15463,7 +16401,19 @@ Module collections. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ K ]; + Ty.apply (Ty.path "&mut") [] [ V ] + ] + ] + [] + |))); fun γ => ltac:(M.monadic (let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -15486,6 +16436,14 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ K ]; + Ty.apply (Ty.path "&mut") [] [ V ] + ] + ] [ M.call_closure (| Ty.tuple @@ -15601,6 +16559,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::map::Iter" + [] + [ K; V ] [ ("range", M.call_closure (| @@ -15896,6 +16856,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::map::IntoIter" + [] + [ K; V; A ] [ ("range", M.read (| full_range |)); ("length", @@ -16004,6 +16966,8 @@ Module collections. (M.alloc (| Value.StructRecord "alloc::collections::btree::map::IntoIter" + [] + [ K; V; A ] [ ("range", M.call_closure (| @@ -16217,6 +17181,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::map::drop::DropGuard" + [] + [ K; V; A ] [ M.borrow (| Pointer.Kind.MutRef, @@ -16504,6 +17470,8 @@ Module collections. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -17235,6 +18203,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::map::Keys" + [] + [ K; V ] [ ("inner", M.call_closure (| @@ -17289,6 +18259,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::btree::map::Keys" + [] + [ K; V ] [ ("inner", M.call_closure (| @@ -17721,6 +18693,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::map::Values" + [] + [ K; V ] [ ("inner", M.call_closure (| @@ -17775,6 +18749,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::btree::map::Values" + [] + [ K; V ] [ ("inner", M.call_closure (| @@ -19499,6 +20475,27 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::borrow::DormantMutRef") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Owned"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] + ] [ M.read (| M.SubPointer.get_tuple_field (| @@ -19647,12 +20644,37 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.read (| pos |) ] |) |) in M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.tuple [ K; V ] ] [ M.read (| kv |) ] |))) ] @@ -19674,6 +20696,29 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.call_closure (| Ty.apply @@ -19745,7 +20790,9 @@ Module collections. ] |))) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.tuple [ K; V ] ] [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -19782,6 +20829,8 @@ Module collections. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| M.deref (| @@ -19999,6 +21048,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::btree::map::Range" + [] + [ K; V ] [ ("inner", M.call_closure (| @@ -20050,6 +21101,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::btree::map::RangeMut" + [] + [ K; V ] [ ("inner", M.call_closure (| @@ -20071,7 +21124,12 @@ Module collections. |), [] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.tuple [ K; V ] ] ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -20494,6 +21552,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::btree::map::ValuesMut" + [] + [ K; V ] [ ("inner", M.call_closure (| @@ -20924,6 +21984,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::btree::map::IntoKeys" + [] + [ K; V; A ] [ ("inner", M.call_closure (| @@ -21295,6 +22357,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::btree::map::IntoValues" + [] + [ K; V; A ] [ ("inner", M.call_closure (| @@ -21416,6 +22480,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::map::Range" + [] + [ K; V ] [ ("inner", M.call_closure (| @@ -22004,7 +23070,7 @@ Module collections. [ Ty.tuple [ K; V ]; Ty.path "alloc::alloc::Global" ] ] |), - [ M.read (| inputs |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| inputs |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |) |) |))) @@ -23485,7 +24551,7 @@ Module collections. [], [ Ty.apply (Ty.path "array") [ N ] [ Ty.tuple [ K; V ] ] ] |), - [ M.read (| arr |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| arr |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |) |) |))) @@ -23598,6 +24664,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::map::Cursor" + [] + [ K; V ] [ ("current", M.read (| current |)); ("root", M.read (| root |)) ] |))) ] @@ -24196,6 +25264,26 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Immut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.call_closure (| Ty.apply @@ -24243,7 +25331,17 @@ Module collections. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| result |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ K ]; + Ty.apply (Ty.path "&") [] [ V ] + ] + ] + [ M.read (| result |) ] |))); fun γ => ltac:(M.monadic @@ -24264,6 +25362,26 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Immut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.call_closure (| Ty.apply @@ -24304,7 +25422,19 @@ Module collections. ] |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ K ]; + Ty.apply (Ty.path "&") [] [ V ] + ] + ] + [] + |))) ] |) |))) @@ -24709,6 +25839,26 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Immut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.call_closure (| Ty.apply @@ -24756,7 +25906,17 @@ Module collections. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| result |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ K ]; + Ty.apply (Ty.path "&") [] [ V ] + ] + ] + [ M.read (| result |) ] |))); fun γ => ltac:(M.monadic @@ -24777,6 +25937,26 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Immut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.call_closure (| Ty.apply @@ -24817,7 +25997,19 @@ Module collections. ] |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ K ]; + Ty.apply (Ty.path "&") [] [ V ] + ] + ] + [] + |))) ] |) |))) @@ -25142,6 +26334,14 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ K ]; + Ty.apply (Ty.path "&mut") [] [ V ] + ] + ] [ Value.Tuple [ @@ -25366,6 +26566,14 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ K ]; + Ty.apply (Ty.path "&mut") [] [ V ] + ] + ] [ Value.Tuple [ @@ -25595,6 +26803,14 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ K ]; + Ty.apply (Ty.path "&mut") [] [ V ] + ] + ] [ Value.Tuple [ @@ -25824,6 +27040,14 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ K ]; + Ty.apply (Ty.path "&mut") [] [ V ] + ] + ] [ Value.Tuple [ @@ -26727,6 +27951,29 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.call_closure (| Ty.apply @@ -26782,6 +28029,14 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&mut") [] [ K ]; + Ty.apply (Ty.path "&mut") [] [ V ] + ] + ] [ Value.Tuple [ @@ -26829,6 +28084,26 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.call_closure (| Ty.apply @@ -26869,7 +28144,19 @@ Module collections. ] |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&mut") [] [ K ]; + Ty.apply (Ty.path "&mut") [] [ V ] + ] + ] + [] + |))) ] |) |))) @@ -27382,6 +28669,29 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.call_closure (| Ty.apply @@ -27437,6 +28747,14 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&mut") [] [ K ]; + Ty.apply (Ty.path "&mut") [] [ V ] + ] + ] [ Value.Tuple [ @@ -27484,6 +28802,26 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.call_closure (| Ty.apply @@ -27524,7 +28862,19 @@ Module collections. ] |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&mut") [] [ K ]; + Ty.apply (Ty.path "&mut") [] [ V ] + ] + ] + [] + |))) ] |) |))) @@ -28205,7 +29555,17 @@ Module collections. ] |) |) in - M.alloc (| Value.StructTuple "core::option::Option::Some" [ M.read (| kv |) ] |) + M.alloc (| + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.tuple + [ Ty.apply (Ty.path "&mut") [] [ K ]; Ty.apply (Ty.path "&mut") [] [ V ] + ] + ] + [ M.read (| kv |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -28884,7 +30244,17 @@ Module collections. ] |) |) in - M.alloc (| Value.StructTuple "core::option::Option::Some" [ M.read (| kv |) ] |) + M.alloc (| + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.tuple + [ Ty.apply (Ty.path "&mut") [] [ K ]; Ty.apply (Ty.path "&mut") [] [ V ] + ] + ] + [ M.read (| kv |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -28918,6 +30288,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::map::Cursor" + [] + [ K; V ] [ ("root", M.call_closure (| @@ -29862,6 +31234,21 @@ Module collections. M.deref (| M.read (| root |) |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Owned"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] [ M.call_closure (| Ty.apply @@ -29929,6 +31316,29 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.call_closure (| Ty.apply @@ -30509,6 +31919,24 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.call_closure (| Ty.apply @@ -31036,6 +32464,21 @@ Module collections. M.deref (| M.read (| root |) |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Owned"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] [ M.call_closure (| Ty.apply @@ -31106,6 +32549,29 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.call_closure (| Ty.apply @@ -31776,6 +33242,24 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.call_closure (| Ty.apply @@ -31986,10 +33470,18 @@ Module collections. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "alloc::collections::btree::map::UnorderedKeyError" + ] [ Value.StructTuple "alloc::collections::btree::map::UnorderedKeyError" [] + [] + [] ] |) |) @@ -32095,10 +33587,18 @@ Module collections. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "alloc::collections::btree::map::UnorderedKeyError" + ] [ Value.StructTuple "alloc::collections::btree::map::UnorderedKeyError" [] + [] + [] ] |) |) @@ -32132,7 +33632,13 @@ Module collections. |) |) in M.alloc (| Value.Tuple [] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "alloc::collections::btree::map::UnorderedKeyError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -32276,10 +33782,18 @@ Module collections. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "alloc::collections::btree::map::UnorderedKeyError" + ] [ Value.StructTuple "alloc::collections::btree::map::UnorderedKeyError" [] + [] + [] ] |) |) @@ -32385,10 +33899,18 @@ Module collections. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "alloc::collections::btree::map::UnorderedKeyError" + ] [ Value.StructTuple "alloc::collections::btree::map::UnorderedKeyError" [] + [] + [] ] |) |) @@ -32422,7 +33944,13 @@ Module collections. |) |) in M.alloc (| Value.Tuple [] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "alloc::collections::btree::map::UnorderedKeyError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -32880,11 +34408,37 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.read (| current |) ] |) |) in M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.tuple [ K; V ] ] + [] |) |) |) @@ -33283,6 +34837,26 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.read (| pos |) ] |) |) in @@ -33572,7 +35146,11 @@ Module collections. ] |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| kv |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.tuple [ K; V ] ] + [ M.read (| kv |) ] |))) ] |) @@ -34033,11 +35611,37 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.read (| current |) ] |) |) in M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.tuple [ K; V ] ] + [] |) |) |) @@ -34436,6 +36040,26 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.read (| pos |) ] |) |) in @@ -34725,7 +36349,11 @@ Module collections. ] |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| kv |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.tuple [ K; V ] ] + [ M.read (| kv |) ] |))) ] |) @@ -34760,7 +36388,7 @@ Module collections. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "alloc::collections::btree::map::UnorderedKeyError" [])) + Value.StructTuple "alloc::collections::btree::map::UnorderedKeyError" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/alloc/collections/btree/map/entry.v b/CoqOfRust/alloc/collections/btree/map/entry.v index a4be2e60d..6b5bea2af 100644 --- a/CoqOfRust/alloc/collections/btree/map/entry.v +++ b/CoqOfRust/alloc/collections/btree/map/entry.v @@ -1651,6 +1651,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::map::entry::Entry::Occupied" + [] + [ K; V; A ] [ M.read (| entry |) ] |))); fun γ => @@ -1665,6 +1667,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::map::entry::Entry::Vacant" + [] + [ K; V; A ] [ M.read (| entry |) ] |))) ] @@ -3021,6 +3025,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::map::entry::OccupiedEntry" + [] + [ K; V; A ] [ ("handle", M.call_closure (| @@ -3078,7 +3084,12 @@ Module collections. "alloc" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.tuple [ K; V ] ] ] + []) ] |) |))) diff --git a/CoqOfRust/alloc/collections/btree/mem.v b/CoqOfRust/alloc/collections/btree/mem.v index 1cd4b3c82..8f9751d01 100644 --- a/CoqOfRust/alloc/collections/btree/mem.v +++ b/CoqOfRust/alloc/collections/btree/mem.v @@ -102,7 +102,7 @@ Module collections. [] [ Ty.path "alloc::collections::btree::mem::replace::PanicGuard" ] := M.alloc (| - Value.StructTuple "alloc::collections::btree::mem::replace::PanicGuard" [] + Value.StructTuple "alloc::collections::btree::mem::replace::PanicGuard" [] [] [] |) in let~ value : Ty.apply (Ty.path "*") [] [ T ] := M.alloc (| diff --git a/CoqOfRust/alloc/collections/btree/merge_iter.v b/CoqOfRust/alloc/collections/btree/merge_iter.v index 33b09d83f..36f8dc08c 100644 --- a/CoqOfRust/alloc/collections/btree/merge_iter.v +++ b/CoqOfRust/alloc/collections/btree/merge_iter.v @@ -83,6 +83,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::merge_iter::Peeked::A" + [] + [ I ] [ M.call_closure (| Ty.associated_in_trait @@ -127,6 +129,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::merge_iter::Peeked::B" + [] + [ I ] [ M.call_closure (| Ty.associated_in_trait @@ -300,6 +304,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::merge_iter::MergeIterInner" + [] + [ I ] [ ("a", M.call_closure (| @@ -568,10 +574,18 @@ Module collections. let b := M.alloc (| b |) in Value.StructRecord "alloc::collections::btree::merge_iter::MergeIterInner" + [] + [ I ] [ ("a", M.read (| a |)); ("b", M.read (| b |)); - ("peeked", Value.StructTuple "core::option::Option::None" []) + ("peeked", + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "alloc::collections::btree::merge_iter::Peeked") [] [ I ] + ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -686,7 +700,18 @@ Module collections. M.alloc (| M.write (| a_next, - Value.StructTuple "core::option::Option::Some" [ M.read (| next |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [ M.read (| next |) ] |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -747,7 +772,18 @@ Module collections. M.alloc (| M.write (| b_next, - Value.StructTuple "core::option::Option::Some" [ M.read (| next |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [ M.read (| next |) ] |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -1049,6 +1085,8 @@ Module collections. |); M.constructor_as_closure "alloc::collections::btree::merge_iter::Peeked::B" + [] + [ I ] ] |) |) @@ -1144,6 +1182,8 @@ Module collections. |); M.constructor_as_closure "alloc::collections::btree::merge_iter::Peeked::A" + [] + [ I ] ] |) |) diff --git a/CoqOfRust/alloc/collections/btree/navigate.v b/CoqOfRust/alloc/collections/btree/navigate.v index a21f54ef7..568c1f050 100644 --- a/CoqOfRust/alloc/collections/btree/navigate.v +++ b/CoqOfRust/alloc/collections/btree/navigate.v @@ -76,6 +76,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::navigate::LeafRange" + [] + [ Ty.path "alloc::collections::btree::node::marker::Immut"; K; V ] [ ("front", M.call_closure (| @@ -234,9 +236,43 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::btree::navigate::LeafRange" + [] + [ B; K; V ] [ - ("front", Value.StructTuple "core::option::Option::None" []); - ("back", Value.StructTuple "core::option::Option::None" []) + ("front", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ B; K; V; Ty.path "alloc::collections::btree::node::marker::Leaf" ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] + []); + ("back", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ B; K; V; Ty.path "alloc::collections::btree::node::marker::Leaf" ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -275,9 +311,53 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::btree::navigate::LeafRange" + [] + [ BorrowType; K; V ] [ - ("front", Value.StructTuple "core::option::Option::None" []); - ("back", Value.StructTuple "core::option::Option::None" []) + ("front", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] + []); + ("back", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -404,6 +484,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::navigate::LeafRange" + [] + [ Ty.path "alloc::collections::btree::node::marker::Immut"; K; V ] [ ("front", M.call_closure (| @@ -1055,7 +1137,7 @@ Module collections. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ R ] [] |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -1645,6 +1727,8 @@ Module collections. |); Value.StructTuple "core::option::Option::Some" + [] + [ R ] [ M.read (| result |) ] ] |) @@ -1724,7 +1808,7 @@ Module collections. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ R ] [] |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -2314,6 +2398,8 @@ Module collections. |); Value.StructTuple "core::option::Option::Some" + [] + [ R ] [ M.read (| result |) ] ] |) @@ -3203,6 +3289,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::navigate::LazyLeafHandle::Root" + [] + [ Ty.path "alloc::collections::btree::node::marker::Immut"; K; V ] [ M.read (| M.deref (| M.read (| root |) |) |) ] |))); fun γ => @@ -3218,6 +3306,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::navigate::LazyLeafHandle::Edge" + [] + [ Ty.path "alloc::collections::btree::node::marker::Immut"; K; V ] [ M.read (| M.deref (| M.read (| edge |) |) |) ] |))) ] @@ -3288,6 +3378,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::navigate::LazyLeafHandle::Root" + [] + [ Ty.path "alloc::collections::btree::node::marker::Immut"; K; V ] [ M.call_closure (| Ty.apply @@ -3332,6 +3424,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::navigate::LazyLeafHandle::Edge" + [] + [ Ty.path "alloc::collections::btree::node::marker::Immut"; K; V ] [ M.call_closure (| Ty.apply @@ -3437,9 +3531,31 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::btree::navigate::LazyLeafRange" + [] + [ B; K; V ] [ - ("front", Value.StructTuple "core::option::Option::None" []); - ("back", Value.StructTuple "core::option::Option::None" []) + ("front", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::navigate::LazyLeafHandle") + [] + [ B; K; V ] + ] + []); + ("back", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::navigate::LazyLeafHandle") + [] + [ B; K; V ] + ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3474,6 +3590,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::navigate::LazyLeafRange" + [] + [ Ty.path "alloc::collections::btree::node::marker::Immut"; K; V ] [ ("front", M.call_closure (| @@ -3591,9 +3709,31 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::btree::navigate::LazyLeafRange" + [] + [ BorrowType; K; V ] [ - ("front", Value.StructTuple "core::option::Option::None" []); - ("back", Value.StructTuple "core::option::Option::None" []) + ("front", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::navigate::LazyLeafHandle") + [] + [ BorrowType; K; V ] + ] + []); + ("back", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::navigate::LazyLeafHandle") + [] + [ BorrowType; K; V ] + ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3625,6 +3765,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::navigate::LazyLeafRange" + [] + [ Ty.path "alloc::collections::btree::node::marker::Immut"; K; V ] [ ("front", M.call_closure (| @@ -4050,9 +4192,19 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::navigate::LazyLeafHandle") + [] + [ BorrowType; K; V ] + ] [ Value.StructTuple "alloc::collections::btree::navigate::LazyLeafHandle::Edge" + [] + [ BorrowType; K; V ] [ M.call_closure (| Ty.apply @@ -4179,7 +4331,34 @@ Module collections. ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] + ] + [] + |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in @@ -4199,6 +4378,29 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] + ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| edge |) |) |) ] |))); fun γ => @@ -4306,9 +4508,19 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::navigate::LazyLeafHandle") + [] + [ BorrowType; K; V ] + ] [ Value.StructTuple "alloc::collections::btree::navigate::LazyLeafHandle::Edge" + [] + [ BorrowType; K; V ] [ M.call_closure (| Ty.apply @@ -4435,7 +4647,34 @@ Module collections. ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] + ] + [] + |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in @@ -4455,6 +4694,29 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] + ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| edge |) |) |) ] |))); fun γ => @@ -5374,6 +5636,24 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Dying"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.call_closure (| Ty.apply @@ -5421,23 +5701,43 @@ Module collections. |) in let edge := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| edge |) ] - |))) - ] - |) - |))) - |))) - | _, _, _ => M.impossible "wrong number of arguments" - end. - - Global Instance AssociatedFunction_take_front : - forall (K V : Ty.t), - M.IsAssociatedFunction.C (Self K V) "take_front" (take_front K V). - Admitted. - Global Typeclasses Opaque take_front. - - (* - pub unsafe fn deallocating_next_unchecked( + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Dying"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] + [ M.read (| edge |) ] + |))) + ] + |) + |))) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. + + Global Instance AssociatedFunction_take_front : + forall (K V : Ty.t), + M.IsAssociatedFunction.C (Self K V) "take_front" (take_front K V). + Admitted. + Global Typeclasses Opaque take_front. + + (* + pub unsafe fn deallocating_next_unchecked( &mut self, alloc: A, ) -> Handle, marker::KV> { @@ -6628,14 +6928,60 @@ Module collections. M.return_ (| Value.StructRecord "alloc::collections::btree::navigate::LeafRange" + [] + [ BorrowType; K; V ] [ ("front", Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.read (| f |) ]); ("back", Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.read (| b |) ]) ] |) @@ -8139,21 +8485,41 @@ Module collections. let root2 := M.alloc (| root2 |) in Value.StructRecord "alloc::collections::btree::navigate::LazyLeafRange" + [] + [ BorrowType; K; V ] [ ("front", Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::navigate::LazyLeafHandle") + [] + [ BorrowType; K; V ] + ] [ Value.StructTuple "alloc::collections::btree::navigate::LazyLeafHandle::Root" + [] + [ BorrowType; K; V ] [ M.read (| root1 |) ] ]); ("back", Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::navigate::LazyLeafHandle") + [] + [ BorrowType; K; V ] + ] [ Value.StructTuple "alloc::collections::btree::navigate::LazyLeafHandle::Root" + [] + [ BorrowType; K; V ] [ M.read (| root2 |) ] ]) ])) @@ -8398,6 +8764,12 @@ Module collections. [ Value.StructTuple "alloc::collections::btree::navigate::Position::Leaf" + [] + [ + Ty.path "alloc::collections::btree::node::marker::Immut"; + K; + V + ] [ M.read (| leaf |) ] ] ] @@ -8445,6 +8817,13 @@ Module collections. [ Value.StructTuple "alloc::collections::btree::navigate::Position::Internal" + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Immut"; + K; + V + ] [ M.read (| internal |) ] ] ] @@ -8684,6 +9063,13 @@ Module collections. [ Value.StructTuple "alloc::collections::btree::navigate::Position::Leaf" + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Immut"; + K; + V + ] [ M.read (| leaf |) ] ] ] @@ -8833,6 +9219,13 @@ Module collections. Value.StructTuple "alloc::collections::btree::navigate::Position::InternalKV" [] + [ + Ty.path + "alloc::collections::btree::node::marker::Immut"; + K; + V + ] + [] ] ] |) @@ -8950,6 +9343,13 @@ Module collections. [ Value.StructTuple "alloc::collections::btree::navigate::Position::Internal" + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Immut"; + K; + V + ] [ M.read (| internal |) ] ] ] @@ -9761,6 +10161,39 @@ Module collections. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ]; + Ty.path + "alloc::collections::btree::node::marker::KV" + ]; + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] [ M.read (| kv |) ] |) |) @@ -9968,6 +10401,39 @@ Module collections. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ]; + Ty.path + "alloc::collections::btree::node::marker::KV" + ]; + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] [ M.read (| root |) ] |) |) @@ -10237,6 +10703,39 @@ Module collections. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ]; + Ty.path + "alloc::collections::btree::node::marker::KV" + ]; + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] [ M.read (| kv |) ] |) |) @@ -10444,6 +10943,39 @@ Module collections. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ]; + Ty.path + "alloc::collections::btree::node::marker::KV" + ]; + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] [ M.read (| root |) ] |) |) @@ -10690,6 +11222,39 @@ Module collections. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Internal" + ]; + Ty.path + "alloc::collections::btree::node::marker::KV" + ]; + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Internal" + ] + ] [ M.read (| internal_kv |) ] |) |) @@ -10850,6 +11415,39 @@ Module collections. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Internal" + ]; + Ty.path + "alloc::collections::btree::node::marker::KV" + ]; + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Internal" + ] + ] [ M.read (| root |) ] |) |) @@ -11153,6 +11751,52 @@ Module collections. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Dying"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ]; + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Dying"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ]; + Ty.path + "alloc::collections::btree::node::marker::KV" + ] + ] + ] [ Value.Tuple [ @@ -11481,6 +12125,52 @@ Module collections. Value.StructTuple "core::option::Option::None" [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Dying"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ]; + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Dying"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ]; + Ty.path + "alloc::collections::btree::node::marker::KV" + ] + ] + ] + [] |) |) |) @@ -11764,6 +12454,52 @@ Module collections. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Dying"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ]; + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Dying"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ]; + Ty.path + "alloc::collections::btree::node::marker::KV" + ] + ] + ] [ Value.Tuple [ @@ -12092,6 +12828,52 @@ Module collections. Value.StructTuple "core::option::Option::None" [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Dying"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ]; + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Dying"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ]; + Ty.path + "alloc::collections::btree::node::marker::KV" + ] + ] + ] + [] |) |) |) diff --git a/CoqOfRust/alloc/collections/btree/node.v b/CoqOfRust/alloc/collections/btree/node.v index bb945d065..7bbaae489 100644 --- a/CoqOfRust/alloc/collections/btree/node.v +++ b/CoqOfRust/alloc/collections/btree/node.v @@ -228,7 +228,21 @@ Module collections. "parent" |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::InternalNode") + [] + [ K; V ] + ] + ] + [] ] |) |) in @@ -928,6 +942,13 @@ Module collections. (let leaf := M.alloc (| leaf |) in Value.StructRecord "alloc::collections::btree::node::NodeRef" + [] + [ + Ty.path "alloc::collections::btree::node::marker::Owned"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ] [ ("height", Value.Integer IntegerKind.Usize 0); ("node", @@ -994,7 +1015,18 @@ Module collections. |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.tuple + [ + Ty.path "alloc::collections::btree::node::marker::Owned"; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ] + ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1412,10 +1444,28 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::node::NodeRef" + [] + [ + Ty.path "alloc::collections::btree::node::marker::Owned"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Internal" + ] [ ("height", M.read (| height |)); ("node", M.read (| node |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.tuple + [ + Ty.path "alloc::collections::btree::node::marker::Owned"; + Ty.path "alloc::collections::btree::node::marker::Internal" + ] + ] + []) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -1564,6 +1614,9 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::node::NodeRef" + [] + [ BorrowType; K; V; Ty.path "alloc::collections::btree::node::marker::Internal" + ] [ ("height", M.read (| height |)); ("node", @@ -1598,7 +1651,18 @@ Module collections. |), [ M.read (| node |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.tuple + [ + BorrowType; + Ty.path "alloc::collections::btree::node::marker::Internal" + ] + ] + []) ] |) |))) @@ -1690,6 +1754,13 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::node::NodeRef" + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::LeafOrInternal" + ] [ ("height", M.read (| @@ -1707,7 +1778,18 @@ Module collections. "node" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.tuple + [ + BorrowType; + Ty.path "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3055,6 +3137,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::node::NodeRef" + [] + [ Ty.path "alloc::collections::btree::node::marker::Immut"; K; V; Type_ ] [ ("height", M.read (| @@ -3072,7 +3156,13 @@ Module collections. "node" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.tuple [ Ty.path "alloc::collections::btree::node::marker::Immut"; Type_ ] + ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3486,6 +3576,22 @@ Module collections. (let parent := M.copy (| γ |) in Value.StructRecord "alloc::collections::btree::node::Handle" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Internal" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] [ ("node", M.call_closure (| @@ -3574,7 +3680,14 @@ Module collections. ] |)); ("_marker", - Value.StructTuple "core::marker::PhantomData" []) + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + []) ])) ] |))) @@ -4166,6 +4279,8 @@ Module collections. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -4209,6 +4324,11 @@ Module collections. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -4443,6 +4563,8 @@ Module collections. |)); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -4832,6 +4954,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::node::NodeRef" + [] + [ Ty.path "alloc::collections::btree::node::marker::Mut"; K; V; Type_ ] [ ("height", M.read (| @@ -4849,7 +4973,12 @@ Module collections. "node" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.tuple [ Ty.path "alloc::collections::btree::node::marker::Mut"; Type_ ] ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5055,6 +5184,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::node::NodeRef" + [] + [ Ty.path "alloc::collections::btree::node::marker::DormantMut"; K; V; Type_ ] [ ("height", M.read (| @@ -5072,7 +5203,15 @@ Module collections. "node" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.tuple + [ Ty.path "alloc::collections::btree::node::marker::DormantMut"; Type_ ] + ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5464,6 +5603,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::node::NodeRef" + [] + [ Ty.path "alloc::collections::btree::node::marker::Mut"; K; V; Type_ ] [ ("height", M.read (| @@ -5481,7 +5622,12 @@ Module collections. "node" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.tuple [ Ty.path "alloc::collections::btree::node::marker::Mut"; Type_ ] ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5969,7 +6115,21 @@ Module collections. "alloc::collections::btree::node::LeafNode", "parent" |), - Value.StructTuple "core::option::Option::Some" [ M.read (| parent |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::InternalNode") + [] + [ K; V ] + ] + ] + [ M.read (| parent |) ] |) |) in let~ _ : @@ -6088,6 +6248,13 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::node::NodeRef" + [] + [ + Ty.path "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ] [ ("height", M.read (| @@ -6105,7 +6272,18 @@ Module collections. "node" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.tuple + [ + Ty.path "alloc::collections::btree::node::marker::Mut"; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ] + ] + []) ] |) |))) @@ -6197,6 +6375,13 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::node::NodeRef" + [] + [ + Ty.path "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Internal" + ] [ ("height", M.read (| @@ -6214,7 +6399,18 @@ Module collections. "node" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.tuple + [ + Ty.path "alloc::collections::btree::node::marker::Mut"; + Ty.path "alloc::collections::btree::node::marker::Internal" + ] + ] + []) ] |) |))) @@ -6489,12 +6685,45 @@ Module collections. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::LeftOrRight") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::BalancingContext") + [] + [ K; V ] + ]; + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] [ Value.StructTuple "alloc::collections::btree::node::LeftOrRight::Left" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::BalancingContext") + [] + [ K; V ] + ] [ Value.StructRecord "alloc::collections::btree::node::BalancingContext" + [] + [ K; V ] [ ("parent", M.call_closure (| @@ -6772,12 +7001,47 @@ Module collections. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::LeftOrRight") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::BalancingContext") + [] + [ K; V ] + ]; + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path + "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] [ Value.StructTuple "alloc::collections::btree::node::LeftOrRight::Right" + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::BalancingContext") + [] + [ K; V ] + ] [ Value.StructRecord "alloc::collections::btree::node::BalancingContext" + [] + [ K; V ] [ ("parent", M.call_closure (| @@ -7025,7 +7289,30 @@ Module collections. |) in let root := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| root |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::LeftOrRight") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::BalancingContext") + [] + [ K; V ] + ]; + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] + [ M.read (| root |) ] |))) ] |) @@ -7161,7 +7448,21 @@ Module collections. "alloc::collections::btree::node::LeafNode", "parent" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::InternalNode") + [] + [ K; V ] + ] + ] + [] |) |) in M.alloc (| Value.Tuple [] |) @@ -7436,6 +7737,13 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::node::NodeRef" + [] + [ + Ty.path "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Internal" + ] [ ("height", M.read (| @@ -7453,9 +7761,20 @@ Module collections. "node" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) - ] - |) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.tuple + [ + Ty.path "alloc::collections::btree::node::marker::Mut"; + Ty.path "alloc::collections::btree::node::marker::Internal" + ] + ] + []) + ] + |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -7870,6 +8189,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::node::NodeRef" + [] + [ Ty.path "alloc::collections::btree::node::marker::Mut"; K; V; Type_ ] [ ("height", M.read (| @@ -7887,7 +8208,12 @@ Module collections. "node" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.tuple [ Ty.path "alloc::collections::btree::node::marker::Mut"; Type_ ] ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -7916,6 +8242,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::node::NodeRef" + [] + [ Ty.path "alloc::collections::btree::node::marker::ValMut"; K; V; Type_ ] [ ("height", M.read (| @@ -7933,7 +8261,15 @@ Module collections. "node" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.tuple + [ Ty.path "alloc::collections::btree::node::marker::ValMut"; Type_ ] + ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -7962,6 +8298,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::node::NodeRef" + [] + [ Ty.path "alloc::collections::btree::node::marker::Dying"; K; V; Type_ ] [ ("height", M.read (| @@ -7979,7 +8317,13 @@ Module collections. "node" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.tuple [ Ty.path "alloc::collections::btree::node::marker::Dying"; Type_ ] + ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -8263,6 +8607,13 @@ Module collections. [ Value.StructRecord "alloc::collections::btree::node::NodeRef" + [] + [ + Ty.path "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ] [ ("height", M.read (| @@ -8280,7 +8631,18 @@ Module collections. "node" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.tuple + [ + Ty.path "alloc::collections::btree::node::marker::Mut"; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ] + ] + []) ]; M.read (| idx |) ] @@ -8412,6 +8774,13 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::node::NodeRef" + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::LeafOrInternal" + ] [ ("height", M.read (| @@ -8429,7 +8798,18 @@ Module collections. "node" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.tuple + [ + BorrowType; + Ty.path "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -8538,9 +8918,37 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::node::ForceResult::Leaf'1" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Internal" + ] + ] [ Value.StructRecord "alloc::collections::btree::node::NodeRef" + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ] [ ("height", M.read (| @@ -8558,7 +8966,18 @@ Module collections. "node" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.tuple + [ + BorrowType; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ] + ] + []) ] ] |))); @@ -8567,9 +8986,37 @@ Module collections. (M.alloc (| Value.StructTuple "alloc::collections::btree::node::ForceResult::Internal'1" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Internal" + ] + ] [ Value.StructRecord "alloc::collections::btree::node::NodeRef" + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Internal" + ] [ ("height", M.read (| @@ -8587,7 +9034,19 @@ Module collections. "node" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.tuple + [ + BorrowType; + Ty.path + "alloc::collections::btree::node::marker::Internal" + ] + ] + []) ] ] |))) @@ -8836,10 +9295,23 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::node::Handle" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ BorrowType; K; V; NodeType ]; + Ty.path "alloc::collections::btree::node::marker::KV" + ] [ ("node", M.read (| node |)); ("idx", M.read (| idx |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "alloc::collections::btree::node::marker::KV" ] + []) ] |) |))) @@ -9172,6 +9644,14 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::node::Handle" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ Ty.path "alloc::collections::btree::node::marker::Immut"; K; V; NodeType ]; + HandleType + ] [ ("node", M.call_closure (| @@ -9208,7 +9688,7 @@ Module collections. "idx" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ HandleType ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -9257,6 +9737,14 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::node::Handle" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ Ty.path "alloc::collections::btree::node::marker::Mut"; K; V; NodeType ]; + HandleType + ] [ ("node", M.call_closure (| @@ -9293,7 +9781,7 @@ Module collections. "idx" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ HandleType ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -9325,6 +9813,15 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::node::Handle" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ Ty.path "alloc::collections::btree::node::marker::DormantMut"; K; V; NodeType + ]; + HandleType + ] [ ("node", M.call_closure (| @@ -9366,7 +9863,7 @@ Module collections. "idx" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ HandleType ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -9412,6 +9909,14 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::node::Handle" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ Ty.path "alloc::collections::btree::node::marker::Mut"; K; V; NodeType ]; + HandleType + ] [ ("node", M.call_closure (| @@ -9451,7 +9956,7 @@ Module collections. "idx" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ HandleType ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -9567,10 +10072,23 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::node::Handle" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ BorrowType; K; V; NodeType ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] [ ("node", M.read (| node |)); ("idx", M.read (| idx |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "alloc::collections::btree::node::marker::Edge" ] + []) ] |) |))) @@ -9664,6 +10182,29 @@ Module collections. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ BorrowType; K; V; NodeType ]; + Ty.path "alloc::collections::btree::node::marker::KV" + ]; + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ BorrowType; K; V; NodeType ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.call_closure (| Ty.apply @@ -9720,7 +10261,32 @@ Module collections. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| self |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ BorrowType; K; V; NodeType ]; + Ty.path "alloc::collections::btree::node::marker::KV" + ]; + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ BorrowType; K; V; NodeType ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] + [ M.read (| self |) ] |))) ] |) @@ -9836,6 +10402,29 @@ Module collections. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ BorrowType; K; V; NodeType ]; + Ty.path "alloc::collections::btree::node::marker::KV" + ]; + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ BorrowType; K; V; NodeType ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.call_closure (| Ty.apply @@ -9879,13 +10468,38 @@ Module collections. |) |) ] - |) + |) + ] + |))); + fun γ => + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ BorrowType; K; V; NodeType ]; + Ty.path "alloc::collections::btree::node::marker::KV" + ]; + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ BorrowType; K; V; NodeType ]; + Ty.path "alloc::collections::btree::node::marker::Edge" + ] ] - |))); - fun γ => - ltac:(M.monadic - (M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| self |) ] + [ M.read (| self |) ] |))) ] |) @@ -10037,6 +10651,8 @@ Module collections. |); Value.StructTuple "alloc::collections::btree::node::LeftOrRight::Left" + [] + [ Ty.path "usize" ] [ M.read (| edge_idx |) ] ] |))); @@ -10058,6 +10674,8 @@ Module collections. |); Value.StructTuple "alloc::collections::btree::node::LeftOrRight::Left" + [] + [ Ty.path "usize" ] [ M.read (| edge_idx |) ] ] |))); @@ -10079,6 +10697,8 @@ Module collections. |); Value.StructTuple "alloc::collections::btree::node::LeftOrRight::Right" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))); @@ -10102,6 +10722,8 @@ Module collections. |); Value.StructTuple "alloc::collections::btree::node::LeftOrRight::Right" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -10388,6 +11010,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| new_len |)) ] ] |) @@ -10471,6 +11095,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| new_len |)) ] ] |) @@ -10774,7 +11400,17 @@ Module collections. M.alloc (| Value.Tuple [ - Value.StructTuple "core::option::Option::None" []; + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::SplitResult") + [] + [ K; V; Ty.path "alloc::collections::btree::node::marker::Leaf" + ] + ] + []; M.call_closure (| Ty.apply (Ty.path "alloc::collections::btree::node::Handle") @@ -11400,6 +12036,18 @@ Module collections. [ Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::SplitResult") + [] + [ + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ] + ] [ M.read (| result |) ]; M.read (| handle |) ] @@ -12696,6 +13344,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| new_len |)) ] ] |) @@ -12779,6 +13429,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| new_len |)) ] ] |) @@ -12894,6 +13546,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -12994,6 +13648,8 @@ Module collections. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -13230,7 +13886,19 @@ Module collections. ] |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::SplitResult") + [] + [ K; V; Ty.path "alloc::collections::btree::node::marker::Internal" + ] + ] + [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -13706,6 +14374,18 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::SplitResult") + [] + [ + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Internal" + ] + ] [ M.read (| result |) ] |))) ] @@ -13947,6 +14627,13 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::node::NodeRef" + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::LeafOrInternal" + ] [ ("node", M.read (| node |)); ("height", @@ -13968,7 +14655,18 @@ Module collections. Value.Integer IntegerKind.Usize 1 ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.tuple + [ + BorrowType; + Ty.path "alloc::collections::btree::node::marker::LeafOrInternal" + ] + ] + []) ] |) |))) @@ -15830,6 +16528,8 @@ Module collections. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -15906,6 +16606,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| new_len |)) ] ] |) @@ -15983,6 +16685,8 @@ Module collections. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -16059,6 +16763,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| new_len |)) ] ] |) @@ -16772,6 +17478,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::node::drop_key_val::Dropper" + [] + [ V ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| val |) |) |) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -16954,6 +17662,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::node::SplitResult" + [] + [ K; V; Ty.path "alloc::collections::btree::node::marker::Leaf" ] [ ("left", M.read (| @@ -17094,6 +17804,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| old_len |)) ] ] |) @@ -17176,6 +17888,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| old_len |)) ] ] |) @@ -17574,6 +18288,8 @@ Module collections. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -17677,6 +18393,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -17755,6 +18473,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::node::SplitResult" + [] + [ K; V; Ty.path "alloc::collections::btree::node::marker::Internal" ] [ ("left", M.read (| @@ -17937,6 +18657,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::node::BalancingContext" + [] + [ K; V ] [ ("parent", M.read (| self |)); ("left_child", @@ -18785,6 +19507,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, parent_node |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| old_parent_len |)) ] ] |) @@ -18917,6 +19641,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, right_node |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| right_len |)) ] ] |) @@ -18974,6 +19700,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, left_node |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -19055,6 +19783,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, parent_node |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| old_parent_len |)) ] ] |) @@ -19187,6 +19917,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, right_node |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| right_len |)) ] ] |) @@ -19244,6 +19976,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, left_node |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -19389,6 +20123,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, parent_node |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -19443,6 +20179,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, parent_node |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -19747,6 +20485,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, right_node |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -19841,6 +20581,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, left_node |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -19897,6 +20639,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, left_node |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -21455,6 +22199,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| new_right_len |)) ] ] |) @@ -21528,6 +22274,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| new_right_len |)) ] ] |) @@ -21601,6 +22349,8 @@ Module collections. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -21671,6 +22421,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -21750,6 +22502,8 @@ Module collections. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -21820,6 +22574,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -22403,6 +23159,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, right |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -22515,6 +23273,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, left |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -22612,6 +23372,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, right |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| count |)) ] ] |) @@ -22647,6 +23409,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, right |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -23429,6 +24193,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -23499,6 +24265,8 @@ Module collections. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -23583,6 +24351,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -23653,6 +24423,8 @@ Module collections. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -23737,6 +24509,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| old_right_len |)) ] ] |) @@ -23811,6 +24585,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| old_right_len |)) ] ] |) @@ -24088,6 +24864,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, right |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| count |)) ] ] |) @@ -24166,6 +24944,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, left |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -24286,6 +25066,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, right |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -24332,6 +25114,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, left |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -24382,6 +25166,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, right |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -24832,9 +25618,55 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::node::ForceResult::Leaf'1" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ]; + Type_ + ]; + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Internal" + ]; + Type_ + ] + ] [ Value.StructRecord "alloc::collections::btree::node::Handle" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ]; + Type_ + ] [ ("node", M.read (| node |)); ("idx", @@ -24845,7 +25677,8 @@ Module collections. "idx" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple "core::marker::PhantomData" [] [ Type_ ] []) ] ] |))); @@ -24861,9 +25694,55 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::node::ForceResult::Internal'1" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ]; + Type_ + ]; + Ty.apply + (Ty.path "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Internal" + ]; + Type_ + ] + ] [ Value.StructRecord "alloc::collections::btree::node::Handle" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Internal" + ]; + Type_ + ] [ ("node", M.read (| node |)); ("idx", @@ -24874,7 +25753,8 @@ Module collections. "idx" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple "core::marker::PhantomData" [] [ Type_ ] []) ] ] |))) @@ -24983,6 +25863,19 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::node::Handle" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::node::NodeRef") + [] + [ + Ty.path "alloc::collections::btree::node::marker::Mut"; + K; + V; + Ty.path "alloc::collections::btree::node::marker::Leaf" + ]; + Type_ + ] [ ("node", M.read (| node |)); ("idx", @@ -24993,7 +25886,7 @@ Module collections. "idx" |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ Type_ ] []) ] |) |))) @@ -25489,6 +26382,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, left_node |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| new_left_len |)); ("end_", M.read (| old_left_len |)) @@ -25548,6 +26443,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, right_node |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| new_right_len |)) ] ] |) @@ -25617,6 +26514,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, left_node |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| new_left_len |)); ("end_", M.read (| old_left_len |)) @@ -25676,6 +26575,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, right_node |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| new_right_len |)) ] ] |) @@ -25892,6 +26793,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, left |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -25993,6 +26896,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, right |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1); ("end_", @@ -26040,6 +26945,8 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, right |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1); ("end_", @@ -26170,6 +27077,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::node::SplitResult" + [] + [ K; V; Ty.path "alloc::collections::btree::node::marker::LeafOrInternal" ] [ ("left", M.call_closure (| @@ -26285,6 +27194,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::node::SplitResult" + [] + [ K; V; Ty.path "alloc::collections::btree::node::marker::LeafOrInternal" ] [ ("left", M.call_closure (| diff --git a/CoqOfRust/alloc/collections/btree/remove.v b/CoqOfRust/alloc/collections/btree/remove.v index 64ee22bb9..d92fb41d6 100644 --- a/CoqOfRust/alloc/collections/btree/remove.v +++ b/CoqOfRust/alloc/collections/btree/remove.v @@ -978,6 +978,8 @@ Module collections. M.read (| left_parent_kv |); Value.StructTuple "alloc::collections::btree::node::LeftOrRight::Right" + [] + [ Ty.path "usize" ] [ M.read (| idx |) ]; M.call_closure (| A, @@ -1369,6 +1371,8 @@ Module collections. M.read (| right_parent_kv |); Value.StructTuple "alloc::collections::btree::node::LeftOrRight::Left" + [] + [ Ty.path "usize" ] [ M.read (| idx |) ]; M.call_closure (| A, diff --git a/CoqOfRust/alloc/collections/btree/search.v b/CoqOfRust/alloc/collections/btree/search.v index 6d7c91e84..91cb0aefa 100644 --- a/CoqOfRust/alloc/collections/btree/search.v +++ b/CoqOfRust/alloc/collections/btree/search.v @@ -85,6 +85,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::search::SearchBound::Included" + [] + [ T ] [ M.read (| t |) ] |))); fun γ => @@ -99,6 +101,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::search::SearchBound::Excluded" + [] + [ T ] [ M.read (| t |) ] |))); fun γ => @@ -108,6 +112,8 @@ Module collections. Value.StructTuple "alloc::collections::btree::search::SearchBound::AllIncluded" [] + [ T ] + [] |))) ] |) @@ -326,6 +332,16 @@ Module collections. M.return_ (| Value.StructTuple "alloc::collections::btree::search::SearchResult::Found" + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal"; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ] [ M.read (| handle |) ] |) |) @@ -445,6 +461,16 @@ Module collections. M.return_ (| Value.StructTuple "alloc::collections::btree::search::SearchResult::GoDown" + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal"; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ] [ M.read (| leaf |) ] |) |) @@ -1312,6 +1338,64 @@ Module collections. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ]; + Ty.path "usize"; + Ty.path "usize"; + Ty.apply + (Ty.path + "alloc::collections::btree::search::SearchBound") + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Q ] + ]; + Ty.apply + (Ty.path + "alloc::collections::btree::search::SearchBound") + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Q ] + ] + ]; + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] [ Value.Tuple [ @@ -1462,6 +1546,8 @@ Module collections. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1510,6 +1596,11 @@ Module collections. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -1699,6 +1790,64 @@ Module collections. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::LeafOrInternal" + ]; + Ty.path "usize"; + Ty.path "usize"; + Ty.apply + (Ty.path + "alloc::collections::btree::search::SearchBound") + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Q ] + ]; + Ty.apply + (Ty.path + "alloc::collections::btree::search::SearchBound") + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Q ] + ] + ]; + Ty.apply + (Ty.path + "alloc::collections::btree::node::Handle") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::btree::node::NodeRef") + [] + [ + BorrowType; + K; + V; + Ty.path + "alloc::collections::btree::node::marker::Leaf" + ]; + Ty.path + "alloc::collections::btree::node::marker::Edge" + ] + ] [ M.read (| common_edge |) ] |) |) @@ -2228,6 +2377,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::search::SearchResult::Found" + [] + [ BorrowType; K; V; Type_; Type_ ] [ M.call_closure (| Ty.apply @@ -2271,6 +2422,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::search::SearchResult::GoDown" + [] + [ BorrowType; K; V; Type_; Type_ ] [ M.call_closure (| Ty.apply @@ -2554,6 +2707,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start_index |)) ] ] |) @@ -2706,6 +2861,8 @@ Module collections. M.return_ (| Value.StructTuple "alloc::collections::btree::search::IndexResult::KV" + [] + [] [ M.call_closure (| Ty.path "usize", @@ -2733,6 +2890,8 @@ Module collections. M.return_ (| Value.StructTuple "alloc::collections::btree::search::IndexResult::Edge" + [] + [] [ M.call_closure (| Ty.path "usize", @@ -2758,6 +2917,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::search::IndexResult::Edge" + [] + [] [ M.call_closure (| Ty.path "usize", @@ -2896,6 +3057,8 @@ Module collections. Value.StructTuple "alloc::collections::btree::search::SearchBound::AllExcluded" [] + [ Ty.apply (Ty.path "&") [] [ Q ] ] + [] ] |))); fun γ => @@ -2973,6 +3136,8 @@ Module collections. Value.StructTuple "alloc::collections::btree::search::SearchBound::AllIncluded" [] + [ Ty.apply (Ty.path "&") [] [ Q ] ] + [] ] |))); fun γ => @@ -3001,6 +3166,8 @@ Module collections. Value.StructTuple "alloc::collections::btree::search::SearchBound::AllIncluded" [] + [ Ty.apply (Ty.path "&") [] [ Q ] ] + [] ] |))); fun γ => @@ -3029,6 +3196,8 @@ Module collections. Value.StructTuple "alloc::collections::btree::search::SearchBound::AllExcluded" [] + [ Ty.apply (Ty.path "&") [] [ Q ] ] + [] ] |))) ] @@ -3163,6 +3332,8 @@ Module collections. Value.StructTuple "alloc::collections::btree::search::SearchBound::AllExcluded" [] + [ Ty.apply (Ty.path "&") [] [ Q ] ] + [] ] |))); fun γ => @@ -3236,6 +3407,8 @@ Module collections. Value.StructTuple "alloc::collections::btree::search::SearchBound::AllIncluded" [] + [ Ty.apply (Ty.path "&") [] [ Q ] ] + [] ] |))); fun γ => @@ -3276,6 +3449,8 @@ Module collections. Value.StructTuple "alloc::collections::btree::search::SearchBound::AllIncluded" [] + [ Ty.apply (Ty.path "&") [] [ Q ] ] + [] ] |))); fun γ => @@ -3292,6 +3467,8 @@ Module collections. Value.StructTuple "alloc::collections::btree::search::SearchBound::AllExcluded" [] + [ Ty.apply (Ty.path "&") [] [ Q ] ] + [] ] |))) ] diff --git a/CoqOfRust/alloc/collections/btree/set.v b/CoqOfRust/alloc/collections/btree/set.v index 9ee9b89a1..b8a0ff154 100644 --- a/CoqOfRust/alloc/collections/btree/set.v +++ b/CoqOfRust/alloc/collections/btree/set.v @@ -323,6 +323,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::set::BTreeSet" + [] + [ T; A ] [ ("map", M.call_closure (| @@ -2013,6 +2015,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::btree::set::BTreeSet" + [] + [ T; Ty.path "alloc::alloc::Global" ] [ ("map", M.call_closure (| @@ -2067,6 +2071,8 @@ Module collections. (let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::collections::btree::set::BTreeSet" + [] + [ T; A ] [ ("map", M.call_closure (| @@ -2114,6 +2120,8 @@ Module collections. let range := M.alloc (| range |) in Value.StructRecord "alloc::collections::btree::set::Range" + [] + [ T ] [ ("iter", M.call_closure (| @@ -2306,10 +2314,14 @@ Module collections. M.return_ (| Value.StructRecord "alloc::collections::btree::set::Difference" + [] + [ T; A ] [ ("inner", Value.StructTuple "alloc::collections::btree::set::DifferenceInner::Iterate" + [] + [ T; A ] [ M.call_closure (| Ty.apply @@ -2451,10 +2463,14 @@ Module collections. M.return_ (| Value.StructRecord "alloc::collections::btree::set::Difference" + [] + [ T; A ] [ ("inner", Value.StructTuple "alloc::collections::btree::set::DifferenceInner::Iterate" + [] + [ T; A ] [ M.call_closure (| Ty.apply @@ -2497,6 +2513,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::set::Difference" + [] + [ T; A ] [ ("inner", M.read (| @@ -2611,6 +2629,8 @@ Module collections. (M.alloc (| Value.StructTuple "alloc::collections::btree::set::DifferenceInner::Iterate" + [] + [ T; A ] [ M.call_closure (| Ty.apply @@ -2731,6 +2751,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::set::DifferenceInner::Iterate" + [] + [ T; A ] [ M.read (| self_iter |) ] |))); fun γ => @@ -2820,6 +2842,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::set::DifferenceInner::Iterate" + [] + [ T; A ] [ M.read (| self_iter |) ] |))); fun γ => @@ -2893,6 +2917,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::set::DifferenceInner::Search" + [] + [ T; A ] [ ("self_iter", M.call_closure (| @@ -2930,6 +2956,8 @@ Module collections. (M.alloc (| Value.StructRecord "alloc::collections::btree::set::DifferenceInner::Stitch" + [] + [ T; A ] [ ("self_iter", M.call_closure (| @@ -3056,6 +3084,8 @@ Module collections. let other := M.alloc (| other |) in Value.StructTuple "alloc::collections::btree::set::SymmetricDifference" + [] + [ T ] [ M.call_closure (| Ty.apply @@ -3250,11 +3280,21 @@ Module collections. M.return_ (| Value.StructRecord "alloc::collections::btree::set::Intersection" + [] + [ T; A ] [ ("inner", Value.StructTuple "alloc::collections::btree::set::IntersectionInner::Answer" - [ Value.StructTuple "core::option::Option::None" [] ]) + [] + [ T; A ] + [ + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + ]) ] |) |) @@ -3372,14 +3412,20 @@ Module collections. M.return_ (| Value.StructRecord "alloc::collections::btree::set::Intersection" + [] + [ T; A ] [ ("inner", Value.StructTuple "alloc::collections::btree::set::IntersectionInner::Answer" + [] + [ T; A ] [ Value.StructTuple "core::option::Option::None" [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] ]) ] |) @@ -3398,6 +3444,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::set::Intersection" + [] + [ T; A ] [ ("inner", M.read (| @@ -3512,10 +3560,19 @@ Module collections. (M.alloc (| Value.StructTuple "alloc::collections::btree::set::IntersectionInner::Answer" + [] + [ T; A ] [ Value.StructTuple "core::option::Option::None" [] + [ + Ty.apply + (Ty.path "&") + [] + [ T ] + ] + [] ] |))) | _ => @@ -3537,9 +3594,13 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::set::IntersectionInner::Answer" + [] + [ T; A ] [ Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -3564,9 +3625,13 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::set::IntersectionInner::Answer" + [] + [ T; A ] [ Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -3648,6 +3713,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::set::IntersectionInner::Search" + [] + [ T; A ] [ ("small_iter", M.call_closure (| @@ -3751,6 +3818,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::set::IntersectionInner::Search" + [] + [ T; A ] [ ("small_iter", M.call_closure (| @@ -3788,6 +3857,8 @@ Module collections. (M.alloc (| Value.StructRecord "alloc::collections::btree::set::IntersectionInner::Stitch" + [] + [ T; A ] [ ("a", M.call_closure (| @@ -3876,6 +3947,8 @@ Module collections. let other := M.alloc (| other |) in Value.StructTuple "alloc::collections::btree::set::Union" + [] + [ T ] [ M.call_closure (| Ty.apply @@ -5282,6 +5355,8 @@ Module collections. |); Value.StructTuple "core::cmp::Ordering::Less" + [] + [] []; M.closure (fun γ => @@ -6213,7 +6288,7 @@ Module collections. M.read (| value |) ] |); - Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] + Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] [] [] ] |) ] @@ -6356,9 +6431,13 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::set::entry::Entry::Occupied" + [] + [ T; A ] [ Value.StructRecord "alloc::collections::btree::set::entry::OccupiedEntry" + [] + [ T; A ] [ ("inner", M.read (| entry |)) ] ] |))); @@ -6374,9 +6453,13 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::set::entry::Entry::Vacant" + [] + [ T; A ] [ Value.StructRecord "alloc::collections::btree::set::entry::VacantEntry" + [] + [ T; A ] [ ("inner", M.read (| entry |)) ] ] |))) @@ -6794,6 +6877,8 @@ Module collections. let value := M.alloc (| value |) in Value.StructRecord "alloc::collections::btree::set::BTreeSet" + [] + [ T; A ] [ ("map", M.call_closure (| @@ -6902,6 +6987,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::set::ExtractIf" + [] + [ T; F; A ] [ ("pred", M.read (| pred |)); ("inner", M.read (| inner |)); @@ -6933,6 +7020,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::set::Iter" + [] + [ T ] [ ("iter", M.call_closure (| @@ -7077,6 +7166,8 @@ Module collections. let bound := M.alloc (| bound |) in Value.StructRecord "alloc::collections::btree::set::Cursor" + [] + [ T ] [ ("inner", M.call_closure (| @@ -7138,6 +7229,8 @@ Module collections. let bound := M.alloc (| bound |) in Value.StructRecord "alloc::collections::btree::set::CursorMut" + [] + [ T; A ] [ ("inner", M.call_closure (| @@ -7199,6 +7292,8 @@ Module collections. let bound := M.alloc (| bound |) in Value.StructRecord "alloc::collections::btree::set::Cursor" + [] + [ T ] [ ("inner", M.call_closure (| @@ -7260,6 +7355,8 @@ Module collections. let bound := M.alloc (| bound |) in Value.StructRecord "alloc::collections::btree::set::CursorMut" + [] + [ T; A ] [ ("inner", M.call_closure (| @@ -7455,6 +7552,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::set::BTreeSet" + [] + [ T; A ] [ ("map", M.read (| map |)) ] |) |))) @@ -7689,7 +7788,7 @@ Module collections. |), [ M.read (| inputs |) ] |); - Value.StructTuple "alloc::alloc::Global" [] + Value.StructTuple "alloc::alloc::Global" [] [] [] ] |) |) @@ -7967,12 +8066,14 @@ Module collections. ] ] |), - [ M.read (| iter |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| iter |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |) |) in M.alloc (| Value.StructRecord "alloc::collections::btree::set::BTreeSet" + [] + [ T; Ty.path "alloc::alloc::Global" ] [ ("map", M.read (| map |)) ] |) |))) @@ -8019,6 +8120,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::set::IntoIter" + [] + [ T; A ] [ ("iter", M.call_closure (| @@ -9761,6 +9864,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::set::Iter" + [] + [ T ] [ ("iter", M.call_closure (| @@ -10307,6 +10412,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::btree::set::Iter" + [] + [ T ] [ ("iter", M.call_closure (| @@ -10546,6 +10653,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::btree::set::IntoIter" + [] + [ T; A ] [ ("iter", M.call_closure (| @@ -10598,6 +10707,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::set::Range" + [] + [ T ] [ ("iter", M.call_closure (| @@ -11063,6 +11174,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::btree::set::Range" + [] + [ T ] [ ("iter", M.call_closure (| @@ -11126,6 +11239,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::set::Difference" + [] + [ T; A ] [ ("inner", M.read (| @@ -11170,6 +11285,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::set::DifferenceInner::Stitch" + [] + [ T; A ] [ ("self_iter", M.call_closure (| @@ -11253,6 +11370,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::set::DifferenceInner::Search" + [] + [ T; A ] [ ("self_iter", M.call_closure (| @@ -11301,6 +11420,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::set::DifferenceInner::Iterate" + [] + [ T; A ] [ M.call_closure (| Ty.apply @@ -11615,7 +11736,11 @@ Module collections. |) ] |); - Value.StructTuple "core::cmp::Ordering::Less" []; + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + []; M.closure (fun γ => ltac:(M.monadic @@ -11700,6 +11825,8 @@ Module collections. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -12188,6 +12315,8 @@ Module collections. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -12485,6 +12614,8 @@ Module collections. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| self_len |) ] ] |))) @@ -12568,6 +12699,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructTuple "alloc::collections::btree::set::SymmetricDifference" + [] + [ T ] [ M.call_closure (| Ty.apply @@ -12867,6 +13000,8 @@ Module collections. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -12966,6 +13101,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::set::Intersection" + [] + [ T; A ] [ ("inner", M.read (| @@ -13010,6 +13147,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::set::IntersectionInner::Stitch" + [] + [ T; A ] [ ("a", M.call_closure (| @@ -13083,6 +13222,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::btree::set::IntersectionInner::Search" + [] + [ T; A ] [ ("small_iter", M.call_closure (| @@ -13131,6 +13272,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::btree::set::IntersectionInner::Answer" + [] + [ T; A ] [ M.read (| M.deref (| M.read (| answer |) |) |) ] |))) ] @@ -13826,6 +13969,8 @@ Module collections. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -14044,6 +14189,8 @@ Module collections. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -14168,6 +14315,8 @@ Module collections. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -14236,6 +14385,8 @@ Module collections. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -14277,6 +14428,8 @@ Module collections. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))); @@ -14301,6 +14454,8 @@ Module collections. Value.Integer IntegerKind.Usize 1; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 1 ] ] |))) @@ -14384,6 +14539,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructTuple "alloc::collections::btree::set::Union" + [] + [ T ] [ M.call_closure (| Ty.apply @@ -14604,6 +14761,8 @@ Module collections. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -14704,6 +14863,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::set::Cursor" + [] + [ K ] [ ("inner", M.call_closure (| @@ -16028,6 +16189,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::set::Cursor" + [] + [ T ] [ ("inner", M.call_closure (| @@ -16083,6 +16246,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::set::CursorMutKey" + [] + [ T; A ] [ ("inner", M.call_closure (| @@ -16156,7 +16321,7 @@ Module collections. |) |); M.read (| value |); - Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] + Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -16206,7 +16371,7 @@ Module collections. |) |); M.read (| value |); - Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] + Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -16262,7 +16427,7 @@ Module collections. |) |); M.read (| value |); - Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] + Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -16315,7 +16480,7 @@ Module collections. |) |); M.read (| value |); - Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] + Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -17124,6 +17289,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::set::Cursor" + [] + [ T ] [ ("inner", M.call_closure (| @@ -17198,7 +17365,7 @@ Module collections. |) |); M.read (| value |); - Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] + Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -17248,7 +17415,7 @@ Module collections. |) |); M.read (| value |); - Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] + Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -17304,7 +17471,7 @@ Module collections. |) |); M.read (| value |); - Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] + Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -17357,7 +17524,7 @@ Module collections. |) |); M.read (| value |); - Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] + Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/alloc/collections/btree/set/entry.v b/CoqOfRust/alloc/collections/btree/set/entry.v index 110c2aa56..239fbc783 100644 --- a/CoqOfRust/alloc/collections/btree/set/entry.v +++ b/CoqOfRust/alloc/collections/btree/set/entry.v @@ -1001,7 +1001,7 @@ Module collections. "inner" |) |); - Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] + Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] [] [] ] |) |) in @@ -1034,6 +1034,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::btree::set::entry::OccupiedEntry" + [] + [ T; A ] [ ("inner", M.call_closure (| @@ -1058,7 +1060,7 @@ Module collections. "inner" |) |); - Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] + Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] [] [] ] |)) ])) diff --git a/CoqOfRust/alloc/collections/btree/set_val.v b/CoqOfRust/alloc/collections/btree/set_val.v index dc6f50c92..ea09e80a4 100644 --- a/CoqOfRust/alloc/collections/btree/set_val.v +++ b/CoqOfRust/alloc/collections/btree/set_val.v @@ -118,7 +118,7 @@ Module collections. ltac:(M.monadic (let self := M.alloc (| self |) in let other := M.alloc (| other |) in - Value.StructTuple "core::cmp::Ordering::Equal" [])) + Value.StructTuple "core::cmp::Ordering::Equal" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -143,7 +143,9 @@ Module collections. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ])) + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -189,7 +191,7 @@ Module collections. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [])) + Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -209,7 +211,8 @@ Module collections. Definition default (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with | [], [], [] => - ltac:(M.monadic (Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [])) + ltac:(M.monadic + (Value.StructTuple "alloc::collections::btree::set_val::SetValZST" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/alloc/collections/btree/split.v b/CoqOfRust/alloc/collections/btree/split.v index af945c91d..51d7a8ba0 100644 --- a/CoqOfRust/alloc/collections/btree/split.v +++ b/CoqOfRust/alloc/collections/btree/split.v @@ -352,6 +352,8 @@ Module collections. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -395,6 +397,11 @@ Module collections. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -634,6 +641,8 @@ Module collections. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -677,6 +686,11 @@ Module collections. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -1546,6 +1560,8 @@ Module collections. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| height |)) diff --git a/CoqOfRust/alloc/collections/linked_list.v b/CoqOfRust/alloc/collections/linked_list.v index 112baeb86..5416ebf69 100644 --- a/CoqOfRust/alloc/collections/linked_list.v +++ b/CoqOfRust/alloc/collections/linked_list.v @@ -277,6 +277,8 @@ Module collections. [ Value.StructRecord "alloc::collections::linked_list::LinkedList" + [] + [ T; Ty.path "alloc::alloc::Global" ] [ ("head", M.read (| @@ -305,10 +307,26 @@ Module collections. ("alloc", Value.StructTuple "alloc::alloc::Global" + [] + [] []); ("marker", Value.StructTuple "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::linked_list::Node") + [] + [ T ]; + Ty.path "alloc::alloc::Global" + ] + ] []) ] ] @@ -374,7 +392,7 @@ Module collections. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "alloc::collections::linked_list::Iter" [])) + Value.StructTuple "alloc::collections::linked_list::Iter" [] [ T ] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -589,6 +607,8 @@ Module collections. [ Value.StructRecord "alloc::collections::linked_list::LinkedList" + [] + [ T; Ty.path "alloc::alloc::Global" ] [ ("head", M.read (| @@ -617,10 +637,26 @@ Module collections. ("alloc", Value.StructTuple "alloc::alloc::Global" + [] + [] []); ("marker", Value.StructTuple "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::linked_list::Node") + [] + [ T ]; + Ty.path "alloc::alloc::Global" + ] + ] []) ] ] @@ -694,6 +730,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::linked_list::IntoIter" + [] + [ T; A ] [ ("list", M.call_closure (| @@ -849,9 +887,31 @@ Module collections. (let element := M.alloc (| element |) in Value.StructRecord "alloc::collections::linked_list::Node" + [] + [ T ] [ - ("next", Value.StructTuple "core::option::Option::None" []); - ("prev", Value.StructTuple "core::option::Option::None" []); + ("next", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ] ] + ] + []); + ("prev", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ] ] + ] + []); ("element", M.read (| element |)) ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -994,7 +1054,16 @@ Module collections. "alloc::collections::linked_list::Node", "prev" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ] ] + ] + [] |) |) in let~ node : @@ -1013,7 +1082,16 @@ Module collections. ] ] := M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| node |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ] ] + ] + [ M.read (| node |) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.match_operator (| @@ -1380,7 +1458,22 @@ Module collections. "alloc::collections::linked_list::LinkedList", "tail" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::linked_list::Node") + [] + [ T ] + ] + ] + [] |) |))); fun γ => @@ -1428,7 +1521,22 @@ Module collections. "alloc::collections::linked_list::Node", "prev" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::linked_list::Node") + [] + [ T ] + ] + ] + [] |) |))) ] @@ -1526,7 +1634,16 @@ Module collections. "alloc::collections::linked_list::Node", "next" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ] ] + ] + [] |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -1580,7 +1697,16 @@ Module collections. ] ] := M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| node |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ] ] + ] + [ M.read (| node |) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.match_operator (| @@ -1947,7 +2073,22 @@ Module collections. "alloc::collections::linked_list::LinkedList", "head" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::linked_list::Node") + [] + [ T ] + ] + ] + [] |) |))); fun γ => @@ -1995,7 +2136,22 @@ Module collections. "alloc::collections::linked_list::Node", "next" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path + "alloc::collections::linked_list::Node") + [] + [ T ] + ] + ] + [] |) |))) ] @@ -2394,6 +2550,18 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ] + ] + ] [ M.read (| splice_start |) ] |) |) in @@ -2410,6 +2578,18 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ] + ] + ] [ M.read (| splice_start |) ] |) |) in @@ -2468,6 +2648,18 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ] + ] + ] [ M.read (| splice_end |) ] |) |) in @@ -2484,6 +2676,18 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ] + ] + ] [ M.read (| splice_end |) ] |) |) in @@ -2827,11 +3031,65 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ] + ]; + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ] + ]; + Ty.path "usize" + ] + ] [ Value.Tuple [ M.read (| head |); M.read (| tail |); M.read (| len |) ] ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ] + ]; + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ] + ]; + Ty.path "usize" + ] + ] + [] + |))) ] |) |))) @@ -3053,7 +3311,21 @@ Module collections. "alloc::collections::linked_list::Node", "next" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ] + ] + ] + [] |) |) in M.alloc (| Value.Tuple [] |) in @@ -3077,7 +3349,21 @@ Module collections. M.alloc (| M.write (| first_part_head, - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ] + ] + ] + [] |) |) in M.alloc (| Value.Tuple [] |))) @@ -3096,6 +3382,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::linked_list::LinkedList" + [] + [ T; A ] [ ("head", M.read (| first_part_head |)); ("tail", M.read (| first_part_tail |)); @@ -3123,7 +3411,23 @@ Module collections. |) ] |)); - ("marker", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ]; + A + ] + ] + []) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -3136,6 +3440,18 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ] + ] + ] [ M.read (| split_node |) ] |) |) in @@ -3448,7 +3764,21 @@ Module collections. "alloc::collections::linked_list::Node", "prev" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ] + ] + ] + [] |) |) in M.alloc (| Value.Tuple [] |) in @@ -3472,7 +3802,21 @@ Module collections. M.alloc (| M.write (| second_part_tail, - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ] + ] + ] + [] |) |) in M.alloc (| Value.Tuple [] |))) @@ -3491,6 +3835,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::linked_list::LinkedList" + [] + [ T; A ] [ ("head", M.read (| second_part_head |)); ("tail", M.read (| second_part_tail |)); @@ -3532,7 +3878,23 @@ Module collections. |) ] |)); - ("marker", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ]; + A + ] + ] + []) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -3545,6 +3907,18 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ] + ] + ] [ M.read (| split_node |) ] |) |) in @@ -3646,12 +4020,44 @@ Module collections. (let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::collections::linked_list::LinkedList" + [] + [ T; A ] [ - ("head", Value.StructTuple "core::option::Option::None" []); - ("tail", Value.StructTuple "core::option::Option::None" []); + ("head", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ] ] + ] + []); + ("tail", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ] ] + ] + []); ("len", Value.Integer IntegerKind.Usize 0); ("alloc", M.read (| alloc |)); - ("marker", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ]; A ] + ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3675,6 +4081,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::linked_list::Iter" + [] + [ T ] [ ("head", M.read (| @@ -3700,7 +4108,17 @@ Module collections. "len" |) |)); - ("marker", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ] ] + ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3724,6 +4142,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::linked_list::IterMut" + [] + [ T ] [ ("head", M.read (| @@ -3749,7 +4169,17 @@ Module collections. "len" |) |)); - ("marker", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ] ] + ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3778,6 +4208,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::linked_list::Cursor" + [] + [ T; A ] [ ("index", Value.Integer IntegerKind.Usize 0); ("current", @@ -3817,6 +4249,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::linked_list::CursorMut" + [] + [ T; A ] [ ("index", Value.Integer IntegerKind.Usize 0); ("current", @@ -3856,6 +4290,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::linked_list::Cursor" + [] + [ T; A ] [ ("index", M.call_closure (| @@ -3921,6 +4357,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::linked_list::CursorMut" + [] + [ T; A ] [ ("index", M.call_closure (| @@ -4079,6 +4517,8 @@ Module collections. [ Value.StructRecord "alloc::collections::linked_list::LinkedList" + [] + [ T; Ty.apply (Ty.path "&") [] [ A ] ] [ ("head", M.call_closure (| @@ -4201,7 +4641,23 @@ Module collections. "alloc" |) |)); - ("marker", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ]; + Ty.apply (Ty.path "&") [] [ A ] + ] + ] + []) ] ] |) @@ -5976,6 +6432,8 @@ Module collections. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -6165,6 +6623,8 @@ Module collections. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -6525,6 +6985,8 @@ Module collections. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| at_ |)) @@ -6692,6 +7154,8 @@ Module collections. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| offset_from_end |)) @@ -7163,6 +7627,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::linked_list::ExtractIf" + [] + [ T; F; A ] [ ("list", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |)); ("it", M.read (| it |)); @@ -7247,12 +7713,47 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::linked_list::LinkedList" + [] + [ T; Ty.path "alloc::alloc::Global" ] [ - ("head", Value.StructTuple "core::option::Option::None" []); - ("tail", Value.StructTuple "core::option::Option::None" []); + ("head", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ] ] + ] + []); + ("tail", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ] ] + ] + []); ("len", Value.Integer IntegerKind.Usize 0); - ("alloc", Value.StructTuple "alloc::alloc::Global" []); - ("marker", Value.StructTuple "core::marker::PhantomData" []) + ("alloc", Value.StructTuple "alloc::alloc::Global" [] [] []); + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ]; + Ty.path "alloc::alloc::Global" + ] + ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -7430,6 +7931,18 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ] + ] + ] [ M.read (| other_head |) ] |) |) in @@ -7471,6 +7984,18 @@ Module collections. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ] + ] + ] [ M.read (| tail |) ] |) |) in @@ -7633,6 +8158,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::linked_list::drop::DropGuard" + [] + [ T; A ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -7828,7 +8355,13 @@ Module collections. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -8054,6 +8587,8 @@ Module collections. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -8165,7 +8700,13 @@ Module collections. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -8423,9 +8964,31 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::linked_list::Iter" + [] + [ T ] [ - ("head", Value.StructTuple "core::option::Option::None" []); - ("tail", Value.StructTuple "core::option::Option::None" []); + ("head", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ] ] + ] + []); + ("tail", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ] ] + ] + []); ("len", Value.Integer IntegerKind.Usize 0); ("marker", M.call_closure (| @@ -8533,7 +9096,13 @@ Module collections. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -8764,6 +9333,8 @@ Module collections. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -8879,7 +9450,13 @@ Module collections. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -9142,9 +9719,31 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::linked_list::IterMut" + [] + [ T ] [ - ("head", Value.StructTuple "core::option::Option::None" []); - ("tail", Value.StructTuple "core::option::Option::None" []); + ("head", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ] ] + ] + []); + ("tail", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ] ] + ] + []); ("len", Value.Integer IntegerKind.Usize 0); ("marker", M.call_closure (| @@ -9266,6 +9865,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::linked_list::Cursor" + [] + [ T; A ] [ ("index", M.read (| index |)); ("current", M.read (| current |)); @@ -9762,6 +10363,8 @@ Module collections. (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -11148,6 +11751,8 @@ Module collections. (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -12292,6 +12897,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::linked_list::Cursor" + [] + [ T; A ] [ ("list", M.borrow (| @@ -13354,6 +13961,8 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -13666,7 +14275,17 @@ Module collections. "alloc::collections::linked_list::Node", "prev" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ] + ] + ] + [] |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -13704,23 +14323,62 @@ Module collections. "alloc::collections::linked_list::Node", "next" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::Node") [] [ T ] + ] + ] + [] |) |) in M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "alloc::collections::linked_list::LinkedList") [] [ T; A ] + ] [ Value.StructRecord "alloc::collections::linked_list::LinkedList" + [] + [ T; A ] [ ("head", Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ] + ] + ] [ M.read (| unlinked_node |) ]); ("tail", Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ] + ] + ] [ M.read (| unlinked_node |) ]); ("len", Value.Integer IntegerKind.Usize 1); ("alloc", @@ -13754,7 +14412,23 @@ Module collections. |) ] |)); - ("marker", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ]; + A + ] + ] + []) ] ] |) @@ -14312,7 +14986,7 @@ Module collections. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))); fun γ => ltac:(M.monadic (let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -14544,7 +15218,7 @@ Module collections. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))); fun γ => ltac:(M.monadic (let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -14639,7 +15313,21 @@ Module collections. "alloc::collections::linked_list::CursorMut", "current" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ + Ty.apply + (Ty.path "alloc::collections::linked_list::Node") + [] + [ T ] + ] + ] + [] |) |) in M.alloc (| Value.Tuple [] |))); @@ -15907,6 +16595,8 @@ Module collections. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -16018,7 +16708,7 @@ Module collections. ] |))) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -16045,6 +16735,8 @@ Module collections. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -16250,6 +16942,8 @@ Module collections. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -16530,6 +17224,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::linked_list::IntoIter" + [] + [ T; A ] [ ("list", M.read (| self |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/alloc/collections/mod.v b/CoqOfRust/alloc/collections/mod.v index d14279e6e..85f4f9ce5 100644 --- a/CoqOfRust/alloc/collections/mod.v +++ b/CoqOfRust/alloc/collections/mod.v @@ -21,6 +21,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::TryReserveError" + [] + [] [ ("kind", M.call_closure (| @@ -315,6 +317,8 @@ Module collections. Value.StructTuple "alloc::collections::TryReserveErrorKind::CapacityOverflow" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -336,6 +340,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::TryReserveErrorKind::AllocError" + [] + [] [ ("layout", M.call_closure (| @@ -712,7 +718,11 @@ Module collections. | [], [], [ kind ] => ltac:(M.monadic (let kind := M.alloc (| kind |) in - Value.StructRecord "alloc::collections::TryReserveError" [ ("kind", M.read (| kind |)) ])) + Value.StructRecord + "alloc::collections::TryReserveError" + [] + [] + [ ("kind", M.read (| kind |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -746,6 +756,8 @@ Module collections. ltac:(M.monadic (Value.StructTuple "alloc::collections::TryReserveErrorKind::CapacityOverflow" + [] + [] [])) ] |))) diff --git a/CoqOfRust/alloc/collections/vec_deque/drain.v b/CoqOfRust/alloc/collections/vec_deque/drain.v index 881ee0a35..153419782 100644 --- a/CoqOfRust/alloc/collections/vec_deque/drain.v +++ b/CoqOfRust/alloc/collections/vec_deque/drain.v @@ -93,6 +93,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::vec_deque::drain::Drain" + [] + [ T; A ] [ ("deque", M.call_closure (| @@ -138,7 +140,12 @@ Module collections. ("idx", M.read (| drain_start |)); ("new_len", M.read (| new_len |)); ("remaining", M.read (| drain_len |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + []) ] |) |))) @@ -230,6 +237,8 @@ Module collections. M.alloc (| Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -772,6 +781,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::vec_deque::drain::drop::DropGuard" + [] + [ T; A ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -1066,7 +1077,7 @@ Module collections. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ T ] [] |) |) |) @@ -1175,6 +1186,8 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.call_closure (| T, @@ -1268,7 +1281,11 @@ Module collections. Value.Tuple [ M.read (| len |); - Value.StructTuple "core::option::Option::Some" [ M.read (| len |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| len |) ] ] |) |))) @@ -1349,7 +1366,7 @@ Module collections. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ T ] [] |) |) |) @@ -1454,6 +1471,8 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.call_closure (| T, diff --git a/CoqOfRust/alloc/collections/vec_deque/into_iter.v b/CoqOfRust/alloc/collections/vec_deque/into_iter.v index 77221b5ec..33dc852dc 100644 --- a/CoqOfRust/alloc/collections/vec_deque/into_iter.v +++ b/CoqOfRust/alloc/collections/vec_deque/into_iter.v @@ -26,6 +26,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::vec_deque::into_iter::IntoIter" + [] + [ T; A ] [ ("inner", M.call_closure (| @@ -86,6 +88,8 @@ Module collections. (let inner := M.alloc (| inner |) in Value.StructRecord "alloc::collections::vec_deque::into_iter::IntoIter" + [] + [ T; A ] [ ("inner", M.read (| inner |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -308,7 +312,11 @@ Module collections. Value.Tuple [ M.read (| len |); - Value.StructTuple "core::option::Option::Some" [ M.read (| len |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| len |) ] ] |) |))) @@ -447,6 +455,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| n |)) ] ] |) @@ -509,8 +519,21 @@ Module collections. |), [ M.read (| rem |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) @@ -615,6 +638,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::vec_deque::into_iter::try_fold::Guard" + [] + [ T; A ] [ ("deque", M.borrow (| @@ -1174,6 +1199,8 @@ Module collections. (let item := M.copy (| γ |) in Value.StructTuple "core::result::Result::Ok" + [] + [ B; Ty.path "never" ] [ M.call_closure (| B, @@ -1591,6 +1618,14 @@ Module collections. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "array") [ N ] [ T ]; + Ty.apply + (Ty.path "core::array::iter::IntoIter") + [ N ] + [ T ] + ] [ M.call_closure (| Ty.apply (Ty.path "array") [ N ] [ T ], @@ -1873,6 +1908,14 @@ Module collections. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "array") [ N ] [ T ]; + Ty.apply + (Ty.path "core::array::iter::IntoIter") + [ N ] + [ T ] + ] [ M.call_closure (| Ty.apply (Ty.path "array") [ N ] [ T ], @@ -2056,6 +2099,14 @@ Module collections. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "array") [ N ] [ T ]; + Ty.apply + (Ty.path "core::array::iter::IntoIter") + [ N ] + [ T ] + ] [ M.call_closure (| Ty.apply @@ -2075,6 +2126,8 @@ Module collections. M.read (| raw_arr |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| init |)) @@ -2334,8 +2387,21 @@ Module collections. |), [ M.read (| rem |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) @@ -2412,6 +2478,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::vec_deque::into_iter::try_rfold::Guard" + [] + [ T; A ] [ ("deque", M.borrow (| @@ -2971,6 +3039,8 @@ Module collections. (let item := M.copy (| γ |) in Value.StructTuple "core::result::Result::Ok" + [] + [ B; Ty.path "never" ] [ M.call_closure (| B, diff --git a/CoqOfRust/alloc/collections/vec_deque/iter.v b/CoqOfRust/alloc/collections/vec_deque/iter.v index 5f5f0b269..7caaffaef 100644 --- a/CoqOfRust/alloc/collections/vec_deque/iter.v +++ b/CoqOfRust/alloc/collections/vec_deque/iter.v @@ -34,6 +34,8 @@ Module collections. let i2 := M.alloc (| i2 |) in Value.StructRecord "alloc::collections::vec_deque::iter::Iter" + [] + [ T ] [ ("i1", M.read (| i1 |)); ("i2", M.read (| i2 |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -305,6 +307,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::vec_deque::iter::Iter" + [] + [ T ] [ ("i1", M.call_closure (| @@ -365,6 +369,8 @@ Module collections. (let self := M.alloc (| self |) in Value.StructRecord "alloc::collections::vec_deque::iter::Iter" + [] + [ T ] [ ("i1", M.call_closure (| @@ -506,6 +512,8 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| val |) |) |) ] |))); fun γ => @@ -676,7 +684,17 @@ Module collections. 0 |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] + [ Value.Tuple [] ] |))); fun γ => ltac:(M.monadic @@ -811,7 +829,11 @@ Module collections. Value.Tuple [ M.read (| len |); - Value.StructTuple "core::option::Option::Some" [ M.read (| len |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| len |) ] ] |) |))) @@ -1303,6 +1325,8 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| val |) |) |) ] |))); fun γ => @@ -1458,7 +1482,17 @@ Module collections. 0 |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] + [ Value.Tuple [] ] |))); fun γ => ltac:(M.monadic diff --git a/CoqOfRust/alloc/collections/vec_deque/iter_mut.v b/CoqOfRust/alloc/collections/vec_deque/iter_mut.v index df14bc816..d862cf7a6 100644 --- a/CoqOfRust/alloc/collections/vec_deque/iter_mut.v +++ b/CoqOfRust/alloc/collections/vec_deque/iter_mut.v @@ -34,6 +34,8 @@ Module collections. let i2 := M.alloc (| i2 |) in Value.StructRecord "alloc::collections::vec_deque::iter_mut::IterMut" + [] + [ T ] [ ("i1", M.read (| i1 |)); ("i2", M.read (| i2 |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -455,6 +457,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::vec_deque::iter_mut::IterMut" + [] + [ T ] [ ("i1", M.call_closure (| @@ -578,6 +582,8 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| val |) |) |) ] |))); fun γ => @@ -733,7 +739,17 @@ Module collections. 0 |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] + [ Value.Tuple [] ] |))); fun γ => ltac:(M.monadic @@ -871,7 +887,11 @@ Module collections. Value.Tuple [ M.read (| len |); - Value.StructTuple "core::option::Option::Some" [ M.read (| len |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| len |) ] ] |) |))) @@ -1407,6 +1427,8 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| val |) |) |) ] |))); fun γ => @@ -1562,7 +1584,17 @@ Module collections. 0 |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] + [ Value.Tuple [] ] |))); fun γ => ltac:(M.monadic diff --git a/CoqOfRust/alloc/collections/vec_deque/macros.v b/CoqOfRust/alloc/collections/vec_deque/macros.v index a3c5ec169..98fcc1b24 100644 --- a/CoqOfRust/alloc/collections/vec_deque/macros.v +++ b/CoqOfRust/alloc/collections/vec_deque/macros.v @@ -154,7 +154,7 @@ Module collections. Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -407,7 +407,7 @@ Module collections. M.read (| M.deref (| M.read (| other |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -661,7 +661,7 @@ Module collections. M.read (| M.deref (| M.read (| other |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -919,7 +919,7 @@ Module collections. Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1180,7 +1180,7 @@ Module collections. M.read (| M.deref (| M.read (| other |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1442,7 +1442,7 @@ Module collections. M.read (| M.deref (| M.read (| other |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) diff --git a/CoqOfRust/alloc/collections/vec_deque/mod.v b/CoqOfRust/alloc/collections/vec_deque/mod.v index 3fe6bde20..c0262f53e 100644 --- a/CoqOfRust/alloc/collections/vec_deque/mod.v +++ b/CoqOfRust/alloc/collections/vec_deque/mod.v @@ -324,6 +324,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::vec_deque::drop::Dropper" + [] + [ T ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| back |) |) |) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -3892,6 +3894,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::vec_deque::write_iter_wrapping::Guard" + [] + [ T; A ] [ ("deque", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |)); @@ -4025,6 +4029,8 @@ Module collections. [ Value.StructTuple "core::iter::adapters::by_ref_sized::ByRefSized" + [] + [ impl_Iterator_Item___T_ ] [ M.borrow (| Pointer.Kind.MutRef, @@ -4569,6 +4575,8 @@ Module collections. (let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::collections::vec_deque::VecDeque" + [] + [ T; A ] [ ("head", Value.Integer IntegerKind.Usize 0); ("len", Value.Integer IntegerKind.Usize 0); @@ -4612,6 +4620,8 @@ Module collections. let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::collections::vec_deque::VecDeque" + [] + [ T; A ] [ ("head", Value.Integer IntegerKind.Usize 0); ("len", Value.Integer IntegerKind.Usize 0); @@ -4803,6 +4813,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::vec_deque::VecDeque" + [] + [ T; A ] [ ("head", M.read (| @@ -4928,6 +4940,8 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -4973,7 +4987,13 @@ Module collections. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |))) ] |) |))) @@ -5059,6 +5079,8 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -5104,7 +5126,13 @@ Module collections. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + [] + |))) ] |) |))) @@ -5802,6 +5830,8 @@ Module collections. Value.StructTuple "alloc::collections::TryReserveErrorKind::CapacityOverflow" [] + [] + [] ] |) ] @@ -6060,7 +6090,13 @@ Module collections. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "alloc::collections::TryReserveError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6179,6 +6215,8 @@ Module collections. Value.StructTuple "alloc::collections::TryReserveErrorKind::CapacityOverflow" [] + [] + [] ] |) ] @@ -6437,7 +6475,13 @@ Module collections. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "alloc::collections::TryReserveError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7163,6 +7207,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::vec_deque::shrink_to::Guard" + [] + [ T; A ] [ ("deque", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |)); @@ -7901,6 +7947,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| begin |)) ] ] |) @@ -7992,6 +8040,8 @@ Module collections. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| len |)) ] ] |) @@ -8024,6 +8074,8 @@ Module collections. M.alloc (| Value.StructTuple "alloc::collections::vec_deque::truncate::Dropper" + [] + [ T ] [ M.borrow (| Pointer.Kind.MutRef, @@ -8328,7 +8380,7 @@ Module collections. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" []; + Value.StructTuple "core::ops::range::RangeFull" [] [] []; M.read (| M.SubPointer.get_struct_record_field (| M.deref (| M.read (| self |) |), @@ -8473,7 +8525,7 @@ Module collections. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" []; + Value.StructTuple "core::ops::range::RangeFull" [] [] []; M.read (| M.SubPointer.get_struct_record_field (| M.deref (| M.read (| self |) |), @@ -8696,7 +8748,11 @@ Module collections. M.get_function (| "core::slice::index::range", [], [ R ] |), [ M.read (| range |); - Value.StructRecord "core::ops::range::RangeTo" [ ("end_", M.read (| len |)) ] + Value.StructRecord + "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] + [ ("end_", M.read (| len |)) ] ] |) |), @@ -8756,12 +8812,16 @@ Module collections. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", Value.Integer IntegerKind.Usize 0) ]; Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", Value.Integer IntegerKind.Usize 0) @@ -8860,6 +8920,8 @@ Module collections. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| wrapped_start |)); ("end_", @@ -8871,6 +8933,8 @@ Module collections. ]; Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", Value.Integer IntegerKind.Usize 0) @@ -8893,6 +8957,8 @@ Module collections. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| wrapped_start |)); ("end_", @@ -8918,6 +8984,8 @@ Module collections. ]; Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| tail_len |)) @@ -9363,6 +9431,8 @@ Module collections. M.read (| range |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -9778,7 +9848,7 @@ Module collections. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))); fun γ => ltac:(M.monadic (let~ old_head : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -9875,6 +9945,8 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.call_closure (| T, @@ -9950,7 +10022,7 @@ Module collections. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))); fun γ => ltac:(M.monadic (let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -10013,6 +10085,8 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.call_closure (| T, @@ -10521,7 +10595,11 @@ Module collections. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ T ] + [] |) |) |) @@ -10676,7 +10754,11 @@ Module collections. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ T ] + [] |) |) |) @@ -11210,7 +11292,9 @@ Module collections. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple "core::option::Option::None" [] [ T ] [] + |) |) |) |))); @@ -11241,6 +11325,8 @@ Module collections. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.call_closure (| T, @@ -13876,6 +13962,8 @@ Module collections. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| free |)); ("end_", @@ -14055,6 +14143,8 @@ Module collections. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer @@ -15120,6 +15210,8 @@ Module collections. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "usize"; Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -15877,6 +15969,8 @@ Module collections. ltac:(M.monadic (Value.StructRecord "alloc::collections::vec_deque::VecDeque" + [] + [ T; Ty.path "alloc::alloc::Global" ] [ ("head", Value.Integer IntegerKind.Usize 0); ("len", Value.Integer IntegerKind.Usize 0); @@ -15937,7 +16031,7 @@ Module collections. [], [] |), - [ M.read (| capacity |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| capacity |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -15978,9 +16072,19 @@ Module collections. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::collections::vec_deque::VecDeque") + [] + [ T; Ty.path "alloc::alloc::Global" ]; + Ty.path "alloc::collections::TryReserveError" + ] [ Value.StructRecord "alloc::collections::vec_deque::VecDeque" + [] + [ T; Ty.path "alloc::alloc::Global" ] [ ("head", Value.Integer IntegerKind.Usize 0); ("len", Value.Integer IntegerKind.Usize 0); @@ -16055,7 +16159,7 @@ Module collections. |), [ M.read (| capacity |); - Value.StructTuple "alloc::alloc::Global" [] + Value.StructTuple "alloc::alloc::Global" [] [] [] ] |) ] @@ -16964,6 +17068,8 @@ Module collections. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -17012,6 +17118,11 @@ Module collections. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -17230,6 +17341,8 @@ Module collections. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -17278,6 +17391,11 @@ Module collections. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -17496,6 +17614,8 @@ Module collections. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -17544,6 +17664,11 @@ Module collections. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -18060,6 +18185,8 @@ Module collections. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -18108,6 +18235,11 @@ Module collections. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -18326,6 +18458,8 @@ Module collections. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -18374,6 +18508,11 @@ Module collections. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -18592,6 +18731,8 @@ Module collections. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -18640,6 +18781,11 @@ Module collections. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -20060,6 +20206,8 @@ Module collections. M.alloc (| Value.StructRecord "alloc::collections::vec_deque::VecDeque" + [] + [ T; A ] [ ("head", Value.Integer IntegerKind.Usize 0); ("len", M.read (| len |)); diff --git a/CoqOfRust/alloc/collections/vec_deque/spec_extend.v b/CoqOfRust/alloc/collections/vec_deque/spec_extend.v index 6929582f1..2a2c139fc 100644 --- a/CoqOfRust/alloc/collections/vec_deque/spec_extend.v +++ b/CoqOfRust/alloc/collections/vec_deque/spec_extend.v @@ -500,6 +500,8 @@ Module collections. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -542,6 +544,11 @@ Module collections. |); Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::fmt::Arguments" + ] [ M.call_closure (| Ty.path @@ -806,6 +813,8 @@ Module collections. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -848,6 +857,11 @@ Module collections. |); Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::fmt::Arguments" + ] [ M.call_closure (| Ty.path diff --git a/CoqOfRust/alloc/ffi/c_str.v b/CoqOfRust/alloc/ffi/c_str.v index e0a3971cb..37509a13e 100644 --- a/CoqOfRust/alloc/ffi/c_str.v +++ b/CoqOfRust/alloc/ffi/c_str.v @@ -328,6 +328,8 @@ Module ffi. (let self := M.alloc (| self |) in Value.StructRecord "alloc::ffi::c_str::CString" + [] + [] [ ("inner", M.call_closure (| @@ -405,6 +407,8 @@ Module ffi. (let self := M.alloc (| self |) in Value.StructTuple "alloc::ffi::c_str::NulError" + [] + [] [ M.call_closure (| Ty.path "usize", @@ -742,6 +746,8 @@ Module ffi. M.alloc (| Value.StructTuple "alloc::ffi::c_str::FromBytesWithNulErrorKind::InteriorNul" + [] + [] [ M.call_closure (| Ty.path "usize", @@ -771,6 +777,8 @@ Module ffi. Value.StructTuple "alloc::ffi::c_str::FromBytesWithNulErrorKind::NotNulTerminated" [] + [] + [] |))) ] |) @@ -1068,6 +1076,8 @@ Module ffi. (let self := M.alloc (| self |) in Value.StructRecord "alloc::ffi::c_str::FromVecWithNulError" + [] + [] [ ("error_kind", M.call_closure (| @@ -1407,7 +1417,7 @@ Module ffi. "bytes" |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1471,6 +1481,8 @@ Module ffi. (let self := M.alloc (| self |) in Value.StructRecord "alloc::ffi::c_str::IntoStringError" + [] + [] [ ("inner", M.call_closure (| @@ -2044,6 +2056,8 @@ Module ffi. M.alloc (| Value.StructRecord "alloc::ffi::c_str::CString" + [] + [] [ ("inner", M.call_closure (| @@ -2139,6 +2153,8 @@ Module ffi. M.alloc (| Value.StructRecord "alloc::ffi::c_str::CString" + [] + [] [ ("inner", M.call_closure (| @@ -2322,6 +2338,8 @@ Module ffi. (let e := M.copy (| γ |) in Value.StructRecord "alloc::ffi::c_str::IntoStringError" + [] + [] [ ("error", M.call_closure (| @@ -2470,6 +2488,8 @@ Module ffi. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ Value.Integer IntegerKind.U8 0 ] |) |) @@ -2541,6 +2561,8 @@ Module ffi. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -2582,6 +2604,8 @@ Module ffi. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -2689,6 +2713,8 @@ Module ffi. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -3184,6 +3210,8 @@ Module ffi. (let v := M.alloc (| v |) in Value.StructRecord "alloc::ffi::c_str::CString" + [] + [] [ ("inner", M.call_closure (| @@ -3338,6 +3366,11 @@ Module ffi. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "alloc::ffi::c_str::CString"; + Ty.path "alloc::ffi::c_str::FromVecWithNulError" + ] [ M.call_closure (| Ty.path "alloc::ffi::c_str::CString", @@ -3363,13 +3396,22 @@ Module ffi. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "alloc::ffi::c_str::CString"; + Ty.path "alloc::ffi::c_str::FromVecWithNulError" + ] [ Value.StructRecord "alloc::ffi::c_str::FromVecWithNulError" + [] + [] [ ("error_kind", Value.StructTuple "alloc::ffi::c_str::FromBytesWithNulErrorKind::InteriorNul" + [] + [] [ M.read (| nul_pos |) ]); ("bytes", M.read (| v |)) ] @@ -3381,13 +3423,22 @@ Module ffi. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "alloc::ffi::c_str::CString"; + Ty.path "alloc::ffi::c_str::FromVecWithNulError" + ] [ Value.StructRecord "alloc::ffi::c_str::FromVecWithNulError" + [] + [] [ ("error_kind", Value.StructTuple "alloc::ffi::c_str::FromBytesWithNulErrorKind::NotNulTerminated" + [] + [] []); ("bytes", M.read (| v |)) ] @@ -4111,6 +4162,8 @@ Module ffi. M.alloc (| Value.StructRecord "alloc::ffi::c_str::CString" + [] + [] [ ("inner", M.call_closure (| @@ -4510,7 +4563,11 @@ Module ffi. | [], [], [ s ] => ltac:(M.monadic (let s := M.alloc (| s |) in - Value.StructTuple "alloc::borrow::Cow::Owned" [ M.read (| s |) ])) + Value.StructTuple + "alloc::borrow::Cow::Owned" + [] + [ Ty.path "core::ffi::c_str::CStr" ] + [ M.read (| s |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4539,6 +4596,8 @@ Module ffi. (let s := M.alloc (| s |) in Value.StructTuple "alloc::borrow::Cow::Borrowed" + [] + [ Ty.path "core::ffi::c_str::CStr" ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| s |) |) |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4569,6 +4628,8 @@ Module ffi. (let s := M.alloc (| s |) in Value.StructTuple "alloc::borrow::Cow::Borrowed" + [] + [ Ty.path "core::ffi::c_str::CStr" ] [ M.borrow (| Pointer.Kind.Ref, @@ -5890,6 +5951,8 @@ Module ffi. (let self := M.alloc (| self |) in Value.StructRecord "alloc::ffi::c_str::CString" + [] + [] [ ("inner", M.call_closure (| @@ -6389,6 +6452,8 @@ Module ffi. (let self := M.alloc (| self |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] ] [ (* Unsize *) M.pointer_coercion diff --git a/CoqOfRust/alloc/raw_vec.v b/CoqOfRust/alloc/raw_vec.v index 8ee674188..31fc5990c 100644 --- a/CoqOfRust/alloc/raw_vec.v +++ b/CoqOfRust/alloc/raw_vec.v @@ -84,7 +84,7 @@ Module raw_vec. Definition value_ZERO (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.alloc (| - Value.StructTuple "alloc::raw_vec::Cap" [ Value.Integer IntegerKind.Usize 0 ] + Value.StructTuple "alloc::raw_vec::Cap" [] [] [ Value.Integer IntegerKind.Usize 0 ] |))). Global Instance AssociatedConstant_value_ZERO : M.IsAssociatedFunction.C Self "ZERO" value_ZERO. @@ -122,7 +122,9 @@ Module raw_vec. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "alloc::raw_vec::Cap" [ M.read (| cap |) ] |))) + (M.alloc (| + Value.StructTuple "alloc::raw_vec::Cap" [] [] [ M.read (| cap |) ] + |))) ] |) |))) @@ -181,7 +183,7 @@ Module raw_vec. [], [] |), - [ Value.StructTuple "alloc::alloc::Global" [] ] + [ Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -205,6 +207,8 @@ Module raw_vec. (let capacity := M.alloc (| capacity |) in Value.StructRecord "alloc::raw_vec::RawVec" + [] + [ T; Ty.path "alloc::alloc::Global" ] [ ("inner", M.call_closure (| @@ -231,7 +235,7 @@ Module raw_vec. |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ T ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -263,6 +267,8 @@ Module raw_vec. (let capacity := M.alloc (| capacity |) in Value.StructRecord "alloc::raw_vec::RawVec" + [] + [ T; Ty.path "alloc::alloc::Global" ] [ ("inner", M.call_closure (| @@ -281,7 +287,7 @@ Module raw_vec. |), [ M.read (| capacity |); - Value.StructTuple "alloc::alloc::Global" []; + Value.StructTuple "alloc::alloc::Global" [] [] []; M.read (| get_constant (| "core::mem::SizedTypeProperties::LAYOUT", @@ -290,7 +296,7 @@ Module raw_vec. |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ T ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -354,8 +360,8 @@ Module raw_vec. |), [ M.read (| capacity |); - Value.StructTuple "alloc::raw_vec::AllocInit::Uninitialized" []; - Value.StructTuple "alloc::alloc::Global" []; + Value.StructTuple "alloc::raw_vec::AllocInit::Uninitialized" [] [] []; + Value.StructTuple "alloc::alloc::Global" [] [] []; M.read (| elem_layout |) ] |) @@ -507,6 +513,8 @@ Module raw_vec. (let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::raw_vec::RawVec" + [] + [ T; A ] [ ("inner", M.call_closure (| @@ -526,7 +534,7 @@ Module raw_vec. |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ T ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -559,6 +567,8 @@ Module raw_vec. let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::raw_vec::RawVec" + [] + [ T; A ] [ ("inner", M.call_closure (| @@ -580,7 +590,7 @@ Module raw_vec. |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ T ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -661,12 +671,19 @@ Module raw_vec. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "alloc::raw_vec::RawVec") [] [ T; A ]; + Ty.path "alloc::collections::TryReserveError" + ] [ Value.StructRecord "alloc::raw_vec::RawVec" + [] + [ T; A ] [ ("inner", M.read (| inner |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ T ] []) ] ] |))); @@ -675,7 +692,16 @@ Module raw_vec. (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Err", 0 |) in let e := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "alloc::raw_vec::RawVec") [] [ T; A ]; + Ty.path "alloc::collections::TryReserveError" + ] + [ M.read (| e |) ] + |))) ] |) |))) @@ -710,6 +736,8 @@ Module raw_vec. let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::raw_vec::RawVec" + [] + [ T; A ] [ ("inner", M.call_closure (| @@ -731,7 +759,7 @@ Module raw_vec. |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ T ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1097,6 +1125,8 @@ Module raw_vec. M.alloc (| Value.StructRecord "alloc::raw_vec::RawVec" + [] + [ T; A ] [ ("inner", M.call_closure (| @@ -1109,7 +1139,7 @@ Module raw_vec. |), [ M.read (| ptr |); M.read (| capacity |); M.read (| alloc |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ T ] []) ] |) |))) @@ -1174,6 +1204,8 @@ Module raw_vec. M.alloc (| Value.StructRecord "alloc::raw_vec::RawVec" + [] + [ T; A ] [ ("inner", M.call_closure (| @@ -1186,7 +1218,7 @@ Module raw_vec. |), [ M.read (| ptr |); M.read (| capacity |); M.read (| alloc |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ T ] []) ] |) |))) @@ -1772,6 +1804,8 @@ Module raw_vec. M.alloc (| Value.StructRecord "alloc::raw_vec::RawVecInner" + [] + [ A ] [ ("ptr", M.read (| ptr |)); ("cap", @@ -1845,7 +1879,7 @@ Module raw_vec. |), [ M.read (| capacity |); - Value.StructTuple "alloc::raw_vec::AllocInit::Uninitialized" []; + Value.StructTuple "alloc::raw_vec::AllocInit::Uninitialized" [] [] []; M.read (| alloc |); M.read (| elem_layout |) ] @@ -1950,7 +1984,7 @@ Module raw_vec. |), [ M.read (| capacity |); - Value.StructTuple "alloc::raw_vec::AllocInit::Uninitialized" []; + Value.StructTuple "alloc::raw_vec::AllocInit::Uninitialized" [] [] []; M.read (| alloc |); M.read (| elem_layout |) ] @@ -2008,7 +2042,7 @@ Module raw_vec. |), [ M.read (| capacity |); - Value.StructTuple "alloc::raw_vec::AllocInit::Zeroed" []; + Value.StructTuple "alloc::raw_vec::AllocInit::Zeroed" [] [] []; M.read (| alloc |); M.read (| elem_layout |) ] @@ -2152,6 +2186,11 @@ Module raw_vec. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "alloc::raw_vec::RawVecInner") [] [ A ]; + Ty.path "alloc::collections::TryReserveError" + ] [ M.call_closure (| Ty.path "alloc::collections::TryReserveError", @@ -2168,6 +2207,8 @@ Module raw_vec. Value.StructTuple "alloc::collections::TryReserveErrorKind::CapacityOverflow" [] + [] + [] ] |) ] @@ -2214,6 +2255,11 @@ Module raw_vec. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "alloc::raw_vec::RawVecInner") [] [ A ]; + Ty.path "alloc::collections::TryReserveError" + ] [ M.call_closure (| Ty.apply (Ty.path "alloc::raw_vec::RawVecInner") [] [ A ], @@ -2285,7 +2331,14 @@ Module raw_vec. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::result::Result::Err" [ M.read (| err |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "alloc::raw_vec::RawVecInner") [] [ A ]; + Ty.path "alloc::collections::TryReserveError" + ] + [ M.read (| err |) ] |) |) |) @@ -2437,6 +2490,11 @@ Module raw_vec. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "alloc::raw_vec::RawVecInner") [] [ A ]; + Ty.path "alloc::collections::TryReserveError" + ] [ M.call_closure (| Ty.path "alloc::collections::TryReserveError", @@ -2452,6 +2510,8 @@ Module raw_vec. [ Value.StructRecord "alloc::collections::TryReserveErrorKind::AllocError" + [] + [] [ ("layout", M.read (| layout |)); ("non_exhaustive", Value.Tuple []) @@ -2469,9 +2529,16 @@ Module raw_vec. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "alloc::raw_vec::RawVecInner") [] [ A ]; + Ty.path "alloc::collections::TryReserveError" + ] [ Value.StructRecord "alloc::raw_vec::RawVecInner" + [] + [ A ] [ ("ptr", M.call_closure (| @@ -2510,7 +2577,11 @@ Module raw_vec. ] |)); ("cap", - Value.StructTuple "alloc::raw_vec::Cap" [ M.read (| capacity |) ]); + Value.StructTuple + "alloc::raw_vec::Cap" + [] + [] + [ M.read (| capacity |) ]); ("alloc", M.read (| alloc |)) ] ] @@ -2546,6 +2617,8 @@ Module raw_vec. let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::raw_vec::RawVecInner" + [] + [ A ] [ ("ptr", M.call_closure (| @@ -2590,6 +2663,8 @@ Module raw_vec. let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::raw_vec::RawVecInner" + [] + [ A ] [ ("ptr", M.call_closure (| @@ -2886,7 +2961,19 @@ Module raw_vec. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "core::ptr::non_null::NonNull") [] [ Ty.path "u8" ]; + Ty.path "core::alloc::layout::Layout" + ] + ] + [] + |))); fun γ => ltac:(M.monadic (let~ alloc_size : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -2948,6 +3035,14 @@ Module raw_vec. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "core::ptr::non_null::NonNull") [] [ Ty.path "u8" ]; + Ty.path "core::alloc::layout::Layout" + ] + ] [ Value.Tuple [ @@ -3383,7 +3478,13 @@ Module raw_vec. |) |) in M.alloc (| Value.Tuple [] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "alloc::collections::TryReserveError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3685,7 +3786,13 @@ Module raw_vec. |) |) in M.alloc (| Value.Tuple [] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "alloc::collections::TryReserveError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3891,7 +3998,7 @@ Module raw_vec. "alloc::raw_vec::RawVecInner", "cap" |), - Value.StructTuple "alloc::raw_vec::Cap" [ M.read (| cap |) ] + Value.StructTuple "alloc::raw_vec::Cap" [] [] [ M.read (| cap |) ] |) |) in M.alloc (| Value.Tuple [] |) @@ -4047,6 +4154,8 @@ Module raw_vec. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "alloc::collections::TryReserveError" ] [ M.call_closure (| Ty.path "alloc::collections::TryReserveError", @@ -4063,6 +4172,8 @@ Module raw_vec. Value.StructTuple "alloc::collections::TryReserveErrorKind::CapacityOverflow" [] + [] + [] ] |) ] @@ -4132,6 +4243,8 @@ Module raw_vec. Value.StructTuple "alloc::collections::TryReserveErrorKind::CapacityOverflow" [] + [] + [] ] |) ] @@ -4562,7 +4675,13 @@ Module raw_vec. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "alloc::collections::TryReserveError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4650,6 +4769,8 @@ Module raw_vec. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "alloc::collections::TryReserveError" ] [ M.call_closure (| Ty.path "alloc::collections::TryReserveError", @@ -4666,6 +4787,8 @@ Module raw_vec. Value.StructTuple "alloc::collections::TryReserveErrorKind::CapacityOverflow" [] + [] + [] ] |) ] @@ -4735,6 +4858,8 @@ Module raw_vec. Value.StructTuple "alloc::collections::TryReserveErrorKind::CapacityOverflow" [] + [] + [] ] |) ] @@ -5113,7 +5238,13 @@ Module raw_vec. |) |) in M.alloc (| Value.Tuple [] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "alloc::collections::TryReserveError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5374,7 +5505,11 @@ Module raw_vec. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "alloc::collections::TryReserveError" ] + [ Value.Tuple [] ] |) |) |) @@ -5733,6 +5868,8 @@ Module raw_vec. ltac:(M.monadic (Value.StructRecord "alloc::collections::TryReserveErrorKind::AllocError" + [] + [] [ ("layout", M.read (| new_layout |)); @@ -5840,7 +5977,11 @@ Module raw_vec. ] |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "alloc::collections::TryReserveError" ] + [ Value.Tuple [] ] |))) ] |) @@ -6280,6 +6421,8 @@ Module raw_vec. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -6317,6 +6460,9 @@ Module raw_vec. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" + ] + [] ] |) |) @@ -6496,6 +6642,8 @@ Module raw_vec. [ Value.StructRecord "alloc::collections::TryReserveErrorKind::AllocError" + [] + [] [ ("layout", M.read (| new_layout |)); ("non_exhaustive", Value.Tuple []) @@ -6655,6 +6803,8 @@ Module raw_vec. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "alloc::collections::TryReserveError" ] [ M.call_closure (| Ty.path "alloc::collections::TryReserveError", @@ -6671,13 +6821,21 @@ Module raw_vec. Value.StructTuple "alloc::collections::TryReserveErrorKind::CapacityOverflow" [] + [] + [] ] |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))) + (M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "alloc::collections::TryReserveError" ] + [ Value.Tuple [] ] + |))) ] |) |))) @@ -6834,6 +6992,8 @@ Module raw_vec. Value.StructTuple "alloc::collections::TryReserveErrorKind::CapacityOverflow" [] + [] + [] ] |))) ] diff --git a/CoqOfRust/alloc/rc.v b/CoqOfRust/alloc/rc.v index 63e1c587e..eea6c389b 100644 --- a/CoqOfRust/alloc/rc.v +++ b/CoqOfRust/alloc/rc.v @@ -234,7 +234,7 @@ Module rc. [], [] |), - [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -384,6 +384,8 @@ Module rc. [ Value.StructRecord "alloc::rc::RcInner" + [] + [ T ] [ ("strong", M.call_closure (| @@ -456,7 +458,7 @@ Module rc. [], [ F ] |), - [ M.read (| data_fn |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| data_fn |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -613,7 +615,9 @@ Module rc. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "alloc::alloc::Global" [] |) + M.alloc (| + Value.StructTuple "alloc::alloc::Global" [] [] [] + |) |); M.read (| layout |) ] @@ -792,7 +796,9 @@ Module rc. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "alloc::alloc::Global" [] |) + M.alloc (| + Value.StructTuple "alloc::alloc::Global" [] [] [] + |) |); M.read (| layout |) ] @@ -860,6 +866,11 @@ Module rc. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "alloc::rc::Rc") [] [ T; Ty.path "alloc::alloc::Global" ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply (Ty.path "alloc::rc::Rc") [] [ T; Ty.path "alloc::alloc::Global" ], @@ -1009,6 +1020,8 @@ Module rc. [ Value.StructRecord "alloc::rc::RcInner" + [] + [ T ] [ ("strong", M.call_closure (| @@ -1178,6 +1191,17 @@ Module rc. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::rc::Rc") + [] + [ + Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ]; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -1424,6 +1448,8 @@ Module rc. Value.StructTuple "alloc::alloc::Global" [] + [] + [] |) |); M.read (| layout |) @@ -1588,6 +1614,17 @@ Module rc. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::rc::Rc") + [] + [ + Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ]; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -1834,6 +1871,8 @@ Module rc. Value.StructTuple "alloc::alloc::Global" [] + [] + [] |) |); M.read (| layout |) @@ -2025,7 +2064,7 @@ Module rc. [], [] |), - [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2060,7 +2099,7 @@ Module rc. [], [] |), - [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2095,7 +2134,7 @@ Module rc. [], [] |), - [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2616,6 +2655,8 @@ Module rc. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -2651,6 +2692,8 @@ Module rc. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -2737,7 +2780,19 @@ Module rc. |) |) in M.alloc (| Value.Tuple [] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| inner |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "*mut") + [] + [ Ty.apply (Ty.path "alloc::rc::RcInner") [] [ T ] ]; + Ty.path "core::alloc::AllocError" + ] + [ M.read (| inner |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2951,9 +3006,16 @@ Module rc. let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::rc::Rc" + [] + [ T; A ] [ ("ptr", M.read (| ptr |)); - ("phantom", Value.StructTuple "core::marker::PhantomData" []); + ("phantom", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "alloc::rc::RcInner") [] [ T ] ] + []); ("alloc", M.read (| alloc |)) ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -3044,6 +3106,8 @@ Module rc. M.alloc (| Value.StructRecord "alloc::rc::Weak" + [] + [ T; Ty.apply (Ty.path "&") [] [ A ] ] [ ("ptr", M.read (| @@ -3682,6 +3746,8 @@ Module rc. [ Value.StructRecord "alloc::rc::RcInner" + [] + [ Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ] ] [ ("strong", M.call_closure (| @@ -3861,6 +3927,8 @@ Module rc. M.alloc (| Value.StructRecord "alloc::rc::Weak" + [] + [ T; A ] [ ("ptr", M.read (| init_ptr |)); ("alloc", M.read (| alloc |)) ] |) in let~ data : Ty.apply (Ty.path "*") [] [ T ] := @@ -4051,6 +4119,8 @@ Module rc. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -4086,6 +4156,8 @@ Module rc. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::fmt::Arguments" ] [ M.call_closure (| Ty.path @@ -4336,6 +4408,8 @@ Module rc. [ Value.StructRecord "alloc::rc::RcInner" + [] + [ T ] [ ("strong", M.call_closure (| @@ -4456,6 +4530,11 @@ Module rc. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "alloc::rc::Rc") [] [ T; A ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply (Ty.path "alloc::rc::Rc") [] [ T; A ], @@ -4547,6 +4626,14 @@ Module rc. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::rc::Rc") + [] + [ Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ]; A ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -4946,6 +5033,14 @@ Module rc. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::rc::Rc") + [] + [ Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ]; A ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -5621,6 +5716,8 @@ Module rc. M.alloc (| Value.StructRecord "alloc::rc::Weak" + [] + [ T; A ] [ ("ptr", M.read (| @@ -5654,12 +5751,20 @@ Module rc. ] |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| val |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ T; Ty.apply (Ty.path "alloc::rc::Rc") [] [ T; A ] ] + [ M.read (| val |) ] |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| this |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ T; Ty.apply (Ty.path "alloc::rc::Rc") [] [ T; A ] ] + [ M.read (| this |) ] |))) ] |) @@ -6288,6 +6393,8 @@ Module rc. M.alloc (| Value.StructRecord "alloc::rc::Weak" + [] + [ T; A ] [ ("ptr", M.read (| @@ -6701,6 +6808,8 @@ Module rc. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -6725,7 +6834,14 @@ Module rc. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + [] + |))) ] |) |))) @@ -8387,7 +8503,9 @@ Module rc. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "alloc::alloc::Global" [] |) + M.alloc (| + Value.StructTuple "alloc::alloc::Global" [] [] [] + |) |); M.read (| layout |) ] @@ -8641,7 +8759,9 @@ Module rc. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "alloc::alloc::Global" [] |) + M.alloc (| + Value.StructTuple "alloc::alloc::Global" [] [] [] + |) |); M.read (| layout |) ] @@ -9017,6 +9137,8 @@ Module rc. M.alloc (| Value.StructRecord "alloc::rc::from_iter_exact::Guard" + [] + [ T ] [ ("mem", M.call_closure (| @@ -10271,6 +10393,14 @@ Module rc. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "alloc::rc::Rc") [] [ T; A ]; + Ty.apply + (Ty.path "alloc::rc::Rc") + [] + [ Ty.dyn [ ("core::any::Any::Trait", []) ]; A ] + ] [ M.call_closure (| Ty.apply (Ty.path "alloc::rc::Rc") [] [ T; A ], @@ -10314,6 +10444,14 @@ Module rc. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "alloc::rc::Rc") [] [ T; A ]; + Ty.apply + (Ty.path "alloc::rc::Rc") + [] + [ Ty.dyn [ ("core::any::Any::Trait", []) ]; A ] + ] [ (* Unsize *) M.pointer_coercion (M.read (| self |)) ] |))) ] @@ -11048,6 +11186,8 @@ Module rc. |); Value.StructRecord "alloc::rc::RcInner" + [] + [ T ] [ ("strong", M.call_closure (| @@ -12653,7 +12793,7 @@ Module rc. |), [ M.borrow (| Pointer.Kind.Ref, v |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13215,6 +13355,17 @@ Module rc. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::rc::Rc") + [] + [ Ty.apply (Ty.path "array") [ N ] [ T ]; A ]; + Ty.apply + (Ty.path "alloc::rc::Rc") + [] + [ Ty.apply (Ty.path "slice") [] [ T ]; A ] + ] [ M.call_closure (| Ty.apply @@ -13272,7 +13423,20 @@ Module rc. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| boxed_slice |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloc::rc::Rc") + [] + [ Ty.apply (Ty.path "array") [ N ] [ T ]; A ]; + Ty.apply + (Ty.path "alloc::rc::Rc") + [] + [ Ty.apply (Ty.path "slice") [] [ T ]; A ] + ] + [ M.read (| boxed_slice |) ] |))) ] |) @@ -13599,6 +13763,8 @@ Module rc. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -13637,6 +13803,11 @@ Module rc. |); Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::fmt::Arguments" + ] [ M.call_closure (| Ty.path @@ -13912,6 +14083,8 @@ Module rc. ltac:(M.monadic (Value.StructRecord "alloc::rc::Weak" + [] + [ T; Ty.path "alloc::alloc::Global" ] [ ("ptr", M.call_closure (| @@ -13947,7 +14120,7 @@ Module rc. |) ] |)); - ("alloc", Value.StructTuple "alloc::alloc::Global" []) + ("alloc", Value.StructTuple "alloc::alloc::Global" [] [] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -13976,7 +14149,7 @@ Module rc. [], [] |), - [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -14009,6 +14182,8 @@ Module rc. (let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::rc::Weak" + [] + [ T; A ] [ ("ptr", M.call_closure (| @@ -14510,6 +14685,8 @@ Module rc. M.alloc (| Value.StructRecord "alloc::rc::Weak" + [] + [ T; A ] [ ("ptr", M.call_closure (| @@ -14710,7 +14887,13 @@ Module rc. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "alloc::rc::Rc") [] [ T; A ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -14732,6 +14915,8 @@ Module rc. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "alloc::rc::Rc") [] [ T; A ] ] [ M.call_closure (| Ty.apply (Ty.path "alloc::rc::Rc") [] [ T; A ], @@ -15053,12 +15238,20 @@ Module rc. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "alloc::rc::WeakInner" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "alloc::rc::WeakInner" ] [ M.read (| let~ ptr : @@ -15100,6 +15293,8 @@ Module rc. M.alloc (| Value.StructRecord "alloc::rc::WeakInner" + [] + [] [ ("strong", M.borrow (| @@ -15583,6 +15778,8 @@ Module rc. M.alloc (| Value.StructRecord "alloc::rc::Weak" + [] + [ T; A ] [ ("ptr", M.read (| @@ -16663,7 +16860,7 @@ Module rc. [], [] |), - [ M.read (| value |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| value |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -16740,6 +16937,8 @@ Module rc. [ Value.StructRecord "alloc::rc::RcInner" + [] + [ T ] [ ("strong", M.call_closure (| @@ -16781,6 +16980,8 @@ Module rc. M.alloc (| Value.StructRecord "alloc::rc::UniqueRc" + [] + [ T; A ] [ ("ptr", M.call_closure (| @@ -16807,7 +17008,12 @@ Module rc. |), [ M.read (| ptr |) ] |)); - ("phantom", Value.StructTuple "core::marker::PhantomData" []); + ("phantom", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "alloc::rc::RcInner") [] [ T ] ] + []); ("alloc", M.read (| alloc |)) ] |))) @@ -17104,6 +17310,8 @@ Module rc. M.alloc (| Value.StructRecord "alloc::rc::Weak" + [] + [ T; A ] [ ("ptr", M.read (| @@ -17784,6 +17992,8 @@ Module rc. M.alloc (| Value.StructRecord "alloc::rc::UniqueRcUninit" + [] + [ T; A ] [ ("ptr", M.call_closure (| @@ -17830,7 +18040,8 @@ Module rc. ] |)); ("layout_for_value", M.read (| layout |)); - ("alloc", Value.StructTuple "core::option::Option::Some" [ M.read (| alloc |) ]) + ("alloc", + Value.StructTuple "core::option::Option::Some" [] [ A ] [ M.read (| alloc |) ]) ] |) |))) diff --git a/CoqOfRust/alloc/slice.v b/CoqOfRust/alloc/slice.v index 2336b058b..4e895b198 100644 --- a/CoqOfRust/alloc/slice.v +++ b/CoqOfRust/alloc/slice.v @@ -197,6 +197,8 @@ Module slice. M.alloc (| Value.StructRecord "alloc::slice::hack::to_vec::DropGuard" + [] + [ T; A ] [ ("vec", M.borrow (| @@ -874,6 +876,8 @@ Module slice. Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] |) |) ] @@ -1553,6 +1557,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -2159,6 +2165,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -2462,7 +2470,7 @@ Module slice. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "alloc::alloc::Global" [] + Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4704,7 +4712,7 @@ Module slice. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -4760,7 +4768,7 @@ Module slice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) diff --git a/CoqOfRust/alloc/str.v b/CoqOfRust/alloc/str.v index 21e960769..55bceb538 100644 --- a/CoqOfRust/alloc/str.v +++ b/CoqOfRust/alloc/str.v @@ -816,6 +816,8 @@ Module str. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -5502,7 +5504,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -5556,7 +5558,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -5829,6 +5831,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ M.read (| M.deref (| M.read (| from_byte |) |) |) ] |))); fun γ => @@ -5930,7 +5934,11 @@ Module str. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u8" ] + [] |))) ] |) in @@ -6311,6 +6319,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| last_end |)); ("end_", M.read (| start |)) @@ -6408,6 +6418,8 @@ Module str. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| last_end |)); ("end_", @@ -6641,6 +6653,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| last_end |)); ("end_", M.read (| start |)) @@ -6733,6 +6747,8 @@ Module str. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| last_end |)); ("end_", @@ -8218,6 +8234,8 @@ Module str. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| slice |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -8295,6 +8313,8 @@ Module str. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -8334,6 +8354,8 @@ Module str. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -8640,6 +8662,8 @@ Module str. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -8817,6 +8841,8 @@ Module str. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -8883,6 +8909,8 @@ Module str. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -9094,6 +9122,8 @@ Module str. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1) ] ] |) @@ -9152,6 +9182,8 @@ Module str. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1) ] ] |) diff --git a/CoqOfRust/alloc/string.v b/CoqOfRust/alloc/string.v index e4f539ec0..dd51aca56 100644 --- a/CoqOfRust/alloc/string.v +++ b/CoqOfRust/alloc/string.v @@ -505,6 +505,8 @@ Module string. (let self := M.alloc (| self |) in Value.StructRecord "alloc::string::FromUtf8Error" + [] + [] [ ("bytes", M.call_closure (| @@ -661,6 +663,8 @@ Module string. ltac:(M.monadic (Value.StructRecord "alloc::string::String" + [] + [] [ ("vec", M.call_closure (| @@ -699,6 +703,8 @@ Module string. (let capacity := M.alloc (| capacity |) in Value.StructRecord "alloc::string::String" + [] + [] [ ("vec", M.call_closure (| @@ -744,9 +750,13 @@ Module string. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "alloc::string::String"; Ty.path "alloc::collections::TryReserveError" ] [ Value.StructRecord "alloc::string::String" + [] + [] [ ("vec", M.read (| @@ -971,7 +981,15 @@ Module string. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructRecord "alloc::string::String" [ ("vec", M.read (| vec |)) ] ] + [] + [ Ty.path "alloc::string::String"; Ty.path "alloc::string::FromUtf8Error" ] + [ + Value.StructRecord + "alloc::string::String" + [] + [] + [ ("vec", M.read (| vec |)) ] + ] |))); fun γ => ltac:(M.monadic @@ -981,9 +999,13 @@ Module string. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "alloc::string::String"; Ty.path "alloc::string::FromUtf8Error" ] [ Value.StructRecord "alloc::string::FromUtf8Error" + [] + [] [ ("bytes", M.read (| vec |)); ("error", M.read (| e |)) ] ] |))) @@ -1299,6 +1321,8 @@ Module string. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1346,6 +1370,11 @@ Module string. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -1369,6 +1398,8 @@ Module string. M.return_ (| Value.StructTuple "alloc::borrow::Cow::Borrowed" + [] + [ Ty.path "str" ] [ M.borrow (| Pointer.Kind.Ref, @@ -1391,6 +1422,8 @@ Module string. M.return_ (| Value.StructTuple "alloc::borrow::Cow::Borrowed" + [] + [ Ty.path "str" ] [ M.borrow (| Pointer.Kind.Ref, @@ -1673,7 +1706,13 @@ Module string. |))) ] |)) in - M.alloc (| Value.StructTuple "alloc::borrow::Cow::Owned" [ M.read (| res |) ] |) + M.alloc (| + Value.StructTuple + "alloc::borrow::Cow::Owned" + [] + [ Ty.path "str" ] + [ M.read (| res |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2066,9 +2105,17 @@ Module string. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "alloc::string::String"; + Ty.path + "alloc::string::FromUtf16Error" + ] [ Value.StructTuple "alloc::string::FromUtf16Error" + [] + [] [ Value.Tuple [] ] ] |) @@ -2083,7 +2130,13 @@ Module string. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| ret |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "alloc::string::String"; Ty.path "alloc::string::FromUtf16Error" ] + [ M.read (| ret |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2395,9 +2448,16 @@ Module string. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "alloc::string::String"; + Ty.path "alloc::string::FromUtf16Error" + ] [ Value.StructTuple "alloc::string::FromUtf16Error" + [] + [] [ Value.Tuple [] ] ] |) @@ -2778,6 +2838,8 @@ Module string. ltac:(M.monadic (Value.StructTuple "alloc::string::FromUtf16Error" + [] + [] [ Value.Tuple [] ])) ] |))) @@ -3582,9 +3644,16 @@ Module string. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "alloc::string::String"; + Ty.path "alloc::string::FromUtf16Error" + ] [ Value.StructTuple "alloc::string::FromUtf16Error" + [] + [] [ Value.Tuple [] ] ] |) @@ -3965,6 +4034,8 @@ Module string. ltac:(M.monadic (Value.StructTuple "alloc::string::FromUtf16Error" + [] + [] [ Value.Tuple [] ])) ] |))) @@ -4746,6 +4817,8 @@ Module string. let capacity := M.alloc (| capacity |) in Value.StructRecord "alloc::string::String" + [] + [] [ ("vec", M.call_closure (| @@ -4783,7 +4856,7 @@ Module string. | [], [], [ bytes ] => ltac:(M.monadic (let bytes := M.alloc (| bytes |) in - Value.StructRecord "alloc::string::String" [ ("vec", M.read (| bytes |)) ])) + Value.StructRecord "alloc::string::String" [] [] [ ("vec", M.read (| bytes |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5024,6 +5097,8 @@ Module string. M.read (| src |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -6071,7 +6146,13 @@ Module string. |) |) in M.alloc (| Value.Tuple [] |) in - M.alloc (| Value.StructTuple "core::option::Option::Some" [ M.read (| ch |) ] |) + M.alloc (| + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "char" ] + [ M.read (| ch |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6154,6 +6235,8 @@ Module string. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| idx |)) ] ] |) @@ -6777,6 +6860,11 @@ Module string. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ Ty.path "usize"; Ty.path "usize" ] + ] [ Value.Tuple [ @@ -7248,6 +7336,8 @@ Module string. M.alloc (| Value.StructRecord "alloc::string::retain::SetLenOnDrop" + [] + [] [ ("s", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |)); ("idx", Value.Integer IntegerKind.Usize 0); @@ -7372,6 +7462,8 @@ Module string. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -8528,6 +8620,8 @@ Module string. M.read (| range |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -8746,6 +8840,8 @@ Module string. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)) ] ] |) @@ -8757,6 +8853,8 @@ Module string. M.alloc (| Value.StructRecord "alloc::string::Drain" + [] + [] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)); @@ -9462,7 +9560,7 @@ Module string. "bytes" |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -9618,6 +9716,8 @@ Module string. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -9709,6 +9809,8 @@ Module string. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -10157,6 +10259,8 @@ Module string. (let self := M.alloc (| self |) in Value.StructRecord "alloc::string::String" + [] + [] [ ("vec", M.call_closure (| @@ -11941,7 +12045,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -11991,7 +12095,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12041,7 +12145,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12094,7 +12198,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12147,7 +12251,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12203,7 +12307,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12226,9 +12330,13 @@ Module string. (let self := M.alloc (| self |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::str::pattern::Utf8Pattern" ] [ Value.StructTuple "core::str::pattern::Utf8Pattern::StringPattern" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -12322,7 +12430,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12348,7 +12456,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12402,7 +12510,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12428,7 +12536,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12494,7 +12602,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12520,7 +12628,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12574,7 +12682,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12600,7 +12708,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12666,7 +12774,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12695,7 +12803,7 @@ Module string. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| other |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12749,7 +12857,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12778,7 +12886,7 @@ Module string. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| other |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12847,7 +12955,7 @@ Module string. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| self |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12873,7 +12981,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12930,7 +13038,7 @@ Module string. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| self |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12956,7 +13064,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13039,7 +13147,7 @@ Module string. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13065,7 +13173,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13136,7 +13244,7 @@ Module string. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13162,7 +13270,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13228,7 +13336,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13272,7 +13380,7 @@ Module string. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13326,7 +13434,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13370,7 +13478,7 @@ Module string. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13454,7 +13562,7 @@ Module string. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13483,7 +13591,7 @@ Module string. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| other |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13554,7 +13662,7 @@ Module string. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13583,7 +13691,7 @@ Module string. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| other |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13652,7 +13760,7 @@ Module string. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| self |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13696,7 +13804,7 @@ Module string. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13753,7 +13861,7 @@ Module string. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| self |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13797,7 +13905,7 @@ Module string. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13881,7 +13989,7 @@ Module string. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13907,7 +14015,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13978,7 +14086,7 @@ Module string. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -14004,7 +14112,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -14070,7 +14178,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -14114,7 +14222,7 @@ Module string. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -14168,7 +14276,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -14212,7 +14320,7 @@ Module string. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -14798,6 +14906,8 @@ Module string. (let s := M.alloc (| s |) in Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "alloc::string::String"; Ty.path "core::convert::Infallible" ] [ M.call_closure (| Ty.path "alloc::string::String", @@ -16633,7 +16743,7 @@ Module string. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -17087,6 +17197,8 @@ Module string. (let s := M.alloc (| s |) in Value.StructTuple "alloc::borrow::Cow::Borrowed" + [] + [ Ty.path "str" ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| s |) |) |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -17113,7 +17225,7 @@ Module string. | [], [], [ s ] => ltac:(M.monadic (let s := M.alloc (| s |) in - Value.StructTuple "alloc::borrow::Cow::Owned" [ M.read (| s |) ])) + Value.StructTuple "alloc::borrow::Cow::Owned" [] [ Ty.path "str" ] [ M.read (| s |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -17141,6 +17253,8 @@ Module string. (let s := M.alloc (| s |) in Value.StructTuple "alloc::borrow::Cow::Borrowed" + [] + [ Ty.path "str" ] [ M.borrow (| Pointer.Kind.Ref, @@ -17186,6 +17300,8 @@ Module string. (let it := M.alloc (| it |) in Value.StructTuple "alloc::borrow::Cow::Owned" + [] + [ Ty.path "str" ] [ M.call_closure (| Ty.path "alloc::string::String", @@ -17228,6 +17344,8 @@ Module string. (let it := M.alloc (| it |) in Value.StructTuple "alloc::borrow::Cow::Owned" + [] + [ Ty.path "str" ] [ M.call_closure (| Ty.path "alloc::string::String", @@ -17270,6 +17388,8 @@ Module string. (let it := M.alloc (| it |) in Value.StructTuple "alloc::borrow::Cow::Owned" + [] + [ Ty.path "str" ] [ M.call_closure (| Ty.path "alloc::string::String", @@ -17363,7 +17483,13 @@ Module string. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -17392,7 +17518,13 @@ Module string. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -17708,6 +17840,8 @@ Module string. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self_vec |) |) |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| diff --git a/CoqOfRust/alloc/sync.v b/CoqOfRust/alloc/sync.v index bf66f9171..afbf777b8 100644 --- a/CoqOfRust/alloc/sync.v +++ b/CoqOfRust/alloc/sync.v @@ -138,7 +138,7 @@ Module sync. [], [] |), - [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -168,7 +168,7 @@ Module sync. [], [] |), - [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -234,6 +234,8 @@ Module sync. [ Value.StructRecord "alloc::sync::ArcInner" + [] + [ T ] [ ("strong", M.call_closure (| @@ -356,7 +358,7 @@ Module sync. [], [ F ] |), - [ M.read (| data_fn |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| data_fn |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -513,7 +515,9 @@ Module sync. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "alloc::alloc::Global" [] |) + M.alloc (| + Value.StructTuple "alloc::alloc::Global" [] [] [] + |) |); M.read (| layout |) ] @@ -692,7 +696,9 @@ Module sync. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "alloc::alloc::Global" [] |) + M.alloc (| + Value.StructTuple "alloc::alloc::Global" [] [] [] + |) |); M.read (| layout |) ] @@ -798,6 +804,15 @@ Module sync. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "core::pin::Pin") + [] + [ Ty.apply (Ty.path "alloc::sync::Arc") [] [ T; Ty.path "alloc::alloc::Global" ] + ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -1117,6 +1132,8 @@ Module sync. [ Value.StructRecord "alloc::sync::ArcInner" + [] + [ T ] [ ("strong", M.call_closure (| @@ -1220,6 +1237,14 @@ Module sync. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::sync::Arc") + [] + [ T; Ty.path "alloc::alloc::Global" ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -1338,6 +1363,17 @@ Module sync. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::sync::Arc") + [] + [ + Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ]; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -1584,6 +1620,8 @@ Module sync. Value.StructTuple "alloc::alloc::Global" [] + [] + [] |) |); M.read (| layout |) @@ -1748,6 +1786,17 @@ Module sync. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::sync::Arc") + [] + [ + Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ]; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -1994,6 +2043,8 @@ Module sync. Value.StructTuple "alloc::alloc::Global" [] + [] + [] |) |); M.read (| layout |) @@ -2138,7 +2189,7 @@ Module sync. [], [] |), - [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2173,7 +2224,7 @@ Module sync. [], [] |), - [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2208,7 +2259,7 @@ Module sync. [], [] |), - [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2620,7 +2671,19 @@ Module sync. [ M.read (| ptr |); M.read (| layout |); M.read (| mem_to_arcinner |) ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| inner |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "*mut") + [] + [ Ty.apply (Ty.path "alloc::sync::ArcInner") [] [ T ] ]; + Ty.path "core::alloc::AllocError" + ] + [ M.read (| inner |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2814,6 +2877,8 @@ Module sync. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -2849,6 +2914,8 @@ Module sync. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -3094,9 +3161,16 @@ Module sync. let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::sync::Arc" + [] + [ T; A ] [ ("ptr", M.read (| ptr |)); - ("phantom", Value.StructTuple "core::marker::PhantomData" []); + ("phantom", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "alloc::sync::ArcInner") [] [ T ] ] + []); ("alloc", M.read (| alloc |)) ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -3208,6 +3282,8 @@ Module sync. [ Value.StructRecord "alloc::sync::ArcInner" + [] + [ T ] [ ("strong", M.call_closure (| @@ -3811,6 +3887,8 @@ Module sync. [ Value.StructRecord "alloc::sync::ArcInner" + [] + [ Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ] ] [ ("strong", M.call_closure (| @@ -3990,6 +4068,8 @@ Module sync. M.alloc (| Value.StructRecord "alloc::sync::Weak" + [] + [ T; A ] [ ("ptr", M.read (| init_ptr |)); ("alloc", M.read (| alloc |)) ] |) in let~ data : Ty.apply (Ty.path "*") [] [ T ] := @@ -4097,7 +4177,7 @@ Module sync. |) |); Value.Integer IntegerKind.Usize 1; - Value.StructTuple "core::sync::atomic::Ordering::Release" [] + Value.StructTuple "core::sync::atomic::Ordering::Release" [] [] [] ] |) |) in @@ -4182,6 +4262,8 @@ Module sync. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -4217,6 +4299,8 @@ Module sync. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::fmt::Arguments" ] [ M.call_closure (| Ty.path @@ -4392,6 +4476,14 @@ Module sync. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "core::pin::Pin") + [] + [ Ty.apply (Ty.path "alloc::sync::Arc") [] [ T; A ] ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -4665,6 +4757,8 @@ Module sync. [ Value.StructRecord "alloc::sync::ArcInner" + [] + [ T ] [ ("strong", M.call_closure (| @@ -4805,6 +4899,11 @@ Module sync. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "alloc::sync::Arc") [] [ T; A ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply (Ty.path "alloc::sync::Arc") [] [ T; A ], @@ -4896,6 +4995,14 @@ Module sync. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::sync::Arc") + [] + [ Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ]; A ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -5295,6 +5402,14 @@ Module sync. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::sync::Arc") + [] + [ Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ]; A ]; + Ty.path "core::alloc::AllocError" + ] [ M.call_closure (| Ty.apply @@ -5757,10 +5872,14 @@ Module sync. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::sync::atomic::Ordering::Relaxed" + [] + [] []; Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + [] + [] ] |) |) @@ -5776,6 +5895,8 @@ Module sync. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ T; Ty.apply (Ty.path "alloc::sync::Arc") [] [ T; A ] ] [ M.read (| this |) ] |) |) @@ -5789,7 +5910,7 @@ Module sync. M.call_closure (| Ty.tuple [], M.get_function (| "core::sync::atomic::fence", [], [] |), - [ Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] ] + [ Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] ] |) |) in let~ this : @@ -5944,6 +6065,8 @@ Module sync. M.alloc (| Value.StructRecord "alloc::sync::Weak" + [] + [ T; A ] [ ("ptr", M.read (| @@ -5976,7 +6099,13 @@ Module sync. ("alloc", M.read (| alloc |)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| elem |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ T; Ty.apply (Ty.path "alloc::sync::Arc") [] [ T; A ] ] + [ M.read (| elem |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6140,7 +6269,11 @@ Module sync. |) |); Value.Integer IntegerKind.Usize 1; - Value.StructTuple "core::sync::atomic::Ordering::Release" [] + Value.StructTuple + "core::sync::atomic::Ordering::Release" + [] + [] + [] ] |); Value.Integer IntegerKind.Usize 1 @@ -6152,7 +6285,9 @@ Module sync. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple "core::option::Option::None" [] [ T ] [] + |) |) |) |))); @@ -6164,7 +6299,7 @@ Module sync. M.call_closure (| Ty.tuple [], M.get_function (| "core::sync::atomic::fence", [], [] |), - [ Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] ] + [ Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] ] |) |) in let~ inner : Ty.apply (Ty.path "*") [] [ T ] := @@ -6275,6 +6410,8 @@ Module sync. [ Value.StructRecord "alloc::sync::Weak" + [] + [ T; A ] [ ("ptr", M.read (| @@ -6309,7 +6446,9 @@ Module sync. ] |) |) in - M.alloc (| Value.StructTuple "core::option::Option::Some" [ M.read (| inner |) ] |) + M.alloc (| + Value.StructTuple "core::option::Option::Some" [] [ T ] [ M.read (| inner |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6823,7 +6962,7 @@ Module sync. "weak" |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) in @@ -6929,6 +7068,8 @@ Module sync. Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + [] + [] ] |) |) @@ -7049,8 +7190,12 @@ Module sync. BinOp.Wrap.add, [ M.read (| cur |); Value.Integer IntegerKind.Usize 1 ] |); - Value.StructTuple "core::sync::atomic::Ordering::Acquire" []; - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple + "core::sync::atomic::Ordering::Acquire" + [] + [] + []; + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |), @@ -7189,6 +7334,8 @@ Module sync. M.return_ (| Value.StructRecord "alloc::sync::Weak" + [] + [ T; A ] [ ("ptr", M.read (| @@ -7301,7 +7448,7 @@ Module sync. "weak" |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) in @@ -7399,7 +7546,7 @@ Module sync. "strong" |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7657,6 +7804,8 @@ Module sync. M.alloc (| Value.StructRecord "alloc::sync::Weak" + [] + [ T; Ty.apply (Ty.path "&") [] [ A ] ] [ ("ptr", M.read (| @@ -8448,10 +8597,14 @@ Module sync. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::sync::atomic::Ordering::Acquire" + [] + [] []; Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + [] + [] ] |) |) @@ -8671,6 +8824,8 @@ Module sync. Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + [] + [] ] |); Value.Integer IntegerKind.Usize 1 @@ -8690,6 +8845,8 @@ Module sync. M.alloc (| Value.StructRecord "alloc::sync::Weak" + [] + [ T; A ] [ ("ptr", M.read (| @@ -8979,6 +9136,8 @@ Module sync. Value.StructTuple "core::sync::atomic::Ordering::Release" [] + [] + [] ] |) |) in @@ -9180,6 +9339,8 @@ Module sync. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -9204,7 +9365,14 @@ Module sync. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + [] + |))) ] |) |))) @@ -9400,8 +9568,16 @@ Module sync. Ty.path "usize" |) |); - Value.StructTuple "core::sync::atomic::Ordering::Acquire" []; - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple + "core::sync::atomic::Ordering::Acquire" + [] + [] + []; + Value.StructTuple + "core::sync::atomic::Ordering::Relaxed" + [] + [] + [] ] |) |) @@ -9452,7 +9628,7 @@ Module sync. "strong" |) |); - Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] + Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] ] |); Value.Integer IntegerKind.Usize 1 @@ -9498,7 +9674,7 @@ Module sync. |) |); Value.Integer IntegerKind.Usize 1; - Value.StructTuple "core::sync::atomic::Ordering::Release" [] + Value.StructTuple "core::sync::atomic::Ordering::Release" [] [] [] ] |) |) in @@ -10072,7 +10248,9 @@ Module sync. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "alloc::alloc::Global" [] |) + M.alloc (| + Value.StructTuple "alloc::alloc::Global" [] [] [] + |) |); M.read (| layout |) ] @@ -10323,7 +10501,9 @@ Module sync. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "alloc::alloc::Global" [] |) + M.alloc (| + Value.StructTuple "alloc::alloc::Global" [] [] [] + |) |); M.read (| layout |) ] @@ -10701,6 +10881,8 @@ Module sync. M.alloc (| Value.StructRecord "alloc::sync::from_iter_exact::Guard" + [] + [ T ] [ ("mem", M.call_closure (| @@ -12045,7 +12227,7 @@ Module sync. |) |); Value.Integer IntegerKind.Usize 1; - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) in @@ -12365,7 +12547,11 @@ Module sync. |) |); Value.Integer IntegerKind.Usize 1; - Value.StructTuple "core::sync::atomic::Ordering::Release" [] + Value.StructTuple + "core::sync::atomic::Ordering::Release" + [] + [] + [] ] |); Value.Integer IntegerKind.Usize 1 @@ -12385,7 +12571,7 @@ Module sync. M.call_closure (| Ty.tuple [], M.get_function (| "core::sync::atomic::fence", [], [] |), - [ Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] ] + [ Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] ] |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -12778,6 +12964,22 @@ Module sync. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "alloc::sync::Arc") [] [ T; A ]; + Ty.apply + (Ty.path "alloc::sync::Arc") + [] + [ + Ty.dyn + [ + ("core::any::Any::Trait", []); + ("core::marker::Sync::AutoTrait", []); + ("core::marker::Send::AutoTrait", []) + ]; + A + ] + ] [ M.call_closure (| Ty.apply (Ty.path "alloc::sync::Arc") [] [ T; A ], @@ -12828,6 +13030,22 @@ Module sync. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "alloc::sync::Arc") [] [ T; A ]; + Ty.apply + (Ty.path "alloc::sync::Arc") + [] + [ + Ty.dyn + [ + ("core::any::Any::Trait", []); + ("core::marker::Sync::AutoTrait", []); + ("core::marker::Send::AutoTrait", []) + ]; + A + ] + ] [ (* Unsize *) M.pointer_coercion (M.read (| self |)) ] |))) ] @@ -12992,6 +13210,8 @@ Module sync. ltac:(M.monadic (Value.StructRecord "alloc::sync::Weak" + [] + [ T; Ty.path "alloc::alloc::Global" ] [ ("ptr", M.call_closure (| @@ -13027,7 +13247,7 @@ Module sync. |) ] |)); - ("alloc", Value.StructTuple "alloc::alloc::Global" []) + ("alloc", Value.StructTuple "alloc::alloc::Global" [] [] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -13056,7 +13276,7 @@ Module sync. [], [] |), - [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| ptr |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -13089,6 +13309,8 @@ Module sync. (let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::sync::Weak" + [] + [ T; A ] [ ("ptr", M.call_closure (| @@ -13596,6 +13818,8 @@ Module sync. M.alloc (| Value.StructRecord "alloc::sync::Weak" + [] + [ T; A ] [ ("ptr", M.call_closure (| @@ -13863,9 +14087,13 @@ Module sync. |); Value.StructTuple "core::sync::atomic::Ordering::Acquire" + [] + [] []; Value.StructTuple "core::sync::atomic::Ordering::Relaxed" + [] + [] []; M.get_associated_function (| Self, @@ -13884,6 +14112,8 @@ Module sync. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "alloc::sync::Arc") [] [ T; A ] ] [ M.call_closure (| Ty.apply (Ty.path "alloc::sync::Arc") [] [ T; A ], @@ -13929,7 +14159,13 @@ Module sync. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "alloc::sync::Arc") [] [ T; A ] ] + [] + |))) ] |) |))) @@ -14011,7 +14247,7 @@ Module sync. |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |))); @@ -14107,7 +14343,7 @@ Module sync. |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] + Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] ] |) |) in @@ -14134,7 +14370,7 @@ Module sync. |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) in @@ -14260,15 +14496,25 @@ Module sync. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "alloc::sync::WeakInner" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "alloc::sync::WeakInner" ] [ Value.StructRecord "alloc::sync::WeakInner" + [] + [] [ ("strong", M.borrow (| @@ -14497,7 +14743,7 @@ Module sync. |) |); Value.Integer IntegerKind.Usize 1; - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) in @@ -14544,6 +14790,8 @@ Module sync. M.alloc (| Value.StructRecord "alloc::sync::Weak" + [] + [ T; A ] [ ("ptr", M.read (| @@ -14738,7 +14986,11 @@ Module sync. |) |); Value.Integer IntegerKind.Usize 1; - Value.StructTuple "core::sync::atomic::Ordering::Release" [] + Value.StructTuple + "core::sync::atomic::Ordering::Release" + [] + [] + [] ] |); Value.Integer IntegerKind.Usize 1 @@ -14751,7 +15003,7 @@ Module sync. M.call_closure (| Ty.tuple [], M.get_function (| "core::sync::atomic::fence", [], [] |), - [ Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] ] + [ Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] ] |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -16121,6 +16373,8 @@ Module sync. |); Value.StructRecord "alloc::sync::ArcInner" + [] + [ T ] [ ("strong", M.call_closure (| @@ -16217,10 +16471,19 @@ Module sync. M.alloc (| Value.StructRecord "alloc::sync::SliceArcInnerForStatic" + [] + [] [ ("inner", Value.StructRecord "alloc::sync::ArcInner" + [] + [ + Ty.apply + (Ty.path "array") + [ Value.Integer IntegerKind.Usize 1 ] + [ Ty.path "u8" ] + ] [ ("strong", M.call_closure (| @@ -17770,7 +18033,7 @@ Module sync. |), [ M.borrow (| Pointer.Kind.Ref, v |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -18343,6 +18606,17 @@ Module sync. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::sync::Arc") + [] + [ Ty.apply (Ty.path "array") [ N ] [ T ]; A ]; + Ty.apply + (Ty.path "alloc::sync::Arc") + [] + [ Ty.apply (Ty.path "slice") [] [ T ]; A ] + ] [ M.call_closure (| Ty.apply @@ -18400,7 +18674,20 @@ Module sync. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| boxed_slice |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloc::sync::Arc") + [] + [ Ty.apply (Ty.path "array") [ N ] [ T ]; A ]; + Ty.apply + (Ty.path "alloc::sync::Arc") + [] + [ Ty.apply (Ty.path "slice") [] [ T ]; A ] + ] + [ M.read (| boxed_slice |) ] |))) ] |) @@ -18737,6 +19024,8 @@ Module sync. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -18775,6 +19064,11 @@ Module sync. |); Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::fmt::Arguments" + ] [ M.call_closure (| Ty.path @@ -19389,6 +19683,8 @@ Module sync. M.alloc (| Value.StructRecord "alloc::sync::UniqueArcUninit" + [] + [ T; A ] [ ("ptr", M.call_closure (| @@ -19435,7 +19731,8 @@ Module sync. ] |)); ("layout_for_value", M.read (| layout |)); - ("alloc", Value.StructTuple "core::option::Option::Some" [ M.read (| alloc |) ]) + ("alloc", + Value.StructTuple "core::option::Option::Some" [] [ A ] [ M.read (| alloc |) ]) ] |) |))) diff --git a/CoqOfRust/alloc/vec/cow.v b/CoqOfRust/alloc/vec/cow.v index af4380570..9d7e0ae71 100644 --- a/CoqOfRust/alloc/vec/cow.v +++ b/CoqOfRust/alloc/vec/cow.v @@ -20,6 +20,8 @@ Module vec. (let s := M.alloc (| s |) in Value.StructTuple "alloc::borrow::Cow::Borrowed" + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| s |) |) |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -58,6 +60,8 @@ Module vec. (let s := M.alloc (| s |) in Value.StructTuple "alloc::borrow::Cow::Borrowed" + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -102,7 +106,11 @@ Module vec. | [], [], [ v ] => ltac:(M.monadic (let v := M.alloc (| v |) in - Value.StructTuple "alloc::borrow::Cow::Owned" [ M.read (| v |) ])) + Value.StructTuple + "alloc::borrow::Cow::Owned" + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + [ M.read (| v |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -134,6 +142,8 @@ Module vec. (let v := M.alloc (| v |) in Value.StructTuple "alloc::borrow::Cow::Borrowed" + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -190,6 +200,8 @@ Module vec. (let it := M.alloc (| it |) in Value.StructTuple "alloc::borrow::Cow::Owned" + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] [ M.call_closure (| Ty.apply (Ty.path "alloc::vec::Vec") [] [ T; Ty.path "alloc::alloc::Global" ], diff --git a/CoqOfRust/alloc/vec/drain.v b/CoqOfRust/alloc/vec/drain.v index 670a69cdc..08abba31c 100644 --- a/CoqOfRust/alloc/vec/drain.v +++ b/CoqOfRust/alloc/vec/drain.v @@ -1443,6 +1443,8 @@ Module vec. M.alloc (| Value.StructTuple "alloc::vec::drain::drop::DropGuard" + [] + [ T; A ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := diff --git a/CoqOfRust/alloc/vec/extract_if.v b/CoqOfRust/alloc/vec/extract_if.v index f1ee67093..b19fd5436 100644 --- a/CoqOfRust/alloc/vec/extract_if.v +++ b/CoqOfRust/alloc/vec/extract_if.v @@ -441,6 +441,8 @@ Module vec. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.call_closure (| T, @@ -590,7 +592,7 @@ Module vec. ] |))) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -617,6 +619,8 @@ Module vec. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", diff --git a/CoqOfRust/alloc/vec/in_place_collect.v b/CoqOfRust/alloc/vec/in_place_collect.v index a7ad2fc25..6d5736cee 100644 --- a/CoqOfRust/alloc/vec/in_place_collect.v +++ b/CoqOfRust/alloc/vec/in_place_collect.v @@ -976,6 +976,8 @@ Module vec. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1047,6 +1049,8 @@ Module vec. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -1360,11 +1364,33 @@ Module vec. M.alloc (| Value.StructRecord "alloc::vec::in_place_drop::InPlaceDstDataSrcBufDrop" + [] + [ + Ty.associated_in_trait + "alloc::vec::in_place_collect::InPlaceCollect" + [] + [] + I + "Src"; + T + ] [ ("ptr", M.read (| dst_buf |)); ("len", M.read (| len |)); ("src_cap", M.read (| src_cap |)); - ("src", Value.StructTuple "core::marker::PhantomData" []) + ("src", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.associated_in_trait + "alloc::vec::in_place_collect::InPlaceCollect" + [] + [] + I + "Src" + ] + []) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -1428,7 +1454,7 @@ Module vec. is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in let~ alloc : Ty.apply (Ty.path "*") [] [ Ty.path "alloc::alloc::Global" ] := - M.alloc (| Value.StructTuple "alloc::alloc::Global" [] |) in + M.alloc (| Value.StructTuple "alloc::alloc::Global" [] [] [] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.match_operator (| Ty.apply (Ty.path "*") [] [ Ty.tuple [] ], @@ -1510,6 +1536,8 @@ Module vec. Value.StructTuple "core::panicking::AssertKind::Ne" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1549,6 +1577,11 @@ Module vec. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -1647,6 +1680,8 @@ Module vec. Value.StructTuple "core::panicking::AssertKind::Ne" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1686,6 +1721,11 @@ Module vec. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -2043,6 +2083,8 @@ Module vec. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -2082,6 +2124,11 @@ Module vec. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -2423,6 +2470,14 @@ Module vec. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::vec::in_place_drop::InPlaceDrop") + [] + [ T ]; + Ty.path "never" + ] [ M.read (| sink |) ] |) |))) @@ -2483,6 +2538,8 @@ Module vec. M.alloc (| Value.StructRecord "alloc::vec::in_place_drop::InPlaceDrop" + [] + [ T ] [ ("inner", M.read (| dst_buf |)); ("dst", M.read (| dst_buf |)) ] |) in let~ sink : @@ -2708,6 +2765,8 @@ Module vec. M.alloc (| Value.StructRecord "alloc::vec::in_place_drop::InPlaceDrop" + [] + [ T ] [ ("inner", M.read (| dst_buf |)); ("dst", M.read (| dst_buf |)) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -2729,6 +2788,8 @@ Module vec. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| len |)) diff --git a/CoqOfRust/alloc/vec/in_place_drop.v b/CoqOfRust/alloc/vec/in_place_drop.v index e0e3af542..52913e624 100644 --- a/CoqOfRust/alloc/vec/in_place_drop.v +++ b/CoqOfRust/alloc/vec/in_place_drop.v @@ -225,7 +225,7 @@ Module vec. "src_cap" |) |); - Value.StructTuple "alloc::alloc::Global" [] + Value.StructTuple "alloc::alloc::Global" [] [] [] ] |) |) in diff --git a/CoqOfRust/alloc/vec/into_iter.v b/CoqOfRust/alloc/vec/into_iter.v index 95e6083e6..ae36acc55 100644 --- a/CoqOfRust/alloc/vec/into_iter.v +++ b/CoqOfRust/alloc/vec/into_iter.v @@ -748,6 +748,8 @@ Module vec. M.alloc (| Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -809,6 +811,8 @@ Module vec. (M.alloc (| Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -1247,7 +1251,11 @@ Module vec. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ T ] + [] |) |) |) @@ -1365,7 +1373,11 @@ Module vec. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ T ] + [] |) |) |) @@ -1413,6 +1425,8 @@ Module vec. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.call_closure (| T, @@ -1571,7 +1585,11 @@ Module vec. Value.Tuple [ M.read (| exact |); - Value.StructTuple "core::option::Option::Some" [ M.read (| exact |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| exact |) ] ] |) |))) @@ -1822,8 +1840,21 @@ Module vec. |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) @@ -2024,6 +2055,14 @@ Module vec. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "array") [ N ] [ T ]; + Ty.apply + (Ty.path "core::array::iter::IntoIter") + [ N ] + [ T ] + ] [ M.call_closure (| Ty.apply @@ -2044,6 +2083,8 @@ Module vec. M.read (| raw_ary |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer @@ -2093,6 +2134,11 @@ Module vec. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "array") [ N ] [ T ]; + Ty.apply (Ty.path "core::array::iter::IntoIter") [ N ] [ T ] + ] [ M.call_closure (| Ty.apply (Ty.path "array") [ N ] [ T ], @@ -2253,6 +2299,11 @@ Module vec. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "array") [ N ] [ T ]; + Ty.apply (Ty.path "core::array::iter::IntoIter") [ N ] [ T ] + ] [ M.call_closure (| Ty.apply @@ -2272,6 +2323,8 @@ Module vec. M.read (| raw_ary |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| len |)) @@ -2375,6 +2428,11 @@ Module vec. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "array") [ N ] [ T ]; + Ty.apply (Ty.path "core::array::iter::IntoIter") [ N ] [ T ] + ] [ M.call_closure (| Ty.apply (Ty.path "array") [ N ] [ T ], @@ -3564,7 +3622,11 @@ Module vec. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ T ] + [] |) |) |) @@ -3604,6 +3666,8 @@ Module vec. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.call_closure (| T, @@ -3711,7 +3775,11 @@ Module vec. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ T ] + [] |) |) |) @@ -3751,6 +3819,8 @@ Module vec. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.call_closure (| T, @@ -4009,8 +4079,21 @@ Module vec. |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) @@ -4455,6 +4538,8 @@ Module vec. M.alloc (| Value.StructTuple "alloc::vec::into_iter::drop::DropGuard" + [] + [ T; A ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := diff --git a/CoqOfRust/alloc/vec/mod.v b/CoqOfRust/alloc/vec/mod.v index 7125ba802..082029265 100644 --- a/CoqOfRust/alloc/vec/mod.v +++ b/CoqOfRust/alloc/vec/mod.v @@ -28,6 +28,8 @@ Module vec. ltac:(M.monadic (Value.StructRecord "alloc::vec::Vec" + [] + [ T; Ty.path "alloc::alloc::Global" ] [ ("buf", M.call_closure (| @@ -76,7 +78,7 @@ Module vec. [], [] |), - [ M.read (| capacity |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| capacity |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -117,7 +119,7 @@ Module vec. [], [] |), - [ M.read (| capacity |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| capacity |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -158,7 +160,7 @@ Module vec. M.read (| ptr |); M.read (| length |); M.read (| capacity |); - Value.StructTuple "alloc::alloc::Global" [] + Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -195,7 +197,7 @@ Module vec. M.read (| ptr |); M.read (| length |); M.read (| capacity |); - Value.StructTuple "alloc::alloc::Global" [] + Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -224,6 +226,8 @@ Module vec. (let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::vec::Vec" + [] + [ T; A ] [ ("buf", M.call_closure (| @@ -266,6 +270,8 @@ Module vec. let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::vec::Vec" + [] + [ T; A ] [ ("buf", M.call_closure (| @@ -317,9 +323,16 @@ Module vec. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "alloc::vec::Vec") [] [ T; A ]; + Ty.path "alloc::collections::TryReserveError" + ] [ Value.StructRecord "alloc::vec::Vec" + [] + [ T; A ] [ ("buf", M.read (| @@ -476,6 +489,8 @@ Module vec. let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::vec::Vec" + [] + [ T; A ] [ ("buf", M.call_closure (| @@ -520,6 +535,8 @@ Module vec. let alloc := M.alloc (| alloc |) in Value.StructRecord "alloc::vec::Vec" + [] + [ T; A ] [ ("buf", M.call_closure (| @@ -3233,6 +3250,8 @@ Module vec. M.alloc (| Value.StructRecord "alloc::vec::retain_mut::BackshiftOnDrop" + [] + [ T; A ] [ ("v", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |)); ("processed_len", Value.Integer IntegerKind.Usize 0); @@ -3863,6 +3882,8 @@ Module vec. M.alloc (| Value.StructRecord "alloc::vec::dedup_by::FillGapOnDrop" + [] + [ T; A ] [ ("read", M.call_closure (| @@ -4460,6 +4481,8 @@ Module vec. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; T ] [ M.read (| value |) ] |) |) @@ -4526,7 +4549,13 @@ Module vec. |) |) in M.alloc (| Value.Tuple [] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; T ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4583,7 +4612,7 @@ Module vec. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))); fun γ => ltac:(M.monadic (let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -4639,6 +4668,8 @@ Module vec. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.call_closure (| T, @@ -4888,7 +4919,7 @@ Module vec. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))) ] |) |))) @@ -5169,7 +5200,11 @@ Module vec. M.get_function (| "core::slice::index::range", [], [ R ] |), [ M.read (| range |); - Value.StructRecord "core::ops::range::RangeTo" [ ("end_", M.read (| len |)) ] + Value.StructRecord + "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] + [ ("end_", M.read (| len |)) ] ] |) |), @@ -5250,6 +5285,8 @@ Module vec. M.alloc (| Value.StructRecord "alloc::vec::drain::Drain" + [] + [ T; A ] [ ("tail_start", M.read (| end_ |)); ("tail_len", @@ -6615,6 +6652,8 @@ Module vec. M.read (| src |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -6818,6 +6857,8 @@ Module vec. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1); ("end_", M.read (| n |)) ] ] |) @@ -7533,6 +7574,8 @@ Module vec. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -7571,6 +7614,11 @@ Module vec. |); Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::fmt::Arguments" + ] [ M.call_closure (| Ty.path @@ -7939,6 +7987,11 @@ Module vec. let replace_with := M.alloc (| replace_with |) in Value.StructRecord "alloc::vec::splice::Splice" + [] + [ + Ty.associated_in_trait "core::iter::traits::collect::IntoIterator" [] [] I "IntoIter"; + A + ] [ ("drain", M.call_closure (| @@ -8040,6 +8093,8 @@ Module vec. M.alloc (| Value.StructRecord "alloc::vec::extract_if::ExtractIf" + [] + [ T; F; A ] [ ("vec", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |)); ("idx", Value.Integer IntegerKind.Usize 0); @@ -8299,7 +8354,7 @@ Module vec. [], [ Ty.path "alloc::alloc::Global" ] |), - [ M.read (| elem |); M.read (| n |); Value.StructTuple "alloc::alloc::Global" [] ] + [ M.read (| elem |); M.read (| n |); Value.StructTuple "alloc::alloc::Global" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -9895,9 +9950,11 @@ Module vec. M.alloc (| Value.StructRecord "alloc::vec::into_iter::IntoIter" + [] + [ T; A ] [ ("buf", M.read (| buf |)); - ("phantom", Value.StructTuple "core::marker::PhantomData" []); + ("phantom", Value.StructTuple "core::marker::PhantomData" [] [ T ] []); ("cap", M.read (| cap |)); ("alloc", M.read (| alloc |)); ("ptr", M.read (| buf |)); @@ -11575,7 +11632,14 @@ Module vec. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::result::Result::Err" [ M.read (| vec |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "array") [ N ] [ T ]; + Ty.apply (Ty.path "alloc::vec::Vec") [] [ T; A ] + ] + [ M.read (| vec |) ] |) |) |) @@ -11624,7 +11688,16 @@ Module vec. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| array |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "array") [ N ] [ T ]; + Ty.apply (Ty.path "alloc::vec::Vec") [] [ T; A ] + ] + [ M.read (| array |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/alloc/vec/partial_eq.v b/CoqOfRust/alloc/vec/partial_eq.v index 3e618eba5..7aea4af10 100644 --- a/CoqOfRust/alloc/vec/partial_eq.v +++ b/CoqOfRust/alloc/vec/partial_eq.v @@ -43,7 +43,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -64,7 +64,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -110,7 +110,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -131,7 +131,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -192,7 +192,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -216,7 +216,7 @@ Module vec. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| other |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -262,7 +262,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -286,7 +286,7 @@ Module vec. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| other |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -347,7 +347,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -371,7 +371,7 @@ Module vec. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| other |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -417,7 +417,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -441,7 +441,7 @@ Module vec. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| other |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -506,7 +506,7 @@ Module vec. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| self |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -527,7 +527,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -576,7 +576,7 @@ Module vec. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| self |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -597,7 +597,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -661,7 +661,7 @@ Module vec. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| self |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -682,7 +682,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -731,7 +731,7 @@ Module vec. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| self |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -752,7 +752,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -812,7 +812,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -833,7 +833,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -879,7 +879,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -900,7 +900,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -960,7 +960,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -981,7 +981,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1027,7 +1027,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1048,7 +1048,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1129,7 +1129,7 @@ Module vec. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1150,7 +1150,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1216,7 +1216,7 @@ Module vec. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1237,7 +1237,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1318,7 +1318,7 @@ Module vec. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1342,7 +1342,7 @@ Module vec. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| other |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1408,7 +1408,7 @@ Module vec. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1432,7 +1432,7 @@ Module vec. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| other |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1514,7 +1514,7 @@ Module vec. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1538,7 +1538,7 @@ Module vec. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| other |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1604,7 +1604,7 @@ Module vec. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1628,7 +1628,7 @@ Module vec. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| other |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1696,7 +1696,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1717,7 +1717,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1769,7 +1769,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1790,7 +1790,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1857,7 +1857,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1881,7 +1881,7 @@ Module vec. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| other |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1933,7 +1933,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1957,7 +1957,7 @@ Module vec. Pointer.Kind.Ref, M.deref (| M.read (| M.deref (| M.read (| other |) |) |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) diff --git a/CoqOfRust/alloc/vec/set_len_on_drop.v b/CoqOfRust/alloc/vec/set_len_on_drop.v index cbb955343..b5d2a2c26 100644 --- a/CoqOfRust/alloc/vec/set_len_on_drop.v +++ b/CoqOfRust/alloc/vec/set_len_on_drop.v @@ -30,6 +30,8 @@ Module vec. (let len := M.alloc (| len |) in Value.StructRecord "alloc::vec::set_len_on_drop::SetLenOnDrop" + [] + [] [ ("local_len", M.read (| M.deref (| M.read (| len |) |) |)); ("len", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| len |) |) |)) diff --git a/CoqOfRust/alloc/vec/spec_from_elem.v b/CoqOfRust/alloc/vec/spec_from_elem.v index 570f0de4f..d816a68a3 100644 --- a/CoqOfRust/alloc/vec/spec_from_elem.v +++ b/CoqOfRust/alloc/vec/spec_from_elem.v @@ -123,6 +123,8 @@ Module vec. M.return_ (| Value.StructRecord "alloc::vec::Vec" + [] + [ T; A ] [ ("buf", M.call_closure (| @@ -243,6 +245,8 @@ Module vec. M.return_ (| Value.StructRecord "alloc::vec::Vec" + [] + [ Ty.path "i8"; A ] [ ("buf", M.call_closure (| @@ -392,6 +396,8 @@ Module vec. M.return_ (| Value.StructRecord "alloc::vec::Vec" + [] + [ Ty.path "u8"; A ] [ ("buf", M.call_closure (| diff --git a/CoqOfRust/alloc/vec/splice.v b/CoqOfRust/alloc/vec/splice.v index 2633c3ce2..6d8dc530c 100644 --- a/CoqOfRust/alloc/vec/splice.v +++ b/CoqOfRust/alloc/vec/splice.v @@ -1342,6 +1342,8 @@ Module vec. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1385,6 +1387,11 @@ Module vec. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) diff --git a/CoqOfRust/alloy_primitives/bits/address.v b/CoqOfRust/alloy_primitives/bits/address.v index 194ae961f..411f4fe1d 100644 --- a/CoqOfRust/alloy_primitives/bits/address.v +++ b/CoqOfRust/alloy_primitives/bits/address.v @@ -186,6 +186,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::address::AddressError::Hex" + [] + [] [ M.read (| value |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -241,6 +243,13 @@ Module bits. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] + ] [ (* Unsize *) M.pointer_coercion @@ -255,7 +264,18 @@ Module bits. γ, "alloy_primitives::bits::address::AddressError::InvalidChecksum" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] + ] + [] + |))) ] |) |))) @@ -391,9 +411,13 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::address::Address" + [] + [] [ Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 20 ] + [] [ M.call_closure (| Ty.apply @@ -535,7 +559,7 @@ Module bits. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] [] ] |) |) in @@ -659,6 +683,8 @@ Module bits. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 6) ] ] @@ -885,6 +911,8 @@ Module bits. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 38) ] ] |) @@ -946,9 +974,13 @@ Module bits. (let word := M.alloc (| word |) in Value.StructTuple "alloy_primitives::bits::address::Address" + [] + [] [ Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 20 ] + [] [ M.call_closure (| Ty.apply @@ -1029,6 +1061,8 @@ Module bits. M.borrow (| Pointer.Kind.Ref, word |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 12) ] ] |) @@ -1114,6 +1148,8 @@ Module bits. M.borrow (| Pointer.Kind.MutRef, word |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 12) ] ] |) @@ -1176,7 +1212,11 @@ Module bits. |) |) in M.alloc (| - Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" [ M.read (| word |) ] + Value.StructTuple + "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 32 ] + [] + [ M.read (| word |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1673,6 +1713,8 @@ Module bits. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 2) ] ] |) @@ -1852,6 +1894,8 @@ Module bits. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 2) ] ] |) @@ -1965,6 +2009,8 @@ Module bits. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 2) ] ] |) @@ -2468,6 +2514,8 @@ Module bits. M.borrow (| Pointer.Kind.MutRef, bytes |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1); ("end_", Value.Integer IntegerKind.Usize 21) @@ -2568,6 +2616,8 @@ Module bits. M.borrow (| Pointer.Kind.MutRef, bytes |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 21); ("end_", Value.Integer IntegerKind.Usize 53) @@ -2618,6 +2668,8 @@ Module bits. M.borrow (| Pointer.Kind.MutRef, bytes |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 53); ("end_", Value.Integer IntegerKind.Usize 85) @@ -2763,7 +2815,11 @@ Module bits. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple + "core::panicking::AssertKind::Eq" + [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -2795,6 +2851,8 @@ Module bits. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::fmt::Arguments" ] [ M.call_closure (| Ty.path "core::fmt::Arguments", @@ -2902,6 +2960,8 @@ Module bits. M.borrow (| Pointer.Kind.Ref, digest |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 12) ] ] |) @@ -2947,6 +3007,8 @@ Module bits. (let self := M.alloc (| self |) in Value.StructTuple "alloy_primitives::bits::address::AddressChecksumBuffer" + [] + [] [ M.call_closure (| Ty.apply @@ -3120,6 +3182,8 @@ Module bits. ltac:(M.monadic (Value.StructTuple "alloy_primitives::bits::address::AddressChecksumBuffer" + [] + [] [ M.call_closure (| Ty.apply diff --git a/CoqOfRust/alloy_primitives/bits/bloom.v b/CoqOfRust/alloy_primitives/bits/bloom.v index c4c03603d..cd042dd67 100644 --- a/CoqOfRust/alloy_primitives/bits/bloom.v +++ b/CoqOfRust/alloy_primitives/bits/bloom.v @@ -1430,6 +1430,8 @@ Module bits. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "i32" ] [ ("start", Value.Integer IntegerKind.I32 0); ("end_", Value.Integer IntegerKind.I32 3) @@ -1513,6 +1515,8 @@ Module bits. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", diff --git a/CoqOfRust/alloy_primitives/bits/fixed.v b/CoqOfRust/alloy_primitives/bits/fixed.v index e2f35ee4c..be496125a 100644 --- a/CoqOfRust/alloy_primitives/bits/fixed.v +++ b/CoqOfRust/alloy_primitives/bits/fixed.v @@ -454,7 +454,11 @@ Module bits. | [], [], [ value ] => ltac:(M.monadic (let value := M.alloc (| value |) in - Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" [ M.read (| value |) ])) + Value.StructTuple + "alloy_primitives::bits::fixed::FixedBytes" + [ N ] + [] + [ M.read (| value |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -980,6 +984,8 @@ Module bits. (let bytes := M.alloc (| bytes |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ N ] + [] [ M.read (| M.deref (| M.read (| bytes |) |) |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1012,6 +1018,8 @@ Module bits. (let bytes := M.alloc (| bytes |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ N ] + [] [ M.read (| M.deref (| M.read (| bytes |) |) |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1549,6 +1557,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 1 ] + [] [ M.call_closure (| Ty.apply (Ty.path "array") [ Value.Integer IntegerKind.Usize 1 ] [ Ty.path "u8" ], @@ -1631,6 +1641,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 1 ] + [] [ M.call_closure (| Ty.apply (Ty.path "array") [ Value.Integer IntegerKind.Usize 1 ] [ Ty.path "u8" ], @@ -1742,6 +1754,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 1 ] + [] [ M.call_closure (| Ty.apply (Ty.path "array") [ Value.Integer IntegerKind.Usize 1 ] [ Ty.path "u8" ], @@ -1824,6 +1838,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 1 ] + [] [ M.call_closure (| Ty.apply (Ty.path "array") [ Value.Integer IntegerKind.Usize 1 ] [ Ty.path "u8" ], @@ -1935,6 +1951,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 2 ] + [] [ M.call_closure (| Ty.apply (Ty.path "array") [ Value.Integer IntegerKind.Usize 2 ] [ Ty.path "u8" ], @@ -2017,6 +2035,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 2 ] + [] [ M.call_closure (| Ty.apply (Ty.path "array") [ Value.Integer IntegerKind.Usize 2 ] [ Ty.path "u8" ], @@ -2128,6 +2148,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 2 ] + [] [ M.call_closure (| Ty.apply (Ty.path "array") [ Value.Integer IntegerKind.Usize 2 ] [ Ty.path "u8" ], @@ -2210,6 +2232,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 2 ] + [] [ M.call_closure (| Ty.apply (Ty.path "array") [ Value.Integer IntegerKind.Usize 2 ] [ Ty.path "u8" ], @@ -2321,6 +2345,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 4 ] + [] [ M.call_closure (| Ty.apply (Ty.path "array") [ Value.Integer IntegerKind.Usize 4 ] [ Ty.path "u8" ], @@ -2403,6 +2429,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 4 ] + [] [ M.call_closure (| Ty.apply (Ty.path "array") [ Value.Integer IntegerKind.Usize 4 ] [ Ty.path "u8" ], @@ -2514,6 +2542,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 4 ] + [] [ M.call_closure (| Ty.apply (Ty.path "array") [ Value.Integer IntegerKind.Usize 4 ] [ Ty.path "u8" ], @@ -2596,6 +2626,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 4 ] + [] [ M.call_closure (| Ty.apply (Ty.path "array") [ Value.Integer IntegerKind.Usize 4 ] [ Ty.path "u8" ], @@ -2707,6 +2739,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 8 ] + [] [ M.call_closure (| Ty.apply (Ty.path "array") [ Value.Integer IntegerKind.Usize 8 ] [ Ty.path "u8" ], @@ -2789,6 +2823,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 8 ] + [] [ M.call_closure (| Ty.apply (Ty.path "array") [ Value.Integer IntegerKind.Usize 8 ] [ Ty.path "u8" ], @@ -2900,6 +2936,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 8 ] + [] [ M.call_closure (| Ty.apply (Ty.path "array") [ Value.Integer IntegerKind.Usize 8 ] [ Ty.path "u8" ], @@ -2982,6 +3020,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 8 ] + [] [ M.call_closure (| Ty.apply (Ty.path "array") [ Value.Integer IntegerKind.Usize 8 ] [ Ty.path "u8" ], @@ -3093,6 +3133,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 16 ] + [] [ M.call_closure (| Ty.apply @@ -3178,6 +3220,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 16 ] + [] [ M.call_closure (| Ty.apply @@ -3292,6 +3336,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 16 ] + [] [ M.call_closure (| Ty.apply @@ -3377,6 +3423,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 16 ] + [] [ M.call_closure (| Ty.apply @@ -3491,6 +3539,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 20 ] + [] [ M.call_closure (| Ty.apply @@ -3605,6 +3655,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 20 ] + [] [ M.call_closure (| Ty.apply @@ -3719,6 +3771,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 32 ] + [] [ M.call_closure (| Ty.apply @@ -3833,6 +3887,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 32 ] + [] [ M.call_closure (| Ty.apply @@ -3947,6 +4003,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 64 ] + [] [ M.call_closure (| Ty.apply @@ -4061,6 +4119,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 64 ] + [] [ M.call_closure (| Ty.apply @@ -4621,6 +4681,8 @@ Module bits. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", Value.Integer IntegerKind.Usize 2) @@ -4661,6 +4723,8 @@ Module bits. M.borrow (| Pointer.Kind.MutRef, buf |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 2); ("end_", Value.Integer IntegerKind.Usize 6) @@ -4719,6 +4783,8 @@ Module bits. M.borrow (| Pointer.Kind.MutRef, buf |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 6) ] ] |) @@ -4792,6 +4858,8 @@ Module bits. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -4837,6 +4905,8 @@ Module bits. M.borrow (| Pointer.Kind.MutRef, buf |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -5857,6 +5927,8 @@ Module bits. (M.alloc (| Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ N ] + [] [ repeat (| Value.Integer IntegerKind.U8 0, N |) ] |))). @@ -5877,7 +5949,11 @@ Module bits. | [], [], [ bytes ] => ltac:(M.monadic (let bytes := M.alloc (| bytes |) in - Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" [ M.read (| bytes |) ])) + Value.StructTuple + "alloy_primitives::bits::fixed::FixedBytes" + [ N ] + [] + [ M.read (| bytes |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5947,7 +6023,11 @@ Module bits. ] |) in M.alloc (| - Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" [ M.read (| bytes |) ] + Value.StructTuple + "alloy_primitives::bits::fixed::FixedBytes" + [ N ] + [] + [ M.read (| bytes |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5977,6 +6057,8 @@ Module bits. (let byte := M.alloc (| byte |) in Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ N ] + [] [ repeat (| M.read (| byte |), N |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6209,6 +6291,8 @@ Module bits. M.alloc (| Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Z ] + [] [ M.read (| result |) ] |) |))) @@ -6608,6 +6692,8 @@ Module bits. M.borrow (| Pointer.Kind.MutRef, bytes |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -6832,6 +6918,8 @@ Module bits. M.borrow (| Pointer.Kind.MutRef, bytes |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| len |)) ] ] |) @@ -7855,6 +7943,8 @@ Module bits. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| s |) |) |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| diff --git a/CoqOfRust/alloy_primitives/bits/function.v b/CoqOfRust/alloy_primitives/bits/function.v index 28e9a8fae..0a8a30c00 100644 --- a/CoqOfRust/alloy_primitives/bits/function.v +++ b/CoqOfRust/alloy_primitives/bits/function.v @@ -67,9 +67,13 @@ Module bits. (let word := M.alloc (| word |) in Value.StructTuple "alloy_primitives::bits::function::Function" + [] + [] [ Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 24 ] + [] [ M.call_closure (| Ty.apply @@ -150,6 +154,8 @@ Module bits. M.borrow (| Pointer.Kind.Ref, word |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 24) ] ] |) @@ -235,6 +241,8 @@ Module bits. M.borrow (| Pointer.Kind.MutRef, word |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 24) ] ] |) @@ -297,7 +305,11 @@ Module bits. |) |) in M.alloc (| - Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" [ M.read (| word |) ] + Value.StructTuple + "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 32 ] + [] + [ M.read (| word |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -384,6 +396,8 @@ Module bits. M.borrow (| Pointer.Kind.MutRef, bytes |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 20) ] ] |) @@ -465,6 +479,8 @@ Module bits. M.borrow (| Pointer.Kind.MutRef, bytes |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 20) ] ] |) @@ -509,9 +525,13 @@ Module bits. M.alloc (| Value.StructTuple "alloy_primitives::bits::function::Function" + [] + [] [ Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 24 ] + [] [ M.read (| bytes |) ] ] |) diff --git a/CoqOfRust/alloy_primitives/bits/macros.v b/CoqOfRust/alloy_primitives/bits/macros.v index 5490c2742..2d00b8a48 100644 --- a/CoqOfRust/alloy_primitives/bits/macros.v +++ b/CoqOfRust/alloy_primitives/bits/macros.v @@ -67,6 +67,8 @@ Module bits. ltac:(M.monadic (Value.StructTuple "alloy_primitives::bits::address::Address" + [] + [] [ M.call_closure (| Ty.apply @@ -493,6 +495,8 @@ Module bits. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::bits::address::Address" + [] + [] [ M.call_closure (| Ty.apply @@ -627,6 +631,8 @@ Module bits. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::bits::address::Address" + [] + [] [ M.call_closure (| Ty.apply @@ -761,6 +767,8 @@ Module bits. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::bits::address::Address" + [] + [] [ M.call_closure (| Ty.apply @@ -894,6 +902,8 @@ Module bits. (let self := M.alloc (| self |) in Value.StructTuple "alloy_primitives::bits::address::Address" + [] + [] [ M.call_closure (| Ty.apply @@ -1026,7 +1036,11 @@ Module bits. | [], [], [ value ] => ltac:(M.monadic (let value := M.alloc (| value |) in - Value.StructTuple "alloy_primitives::bits::address::Address" [ M.read (| value |) ])) + Value.StructTuple + "alloy_primitives::bits::address::Address" + [] + [] + [ M.read (| value |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1082,9 +1096,16 @@ Module bits. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "alloy_primitives::bits::address::Address"; + Ty.path "const_hex::error::FromHexError" + ] [ Value.StructTuple "alloy_primitives::bits::address::Address" + [] + [] [ M.read (| M.match_operator (| @@ -1933,7 +1954,14 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::address::Address" - [ Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" [ M.read (| value |) ] + [] + [] + [ + Value.StructTuple + "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 20 ] + [] + [ M.read (| value |) ] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2000,9 +2028,13 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::address::Address" + [] + [] [ Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 20 ] + [] [ M.read (| M.deref (| M.read (| value |) |) |) ] ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -2038,9 +2070,13 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::address::Address" + [] + [] [ Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 20 ] + [] [ M.read (| M.deref (| M.read (| value |) |) |) ] ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -4688,7 +4724,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -4769,7 +4805,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -4848,7 +4884,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -4937,7 +4973,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -5017,7 +5053,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -5098,7 +5134,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -5219,6 +5255,8 @@ Module bits. (M.alloc (| Value.StructTuple "alloy_primitives::bits::address::Address" + [] + [] [ M.read (| get_associated_constant (| @@ -5253,7 +5291,14 @@ Module bits. (let bytes := M.alloc (| bytes |) in Value.StructTuple "alloy_primitives::bits::address::Address" - [ Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" [ M.read (| bytes |) ] + [] + [] + [ + Value.StructTuple + "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 20 ] + [] + [ M.read (| bytes |) ] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5274,6 +5319,8 @@ Module bits. (let x := M.alloc (| x |) in Value.StructTuple "alloy_primitives::bits::address::Address" + [] + [] [ M.call_closure (| Ty.apply @@ -5312,6 +5359,8 @@ Module bits. (let byte := M.alloc (| byte |) in Value.StructTuple "alloy_primitives::bits::address::Address" + [] + [] [ M.call_closure (| Ty.apply @@ -5525,6 +5574,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::address::Address" + [] + [] [ M.call_closure (| Ty.apply @@ -5563,6 +5614,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::address::Address" + [] + [] [ M.call_closure (| Ty.apply @@ -5745,6 +5798,8 @@ Module bits. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::bits::address::Address" + [] + [] [ M.call_closure (| Ty.apply @@ -5798,6 +5853,8 @@ Module bits. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::bits::address::Address" + [] + [] [ M.call_closure (| Ty.apply @@ -5851,6 +5908,8 @@ Module bits. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::bits::address::Address" + [] + [] [ M.call_closure (| Ty.apply @@ -5958,6 +6017,8 @@ Module bits. ltac:(M.monadic (Value.StructTuple "alloy_primitives::bits::bloom::Bloom" + [] + [] [ M.call_closure (| Ty.apply @@ -6384,6 +6445,8 @@ Module bits. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::bits::bloom::Bloom" + [] + [] [ M.call_closure (| Ty.apply @@ -6518,6 +6581,8 @@ Module bits. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::bits::bloom::Bloom" + [] + [] [ M.call_closure (| Ty.apply @@ -6652,6 +6717,8 @@ Module bits. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::bits::bloom::Bloom" + [] + [] [ M.call_closure (| Ty.apply @@ -6785,6 +6852,8 @@ Module bits. (let self := M.alloc (| self |) in Value.StructTuple "alloy_primitives::bits::bloom::Bloom" + [] + [] [ M.call_closure (| Ty.apply @@ -6917,7 +6986,7 @@ Module bits. | [], [], [ value ] => ltac:(M.monadic (let value := M.alloc (| value |) in - Value.StructTuple "alloy_primitives::bits::bloom::Bloom" [ M.read (| value |) ])) + Value.StructTuple "alloy_primitives::bits::bloom::Bloom" [] [] [ M.read (| value |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6973,9 +7042,16 @@ Module bits. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "alloy_primitives::bits::bloom::Bloom"; + Ty.path "const_hex::error::FromHexError" + ] [ Value.StructTuple "alloy_primitives::bits::bloom::Bloom" + [] + [] [ M.read (| M.match_operator (| @@ -7896,7 +7972,14 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::bloom::Bloom" - [ Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" [ M.read (| value |) ] + [] + [] + [ + Value.StructTuple + "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 256 ] + [] + [ M.read (| value |) ] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -7963,9 +8046,13 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::bloom::Bloom" + [] + [] [ Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 256 ] + [] [ M.read (| M.deref (| M.read (| value |) |) |) ] ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -8002,9 +8089,13 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::bloom::Bloom" + [] + [] [ Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 256 ] + [] [ M.read (| M.deref (| M.read (| value |) |) |) ] ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -10656,7 +10747,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -10737,7 +10828,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -10816,7 +10907,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -10905,7 +10996,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -10985,7 +11076,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -11066,7 +11157,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -11187,6 +11278,8 @@ Module bits. (M.alloc (| Value.StructTuple "alloy_primitives::bits::bloom::Bloom" + [] + [] [ M.read (| get_associated_constant (| @@ -11221,7 +11314,14 @@ Module bits. (let bytes := M.alloc (| bytes |) in Value.StructTuple "alloy_primitives::bits::bloom::Bloom" - [ Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" [ M.read (| bytes |) ] + [] + [] + [ + Value.StructTuple + "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 256 ] + [] + [ M.read (| bytes |) ] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -11242,6 +11342,8 @@ Module bits. (let x := M.alloc (| x |) in Value.StructTuple "alloy_primitives::bits::bloom::Bloom" + [] + [] [ M.call_closure (| Ty.apply @@ -11280,6 +11382,8 @@ Module bits. (let byte := M.alloc (| byte |) in Value.StructTuple "alloy_primitives::bits::bloom::Bloom" + [] + [] [ M.call_closure (| Ty.apply @@ -11493,6 +11597,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::bloom::Bloom" + [] + [] [ M.call_closure (| Ty.apply @@ -11531,6 +11637,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::bloom::Bloom" + [] + [] [ M.call_closure (| Ty.apply @@ -11712,6 +11820,8 @@ Module bits. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::bits::bloom::Bloom" + [] + [] [ M.call_closure (| Ty.apply @@ -11765,6 +11875,8 @@ Module bits. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::bits::bloom::Bloom" + [] + [] [ M.call_closure (| Ty.apply @@ -11818,6 +11930,8 @@ Module bits. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::bits::bloom::Bloom" + [] + [] [ M.call_closure (| Ty.apply @@ -13669,7 +13783,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13754,7 +13868,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13839,7 +13953,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13932,7 +14046,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -14020,7 +14134,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -14105,7 +14219,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -14277,6 +14391,8 @@ Module bits. ltac:(M.monadic (Value.StructTuple "alloy_primitives::bits::function::Function" + [] + [] [ M.call_closure (| Ty.apply @@ -14703,6 +14819,8 @@ Module bits. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::bits::function::Function" + [] + [] [ M.call_closure (| Ty.apply @@ -14837,6 +14955,8 @@ Module bits. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::bits::function::Function" + [] + [] [ M.call_closure (| Ty.apply @@ -14971,6 +15091,8 @@ Module bits. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::bits::function::Function" + [] + [] [ M.call_closure (| Ty.apply @@ -15104,6 +15226,8 @@ Module bits. (let self := M.alloc (| self |) in Value.StructTuple "alloy_primitives::bits::function::Function" + [] + [] [ M.call_closure (| Ty.apply @@ -15236,7 +15360,11 @@ Module bits. | [], [], [ value ] => ltac:(M.monadic (let value := M.alloc (| value |) in - Value.StructTuple "alloy_primitives::bits::function::Function" [ M.read (| value |) ])) + Value.StructTuple + "alloy_primitives::bits::function::Function" + [] + [] + [ M.read (| value |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -15292,9 +15420,16 @@ Module bits. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "alloy_primitives::bits::function::Function"; + Ty.path "const_hex::error::FromHexError" + ] [ Value.StructTuple "alloy_primitives::bits::function::Function" + [] + [] [ M.read (| M.match_operator (| @@ -16219,7 +16354,14 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::function::Function" - [ Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" [ M.read (| value |) ] + [] + [] + [ + Value.StructTuple + "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 24 ] + [] + [ M.read (| value |) ] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -16286,9 +16428,13 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::function::Function" + [] + [] [ Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 24 ] + [] [ M.read (| M.deref (| M.read (| value |) |) |) ] ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -16324,9 +16470,13 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::function::Function" + [] + [] [ Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 24 ] + [] [ M.read (| M.deref (| M.read (| value |) |) |) ] ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -18983,7 +19133,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -19064,7 +19214,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -19143,7 +19293,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -19232,7 +19382,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -19312,7 +19462,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -19393,7 +19543,7 @@ Module bits. 0 |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -19514,6 +19664,8 @@ Module bits. (M.alloc (| Value.StructTuple "alloy_primitives::bits::function::Function" + [] + [] [ M.read (| get_associated_constant (| @@ -19548,7 +19700,14 @@ Module bits. (let bytes := M.alloc (| bytes |) in Value.StructTuple "alloy_primitives::bits::function::Function" - [ Value.StructTuple "alloy_primitives::bits::fixed::FixedBytes" [ M.read (| bytes |) ] + [] + [] + [ + Value.StructTuple + "alloy_primitives::bits::fixed::FixedBytes" + [ Value.Integer IntegerKind.Usize 24 ] + [] + [ M.read (| bytes |) ] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -19569,6 +19728,8 @@ Module bits. (let x := M.alloc (| x |) in Value.StructTuple "alloy_primitives::bits::function::Function" + [] + [] [ M.call_closure (| Ty.apply @@ -19607,6 +19768,8 @@ Module bits. (let byte := M.alloc (| byte |) in Value.StructTuple "alloy_primitives::bits::function::Function" + [] + [] [ M.call_closure (| Ty.apply @@ -19820,6 +19983,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::function::Function" + [] + [] [ M.call_closure (| Ty.apply @@ -19858,6 +20023,8 @@ Module bits. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bits::function::Function" + [] + [] [ M.call_closure (| Ty.apply @@ -20040,6 +20207,8 @@ Module bits. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::bits::function::Function" + [] + [] [ M.call_closure (| Ty.apply @@ -20093,6 +20262,8 @@ Module bits. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::bits::function::Function" + [] + [] [ M.call_closure (| Ty.apply @@ -20146,6 +20317,8 @@ Module bits. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::bits::function::Function" + [] + [] [ M.call_closure (| Ty.apply diff --git a/CoqOfRust/alloy_primitives/bytes/mod.v b/CoqOfRust/alloy_primitives/bytes/mod.v index 0e657fa61..f59550b87 100644 --- a/CoqOfRust/alloy_primitives/bytes/mod.v +++ b/CoqOfRust/alloy_primitives/bytes/mod.v @@ -21,6 +21,8 @@ Module bytes_. (let self := M.alloc (| self |) in Value.StructTuple "alloy_primitives::bytes_::Bytes" + [] + [] [ M.call_closure (| Ty.path "bytes::bytes::Bytes", @@ -72,6 +74,8 @@ Module bytes_. ltac:(M.monadic (Value.StructTuple "alloy_primitives::bytes_::Bytes" + [] + [] [ M.call_closure (| Ty.path "bytes::bytes::Bytes", @@ -899,6 +903,8 @@ Module bytes_. (let iter := M.alloc (| iter |) in Value.StructTuple "alloy_primitives::bytes_::Bytes" + [] + [] [ M.call_closure (| Ty.path "bytes::bytes::Bytes", @@ -941,6 +947,8 @@ Module bytes_. (let iter := M.alloc (| iter |) in Value.StructTuple "alloy_primitives::bytes_::Bytes" + [] + [] [ M.call_closure (| Ty.path "bytes::bytes::Bytes", @@ -1178,7 +1186,7 @@ Module bytes_. | [], [], [ value ] => ltac:(M.monadic (let value := M.alloc (| value |) in - Value.StructTuple "alloy_primitives::bytes_::Bytes" [ M.read (| value |) ])) + Value.StructTuple "alloy_primitives::bytes_::Bytes" [] [] [ M.read (| value |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1234,6 +1242,8 @@ Module bytes_. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bytes_::Bytes" + [] + [] [ M.call_closure (| Ty.path "bytes::bytes::Bytes", @@ -1601,6 +1611,8 @@ Module bytes_. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bytes_::Bytes" + [] + [] [ M.call_closure (| Ty.path "bytes::bytes::Bytes", @@ -1653,6 +1665,8 @@ Module bytes_. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::bytes_::Bytes" + [] + [] [ M.call_closure (| Ty.path "bytes::bytes::Bytes", @@ -1821,7 +1835,7 @@ Module bytes_. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1928,7 +1942,7 @@ Module bytes_. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -2033,7 +2047,7 @@ Module bytes_. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -2057,7 +2071,7 @@ Module bytes_. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -2541,6 +2555,8 @@ Module bytes_. ltac:(M.monadic (Value.StructTuple "alloy_primitives::bytes_::Bytes" + [] + [] [ M.call_closure (| Ty.path "bytes::bytes::Bytes", @@ -2567,6 +2583,8 @@ Module bytes_. (let bytes := M.alloc (| bytes |) in Value.StructTuple "alloy_primitives::bytes_::Bytes" + [] + [] [ M.call_closure (| Ty.path "bytes::bytes::Bytes", @@ -2599,6 +2617,8 @@ Module bytes_. (let data := M.alloc (| data |) in Value.StructTuple "alloy_primitives::bytes_::Bytes" + [] + [] [ M.call_closure (| Ty.path "bytes::bytes::Bytes", @@ -2632,6 +2652,8 @@ Module bytes_. let range := M.alloc (| range |) in Value.StructTuple "alloy_primitives::bytes_::Bytes" + [] + [] [ M.call_closure (| Ty.path "bytes::bytes::Bytes", @@ -2674,6 +2696,8 @@ Module bytes_. let subset := M.alloc (| subset |) in Value.StructTuple "alloy_primitives::bytes_::Bytes" + [] + [] [ M.call_closure (| Ty.path "bytes::bytes::Bytes", @@ -2712,6 +2736,8 @@ Module bytes_. let at_ := M.alloc (| at_ |) in Value.StructTuple "alloy_primitives::bytes_::Bytes" + [] + [] [ M.call_closure (| Ty.path "bytes::bytes::Bytes", @@ -2750,6 +2776,8 @@ Module bytes_. let at_ := M.alloc (| at_ |) in Value.StructTuple "alloy_primitives::bytes_::Bytes" + [] + [] [ M.call_closure (| Ty.path "bytes::bytes::Bytes", diff --git a/CoqOfRust/alloy_primitives/common.v b/CoqOfRust/alloy_primitives/common.v index 086c4e459..bde3a722e 100644 --- a/CoqOfRust/alloy_primitives/common.v +++ b/CoqOfRust/alloy_primitives/common.v @@ -167,7 +167,7 @@ Module common. Definition default (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with | [], [], [] => - ltac:(M.monadic (Value.StructTuple "alloy_primitives::common::TxKind::Create" [])) + ltac:(M.monadic (Value.StructTuple "alloy_primitives::common::TxKind::Create" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -455,7 +455,9 @@ Module common. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "alloy_primitives::common::TxKind::Create" [] |))); + M.alloc (| + Value.StructTuple "alloy_primitives::common::TxKind::Create" [] [] [] + |))); fun γ => ltac:(M.monadic (let γ0_0 := @@ -468,6 +470,8 @@ Module common. M.alloc (| Value.StructTuple "alloy_primitives::common::TxKind::Call" + [] + [] [ M.read (| addr |) ] |))) ] @@ -504,7 +508,7 @@ Module common. | [], [], [ value ] => ltac:(M.monadic (let value := M.alloc (| value |) in - Value.StructTuple "alloy_primitives::common::TxKind::Call" [ M.read (| value |) ])) + Value.StructTuple "alloy_primitives::common::TxKind::Call" [] [] [ M.read (| value |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -617,7 +621,18 @@ Module common. (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "alloy_primitives::common::TxKind::Create" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.path "alloy_primitives::bits::address::Address" ] + ] + [] + |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in @@ -631,6 +646,13 @@ Module common. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.path "alloy_primitives::bits::address::Address" ] + ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| to |) |) |) ] |))) ] diff --git a/CoqOfRust/alloy_primitives/links/common.v b/CoqOfRust/alloy_primitives/links/common.v index f3a650e97..16ccac442 100644 --- a/CoqOfRust/alloy_primitives/links/common.v +++ b/CoqOfRust/alloy_primitives/links/common.v @@ -18,8 +18,8 @@ Module TxKind. Φ := Ty.path "alloy_primitives::common::TxKind"; φ x := match x with - | Create => Value.StructTuple "alloy_primitives::common::TxKind::Create" [] - | Call address => Value.StructTuple "alloy_primitives::common::TxKind::Call" [φ address] + | Create => Value.StructTuple "alloy_primitives::common::TxKind::Create" [] [] [] + | Call address => Value.StructTuple "alloy_primitives::common::TxKind::Call" [] [] [φ address] end; }. diff --git a/CoqOfRust/alloy_primitives/log/mod.v b/CoqOfRust/alloy_primitives/log/mod.v index d9609e783..99ae87a69 100644 --- a/CoqOfRust/alloy_primitives/log/mod.v +++ b/CoqOfRust/alloy_primitives/log/mod.v @@ -182,6 +182,8 @@ Module log. (let self := M.alloc (| self |) in Value.StructRecord "alloy_primitives::log::LogData" + [] + [] [ ("topics", M.call_closure (| @@ -355,6 +357,8 @@ Module log. ltac:(M.monadic (Value.StructRecord "alloy_primitives::log::LogData" + [] + [] [ ("topics", M.call_closure (| @@ -683,6 +687,8 @@ Module log. let data := M.alloc (| data |) in Value.StructRecord "alloy_primitives::log::LogData" + [] + [] [ ("topics", M.read (| topics |)); ("data", M.read (| data |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -764,6 +770,8 @@ Module log. ltac:(M.monadic (Value.StructRecord "alloy_primitives::log::LogData" + [] + [] [ ("topics", M.call_closure (| @@ -1257,6 +1265,8 @@ Module log. (let self := M.alloc (| self |) in Value.StructRecord "alloy_primitives::log::Log" + [] + [ T ] [ ("address", M.call_closure (| @@ -1408,6 +1418,8 @@ Module log. ltac:(M.monadic (Value.StructRecord "alloy_primitives::log::Log" + [] + [ T ] [ ("address", M.call_closure (| @@ -1835,6 +1847,8 @@ Module log. (let data := M.copy (| γ |) in Value.StructRecord "alloy_primitives::log::Log" + [] + [ Ty.path "alloy_primitives::log::LogData" ] [ ("address", M.read (| address |)); ("data", M.read (| data |)) ])) ] @@ -1864,6 +1878,8 @@ Module log. let data := M.alloc (| data |) in Value.StructRecord "alloy_primitives::log::Log" + [] + [ Ty.path "alloy_primitives::log::LogData" ] [ ("address", M.read (| address |)); ("data", @@ -1897,6 +1913,8 @@ Module log. ltac:(M.monadic (Value.StructRecord "alloy_primitives::log::Log" + [] + [ Ty.path "alloy_primitives::log::LogData" ] [ ("address", M.read (| @@ -1948,6 +1966,8 @@ Module log. let data := M.alloc (| data |) in Value.StructRecord "alloy_primitives::log::Log" + [] + [ T ] [ ("address", M.read (| address |)); ("data", M.read (| data |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2077,6 +2097,8 @@ Module log. (let self := M.alloc (| self |) in Value.StructRecord "alloy_primitives::log::Log" + [] + [ Ty.path "alloy_primitives::log::LogData" ] [ ("address", M.read (| diff --git a/CoqOfRust/alloy_primitives/map/fixed.v b/CoqOfRust/alloy_primitives/map/fixed.v index 3f9077030..e6af416a9 100644 --- a/CoqOfRust/alloy_primitives/map/fixed.v +++ b/CoqOfRust/alloy_primitives/map/fixed.v @@ -151,6 +151,8 @@ Module map. (let self := M.alloc (| self |) in Value.StructRecord "alloy_primitives::map::fixed::FbBuildHasher" + [ N ] + [] [ ("inner", M.call_closure (| @@ -240,6 +242,8 @@ Module map. ltac:(M.monadic (Value.StructRecord "alloy_primitives::map::fixed::FbBuildHasher" + [ N ] + [] [ ("inner", M.call_closure (| @@ -376,6 +380,8 @@ Module map. (let self := M.alloc (| self |) in Value.StructRecord "alloy_primitives::map::fixed::FbHasher" + [ N ] + [] [ ("inner", M.call_closure (| @@ -400,7 +406,12 @@ Module map. |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "array") [ N ] [ Ty.tuple [] ] ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -454,6 +465,8 @@ Module map. (let self := M.alloc (| self |) in Value.StructRecord "alloy_primitives::map::fixed::FbHasher" + [ N ] + [] [ ("inner", M.call_closure (| @@ -550,6 +563,8 @@ Module map. ltac:(M.monadic (Value.StructRecord "alloy_primitives::map::fixed::FbHasher" + [ N ] + [] [ ("inner", M.call_closure (| @@ -584,7 +599,12 @@ Module map. |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "array") [ N ] [ Ty.tuple [] ] ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -805,6 +825,8 @@ Module map. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -837,6 +859,8 @@ Module map. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -1070,6 +1094,8 @@ Module map. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1102,6 +1128,8 @@ Module map. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/alloy_primitives/sealed.v b/CoqOfRust/alloy_primitives/sealed.v index 8a107dc8c..b3cb5b592 100644 --- a/CoqOfRust/alloy_primitives/sealed.v +++ b/CoqOfRust/alloy_primitives/sealed.v @@ -31,6 +31,8 @@ Module sealed. (let self := M.alloc (| self |) in Value.StructRecord "alloy_primitives::sealed::Sealed" + [] + [ T ] [ ("inner", M.call_closure (| @@ -552,6 +554,8 @@ Module sealed. M.alloc (| Value.StructRecord "alloy_primitives::sealed::Sealed" + [] + [ T ] [ ("inner", M.read (| inner |)); ("seal", M.read (| seal |)) ] |) |))) @@ -611,6 +615,8 @@ Module sealed. M.alloc (| Value.StructRecord "alloy_primitives::sealed::Sealed" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ ("inner", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| inner |) |) |)); ("seal", M.read (| seal |)) @@ -798,6 +804,8 @@ Module sealed. let seal := M.alloc (| seal |) in Value.StructRecord "alloy_primitives::sealed::Sealed" + [] + [ T ] [ ("inner", M.read (| inner |)); ("seal", M.read (| seal |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/alloy_primitives/signature/error.v b/CoqOfRust/alloy_primitives/signature/error.v index 59e052980..30f387451 100644 --- a/CoqOfRust/alloy_primitives/signature/error.v +++ b/CoqOfRust/alloy_primitives/signature/error.v @@ -256,6 +256,8 @@ Module signature. (let err := M.alloc (| err |) in Value.StructTuple "alloy_primitives::signature::error::SignatureError::FromHex" + [] + [] [ M.read (| err |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -313,6 +315,13 @@ Module signature. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] + ] [ (* Unsize *) M.pointer_coercion @@ -321,7 +330,18 @@ Module signature. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] + ] + [] + |))) ] |) |))) diff --git a/CoqOfRust/alloy_primitives/signature/parity.v b/CoqOfRust/alloy_primitives/signature/parity.v index 149561164..8cbad7c92 100644 --- a/CoqOfRust/alloy_primitives/signature/parity.v +++ b/CoqOfRust/alloy_primitives/signature/parity.v @@ -630,6 +630,8 @@ Module signature. ltac:(M.monadic (Value.StructTuple "alloy_primitives::signature::parity::Parity::Parity" + [] + [] [ Value.Bool false ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -748,6 +750,8 @@ Module signature. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::signature::parity::Parity::Parity" + [] + [] [ UnOp.not (| M.call_closure (| @@ -798,6 +802,8 @@ Module signature. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::signature::parity::Parity::Parity" + [] + [] [ M.read (| value |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -878,9 +884,16 @@ Module signature. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "alloy_primitives::signature::parity::Parity"; + Ty.path "alloy_primitives::signature::error::SignatureError" + ] [ Value.StructTuple "alloy_primitives::signature::parity::Parity::Parity" + [] + [] [ M.call_closure (| Ty.path "bool", @@ -923,9 +936,16 @@ Module signature. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "alloy_primitives::signature::parity::Parity"; + Ty.path "alloy_primitives::signature::error::SignatureError" + ] [ Value.StructTuple "alloy_primitives::signature::parity::Parity::NonEip155" + [] + [] [ M.call_closure (| Ty.path "bool", @@ -954,9 +974,16 @@ Module signature. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "alloy_primitives::signature::parity::Parity"; + Ty.path "alloy_primitives::signature::error::SignatureError" + ] [ Value.StructTuple "alloy_primitives::signature::parity::Parity::Eip155" + [] + [] [ M.read (| value |) ] ] |))); @@ -965,9 +992,16 @@ Module signature. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "alloy_primitives::signature::parity::Parity"; + Ty.path "alloy_primitives::signature::error::SignatureError" + ] [ Value.StructTuple "alloy_primitives::signature::error::SignatureError::InvalidParity" + [] + [] [ M.read (| value |) ] ] |))) @@ -1085,6 +1119,8 @@ Module signature. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -1095,7 +1131,9 @@ Module signature. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] [] + |))) ] |) |))) @@ -1370,6 +1408,8 @@ Module signature. (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -1388,7 +1428,9 @@ Module signature. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u8" ] [] + |))) ] |) |))) @@ -1506,6 +1548,8 @@ Module signature. M.alloc (| Value.StructTuple "alloy_primitives::signature::parity::Parity::Parity" + [] + [] [ UnOp.not (| M.read (| b |) |) ] |))); fun γ => @@ -1520,6 +1564,8 @@ Module signature. M.alloc (| Value.StructTuple "alloy_primitives::signature::parity::Parity::NonEip155" + [] + [] [ UnOp.not (| M.read (| b |) |) ] |))); fun γ => @@ -1538,6 +1584,8 @@ Module signature. M.alloc (| Value.StructTuple "alloy_primitives::signature::parity::Parity::Eip155" + [] + [] [ Value.Integer IntegerKind.U64 1 ] |))); fun γ => @@ -1552,6 +1600,8 @@ Module signature. M.alloc (| Value.StructTuple "alloy_primitives::signature::parity::Parity::Eip155" + [] + [] [ M.read (| M.match_operator (| @@ -1615,6 +1665,8 @@ Module signature. M.alloc (| Value.StructTuple "alloy_primitives::signature::parity::Parity::Eip155" + [] + [] [ M.call_closure (| Ty.path "u64", @@ -1664,6 +1716,8 @@ Module signature. M.alloc (| Value.StructTuple "alloy_primitives::signature::parity::Parity::NonEip155" + [] + [] [ M.call_closure (| Ty.path "bool", @@ -1783,6 +1837,8 @@ Module signature. M.alloc (| Value.StructTuple "alloy_primitives::signature::parity::Parity::Eip155" + [] + [] [ M.call_closure (| Ty.path "u64", @@ -1816,6 +1872,8 @@ Module signature. (let self := M.alloc (| self |) in Value.StructTuple "alloy_primitives::signature::parity::Parity::Parity" + [] + [] [ M.call_closure (| Ty.path "bool", diff --git a/CoqOfRust/alloy_primitives/signature/primitive_sig.v b/CoqOfRust/alloy_primitives/signature/primitive_sig.v index ca5a2467d..568666d82 100644 --- a/CoqOfRust/alloy_primitives/signature/primitive_sig.v +++ b/CoqOfRust/alloy_primitives/signature/primitive_sig.v @@ -591,9 +591,17 @@ Module signature. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "alloy_primitives::signature::primitive_sig::PrimitiveSignature"; + Ty.path "alloy_primitives::signature::error::SignatureError" + ] [ Value.StructTuple "alloy_primitives::signature::error::SignatureError::FromBytes" + [] + [] [ mk_str (| "expected exactly 65 bytes" |) ] ] |) @@ -673,6 +681,8 @@ Module signature. |); Value.StructTuple "alloy_primitives::signature::error::SignatureError::InvalidParity" + [] + [] [ M.cast (Ty.path "u64") @@ -760,6 +770,11 @@ Module signature. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "alloy_primitives::signature::primitive_sig::PrimitiveSignature"; + Ty.path "alloy_primitives::signature::error::SignatureError" + ] [ M.call_closure (| Ty.path "alloy_primitives::signature::primitive_sig::PrimitiveSignature", @@ -803,6 +818,8 @@ Module signature. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 64) ] ] |) @@ -1057,7 +1074,7 @@ Module signature. |), [ M.borrow (| Pointer.Kind.Ref, bytes |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1389,6 +1406,8 @@ Module signature. let v := M.alloc (| v |) in Value.StructRecord "alloy_primitives::signature::primitive_sig::PrimitiveSignature" + [] + [] [ ("r", M.read (| r |)); ("s", M.read (| s |)); ("y_parity", M.read (| v |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1652,9 +1671,14 @@ Module signature. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "alloy_primitives::signature::primitive_sig::PrimitiveSignature" + ] [ Value.StructRecord "alloy_primitives::signature::primitive_sig::PrimitiveSignature" + [] + [] [ ("y_parity", UnOp.not (| @@ -1727,7 +1751,14 @@ Module signature. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "alloy_primitives::signature::primitive_sig::PrimitiveSignature" + ] + [] + |))) ] |) |))) @@ -1808,6 +1839,8 @@ Module signature. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| bytes |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 32) ] ] |) @@ -1873,6 +1906,8 @@ Module signature. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| bytes |) |) |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 32); ("end_", Value.Integer IntegerKind.Usize 64) @@ -2047,6 +2082,8 @@ Module signature. M.borrow (| Pointer.Kind.MutRef, sig |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 32) ] ] |) @@ -2131,6 +2168,8 @@ Module signature. M.borrow (| Pointer.Kind.MutRef, sig |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 32); ("end_", Value.Integer IntegerKind.Usize 64) @@ -2227,6 +2266,8 @@ Module signature. let v := M.alloc (| v |) in Value.StructRecord "alloy_primitives::signature::primitive_sig::PrimitiveSignature" + [] + [] [ ("y_parity", M.read (| v |)); ("r", diff --git a/CoqOfRust/alloy_primitives/signature/sig.v b/CoqOfRust/alloy_primitives/signature/sig.v index 5c1c847c6..a27e62a7b 100644 --- a/CoqOfRust/alloy_primitives/signature/sig.v +++ b/CoqOfRust/alloy_primitives/signature/sig.v @@ -584,9 +584,16 @@ Module signature. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "alloy_primitives::signature::sig::Signature"; + Ty.path "alloy_primitives::signature::error::SignatureError" + ] [ Value.StructTuple "alloy_primitives::signature::error::SignatureError::FromBytes" + [] + [] [ mk_str (| "expected exactly 65 bytes" |) ] ] |) @@ -647,6 +654,8 @@ Module signature. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 64) ] ] |) @@ -904,7 +913,7 @@ Module signature. |), [ M.borrow (| Pointer.Kind.Ref, bytes |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1247,6 +1256,8 @@ Module signature. let v := M.alloc (| v |) in Value.StructRecord "alloy_primitives::signature::sig::Signature" + [] + [] [ ("r", M.read (| r |)); ("s", M.read (| s |)); ("v", M.read (| v |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1524,9 +1535,13 @@ Module signature. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "alloy_primitives::signature::sig::Signature" ] [ Value.StructRecord "alloy_primitives::signature::sig::Signature" + [] + [] [ ("v", M.call_closure (| @@ -1609,7 +1624,13 @@ Module signature. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "alloy_primitives::signature::sig::Signature" ] + [] + |))) ] |) |))) @@ -1693,6 +1714,8 @@ Module signature. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| bytes |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 32) ] ] |) @@ -1758,6 +1781,8 @@ Module signature. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| bytes |) |) |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 32); ("end_", Value.Integer IntegerKind.Usize 64) @@ -1825,9 +1850,16 @@ Module signature. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "alloy_primitives::signature::sig::Signature"; + Ty.path "alloy_primitives::signature::error::SignatureError" + ] [ Value.StructRecord "alloy_primitives::signature::sig::Signature" + [] + [] [ ("v", M.read (| @@ -2333,6 +2365,8 @@ Module signature. M.borrow (| Pointer.Kind.MutRef, sig |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 32) ] ] |) @@ -2417,6 +2451,8 @@ Module signature. M.borrow (| Pointer.Kind.MutRef, sig |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 32); ("end_", Value.Integer IntegerKind.Usize 64) @@ -2546,6 +2582,8 @@ Module signature. let parity := M.alloc (| parity |) in Value.StructRecord "alloy_primitives::signature::sig::Signature" + [] + [] [ ("v", M.call_closure (| diff --git a/CoqOfRust/alloy_primitives/signature/utils.v b/CoqOfRust/alloy_primitives/signature/utils.v index edcfee698..0945353c2 100644 --- a/CoqOfRust/alloy_primitives/signature/utils.v +++ b/CoqOfRust/alloy_primitives/signature/utils.v @@ -94,7 +94,13 @@ Module signature. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "bool" ] + [] + |) |) |) |))); @@ -114,6 +120,8 @@ Module signature. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "bool" ] [ M.call_closure (| Ty.path "bool", diff --git a/CoqOfRust/alloy_primitives/signed/conversions.v b/CoqOfRust/alloy_primitives/signed/conversions.v index d3702abb3..c352ad2b4 100644 --- a/CoqOfRust/alloy_primitives/signed/conversions.v +++ b/CoqOfRust/alloy_primitives/signed/conversions.v @@ -39,7 +39,11 @@ Module signed. [ Ty.apply (Ty.path "alloy_primitives::signed::int::Signed") [ BITS; LIMBS ] [] ] := M.alloc (| - Value.StructTuple "alloy_primitives::signed::int::Signed" [ M.read (| from |) ] + Value.StructTuple + "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] + [ M.read (| from |) ] |) in M.match_operator (| Ty.apply @@ -78,7 +82,17 @@ Module signed. "alloy_primitives::signed::sign::Sign::Positive" |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| value |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + []; + Ty.path "alloy_primitives::signed::errors::BigIntConversionError" + ] + [ M.read (| value |) ] |))); fun γ => ltac:(M.monadic @@ -90,10 +104,20 @@ Module signed. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + []; + Ty.path "alloy_primitives::signed::errors::BigIntConversionError" + ] [ Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" [] + [] + [] ] |))) ] @@ -180,6 +204,11 @@ Module signed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.path "alloy_primitives::signed::errors::BigIntConversionError" + ] [ M.read (| M.SubPointer.get_struct_tuple_field (| @@ -200,10 +229,17 @@ Module signed. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.path "alloy_primitives::signed::errors::BigIntConversionError" + ] [ Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" [] + [] + [] ] |))) ] @@ -561,6 +597,8 @@ Module signed. [ Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" + [] + [] []; M.borrow (| Pointer.Kind.Ref, @@ -588,6 +626,8 @@ Module signed. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1) ] ] |) @@ -614,6 +654,8 @@ Module signed. [ Value.StructTuple "alloy_primitives::signed::sign::Sign::Negative" + [] + [] []; M.borrow (| Pointer.Kind.Ref, @@ -641,6 +683,8 @@ Module signed. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1) ] ] |) @@ -655,6 +699,8 @@ Module signed. [ Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" + [] + [] []; M.read (| s |) ] @@ -862,6 +908,8 @@ Module signed. Value.StructTuple "alloy_primitives::signed::errors::ParseSignedError::IntegerOverflow" [] + [] + [] ] |) |))) @@ -974,10 +1022,18 @@ Module signed. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i128"; + Ty.path + "alloy_primitives::signed::errors::BigIntConversionError" + ] [ Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" [] + [] + [] ] |) |) @@ -1025,6 +1081,11 @@ Module signed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "i128"; + Ty.path "alloy_primitives::signed::errors::BigIntConversionError" + ] [ M.cast (Ty.path "i128") @@ -1156,6 +1217,11 @@ Module signed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "i128"; + Ty.path "alloy_primitives::signed::errors::BigIntConversionError" + ] [ M.call_closure (| Ty.path "i128", @@ -1425,10 +1491,21 @@ Module signed. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + []; + Ty.path + "alloy_primitives::signed::errors::BigIntConversionError" + ] [ Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" [] + [] + [] ] |) |) @@ -1440,9 +1517,19 @@ Module signed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + []; + Ty.path "alloy_primitives::signed::errors::BigIntConversionError" + ] [ Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -1559,10 +1646,18 @@ Module signed. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u128"; + Ty.path + "alloy_primitives::signed::errors::BigIntConversionError" + ] [ Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" [] + [] + [] ] |) |) @@ -1628,6 +1723,8 @@ Module signed. M.alloc (| Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.read (| saturated |) ] |) |) @@ -1642,10 +1739,18 @@ Module signed. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u128"; + Ty.path + "alloy_primitives::signed::errors::BigIntConversionError" + ] [ Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" [] + [] + [] ] |) |) @@ -1752,6 +1857,8 @@ Module signed. ltac:(M.monadic (Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" + [] + [] [])) ] |))) @@ -1878,10 +1985,21 @@ Module signed. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + []; + Ty.path + "alloy_primitives::signed::errors::BigIntConversionError" + ] [ Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" [] + [] + [] ] |) |) @@ -3651,6 +3769,8 @@ Module signed. ltac:(M.monadic (Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" + [] + [] [])) ] |))) @@ -3781,13 +3901,19 @@ Module signed. [] |), [ - Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" []; + Value.StructTuple + "alloy_primitives::signed::sign::Sign::Positive" + [] + [] + []; M.read (| u |) ] |); Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" [] + [] + [] ] |) |) @@ -3957,9 +4083,19 @@ Module signed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + []; + Ty.path "alloy_primitives::signed::errors::BigIntConversionError" + ] [ Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.read (| tc |) ] ] |) @@ -4213,6 +4349,8 @@ Module signed. ltac:(M.monadic (Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" + [] + [] [])) ] |))) @@ -4470,6 +4608,8 @@ Module signed. ltac:(M.monadic (Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" + [] + [] [])) ] |))) @@ -4677,6 +4817,8 @@ Module signed. ltac:(M.monadic (Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" + [] + [] [])) ] |))) @@ -4807,13 +4949,19 @@ Module signed. [] |), [ - Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" []; + Value.StructTuple + "alloy_primitives::signed::sign::Sign::Positive" + [] + [] + []; M.read (| u |) ] |); Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" [] + [] + [] ] |) |) @@ -4983,9 +5131,19 @@ Module signed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + []; + Ty.path "alloy_primitives::signed::errors::BigIntConversionError" + ] [ Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.read (| tc |) ] ] |) @@ -5239,6 +5397,8 @@ Module signed. ltac:(M.monadic (Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" + [] + [] [])) ] |))) @@ -5496,6 +5656,8 @@ Module signed. ltac:(M.monadic (Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" + [] + [] [])) ] |))) @@ -5703,6 +5865,8 @@ Module signed. ltac:(M.monadic (Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" + [] + [] [])) ] |))) @@ -5833,13 +5997,19 @@ Module signed. [] |), [ - Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" []; + Value.StructTuple + "alloy_primitives::signed::sign::Sign::Positive" + [] + [] + []; M.read (| u |) ] |); Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" [] + [] + [] ] |) |) @@ -6009,9 +6179,19 @@ Module signed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + []; + Ty.path "alloy_primitives::signed::errors::BigIntConversionError" + ] [ Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.read (| tc |) ] ] |) @@ -6265,6 +6445,8 @@ Module signed. ltac:(M.monadic (Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" + [] + [] [])) ] |))) @@ -6522,6 +6704,8 @@ Module signed. ltac:(M.monadic (Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" + [] + [] [])) ] |))) @@ -6729,6 +6913,8 @@ Module signed. ltac:(M.monadic (Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" + [] + [] [])) ] |))) @@ -6859,13 +7045,19 @@ Module signed. [] |), [ - Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" []; + Value.StructTuple + "alloy_primitives::signed::sign::Sign::Positive" + [] + [] + []; M.read (| u |) ] |); Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" [] + [] + [] ] |) |) @@ -7035,9 +7227,19 @@ Module signed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + []; + Ty.path "alloy_primitives::signed::errors::BigIntConversionError" + ] [ Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.read (| tc |) ] ] |) @@ -7291,6 +7493,8 @@ Module signed. ltac:(M.monadic (Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" + [] + [] [])) ] |))) @@ -7548,6 +7752,8 @@ Module signed. ltac:(M.monadic (Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" + [] + [] [])) ] |))) @@ -7755,6 +7961,8 @@ Module signed. ltac:(M.monadic (Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" + [] + [] [])) ] |))) @@ -7885,13 +8093,19 @@ Module signed. [] |), [ - Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" []; + Value.StructTuple + "alloy_primitives::signed::sign::Sign::Positive" + [] + [] + []; M.read (| u |) ] |); Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" [] + [] + [] ] |) |) @@ -8061,9 +8275,19 @@ Module signed. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + []; + Ty.path "alloy_primitives::signed::errors::BigIntConversionError" + ] [ Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.read (| tc |) ] ] |) @@ -8317,6 +8541,8 @@ Module signed. ltac:(M.monadic (Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" + [] + [] [])) ] |))) @@ -8574,6 +8800,8 @@ Module signed. ltac:(M.monadic (Value.StructTuple "alloy_primitives::signed::errors::BigIntConversionError" + [] + [] [])) ] |))) diff --git a/CoqOfRust/alloy_primitives/signed/errors.v b/CoqOfRust/alloy_primitives/signed/errors.v index 156e58229..245fcfcbd 100644 --- a/CoqOfRust/alloy_primitives/signed/errors.v +++ b/CoqOfRust/alloy_primitives/signed/errors.v @@ -375,12 +375,16 @@ Module signed. Value.StructTuple "alloy_primitives::signed::errors::ParseSignedError::IntegerOverflow" [] + [] + [] |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "alloy_primitives::signed::errors::ParseSignedError::Ruint" + [] + [] [ M.read (| err |) ] |))) ] @@ -440,6 +444,13 @@ Module signed. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] + ] [ (* Unsize *) M.pointer_coercion @@ -454,7 +465,18 @@ Module signed. γ, "alloy_primitives::signed::errors::ParseSignedError::IntegerOverflow" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] + ] + [] + |))) ] |) |))) diff --git a/CoqOfRust/alloy_primitives/signed/int.v b/CoqOfRust/alloy_primitives/signed/int.v index 9929ce4ff..79b183ea1 100644 --- a/CoqOfRust/alloy_primitives/signed/int.v +++ b/CoqOfRust/alloy_primitives/signed/int.v @@ -81,6 +81,8 @@ Module signed. ltac:(M.monadic (Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -1115,6 +1117,8 @@ Module signed. (M.alloc (| Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.read (| get_associated_constant (| @@ -1148,7 +1152,11 @@ Module signed. | [], [], [ val ] => ltac:(M.monadic (let val := M.alloc (| val |) in - Value.StructTuple "alloy_primitives::signed::int::Signed" [ M.read (| val |) ])) + Value.StructTuple + "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] + [ M.read (| val |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1489,6 +1497,8 @@ Module signed. Value.StructTuple "alloy_primitives::signed::sign::Sign::Negative" [] + [] + [] |) |) |) @@ -1500,7 +1510,7 @@ Module signed. ] |) in M.alloc (| - Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" [] + Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" [] [] [] |) |))) |))) @@ -2319,6 +2329,8 @@ Module signed. M.alloc (| Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.read (| M.match_operator (| @@ -2537,12 +2549,30 @@ Module signed. (let γ := M.use overflow in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] [ M.read (| result |) ] |))) ] @@ -2675,6 +2705,8 @@ Module signed. [ Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" + [] + [] []; M.borrow (| Pointer.Kind.Ref, @@ -2702,6 +2734,8 @@ Module signed. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1) ] ] |) @@ -2728,6 +2762,8 @@ Module signed. [ Value.StructTuple "alloy_primitives::signed::sign::Sign::Negative" + [] + [] []; M.borrow (| Pointer.Kind.Ref, @@ -2755,6 +2791,8 @@ Module signed. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1) ] ] |) @@ -2769,6 +2807,8 @@ Module signed. [ Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" + [] + [] []; M.read (| value |) ] @@ -2974,6 +3014,8 @@ Module signed. Value.StructTuple "alloy_primitives::signed::errors::ParseSignedError::IntegerOverflow" [] + [] + [] ] |) |))) @@ -3272,6 +3314,8 @@ Module signed. [ Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" + [] + [] []; M.borrow (| Pointer.Kind.Ref, @@ -3299,6 +3343,8 @@ Module signed. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1) ] ] |) @@ -3325,6 +3371,8 @@ Module signed. [ Value.StructTuple "alloy_primitives::signed::sign::Sign::Negative" + [] + [] []; M.borrow (| Pointer.Kind.Ref, @@ -3352,6 +3400,8 @@ Module signed. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1) ] ] |) @@ -3366,6 +3416,8 @@ Module signed. [ Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" + [] + [] []; M.read (| value |) ] @@ -3464,10 +3516,21 @@ Module signed. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + []; + Ty.path + "alloy_primitives::signed::errors::ParseSignedError" + ] [ Value.StructTuple "alloy_primitives::signed::errors::ParseSignedError::IntegerOverflow" [] + [] + [] ] |) |) @@ -3668,6 +3731,8 @@ Module signed. Value.StructTuple "alloy_primitives::signed::errors::ParseSignedError::IntegerOverflow" [] + [] + [] ] |) |))) @@ -4056,6 +4121,8 @@ Module signed. (let bytes := M.alloc (| bytes |) in Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -4095,6 +4162,8 @@ Module signed. (let bytes := M.alloc (| bytes |) in Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -4165,7 +4234,7 @@ Module signed. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| slice |) |) |) ] |); - M.constructor_as_closure "alloy_primitives::signed::int::Signed" + M.constructor_as_closure "alloy_primitives::signed::int::Signed" [ BITS; LIMBS ] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4229,7 +4298,7 @@ Module signed. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| slice |) |) |) ] |); - M.constructor_as_closure "alloy_primitives::signed::int::Signed" + M.constructor_as_closure "alloy_primitives::signed::int::Signed" [ BITS; LIMBS ] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4357,6 +4426,8 @@ Module signed. (let limbs := M.alloc (| limbs |) in Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -4409,9 +4480,16 @@ Module signed. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "alloy_primitives::signed::int::Signed") [ BITS; LIMBS ] []; + Ty.path "ruint::base_convert::BaseConvertError" + ] [ Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.read (| M.match_operator (| diff --git a/CoqOfRust/alloy_primitives/signed/ops.v b/CoqOfRust/alloy_primitives/signed/ops.v index 566910287..1e5f5eb2b 100644 --- a/CoqOfRust/alloy_primitives/signed/ops.v +++ b/CoqOfRust/alloy_primitives/signed/ops.v @@ -186,6 +186,8 @@ Module signed. [ Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -280,11 +282,31 @@ Module signed. let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| value |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [ M.read (| value |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [] + |))) ] |) |))) @@ -600,6 +622,8 @@ Module signed. [ Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -698,11 +722,31 @@ Module signed. let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| value |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [ M.read (| value |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [] + |))) ] |) |))) @@ -932,6 +976,8 @@ Module signed. M.alloc (| Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.read (| unsigned |) ] |) in let~ overflow : Ty.apply (Ty.path "*") [] [ Ty.path "bool" ] := @@ -1119,11 +1165,31 @@ Module signed. let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| value |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [ M.read (| value |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [] + |))) ] |) |))) @@ -1433,6 +1499,8 @@ Module signed. M.alloc (| Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.read (| unsigned |) ] |) in let~ overflow : Ty.apply (Ty.path "*") [] [ Ty.path "bool" ] := @@ -1620,11 +1688,31 @@ Module signed. let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| value |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [ M.read (| value |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [] + |))) ] |) |))) @@ -2182,11 +2270,31 @@ Module signed. let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| value |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [ M.read (| value |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [] + |))) ] |) |))) @@ -2824,12 +2932,30 @@ Module signed. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] [ M.read (| M.SubPointer.get_tuple_field (| @@ -3389,12 +3515,30 @@ Module signed. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] [ M.read (| M.SubPointer.get_tuple_field (| @@ -4030,12 +4174,30 @@ Module signed. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] [ M.call_closure (| Ty.apply @@ -4725,12 +4887,30 @@ Module signed. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] [ M.call_closure (| Ty.apply @@ -4862,12 +5042,12 @@ Module signed. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "alloy_primitives::signed::sign::Sign::Negative" [] + Value.StructTuple "alloy_primitives::signed::sign::Sign::Negative" [] [] [] |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" [] + Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" [] [] [] |))) ] |) @@ -5329,12 +5509,30 @@ Module signed. (let γ := M.use overflow in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] [ M.read (| result |) ] |))) ] @@ -5630,6 +5828,8 @@ Module signed. [ Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -5733,11 +5933,31 @@ Module signed. let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| value |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [ M.read (| value |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [] + |))) ] |) |))) @@ -5876,6 +6096,8 @@ Module signed. [ Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -5979,11 +6201,31 @@ Module signed. let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| value |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [ M.read (| value |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [] + |))) ] |) |))) @@ -6525,7 +6767,16 @@ Module signed. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [ M.read (| self |) ] |))); fun γ => ltac:(M.monadic @@ -6632,12 +6883,30 @@ Module signed. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::signed::int::Signed") + [ BITS; LIMBS ] + [] + ] [ M.read (| result |) ] |))) ] @@ -8989,6 +9258,8 @@ Module signed. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -9114,7 +9385,7 @@ Module signed. γ1_0, "alloy_primitives::signed::sign::Sign::Negative" |) in - M.alloc (| Value.StructTuple "core::cmp::Ordering::Greater" [] |))); + M.alloc (| Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -9133,7 +9404,7 @@ Module signed. γ1_0, "alloy_primitives::signed::sign::Sign::Positive" |) in - M.alloc (| Value.StructTuple "core::cmp::Ordering::Less" [] |))); + M.alloc (| Value.StructTuple "core::cmp::Ordering::Less" [] [] [] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -10300,6 +10571,8 @@ Module signed. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -10440,6 +10713,8 @@ Module signed. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -10580,6 +10855,8 @@ Module signed. let rhs := M.alloc (| rhs |) in Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -10784,6 +11061,8 @@ Module signed. (let self := M.alloc (| self |) in Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], diff --git a/CoqOfRust/alloy_primitives/signed/sign.v b/CoqOfRust/alloy_primitives/signed/sign.v index ab3f11393..f24a85a35 100644 --- a/CoqOfRust/alloy_primitives/signed/sign.v +++ b/CoqOfRust/alloy_primitives/signed/sign.v @@ -259,7 +259,7 @@ Module signed. "alloy_primitives::signed::sign::Sign::Positive" |) in M.alloc (| - Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" [] + Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" [] [] [] |))); fun γ => ltac:(M.monadic @@ -276,7 +276,7 @@ Module signed. "alloy_primitives::signed::sign::Sign::Negative" |) in M.alloc (| - Value.StructTuple "alloy_primitives::signed::sign::Sign::Negative" [] + Value.StructTuple "alloy_primitives::signed::sign::Sign::Negative" [] [] [] |))); fun γ => ltac:(M.monadic @@ -293,7 +293,7 @@ Module signed. "alloy_primitives::signed::sign::Sign::Positive" |) in M.alloc (| - Value.StructTuple "alloy_primitives::signed::sign::Sign::Negative" [] + Value.StructTuple "alloy_primitives::signed::sign::Sign::Negative" [] [] [] |))); fun γ => ltac:(M.monadic @@ -310,7 +310,7 @@ Module signed. "alloy_primitives::signed::sign::Sign::Negative" |) in M.alloc (| - Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" [] + Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" [] [] [] |))) ] |) @@ -360,7 +360,7 @@ Module signed. "alloy_primitives::signed::sign::Sign::Positive" |) in M.alloc (| - Value.StructTuple "alloy_primitives::signed::sign::Sign::Negative" [] + Value.StructTuple "alloy_primitives::signed::sign::Sign::Negative" [] [] [] |))); fun γ => ltac:(M.monadic @@ -370,7 +370,7 @@ Module signed. "alloy_primitives::signed::sign::Sign::Negative" |) in M.alloc (| - Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" [] + Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" [] [] [] |))) ] |) @@ -420,7 +420,7 @@ Module signed. "alloy_primitives::signed::sign::Sign::Positive" |) in M.alloc (| - Value.StructTuple "alloy_primitives::signed::sign::Sign::Negative" [] + Value.StructTuple "alloy_primitives::signed::sign::Sign::Negative" [] [] [] |))); fun γ => ltac:(M.monadic @@ -430,7 +430,7 @@ Module signed. "alloy_primitives::signed::sign::Sign::Negative" |) in M.alloc (| - Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" [] + Value.StructTuple "alloy_primitives::signed::sign::Sign::Positive" [] [] [] |))) ] |) @@ -506,7 +506,11 @@ Module signed. let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] |))); fun γ => ltac:(M.monadic diff --git a/CoqOfRust/alloy_primitives/signed/utils.v b/CoqOfRust/alloy_primitives/signed/utils.v index b6832165d..53baf5d75 100644 --- a/CoqOfRust/alloy_primitives/signed/utils.v +++ b/CoqOfRust/alloy_primitives/signed/utils.v @@ -574,6 +574,8 @@ Module signed. M.alloc (| Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -689,6 +691,8 @@ Module signed. M.alloc (| Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -732,6 +736,8 @@ Module signed. M.alloc (| Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -830,6 +836,8 @@ Module signed. M.alloc (| Value.StructTuple "alloy_primitives::signed::int::Signed" + [ BITS; LIMBS ] + [] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], diff --git a/CoqOfRust/alloy_primitives/utils/mod.v b/CoqOfRust/alloy_primitives/utils/mod.v index 3a164d70c..7e1dabf93 100644 --- a/CoqOfRust/alloy_primitives/utils/mod.v +++ b/CoqOfRust/alloy_primitives/utils/mod.v @@ -299,6 +299,11 @@ Module utils. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "alloc::boxed::Box") [] [ T; Ty.path "alloc::alloc::Global" ]; + Ty.path "alloc::collections::TryReserveError" + ] [ M.call_closure (| Ty.apply @@ -628,6 +633,17 @@ Module utils. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ + Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ]; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "alloc::collections::TryReserveError" + ] [ M.call_closure (| Ty.apply @@ -966,7 +982,16 @@ Module utils. [ M.borrow (| Pointer.Kind.MutRef, vec |); M.read (| iter |) ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| vec |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "alloc::vec::Vec") [] [ T; Ty.path "alloc::alloc::Global" ]; + Ty.path "alloc::collections::TryReserveError" + ] + [ M.read (| vec |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1252,7 +1277,16 @@ Module utils. [ M.borrow (| Pointer.Kind.MutRef, vec |); M.read (| n |); M.read (| elem |) ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| vec |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "alloc::vec::Vec") [] [ T; Ty.path "alloc::alloc::Global" ]; + Ty.path "alloc::collections::TryReserveError" + ] + [ M.read (| vec |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1903,6 +1937,8 @@ Module utils. (let self := M.alloc (| self |) in Value.StructTuple "alloy_primitives::utils::keccak256_state::State" + [] + [] [ M.call_closure (| Ty.path "tiny_keccak::keccak::Keccak", @@ -1958,6 +1994,8 @@ Module utils. ltac:(M.monadic (Value.StructTuple "alloy_primitives::utils::keccak256_state::State" + [] + [] [ M.call_closure (| Ty.path "tiny_keccak::keccak::Keccak", @@ -2094,6 +2132,8 @@ Module utils. (let self := M.alloc (| self |) in Value.StructRecord "alloy_primitives::utils::Keccak256" + [] + [] [ ("state", M.call_closure (| @@ -2242,6 +2282,8 @@ Module utils. ltac:(M.monadic (Value.StructRecord "alloy_primitives::utils::Keccak256" + [] + [] [ ("state", M.call_closure (| diff --git a/CoqOfRust/alloy_primitives/utils/units.v b/CoqOfRust/alloy_primitives/utils/units.v index 3bdd4c9f5..957c95f90 100644 --- a/CoqOfRust/alloy_primitives/utils/units.v +++ b/CoqOfRust/alloy_primitives/utils/units.v @@ -637,7 +637,18 @@ Module utils. "alloy_primitives::utils::units::UnitsError::InvalidUnit", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] + ] + [] + |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in @@ -651,6 +662,13 @@ Module utils. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] + ] [ (* Unsize *) M.pointer_coercion @@ -849,6 +867,8 @@ Module utils. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::utils::units::UnitsError::ParseSigned" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::signed::errors::ParseSignedError", @@ -891,6 +911,8 @@ Module utils. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::utils::units::UnitsError::ParseSigned" + [] + [] [ M.read (| value |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1970,6 +1992,8 @@ Module utils. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::utils::units::ParseUnits::U256" + [] + [] [ M.call_closure (| Ty.apply @@ -2070,6 +2094,8 @@ Module utils. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::utils::units::ParseUnits::U256" + [] + [] [ M.call_closure (| Ty.apply @@ -2170,6 +2196,8 @@ Module utils. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::utils::units::ParseUnits::U256" + [] + [] [ M.call_closure (| Ty.apply @@ -2270,6 +2298,8 @@ Module utils. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::utils::units::ParseUnits::U256" + [] + [] [ M.call_closure (| Ty.apply @@ -2370,6 +2400,8 @@ Module utils. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::utils::units::ParseUnits::U256" + [] + [] [ M.call_closure (| Ty.apply @@ -2470,6 +2502,8 @@ Module utils. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::utils::units::ParseUnits::U256" + [] + [] [ M.call_closure (| Ty.apply @@ -2570,6 +2604,8 @@ Module utils. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::utils::units::ParseUnits::U256" + [] + [] [ M.call_closure (| Ty.apply @@ -2660,6 +2696,8 @@ Module utils. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::utils::units::ParseUnits::I256" + [] + [] [ M.call_closure (| Ty.apply @@ -2738,6 +2776,8 @@ Module utils. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::utils::units::ParseUnits::I256" + [] + [] [ M.call_closure (| Ty.apply @@ -2816,6 +2856,8 @@ Module utils. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::utils::units::ParseUnits::I256" + [] + [] [ M.call_closure (| Ty.apply @@ -2894,6 +2936,8 @@ Module utils. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::utils::units::ParseUnits::I256" + [] + [] [ M.call_closure (| Ty.apply @@ -2972,6 +3016,8 @@ Module utils. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::utils::units::ParseUnits::I256" + [] + [] [ M.call_closure (| Ty.apply @@ -3050,6 +3096,8 @@ Module utils. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::utils::units::ParseUnits::I256" + [] + [] [ M.call_closure (| Ty.apply @@ -3128,6 +3176,8 @@ Module utils. (let value := M.alloc (| value |) in Value.StructTuple "alloy_primitives::utils::units::ParseUnits::I256" + [] + [] [ M.call_closure (| Ty.apply @@ -3584,6 +3634,8 @@ Module utils. M.borrow (| Pointer.Kind.Ref, amount |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| di |)) ] ] |) @@ -3671,6 +3723,8 @@ Module utils. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -3776,9 +3830,17 @@ Module utils. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "alloy_primitives::utils::units::ParseUnits"; + Ty.path "alloy_primitives::utils::units::UnitsError" + ] [ Value.StructTuple "alloy_primitives::utils::units::ParseUnits::I256" + [] + [] [ M.read (| get_associated_constant (| @@ -3809,9 +3871,17 @@ Module utils. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "alloy_primitives::utils::units::ParseUnits"; + Ty.path "alloy_primitives::utils::units::UnitsError" + ] [ Value.StructTuple "alloy_primitives::utils::units::ParseUnits::I256" + [] + [] [ M.read (| M.match_operator (| @@ -4017,9 +4087,16 @@ Module utils. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "alloy_primitives::utils::units::ParseUnits"; + Ty.path "alloy_primitives::utils::units::UnitsError" + ] [ Value.StructTuple "alloy_primitives::utils::units::ParseUnits::U256" + [] + [] [ M.read (| M.match_operator (| @@ -4265,9 +4342,17 @@ Module utils. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "alloy_primitives::utils::units::ParseUnits"; + Ty.path "alloy_primitives::utils::units::UnitsError" + ] [ Value.StructTuple "alloy_primitives::utils::units::ParseUnits::I256" + [] + [] [ M.read (| get_associated_constant (| @@ -4796,10 +4881,14 @@ Module utils. |); Value.StructTuple "alloy_primitives::utils::units::UnitsError::ParseSigned" + [] + [] [ Value.StructTuple "alloy_primitives::signed::errors::ParseSignedError::IntegerOverflow" [] + [] + [] ] ] |) @@ -4885,9 +4974,17 @@ Module utils. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "alloy_primitives::utils::units::ParseUnits"; + Ty.path "alloy_primitives::utils::units::UnitsError" + ] [ Value.StructTuple "alloy_primitives::utils::units::ParseUnits::I256" + [] + [] [ M.read (| n |) ] ] |))) @@ -5291,10 +5388,14 @@ Module utils. |); Value.StructTuple "alloy_primitives::utils::units::UnitsError::ParseSigned" + [] + [] [ Value.StructTuple "alloy_primitives::signed::errors::ParseSignedError::IntegerOverflow" [] + [] + [] ] ] |) @@ -5377,9 +5478,16 @@ Module utils. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "alloy_primitives::utils::units::ParseUnits"; + Ty.path "alloy_primitives::utils::units::UnitsError" + ] [ Value.StructTuple "alloy_primitives::utils::units::ParseUnits::U256" + [] + [] [ M.read (| a_uint |) ] ] |))) @@ -5855,14 +5963,20 @@ Module utils. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 0; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |); M.call_closure (| @@ -5878,13 +5992,19 @@ Module utils. Value.UnicodeChar 48; Value.StructTuple "core::fmt::rt::Alignment::Right" + [] + [] []; Value.Integer IntegerKind.U32 0; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Param" + [] + [] [ Value.Integer IntegerKind.Usize 2 ] ] |) @@ -6341,14 +6461,20 @@ Module utils. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 0; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |); M.call_closure (| @@ -6364,14 +6490,20 @@ Module utils. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 0; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |); M.call_closure (| @@ -6387,13 +6519,19 @@ Module utils. Value.UnicodeChar 48; Value.StructTuple "core::fmt::rt::Alignment::Right" + [] + [] []; Value.Integer IntegerKind.U32 0; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Param" + [] + [] [ Value.Integer IntegerKind.Usize 3 ] ] |) @@ -7313,6 +7451,8 @@ Module utils. ltac:(M.monadic (Value.StructTuple "alloy_primitives::utils::units::UnitsError::InvalidUnit" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -7692,6 +7832,8 @@ Module utils. ltac:(M.monadic (Value.StructTuple "alloy_primitives::utils::units::UnitsError::InvalidUnit" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -7728,6 +7870,11 @@ Module utils. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "alloy_primitives::utils::units::Unit"; + Ty.path "alloy_primitives::utils::units::UnitsError" + ] [ M.read (| M.match_operator (| @@ -8079,9 +8226,16 @@ Module utils. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "alloy_primitives::utils::units::Unit"; + Ty.path "alloy_primitives::utils::units::UnitsError" + ] [ Value.StructTuple "alloy_primitives::utils::units::UnitsError::InvalidUnit" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -8485,6 +8639,8 @@ Module utils. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "alloy_primitives::utils::units::Unit" ] [ M.call_closure (| Ty.path "alloy_primitives::utils::units::Unit", @@ -8500,7 +8656,13 @@ Module utils. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "alloy_primitives::utils::units::Unit" ] + [] + |))) ] |) |))) @@ -8521,7 +8683,7 @@ Module utils. | [], [], [ x ] => ltac:(M.monadic (let x := M.alloc (| x |) in - Value.StructTuple "alloy_primitives::utils::units::Unit" [ M.read (| x |) ])) + Value.StructTuple "alloy_primitives::utils::units::Unit" [] [] [ M.read (| x |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/bytes/buf/buf_impl.v b/CoqOfRust/bytes/buf/buf_impl.v index bec21da82..d81187d39 100644 --- a/CoqOfRust/bytes/buf/buf_impl.v +++ b/CoqOfRust/bytes/buf/buf_impl.v @@ -415,6 +415,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| cnt |)) ] ] |) @@ -452,6 +454,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| cnt |)) ] ] |) @@ -498,6 +502,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| cnt |)) ] ] |) @@ -918,6 +924,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -1297,6 +1305,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -1676,6 +1686,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -2050,6 +2062,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -2429,6 +2443,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -2808,6 +2824,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -3182,6 +3200,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -3561,6 +3581,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -3940,6 +3962,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -4314,6 +4338,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -4693,6 +4719,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -5072,6 +5100,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -5446,6 +5476,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -5825,6 +5857,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -6204,6 +6238,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -6578,6 +6614,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -6957,6 +6995,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -7336,6 +7376,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -7710,6 +7752,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -8089,6 +8133,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -8468,6 +8514,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -8842,6 +8890,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -9221,6 +9271,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -9600,6 +9652,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -9941,6 +9995,8 @@ Module buf. M.borrow (| Pointer.Kind.MutRef, buf |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| slice_at |)) ] ] |) @@ -10045,6 +10101,8 @@ Module buf. M.pointer_coercion (M.borrow (| Pointer.Kind.MutRef, buf |)); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| nbytes |)) ] ] |) @@ -10314,6 +10372,8 @@ Module buf. M.borrow (| Pointer.Kind.MutRef, buf |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| slice_at |)) ] ] |) @@ -10418,6 +10478,8 @@ Module buf. M.pointer_coercion (M.borrow (| Pointer.Kind.MutRef, buf |)); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| nbytes |)) ] ] |) @@ -12976,6 +13038,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| cnt |)) ] ] |) @@ -13138,6 +13202,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -13405,6 +13471,8 @@ Module buf. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| slice |) |) |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| pos |)) ] ] |) diff --git a/CoqOfRust/bytes/buf/buf_mut.v b/CoqOfRust/bytes/buf/buf_mut.v index 39d1cc9a3..bb8ab840c 100644 --- a/CoqOfRust/bytes/buf/buf_mut.v +++ b/CoqOfRust/bytes/buf/buf_mut.v @@ -298,6 +298,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| cnt |)) ] ] |) @@ -335,6 +337,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| cnt |)) ] ] |) @@ -650,6 +654,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| cnt |)) ] ] |) @@ -687,6 +693,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| cnt |)) ] ] |) @@ -733,6 +741,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| cnt |)) ] ] |) @@ -2445,6 +2455,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)) ] ] |) @@ -2529,6 +2541,8 @@ Module buf. (* Unsize *) M.pointer_coercion (M.borrow (| Pointer.Kind.Ref, slice |)); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| nbytes |)) ] ] |) @@ -2806,6 +2820,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)) ] ] |) @@ -2890,6 +2906,8 @@ Module buf. (* Unsize *) M.pointer_coercion (M.borrow (| Pointer.Kind.Ref, slice |)); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| nbytes |)) ] ] |) @@ -5318,6 +5336,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| diff --git a/CoqOfRust/bytes/buf/chain.v b/CoqOfRust/bytes/buf/chain.v index e42b519a7..41ffeaef3 100644 --- a/CoqOfRust/bytes/buf/chain.v +++ b/CoqOfRust/bytes/buf/chain.v @@ -107,6 +107,8 @@ Module buf. let b := M.alloc (| b |) in Value.StructRecord "bytes::buf::chain::Chain" + [] + [ T; U ] [ ("a", M.read (| a |)); ("b", M.read (| b |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -805,6 +807,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| n |)) ] ] |) diff --git a/CoqOfRust/bytes/buf/iter.v b/CoqOfRust/bytes/buf/iter.v index dc9ae3930..811242652 100644 --- a/CoqOfRust/bytes/buf/iter.v +++ b/CoqOfRust/bytes/buf/iter.v @@ -86,7 +86,11 @@ Module buf. | [], [], [ inner ] => ltac:(M.monadic (let inner := M.alloc (| inner |) in - Value.StructRecord "bytes::buf::iter::IntoIter" [ ("inner", M.read (| inner |)) ])) + Value.StructRecord + "bytes::buf::iter::IntoIter" + [] + [ T ] + [ ("inner", M.read (| inner |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -258,7 +262,13 @@ Module buf. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u8" ] + [] + |) |) |) |))); @@ -324,7 +334,13 @@ Module buf. ] |) |) in - M.alloc (| Value.StructTuple "core::option::Option::Some" [ M.read (| b |) ] |) + M.alloc (| + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u8" ] + [ M.read (| b |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -372,7 +388,11 @@ Module buf. Value.Tuple [ M.read (| rem |); - Value.StructTuple "core::option::Option::Some" [ M.read (| rem |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| rem |) ] ] |) |))) diff --git a/CoqOfRust/bytes/buf/limit.v b/CoqOfRust/bytes/buf/limit.v index 4dd6ef874..4f79088f2 100644 --- a/CoqOfRust/bytes/buf/limit.v +++ b/CoqOfRust/bytes/buf/limit.v @@ -101,6 +101,8 @@ Module buf. let limit := M.alloc (| limit |) in Value.StructRecord "bytes::buf::limit::Limit" + [] + [ T ] [ ("inner", M.read (| inner |)); ("limit", M.read (| limit |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -433,6 +435,8 @@ Module buf. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| end_ |)) ] ] |) diff --git a/CoqOfRust/bytes/buf/reader.v b/CoqOfRust/bytes/buf/reader.v index caa716226..757f45e61 100644 --- a/CoqOfRust/bytes/buf/reader.v +++ b/CoqOfRust/bytes/buf/reader.v @@ -82,7 +82,7 @@ Module buf. | [], [ B ], [ buf ] => ltac:(M.monadic (let buf := M.alloc (| buf |) in - Value.StructRecord "bytes::buf::reader::Reader" [ ("buf", M.read (| buf |)) ])) + Value.StructRecord "bytes::buf::reader::Reader" [] [ B ] [ ("buf", M.read (| buf |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -307,6 +307,8 @@ Module buf. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| len |)) @@ -320,7 +322,13 @@ Module buf. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| len |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "usize"; Ty.path "std::io::error::Error" ] + [ M.read (| len |) ] + |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -351,6 +359,11 @@ Module buf. (let self := M.alloc (| self |) in Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.path "std::io::error::Error" + ] [ M.borrow (| Pointer.Kind.Ref, diff --git a/CoqOfRust/bytes/buf/take.v b/CoqOfRust/bytes/buf/take.v index 988ce6a8c..a68da614e 100644 --- a/CoqOfRust/bytes/buf/take.v +++ b/CoqOfRust/bytes/buf/take.v @@ -101,6 +101,8 @@ Module buf. let limit := M.alloc (| limit |) in Value.StructRecord "bytes::buf::take::Take" + [] + [ T ] [ ("inner", M.read (| inner |)); ("limit", M.read (| limit |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -384,6 +386,8 @@ Module buf. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| bytes |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| diff --git a/CoqOfRust/bytes/buf/uninit_slice.v b/CoqOfRust/bytes/buf/uninit_slice.v index 2151e26ff..06cc702ec 100644 --- a/CoqOfRust/bytes/buf/uninit_slice.v +++ b/CoqOfRust/bytes/buf/uninit_slice.v @@ -407,6 +407,8 @@ Module buf. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| index |)) ] ] |) @@ -524,7 +526,11 @@ Module buf. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple + "core::panicking::AssertKind::Eq" + [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -554,7 +560,11 @@ Module buf. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/bytes/buf/vec_deque.v b/CoqOfRust/bytes/buf/vec_deque.v index 6cc698735..dc866c677 100644 --- a/CoqOfRust/bytes/buf/vec_deque.v +++ b/CoqOfRust/bytes/buf/vec_deque.v @@ -176,7 +176,11 @@ Module buf. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |); - Value.StructRecord "core::ops::range::RangeTo" [ ("end_", M.read (| cnt |)) ] + Value.StructRecord + "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] + [ ("end_", M.read (| cnt |)) ] ] |) |) in diff --git a/CoqOfRust/bytes/buf/writer.v b/CoqOfRust/bytes/buf/writer.v index 723118f89..795def2ea 100644 --- a/CoqOfRust/bytes/buf/writer.v +++ b/CoqOfRust/bytes/buf/writer.v @@ -82,7 +82,7 @@ Module buf. | [], [ B ], [ buf ] => ltac:(M.monadic (let buf := M.alloc (| buf |) in - Value.StructRecord "bytes::buf::writer::Writer" [ ("buf", M.read (| buf |)) ])) + Value.StructRecord "bytes::buf::writer::Writer" [] [ B ] [ ("buf", M.read (| buf |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -293,6 +293,8 @@ Module buf. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| src |) |) |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| n |)) @@ -304,7 +306,13 @@ Module buf. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| n |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "usize"; Ty.path "std::io::error::Error" ] + [ M.read (| n |) ] + |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -320,7 +328,11 @@ Module buf. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ])) + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "std::io::error::Error" ] + [ Value.Tuple [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/bytes/bytes.v b/CoqOfRust/bytes/bytes.v index 1c1ccbe24..2836b27f7 100644 --- a/CoqOfRust/bytes/bytes.v +++ b/CoqOfRust/bytes/bytes.v @@ -133,6 +133,8 @@ Module bytes. (let bytes := M.alloc (| bytes |) in Value.StructRecord "bytes::bytes::Bytes" + [] + [] [ ("ptr", M.call_closure (| @@ -1531,6 +1533,8 @@ Module bytes. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| sub_offset |)); ("end_", @@ -2556,6 +2560,8 @@ Module bytes. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "bytes::bytes_mut::BytesMut"; Ty.path "bytes::bytes::Bytes" ] [ M.call_closure (| Ty.path "bytes::bytes_mut::BytesMut", @@ -2575,7 +2581,11 @@ Module bytes. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| self |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "bytes::bytes_mut::BytesMut"; Ty.path "bytes::bytes::Bytes" ] + [ M.read (| self |) ] |))) ] |) @@ -2613,6 +2623,8 @@ Module bytes. let vtable := M.alloc (| vtable |) in Value.StructRecord "bytes::bytes::Bytes" + [] + [] [ ("ptr", M.read (| ptr |)); ("len", M.read (| len |)); @@ -4299,7 +4311,7 @@ Module bytes. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -4385,7 +4397,7 @@ Module bytes. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -4578,7 +4590,7 @@ Module bytes. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -5576,6 +5588,8 @@ Module bytes. [ Value.StructRecord "bytes::bytes::Shared" + [] + [] [ ("buf", M.read (| ptr |)); ("cap", M.read (| cap |)); @@ -5685,6 +5699,8 @@ Module bytes. M.alloc (| Value.StructRecord "bytes::bytes::Bytes" + [] + [] [ ("ptr", (* MutToConstPointer *) M.pointer_coercion (M.read (| ptr |))); ("len", M.read (| len |)); @@ -5949,6 +5965,8 @@ Module bytes. M.alloc (| Value.StructRecord "bytes::bytes::Bytes" + [] + [] [ ("ptr", (* MutToConstPointer *) M.pointer_coercion (M.read (| ptr |))); @@ -6008,6 +6026,8 @@ Module bytes. (M.alloc (| Value.StructRecord "bytes::bytes::Bytes" + [] + [] [ ("ptr", (* MutToConstPointer *) M.pointer_coercion (M.read (| ptr |))); @@ -6642,6 +6662,8 @@ Module bytes. (M.alloc (| Value.StructRecord "bytes::bytes::Vtable" + [] + [] [ ("clone", (* ReifyFnPointer *) @@ -6963,6 +6985,8 @@ Module bytes. M.alloc (| Value.StructRecord "bytes::bytes::Vtable" + [] + [] [ ("clone", (* ReifyFnPointer *) @@ -7003,6 +7027,8 @@ Module bytes. M.alloc (| Value.StructRecord "bytes::bytes::Vtable" + [] + [] [ ("clone", (* ReifyFnPointer *) @@ -7068,7 +7094,7 @@ Module bytes. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] + Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] ] |) |) in @@ -7198,6 +7224,8 @@ Module bytes. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -7230,6 +7258,8 @@ Module bytes. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -7381,7 +7411,7 @@ Module bytes. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] + Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] ] |) |) in @@ -7522,6 +7552,8 @@ Module bytes. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -7554,6 +7586,8 @@ Module bytes. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -7685,7 +7719,7 @@ Module bytes. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] + Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] ] |) |) in @@ -7815,6 +7849,8 @@ Module bytes. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -7847,6 +7883,8 @@ Module bytes. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -8465,6 +8503,8 @@ Module bytes. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -8512,6 +8552,11 @@ Module bytes. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -8687,7 +8732,7 @@ Module bytes. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] + Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] ] |) |) in @@ -8810,6 +8855,8 @@ Module bytes. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -8842,6 +8889,8 @@ Module bytes. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -9295,6 +9344,8 @@ Module bytes. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -9342,6 +9393,11 @@ Module bytes. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -9447,7 +9503,7 @@ Module bytes. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] + Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] ] |) |) in @@ -9513,7 +9569,7 @@ Module bytes. "ref_cnt" |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) in @@ -9718,6 +9774,8 @@ Module bytes. M.alloc (| Value.StructRecord "bytes::bytes::Vtable" + [] + [] [ ("clone", (* ReifyFnPointer *) @@ -9794,7 +9852,7 @@ Module bytes. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) in @@ -9912,8 +9970,16 @@ Module bytes. |); Value.Integer IntegerKind.Usize 1; Value.Integer IntegerKind.Usize 0; - Value.StructTuple "core::sync::atomic::Ordering::AcqRel" []; - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple + "core::sync::atomic::Ordering::AcqRel" + [] + [] + []; + Value.StructTuple + "core::sync::atomic::Ordering::Relaxed" + [] + [] + [] ] |) |) @@ -10148,7 +10214,7 @@ Module bytes. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) ] @@ -10239,7 +10305,7 @@ Module bytes. "ref_cnt" |) |); - Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] + Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] ] |); Value.Integer IntegerKind.Usize 1 @@ -10532,7 +10598,7 @@ Module bytes. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) ] @@ -10575,7 +10641,7 @@ Module bytes. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] + Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] ] |) |) in @@ -10609,7 +10675,7 @@ Module bytes. "ref_cnt" |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) in @@ -10790,7 +10856,7 @@ Module bytes. |) |); Value.Integer IntegerKind.Usize 1; - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) in @@ -10838,6 +10904,8 @@ Module bytes. M.alloc (| Value.StructRecord "bytes::bytes::Bytes" + [] + [] [ ("ptr", M.read (| ptr |)); ("len", M.read (| len |)); @@ -10990,6 +11058,8 @@ Module bytes. [ Value.StructRecord "bytes::bytes::Shared" + [] + [] [ ("buf", M.read (| buf |)); ("cap", @@ -11128,8 +11198,8 @@ Module bytes. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| atom |) |) |); M.cast (Ty.apply (Ty.path "*mut") [] [ Ty.tuple [] ]) (M.read (| ptr |)); M.cast (Ty.apply (Ty.path "*mut") [] [ Ty.tuple [] ]) (M.read (| shared |)); - Value.StructTuple "core::sync::atomic::Ordering::AcqRel" []; - Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] + Value.StructTuple "core::sync::atomic::Ordering::AcqRel" [] [] []; + Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] ] |) |), @@ -11198,6 +11268,8 @@ Module bytes. M.alloc (| Value.StructRecord "bytes::bytes::Bytes" + [] + [] [ ("ptr", M.read (| offset |)); ("len", M.read (| len |)); @@ -11377,7 +11449,11 @@ Module bytes. |) |); Value.Integer IntegerKind.Usize 1; - Value.StructTuple "core::sync::atomic::Ordering::Release" [] + Value.StructTuple + "core::sync::atomic::Ordering::Release" + [] + [] + [] ] |); Value.Integer IntegerKind.Usize 1 @@ -11410,7 +11486,7 @@ Module bytes. "ref_cnt" |) |); - Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] + Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] ] |) |) in diff --git a/CoqOfRust/bytes/bytes_mut.v b/CoqOfRust/bytes/bytes_mut.v index 176d0a3a1..40a2967ea 100644 --- a/CoqOfRust/bytes/bytes_mut.v +++ b/CoqOfRust/bytes/bytes_mut.v @@ -723,6 +723,8 @@ Module bytes_mut. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -759,6 +761,8 @@ Module bytes_mut. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -3159,6 +3163,8 @@ Module bytes_mut. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -3206,6 +3212,11 @@ Module bytes_mut. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -3311,6 +3322,8 @@ Module bytes_mut. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -3343,6 +3356,8 @@ Module bytes_mut. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -4767,6 +4782,8 @@ Module bytes_mut. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -4799,6 +4816,8 @@ Module bytes_mut. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -5612,6 +5631,8 @@ Module bytes_mut. M.alloc (| Value.StructRecord "bytes::bytes_mut::BytesMut" + [] + [] [ ("ptr", M.read (| ptr |)); ("len", M.read (| len |)); @@ -6211,7 +6232,11 @@ Module bytes_mut. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "bytes::bytes_mut::BytesMut" ] + [ Value.Tuple [] ] |) |) |) @@ -6437,12 +6462,20 @@ Module bytes_mut. |) |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "bytes::bytes_mut::BytesMut" ] + [ Value.Tuple [] ] |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| other |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "bytes::bytes_mut::BytesMut" ] + [ M.read (| other |) ] |))) ] |) @@ -6619,6 +6652,8 @@ Module bytes_mut. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -6651,6 +6686,8 @@ Module bytes_mut. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -6817,6 +6854,8 @@ Module bytes_mut. [ Value.StructRecord "bytes::bytes_mut::Shared" + [] + [] [ ("vec", M.call_closure (| @@ -6987,6 +7026,8 @@ Module bytes_mut. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -7019,6 +7060,8 @@ Module bytes_mut. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -7273,6 +7316,8 @@ Module bytes_mut. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -7305,6 +7350,8 @@ Module bytes_mut. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -7453,6 +7500,8 @@ Module bytes_mut. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -7485,6 +7534,8 @@ Module bytes_mut. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -9790,13 +9841,21 @@ Module bytes_mut. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))); + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::fmt::Error" [] ] + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.StructTuple "core::fmt::Error" [] [] [] ] |))) ] |) @@ -9905,7 +9964,7 @@ Module bytes_mut. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -10731,7 +10790,7 @@ Module bytes_mut. |) |); Value.Integer IntegerKind.Usize 1; - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) in @@ -10850,7 +10909,11 @@ Module bytes_mut. |) |); Value.Integer IntegerKind.Usize 1; - Value.StructTuple "core::sync::atomic::Ordering::Release" [] + Value.StructTuple + "core::sync::atomic::Ordering::Release" + [] + [] + [] ] |); Value.Integer IntegerKind.Usize 1 @@ -10883,7 +10946,7 @@ Module bytes_mut. "ref_count" |) |); - Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] + Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] ] |) |) in @@ -10976,7 +11039,7 @@ Module bytes_mut. "ref_count" |) |); - Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] + Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] ] |); Value.Integer IntegerKind.Usize 1 @@ -11709,7 +11772,7 @@ Module bytes_mut. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -11798,7 +11861,7 @@ Module bytes_mut. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -11959,7 +12022,7 @@ Module bytes_mut. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12512,7 +12575,7 @@ Module bytes_mut. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12553,7 +12616,7 @@ Module bytes_mut. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12634,7 +12697,7 @@ Module bytes_mut. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12675,7 +12738,7 @@ Module bytes_mut. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -13520,6 +13583,8 @@ Module bytes_mut. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -13549,7 +13614,11 @@ Module bytes_mut. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -13674,6 +13743,8 @@ Module bytes_mut. M.alloc (| Value.StructRecord "bytes::bytes::Vtable" + [] + [] [ ("clone", (* ReifyFnPointer *) @@ -13738,7 +13809,7 @@ Module bytes_mut. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |)) |) in @@ -13859,7 +13930,7 @@ Module bytes_mut. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) ] @@ -14139,7 +14210,7 @@ Module bytes_mut. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) ] @@ -14271,6 +14342,8 @@ Module bytes_mut. M.alloc (| Value.StructRecord "bytes::bytes_mut::BytesMut" + [] + [] [ ("ptr", M.read (| ptr |)); ("len", M.read (| len |)); @@ -14381,7 +14454,7 @@ Module bytes_mut. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] + Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] ] |) |) in @@ -14415,7 +14488,7 @@ Module bytes_mut. "ref_count" |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) in diff --git a/CoqOfRust/bytes/fmt/debug.v b/CoqOfRust/bytes/fmt/debug.v index 5cecd2911..555e1cbbd 100644 --- a/CoqOfRust/bytes/fmt/debug.v +++ b/CoqOfRust/bytes/fmt/debug.v @@ -1462,6 +1462,11 @@ Module fmt. M.alloc (| Value.StructRecord "core::ops::range::Range" + [] + [ + Ty.path + "u8" + ] [ ("start", Value.Integer @@ -1940,15 +1945,21 @@ Module fmt. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 8; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize @@ -2213,7 +2224,13 @@ Module fmt. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2265,6 +2282,8 @@ Module fmt. M.alloc (| Value.StructTuple "bytes::fmt::BytesRef" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -2345,6 +2364,8 @@ Module fmt. M.alloc (| Value.StructTuple "bytes::fmt::BytesRef" + [] + [] [ M.borrow (| Pointer.Kind.Ref, diff --git a/CoqOfRust/bytes/fmt/hex.v b/CoqOfRust/bytes/fmt/hex.v index 845385cf2..d415b461e 100644 --- a/CoqOfRust/bytes/fmt/hex.v +++ b/CoqOfRust/bytes/fmt/hex.v @@ -251,15 +251,21 @@ Module fmt. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 8; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize @@ -362,7 +368,13 @@ Module fmt. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -625,15 +637,21 @@ Module fmt. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 8; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize @@ -736,7 +754,13 @@ Module fmt. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -788,6 +812,8 @@ Module fmt. M.alloc (| Value.StructTuple "bytes::fmt::BytesRef" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -868,6 +894,8 @@ Module fmt. M.alloc (| Value.StructTuple "bytes::fmt::BytesRef" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -948,6 +976,8 @@ Module fmt. M.alloc (| Value.StructTuple "bytes::fmt::BytesRef" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -1028,6 +1058,8 @@ Module fmt. M.alloc (| Value.StructTuple "bytes::fmt::BytesRef" + [] + [] [ M.borrow (| Pointer.Kind.Ref, diff --git a/CoqOfRust/core/alloc/layout.v b/CoqOfRust/core/alloc/layout.v index 9cca0bd8e..4bc2cd257 100644 --- a/CoqOfRust/core/alloc/layout.v +++ b/CoqOfRust/core/alloc/layout.v @@ -433,9 +433,16 @@ Module alloc. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "core::alloc::layout::Layout"; + Ty.path "core::alloc::layout::LayoutError" + ] [ Value.StructRecord "core::alloc::layout::Layout" + [] + [] [ ("size", M.read (| size |)); ("align", @@ -456,7 +463,12 @@ Module alloc. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::alloc::layout::LayoutError" [] ] + [] + [ + Ty.path "core::alloc::layout::Layout"; + Ty.path "core::alloc::layout::LayoutError" + ] + [ Value.StructTuple "core::alloc::layout::LayoutError" [] [] [] ] |))) ] |) @@ -691,7 +703,18 @@ Module alloc. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::alloc::layout::LayoutError" [] ] + [] + [ + Ty.path "core::alloc::layout::Layout"; + Ty.path "core::alloc::layout::LayoutError" + ] + [ + Value.StructTuple + "core::alloc::layout::LayoutError" + [] + [] + [] + ] |) |) |) @@ -702,9 +725,16 @@ Module alloc. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "core::alloc::layout::Layout"; + Ty.path "core::alloc::layout::LayoutError" + ] [ Value.StructRecord "core::alloc::layout::Layout" + [] + [] [ ("size", M.read (| size |)); ("align", M.read (| align |)) ] ] |) @@ -781,6 +811,8 @@ Module alloc. M.alloc (| Value.StructRecord "core::alloc::layout::Layout" + [] + [] [ ("size", M.read (| size |)); ("align", @@ -1188,7 +1220,12 @@ Module alloc. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::alloc::layout::LayoutError" [] ] + [] + [ + Ty.path "core::alloc::layout::Layout"; + Ty.path "core::alloc::layout::LayoutError" + ] + [ Value.StructTuple "core::alloc::layout::LayoutError" [] [] [] ] |))) ] |) @@ -1539,6 +1576,11 @@ Module alloc. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple [ Ty.path "core::alloc::layout::Layout"; Ty.path "usize" ]; + Ty.path "core::alloc::layout::LayoutError" + ] [ Value.Tuple [ @@ -1561,7 +1603,12 @@ Module alloc. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::alloc::layout::LayoutError" [] ] + [] + [ + Ty.tuple [ Ty.path "core::alloc::layout::Layout"; Ty.path "usize" ]; + Ty.path "core::alloc::layout::LayoutError" + ] + [ Value.StructTuple "core::alloc::layout::LayoutError" [] [] [] ] |))) ] |) @@ -1712,6 +1759,11 @@ Module alloc. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple [ Ty.path "core::alloc::layout::Layout"; Ty.path "usize" ]; + Ty.path "core::alloc::layout::LayoutError" + ] [ Value.Tuple [ M.read (| layout |); M.read (| offset |) ] ] |))); fun γ => @@ -1719,7 +1771,12 @@ Module alloc. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::alloc::layout::LayoutError" [] ] + [] + [ + Ty.tuple [ Ty.path "core::alloc::layout::Layout"; Ty.path "usize" ]; + Ty.path "core::alloc::layout::LayoutError" + ] + [ Value.StructTuple "core::alloc::layout::LayoutError" [] [] [] ] |))) ] |) @@ -1821,7 +1878,12 @@ Module alloc. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::alloc::layout::LayoutError" [] ] + [] + [ + Ty.path "core::alloc::layout::Layout"; + Ty.path "core::alloc::layout::LayoutError" + ] + [ Value.StructTuple "core::alloc::layout::LayoutError" [] [] [] ] |))) ] |) @@ -2007,7 +2069,7 @@ Module alloc. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::alloc::layout::LayoutError" [])) + Value.StructTuple "core::alloc::layout::LayoutError" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/alloc/mod.v b/CoqOfRust/core/alloc/mod.v index 579698289..d31e47b58 100644 --- a/CoqOfRust/core/alloc/mod.v +++ b/CoqOfRust/core/alloc/mod.v @@ -422,7 +422,19 @@ Module alloc. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| ptr |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.path "core::alloc::AllocError" + ] + [ M.read (| ptr |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -778,7 +790,19 @@ Module alloc. |) |) in M.alloc (| Value.Tuple [] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| new_ptr |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.path "core::alloc::AllocError" + ] + [ M.read (| new_ptr |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1138,7 +1162,19 @@ Module alloc. |) |) in M.alloc (| Value.Tuple [] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| new_ptr |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.path "core::alloc::AllocError" + ] + [ M.read (| new_ptr |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1494,7 +1530,19 @@ Module alloc. |) |) in M.alloc (| Value.Tuple [] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| new_ptr |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "core::ptr::non_null::NonNull") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.path "core::alloc::AllocError" + ] + [ M.read (| new_ptr |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/core/any.v b/CoqOfRust/core/any.v index 85790ca31..f7e2d1b3a 100644 --- a/CoqOfRust/core/any.v +++ b/CoqOfRust/core/any.v @@ -332,6 +332,8 @@ Module any. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -351,7 +353,14 @@ Module any. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |))) ] |) |))) @@ -413,6 +422,8 @@ Module any. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -437,7 +448,14 @@ Module any. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + [] + |))) ] |) |))) @@ -1345,6 +1363,8 @@ Module any. M.alloc (| Value.StructRecord "core::any::TypeId" + [] + [] [ ("t", Value.Tuple [ M.read (| t1 |); M.read (| t2 |) ]) ] |) |))) @@ -1605,11 +1625,13 @@ Module any. [ Value.Integer IntegerKind.Usize 0; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple "core::fmt::rt::Alignment::Unknown" [] [] []; Value.Integer IntegerKind.U32 12; - Value.StructTuple "core::fmt::rt::Count::Implied" []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize 34 ] ] |) diff --git a/CoqOfRust/core/array/ascii.v b/CoqOfRust/core/array/ascii.v index 8ebed4400..5cbfe14f0 100644 --- a/CoqOfRust/core/array/ascii.v +++ b/CoqOfRust/core/array/ascii.v @@ -69,6 +69,18 @@ Module array. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "array") + [ N ] + [ Ty.path "core::ascii::ascii_char::AsciiChar" ] + ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -98,7 +110,23 @@ Module array. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "array") + [ N ] + [ Ty.path "core::ascii::ascii_char::AsciiChar" ] + ] + ] + [] + |))) ] |) |))) diff --git a/CoqOfRust/core/array/drain.v b/CoqOfRust/core/array/drain.v index 271964d8c..e4ae2a3a2 100644 --- a/CoqOfRust/core/array/drain.v +++ b/CoqOfRust/core/array/drain.v @@ -57,6 +57,8 @@ Module array. M.alloc (| Value.StructTuple "core::array::drain::Drain" + [] + [ T ] [ M.call_closure (| Ty.apply (Ty.path "core::slice::iter::IterMut") [] [ T ], @@ -327,6 +329,8 @@ Module array. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.call_closure (| T, @@ -378,7 +382,11 @@ Module array. Value.Tuple [ M.read (| n |); - Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| n |) ] ] |) |))) diff --git a/CoqOfRust/core/array/equality.v b/CoqOfRust/core/array/equality.v index 77933a6d7..58f808319 100644 --- a/CoqOfRust/core/array/equality.v +++ b/CoqOfRust/core/array/equality.v @@ -976,7 +976,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| a |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -997,7 +997,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| b |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1053,7 +1053,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| a |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1074,7 +1074,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| b |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) diff --git a/CoqOfRust/core/array/iter.v b/CoqOfRust/core/array/iter.v index 6f4d1ef02..7f7c7e0a3 100644 --- a/CoqOfRust/core/array/iter.v +++ b/CoqOfRust/core/array/iter.v @@ -94,6 +94,8 @@ Module array. M.alloc (| Value.StructRecord "core::array::iter::IntoIter" + [ N ] + [ T ] [ ("data", M.read (| data |)); ("alive", @@ -227,6 +229,8 @@ Module array. M.alloc (| Value.StructRecord "core::array::iter::IntoIter" + [ N ] + [ T ] [ ("data", M.read (| buffer |)); ("alive", M.read (| alive |)) ] |) |))) @@ -290,6 +294,8 @@ Module array. M.alloc (| Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", Value.Integer IntegerKind.Usize 0) @@ -769,7 +775,11 @@ Module array. Value.Tuple [ M.read (| len |); - Value.StructTuple "core::option::Option::Some" [ M.read (| len |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| len |) ] ] |) |))) @@ -848,6 +858,8 @@ Module array. [ Value.StructTuple "core::iter::adapters::by_ref_sized::ByRefSized" + [] + [ Ty.path "core::ops::index_range::IndexRange" ] [ M.borrow (| Pointer.Kind.MutRef, @@ -1250,8 +1262,21 @@ Module array. |), [ M.read (| remaining |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) @@ -1628,6 +1653,8 @@ Module array. [ Value.StructTuple "core::iter::adapters::by_ref_sized::ByRefSized" + [] + [ Ty.path "core::ops::index_range::IndexRange" ] [ M.borrow (| Pointer.Kind.MutRef, @@ -1964,8 +1991,21 @@ Module array. |), [ M.read (| remaining |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) @@ -2264,6 +2304,8 @@ Module array. M.alloc (| Value.StructRecord "core::array::iter::IntoIter" + [ N ] + [ T ] [ ("data", repeat (| diff --git a/CoqOfRust/core/array/links/iter.v b/CoqOfRust/core/array/links/iter.v index e4113e95a..d5f0bbbdf 100644 --- a/CoqOfRust/core/array/links/iter.v +++ b/CoqOfRust/core/array/links/iter.v @@ -20,7 +20,7 @@ Module IntoIter. Global Instance IsLink {T : Set} `{Link T} {N : Usize.t} : Link (t T N) := { Φ := Ty.apply (Ty.path "core::array::iter::IntoIter") [ φ N ] [ Φ T ]; - φ x := Value.StructRecord "core::array::iter::IntoIter" [ + φ x := Value.StructRecord "core::array::iter::IntoIter" [ φ N ] [ Φ T ] [ ("data", φ x.(data)); ("alive", φ x.(alive)) ]; diff --git a/CoqOfRust/core/array/mod.v b/CoqOfRust/core/array/mod.v index d739a0a51..8a250286b 100644 --- a/CoqOfRust/core/array/mod.v +++ b/CoqOfRust/core/array/mod.v @@ -669,7 +669,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -731,7 +731,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1021,7 +1021,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| slice |) |) |) ] |); - Value.StructTuple "core::array::TryFromSliceError" [ Value.Tuple [] ] + Value.StructTuple "core::array::TryFromSliceError" [] [] [ Value.Tuple [] ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1097,7 +1097,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| slice |) |) |) ] |); - Value.StructTuple "core::array::TryFromSliceError" [ Value.Tuple [] ] + Value.StructTuple "core::array::TryFromSliceError" [] [] [ Value.Tuple [] ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1170,7 +1170,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1251,7 +1251,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1615,7 +1615,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1646,7 +1646,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1712,7 +1712,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1743,7 +1743,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1809,7 +1809,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1840,7 +1840,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1906,7 +1906,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -1937,7 +1937,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -2003,7 +2003,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -2034,7 +2034,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -2120,7 +2120,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -2151,7 +2151,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| other |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -6510,7 +6510,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -6606,7 +6606,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -6702,7 +6702,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -6798,7 +6798,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -6881,7 +6881,7 @@ Module array. |), [ M.read (| iter |); - M.constructor_as_closure "core::ops::try_trait::NeverShortCircuit" + M.constructor_as_closure "core::ops::try_trait::NeverShortCircuit" [] [ T ] ] |) ] @@ -7105,6 +7105,8 @@ Module array. M.alloc (| Value.StructRecord "core::array::Guard" + [] + [ T ] [ ("array_mut", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| buffer |) |) |)); @@ -7393,6 +7395,11 @@ Module array. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" + [] + [ + Ty.associated_in_trait "core::ops::try_trait::Try" [] [] R "Residual"; + Ty.tuple [] + ] [ Value.Tuple [] ] |) |))) @@ -7734,6 +7741,8 @@ Module array. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -7861,6 +7870,11 @@ Module array. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "array") [ N ] [ T ]; + Ty.apply (Ty.path "core::array::iter::IntoIter") [ N ] [ T ] + ] [ M.call_closure (| Ty.apply (Ty.path "array") [ N ] [ T ], @@ -7882,6 +7896,11 @@ Module array. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "array") [ N ] [ T ]; + Ty.apply (Ty.path "core::array::iter::IntoIter") [ N ] [ T ] + ] [ M.call_closure (| Ty.apply (Ty.path "core::array::iter::IntoIter") [ N ] [ T ], @@ -7895,6 +7914,8 @@ Module array. M.read (| array |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| initialized |)) @@ -7949,6 +7970,8 @@ Module array. M.alloc (| Value.StructRecord "core::array::Guard" + [] + [ T ] [ ("array_mut", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| buffer |) |) |)); @@ -8085,7 +8108,13 @@ Module array. [ M.read (| guard |) ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "usize" ] + [ Value.Tuple [] ] + |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/ascii.v b/CoqOfRust/core/ascii.v index dee189286..56f3aab11 100644 --- a/CoqOfRust/core/ascii.v +++ b/CoqOfRust/core/ascii.v @@ -27,6 +27,8 @@ Module ascii. (let self := M.alloc (| self |) in Value.StructTuple "core::ascii::EscapeDefault" + [] + [] [ M.call_closure (| Ty.apply @@ -112,6 +114,8 @@ Module ascii. (let c := M.alloc (| c |) in Value.StructTuple "core::ascii::EscapeDefault" + [] + [] [ M.call_closure (| Ty.apply @@ -148,6 +152,8 @@ Module ascii. ltac:(M.monadic (Value.StructTuple "core::ascii::EscapeDefault" + [] + [] [ M.call_closure (| Ty.apply @@ -298,7 +304,13 @@ Module ascii. |) in M.alloc (| Value.Tuple - [ M.read (| n |); Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + [ + M.read (| n |); + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| n |) ] ] |) |))) diff --git a/CoqOfRust/core/ascii/ascii_char.v b/CoqOfRust/core/ascii/ascii_char.v index e35efaf74..4d20d7fb5 100644 --- a/CoqOfRust/core/ascii/ascii_char.v +++ b/CoqOfRust/core/ascii/ascii_char.v @@ -1150,6 +1150,8 @@ Module ascii. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::ascii::ascii_char::AsciiChar" ] [ M.call_closure (| Ty.path "core::ascii::ascii_char::AsciiChar", @@ -1165,7 +1167,13 @@ Module ascii. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::ascii::ascii_char::AsciiChar" ] + [] + |))) ] |) |))) @@ -1247,6 +1255,8 @@ Module ascii. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::ascii::ascii_char::AsciiChar" ] [ M.call_closure (| Ty.path "core::ascii::ascii_char::AsciiChar", @@ -1262,7 +1272,13 @@ Module ascii. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::ascii::ascii_char::AsciiChar" ] + [] + |))) ] |) |))) @@ -1843,7 +1859,13 @@ Module ascii. Ty.path "usize" ], M.get_associated_function (| Self, "backslash.fmt", [], [] |), - [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::Digit0" [] ] + [ + Value.StructTuple + "core::ascii::ascii_char::AsciiChar::Digit0" + [] + [] + [] + ] |) |))); fun γ => @@ -1865,7 +1887,13 @@ Module ascii. Ty.path "usize" ], M.get_associated_function (| Self, "backslash.fmt", [], [] |), - [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallT" [] ] + [ + Value.StructTuple + "core::ascii::ascii_char::AsciiChar::SmallT" + [] + [] + [] + ] |) |))); fun γ => @@ -1887,7 +1915,13 @@ Module ascii. Ty.path "usize" ], M.get_associated_function (| Self, "backslash.fmt", [], [] |), - [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallR" [] ] + [ + Value.StructTuple + "core::ascii::ascii_char::AsciiChar::SmallR" + [] + [] + [] + ] |) |))); fun γ => @@ -1909,7 +1943,13 @@ Module ascii. Ty.path "usize" ], M.get_associated_function (| Self, "backslash.fmt", [], [] |), - [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallN" [] ] + [ + Value.StructTuple + "core::ascii::ascii_char::AsciiChar::SmallN" + [] + [] + [] + ] |) |))); fun γ => @@ -1935,6 +1975,8 @@ Module ascii. Value.StructTuple "core::ascii::ascii_char::AsciiChar::ReverseSolidus" [] + [] + [] ] |) |))); @@ -1957,7 +1999,12 @@ Module ascii. Ty.path "usize" ], M.get_associated_function (| Self, "backslash.fmt", [], [] |), - [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::Apostrophe" [] + [ + Value.StructTuple + "core::ascii::ascii_char::AsciiChar::Apostrophe" + [] + [] + [] ] |) |))); @@ -2083,16 +2130,26 @@ Module ascii. [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::Apostrophe" + [] + [] []; Value.StructTuple "core::ascii::ascii_char::AsciiChar::ReverseSolidus" + [] + [] + []; + Value.StructTuple + "core::ascii::ascii_char::AsciiChar::SmallX" + [] + [] []; - Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallX" []; M.read (| hi |); M.read (| lo |); Value.StructTuple "core::ascii::ascii_char::AsciiChar::Apostrophe" [] + [] + [] ]; Value.Integer IntegerKind.Usize 6 ] @@ -2106,14 +2163,30 @@ Module ascii. [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::Apostrophe" + [] + [] []; M.read (| M.deref (| M.read (| self |) |) |); Value.StructTuple "core::ascii::ascii_char::AsciiChar::Apostrophe" + [] + [] + []; + Value.StructTuple + "core::ascii::ascii_char::AsciiChar::Null" + [] + [] []; - Value.StructTuple "core::ascii::ascii_char::AsciiChar::Null" []; - Value.StructTuple "core::ascii::ascii_char::AsciiChar::Null" []; - Value.StructTuple "core::ascii::ascii_char::AsciiChar::Null" [] + Value.StructTuple + "core::ascii::ascii_char::AsciiChar::Null" + [] + [] + []; + Value.StructTuple + "core::ascii::ascii_char::AsciiChar::Null" + [] + [] + [] ]; Value.Integer IntegerKind.Usize 3 ] @@ -2190,6 +2263,8 @@ Module ascii. M.borrow (| Pointer.Kind.Ref, buf |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| len |)) ] ] |) diff --git a/CoqOfRust/core/asserting.v b/CoqOfRust/core/asserting.v index 99bb6fe0a..d4f6859e4 100644 --- a/CoqOfRust/core/asserting.v +++ b/CoqOfRust/core/asserting.v @@ -127,6 +127,8 @@ Module asserting. |), Value.StructTuple "core::option::Option::Some" + [] + [ E ] [ M.read (| M.deref (| @@ -283,9 +285,11 @@ Module asserting. ltac:(M.monadic (Value.StructRecord "core::asserting::Capture" + [] + [ M_; T ] [ - ("elem", Value.StructTuple "core::option::Option::None" []); - ("phantom", Value.StructTuple "core::marker::PhantomData" []) + ("elem", Value.StructTuple "core::option::Option::None" [] [ M_ ] []); + ("phantom", Value.StructTuple "core::marker::PhantomData" [] [ T ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/async_iter/async_iter.v b/CoqOfRust/core/async_iter/async_iter.v index 7529a1b49..16f8128fa 100644 --- a/CoqOfRust/core/async_iter/async_iter.v +++ b/CoqOfRust/core/async_iter/async_iter.v @@ -16,7 +16,9 @@ Module async_iter. ltac:(M.monadic (let self := M.alloc (| self |) in Value.Tuple - [ Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::None" [] + [ + Value.Integer IntegerKind.Usize 0; + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -341,7 +343,9 @@ Module async_iter. (let t := M.alloc (| t |) in Value.StructTuple "core::task::poll::Poll::Ready" - [ Value.StructTuple "core::option::Option::Some" [ M.read (| t |) ] ])) + [] + [ Ty.apply (Ty.path "core::option::Option") [] [ T ] ] + [ Value.StructTuple "core::option::Option::Some" [] [ T ] [ M.read (| t |) ] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -363,7 +367,14 @@ Module async_iter. (α : list Value.t) : M := let Self : Ty.t := Self T in - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::task::poll::Poll::Pending" [] |))). + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::task::poll::Poll::Pending" + [] + [ Ty.apply (Ty.path "core::option::Option") [] [ T ] ] + [] + |))). Global Instance AssociatedConstant_value_PENDING : forall (T : Ty.t), @@ -387,7 +398,9 @@ Module async_iter. (M.alloc (| Value.StructTuple "core::task::poll::Poll::Ready" - [ Value.StructTuple "core::option::Option::None" [] ] + [] + [ Ty.apply (Ty.path "core::option::Option") [] [ T ] ] + [ Value.StructTuple "core::option::Option::None" [] [ T ] [] ] |))). Global Instance AssociatedConstant_value_FINISHED : diff --git a/CoqOfRust/core/async_iter/from_iter.v b/CoqOfRust/core/async_iter/from_iter.v index a9213e60c..630270080 100644 --- a/CoqOfRust/core/async_iter/from_iter.v +++ b/CoqOfRust/core/async_iter/from_iter.v @@ -24,6 +24,8 @@ Module async_iter. (let self := M.alloc (| self |) in Value.StructRecord "core::async_iter::from_iter::FromIter" + [] + [ I ] [ ("iter", M.call_closure (| @@ -147,6 +149,9 @@ Module async_iter. (let iter := M.alloc (| iter |) in Value.StructRecord "core::async_iter::from_iter::FromIter" + [] + [ Ty.associated_in_trait "core::iter::traits::collect::IntoIterator" [] [] I "IntoIter" + ] [ ("iter", M.call_closure (| @@ -198,6 +203,13 @@ Module async_iter. let _cx := M.alloc (| _cx |) in Value.StructTuple "core::task::poll::Poll::Ready" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ Ty.associated_in_trait "core::iter::traits::iterator::Iterator" [] [] I "Item" ] + ] [ M.call_closure (| Ty.apply diff --git a/CoqOfRust/core/bool.v b/CoqOfRust/core/bool.v index 2fe930d4b..24963f2b4 100644 --- a/CoqOfRust/core/bool.v +++ b/CoqOfRust/core/bool.v @@ -26,10 +26,11 @@ Module bool. (let γ := M.use self in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| t |) ] + Value.StructTuple "core::option::Option::Some" [] [ T ] [ M.read (| t |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))) ] |) |))) @@ -64,6 +65,8 @@ Module bool. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.call_closure (| T, @@ -81,7 +84,8 @@ Module bool. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))) ] |) |))) diff --git a/CoqOfRust/core/cell.v b/CoqOfRust/core/cell.v index d21d15876..1503498f1 100644 --- a/CoqOfRust/core/cell.v +++ b/CoqOfRust/core/cell.v @@ -605,6 +605,8 @@ Module cell. (let value := M.alloc (| value |) in Value.StructRecord "core::cell::Cell" + [] + [ T ] [ ("value", M.call_closure (| @@ -1883,6 +1885,8 @@ Module cell. (let value := M.alloc (| value |) in Value.StructRecord "core::cell::RefCell" + [] + [ T ] [ ("value", M.call_closure (| @@ -2401,9 +2405,16 @@ Module cell. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::cell::Ref") [] [ T ]; + Ty.path "core::cell::BorrowError" + ] [ Value.StructRecord "core::cell::Ref" + [] + [ T ] [ ("value", M.read (| value |)); ("borrow", M.read (| b |)) ] ] |))); @@ -2413,7 +2424,12 @@ Module cell. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::cell::BorrowError" [] ] + [] + [ + Ty.apply (Ty.path "core::cell::Ref") [] [ T ]; + Ty.path "core::cell::BorrowError" + ] + [ Value.StructTuple "core::cell::BorrowError" [] [] [] ] |))) ] |) @@ -2616,13 +2632,25 @@ Module cell. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::cell::RefMut") [] [ T ]; + Ty.path "core::cell::BorrowMutError" + ] [ Value.StructRecord "core::cell::RefMut" + [] + [ T ] [ ("value", M.read (| value |)); ("borrow", M.read (| b |)); - ("marker", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + []) ] ] |))); @@ -2632,7 +2660,12 @@ Module cell. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::cell::BorrowMutError" [] ] + [] + [ + Ty.apply (Ty.path "core::cell::RefMut") [] [ T ]; + Ty.path "core::cell::BorrowMutError" + ] + [ Value.StructTuple "core::cell::BorrowMutError" [] [] [] ] |))) ] |) @@ -2886,6 +2919,8 @@ Module cell. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.apply (Ty.path "&") [] [ T ]; Ty.path "core::cell::BorrowError" ] [ M.borrow (| Pointer.Kind.Ref, @@ -2923,7 +2958,9 @@ Module cell. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::cell::BorrowError" [] ] + [] + [ Ty.apply (Ty.path "&") [] [ T ]; Ty.path "core::cell::BorrowError" ] + [ Value.StructTuple "core::cell::BorrowError" [] [] [] ] |))) ] |) @@ -4035,7 +4072,13 @@ Module cell. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::cell::BorrowRef" ] + [] + |))); fun γ => ltac:(M.monadic (let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -4057,9 +4100,13 @@ Module cell. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cell::BorrowRef" ] [ Value.StructRecord "core::cell::BorrowRef" + [] + [] [ ("borrow", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| borrow |) |) |)) @@ -4382,6 +4429,8 @@ Module cell. M.alloc (| Value.StructRecord "core::cell::BorrowRef" + [] + [] [ ("borrow", M.borrow (| @@ -4508,6 +4557,8 @@ Module cell. (let orig := M.alloc (| orig |) in Value.StructRecord "core::cell::Ref" + [] + [ T ] [ ("value", M.read (| @@ -4567,6 +4618,8 @@ Module cell. let f := M.alloc (| f |) in Value.StructRecord "core::cell::Ref" + [] + [ U ] [ ("value", M.call_closure (| @@ -4726,9 +4779,16 @@ Module cell. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::cell::Ref") [] [ U ]; + Ty.apply (Ty.path "core::cell::Ref") [] [ T ] + ] [ Value.StructRecord "core::cell::Ref" + [] + [ U ] [ ("value", M.call_closure (| @@ -4759,7 +4819,14 @@ Module cell. ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| orig |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "core::cell::Ref") [] [ U ]; + Ty.apply (Ty.path "core::cell::Ref") [] [ T ] + ] + [ M.read (| orig |) ] |))) ] |) @@ -4885,6 +4952,8 @@ Module cell. [ Value.StructRecord "core::cell::Ref" + [] + [ U ] [ ("value", M.call_closure (| @@ -4904,6 +4973,8 @@ Module cell. ]; Value.StructRecord "core::cell::Ref" + [] + [ V ] [ ("value", M.call_closure (| @@ -5159,6 +5230,8 @@ Module cell. M.alloc (| Value.StructRecord "core::cell::RefMut" + [] + [ U ] [ ("value", M.read (| value |)); ("borrow", @@ -5169,7 +5242,12 @@ Module cell. "borrow" |) |)); - ("marker", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ U ] ] + []) ] |) |))) @@ -5279,9 +5357,16 @@ Module cell. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::cell::RefMut") [] [ U ]; + Ty.apply (Ty.path "core::cell::RefMut") [] [ T ] + ] [ Value.StructRecord "core::cell::RefMut" + [] + [ U ] [ ("value", M.call_closure (| @@ -5305,7 +5390,12 @@ Module cell. "borrow" |) |)); - ("marker", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ U ] ] + []) ] ] |))); @@ -5313,7 +5403,14 @@ Module cell. ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| orig |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "core::cell::RefMut") [] [ U ]; + Ty.apply (Ty.path "core::cell::RefMut") [] [ T ] + ] + [ M.read (| orig |) ] |))) ] |) @@ -5441,6 +5538,8 @@ Module cell. [ Value.StructRecord "core::cell::RefMut" + [] + [ U ] [ ("value", M.call_closure (| @@ -5457,10 +5556,17 @@ Module cell. [ M.read (| a |) ] |)); ("borrow", M.read (| borrow |)); - ("marker", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ U ] ] + []) ]; Value.StructRecord "core::cell::RefMut" + [] + [ V ] [ ("value", M.call_closure (| @@ -5484,7 +5590,12 @@ Module cell. "borrow" |) |)); - ("marker", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ V ] ] + []) ] ] |))) @@ -5818,9 +5929,13 @@ Module cell. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cell::BorrowRefMut" ] [ Value.StructRecord "core::cell::BorrowRefMut" + [] + [] [ ("borrow", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| borrow |) |) |)) @@ -5828,7 +5943,14 @@ Module cell. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::cell::BorrowRefMut" ] + [] + |))) ] |) |))) @@ -6003,6 +6125,8 @@ Module cell. M.alloc (| Value.StructRecord "core::cell::BorrowRefMut" + [] + [] [ ("borrow", M.borrow (| @@ -6280,7 +6404,7 @@ Module cell. | [], [], [ value ] => ltac:(M.monadic (let value := M.alloc (| value |) in - Value.StructRecord "core::cell::UnsafeCell" [ ("value", M.read (| value |)) ])) + Value.StructRecord "core::cell::UnsafeCell" [] [ T ] [ ("value", M.read (| value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6608,9 +6732,15 @@ Module cell. (let value := M.alloc (| value |) in Value.StructRecord "core::cell::SyncUnsafeCell" + [] + [ T ] [ ("value", - Value.StructRecord "core::cell::UnsafeCell" [ ("value", M.read (| value |)) ]) + Value.StructRecord + "core::cell::UnsafeCell" + [] + [ T ] + [ ("value", M.read (| value |)) ]) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/cell/lazy.v b/CoqOfRust/core/cell/lazy.v index df0b4cc28..8c61dc303 100644 --- a/CoqOfRust/core/cell/lazy.v +++ b/CoqOfRust/core/cell/lazy.v @@ -62,6 +62,8 @@ Module cell. (let f := M.alloc (| f |) in Value.StructRecord "core::cell::lazy::LazyCell" + [] + [ T; F ] [ ("state", M.call_closure (| @@ -78,7 +80,13 @@ Module cell. [], [] |), - [ Value.StructTuple "core::cell::lazy::State::Uninit" [ M.read (| f |) ] ] + [ + Value.StructTuple + "core::cell::lazy::State::Uninit" + [] + [ T; F ] + [ M.read (| f |) ] + ] |)) ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -147,7 +155,11 @@ Module cell. |) in let data := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| data |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ T; F ] + [ M.read (| data |) ] |))); fun γ => ltac:(M.monadic @@ -159,7 +171,7 @@ Module cell. |) in let f := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| f |) ] + Value.StructTuple "core::result::Result::Err" [] [ T; F ] [ M.read (| f |) ] |))); fun γ => ltac:(M.monadic @@ -609,7 +621,7 @@ Module cell. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| state |) |) |); - Value.StructTuple "core::cell::lazy::State::Poisoned" [] + Value.StructTuple "core::cell::lazy::State::Poisoned" [] [ T; F ] [] ] |) |), @@ -680,6 +692,8 @@ Module cell. |); Value.StructTuple "core::cell::lazy::State::Init" + [] + [ T; F ] [ M.read (| data |) ] ] |) @@ -834,11 +848,19 @@ Module cell. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| data |) |) |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + [] + |))) ] |) |))) @@ -934,11 +956,19 @@ Module cell. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |))) ] |) |))) diff --git a/CoqOfRust/core/cell/once.v b/CoqOfRust/core/cell/once.v index e8cca285d..e5b9a73c4 100644 --- a/CoqOfRust/core/cell/once.v +++ b/CoqOfRust/core/cell/once.v @@ -33,6 +33,8 @@ Module cell. ltac:(M.monadic (Value.StructRecord "core::cell::once::OnceCell" + [] + [ T ] [ ("inner", M.call_closure (| @@ -49,7 +51,7 @@ Module cell. [], [] |), - [ Value.StructTuple "core::option::Option::None" [] ] + [ Value.StructTuple "core::option::Option::None" [] [ T ] [] ] |)) ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -241,7 +243,11 @@ Module cell. 0 |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; T ] + [ Value.Tuple [] ] |))); fun γ => ltac:(M.monadic @@ -255,7 +261,11 @@ Module cell. let γ1_1 := M.SubPointer.get_tuple_field (| γ0_0, 1 |) in let value := M.copy (| γ1_1 |) in M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| value |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.tuple []; T ] + [ M.read (| value |) ] |))) ] |) @@ -335,6 +345,11 @@ Module cell. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "&") [] [ T ]; + Ty.tuple [ Ty.apply (Ty.path "&") [] [ T ]; T ] + ] [ Value.Tuple [ @@ -402,6 +417,11 @@ Module cell. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "&") [] [ T ]; + Ty.tuple [ Ty.apply (Ty.path "&") [] [ T ]; T ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -497,6 +517,8 @@ Module cell. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ T; Ty.path "never" ] [ M.call_closure (| T, @@ -621,6 +643,8 @@ Module cell. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ T; Ty.path "never" ] [ M.call_closure (| T, @@ -739,6 +763,8 @@ Module cell. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.apply (Ty.path "&") [] [ T ]; E ] [ M.borrow (| Pointer.Kind.Ref, @@ -976,6 +1002,8 @@ Module cell. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ]; E ] [ M.borrow (| Pointer.Kind.MutRef, @@ -1197,6 +1225,8 @@ Module cell. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.apply (Ty.path "&") [] [ T ]; E ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| val |) |) |) ] |))); fun γ => @@ -1807,6 +1837,8 @@ Module cell. (let value := M.alloc (| value |) in Value.StructRecord "core::cell::once::OnceCell" + [] + [ T ] [ ("inner", M.call_closure (| @@ -1823,7 +1855,8 @@ Module cell. [], [] |), - [ Value.StructTuple "core::option::Option::Some" [ M.read (| value |) ] ] + [ Value.StructTuple "core::option::Option::Some" [] [ T ] [ M.read (| value |) ] + ] |)) ])) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/core/char/convert.v b/CoqOfRust/core/char/convert.v index 082d1001c..cedc3583c 100644 --- a/CoqOfRust/core/char/convert.v +++ b/CoqOfRust/core/char/convert.v @@ -40,13 +40,19 @@ Module char. M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Ok", 0 |) in let c := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| c |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "char" ] + [ M.read (| c |) ] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "char" ] [] + |))) ] |) |))) @@ -299,6 +305,8 @@ Module char. ltac:(M.monadic (Value.StructTuple "core::char::TryFromCharError" + [] + [] [ Value.Tuple [] ])) ] |))) @@ -406,6 +414,8 @@ Module char. ltac:(M.monadic (Value.StructTuple "core::char::TryFromCharError" + [] + [] [ Value.Tuple [] ])) ] |))) @@ -471,6 +481,8 @@ Module char. (let self := M.alloc (| self |) in Value.StructRecord "core::char::convert::ParseCharError" + [] + [] [ ("kind", M.call_closure (| @@ -1090,13 +1102,19 @@ Module char. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "char"; Ty.path "core::char::convert::ParseCharError" ] [ Value.StructRecord "core::char::convert::ParseCharError" + [] + [] [ ("kind", Value.StructTuple "core::char::convert::CharErrorKind::EmptyString" + [] + [] []) ] ] @@ -1114,20 +1132,30 @@ Module char. let c := M.copy (| γ1_0 |) in let _ := M.is_struct_tuple (| γ0_1, "core::option::Option::None" |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| c |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "char"; Ty.path "core::char::convert::ParseCharError" ] + [ M.read (| c |) ] |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "char"; Ty.path "core::char::convert::ParseCharError" ] [ Value.StructRecord "core::char::convert::ParseCharError" + [] + [] [ ("kind", Value.StructTuple "core::char::convert::CharErrorKind::TooManyChars" + [] + [] []) ] ] @@ -1230,9 +1258,13 @@ Module char. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "char"; Ty.path "core::char::convert::CharTryFromError" ] [ Value.StructTuple "core::char::convert::CharTryFromError" + [] + [] [ Value.Tuple [] ] ] |))); @@ -1241,6 +1273,8 @@ Module char. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "char"; Ty.path "core::char::convert::CharTryFromError" ] [ M.call_closure (| Ty.path "char", @@ -1665,6 +1699,8 @@ Module char. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "char" ] [ M.cast (Ty.path "char") @@ -1680,6 +1716,8 @@ Module char. (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "char" ] [ M.cast (Ty.path "char") @@ -1700,7 +1738,10 @@ Module char. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "char" ] [] + |))) ] |) |))) diff --git a/CoqOfRust/core/char/decode.v b/CoqOfRust/core/char/decode.v index b446475cc..e23f8b154 100644 --- a/CoqOfRust/core/char/decode.v +++ b/CoqOfRust/core/char/decode.v @@ -25,6 +25,8 @@ Module char. (let self := M.alloc (| self |) in Value.StructRecord "core::char::decode::DecodeUtf16" + [] + [ I ] [ ("iter", M.call_closure (| @@ -244,6 +246,8 @@ Module char. (let self := M.alloc (| self |) in Value.StructRecord "core::char::decode::DecodeUtf16Error" + [] + [] [ ("code", M.call_closure (| @@ -385,6 +389,9 @@ Module char. (let iter := M.alloc (| iter |) in Value.StructRecord "core::char::decode::DecodeUtf16" + [] + [ Ty.associated_in_trait "core::iter::traits::collect::IntoIterator" [] [] I "IntoIter" + ] [ ("iter", M.call_closure (| @@ -405,7 +412,7 @@ Module char. |), [ M.read (| iter |) ] |)); - ("buf", Value.StructTuple "core::option::Option::None" []) + ("buf", Value.StructTuple "core::option::Option::None" [] [ Ty.path "u16" ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -686,9 +693,18 @@ Module char. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::result::Result") + [] + [ Ty.path "char"; Ty.path "core::char::decode::DecodeUtf16Error" ] + ] [ Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "char"; Ty.path "core::char::decode::DecodeUtf16Error" ] [ M.call_closure (| Ty.path "char", @@ -744,12 +760,29 @@ Module char. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::result::Result") + [] + [ + Ty.path "char"; + Ty.path "core::char::decode::DecodeUtf16Error" + ] + ] [ Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "char"; + Ty.path "core::char::decode::DecodeUtf16Error" + ] [ Value.StructRecord "core::char::decode::DecodeUtf16Error" + [] + [] [ ("code", M.read (| u |)) ] ] ] @@ -811,12 +844,31 @@ Module char. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::result::Result") + [] + [ + Ty.path "char"; + Ty.path + "core::char::decode::DecodeUtf16Error" + ] + ] [ Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "char"; + Ty.path + "core::char::decode::DecodeUtf16Error" + ] [ Value.StructRecord "core::char::decode::DecodeUtf16Error" + [] + [] [ ("code", M.read (| u |)) ] ] ] @@ -876,18 +928,39 @@ Module char. |), Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u16" ] [ M.read (| u2 |) ] |) |) in M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::result::Result") + [] + [ + Ty.path "char"; + Ty.path + "core::char::decode::DecodeUtf16Error" + ] + ] [ Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "char"; + Ty.path + "core::char::decode::DecodeUtf16Error" + ] [ Value.StructRecord "core::char::decode::DecodeUtf16Error" + [] + [] [ ("code", M.read (| u |)) ] ] ] @@ -944,9 +1017,24 @@ Module char. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::result::Result") + [] + [ + Ty.path "char"; + Ty.path "core::char::decode::DecodeUtf16Error" + ] + ] [ Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "char"; + Ty.path "core::char::decode::DecodeUtf16Error" + ] [ M.call_closure (| Ty.path "char", @@ -1161,6 +1249,8 @@ Module char. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] |) |) diff --git a/CoqOfRust/core/char/methods.v b/CoqOfRust/core/char/methods.v index 577594700..7da60cb33 100644 --- a/CoqOfRust/core/char/methods.v +++ b/CoqOfRust/core/char/methods.v @@ -397,11 +397,15 @@ Module char. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.cast (Ty.path "u32") (M.read (| value |)) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -479,7 +483,8 @@ Module char. [], [] |), - [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::Digit0" [] ] + [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::Digit0" [] [] [] + ] |) |))); fun γ => @@ -495,7 +500,8 @@ Module char. [], [] |), - [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallT" [] ] + [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallT" [] [] [] + ] |) |))); fun γ => @@ -511,7 +517,8 @@ Module char. [], [] |), - [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallR" [] ] + [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallR" [] [] [] + ] |) |))); fun γ => @@ -527,7 +534,8 @@ Module char. [], [] |), - [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallN" [] ] + [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallN" [] [] [] + ] |) |))); fun γ => @@ -547,6 +555,8 @@ Module char. Value.StructTuple "core::ascii::ascii_char::AsciiChar::ReverseSolidus" [] + [] + [] ] |) |))); @@ -570,7 +580,12 @@ Module char. [], [] |), - [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::QuotationMark" [] + [ + Value.StructTuple + "core::ascii::ascii_char::AsciiChar::QuotationMark" + [] + [] + [] ] |) |))); @@ -594,7 +609,13 @@ Module char. [], [] |), - [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::Apostrophe" [] ] + [ + Value.StructTuple + "core::ascii::ascii_char::AsciiChar::Apostrophe" + [] + [] + [] + ] |) |))); fun γ => @@ -748,7 +769,8 @@ Module char. [], [] |), - [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallT" [] ] + [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallT" [] [] [] + ] |) |))); fun γ => @@ -764,7 +786,8 @@ Module char. [], [] |), - [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallR" [] ] + [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallR" [] [] [] + ] |) |))); fun γ => @@ -780,7 +803,8 @@ Module char. [], [] |), - [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallN" [] ] + [ Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallN" [] [] [] + ] |) |))); fun γ => @@ -1462,6 +1486,8 @@ Module char. (let self := M.alloc (| self |) in Value.StructTuple "core::char::ToLowercase" + [] + [] [ M.call_closure (| Ty.path "core::char::CaseMappingIter", @@ -1507,6 +1533,8 @@ Module char. (let self := M.alloc (| self |) in Value.StructTuple "core::char::ToUppercase" + [] + [] [ M.call_closure (| Ty.path "core::char::CaseMappingIter", @@ -1609,6 +1637,8 @@ Module char. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::ascii::ascii_char::AsciiChar" ] [ M.call_closure (| Ty.path "core::ascii::ascii_char::AsciiChar", @@ -1625,7 +1655,13 @@ Module char. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::ascii::ascii_char::AsciiChar" ] + [] + |))) ] |) |))) @@ -2418,6 +2454,8 @@ Module char. (M.alloc (| Value.StructRecord "core::char::methods::EscapeDebugExtArgs" + [] + [] [ ("escape_grapheme_extended", Value.Bool true); ("escape_single_quote", Value.Bool true); diff --git a/CoqOfRust/core/char/mod.v b/CoqOfRust/core/char/mod.v index 9257a1542..b19b2253b 100644 --- a/CoqOfRust/core/char/mod.v +++ b/CoqOfRust/core/char/mod.v @@ -213,6 +213,8 @@ Module char. (let self := M.alloc (| self |) in Value.StructTuple "core::char::EscapeUnicode" + [] + [] [ M.call_closure (| Ty.apply @@ -333,6 +335,8 @@ Module char. (let c := M.alloc (| c |) in Value.StructTuple "core::char::EscapeUnicode" + [] + [] [ M.call_closure (| Ty.apply @@ -459,7 +463,13 @@ Module char. |) in M.alloc (| Value.Tuple - [ M.read (| n |); Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + [ + M.read (| n |); + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| n |) ] ] |) |))) @@ -753,6 +763,8 @@ Module char. (let self := M.alloc (| self |) in Value.StructTuple "core::char::EscapeDefault" + [] + [] [ M.call_closure (| Ty.apply @@ -873,6 +885,8 @@ Module char. (let c := M.alloc (| c |) in Value.StructTuple "core::char::EscapeDefault" + [] + [] [ M.call_closure (| Ty.apply @@ -922,6 +936,8 @@ Module char. (let c := M.alloc (| c |) in Value.StructTuple "core::char::EscapeDefault" + [] + [] [ M.call_closure (| Ty.apply @@ -960,6 +976,8 @@ Module char. (let c := M.alloc (| c |) in Value.StructTuple "core::char::EscapeDefault" + [] + [] [ M.call_closure (| Ty.apply @@ -1086,7 +1104,13 @@ Module char. |) in M.alloc (| Value.Tuple - [ M.read (| n |); Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + [ + M.read (| n |); + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| n |) ] ] |) |))) @@ -1374,6 +1398,8 @@ Module char. (let self := M.alloc (| self |) in Value.StructTuple "core::char::EscapeDebug" + [] + [] [ M.call_closure (| Ty.path "core::char::EscapeDebugInner", @@ -1531,6 +1557,8 @@ Module char. M.alloc (| Value.StructTuple "core::char::EscapeDebugInner::Bytes" + [] + [] [ M.call_closure (| Ty.apply @@ -1566,6 +1594,8 @@ Module char. M.alloc (| Value.StructTuple "core::char::EscapeDebugInner::Char" + [] + [] [ M.call_closure (| Ty.path "char", @@ -1718,7 +1748,9 @@ Module char. (let chr := M.alloc (| chr |) in Value.StructTuple "core::char::EscapeDebug" - [ Value.StructTuple "core::char::EscapeDebugInner::Char" [ M.read (| chr |) ] ])) + [] + [] + [ Value.StructTuple "core::char::EscapeDebugInner::Char" [] [] [ M.read (| chr |) ] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1739,9 +1771,13 @@ Module char. (let c := M.alloc (| c |) in Value.StructTuple "core::char::EscapeDebug" + [] + [] [ Value.StructTuple "core::char::EscapeDebugInner::Bytes" + [] + [] [ M.call_closure (| Ty.apply @@ -1781,9 +1817,13 @@ Module char. (let c := M.alloc (| c |) in Value.StructTuple "core::char::EscapeDebug" + [] + [] [ Value.StructTuple "core::char::EscapeDebugInner::Bytes" + [] + [] [ M.call_closure (| Ty.apply @@ -1831,6 +1871,8 @@ Module char. |), Value.StructTuple "core::char::EscapeDebugInner::Bytes" + [] + [] [ M.call_closure (| Ty.apply @@ -1962,7 +2004,11 @@ Module char. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| chr |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "char" ] + [ M.read (| chr |) ] |))) ] |) @@ -2000,7 +2046,13 @@ Module char. |) in M.alloc (| Value.Tuple - [ M.read (| n |); Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + [ + M.read (| n |); + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| n |) ] ] |) |))) @@ -2348,6 +2400,8 @@ Module char. (let self := M.alloc (| self |) in Value.StructTuple "core::char::ToLowercase" + [] + [] [ M.call_closure (| Ty.path "core::char::CaseMappingIter", @@ -3066,6 +3120,8 @@ Module char. (let self := M.alloc (| self |) in Value.StructTuple "core::char::ToUppercase" + [] + [] [ M.call_closure (| Ty.path "core::char::CaseMappingIter", @@ -3790,6 +3846,8 @@ Module char. (let self := M.alloc (| self |) in Value.StructTuple "core::char::CaseMappingIter" + [] + [] [ M.call_closure (| Ty.apply @@ -4000,7 +4058,9 @@ Module char. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::char::CaseMappingIter" [ M.read (| iter |) ] |) + M.alloc (| + Value.StructTuple "core::char::CaseMappingIter" [] [] [ M.read (| iter |) ] + |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4850,7 +4910,13 @@ Module char. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/core/clone/uninit.v b/CoqOfRust/core/clone/uninit.v index 29c4f3e65..b4d884ffe 100644 --- a/CoqOfRust/core/clone/uninit.v +++ b/CoqOfRust/core/clone/uninit.v @@ -180,6 +180,8 @@ Module clone. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -211,6 +213,8 @@ Module clone. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::fmt::Arguments" ] [ M.call_closure (| Ty.path "core::fmt::Arguments", @@ -617,6 +621,8 @@ Module clone. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -648,6 +654,8 @@ Module clone. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::fmt::Arguments" ] [ M.call_closure (| Ty.path "core::fmt::Arguments", @@ -784,6 +792,8 @@ Module clone. (let data := M.alloc (| data |) in Value.StructRecord "core::clone::uninit::InitializingSlice" + [] + [ T ] [ ("data", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| data |) |) |)); ("initialized_len", Value.Integer IntegerKind.Usize 0) diff --git a/CoqOfRust/core/cmp.v b/CoqOfRust/core/cmp.v index ca0004428..1b38caf47 100644 --- a/CoqOfRust/core/cmp.v +++ b/CoqOfRust/core/cmp.v @@ -676,15 +676,15 @@ Module cmp. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::cmp::Ordering::Less" |) in - M.alloc (| Value.StructTuple "core::cmp::Ordering::Greater" [] |))); + M.alloc (| Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::cmp::Ordering::Equal" |) in - M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] |))); + M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::cmp::Ordering::Greater" |) in - M.alloc (| Value.StructTuple "core::cmp::Ordering::Less" [] |))) + M.alloc (| Value.StructTuple "core::cmp::Ordering::Less" [] [] [] |))) ] |) |))) @@ -966,6 +966,8 @@ Module cmp. ltac:(M.monadic (Value.StructTuple "core::cmp::Reverse" + [] + [ T ] [ M.call_closure (| T, @@ -1311,6 +1313,8 @@ Module cmp. (let self := M.alloc (| self |) in Value.StructTuple "core::cmp::Reverse" + [] + [ T ] [ M.call_closure (| T, @@ -3746,7 +3750,9 @@ Module cmp. ltac:(M.monadic (Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ])) + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ])) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3777,6 +3783,8 @@ Module cmp. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -3855,7 +3863,13 @@ Module cmp. is_constant_or_break_match (| M.read (| γ0_0 |), Value.Bool false |) in let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::cmp::Ordering" ] + [] + |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -3867,7 +3881,9 @@ Module cmp. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |))); fun γ => ltac:(M.monadic @@ -3880,7 +3896,9 @@ Module cmp. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |))); fun γ => ltac:(M.monadic @@ -3893,7 +3911,9 @@ Module cmp. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |))) ] |) @@ -4045,7 +4065,13 @@ Module cmp. is_constant_or_break_match (| M.read (| γ0_0 |), Value.Bool false |) in let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::cmp::Ordering" ] + [] + |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -4057,7 +4083,9 @@ Module cmp. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |))); fun γ => ltac:(M.monadic @@ -4070,7 +4098,9 @@ Module cmp. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |))); fun γ => ltac:(M.monadic @@ -4083,7 +4113,9 @@ Module cmp. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |))) ] |) @@ -4235,7 +4267,13 @@ Module cmp. is_constant_or_break_match (| M.read (| γ0_0 |), Value.Bool false |) in let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::cmp::Ordering" ] + [] + |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -4247,7 +4285,9 @@ Module cmp. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |))); fun γ => ltac:(M.monadic @@ -4260,7 +4300,9 @@ Module cmp. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |))); fun γ => ltac:(M.monadic @@ -4273,7 +4315,9 @@ Module cmp. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |))) ] |) @@ -4425,7 +4469,13 @@ Module cmp. is_constant_or_break_match (| M.read (| γ0_0 |), Value.Bool false |) in let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::cmp::Ordering" ] + [] + |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -4437,7 +4487,9 @@ Module cmp. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |))); fun γ => ltac:(M.monadic @@ -4450,7 +4502,9 @@ Module cmp. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |))); fun γ => ltac:(M.monadic @@ -4463,7 +4517,9 @@ Module cmp. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |))) ] |) @@ -4573,7 +4629,7 @@ Module cmp. ltac:(M.monadic (let self := M.alloc (| self |) in let _other := M.alloc (| _other |) in - Value.StructTuple "core::cmp::Ordering::Equal" [])) + Value.StructTuple "core::cmp::Ordering::Equal" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4630,7 +4686,7 @@ Module cmp. M.read (| γ |), Value.Integer IntegerKind.I8 (-1) |) in - M.alloc (| Value.StructTuple "core::cmp::Ordering::Less" [] |))); + M.alloc (| Value.StructTuple "core::cmp::Ordering::Less" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := @@ -4638,7 +4694,7 @@ Module cmp. M.read (| γ |), Value.Integer IntegerKind.I8 0 |) in - M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] |))); + M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := @@ -4646,7 +4702,7 @@ Module cmp. M.read (| γ |), Value.Integer IntegerKind.I8 1 |) in - M.alloc (| Value.StructTuple "core::cmp::Ordering::Greater" [] |))); + M.alloc (| Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -4804,6 +4860,8 @@ Module cmp. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -4959,6 +5017,8 @@ Module cmp. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -5114,6 +5174,8 @@ Module cmp. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -5265,6 +5327,8 @@ Module cmp. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -5416,6 +5480,8 @@ Module cmp. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -5567,6 +5633,8 @@ Module cmp. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -5718,6 +5786,8 @@ Module cmp. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -5873,6 +5943,8 @@ Module cmp. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -6028,6 +6100,8 @@ Module cmp. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -6179,6 +6253,8 @@ Module cmp. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -6330,6 +6406,8 @@ Module cmp. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -6481,6 +6559,8 @@ Module cmp. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -6632,6 +6712,8 @@ Module cmp. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", diff --git a/CoqOfRust/core/convert/mod.v b/CoqOfRust/core/convert/mod.v index b167c9979..244815f3d 100644 --- a/CoqOfRust/core/convert/mod.v +++ b/CoqOfRust/core/convert/mod.v @@ -319,6 +319,8 @@ Module convert. (let value := M.alloc (| value |) in Value.StructTuple "core::result::Result::Ok" + [] + [ T; Ty.path "core::convert::Infallible" ] [ M.call_closure (| T, diff --git a/CoqOfRust/core/convert/num.v b/CoqOfRust/core/convert/num.v index 295470572..c588b92d7 100644 --- a/CoqOfRust/core/convert/num.v +++ b/CoqOfRust/core/convert/num.v @@ -3458,7 +3458,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -3466,6 +3473,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u8") (M.read (| u |)) ] |))) ] @@ -3539,7 +3548,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -3547,6 +3563,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u8") (M.read (| u |)) ] |))) ] @@ -3624,7 +3642,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -3632,6 +3657,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u16") (M.read (| u |)) ] |))) ] @@ -3705,7 +3732,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -3713,6 +3747,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u8") (M.read (| u |)) ] |))) ] @@ -3790,7 +3826,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -3798,6 +3841,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u16") (M.read (| u |)) ] |))) ] @@ -3875,7 +3920,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u32"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -3883,6 +3935,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u32"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u32") (M.read (| u |)) ] |))) ] @@ -3956,7 +4010,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -3964,6 +4025,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u8") (M.read (| u |)) ] |))) ] @@ -4041,7 +4104,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -4049,6 +4119,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u16") (M.read (| u |)) ] |))) ] @@ -4126,7 +4198,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u32"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -4134,6 +4213,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u32"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u32") (M.read (| u |)) ] |))) ] @@ -4211,7 +4292,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u64"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -4219,6 +4307,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u64"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u64") (M.read (| u |)) ] |))) ] @@ -4307,7 +4397,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -4315,6 +4412,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i8") (M.read (| u |)) ] |))) ] @@ -4403,7 +4502,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -4411,6 +4517,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i8") (M.read (| u |)) ] |))) ] @@ -4499,7 +4607,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i16"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -4507,6 +4622,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i16"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i16") (M.read (| u |)) ] |))) ] @@ -4595,7 +4712,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -4603,6 +4727,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i8") (M.read (| u |)) ] |))) ] @@ -4691,7 +4817,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i16"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -4699,6 +4832,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i16"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i16") (M.read (| u |)) ] |))) ] @@ -4787,7 +4922,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i32"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -4795,6 +4937,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i32"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i32") (M.read (| u |)) ] |))) ] @@ -4883,7 +5027,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -4891,6 +5042,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i8") (M.read (| u |)) ] |))) ] @@ -4979,7 +5132,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i16"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -4987,6 +5147,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i16"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i16") (M.read (| u |)) ] |))) ] @@ -5075,7 +5237,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i32"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -5083,6 +5252,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i32"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i32") (M.read (| u |)) ] |))) ] @@ -5171,7 +5342,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i64"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -5179,6 +5357,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i64"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i64") (M.read (| u |)) ] |))) ] @@ -5252,7 +5432,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -5260,6 +5447,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i8") (M.read (| u |)) ] |))) ] @@ -5333,7 +5522,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -5341,6 +5537,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i8") (M.read (| u |)) ] |))) ] @@ -5418,7 +5616,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i16"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -5426,6 +5631,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i16"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i16") (M.read (| u |)) ] |))) ] @@ -5499,7 +5706,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -5507,6 +5721,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i8") (M.read (| u |)) ] |))) ] @@ -5584,7 +5800,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i16"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -5592,6 +5815,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i16"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i16") (M.read (| u |)) ] |))) ] @@ -5669,7 +5894,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i32"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -5677,6 +5909,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i32"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i32") (M.read (| u |)) ] |))) ] @@ -5750,7 +5984,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -5758,6 +5999,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i8") (M.read (| u |)) ] |))) ] @@ -5835,7 +6078,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i16"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -5843,6 +6093,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i16"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i16") (M.read (| u |)) ] |))) ] @@ -5920,7 +6172,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i32"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -5928,6 +6187,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i32"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i32") (M.read (| u |)) ] |))) ] @@ -6005,7 +6266,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i64"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -6013,6 +6281,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i64"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i64") (M.read (| u |)) ] |))) ] @@ -6086,7 +6356,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -6094,6 +6371,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i8") (M.read (| u |)) ] |))) ] @@ -6171,7 +6450,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i16"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -6179,6 +6465,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i16"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i16") (M.read (| u |)) ] |))) ] @@ -6256,7 +6544,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i32"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -6264,6 +6559,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i32"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i32") (M.read (| u |)) ] |))) ] @@ -6341,7 +6638,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i64"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -6349,6 +6653,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i64"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i64") (M.read (| u |)) ] |))) ] @@ -6426,7 +6732,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "i128"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -6434,6 +6747,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i128"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i128") (M.read (| u |)) ] |))) ] @@ -6500,6 +6815,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u8") (M.read (| u |)) ] |))); fun γ => @@ -6507,7 +6824,14 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))) ] @@ -6574,6 +6898,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u16") (M.read (| u |)) ] |))); fun γ => @@ -6581,7 +6907,14 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))) ] @@ -6648,6 +6981,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u32"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u32") (M.read (| u |)) ] |))); fun γ => @@ -6655,7 +6990,14 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u32"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))) ] @@ -6722,6 +7064,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u64"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u64") (M.read (| u |)) ] |))); fun γ => @@ -6729,7 +7073,14 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u64"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))) ] @@ -6796,6 +7147,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u128"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u128") (M.read (| u |)) ] |))); fun γ => @@ -6803,7 +7156,14 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u128"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))) ] @@ -6892,7 +7252,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -6900,6 +7267,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u8") (M.read (| u |)) ] |))) ] @@ -6966,6 +7335,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u16") (M.read (| u |)) ] |))); fun γ => @@ -6973,7 +7344,14 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))) ] @@ -7040,6 +7418,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u32"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u32") (M.read (| u |)) ] |))); fun γ => @@ -7047,7 +7427,14 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u32"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))) ] @@ -7114,6 +7501,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u64"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u64") (M.read (| u |)) ] |))); fun γ => @@ -7121,7 +7510,14 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u64"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))) ] @@ -7188,6 +7584,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u128"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u128") (M.read (| u |)) ] |))); fun γ => @@ -7195,7 +7593,14 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u128"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))) ] @@ -7284,7 +7689,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -7292,6 +7704,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u8") (M.read (| u |)) ] |))) ] @@ -7380,7 +7794,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -7388,6 +7809,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u16") (M.read (| u |)) ] |))) ] @@ -7454,6 +7877,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u32"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u32") (M.read (| u |)) ] |))); fun γ => @@ -7461,7 +7886,14 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u32"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))) ] @@ -7528,6 +7960,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u64"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u64") (M.read (| u |)) ] |))); fun γ => @@ -7535,7 +7969,14 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u64"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))) ] @@ -7602,6 +8043,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u128"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u128") (M.read (| u |)) ] |))); fun γ => @@ -7609,7 +8052,14 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u128"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))) ] @@ -7698,7 +8148,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -7706,6 +8163,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u8") (M.read (| u |)) ] |))) ] @@ -7794,7 +8253,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -7802,6 +8268,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u16") (M.read (| u |)) ] |))) ] @@ -7890,7 +8358,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u32"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -7898,6 +8373,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u32"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u32") (M.read (| u |)) ] |))) ] @@ -7964,6 +8441,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u64"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u64") (M.read (| u |)) ] |))); fun γ => @@ -7971,7 +8450,14 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u64"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))) ] @@ -8038,6 +8524,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u128"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u128") (M.read (| u |)) ] |))); fun γ => @@ -8045,7 +8533,14 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u128"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))) ] @@ -8134,7 +8629,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -8142,6 +8644,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u8") (M.read (| u |)) ] |))) ] @@ -8230,7 +8734,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -8238,6 +8749,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u16") (M.read (| u |)) ] |))) ] @@ -8326,7 +8839,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u32"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -8334,6 +8854,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u32"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u32") (M.read (| u |)) ] |))) ] @@ -8422,7 +8944,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u64"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -8430,6 +8959,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u64"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u64") (M.read (| u |)) ] |))) ] @@ -8496,6 +9027,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u128"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u128") (M.read (| u |)) ] |))); fun γ => @@ -8503,7 +9036,14 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "u128"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))) ] @@ -8581,7 +9121,14 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "isize"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))); fun γ => @@ -8589,6 +9136,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "isize"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "isize") (M.read (| u |)) ] |))) ] @@ -8655,6 +9204,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "usize"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "usize") (M.read (| u |)) ] |))); fun γ => @@ -8662,7 +9213,14 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + [] + [ Ty.path "usize"; Ty.path "core::num::error::TryFromIntError" ] + [ + Value.StructTuple + "core::num::error::TryFromIntError" + [] + [] + [ Value.Tuple [] ] ] |))) ] @@ -8741,9 +9299,13 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))); @@ -8752,6 +9314,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u8") (M.read (| u |)) ] |))) ] @@ -8829,9 +9393,13 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))); @@ -8840,6 +9408,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u16") (M.read (| u |)) ] |))) ] @@ -8917,9 +9487,13 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u32"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))); @@ -8928,6 +9502,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u32"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u32") (M.read (| u |)) ] |))) ] @@ -8964,6 +9540,8 @@ Module convert. (let value := M.alloc (| value |) in Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u64"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u64") (M.read (| value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -8996,6 +9574,8 @@ Module convert. (let value := M.alloc (| value |) in Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u128"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u128") (M.read (| value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -9069,9 +9649,13 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))); @@ -9080,6 +9664,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i8") (M.read (| u |)) ] |))) ] @@ -9157,9 +9743,13 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "i16"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))); @@ -9168,6 +9758,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i16"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i16") (M.read (| u |)) ] |))) ] @@ -9245,9 +9837,13 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "i32"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))); @@ -9256,6 +9852,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i32"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i32") (M.read (| u |)) ] |))) ] @@ -9333,9 +9931,13 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "i64"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))); @@ -9344,6 +9946,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i64"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i64") (M.read (| u |)) ] |))) ] @@ -9380,6 +9984,8 @@ Module convert. (let value := M.alloc (| value |) in Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i128"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i128") (M.read (| value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -9464,9 +10070,13 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))); @@ -9475,6 +10085,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u8") (M.read (| u |)) ] |))) ] @@ -9567,9 +10179,13 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))); @@ -9578,6 +10194,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u16"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u16") (M.read (| u |)) ] |))) ] @@ -9670,9 +10288,13 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u32"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))); @@ -9681,6 +10303,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u32"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u32") (M.read (| u |)) ] |))) ] @@ -9747,6 +10371,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u64"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u64") (M.read (| u |)) ] |))); fun γ => @@ -9754,9 +10380,13 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u64"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))) @@ -9824,6 +10454,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u128"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "u128") (M.read (| u |)) ] |))); fun γ => @@ -9831,9 +10463,13 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u128"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))) @@ -9923,9 +10559,13 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))); @@ -9934,6 +10574,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i8"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i8") (M.read (| u |)) ] |))) ] @@ -10026,9 +10668,13 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "i16"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))); @@ -10037,6 +10683,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i16"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i16") (M.read (| u |)) ] |))) ] @@ -10129,9 +10777,13 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "i32"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))); @@ -10140,6 +10792,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i32"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i32") (M.read (| u |)) ] |))) ] @@ -10176,6 +10830,8 @@ Module convert. (let value := M.alloc (| value |) in Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i64"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i64") (M.read (| value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -10208,6 +10864,8 @@ Module convert. (let value := M.alloc (| value |) in Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i128"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "i128") (M.read (| value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -10240,6 +10898,8 @@ Module convert. (let value := M.alloc (| value |) in Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "usize"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "usize") (M.read (| value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -10272,6 +10932,8 @@ Module convert. (let value := M.alloc (| value |) in Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "usize"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "usize") (M.read (| value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -10345,9 +11007,13 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "usize"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))); @@ -10356,6 +11022,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "usize"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "usize") (M.read (| u |)) ] |))) ] @@ -10422,6 +11090,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "usize"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "usize") (M.read (| u |)) ] |))); fun γ => @@ -10429,9 +11099,13 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "usize"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))) @@ -10499,6 +11173,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "usize"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "usize") (M.read (| u |)) ] |))); fun γ => @@ -10506,9 +11182,13 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "usize"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))) @@ -10576,6 +11256,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "usize"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "usize") (M.read (| u |)) ] |))); fun γ => @@ -10583,9 +11265,13 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "usize"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))) @@ -10653,6 +11339,8 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "usize"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "usize") (M.read (| u |)) ] |))); fun γ => @@ -10660,9 +11348,13 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "usize"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))) @@ -10756,9 +11448,13 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "usize"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))); @@ -10767,6 +11463,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "usize"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "usize") (M.read (| u |)) ] |))) ] @@ -10803,6 +11501,8 @@ Module convert. (let value := M.alloc (| value |) in Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "isize"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "isize") (M.read (| value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -10835,6 +11535,8 @@ Module convert. (let value := M.alloc (| value |) in Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "isize"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "isize") (M.read (| value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -10908,9 +11610,13 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "isize"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))); @@ -10919,6 +11625,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "isize"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "isize") (M.read (| u |)) ] |))) ] @@ -10996,9 +11704,13 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "isize"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))); @@ -11007,6 +11719,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "isize"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "isize") (M.read (| u |)) ] |))) ] @@ -11043,6 +11757,8 @@ Module convert. (let value := M.alloc (| value |) in Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "isize"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "isize") (M.read (| value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -11075,6 +11791,8 @@ Module convert. (let value := M.alloc (| value |) in Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "isize"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "isize") (M.read (| value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -11163,9 +11881,13 @@ Module convert. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "isize"; Ty.path "core::num::error::TryFromIntError" ] [ Value.StructTuple "core::num::error::TryFromIntError" + [] + [] [ Value.Tuple [] ] ] |))); @@ -11174,6 +11896,8 @@ Module convert. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "isize"; Ty.path "core::num::error::TryFromIntError" ] [ M.cast (Ty.path "isize") (M.read (| u |)) ] |))) ] @@ -13446,7 +14170,7 @@ Module convert. |), [ M.read (| value |) ] |); - Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + Value.StructTuple "core::num::error::TryFromIntError" [] [] [ Value.Tuple [] ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -13510,7 +14234,7 @@ Module convert. |), [ M.read (| value |) ] |); - Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + Value.StructTuple "core::num::error::TryFromIntError" [] [] [ Value.Tuple [] ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -13574,7 +14298,7 @@ Module convert. |), [ M.read (| value |) ] |); - Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + Value.StructTuple "core::num::error::TryFromIntError" [] [] [ Value.Tuple [] ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -13638,7 +14362,7 @@ Module convert. |), [ M.read (| value |) ] |); - Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + Value.StructTuple "core::num::error::TryFromIntError" [] [] [ Value.Tuple [] ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -13702,7 +14426,7 @@ Module convert. |), [ M.read (| value |) ] |); - Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + Value.StructTuple "core::num::error::TryFromIntError" [] [] [ Value.Tuple [] ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -13766,7 +14490,7 @@ Module convert. |), [ M.read (| value |) ] |); - Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + Value.StructTuple "core::num::error::TryFromIntError" [] [] [ Value.Tuple [] ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -13830,7 +14554,7 @@ Module convert. |), [ M.read (| value |) ] |); - Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + Value.StructTuple "core::num::error::TryFromIntError" [] [] [ Value.Tuple [] ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -13894,7 +14618,7 @@ Module convert. |), [ M.read (| value |) ] |); - Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + Value.StructTuple "core::num::error::TryFromIntError" [] [] [ Value.Tuple [] ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -13958,7 +14682,7 @@ Module convert. |), [ M.read (| value |) ] |); - Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + Value.StructTuple "core::num::error::TryFromIntError" [] [] [ Value.Tuple [] ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -14022,7 +14746,7 @@ Module convert. |), [ M.read (| value |) ] |); - Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + Value.StructTuple "core::num::error::TryFromIntError" [] [] [ Value.Tuple [] ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -14086,7 +14810,7 @@ Module convert. |), [ M.read (| value |) ] |); - Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + Value.StructTuple "core::num::error::TryFromIntError" [] [] [ Value.Tuple [] ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -14150,7 +14874,7 @@ Module convert. |), [ M.read (| value |) ] |); - Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + Value.StructTuple "core::num::error::TryFromIntError" [] [] [ Value.Tuple [] ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -14200,6 +14924,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ], @@ -14396,6 +15125,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ], @@ -14592,6 +15326,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ], @@ -14789,6 +15528,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ], @@ -14987,6 +15731,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ], @@ -15183,6 +15932,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ], @@ -15380,6 +16134,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ], @@ -15577,6 +16336,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ], @@ -15775,6 +16539,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ], @@ -15971,6 +16740,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ], @@ -16168,6 +16942,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ], @@ -16365,6 +17144,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ], @@ -16562,6 +17346,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ], @@ -16760,6 +17549,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ], @@ -16956,6 +17750,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ], @@ -17153,6 +17952,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ], @@ -17350,6 +18154,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ], @@ -17547,6 +18356,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ], @@ -17744,6 +18558,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ], @@ -17940,6 +18759,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ], @@ -18136,6 +18960,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ], @@ -18333,6 +19162,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ], @@ -18531,6 +19365,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ], @@ -18727,6 +19566,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ], @@ -18924,6 +19768,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ], @@ -19121,6 +19970,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ], @@ -19319,6 +20173,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ], @@ -19515,6 +20374,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ], @@ -19712,6 +20576,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ], @@ -19909,6 +20778,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ], @@ -20106,6 +20980,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ], @@ -20304,6 +21183,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ], @@ -20500,6 +21384,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ], @@ -20697,6 +21586,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ], @@ -20894,6 +21788,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ], @@ -21091,6 +21990,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i128" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i128" ], @@ -21288,6 +22192,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ], @@ -21484,6 +22393,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ], @@ -21680,6 +22594,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ], @@ -21877,6 +22796,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ], @@ -22075,6 +22999,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ], @@ -22271,6 +23200,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ], @@ -22468,6 +23402,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ], @@ -22665,6 +23604,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ], @@ -22863,6 +23807,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ], @@ -23059,6 +24008,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ], @@ -23256,6 +24210,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ], @@ -23453,6 +24412,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ], @@ -23650,6 +24614,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ], @@ -23848,6 +24817,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ], @@ -24044,6 +25018,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ], @@ -24241,6 +25220,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ], @@ -24438,6 +25422,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ], @@ -24635,6 +25624,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i128" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i128" ], @@ -24832,6 +25826,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ], @@ -25030,6 +26029,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ], @@ -25226,6 +26230,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ], @@ -25423,6 +26432,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ], @@ -25620,6 +26634,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ], @@ -25817,6 +26836,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i128" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i128" ], @@ -26014,6 +27038,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ], @@ -26212,6 +27241,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ], @@ -26408,6 +27442,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ], @@ -26605,6 +27644,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ], @@ -26802,6 +27846,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ], @@ -26999,6 +28048,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ], @@ -27196,6 +28250,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ], @@ -27394,6 +28453,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ], @@ -27590,6 +28654,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ], @@ -27787,6 +28856,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ], @@ -27984,6 +29058,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ], @@ -28181,6 +29260,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ], @@ -28378,6 +29462,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ], @@ -28576,6 +29665,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ], @@ -28772,6 +29866,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ], @@ -28969,6 +30068,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ], @@ -29166,6 +30270,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ], @@ -29363,6 +30472,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ], @@ -29560,6 +30674,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ], @@ -29758,6 +30877,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ], @@ -29954,6 +31078,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ], @@ -30151,6 +31280,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ], @@ -30348,6 +31482,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ], @@ -30545,6 +31684,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ], @@ -30742,6 +31886,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ], @@ -30940,6 +32089,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ], @@ -31136,6 +32290,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ], @@ -31333,6 +32492,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ], @@ -31530,6 +32694,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ], @@ -31727,6 +32896,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ], @@ -31924,6 +33098,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ], @@ -32122,6 +33301,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ], @@ -32318,6 +33502,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ], @@ -32515,6 +33704,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ], @@ -32712,6 +33906,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ], @@ -32909,6 +34108,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ], @@ -33106,6 +34310,11 @@ Module convert. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ]; + Ty.path "core::num::error::TryFromIntError" + ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ], diff --git a/CoqOfRust/core/default.v b/CoqOfRust/core/default.v index 44d49b1a1..48c35bc5c 100644 --- a/CoqOfRust/core/default.v +++ b/CoqOfRust/core/default.v @@ -85,7 +85,7 @@ Module default. Definition default (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with | [], [], [] => - ltac:(M.monadic (Value.StructTuple "core::ascii::ascii_char::AsciiChar::Null" [])) + ltac:(M.monadic (Value.StructTuple "core::ascii::ascii_char::AsciiChar::Null" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/error.v b/CoqOfRust/core/error.v index 502cecee3..76dfe4a1d 100644 --- a/CoqOfRust/core/error.v +++ b/CoqOfRust/core/error.v @@ -9,7 +9,11 @@ Module error. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::option::Option::None" [])) + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] ] + [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -185,7 +189,7 @@ Module error. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::error::private::Internal" [] + Value.StructTuple "core::error::private::Internal" [] [] [] ] |) |) in @@ -256,6 +260,8 @@ Module error. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -283,7 +289,14 @@ Module error. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |))) ] |) |))) @@ -343,6 +356,8 @@ Module error. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -370,7 +385,14 @@ Module error. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + [] + |))) ] |) |))) @@ -405,10 +427,14 @@ Module error. (let self := M.alloc (| self |) in Value.StructRecord "core::error::Source" + [] + [] [ ("current", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] ] [ (* Unsize *) M.pointer_coercion @@ -720,6 +746,8 @@ Module error. M.alloc (| Value.StructRecord "core::error::Tagged" + [] + [ Ty.apply (Ty.path "core::error::TaggedOption") [] [ I ] ] [ ("tag_id", M.call_closure (| @@ -730,7 +758,15 @@ Module error. ("value", Value.StructTuple "core::error::TaggedOption" - [ Value.StructTuple "core::option::Option::None" [] ]) + [] + [ I ] + [ + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.associated_in_trait "core::error::tags::Type" [] [] I "Reified" ] + [] + ]) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -1077,6 +1113,15 @@ Module error. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.associated_in_trait + "core::error::tags::Type" + [] + [] + I + "Reified" + ] [ M.read (| value |) ] |) |) in @@ -1181,6 +1226,15 @@ Module error. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.associated_in_trait + "core::error::tags::Type" + [] + [] + I + "Reified" + ] [ M.call_closure (| Ty.associated_in_trait @@ -1930,6 +1984,13 @@ Module error. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "core::error::TaggedOption") [] [ I ] ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -2006,7 +2067,19 @@ Module error. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "core::error::TaggedOption") [] [ I ] ] + ] + [] + |))) ] |) |))) @@ -2103,6 +2176,13 @@ Module error. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "core::error::TaggedOption") [] [ I ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -2179,7 +2259,19 @@ Module error. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "core::error::TaggedOption") [] [ I ] ] + ] + [] + |))) ] |) |))) @@ -2218,6 +2310,8 @@ Module error. (let self := M.alloc (| self |) in Value.StructRecord "core::error::Source" + [] + [] [ ("current", M.call_closure (| @@ -2493,7 +2587,7 @@ Module error. Value.Tuple [ Value.Integer IntegerKind.Usize 1; - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] ] |))); fun γ => @@ -2504,6 +2598,8 @@ Module error. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))) diff --git a/CoqOfRust/core/escape.v b/CoqOfRust/core/escape.v index 1fb6c84df..22f13a4b2 100644 --- a/CoqOfRust/core/escape.v +++ b/CoqOfRust/core/escape.v @@ -94,13 +94,13 @@ Module escape. [ Ty.apply (Ty.path "array") [ N ] [ Ty.path "core::ascii::ascii_char::AsciiChar" ] ] := M.alloc (| - repeat (| Value.StructTuple "core::ascii::ascii_char::AsciiChar::Null" [], N |) + repeat (| Value.StructTuple "core::ascii::ascii_char::AsciiChar::Null" [] [] [], N |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.alloc (| M.write (| M.SubPointer.get_array_field (| output, Value.Integer IntegerKind.Usize 0 |), - Value.StructTuple "core::ascii::ascii_char::AsciiChar::ReverseSolidus" [] + Value.StructTuple "core::ascii::ascii_char::AsciiChar::ReverseSolidus" [] [] [] |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -116,6 +116,8 @@ Module escape. M.read (| output |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "u8" ] [ ("start", Value.Integer IntegerKind.U8 0); ("end_", Value.Integer IntegerKind.U8 2) @@ -163,7 +165,7 @@ Module escape. [ Ty.apply (Ty.path "array") [ N ] [ Ty.path "core::ascii::ascii_char::AsciiChar" ] ] := M.alloc (| - repeat (| Value.StructTuple "core::ascii::ascii_char::AsciiChar::Null" [], N |) + repeat (| Value.StructTuple "core::ascii::ascii_char::AsciiChar::Null" [] [] [], N |) |) in let~ hi : Ty.apply (Ty.path "*") [] [ Ty.path "core::ascii::ascii_char::AsciiChar" ] := M.copy (| @@ -207,14 +209,14 @@ Module escape. M.alloc (| M.write (| M.SubPointer.get_array_field (| output, Value.Integer IntegerKind.Usize 0 |), - Value.StructTuple "core::ascii::ascii_char::AsciiChar::ReverseSolidus" [] + Value.StructTuple "core::ascii::ascii_char::AsciiChar::ReverseSolidus" [] [] [] |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.alloc (| M.write (| M.SubPointer.get_array_field (| output, Value.Integer IntegerKind.Usize 1 |), - Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallX" [] + Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallX" [] [] [] |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -237,6 +239,8 @@ Module escape. M.read (| output |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "u8" ] [ ("start", Value.Integer IntegerKind.U8 0); ("end_", Value.Integer IntegerKind.U8 4) @@ -278,7 +282,7 @@ Module escape. [ Ty.apply (Ty.path "array") [ N ] [ Ty.path "core::ascii::ascii_char::AsciiChar" ] ] := M.alloc (| - repeat (| Value.StructTuple "core::ascii::ascii_char::AsciiChar::Null" [], N |) + repeat (| Value.StructTuple "core::ascii::ascii_char::AsciiChar::Null" [] [] [], N |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.alloc (| @@ -293,6 +297,8 @@ Module escape. M.read (| output |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "u8" ] [ ("start", Value.Integer IntegerKind.U8 0); ("end_", Value.Integer IntegerKind.U8 1) @@ -841,7 +847,7 @@ Module escape. [ Ty.apply (Ty.path "array") [ N ] [ Ty.path "core::ascii::ascii_char::AsciiChar" ] ] := M.alloc (| - repeat (| Value.StructTuple "core::ascii::ascii_char::AsciiChar::Null" [], N |) + repeat (| Value.StructTuple "core::ascii::ascii_char::AsciiChar::Null" [] [] [], N |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.alloc (| @@ -1033,7 +1039,7 @@ Module escape. M.alloc (| M.write (| M.SubPointer.get_array_field (| output, Value.Integer IntegerKind.Usize 9 |), - Value.StructTuple "core::ascii::ascii_char::AsciiChar::RightCurlyBracket" [] + Value.StructTuple "core::ascii::ascii_char::AsciiChar::RightCurlyBracket" [] [] [] |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -1047,7 +1053,7 @@ Module escape. [ M.read (| start |); Value.Integer IntegerKind.Usize 0 ] |) |), - Value.StructTuple "core::ascii::ascii_char::AsciiChar::ReverseSolidus" [] + Value.StructTuple "core::ascii::ascii_char::AsciiChar::ReverseSolidus" [] [] [] |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -1061,7 +1067,7 @@ Module escape. [ M.read (| start |); Value.Integer IntegerKind.Usize 1 ] |) |), - Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallU" [] + Value.StructTuple "core::ascii::ascii_char::AsciiChar::SmallU" [] [] [] |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -1075,7 +1081,7 @@ Module escape. [ M.read (| start |); Value.Integer IntegerKind.Usize 2 ] |) |), - Value.StructTuple "core::ascii::ascii_char::AsciiChar::LeftCurlyBracket" [] + Value.StructTuple "core::ascii::ascii_char::AsciiChar::LeftCurlyBracket" [] [] [] |) |) in M.alloc (| @@ -1084,6 +1090,8 @@ Module escape. M.read (| output |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "u8" ] [ ("start", M.cast (Ty.path "u8") (M.read (| start |))); ("end_", M.cast (Ty.path "u8") N) @@ -1125,6 +1133,8 @@ Module escape. (let self := M.alloc (| self |) in Value.StructRecord "core::escape::EscapeIterInner" + [ N ] + [] [ ("data", M.call_closure (| @@ -1323,6 +1333,8 @@ Module escape. M.alloc (| Value.StructRecord "core::escape::EscapeIterInner" + [ N ] + [] [ ("data", M.read (| data |)); ("alive", M.read (| range |)) ] |))) ] @@ -1379,6 +1391,8 @@ Module escape. M.alloc (| Value.StructRecord "core::escape::EscapeIterInner" + [ N ] + [] [ ("data", M.read (| data |)); ("alive", M.read (| range |)) ] |))) ] @@ -1435,6 +1449,8 @@ Module escape. M.alloc (| Value.StructRecord "core::escape::EscapeIterInner" + [ N ] + [] [ ("data", M.read (| data |)); ("alive", M.read (| range |)) ] |))) ] @@ -1461,12 +1477,19 @@ Module escape. ltac:(M.monadic (Value.StructRecord "core::escape::EscapeIterInner" + [ N ] + [] [ ("data", - repeat (| Value.StructTuple "core::ascii::ascii_char::AsciiChar::Null" [], N |)); + repeat (| + Value.StructTuple "core::ascii::ascii_char::AsciiChar::Null" [] [] [], + N + |)); ("alive", Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "u8" ] [ ("start", Value.Integer IntegerKind.U8 0); ("end_", Value.Integer IntegerKind.U8 0) @@ -1523,6 +1546,8 @@ Module escape. |)); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -1834,6 +1859,8 @@ Module escape. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -2026,6 +2053,8 @@ Module escape. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", diff --git a/CoqOfRust/core/ffi/c_str.v b/CoqOfRust/core/ffi/c_str.v index 40f5e9985..437c95cc5 100644 --- a/CoqOfRust/core/ffi/c_str.v +++ b/CoqOfRust/core/ffi/c_str.v @@ -177,6 +177,8 @@ Module ffi. (let self := M.alloc (| self |) in Value.StructRecord "core::ffi::c_str::FromBytesWithNulError" + [] + [] [ ("kind", M.call_closure (| @@ -426,6 +428,8 @@ Module ffi. M.alloc (| Value.StructTuple "core::ffi::c_str::FromBytesWithNulErrorKind::InteriorNul" + [] + [] [ M.call_closure (| Ty.path "usize", @@ -455,6 +459,8 @@ Module ffi. Value.StructTuple "core::ffi::c_str::FromBytesWithNulErrorKind::NotNulTerminated" [] + [] + [] |))) ] |) @@ -740,10 +746,14 @@ Module ffi. (let pos := M.alloc (| pos |) in Value.StructRecord "core::ffi::c_str::FromBytesWithNulError" + [] + [] [ ("kind", Value.StructTuple "core::ffi::c_str::FromBytesWithNulErrorKind::InteriorNul" + [] + [] [ M.read (| pos |) ]) ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -765,10 +775,14 @@ Module ffi. ltac:(M.monadic (Value.StructRecord "core::ffi::c_str::FromBytesWithNulError" + [] + [] [ ("kind", Value.StructTuple "core::ffi::c_str::FromBytesWithNulErrorKind::NotNulTerminated" + [] + [] []) ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -867,6 +881,8 @@ Module ffi. (let self := M.alloc (| self |) in Value.StructTuple "core::ffi::c_str::FromBytesUntilNulError" + [] + [] [ M.call_closure (| Ty.tuple [], @@ -1662,7 +1678,13 @@ Module ffi. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1874,6 +1896,11 @@ Module ffi. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "&") [] [ Ty.path "core::ffi::c_str::CStr" ]; + Ty.path "core::ffi::c_str::FromBytesUntilNulError" + ] [ M.borrow (| Pointer.Kind.Ref, @@ -1903,9 +1930,16 @@ Module ffi. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "&") [] [ Ty.path "core::ffi::c_str::CStr" ]; + Ty.path "core::ffi::c_str::FromBytesUntilNulError" + ] [ Value.StructTuple "core::ffi::c_str::FromBytesUntilNulError" + [] + [] [ Value.Tuple [] ] ] |))) @@ -2008,6 +2042,11 @@ Module ffi. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "&") [] [ Ty.path "core::ffi::c_str::CStr" ]; + Ty.path "core::ffi::c_str::FromBytesWithNulError" + ] [ M.borrow (| Pointer.Kind.Ref, @@ -2043,6 +2082,11 @@ Module ffi. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "&") [] [ Ty.path "core::ffi::c_str::CStr" ]; + Ty.path "core::ffi::c_str::FromBytesWithNulError" + ] [ M.call_closure (| Ty.path "core::ffi::c_str::FromBytesWithNulError", @@ -2062,6 +2106,11 @@ Module ffi. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "&") [] [ Ty.path "core::ffi::c_str::CStr" ]; + Ty.path "core::ffi::c_str::FromBytesWithNulError" + ] [ M.call_closure (| Ty.path "core::ffi::c_str::FromBytesWithNulError", @@ -2888,6 +2937,8 @@ Module ffi. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -3161,6 +3212,8 @@ Module ffi. (let self := M.alloc (| self |) in Value.StructRecord "core::ffi::c_str::Bytes" + [] + [] [ ("ptr", M.call_closure (| @@ -3357,6 +3410,8 @@ Module ffi. (let s := M.alloc (| s |) in Value.StructRecord "core::ffi::c_str::Bytes" + [] + [] [ ("ptr", M.call_closure (| @@ -3380,7 +3435,12 @@ Module ffi. |) ] |)); - ("phantom", Value.StructTuple "core::marker::PhantomData" []) + ("phantom", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ Ty.path "i8" ] ] ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3507,7 +3567,9 @@ Module ffi. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u8" ] [] + |))); fun γ => ltac:(M.monadic (let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -3543,7 +3605,11 @@ Module ffi. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| ret |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u8" ] + [ M.read (| ret |) ] |))) ] |) @@ -3598,6 +3664,8 @@ Module ffi. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))); @@ -3607,7 +3675,7 @@ Module ffi. Value.Tuple [ Value.Integer IntegerKind.Usize 1; - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] ] |))) ] diff --git a/CoqOfRust/core/ffi/va_list.v b/CoqOfRust/core/ffi/va_list.v index aba5d7bb4..eb007a078 100644 --- a/CoqOfRust/core/ffi/va_list.v +++ b/CoqOfRust/core/ffi/va_list.v @@ -256,9 +256,16 @@ Module ffi. (let self := M.alloc (| self |) in Value.StructRecord "core::ffi::va_list::VaList" + [] + [] [ ("inner", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.path "core::ffi::va_list::VaListImpl" ] ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/fmt/builders.v b/CoqOfRust/core/fmt/builders.v index 8d37985bd..6f14e6ef6 100644 --- a/CoqOfRust/core/fmt/builders.v +++ b/CoqOfRust/core/fmt/builders.v @@ -38,6 +38,8 @@ Module fmt. ltac:(M.monadic (Value.StructRecord "core::fmt::builders::PadAdapterState" + [] + [] [ ("on_newline", Value.Bool true) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -149,6 +151,8 @@ Module fmt. |); Value.StructRecord "core::fmt::builders::PadAdapter" + [] + [] [ ("buf", (* Unsize *) @@ -674,7 +678,13 @@ Module fmt. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -991,6 +1001,8 @@ Module fmt. M.alloc (| Value.StructRecord "core::fmt::builders::DebugStruct" + [] + [] [ ("fmt", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| fmt |) |) |)); ("result", M.read (| result |)); @@ -1492,6 +1504,11 @@ Module fmt. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::builders::PadAdapter" + ] + [] |) in let~ state : Ty.apply @@ -2848,6 +2865,11 @@ Module fmt. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::builders::PadAdapter" + ] + [] |) in let~ state : Ty.apply @@ -3566,6 +3588,8 @@ Module fmt. M.alloc (| Value.StructRecord "core::fmt::builders::DebugTuple" + [] + [] [ ("fmt", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| fmt |) |) |)); ("result", M.read (| result |)); @@ -4073,6 +4097,11 @@ Module fmt. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::builders::PadAdapter" + ] + [] |) in let~ state : Ty.apply @@ -4849,6 +4878,11 @@ Module fmt. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::builders::PadAdapter" + ] + [] |) in let~ state : Ty.apply @@ -6052,6 +6086,11 @@ Module fmt. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::builders::PadAdapter" + ] + [] |) in let~ state : Ty.apply @@ -6662,10 +6701,14 @@ Module fmt. M.alloc (| Value.StructRecord "core::fmt::builders::DebugSet" + [] + [] [ ("inner", Value.StructRecord "core::fmt::builders::DebugInner" + [] + [] [ ("fmt", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| fmt |) |) |)); ("result", M.read (| result |)); @@ -7207,6 +7250,11 @@ Module fmt. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::builders::PadAdapter" + ] + [] |) in let~ state : Ty.apply @@ -7792,10 +7840,14 @@ Module fmt. M.alloc (| Value.StructRecord "core::fmt::builders::DebugList" + [] + [] [ ("inner", Value.StructRecord "core::fmt::builders::DebugInner" + [] + [] [ ("fmt", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| fmt |) |) |)); ("result", M.read (| result |)); @@ -8317,6 +8369,11 @@ Module fmt. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::builders::PadAdapter" + ] + [] |) in let~ state : Ty.apply @@ -8869,6 +8926,8 @@ Module fmt. M.alloc (| Value.StructRecord "core::fmt::builders::DebugMap" + [] + [] [ ("fmt", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| fmt |) |) |)); ("result", M.read (| result |)); @@ -9531,6 +9590,11 @@ Module fmt. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::builders::PadAdapter" + ] + [] |) in let~ _ : Ty.apply @@ -10497,6 +10561,8 @@ Module fmt. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] [ Value.Tuple [] ] |) |))) @@ -10857,6 +10923,11 @@ Module fmt. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::builders::PadAdapter" + ] + [] |) in let~ writer : Ty.apply @@ -11433,6 +11504,8 @@ Module fmt. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] [ Value.Tuple [] ] |) |))) @@ -11894,6 +11967,11 @@ Module fmt. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::builders::PadAdapter" + ] + [] |) in let~ state : Ty.apply @@ -12522,7 +12600,7 @@ Module fmt. | [], [ F ], [ f ] => ltac:(M.monadic (let f := M.alloc (| f |) in - Value.StructTuple "core::fmt::builders::FromFn" [ M.read (| f |) ])) + Value.StructTuple "core::fmt::builders::FromFn" [] [ F ] [ M.read (| f |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/fmt/float.v b/CoqOfRust/core/fmt/float.v index 7f86b4663..551639d57 100644 --- a/CoqOfRust/core/fmt/float.v +++ b/CoqOfRust/core/fmt/float.v @@ -590,12 +590,16 @@ Module fmt. ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool false |) in - M.alloc (| Value.StructTuple "core::num::flt2dec::Sign::Minus" [] |))); + M.alloc (| + Value.StructTuple "core::num::flt2dec::Sign::Minus" [] [] [] + |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::num::flt2dec::Sign::MinusPlus" [] |))) + M.alloc (| + Value.StructTuple "core::num::flt2dec::Sign::MinusPlus" [] [] [] + |))) ] |) |) in @@ -1141,12 +1145,16 @@ Module fmt. ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool false |) in - M.alloc (| Value.StructTuple "core::num::flt2dec::Sign::Minus" [] |))); + M.alloc (| + Value.StructTuple "core::num::flt2dec::Sign::Minus" [] [] [] + |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::num::flt2dec::Sign::MinusPlus" [] |))) + M.alloc (| + Value.StructTuple "core::num::flt2dec::Sign::MinusPlus" [] [] [] + |))) ] |) |) in @@ -1289,12 +1297,16 @@ Module fmt. ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool false |) in - M.alloc (| Value.StructTuple "core::num::flt2dec::Sign::Minus" [] |))); + M.alloc (| + Value.StructTuple "core::num::flt2dec::Sign::Minus" [] [] [] + |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::num::flt2dec::Sign::MinusPlus" [] |))) + M.alloc (| + Value.StructTuple "core::num::flt2dec::Sign::MinusPlus" [] [] [] + |))) ] |) |) in @@ -1888,11 +1900,17 @@ Module fmt. [ Value.Integer IntegerKind.Usize 0; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple + "core::fmt::rt::Alignment::Unknown" + [] + [] + []; Value.Integer IntegerKind.U32 12; - Value.StructTuple "core::fmt::rt::Count::Implied" []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize 6 ] ] |) @@ -2036,11 +2054,17 @@ Module fmt. [ Value.Integer IntegerKind.Usize 0; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple + "core::fmt::rt::Alignment::Unknown" + [] + [] + []; Value.Integer IntegerKind.U32 12; - Value.StructTuple "core::fmt::rt::Count::Implied" []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize 34 ] ] |) diff --git a/CoqOfRust/core/fmt/mod.v b/CoqOfRust/core/fmt/mod.v index 7d49c53e3..a308eb667 100644 --- a/CoqOfRust/core/fmt/mod.v +++ b/CoqOfRust/core/fmt/mod.v @@ -303,7 +303,7 @@ Module fmt. (* Default *) Definition default (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "core::fmt::Error" [])) + | [], [], [] => ltac:(M.monadic (Value.StructTuple "core::fmt::Error" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -376,7 +376,7 @@ Module fmt. ltac:(M.monadic (let self := M.alloc (| self |) in let other := M.alloc (| other |) in - Value.StructTuple "core::cmp::Ordering::Equal" [])) + Value.StructTuple "core::cmp::Ordering::Equal" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -436,7 +436,9 @@ Module fmt. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ])) + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -671,12 +673,15 @@ Module fmt. (let buf := M.alloc (| buf |) in Value.StructRecord "core::fmt::Formatter" + [] + [] [ ("flags", Value.Integer IntegerKind.U32 0); ("fill", Value.UnicodeChar 32); - ("align", Value.StructTuple "core::fmt::rt::Alignment::Unknown" []); - ("width", Value.StructTuple "core::option::Option::None" []); - ("precision", Value.StructTuple "core::option::Option::None" []); + ("align", Value.StructTuple "core::fmt::rt::Alignment::Unknown" [] [] []); + ("width", Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] []); + ("precision", + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] []); ("buf", (* Unsize *) M.pointer_coercion @@ -715,6 +720,8 @@ Module fmt. let wrap := M.alloc (| wrap |) in Value.StructRecord "core::fmt::Formatter" + [] + [] [ ("buf", (* Unsize *) @@ -906,7 +913,9 @@ Module fmt. (Ty.path "*") [] [ Ty.apply (Ty.path "core::option::Option") [] [ Ty.path "char" ] ] := - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) in + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "char" ] [] + |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.match_operator (| Ty.apply (Ty.path "*") [] [ Ty.tuple [] ], @@ -924,6 +933,8 @@ Module fmt. sign, Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "char" ] [ Value.UnicodeChar 45 ] |) |) in @@ -978,6 +989,8 @@ Module fmt. sign, Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "char" ] [ Value.UnicodeChar 43 ] |) |) in @@ -1089,11 +1102,21 @@ Module fmt. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| prefix |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [ M.read (| prefix |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |))) ] |) |) in @@ -1490,7 +1513,7 @@ Module fmt. |) |) |); - Value.StructTuple "core::fmt::rt::Alignment::Right" [] + Value.StructTuple "core::fmt::rt::Alignment::Right" [] [] [] ] |) |) in @@ -1663,7 +1686,7 @@ Module fmt. BinOp.Wrap.sub, [ M.read (| min |); M.read (| width |) ] |); - Value.StructTuple "core::fmt::Alignment::Right" [] + Value.StructTuple "core::fmt::Alignment::Right" [] [] [] ] |) ] @@ -1984,7 +2007,11 @@ Module fmt. |) |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] |))); fun γ => ltac:(M.monadic @@ -2053,7 +2080,7 @@ Module fmt. BinOp.Wrap.sub, [ M.read (| min |); M.read (| width |) ] |); - Value.StructTuple "core::fmt::Alignment::Right" [] + Value.StructTuple "core::fmt::Alignment::Right" [] [] [] ] |) ] @@ -2661,6 +2688,8 @@ Module fmt. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| i |)) ] ] |); @@ -2844,7 +2873,9 @@ Module fmt. ltac:(M.monadic (let~ align : Ty.apply (Ty.path "*") [] [ Ty.path "core::fmt::Alignment" ] := - M.alloc (| Value.StructTuple "core::fmt::Alignment::Left" [] |) in + M.alloc (| + Value.StructTuple "core::fmt::Alignment::Left" [] [] [] + |) in let~ post_padding : Ty.apply (Ty.path "*") @@ -3192,17 +3223,21 @@ Module fmt. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::fmt::rt::Alignment::Left" |) in - M.alloc (| Value.StructTuple "core::fmt::Alignment::Left" [] |))); + M.alloc (| Value.StructTuple "core::fmt::Alignment::Left" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::fmt::rt::Alignment::Right" |) in - M.alloc (| Value.StructTuple "core::fmt::Alignment::Right" [] |))); + M.alloc (| + Value.StructTuple "core::fmt::Alignment::Right" [] [] [] + |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::fmt::rt::Alignment::Center" |) in - M.alloc (| Value.StructTuple "core::fmt::Alignment::Center" [] |))) + M.alloc (| + Value.StructTuple "core::fmt::Alignment::Center" [] [] [] + |))) ] |) |) in @@ -3291,6 +3326,8 @@ Module fmt. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| pre_pad |)) @@ -3519,6 +3556,8 @@ Module fmt. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "core::fmt::PostPadding"; Ty.path "core::fmt::Error" ] [ M.call_closure (| Ty.path "core::fmt::PostPadding", @@ -3906,7 +3945,7 @@ Module fmt. "core::fmt::Formatter", "align" |), - Value.StructTuple "core::fmt::rt::Alignment::Right" [] + Value.StructTuple "core::fmt::rt::Alignment::Right" [] [] [] |) |) in M.alloc (| Value.Tuple [] |))); @@ -4060,6 +4099,8 @@ Module fmt. Value.StructTuple "core::fmt::Alignment::Right" [] + [] + [] ] |) ] @@ -5147,6 +5188,11 @@ Module fmt. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ + Ty.path + "usize" + ] [ ("end_", M.read (| @@ -5415,6 +5461,8 @@ Module fmt. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -5703,6 +5751,8 @@ Module fmt. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| len |)) @@ -5952,7 +6002,13 @@ Module fmt. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6217,7 +6273,9 @@ Module fmt. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::fmt::Alignment::Left" [] ] + [] + [ Ty.path "core::fmt::Alignment" ] + [ Value.StructTuple "core::fmt::Alignment::Left" [] [] [] ] |))); fun γ => ltac:(M.monadic @@ -6225,7 +6283,9 @@ Module fmt. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::fmt::Alignment::Right" [] ] + [] + [ Ty.path "core::fmt::Alignment" ] + [ Value.StructTuple "core::fmt::Alignment::Right" [] [] [] ] |))); fun γ => ltac:(M.monadic @@ -6233,12 +6293,20 @@ Module fmt. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::fmt::Alignment::Center" [] ] + [] + [ Ty.path "core::fmt::Alignment" ] + [ Value.StructTuple "core::fmt::Alignment::Center" [] [] [] ] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::fmt::rt::Alignment::Unknown" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Alignment" ] + [] + |))) ] |) |))) @@ -7419,7 +7487,7 @@ Module fmt. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -7449,7 +7517,11 @@ Module fmt. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -8793,12 +8865,24 @@ Module fmt. M.alloc (| Value.StructRecord "core::fmt::Arguments" + [] + [] [ ("pieces", (* Unsize *) M.pointer_coercion (M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| pieces |) |) |))); - ("fmt", Value.StructTuple "core::option::Option::None" []); + ("fmt", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "core::fmt::rt::Placeholder" ] ] + ] + []); ("args", (* Unsize *) M.pointer_coercion @@ -8838,12 +8922,24 @@ Module fmt. M.alloc (| Value.StructRecord "core::fmt::Arguments" + [] + [] [ ("pieces", (* Unsize *) M.pointer_coercion (M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| pieces |) |) |))); - ("fmt", Value.StructTuple "core::option::Option::None" []); + ("fmt", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "core::fmt::rt::Placeholder" ] ] + ] + []); ("args", (* Unsize *) M.pointer_coercion @@ -8878,11 +8974,20 @@ Module fmt. let _unsafe_arg := M.alloc (| _unsafe_arg |) in Value.StructRecord "core::fmt::Arguments" + [] + [] [ ("pieces", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| pieces |) |) |)); ("fmt", Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "core::fmt::rt::Placeholder" ] ] + ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| fmt |) |) |) ]); ("args", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| args |) |) |)) ])) @@ -9300,6 +9405,8 @@ Module fmt. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) ] |))); fun γ => @@ -9313,6 +9420,8 @@ Module fmt. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -9321,7 +9430,14 @@ Module fmt. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |))) ] |) |))) @@ -9408,7 +9524,14 @@ Module fmt. let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in s)); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |))) ] |) |))) @@ -11052,7 +11175,13 @@ Module fmt. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -11357,11 +11486,19 @@ Module fmt. (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::fmt::rt::Count::Is", 0 |) in let n := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| n |) ] + |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::fmt::rt::Count::Implied" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))); fun γ => ltac:(M.monadic (let γ0_0 := @@ -11501,6 +11638,8 @@ Module fmt. let padding := M.alloc (| padding |) in Value.StructRecord "core::fmt::PostPadding" + [] + [] [ ("fill", M.read (| fill |)); ("padding", M.read (| padding |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -11549,6 +11688,8 @@ Module fmt. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -11759,7 +11900,13 @@ Module fmt. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -13079,6 +13226,8 @@ Module fmt. M.alloc (| Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", Value.Integer IntegerKind.Usize 0) @@ -13298,6 +13447,8 @@ Module fmt. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| non_printable_start |)) ] ] @@ -13379,6 +13530,8 @@ Module fmt. M.read (| c |); Value.StructRecord "core::char::methods::EscapeDebugExtArgs" + [] + [] [ ("escape_grapheme_extended", Value.Bool true); @@ -14289,6 +14442,8 @@ Module fmt. M.read (| M.deref (| M.read (| self |) |) |); Value.StructRecord "core::char::methods::EscapeDebugExtArgs" + [] + [] [ ("escape_grapheme_extended", Value.Bool true); ("escape_single_quote", Value.Bool true); @@ -14803,6 +14958,8 @@ Module fmt. |), Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", diff --git a/CoqOfRust/core/fmt/num.v b/CoqOfRust/core/fmt/num.v index 4beb9230b..22e1292b1 100644 --- a/CoqOfRust/core/fmt/num.v +++ b/CoqOfRust/core/fmt/num.v @@ -1272,6 +1272,8 @@ Module fmt. (* Unsize *) M.pointer_coercion (M.borrow (| Pointer.Kind.Ref, buf |)); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| curr |)) ] ] |) @@ -1390,7 +1392,7 @@ Module fmt. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::fmt::num::Binary" [])) + Value.StructTuple "core::fmt::num::Binary" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1455,7 +1457,7 @@ Module fmt. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::fmt::num::Octal" [])) + Value.StructTuple "core::fmt::num::Octal" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1520,7 +1522,7 @@ Module fmt. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::fmt::num::LowerHex" [])) + Value.StructTuple "core::fmt::num::LowerHex" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1585,7 +1587,7 @@ Module fmt. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::fmt::num::UpperHex" [])) + Value.StructTuple "core::fmt::num::UpperHex" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2358,7 +2360,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] [] [] |) |); M.cast (Ty.path "usize") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -2407,7 +2409,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] [] [] |) |); M.cast (Ty.path "usize") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -2456,7 +2458,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] [] [] |) |); M.cast (Ty.path "usize") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -2505,7 +2507,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] [] [] |) |); M.cast (Ty.path "usize") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -2554,7 +2556,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -2603,7 +2605,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -2652,7 +2654,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -2701,7 +2703,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -2750,7 +2752,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] [] [] |) |); M.cast (Ty.path "u8") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -2799,7 +2801,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] [] [] |) |); M.cast (Ty.path "u8") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -2848,7 +2850,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] [] [] |) |); M.cast (Ty.path "u8") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -2897,7 +2899,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] [] [] |) |); M.cast (Ty.path "u8") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -2946,7 +2948,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -2995,7 +2997,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3044,7 +3046,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3093,7 +3095,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3142,7 +3144,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] [] [] |) |); M.cast (Ty.path "u16") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3191,7 +3193,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] [] [] |) |); M.cast (Ty.path "u16") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3240,7 +3242,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] [] [] |) |); M.cast (Ty.path "u16") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3289,7 +3291,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] [] [] |) |); M.cast (Ty.path "u16") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3338,7 +3340,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3387,7 +3389,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3436,7 +3438,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3485,7 +3487,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3534,7 +3536,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] [] [] |) |); M.cast (Ty.path "u32") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3583,7 +3585,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] [] [] |) |); M.cast (Ty.path "u32") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3632,7 +3634,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] [] [] |) |); M.cast (Ty.path "u32") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3681,7 +3683,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] [] [] |) |); M.cast (Ty.path "u32") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3730,7 +3732,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3779,7 +3781,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3828,7 +3830,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3877,7 +3879,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3926,7 +3928,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] [] [] |) |); M.cast (Ty.path "u64") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -3975,7 +3977,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] [] [] |) |); M.cast (Ty.path "u64") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -4024,7 +4026,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] [] [] |) |); M.cast (Ty.path "u64") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -4073,7 +4075,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] [] [] |) |); M.cast (Ty.path "u64") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -4122,7 +4124,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -4171,7 +4173,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -4220,7 +4222,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -4269,7 +4271,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -4318,7 +4320,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] [] [] |) |); M.cast (Ty.path "u128") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -4367,7 +4369,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] [] [] |) |); M.cast (Ty.path "u128") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -4416,7 +4418,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] [] [] |) |); M.cast (Ty.path "u128") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -4465,7 +4467,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] [] [] |) |); M.cast (Ty.path "u128") (M.read (| M.deref (| M.read (| self |) |) |)); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -4514,7 +4516,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Binary" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -4563,7 +4565,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::Octal" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -4612,7 +4614,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::LowerHex" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -4661,7 +4663,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] |) + M.alloc (| Value.StructTuple "core::fmt::num::UpperHex" [] [] [] |) |); M.read (| M.use (M.deref (| M.read (| self |) |)) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) @@ -11417,6 +11419,8 @@ Module fmt. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1); ("end_", M.read (| subtracted_precision |)) @@ -12558,6 +12562,8 @@ Module fmt. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -12566,9 +12572,13 @@ Module fmt. ]; Value.StructTuple "core::num::fmt::Part::Zero" + [] + [] [ M.read (| added_precision |) ]; Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -12666,6 +12676,8 @@ Module fmt. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| sign |) |) |)); @@ -15615,6 +15627,8 @@ Module fmt. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1); ("end_", M.read (| subtracted_precision |)) @@ -16745,6 +16759,8 @@ Module fmt. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -16753,9 +16769,13 @@ Module fmt. ]; Value.StructTuple "core::num::fmt::Part::Zero" + [] + [] [ M.read (| added_precision |) ]; Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -16847,6 +16867,8 @@ Module fmt. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| sign |) |) |)); diff --git a/CoqOfRust/core/fmt/rt.v b/CoqOfRust/core/fmt/rt.v index 602238542..6397b955c 100644 --- a/CoqOfRust/core/fmt/rt.v +++ b/CoqOfRust/core/fmt/rt.v @@ -128,6 +128,8 @@ Module fmt. let width := M.alloc (| width |) in Value.StructRecord "core::fmt::rt::Placeholder" + [] + [] [ ("position", M.read (| position |)); ("fill", M.read (| fill |)); @@ -636,10 +638,14 @@ Module fmt. let f := M.alloc (| f |) in Value.StructRecord "core::fmt::rt::Argument" + [] + [] [ ("ty", Value.StructRecord "core::fmt::rt::ArgumentType::Placeholder" + [] + [] [ ("value", M.call_closure (| @@ -706,7 +712,12 @@ Module fmt. |), [ M.read (| f |) ] |)); - ("_lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("_lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ]) ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -847,6 +858,8 @@ Module fmt. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] [ Value.Tuple [] ])) ] |))) @@ -1072,10 +1085,14 @@ Module fmt. (let x := M.alloc (| x |) in Value.StructRecord "core::fmt::rt::Argument" + [] + [] [ ("ty", Value.StructTuple "core::fmt::rt::ArgumentType::Count" + [] + [] [ M.read (| M.deref (| M.read (| x |) |) |) ]) ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -1216,13 +1233,19 @@ Module fmt. |) in let count := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| count |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| count |) ] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::fmt::rt::ArgumentType::Placeholder" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))) ] |) |))) @@ -1270,7 +1293,7 @@ Module fmt. match ε, τ, α with | [], [], [] => ltac:(M.monadic - (Value.StructRecord "core::fmt::rt::UnsafeArg" [ ("_private", Value.Tuple []) ])) + (Value.StructRecord "core::fmt::rt::UnsafeArg" [] [] [ ("_private", Value.Tuple []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/future/async_drop.v b/CoqOfRust/core/future/async_drop.v index 5b78a5bd0..3a2816033 100644 --- a/CoqOfRust/core/future/async_drop.v +++ b/CoqOfRust/core/future/async_drop.v @@ -15,6 +15,8 @@ Module future. (let value := M.alloc (| value |) in Value.StructRecord "core::future::async_drop::AsyncDropOwning" + [] + [ T ] [ ("value", M.call_closure (| @@ -27,8 +29,13 @@ Module future. |), [ M.read (| value |) ] |)); - ("dtor", Value.StructTuple "core::option::Option::None" []); - ("_pinned", Value.StructTuple "core::marker::PhantomPinned" []) + ("dtor", + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::future::async_drop::AsyncDropInPlace") [] [ T ] ] + []); + ("_pinned", Value.StructTuple "core::marker::PhantomPinned" [] [] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -421,6 +428,8 @@ Module future. (let to_drop := M.alloc (| to_drop |) in Value.StructTuple "core::future::async_drop::AsyncDropInPlace" + [] + [ T ] [ M.call_closure (| Ty.associated_in_trait @@ -1056,7 +1065,12 @@ Module future. (let inner := M.alloc (| inner |) in Value.StructRecord "core::future::async_drop::Fuse" - [ ("inner", Value.StructTuple "core::option::Option::Some" [ M.read (| inner |) ]) ])) + [] + [ T ] + [ + ("inner", + Value.StructTuple "core::option::Option::Some" [] [ T ] [ M.read (| inner |) ]) + ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1225,7 +1239,11 @@ Module future. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::task::poll::Poll::Pending" [] + Value.StructTuple + "core::task::poll::Poll::Pending" + [] + [ Ty.tuple [] ] + [] |) |) |) @@ -1240,14 +1258,20 @@ Module future. "core::future::async_drop::Fuse", "inner" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ T ] [] |) |) in M.alloc (| Value.Tuple [] |))); fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::task::poll::Poll::Ready" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::task::poll::Poll::Ready" + [] + [ Ty.tuple [] ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1386,6 +1410,8 @@ Module future. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| len |)) @@ -2994,7 +3020,7 @@ Module future. *) Definition noop (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "core::future::async_drop::Noop" [])) + | [], [], [] => ltac:(M.monadic (Value.StructTuple "core::future::async_drop::Noop" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3040,7 +3066,11 @@ Module future. [ fun γ => ltac:(M.monadic - (Value.StructTuple "core::task::poll::Poll::Ready" [ Value.Tuple [] ])) + (Value.StructTuple + "core::task::poll::Poll::Ready" + [] + [ Ty.tuple [] ] + [ Value.Tuple [] ])) ] |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/core/future/join.v b/CoqOfRust/core/future/join.v index e3bd76950..7ad15d088 100644 --- a/CoqOfRust/core/future/join.v +++ b/CoqOfRust/core/future/join.v @@ -103,7 +103,7 @@ Module future. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::future::join::MaybeDone::Taken" [] + Value.StructTuple "core::future::join::MaybeDone::Taken" [] [ F ] [] ] |) |), @@ -118,7 +118,18 @@ Module future. |) in let val := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| val |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.associated_in_trait + "core::future::future::Future" + [] + [] + F + "Output" + ] + [ M.read (| val |) ] |))); fun γ => ltac:(M.monadic @@ -135,7 +146,13 @@ Module future. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.associated_in_trait "core::future::future::Future" [] [] F "Output" ] + [] + |))) ] |) |))) @@ -355,6 +372,8 @@ Module future. Value.StructTuple "core::task::poll::Poll::Pending" [] + [ Ty.tuple [] ] + [] |) |) |) @@ -389,6 +408,8 @@ Module future. M.borrow (| Pointer.Kind.MutRef, self |); Value.StructTuple "core::future::join::MaybeDone::Done" + [] + [ F ] [ M.read (| val |) ] ] |) @@ -418,7 +439,13 @@ Module future. |))) ] |) in - M.alloc (| Value.StructTuple "core::task::poll::Poll::Ready" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::task::poll::Poll::Ready" + [] + [ Ty.tuple [] ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/core/future/pending.v b/CoqOfRust/core/future/pending.v index 73ce0c4ee..361731c14 100644 --- a/CoqOfRust/core/future/pending.v +++ b/CoqOfRust/core/future/pending.v @@ -23,7 +23,10 @@ Module future. ltac:(M.monadic (Value.StructRecord "core::future::pending::Pending" - [ ("_data", Value.StructTuple "core::marker::PhantomData" []) ])) + [] + [ T ] + [ ("_data", Value.StructTuple "core::marker::PhantomData" [] [ Ty.function [] T ] []) + ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -54,7 +57,10 @@ Module future. M.match_operator (| Ty.apply (Ty.path "*") [] [ Ty.apply (Ty.path "core::task::poll::Poll") [] [ T ] ], β1, - [ fun γ => ltac:(M.monadic (Value.StructTuple "core::task::poll::Poll::Pending" [])) ] + [ + fun γ => + ltac:(M.monadic (Value.StructTuple "core::task::poll::Poll::Pending" [] [ T ] [])) + ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/future/poll_fn.v b/CoqOfRust/core/future/poll_fn.v index 58a68b88d..92786ef53 100644 --- a/CoqOfRust/core/future/poll_fn.v +++ b/CoqOfRust/core/future/poll_fn.v @@ -16,7 +16,7 @@ Module future. | [], [ T; F ], [ f ] => ltac:(M.monadic (let f := M.alloc (| f |) in - Value.StructRecord "core::future::poll_fn::PollFn" [ ("f", M.read (| f |)) ])) + Value.StructRecord "core::future::poll_fn::PollFn" [] [ F ] [ ("f", M.read (| f |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/future/ready.v b/CoqOfRust/core/future/ready.v index 1e38b49b1..49039e2e3 100644 --- a/CoqOfRust/core/future/ready.v +++ b/CoqOfRust/core/future/ready.v @@ -83,6 +83,8 @@ Module future. (let self := M.alloc (| self |) in Value.StructTuple "core::future::ready::Ready" + [] + [ T ] [ M.call_closure (| Ty.apply (Ty.path "core::option::Option") [] [ T ], @@ -158,6 +160,8 @@ Module future. let _cx := M.alloc (| _cx |) in Value.StructTuple "core::task::poll::Poll::Ready" + [] + [ T ] [ M.call_closure (| T, @@ -287,7 +291,9 @@ Module future. (let t := M.alloc (| t |) in Value.StructTuple "core::future::ready::Ready" - [ Value.StructTuple "core::option::Option::Some" [ M.read (| t |) ] ])) + [] + [ T ] + [ Value.StructTuple "core::option::Option::Some" [] [ T ] [ M.read (| t |) ] ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/hash/mod.v b/CoqOfRust/core/hash/mod.v index 2672f533c..05e609029 100644 --- a/CoqOfRust/core/hash/mod.v +++ b/CoqOfRust/core/hash/mod.v @@ -1083,7 +1083,9 @@ Module hash. ltac:(M.monadic (Value.StructTuple "core::hash::BuildHasherDefault" - [ Value.StructTuple "core::marker::PhantomData" [] ])) + [] + [ H ] + [ Value.StructTuple "core::marker::PhantomData" [] [ Ty.function [] H ] [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1215,7 +1217,9 @@ Module hash. (let self := M.alloc (| self |) in Value.StructTuple "core::hash::BuildHasherDefault" - [ Value.StructTuple "core::marker::PhantomData" [] ])) + [] + [ H ] + [ Value.StructTuple "core::marker::PhantomData" [] [ Ty.function [] H ] [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/hash/sip.v b/CoqOfRust/core/hash/sip.v index 88dac259c..bfc0c5d6d 100644 --- a/CoqOfRust/core/hash/sip.v +++ b/CoqOfRust/core/hash/sip.v @@ -88,6 +88,8 @@ Module hash. (let self := M.alloc (| self |) in Value.StructRecord "core::hash::sip::SipHasher13" + [] + [] [ ("hasher", M.call_closure (| @@ -146,6 +148,8 @@ Module hash. ltac:(M.monadic (Value.StructRecord "core::hash::sip::SipHasher13" + [] + [] [ ("hasher", M.call_closure (| @@ -265,6 +269,8 @@ Module hash. (let self := M.alloc (| self |) in Value.StructRecord "core::hash::sip::SipHasher24" + [] + [] [ ("hasher", M.call_closure (| @@ -323,6 +329,8 @@ Module hash. ltac:(M.monadic (Value.StructRecord "core::hash::sip::SipHasher24" + [] + [] [ ("hasher", M.call_closure (| @@ -434,6 +442,8 @@ Module hash. (let self := M.alloc (| self |) in Value.StructTuple "core::hash::sip::SipHasher" + [] + [] [ M.call_closure (| Ty.path "core::hash::sip::SipHasher24", @@ -485,6 +495,8 @@ Module hash. ltac:(M.monadic (Value.StructTuple "core::hash::sip::SipHasher" + [] + [] [ M.call_closure (| Ty.path "core::hash::sip::SipHasher24", @@ -1685,9 +1697,13 @@ Module hash. let key1 := M.alloc (| key1 |) in Value.StructTuple "core::hash::sip::SipHasher" + [] + [] [ Value.StructRecord "core::hash::sip::SipHasher24" + [] + [] [ ("hasher", M.call_closure (| @@ -1759,6 +1775,8 @@ Module hash. let key1 := M.alloc (| key1 |) in Value.StructRecord "core::hash::sip::SipHasher13" + [] + [] [ ("hasher", M.call_closure (| @@ -1826,6 +1844,8 @@ Module hash. M.alloc (| Value.StructRecord "core::hash::sip::Hasher" + [] + [ S ] [ ("k0", M.read (| key0 |)); ("k1", M.read (| key1 |)); @@ -1833,6 +1853,8 @@ Module hash. ("state", Value.StructRecord "core::hash::sip::State" + [] + [] [ ("v0", Value.Integer IntegerKind.U64 0); ("v1", Value.Integer IntegerKind.U64 0); @@ -1841,7 +1863,7 @@ Module hash. ]); ("tail", Value.Integer IntegerKind.U64 0); ("ntail", Value.Integer IntegerKind.Usize 0); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ S ] []) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -3354,6 +3376,8 @@ Module hash. (let self := M.alloc (| self |) in Value.StructRecord "core::hash::sip::Hasher" + [] + [ S ] [ ("k0", M.read (| @@ -3514,7 +3538,7 @@ Module hash. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::hash::sip::Sip13Rounds" [])) + Value.StructTuple "core::hash::sip::Sip13Rounds" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3533,7 +3557,7 @@ Module hash. (* Default *) Definition default (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "core::hash::sip::Sip13Rounds" [])) + | [], [], [] => ltac:(M.monadic (Value.StructTuple "core::hash::sip::Sip13Rounds" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5124,7 +5148,7 @@ Module hash. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::hash::sip::Sip24Rounds" [])) + Value.StructTuple "core::hash::sip::Sip24Rounds" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5143,7 +5167,7 @@ Module hash. (* Default *) Definition default (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "core::hash::sip::Sip24Rounds" [])) + | [], [], [] => ltac:(M.monadic (Value.StructTuple "core::hash::sip::Sip24Rounds" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/internal_macros.v b/CoqOfRust/core/internal_macros.v index 27dd2e8f7..5cdd5f2fc 100644 --- a/CoqOfRust/core/internal_macros.v +++ b/CoqOfRust/core/internal_macros.v @@ -139244,6 +139244,8 @@ Module str. M.read (| c |); Value.StructRecord "core::char::methods::EscapeDebugExtArgs" + [] + [] [ ("escape_grapheme_extended", Value.Bool false); ("escape_single_quote", Value.Bool true); diff --git a/CoqOfRust/core/intrinsics/mod.v b/CoqOfRust/core/intrinsics/mod.v index 57f3adaae..01177ee9c 100644 --- a/CoqOfRust/core/intrinsics/mod.v +++ b/CoqOfRust/core/intrinsics/mod.v @@ -8694,10 +8694,14 @@ Module char. [ Value.Integer IntegerKind.Usize 0; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple + "core::fmt::rt::Alignment::Unknown" + [] + [] + []; Value.Integer IntegerKind.U32 0; - Value.StructTuple "core::fmt::rt::Count::Implied" []; - Value.StructTuple "core::fmt::rt::Count::Implied" [] + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] [] ] |); M.call_closure (| @@ -8711,11 +8715,17 @@ Module char. [ Value.Integer IntegerKind.Usize 1; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple + "core::fmt::rt::Alignment::Unknown" + [] + [] + []; Value.Integer IntegerKind.U32 8; - Value.StructTuple "core::fmt::rt::Count::Implied" []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize 4 ] ] |); @@ -8730,10 +8740,14 @@ Module char. [ Value.Integer IntegerKind.Usize 2; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple + "core::fmt::rt::Alignment::Unknown" + [] + [] + []; Value.Integer IntegerKind.U32 0; - Value.StructTuple "core::fmt::rt::Count::Implied" []; - Value.StructTuple "core::fmt::rt::Count::Implied" [] + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] [] ] |) ] @@ -8979,10 +8993,14 @@ Module char. [ Value.Integer IntegerKind.Usize 0; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple + "core::fmt::rt::Alignment::Unknown" + [] + [] + []; Value.Integer IntegerKind.U32 0; - Value.StructTuple "core::fmt::rt::Count::Implied" []; - Value.StructTuple "core::fmt::rt::Count::Implied" [] + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] [] ] |); M.call_closure (| @@ -8996,11 +9014,17 @@ Module char. [ Value.Integer IntegerKind.Usize 1; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple + "core::fmt::rt::Alignment::Unknown" + [] + [] + []; Value.Integer IntegerKind.U32 8; - Value.StructTuple "core::fmt::rt::Count::Implied" []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize 4 ] ] |); @@ -9015,10 +9039,14 @@ Module char. [ Value.Integer IntegerKind.Usize 2; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple + "core::fmt::rt::Alignment::Unknown" + [] + [] + []; Value.Integer IntegerKind.U32 0; - Value.StructTuple "core::fmt::rt::Count::Implied" []; - Value.StructTuple "core::fmt::rt::Count::Implied" [] + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] [] ] |) ] @@ -9557,6 +9585,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| offset |)) ] ] |) @@ -9603,6 +9633,8 @@ Module slice. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| index |) ] |) |) @@ -9917,6 +9949,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -9927,7 +9961,9 @@ Module slice. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))) ] |) |))) diff --git a/CoqOfRust/core/io/borrowed_buf.v b/CoqOfRust/core/io/borrowed_buf.v index daded7850..1f728656a 100644 --- a/CoqOfRust/core/io/borrowed_buf.v +++ b/CoqOfRust/core/io/borrowed_buf.v @@ -251,6 +251,8 @@ Module io. M.alloc (| Value.StructRecord "core::io::borrowed_buf::BorrowedBuf" + [] + [] [ ("buf", M.borrow (| @@ -379,6 +381,8 @@ Module io. (let buf := M.alloc (| buf |) in Value.StructRecord "core::io::borrowed_buf::BorrowedBuf" + [] + [] [ ("buf", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| buf |) |) |)); ("filled", Value.Integer IntegerKind.Usize 0); @@ -583,6 +587,8 @@ Module io. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -715,6 +721,8 @@ Module io. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -844,6 +852,8 @@ Module io. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -977,6 +987,8 @@ Module io. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -1045,6 +1057,8 @@ Module io. (let self := M.alloc (| self |) in Value.StructRecord "core::io::borrowed_buf::BorrowedCursor" + [] + [] [ ("start", M.read (| @@ -1296,6 +1310,8 @@ Module io. (let self := M.alloc (| self |) in Value.StructRecord "core::io::borrowed_buf::BorrowedCursor" + [] + [] [ ("buf", M.borrow (| @@ -1554,6 +1570,8 @@ Module io. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -1715,6 +1733,8 @@ Module io. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -1865,6 +1885,8 @@ Module io. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -1976,6 +1998,8 @@ Module io. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -2710,6 +2734,8 @@ Module io. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| diff --git a/CoqOfRust/core/iter/adapters/array_chunks.v b/CoqOfRust/core/iter/adapters/array_chunks.v index b78526b32..6ccb87a69 100644 --- a/CoqOfRust/core/iter/adapters/array_chunks.v +++ b/CoqOfRust/core/iter/adapters/array_chunks.v @@ -135,6 +135,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::array_chunks::ArrayChunks" + [ N ] + [ I ] [ ("iter", M.call_closure (| @@ -310,9 +312,28 @@ Module iter. M.alloc (| Value.StructRecord "core::iter::adapters::array_chunks::ArrayChunks" + [ N ] + [ I ] [ ("iter", M.read (| iter |)); - ("remainder", Value.StructTuple "core::option::Option::None" []) + ("remainder", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::array::iter::IntoIter") + [ N ] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + ] + []) ] |) |))) @@ -860,7 +881,23 @@ Module iter. "core::iter::adapters::array_chunks::ArrayChunks", "remainder" |), - Value.StructTuple "core::option::Option::Some" [ M.read (| remainder |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::array::iter::IntoIter") + [ N ] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + ] + [ M.read (| remainder |) ] |) |) in M.alloc (| Value.Tuple [] |) @@ -1025,7 +1062,23 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |); - M.constructor_as_closure "core::ops::control_flow::ControlFlow::Break" + M.constructor_as_closure + "core::ops::control_flow::ControlFlow::Break" + [] + [ + Ty.apply + (Ty.path "array") + [ N ] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ]; + Ty.tuple [] + ] ] |) ] @@ -1833,6 +1886,21 @@ Module iter. (let x := M.copy (| γ |) in Value.StructTuple "core::ops::control_flow::ControlFlow::Break" + [] + [ + Ty.apply + (Ty.path "array") + [ N ] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ]; + Ty.tuple [] + ] [ M.read (| x |) ])) ] |))) @@ -1948,6 +2016,8 @@ Module iter. [ Value.StructTuple "core::iter::adapters::by_ref_sized::ByRefSized" + [] + [ I ] [ M.borrow (| Pointer.Kind.MutRef, diff --git a/CoqOfRust/core/iter/adapters/chain.v b/CoqOfRust/core/iter/adapters/chain.v index 78b3b5de2..585c54782 100644 --- a/CoqOfRust/core/iter/adapters/chain.v +++ b/CoqOfRust/core/iter/adapters/chain.v @@ -29,6 +29,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::chain::Chain" + [] + [ A; B ] [ ("a", M.call_closure (| @@ -196,9 +198,11 @@ Module iter. let b := M.alloc (| b |) in Value.StructRecord "core::iter::adapters::chain::Chain" + [] + [ A; B ] [ - ("a", Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ]); - ("b", Value.StructTuple "core::option::Option::Some" [ M.read (| b |) ]) + ("a", Value.StructTuple "core::option::Option::Some" [] [ A ] [ M.read (| a |) ]); + ("b", Value.StructTuple "core::option::Option::Some" [] [ B ] [ M.read (| b |) ]) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -907,7 +911,7 @@ Module iter. "core::iter::adapters::chain::Chain", "a" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ A ] [] |) |) in M.alloc (| Value.Tuple [] |))); @@ -1295,6 +1299,14 @@ Module iter. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] [ Value.Tuple [] ] |) |) @@ -1337,7 +1349,7 @@ Module iter. "core::iter::adapters::chain::Chain", "a" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ A ] [] |) |) in M.alloc (| Value.Tuple [] |))); @@ -1476,8 +1488,27 @@ Module iter. |), [ M.read (| n |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] ] |) |) @@ -1682,7 +1713,7 @@ Module iter. "core::iter::adapters::chain::Chain", "a" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ A ] [] |) |) in M.alloc (| Value.Tuple [] |))); @@ -2658,6 +2689,8 @@ Module iter. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "usize" ] + [] |))) ] |) @@ -2776,6 +2809,8 @@ Module iter. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))) @@ -3286,6 +3321,14 @@ Module iter. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] [ Value.Tuple [] ] |) |) @@ -3328,7 +3371,7 @@ Module iter. "core::iter::adapters::chain::Chain", "b" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ B ] [] |) |) in M.alloc (| Value.Tuple [] |))); @@ -3467,8 +3510,27 @@ Module iter. |), [ M.read (| n |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] ] |) |) @@ -3678,7 +3740,7 @@ Module iter. "core::iter::adapters::chain::Chain", "b" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ B ] [] |) |) in M.alloc (| Value.Tuple [] |))); @@ -4378,7 +4440,7 @@ Module iter. "core::iter::adapters::chain::Chain", "b" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ B ] [] |) |) in M.alloc (| Value.Tuple [] |))); @@ -4935,7 +4997,7 @@ Module iter. M.alloc (| M.write (| M.deref (| M.read (| opt |) |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ T ] [] |) |) in M.alloc (| Value.Tuple [] |))); diff --git a/CoqOfRust/core/iter/adapters/cloned.v b/CoqOfRust/core/iter/adapters/cloned.v index d71ba27a9..3db64dd88 100644 --- a/CoqOfRust/core/iter/adapters/cloned.v +++ b/CoqOfRust/core/iter/adapters/cloned.v @@ -25,6 +25,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::cloned::Cloned" + [] + [ I ] [ ("it", M.call_closure (| @@ -139,6 +141,8 @@ Module iter. (let it := M.alloc (| it |) in Value.StructRecord "core::iter::adapters::cloned::Cloned" + [] + [ I ] [ ("it", M.read (| it |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/iter/adapters/copied.v b/CoqOfRust/core/iter/adapters/copied.v index e7540dc1a..ef544d46a 100644 --- a/CoqOfRust/core/iter/adapters/copied.v +++ b/CoqOfRust/core/iter/adapters/copied.v @@ -25,6 +25,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::copied::Copied" + [] + [ I ] [ ("it", M.call_closure (| @@ -139,6 +141,8 @@ Module iter. (let it := M.alloc (| it |) in Value.StructRecord "core::iter::adapters::copied::Copied" + [] + [ I ] [ ("it", M.read (| it |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1490,6 +1494,18 @@ Module iter. (M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "array") + [ N ] + [ T ]; + Ty.apply + (Ty.path + "core::array::iter::IntoIter") + [ N ] + [ T ] + ] [ M.call_closure (| Ty.apply @@ -1511,6 +1527,8 @@ Module iter. M.read (| raw_array |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer @@ -1568,6 +1586,14 @@ Module iter. (M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "array") [ N ] [ T ]; + Ty.apply + (Ty.path "core::array::iter::IntoIter") + [ N ] + [ T ] + ] [ M.call_closure (| Ty.apply (Ty.path "array") [ N ] [ T ], @@ -1740,6 +1766,14 @@ Module iter. (M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "array") [ N ] [ T ]; + Ty.apply + (Ty.path "core::array::iter::IntoIter") + [ N ] + [ T ] + ] [ M.call_closure (| Ty.apply @@ -1759,6 +1793,8 @@ Module iter. M.read (| raw_array |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); @@ -1895,6 +1931,11 @@ Module iter. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "array") [ N ] [ T ]; + Ty.apply (Ty.path "core::array::iter::IntoIter") [ N ] [ T ] + ] [ M.call_closure (| Ty.apply (Ty.path "array") [ N ] [ T ], diff --git a/CoqOfRust/core/iter/adapters/cycle.v b/CoqOfRust/core/iter/adapters/cycle.v index 76f4dfd7c..498d5759e 100644 --- a/CoqOfRust/core/iter/adapters/cycle.v +++ b/CoqOfRust/core/iter/adapters/cycle.v @@ -25,6 +25,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::cycle::Cycle" + [] + [ I ] [ ("orig", M.call_closure (| @@ -175,6 +177,8 @@ Module iter. (let iter := M.alloc (| iter |) in Value.StructRecord "core::iter::adapters::cycle::Cycle" + [] + [ I ] [ ("orig", M.call_closure (| @@ -443,7 +447,11 @@ Module iter. Value.Tuple [ Value.Integer IntegerKind.Usize 0; - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] ] |))); fun γ => @@ -458,7 +466,11 @@ Module iter. Ty.path "usize" |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] ] |))) ] @@ -1178,6 +1190,14 @@ Module iter. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] [ Value.Tuple [] ] |) |) @@ -1322,6 +1342,15 @@ Module iter. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path + "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] [ Value.Tuple [] ] |) |) @@ -1490,8 +1519,27 @@ Module iter. |), [ M.read (| n |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] ] |) |) diff --git a/CoqOfRust/core/iter/adapters/enumerate.v b/CoqOfRust/core/iter/adapters/enumerate.v index 03a347a6d..60cfc2893 100644 --- a/CoqOfRust/core/iter/adapters/enumerate.v +++ b/CoqOfRust/core/iter/adapters/enumerate.v @@ -25,6 +25,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::enumerate::Enumerate" + [] + [ I ] [ ("iter", M.call_closure (| @@ -183,6 +185,8 @@ Module iter. (let iter := M.alloc (| iter |) in Value.StructRecord "core::iter::adapters::enumerate::Enumerate" + [] + [ I ] [ ("iter", M.read (| iter |)); ("count", Value.Integer IntegerKind.Usize 0) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -440,6 +444,19 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.path "usize"; + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + ] [ Value.Tuple [ M.read (| i |); M.read (| a |) ] ] |) |))) @@ -730,6 +747,19 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.path "usize"; + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + ] [ Value.Tuple [ M.read (| i |); M.read (| a |) ] ] |) |))) @@ -1407,6 +1437,19 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.path "usize"; + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + ] [ Value.Tuple [ @@ -1670,6 +1713,19 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.path "usize"; + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + ] [ Value.Tuple [ diff --git a/CoqOfRust/core/iter/adapters/filter.v b/CoqOfRust/core/iter/adapters/filter.v index ea9fa6af5..c3cba509e 100644 --- a/CoqOfRust/core/iter/adapters/filter.v +++ b/CoqOfRust/core/iter/adapters/filter.v @@ -25,6 +25,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::filter::Filter" + [] + [ I; P ] [ ("iter", M.call_closure (| @@ -98,6 +100,8 @@ Module iter. let predicate := M.alloc (| predicate |) in Value.StructRecord "core::iter::adapters::filter::Filter" + [] + [ I; P ] [ ("iter", M.read (| iter |)); ("predicate", M.read (| predicate |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -488,6 +492,8 @@ Module iter. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" + [] + [ Ty.tuple []; Ty.tuple [] ] [ Value.Tuple [] ] |))); fun γ => @@ -495,6 +501,8 @@ Module iter. (M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Break" + [] + [ Ty.tuple []; Ty.tuple [] ] [ Value.Tuple [] ] |))) ] @@ -553,6 +561,31 @@ Module iter. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "array") + [ N ] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ]; + Ty.apply + (Ty.path "core::array::iter::IntoIter") + [ N ] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + ] [ M.call_closure (| Ty.apply @@ -597,6 +630,31 @@ Module iter. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "array") + [ N ] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ]; + Ty.apply + (Ty.path "core::array::iter::IntoIter") + [ N ] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + ] [ M.call_closure (| Ty.apply @@ -630,6 +688,8 @@ Module iter. M.read (| array |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| initialized |)) diff --git a/CoqOfRust/core/iter/adapters/filter_map.v b/CoqOfRust/core/iter/adapters/filter_map.v index e8662971a..7b3dbd5b8 100644 --- a/CoqOfRust/core/iter/adapters/filter_map.v +++ b/CoqOfRust/core/iter/adapters/filter_map.v @@ -25,6 +25,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::filter_map::FilterMap" + [] + [ I; F ] [ ("iter", M.call_closure (| @@ -98,6 +100,8 @@ Module iter. let f := M.alloc (| f |) in Value.StructRecord "core::iter::adapters::filter_map::FilterMap" + [] + [ I; F ] [ ("iter", M.read (| iter |)); ("f", M.read (| f |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -610,6 +614,8 @@ Module iter. M.alloc (| Value.StructRecord "core::iter::adapters::filter_map::next_chunk::Guard" + [] + [ B ] [ ("array", (* Unsize *) @@ -1056,6 +1062,8 @@ Module iter. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" + [] + [ Ty.tuple []; Ty.tuple [] ] [ Value.Tuple [] ] |))); fun γ => @@ -1063,6 +1071,8 @@ Module iter. (M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Break" + [] + [ Ty.tuple []; Ty.tuple [] ] [ Value.Tuple [] ] |))) ] @@ -1144,6 +1154,11 @@ Module iter. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "array") [ N ] [ B ]; + Ty.apply (Ty.path "core::array::iter::IntoIter") [ N ] [ B ] + ] [ M.call_closure (| Ty.apply (Ty.path "array") [ N ] [ B ], @@ -1211,6 +1226,11 @@ Module iter. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "array") [ N ] [ B ]; + Ty.apply (Ty.path "core::array::iter::IntoIter") [ N ] [ B ] + ] [ M.call_closure (| Ty.apply (Ty.path "core::array::iter::IntoIter") [ N ] [ B ], @@ -1224,6 +1244,8 @@ Module iter. M.read (| array |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| initialized |)) diff --git a/CoqOfRust/core/iter/adapters/flatten.v b/CoqOfRust/core/iter/adapters/flatten.v index b9d1c2b39..9dd838fed 100644 --- a/CoqOfRust/core/iter/adapters/flatten.v +++ b/CoqOfRust/core/iter/adapters/flatten.v @@ -45,6 +45,8 @@ Module iter. let f := M.alloc (| f |) in Value.StructRecord "core::iter::adapters::flatten::FlatMap" + [] + [ I; U; F ] [ ("inner", M.call_closure (| @@ -228,6 +230,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::flatten::FlatMap" + [] + [ I; U; F ] [ ("inner", M.call_closure (| @@ -1644,6 +1648,8 @@ Module iter. (let iter := M.alloc (| iter |) in Value.StructRecord "core::iter::adapters::flatten::Flatten" + [] + [ I ] [ ("inner", M.call_closure (| @@ -1812,6 +1818,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::flatten::Flatten" + [] + [ I ] [ ("inner", M.call_closure (| @@ -2644,6 +2652,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::flatten::FlattenCompat" + [] + [ I; U ] [ ("iter", M.call_closure (| @@ -2854,6 +2864,8 @@ Module iter. (let iter := M.alloc (| iter |) in Value.StructRecord "core::iter::adapters::flatten::FlattenCompat" + [] + [ I; U ] [ ("iter", M.call_closure (| @@ -2869,8 +2881,8 @@ Module iter. |), [ M.read (| iter |) ] |)); - ("frontiter", Value.StructTuple "core::option::Option::None" []); - ("backiter", Value.StructTuple "core::option::Option::None" []) + ("frontiter", Value.StructTuple "core::option::Option::None" [] [ U ] []); + ("backiter", Value.StructTuple "core::option::Option::None" [] [ U ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3257,7 +3269,7 @@ Module iter. "core::iter::adapters::flatten::FlattenCompat", "frontiter" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ U ] [] |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -3409,7 +3421,7 @@ Module iter. "core::iter::adapters::flatten::FlattenCompat", "frontiter" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ U ] [] |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -3563,7 +3575,7 @@ Module iter. "core::iter::adapters::flatten::FlattenCompat", "backiter" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ U ] [] |) |) in M.alloc (| @@ -3968,7 +3980,7 @@ Module iter. "core::iter::adapters::flatten::FlattenCompat", "backiter" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ U ] [] |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -4120,7 +4132,7 @@ Module iter. "core::iter::adapters::flatten::FlattenCompat", "backiter" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ U ] [] |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -4274,7 +4286,7 @@ Module iter. "core::iter::adapters::flatten::FlattenCompat", "frontiter" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ U ] [] |) |) in M.alloc (| @@ -4563,6 +4575,8 @@ Module iter. |), Value.StructTuple "core::option::Option::Some" + [] + [ U ] [ M.call_closure (| U, @@ -4703,6 +4717,8 @@ Module iter. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ]; M.get_trait_method (| @@ -4804,6 +4820,8 @@ Module iter. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ]; M.get_trait_method (| @@ -5714,7 +5732,11 @@ Module iter. Value.Tuple [ M.read (| lo |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] ] |))) ] @@ -5986,15 +6008,44 @@ Module iter. |), [ M.read (| remaining |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] ] |) |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] + [ Value.Tuple [] ] |))) ] |) @@ -6104,7 +6155,12 @@ Module iter. |), [ M.read (| self |); - Value.StructTuple "core::option::Option::None" []; + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.associated_in_trait "core::iter::traits::iterator::Iterator" [] [] U "Item" + ] + []; M.get_associated_function (| Self, "last.last", [], [] |) ] |))) @@ -6512,6 +6568,8 @@ Module iter. |), Value.StructTuple "core::option::Option::Some" + [] + [ U ] [ M.call_closure (| U, @@ -6801,15 +6859,44 @@ Module iter. |), [ M.read (| remaining |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] ] |) |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] + [ Value.Tuple [] ] |))) ] |) @@ -6922,7 +7009,9 @@ Module iter. Definition size (T : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := let Self : Ty.t := Self T in match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "core::option::Option::None" [])) + | [], [], [] => + ltac:(M.monadic + (Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6953,7 +7042,9 @@ Module iter. : M := let Self : Ty.t := Self N T in match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "core::option::Option::Some" [ N ])) + | [], [], [] => + ltac:(M.monadic + (Value.StructTuple "core::option::Option::Some" [] [ Ty.path "usize" ] [ N ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6985,7 +7076,9 @@ Module iter. : M := let Self : Ty.t := Self N T in match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "core::option::Option::Some" [ N ])) + | [], [], [] => + ltac:(M.monadic + (Value.StructTuple "core::option::Option::Some" [] [ Ty.path "usize" ] [ N ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -7017,7 +7110,9 @@ Module iter. : M := let Self : Ty.t := Self N T in match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "core::option::Option::Some" [ N ])) + | [], [], [] => + ltac:(M.monadic + (Value.StructTuple "core::option::Option::Some" [] [ Ty.path "usize" ] [ N ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -7218,7 +7313,7 @@ Module iter. M.alloc (| M.write (| M.deref (| M.read (| opt |) |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ T ] [] |) |) in M.alloc (| Value.Tuple [] |))); @@ -8010,7 +8105,12 @@ Module iter. ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ M.read (| n |) ] |))) ] |) @@ -8193,7 +8293,20 @@ Module iter. ] |))) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + U + "Item" + ] + [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -8318,6 +8431,8 @@ Module iter. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))); @@ -8683,8 +8798,27 @@ Module iter. |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] ] |) |))); @@ -9234,7 +9368,20 @@ Module iter. ] |))) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + U + "Item" + ] + [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -9572,8 +9719,27 @@ Module iter. |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] ] |) |))); diff --git a/CoqOfRust/core/iter/adapters/fuse.v b/CoqOfRust/core/iter/adapters/fuse.v index dfcd985d3..3de7b0a43 100644 --- a/CoqOfRust/core/iter/adapters/fuse.v +++ b/CoqOfRust/core/iter/adapters/fuse.v @@ -25,6 +25,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::fuse::Fuse" + [] + [ I ] [ ("iter", M.call_closure (| @@ -147,7 +149,12 @@ Module iter. (let iter := M.alloc (| iter |) in Value.StructRecord "core::iter::adapters::fuse::Fuse" - [ ("iter", Value.StructTuple "core::option::Option::Some" [ M.read (| iter |) ]) ])) + [] + [ I ] + [ + ("iter", + Value.StructTuple "core::option::Option::Some" [] [ I ] [ M.read (| iter |) ]) + ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -367,7 +374,20 @@ Module iter. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [] + |))) ] |) |))) @@ -500,6 +520,8 @@ Module iter. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))) @@ -1137,6 +1159,8 @@ Module iter. ltac:(M.monadic (Value.StructRecord "core::iter::adapters::fuse::Fuse" + [] + [ I ] [ ("iter", M.call_closure (| @@ -1582,7 +1606,7 @@ Module iter. "core::iter::adapters::fuse::Fuse", "iter" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ I ] [] |) |) in M.alloc (| Value.Tuple [] |))); @@ -2140,7 +2164,7 @@ Module iter. "core::iter::adapters::fuse::Fuse", "iter" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ I ] [] |) |) in M.alloc (| Value.Tuple [] |))); @@ -4065,7 +4089,7 @@ Module iter. M.alloc (| M.write (| M.deref (| M.read (| opt |) |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ T ] [] |) |) in M.alloc (| Value.Tuple [] |))); diff --git a/CoqOfRust/core/iter/adapters/inspect.v b/CoqOfRust/core/iter/adapters/inspect.v index ef400d77a..3ac46075b 100644 --- a/CoqOfRust/core/iter/adapters/inspect.v +++ b/CoqOfRust/core/iter/adapters/inspect.v @@ -25,6 +25,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::inspect::Inspect" + [] + [ I; F ] [ ("iter", M.call_closure (| @@ -98,6 +100,8 @@ Module iter. let f := M.alloc (| f |) in Value.StructRecord "core::iter::adapters::inspect::Inspect" + [] + [ I; F ] [ ("iter", M.read (| iter |)); ("f", M.read (| f |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/iter/adapters/intersperse.v b/CoqOfRust/core/iter/adapters/intersperse.v index fc8fbbf82..b81f20519 100644 --- a/CoqOfRust/core/iter/adapters/intersperse.v +++ b/CoqOfRust/core/iter/adapters/intersperse.v @@ -147,6 +147,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::intersperse::Intersperse" + [] + [ I ] [ ("started", M.call_closure (| @@ -336,10 +338,24 @@ Module iter. let separator := M.alloc (| separator |) in Value.StructRecord "core::iter::adapters::intersperse::Intersperse" + [] + [ I ] [ ("started", Value.Bool false); ("separator", M.read (| separator |)); - ("next_item", Value.StructTuple "core::option::Option::None" []); + ("next_item", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + []); ("iter", M.call_closure (| Ty.apply (Ty.path "core::iter::adapters::fuse::Fuse") [] [ I ], @@ -500,7 +516,18 @@ Module iter. |) in let v := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| v |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [ M.read (| v |) ] |))); fun γ => ltac:(M.monadic @@ -622,6 +649,15 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] [ M.call_closure (| Ty.associated_in_trait @@ -660,7 +696,18 @@ Module iter. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [] |))) ] |))) @@ -1234,6 +1281,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::intersperse::IntersperseWith" + [] + [ I; G ] [ ("started", M.read (| @@ -1356,10 +1405,24 @@ Module iter. let separator := M.alloc (| separator |) in Value.StructRecord "core::iter::adapters::intersperse::IntersperseWith" + [] + [ I; G ] [ ("started", Value.Bool false); ("separator", M.read (| separator |)); - ("next_item", Value.StructTuple "core::option::Option::None" []); + ("next_item", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + []); ("iter", M.call_closure (| Ty.apply (Ty.path "core::iter::adapters::fuse::Fuse") [] [ I ], @@ -1520,7 +1583,18 @@ Module iter. |) in let v := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| v |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [ M.read (| v |) ] |))); fun γ => ltac:(M.monadic @@ -1642,6 +1716,15 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] [ M.call_closure (| Ty.associated_in_trait @@ -1676,7 +1759,18 @@ Module iter. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [] |))) ] |))) diff --git a/CoqOfRust/core/iter/adapters/map.v b/CoqOfRust/core/iter/adapters/map.v index 123db5846..cfd625d80 100644 --- a/CoqOfRust/core/iter/adapters/map.v +++ b/CoqOfRust/core/iter/adapters/map.v @@ -25,6 +25,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::map::Map" + [] + [ I; F ] [ ("iter", M.call_closure (| @@ -98,6 +100,8 @@ Module iter. let f := M.alloc (| f |) in Value.StructRecord "core::iter::adapters::map::Map" + [] + [ I; F ] [ ("iter", M.read (| iter |)); ("f", M.read (| f |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/iter/adapters/map_while.v b/CoqOfRust/core/iter/adapters/map_while.v index f7739b315..0421bfcd8 100644 --- a/CoqOfRust/core/iter/adapters/map_while.v +++ b/CoqOfRust/core/iter/adapters/map_while.v @@ -25,6 +25,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::map_while::MapWhile" + [] + [ I; P ] [ ("iter", M.call_closure (| @@ -98,6 +100,8 @@ Module iter. let predicate := M.alloc (| predicate |) in Value.StructRecord "core::iter::adapters::map_while::MapWhile" + [] + [ I; P ] [ ("iter", M.read (| iter |)); ("predicate", M.read (| predicate |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -792,6 +796,8 @@ Module iter. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Break" + [] + [ R; Acc ] [ M.call_closure (| R, diff --git a/CoqOfRust/core/iter/adapters/map_windows.v b/CoqOfRust/core/iter/adapters/map_windows.v index f72296b41..a4f420fa2 100644 --- a/CoqOfRust/core/iter/adapters/map_windows.v +++ b/CoqOfRust/core/iter/adapters/map_windows.v @@ -292,6 +292,8 @@ Module iter. M.alloc (| Value.StructRecord "core::iter::adapters::map_windows::MapWindows" + [ N ] + [ I; F ] [ ("inner", M.call_closure (| @@ -347,9 +349,29 @@ Module iter. (let iter := M.alloc (| iter |) in Value.StructRecord "core::iter::adapters::map_windows::MapWindowsInner" + [ N ] + [ I ] [ - ("iter", Value.StructTuple "core::option::Option::Some" [ M.read (| iter |) ]); - ("buffer", Value.StructTuple "core::option::Option::None" []) + ("iter", + Value.StructTuple "core::option::Option::Some" [] [ I ] [ M.read (| iter |) ]); + ("buffer", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::iter::adapters::map_windows::Buffer") + [ N ] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1512,9 +1534,14 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::iter::adapters::map_windows::Buffer") [ N ] [ T ] + ] [ Value.StructRecord "core::iter::adapters::map_windows::Buffer" + [ N ] + [ T ] [ ("buffer", M.read (| buffer |)); ("start", Value.Integer IntegerKind.Usize 0) @@ -2736,6 +2763,8 @@ Module iter. M.alloc (| Value.StructRecord "core::iter::adapters::map_windows::Buffer" + [ N ] + [ T ] [ ("buffer", Value.Array @@ -2896,6 +2925,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::map_windows::MapWindowsInner" + [ N ] + [ I ] [ ("iter", M.call_closure (| @@ -3416,7 +3447,7 @@ Module iter. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| out |) ] + Value.StructTuple "core::option::Option::Some" [] [ R ] [ M.read (| out |) ] |) |))) |))) @@ -3641,6 +3672,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::map_windows::MapWindows" + [ N ] + [ I; F ] [ ("f", M.call_closure (| diff --git a/CoqOfRust/core/iter/adapters/mod.v b/CoqOfRust/core/iter/adapters/mod.v index 82bc79155..2a58cbf0a 100644 --- a/CoqOfRust/core/iter/adapters/mod.v +++ b/CoqOfRust/core/iter/adapters/mod.v @@ -44,7 +44,7 @@ Module iter. M.read (| let~ residual : Ty.apply (Ty.path "*") [] [ Ty.apply (Ty.path "core::option::Option") [] [ R ] ] := - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) in + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ R ] [] |) in let~ shunt : Ty.apply (Ty.path "*") @@ -53,6 +53,8 @@ Module iter. M.alloc (| Value.StructRecord "core::iter::adapters::GenericShunt" + [] + [ I; R ] [ ("iter", M.read (| iter |)); ("residual", @@ -298,7 +300,23 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |); - M.constructor_as_closure "core::ops::control_flow::ControlFlow::Break" + M.constructor_as_closure + "core::ops::control_flow::ControlFlow::Break" + [] + [ + Ty.associated_in_trait + "core::ops::try_trait::Try" + [] + [] + (Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item") + "Output"; + Ty.tuple [] + ] ] |) ] @@ -372,6 +390,8 @@ Module iter. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))); @@ -725,12 +745,16 @@ Module iter. |), Value.StructTuple "core::option::Option::Some" + [] + [ R ] [ M.read (| r |) ] |) |) in M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Break" + [] + [ T; B ] [ M.call_closure (| T, diff --git a/CoqOfRust/core/iter/adapters/peekable.v b/CoqOfRust/core/iter/adapters/peekable.v index 5a5387103..7408e7a56 100644 --- a/CoqOfRust/core/iter/adapters/peekable.v +++ b/CoqOfRust/core/iter/adapters/peekable.v @@ -45,6 +45,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::peekable::Peekable" + [] + [ I ] [ ("iter", M.call_closure (| @@ -233,9 +235,28 @@ Module iter. (let iter := M.alloc (| iter |) in Value.StructRecord "core::iter::adapters::peekable::Peekable" + [] + [ I ] [ ("iter", M.read (| iter |)); - ("peeked", Value.StructTuple "core::option::Option::None" []) + ("peeked", + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -762,7 +783,18 @@ Module iter. |) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| matched |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [ M.read (| matched |) ] |))); fun γ => ltac:(M.monadic @@ -839,10 +871,39 @@ Module iter. "core::iter::adapters::peekable::Peekable", "peeked" |), - Value.StructTuple "core::option::Option::Some" [ M.read (| other |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + ] + [ M.read (| other |) ] |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [] + |))) ] |) |))) @@ -1383,7 +1444,20 @@ Module iter. 0 |) in let _ := M.is_struct_tuple (| γ0_0, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [] + |))); fun γ => ltac:(M.monadic (let γ0_0 := @@ -1631,7 +1705,18 @@ Module iter. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [] |) |) |) @@ -1649,7 +1734,20 @@ Module iter. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [] + |))) ] |) |) in @@ -1782,6 +1880,8 @@ Module iter. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |) @@ -1917,7 +2017,11 @@ Module iter. (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in M.alloc (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] |))) ] |) @@ -2619,7 +2723,20 @@ Module iter. |) in let γ0_0 := M.read (| γ0_0 |) in let _ := M.is_struct_tuple (| γ0_0, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [] + |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in @@ -2896,9 +3013,32 @@ Module iter. |), Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + ] [ Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] [ M.read (| v |) ] ] |) diff --git a/CoqOfRust/core/iter/adapters/rev.v b/CoqOfRust/core/iter/adapters/rev.v index 512492c8f..595236928 100644 --- a/CoqOfRust/core/iter/adapters/rev.v +++ b/CoqOfRust/core/iter/adapters/rev.v @@ -25,6 +25,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::rev::Rev" + [] + [ T ] [ ("iter", M.call_closure (| @@ -137,7 +139,11 @@ Module iter. | [], [], [ iter ] => ltac:(M.monadic (let iter := M.alloc (| iter |) in - Value.StructRecord "core::iter::adapters::rev::Rev" [ ("iter", M.read (| iter |)) ])) + Value.StructRecord + "core::iter::adapters::rev::Rev" + [] + [ T ] + [ ("iter", M.read (| iter |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/iter/adapters/scan.v b/CoqOfRust/core/iter/adapters/scan.v index 8057f6d7d..fc8d5b1dc 100644 --- a/CoqOfRust/core/iter/adapters/scan.v +++ b/CoqOfRust/core/iter/adapters/scan.v @@ -30,6 +30,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::scan::Scan" + [] + [ I; St; F ] [ ("iter", M.call_closure (| @@ -124,6 +126,8 @@ Module iter. let f := M.alloc (| f |) in Value.StructRecord "core::iter::adapters::scan::Scan" + [] + [ I; St; F ] [ ("iter", M.read (| iter |)); ("state", M.read (| state |)); ("f", M.read (| f |)) ])) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/core/iter/adapters/skip.v b/CoqOfRust/core/iter/adapters/skip.v index d63ecd1bd..d20dc4fd0 100644 --- a/CoqOfRust/core/iter/adapters/skip.v +++ b/CoqOfRust/core/iter/adapters/skip.v @@ -25,6 +25,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::skip::Skip" + [] + [ I ] [ ("iter", M.call_closure (| @@ -184,6 +186,8 @@ Module iter. let n := M.alloc (| n |) in Value.StructRecord "core::iter::adapters::skip::Skip" + [] + [ I ] [ ("iter", M.read (| iter |)); ("n", M.read (| n |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1312,6 +1316,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -1339,7 +1345,11 @@ Module iter. (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in M.alloc (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] |))) ] |) @@ -2089,8 +2099,21 @@ Module iter. |), [ M.read (| n |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) @@ -2188,6 +2211,8 @@ Module iter. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -2503,7 +2528,20 @@ Module iter. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [] + |))) ] |) |))) @@ -2700,7 +2738,20 @@ Module iter. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [] + |))) ] |) |))) @@ -3151,8 +3202,21 @@ Module iter. |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) diff --git a/CoqOfRust/core/iter/adapters/skip_while.v b/CoqOfRust/core/iter/adapters/skip_while.v index 1bc444800..358d51323 100644 --- a/CoqOfRust/core/iter/adapters/skip_while.v +++ b/CoqOfRust/core/iter/adapters/skip_while.v @@ -25,6 +25,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::skip_while::SkipWhile" + [] + [ I; P ] [ ("iter", M.call_closure (| @@ -126,6 +128,8 @@ Module iter. let predicate := M.alloc (| predicate |) in Value.StructRecord "core::iter::adapters::skip_while::SkipWhile" + [] + [ I; P ] [ ("iter", M.read (| iter |)); ("flag", Value.Bool false); diff --git a/CoqOfRust/core/iter/adapters/step_by.v b/CoqOfRust/core/iter/adapters/step_by.v index eb0666f2f..b187521af 100644 --- a/CoqOfRust/core/iter/adapters/step_by.v +++ b/CoqOfRust/core/iter/adapters/step_by.v @@ -26,6 +26,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::step_by::StepBy" + [] + [ I ] [ ("iter", M.call_closure (| @@ -281,6 +283,8 @@ Module iter. M.alloc (| Value.StructRecord "core::iter::adapters::step_by::StepBy" + [] + [ I ] [ ("iter", M.read (| iter |)); ("step_minus_one", @@ -3401,11 +3405,17 @@ Module iter. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| val |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u8" ] + [ M.read (| val |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u8" ] [] + |))) ] |) |))) @@ -3444,7 +3454,11 @@ Module iter. Value.Tuple [ M.read (| remaining |); - Value.StructTuple "core::option::Option::Some" [ M.read (| remaining |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| remaining |) ] ] |) |))) @@ -3997,6 +4011,8 @@ Module iter. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "u8" ] [ ("start", Value.Integer IntegerKind.U8 0); ("end_", M.read (| remaining |)) @@ -4398,11 +4414,17 @@ Module iter. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| val |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u16" ] + [ M.read (| val |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u16" ] [] + |))) ] |) |))) @@ -4441,7 +4463,11 @@ Module iter. Value.Tuple [ M.read (| remaining |); - Value.StructTuple "core::option::Option::Some" [ M.read (| remaining |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| remaining |) ] ] |) |))) @@ -4996,6 +5022,8 @@ Module iter. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "u16" ] [ ("start", Value.Integer IntegerKind.U16 0); ("end_", M.read (| remaining |)) @@ -5397,11 +5425,17 @@ Module iter. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| val |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| val |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -5440,7 +5474,11 @@ Module iter. Value.Tuple [ M.read (| remaining |); - Value.StructTuple "core::option::Option::Some" [ M.read (| remaining |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| remaining |) ] ] |) |))) @@ -5995,6 +6033,8 @@ Module iter. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "u32" ] [ ("start", Value.Integer IntegerKind.U32 0); ("end_", M.read (| remaining |)) @@ -6396,11 +6436,17 @@ Module iter. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| val |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u64" ] + [ M.read (| val |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] [] + |))) ] |) |))) @@ -6439,7 +6485,11 @@ Module iter. Value.Tuple [ M.read (| remaining |); - Value.StructTuple "core::option::Option::Some" [ M.read (| remaining |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| remaining |) ] ] |) |))) @@ -6994,6 +7044,8 @@ Module iter. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "u64" ] [ ("start", Value.Integer IntegerKind.U64 0); ("end_", M.read (| remaining |)) @@ -7396,11 +7448,17 @@ Module iter. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| val |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| val |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))) ] |) |))) @@ -7436,7 +7494,11 @@ Module iter. Value.Tuple [ M.read (| remaining |); - Value.StructTuple "core::option::Option::Some" [ M.read (| remaining |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| remaining |) ] ] |) |))) @@ -7991,6 +8053,8 @@ Module iter. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| remaining |)) @@ -8242,6 +8306,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -8266,7 +8332,9 @@ Module iter. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u8" ] [] + |))) ] |) |))) @@ -8382,7 +8450,11 @@ Module iter. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u8" ] + [] |) |) |) @@ -8870,6 +8942,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -8894,7 +8968,9 @@ Module iter. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u16" ] [] + |))) ] |) |))) @@ -9010,7 +9086,11 @@ Module iter. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u16" ] + [] |) |) |) @@ -9498,6 +9578,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -9522,7 +9604,9 @@ Module iter. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -9638,7 +9722,11 @@ Module iter. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u32" ] + [] |) |) |) @@ -10134,6 +10222,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -10159,7 +10249,9 @@ Module iter. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))) ] |) |))) @@ -10275,7 +10367,11 @@ Module iter. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] |) |) |) diff --git a/CoqOfRust/core/iter/adapters/take.v b/CoqOfRust/core/iter/adapters/take.v index ba75ede23..88e2cda00 100644 --- a/CoqOfRust/core/iter/adapters/take.v +++ b/CoqOfRust/core/iter/adapters/take.v @@ -25,6 +25,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::take::Take" + [] + [ I ] [ ("iter", M.call_closure (| @@ -184,6 +186,8 @@ Module iter. let n := M.alloc (| n |) in Value.StructRecord "core::iter::adapters::take::Take" + [] + [ I ] [ ("iter", M.read (| iter |)); ("n", M.read (| n |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -313,7 +317,20 @@ Module iter. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [] + |))) ] |) |))) @@ -553,7 +570,20 @@ Module iter. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [] + |))) ] |) |))) @@ -628,6 +658,8 @@ Module iter. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |) @@ -753,6 +785,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| x |) ] |))); fun γ => @@ -760,6 +794,8 @@ Module iter. (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -1217,8 +1253,21 @@ Module iter. |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) @@ -1457,7 +1506,20 @@ Module iter. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [] + |))); fun γ => ltac:(M.monadic (let~ n : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -1818,7 +1880,20 @@ Module iter. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [] + |))) ] |) |))) @@ -2556,8 +2631,21 @@ Module iter. |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) @@ -2936,6 +3024,8 @@ Module iter. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| end_ |)) @@ -3174,6 +3264,8 @@ Module iter. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| end_ |)) diff --git a/CoqOfRust/core/iter/adapters/take_while.v b/CoqOfRust/core/iter/adapters/take_while.v index 9e4bb8deb..4dd8887f3 100644 --- a/CoqOfRust/core/iter/adapters/take_while.v +++ b/CoqOfRust/core/iter/adapters/take_while.v @@ -25,6 +25,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::take_while::TakeWhile" + [] + [ I; P ] [ ("iter", M.call_closure (| @@ -126,6 +128,8 @@ Module iter. let predicate := M.alloc (| predicate |) in Value.StructRecord "core::iter::adapters::take_while::TakeWhile" + [] + [ I; P ] [ ("iter", M.read (| iter |)); ("flag", Value.Bool false); @@ -345,7 +349,20 @@ Module iter. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [] + |))); fun γ => ltac:(M.monadic (let~ x : @@ -591,6 +608,15 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] [ M.read (| x |) ] |))); fun γ => @@ -607,7 +633,18 @@ Module iter. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + I + "Item" + ] + [] |))) ] |))) @@ -669,6 +706,8 @@ Module iter. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))); diff --git a/CoqOfRust/core/iter/adapters/zip.v b/CoqOfRust/core/iter/adapters/zip.v index 5cfd07c6c..3fddf4e18 100644 --- a/CoqOfRust/core/iter/adapters/zip.v +++ b/CoqOfRust/core/iter/adapters/zip.v @@ -32,6 +32,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::adapters::zip::Zip" + [] + [ A; B ] [ ("a", M.call_closure (| @@ -345,6 +347,24 @@ Module iter. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + A + "Item"; + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + B + "Item" + ] + ] [ M.read (| x |) ] |) |) @@ -382,7 +402,29 @@ Module iter. ] |))) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + A + "Item"; + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + B + "Item" + ] + ] + [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -851,6 +893,8 @@ Module iter. let b := M.alloc (| b |) in Value.StructRecord "core::iter::adapters::zip::Zip" + [] + [ A; B ] [ ("a", M.read (| a |)); ("b", M.read (| b |)); @@ -1268,6 +1312,24 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + A + "Item"; + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + B + "Item" + ] + ] [ Value.Tuple [ M.read (| x |); M.read (| y |) ] ] |) |))) @@ -1477,6 +1539,8 @@ Module iter. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -1638,6 +1702,8 @@ Module iter. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -1895,6 +1961,24 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + A + "Item"; + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + B + "Item" + ] + ] [ Value.Tuple [ M.read (| x |); M.read (| y |) ] ] |))); fun γ => @@ -1903,7 +1987,29 @@ Module iter. let γ0_1 := M.SubPointer.get_tuple_field (| γ, 1 |) in let _ := M.is_struct_tuple (| γ0_0, "core::option::Option::None" |) in let _ := M.is_struct_tuple (| γ0_1, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + A + "Item"; + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + B + "Item" + ] + ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -2100,6 +2206,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -2131,6 +2239,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| x |) ] |))); fun γ => @@ -2152,6 +2262,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| y |) ] |))); fun γ => @@ -2169,7 +2281,11 @@ Module iter. "core::option::Option::None" |) in M.alloc (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] |))) ] |) @@ -2342,6 +2458,8 @@ Module iter. let b := M.alloc (| b |) in Value.StructRecord "core::iter::adapters::zip::Zip" + [] + [ A; B ] [ ("a", M.read (| a |)); ("b", M.read (| b |)); @@ -2759,6 +2877,24 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + A + "Item"; + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + B + "Item" + ] + ] [ Value.Tuple [ M.read (| x |); M.read (| y |) ] ] |) |))) @@ -2968,6 +3104,8 @@ Module iter. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -3129,6 +3267,8 @@ Module iter. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -3386,6 +3526,24 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + A + "Item"; + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + B + "Item" + ] + ] [ Value.Tuple [ M.read (| x |); M.read (| y |) ] ] |))); fun γ => @@ -3394,7 +3552,29 @@ Module iter. let γ0_1 := M.SubPointer.get_tuple_field (| γ, 1 |) in let _ := M.is_struct_tuple (| γ0_0, "core::option::Option::None" |) in let _ := M.is_struct_tuple (| γ0_1, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + A + "Item"; + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + B + "Item" + ] + ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -3487,7 +3667,11 @@ Module iter. Value.Tuple [ M.read (| size |); - Value.StructTuple "core::option::Option::Some" [ M.read (| size |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| size |) ] ] |) |))) @@ -3674,6 +3858,8 @@ Module iter. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| len |)) @@ -3911,6 +4097,8 @@ Module iter. M.alloc (| Value.StructRecord "core::iter::adapters::zip::Zip" + [] + [ A; B ] [ ("a", M.read (| a |)); ("b", M.read (| b |)); @@ -4040,6 +4228,24 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + A + "Item"; + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + B + "Item" + ] + ] [ Value.Tuple [ @@ -4258,10 +4464,54 @@ Module iter. |) |) in M.alloc (| Value.Tuple [] |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + A + "Item"; + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + B + "Item" + ] + ] + [] + |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + A + "Item"; + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + B + "Item" + ] + ] + [] + |))) ] |))) ] @@ -4315,7 +4565,11 @@ Module iter. Value.Tuple [ M.read (| len |); - Value.StructTuple "core::option::Option::Some" [ M.read (| len |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| len |) ] ] |) |))) @@ -4891,6 +5145,8 @@ Module iter. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); @@ -5191,6 +5447,8 @@ Module iter. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -5238,6 +5496,11 @@ Module iter. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -5349,6 +5612,8 @@ Module iter. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); @@ -5612,6 +5877,24 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + A + "Item"; + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + B + "Item" + ] + ] [ Value.Tuple [ @@ -5676,7 +5959,29 @@ Module iter. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + A + "Item"; + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + B + "Item" + ] + ] + [] + |))) ] |) |))) @@ -6767,6 +7072,8 @@ Module iter. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| upper |)) diff --git a/CoqOfRust/core/iter/range.v b/CoqOfRust/core/iter/range.v index 525772371..472481148 100644 --- a/CoqOfRust/core/iter/range.v +++ b/CoqOfRust/core/iter/range.v @@ -608,7 +608,11 @@ Module iter. Value.Tuple [ M.read (| steps |); - Value.StructTuple "core::option::Option::Some" [ M.read (| steps |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| steps |) ] ] |))); fun γ => @@ -617,7 +621,7 @@ Module iter. Value.Tuple [ Value.Integer IntegerKind.Usize 0; - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] ] |))) ] @@ -689,7 +693,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u8" ] [] + |))) ] |) |))) @@ -759,7 +765,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u8" ] [] + |))) ] |) |))) @@ -1109,7 +1117,11 @@ Module iter. Value.Tuple [ M.read (| steps |); - Value.StructTuple "core::option::Option::Some" [ M.read (| steps |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| steps |) ] ] |))); fun γ => @@ -1118,7 +1130,7 @@ Module iter. Value.Tuple [ Value.Integer IntegerKind.Usize 0; - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] ] |))) ] @@ -1219,11 +1231,19 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i8" ] [ M.read (| wrapped |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i8" ] + [] + |))) ] |))); fun γ => @@ -1234,7 +1254,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i8" ] [] + |))) ] |) |))) @@ -1333,11 +1355,19 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i8" ] [ M.read (| wrapped |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i8" ] + [] + |))) ] |))); fun γ => @@ -1348,7 +1378,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i8" ] [] + |))) ] |) |))) @@ -1663,7 +1695,11 @@ Module iter. Value.Tuple [ M.read (| steps |); - Value.StructTuple "core::option::Option::Some" [ M.read (| steps |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| steps |) ] ] |))); fun γ => @@ -1672,7 +1708,7 @@ Module iter. Value.Tuple [ Value.Integer IntegerKind.Usize 0; - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] ] |))) ] @@ -1744,7 +1780,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u16" ] [] + |))) ] |) |))) @@ -1814,7 +1852,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u16" ] [] + |))) ] |) |))) @@ -2164,7 +2204,11 @@ Module iter. Value.Tuple [ M.read (| steps |); - Value.StructTuple "core::option::Option::Some" [ M.read (| steps |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| steps |) ] ] |))); fun γ => @@ -2173,7 +2217,7 @@ Module iter. Value.Tuple [ Value.Integer IntegerKind.Usize 0; - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] ] |))) ] @@ -2274,11 +2318,19 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i16" ] [ M.read (| wrapped |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i16" ] + [] + |))) ] |))); fun γ => @@ -2289,7 +2341,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i16" ] [] + |))) ] |) |))) @@ -2388,11 +2442,19 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i16" ] [ M.read (| wrapped |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i16" ] + [] + |))) ] |))); fun γ => @@ -2403,7 +2465,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i16" ] [] + |))) ] |) |))) @@ -2718,7 +2782,11 @@ Module iter. Value.Tuple [ M.read (| steps |); - Value.StructTuple "core::option::Option::Some" [ M.read (| steps |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| steps |) ] ] |))); fun γ => @@ -2727,7 +2795,7 @@ Module iter. Value.Tuple [ Value.Integer IntegerKind.Usize 0; - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] ] |))) ] @@ -2799,7 +2867,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -2869,7 +2939,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -3219,7 +3291,11 @@ Module iter. Value.Tuple [ M.read (| steps |); - Value.StructTuple "core::option::Option::Some" [ M.read (| steps |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| steps |) ] ] |))); fun γ => @@ -3228,7 +3304,7 @@ Module iter. Value.Tuple [ Value.Integer IntegerKind.Usize 0; - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] ] |))) ] @@ -3329,11 +3405,19 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i32" ] [ M.read (| wrapped |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i32" ] + [] + |))) ] |))); fun γ => @@ -3344,7 +3428,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] + |))) ] |) |))) @@ -3443,11 +3529,19 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i32" ] [ M.read (| wrapped |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i32" ] + [] + |))) ] |))); fun γ => @@ -3458,7 +3552,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] + |))) ] |) |))) @@ -3773,7 +3869,11 @@ Module iter. Value.Tuple [ M.read (| steps |); - Value.StructTuple "core::option::Option::Some" [ M.read (| steps |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| steps |) ] ] |))); fun γ => @@ -3782,7 +3882,7 @@ Module iter. Value.Tuple [ Value.Integer IntegerKind.Usize 0; - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] ] |))) ] @@ -3854,7 +3954,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] [] + |))) ] |) |))) @@ -3924,7 +4026,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] [] + |))) ] |) |))) @@ -4274,7 +4378,11 @@ Module iter. Value.Tuple [ M.read (| steps |); - Value.StructTuple "core::option::Option::Some" [ M.read (| steps |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| steps |) ] ] |))); fun γ => @@ -4283,7 +4391,7 @@ Module iter. Value.Tuple [ Value.Integer IntegerKind.Usize 0; - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] ] |))) ] @@ -4384,11 +4492,19 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i64" ] [ M.read (| wrapped |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i64" ] + [] + |))) ] |))); fun γ => @@ -4399,7 +4515,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i64" ] [] + |))) ] |) |))) @@ -4498,11 +4616,19 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i64" ] [ M.read (| wrapped |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i64" ] + [] + |))) ] |))); fun γ => @@ -4513,7 +4639,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i64" ] [] + |))) ] |) |))) @@ -4837,7 +4965,11 @@ Module iter. Value.Tuple [ M.read (| steps |); - Value.StructTuple "core::option::Option::Some" [ M.read (| steps |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| steps |) ] ] |))); fun γ => @@ -4846,7 +4978,7 @@ Module iter. Value.Tuple [ Value.Integer IntegerKind.Usize 0; - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] ] |))) ] @@ -4918,7 +5050,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))) ] |) |))) @@ -4988,7 +5122,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))) ] |) |))) @@ -5342,7 +5478,11 @@ Module iter. Value.Tuple [ M.read (| steps |); - Value.StructTuple "core::option::Option::Some" [ M.read (| steps |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| steps |) ] ] |))); fun γ => @@ -5351,7 +5491,7 @@ Module iter. Value.Tuple [ Value.Integer IntegerKind.Usize 0; - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] ] |))) ] @@ -5452,11 +5592,19 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "isize" ] [ M.read (| wrapped |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "isize" ] + [] + |))) ] |))); fun γ => @@ -5467,7 +5615,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "isize" ] [] + |))) ] |) |))) @@ -5566,11 +5716,19 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "isize" ] [ M.read (| wrapped |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "isize" ] + [] + |))) ] |))); fun γ => @@ -5581,7 +5739,9 @@ Module iter. "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "isize" ] [] + |))) ] |) |))) @@ -5946,6 +6106,8 @@ Module iter. M.read (| steps |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| steps |) ] ] |))); @@ -5961,7 +6123,11 @@ Module iter. Ty.path "usize" |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] ] |))) ] @@ -5972,7 +6138,7 @@ Module iter. Value.Tuple [ Value.Integer IntegerKind.Usize 0; - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] ] |))) ] @@ -6433,6 +6599,8 @@ Module iter. M.read (| steps |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| steps |) ] ] |))); @@ -6448,7 +6616,11 @@ Module iter. Ty.path "usize" |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] ] |))) ] @@ -6466,7 +6638,11 @@ Module iter. Ty.path "usize" |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] ] |))) ] @@ -6477,7 +6653,7 @@ Module iter. Value.Tuple [ Value.Integer IntegerKind.Usize 0; - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] ] |))) ] @@ -6763,6 +6939,8 @@ Module iter. M.read (| steps |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| steps |) ] ] |))); @@ -6781,6 +6959,8 @@ Module iter. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "usize" ] + [] ] |))) ] @@ -6841,6 +7021,8 @@ Module iter. M.read (| steps |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| steps |) ] ] |))); @@ -6859,6 +7041,8 @@ Module iter. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "usize" ] + [] ] |))) ] @@ -6871,7 +7055,11 @@ Module iter. Value.Tuple [ Value.Integer IntegerKind.Usize 0; - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] ] |))) ] @@ -7183,6 +7371,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "char" ] [ M.call_closure (| Ty.path "char", @@ -7198,7 +7388,9 @@ Module iter. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "char" ] [] + |))) ] |) |))) @@ -7470,6 +7662,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "char" ] [ M.call_closure (| Ty.path "char", @@ -8098,6 +8292,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::ascii::ascii_char::AsciiChar" ] [ M.call_closure (| Ty.path "core::ascii::ascii_char::AsciiChar", @@ -9094,6 +9290,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ A ] [ M.call_closure (| A, @@ -9119,7 +9317,7 @@ Module iter. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| Value.StructTuple "core::option::Option::None" [] [ A ] [] |))) ] |) |))) @@ -9310,6 +9508,8 @@ Module iter. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ A ] [ M.read (| plus_n |) ] |) |) @@ -9345,7 +9545,7 @@ Module iter. |) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ A ] [] |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -9583,8 +9783,21 @@ Module iter. |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) @@ -9721,6 +9934,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ A ] [ M.call_closure (| A, @@ -9748,7 +9963,7 @@ Module iter. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| Value.StructTuple "core::option::Option::None" [] [ A ] [] |))) ] |) |))) @@ -9931,6 +10146,8 @@ Module iter. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ A ] [ M.call_closure (| A, @@ -9989,7 +10206,7 @@ Module iter. |) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ A ] [] |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -10227,8 +10444,21 @@ Module iter. |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) @@ -10350,11 +10580,11 @@ Module iter. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| old |) ] + Value.StructTuple "core::option::Option::Some" [] [ T ] [ M.read (| old |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))) ] |) |))) @@ -10494,6 +10724,8 @@ Module iter. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.read (| plus_n |) ] |) |) @@ -10522,7 +10754,7 @@ Module iter. |) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -10733,8 +10965,21 @@ Module iter. |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) @@ -10841,6 +11086,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -10853,7 +11100,7 @@ Module iter. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))) ] |) |))) @@ -10998,6 +11245,8 @@ Module iter. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -11034,7 +11283,7 @@ Module iter. |) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -11242,8 +11491,21 @@ Module iter. |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) @@ -11422,6 +11684,8 @@ Module iter. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))) @@ -12494,6 +12758,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ A ] [ M.call_closure (| A, @@ -12535,7 +12801,7 @@ Module iter. Value.Tuple [ M.read (| get_associated_constant (| Ty.path "usize", "MAX", Ty.path "usize" |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -12617,7 +12883,9 @@ Module iter. |) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::Some" [ M.read (| plus_n |) ] |) + M.alloc (| + Value.StructTuple "core::option::Option::Some" [] [ A ] [ M.read (| plus_n |) ] + |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -12735,7 +13003,9 @@ Module iter. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple "core::option::Option::None" [] [ A ] [] + |) |) |) |))); @@ -12778,6 +13048,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ A ] [ M.read (| M.match_operator (| @@ -13537,7 +13809,9 @@ Module iter. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple "core::option::Option::None" [] [ A ] [] + |) |) |) |))); @@ -13580,6 +13854,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ A ] [ M.read (| M.match_operator (| @@ -14355,7 +14631,9 @@ Module iter. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple "core::option::Option::None" [] [ T ] [] + |) |) |) |))); @@ -14398,6 +14676,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.read (| M.match_operator (| @@ -15061,7 +15341,9 @@ Module iter. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple "core::option::Option::None" [] [ T ] [] + |) |) |) |))); @@ -15104,6 +15386,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.read (| M.match_operator (| @@ -15815,6 +16099,8 @@ Module iter. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |) @@ -16221,7 +16507,9 @@ Module iter. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple "core::option::Option::None" [] [ A ] [] + |) |) |) |))); @@ -16372,6 +16660,8 @@ Module iter. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ A ] [ M.read (| plus_n |) ] |) |) @@ -16427,6 +16717,8 @@ Module iter. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ A ] [ M.read (| plus_n |) ] |) |) @@ -16473,7 +16765,7 @@ Module iter. Value.Bool true |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ A ] [] |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -16804,7 +17096,9 @@ Module iter. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple "core::option::Option::None" [] [ A ] [] + |) |) |) |))); @@ -16958,6 +17252,8 @@ Module iter. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ A ] [ M.read (| minus_n |) ] |) |) @@ -17013,6 +17309,8 @@ Module iter. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ A ] [ M.read (| minus_n |) ] |) |) @@ -17059,7 +17357,7 @@ Module iter. Value.Bool true |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ A ] [] |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/core/iter/sources/empty.v b/CoqOfRust/core/iter/sources/empty.v index 8743d59ab..90076bdeb 100644 --- a/CoqOfRust/core/iter/sources/empty.v +++ b/CoqOfRust/core/iter/sources/empty.v @@ -15,7 +15,9 @@ Module iter. ltac:(M.monadic (Value.StructTuple "core::iter::sources::empty::Empty" - [ Value.StructTuple "core::marker::PhantomData" [] ])) + [] + [ T ] + [ Value.StructTuple "core::marker::PhantomData" [] [ Ty.function [] T ] [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -111,7 +113,7 @@ Module iter. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::option::Option::None" [])) + Value.StructTuple "core::option::Option::None" [] [ T ] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -131,6 +133,8 @@ Module iter. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -166,7 +170,7 @@ Module iter. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::option::Option::None" [])) + Value.StructTuple "core::option::Option::None" [] [ T ] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -254,7 +258,9 @@ Module iter. (let self := M.alloc (| self |) in Value.StructTuple "core::iter::sources::empty::Empty" - [ Value.StructTuple "core::marker::PhantomData" [] ])) + [] + [ T ] + [ Value.StructTuple "core::marker::PhantomData" [] [ Ty.function [] T ] [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -284,7 +290,9 @@ Module iter. ltac:(M.monadic (Value.StructTuple "core::iter::sources::empty::Empty" - [ Value.StructTuple "core::marker::PhantomData" [] ])) + [] + [ T ] + [ Value.StructTuple "core::marker::PhantomData" [] [ Ty.function [] T ] [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/iter/sources/from_coroutine.v b/CoqOfRust/core/iter/sources/from_coroutine.v index 7bc5af7ac..075c759c5 100644 --- a/CoqOfRust/core/iter/sources/from_coroutine.v +++ b/CoqOfRust/core/iter/sources/from_coroutine.v @@ -16,6 +16,8 @@ Module iter. (let coroutine := M.alloc (| coroutine |) in Value.StructTuple "core::iter::sources::from_coroutine::FromCoroutine" + [] + [ G ] [ M.read (| coroutine |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -46,6 +48,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructTuple "core::iter::sources::from_coroutine::FromCoroutine" + [] + [ G ] [ M.call_closure (| G, @@ -184,7 +188,18 @@ Module iter. |) in let n := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.associated_in_trait + "core::ops::coroutine::Coroutine" + [] + [ Ty.tuple [] ] + G + "Yield" + ] + [ M.read (| n |) ] |))); fun γ => ltac:(M.monadic @@ -194,7 +209,20 @@ Module iter. "core::ops::coroutine::CoroutineState::Complete", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::ops::coroutine::Coroutine" + [] + [ Ty.tuple [] ] + G + "Yield" + ] + [] + |))) ] |) |))) diff --git a/CoqOfRust/core/iter/sources/from_fn.v b/CoqOfRust/core/iter/sources/from_fn.v index f7495c30a..b60700a6e 100644 --- a/CoqOfRust/core/iter/sources/from_fn.v +++ b/CoqOfRust/core/iter/sources/from_fn.v @@ -17,7 +17,7 @@ Module iter. | [], [ T; F ], [ f ] => ltac:(M.monadic (let f := M.alloc (| f |) in - Value.StructTuple "core::iter::sources::from_fn::FromFn" [ M.read (| f |) ])) + Value.StructTuple "core::iter::sources::from_fn::FromFn" [] [ F ] [ M.read (| f |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -47,6 +47,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructTuple "core::iter::sources::from_fn::FromFn" + [] + [ F ] [ M.call_closure (| F, diff --git a/CoqOfRust/core/iter/sources/once.v b/CoqOfRust/core/iter/sources/once.v index 9ea8b4e5a..2a696be20 100644 --- a/CoqOfRust/core/iter/sources/once.v +++ b/CoqOfRust/core/iter/sources/once.v @@ -16,6 +16,8 @@ Module iter. (let value := M.alloc (| value |) in Value.StructRecord "core::iter::sources::once::Once" + [] + [ T ] [ ("inner", M.call_closure (| @@ -29,7 +31,8 @@ Module iter. [], [] |), - [ Value.StructTuple "core::option::Option::Some" [ M.read (| value |) ] ] + [ Value.StructTuple "core::option::Option::Some" [] [ T ] [ M.read (| value |) ] + ] |)) ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -61,6 +64,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::sources::once::Once" + [] + [ T ] [ ("inner", M.call_closure (| diff --git a/CoqOfRust/core/iter/sources/once_with.v b/CoqOfRust/core/iter/sources/once_with.v index 0b33610cc..83674de3c 100644 --- a/CoqOfRust/core/iter/sources/once_with.v +++ b/CoqOfRust/core/iter/sources/once_with.v @@ -16,7 +16,12 @@ Module iter. (let gen := M.alloc (| gen |) in Value.StructRecord "core::iter::sources::once_with::OnceWith" - [ ("gen", Value.StructTuple "core::option::Option::Some" [ M.read (| gen |) ]) ])) + [] + [ F ] + [ + ("gen", + Value.StructTuple "core::option::Option::Some" [] [ F ] [ M.read (| gen |) ]) + ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -46,6 +51,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::sources::once_with::OnceWith" + [] + [ F ] [ ("gen", M.call_closure (| @@ -330,6 +337,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ A ] [ M.call_closure (| A, diff --git a/CoqOfRust/core/iter/sources/repeat.v b/CoqOfRust/core/iter/sources/repeat.v index ae81ed291..a6750c6c9 100644 --- a/CoqOfRust/core/iter/sources/repeat.v +++ b/CoqOfRust/core/iter/sources/repeat.v @@ -16,6 +16,8 @@ Module iter. (let elt := M.alloc (| elt |) in Value.StructRecord "core::iter::sources::repeat::Repeat" + [] + [ T ] [ ("element", M.read (| elt |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -46,6 +48,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::sources::repeat::Repeat" + [] + [ A ] [ ("element", M.call_closure (| @@ -163,6 +167,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructTuple "core::option::Option::Some" + [] + [ A ] [ M.call_closure (| A, @@ -198,7 +204,7 @@ Module iter. M.read (| get_associated_constant (| Ty.path "usize", "MAX", Ty.path "usize" |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -241,7 +247,17 @@ Module iter. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] + [ Value.Tuple [] ] |))) ] |) @@ -272,6 +288,8 @@ Module iter. (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ A ] [ M.call_closure (| A, @@ -383,6 +401,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructTuple "core::option::Option::Some" + [] + [ A ] [ M.call_closure (| A, @@ -440,7 +460,17 @@ Module iter. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] + [ Value.Tuple [] ] |))) ] |) @@ -471,6 +501,8 @@ Module iter. (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ A ] [ M.call_closure (| A, diff --git a/CoqOfRust/core/iter/sources/repeat_n.v b/CoqOfRust/core/iter/sources/repeat_n.v index 631dd4af7..e67df4ed4 100644 --- a/CoqOfRust/core/iter/sources/repeat_n.v +++ b/CoqOfRust/core/iter/sources/repeat_n.v @@ -81,6 +81,8 @@ Module iter. M.alloc (| Value.StructRecord "core::iter::sources::repeat_n::RepeatN" + [] + [ T ] [ ("element", M.read (| element |)); ("count", M.read (| count |)) ] |) |))) @@ -166,6 +168,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ A ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -198,7 +202,13 @@ Module iter. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ A ] ] + [] + |))) ] |) |))) @@ -323,6 +333,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ A ] [ M.call_closure (| A, @@ -341,7 +353,7 @@ Module iter. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| Value.StructTuple "core::option::Option::None" [] [ A ] [] |))) ] |) |))) @@ -375,6 +387,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::sources::repeat_n::RepeatN" + [] + [ A ] [ ("count", M.read (| @@ -718,6 +732,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ A ] [ M.call_closure (| A, @@ -744,7 +760,7 @@ Module iter. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| Value.StructTuple "core::option::Option::None" [] [ A ] [] |))) ] |) |))) @@ -784,7 +800,11 @@ Module iter. Value.Tuple [ M.read (| len |); - Value.StructTuple "core::option::Option::Some" [ M.read (| len |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| len |) ] ] |) |))) @@ -906,6 +926,14 @@ Module iter. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] [ M.call_closure (| Ty.apply @@ -949,7 +977,17 @@ Module iter. |) |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] + [ Value.Tuple [] ] |))) ] |) diff --git a/CoqOfRust/core/iter/sources/repeat_with.v b/CoqOfRust/core/iter/sources/repeat_with.v index 07eb8c630..f22348bef 100644 --- a/CoqOfRust/core/iter/sources/repeat_with.v +++ b/CoqOfRust/core/iter/sources/repeat_with.v @@ -16,6 +16,8 @@ Module iter. (let repeater := M.alloc (| repeater |) in Value.StructRecord "core::iter::sources::repeat_with::RepeatWith" + [] + [ F ] [ ("repeater", M.read (| repeater |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -60,6 +62,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::sources::repeat_with::RepeatWith" + [] + [ F ] [ ("repeater", M.call_closure (| @@ -176,6 +180,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructTuple "core::option::Option::Some" + [] + [ A ] [ M.call_closure (| A, @@ -225,7 +231,7 @@ Module iter. M.read (| get_associated_constant (| Ty.path "usize", "MAX", Ty.path "usize" |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/iter/sources/successors.v b/CoqOfRust/core/iter/sources/successors.v index e0b28d2d9..acffce5c5 100644 --- a/CoqOfRust/core/iter/sources/successors.v +++ b/CoqOfRust/core/iter/sources/successors.v @@ -23,6 +23,8 @@ Module iter. let succ := M.alloc (| succ |) in Value.StructRecord "core::iter::sources::successors::Successors" + [] + [ T; F ] [ ("next", M.read (| first |)); ("succ", M.read (| succ |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -53,6 +55,8 @@ Module iter. (let self := M.alloc (| self |) in Value.StructRecord "core::iter::sources::successors::Successors" + [] + [ T; F ] [ ("next", M.call_closure (| @@ -287,7 +291,7 @@ Module iter. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| item |) ] + Value.StructTuple "core::option::Option::Some" [] [ T ] [ M.read (| item |) ] |) |))) |))) @@ -354,7 +358,11 @@ Module iter. Value.Tuple [ Value.Integer IntegerKind.Usize 1; - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] ] |))); fun γ => @@ -365,6 +373,8 @@ Module iter. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))) diff --git a/CoqOfRust/core/iter/traits/accum.v b/CoqOfRust/core/iter/traits/accum.v index 7a50befec..792d47183 100644 --- a/CoqOfRust/core/iter/traits/accum.v +++ b/CoqOfRust/core/iter/traits/accum.v @@ -5014,6 +5014,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ Value.Integer IntegerKind.I8 0 ]; M.closure (fun γ => @@ -5168,6 +5170,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ Value.Integer IntegerKind.I8 1 ]; M.closure (fun γ => @@ -5330,6 +5334,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ Value.Integer IntegerKind.I8 0 ]; M.closure (fun γ => @@ -5512,6 +5518,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ Value.Integer IntegerKind.I8 1 ]; M.closure (fun γ => @@ -5686,6 +5694,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ Value.Integer IntegerKind.I16 0 ]; M.closure (fun γ => @@ -5840,6 +5850,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ Value.Integer IntegerKind.I16 1 ]; M.closure (fun γ => @@ -6002,6 +6014,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ Value.Integer IntegerKind.I16 0 ]; M.closure (fun γ => @@ -6184,6 +6198,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ Value.Integer IntegerKind.I16 1 ]; M.closure (fun γ => @@ -6358,6 +6374,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ Value.Integer IntegerKind.I32 0 ]; M.closure (fun γ => @@ -6512,6 +6530,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ Value.Integer IntegerKind.I32 1 ]; M.closure (fun γ => @@ -6674,6 +6694,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ Value.Integer IntegerKind.I32 0 ]; M.closure (fun γ => @@ -6856,6 +6878,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ Value.Integer IntegerKind.I32 1 ]; M.closure (fun γ => @@ -7030,6 +7054,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ Value.Integer IntegerKind.I64 0 ]; M.closure (fun γ => @@ -7184,6 +7210,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ Value.Integer IntegerKind.I64 1 ]; M.closure (fun γ => @@ -7346,6 +7374,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ Value.Integer IntegerKind.I64 0 ]; M.closure (fun γ => @@ -7528,6 +7558,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ Value.Integer IntegerKind.I64 1 ]; M.closure (fun γ => @@ -7705,6 +7737,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ Value.Integer IntegerKind.I128 0 ]; M.closure (fun γ => @@ -7862,6 +7896,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ Value.Integer IntegerKind.I128 1 ]; M.closure (fun γ => @@ -8027,6 +8063,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ Value.Integer IntegerKind.I128 0 ]; M.closure (fun γ => @@ -8212,6 +8250,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ Value.Integer IntegerKind.I128 1 ]; M.closure (fun γ => @@ -8392,6 +8432,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ Value.Integer IntegerKind.Isize 0 ]; M.closure (fun γ => @@ -8552,6 +8594,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ Value.Integer IntegerKind.Isize 1 ]; M.closure (fun γ => @@ -8717,6 +8761,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ Value.Integer IntegerKind.Isize 0 ]; M.closure (fun γ => @@ -8902,6 +8948,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ Value.Integer IntegerKind.Isize 1 ]; M.closure (fun γ => @@ -9076,6 +9124,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ Value.Integer IntegerKind.U8 0 ]; M.closure (fun γ => @@ -9230,6 +9280,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ Value.Integer IntegerKind.U8 1 ]; M.closure (fun γ => @@ -9392,6 +9444,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ Value.Integer IntegerKind.U8 0 ]; M.closure (fun γ => @@ -9574,6 +9628,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ Value.Integer IntegerKind.U8 1 ]; M.closure (fun γ => @@ -9748,6 +9804,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ Value.Integer IntegerKind.U16 0 ]; M.closure (fun γ => @@ -9902,6 +9960,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ Value.Integer IntegerKind.U16 1 ]; M.closure (fun γ => @@ -10064,6 +10124,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ Value.Integer IntegerKind.U16 0 ]; M.closure (fun γ => @@ -10246,6 +10308,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ Value.Integer IntegerKind.U16 1 ]; M.closure (fun γ => @@ -10420,6 +10484,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ Value.Integer IntegerKind.U32 0 ]; M.closure (fun γ => @@ -10574,6 +10640,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ Value.Integer IntegerKind.U32 1 ]; M.closure (fun γ => @@ -10736,6 +10804,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ Value.Integer IntegerKind.U32 0 ]; M.closure (fun γ => @@ -10918,6 +10988,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ Value.Integer IntegerKind.U32 1 ]; M.closure (fun γ => @@ -11092,6 +11164,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ Value.Integer IntegerKind.U64 0 ]; M.closure (fun γ => @@ -11246,6 +11320,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ Value.Integer IntegerKind.U64 1 ]; M.closure (fun γ => @@ -11408,6 +11484,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ Value.Integer IntegerKind.U64 0 ]; M.closure (fun γ => @@ -11590,6 +11668,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ Value.Integer IntegerKind.U64 1 ]; M.closure (fun γ => @@ -11767,6 +11847,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ Value.Integer IntegerKind.U128 0 ]; M.closure (fun γ => @@ -11924,6 +12006,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ Value.Integer IntegerKind.U128 1 ]; M.closure (fun γ => @@ -12089,6 +12173,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ Value.Integer IntegerKind.U128 0 ]; M.closure (fun γ => @@ -12274,6 +12360,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ Value.Integer IntegerKind.U128 1 ]; M.closure (fun γ => @@ -12454,6 +12542,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ]; M.closure (fun γ => @@ -12614,6 +12704,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 1 ]; M.closure (fun γ => @@ -12779,6 +12871,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ]; M.closure (fun γ => @@ -12964,6 +13058,8 @@ Module iter. M.read (| iter |); Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 1 ]; M.closure (fun γ => diff --git a/CoqOfRust/core/iter/traits/collect.v b/CoqOfRust/core/iter/traits/collect.v index 9a01b24bb..d97c25552 100644 --- a/CoqOfRust/core/iter/traits/collect.v +++ b/CoqOfRust/core/iter/traits/collect.v @@ -149,7 +149,11 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::option::Option::Some" [ M.read (| item |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ A ] + [ M.read (| item |) ] ] |) |) in diff --git a/CoqOfRust/core/iter/traits/double_ended.v b/CoqOfRust/core/iter/traits/double_ended.v index 0d49661d3..e0c14ba52 100644 --- a/CoqOfRust/core/iter/traits/double_ended.v +++ b/CoqOfRust/core/iter/traits/double_ended.v @@ -46,6 +46,8 @@ Module iter. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| n |)) @@ -189,6 +191,15 @@ Module iter. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path + "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] [ M.call_closure (| Ty.apply @@ -232,7 +243,16 @@ Module iter. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -338,7 +358,18 @@ Module iter. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + Self + "Item" + ] + [] |) |) |) diff --git a/CoqOfRust/core/iter/traits/exact_size.v b/CoqOfRust/core/iter/traits/exact_size.v index 8a12442ef..9c422400f 100644 --- a/CoqOfRust/core/iter/traits/exact_size.v +++ b/CoqOfRust/core/iter/traits/exact_size.v @@ -52,6 +52,8 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| lower |) ] |) |) @@ -123,6 +125,8 @@ Module iter. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -164,6 +168,8 @@ Module iter. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/core/iter/traits/iterator.v b/CoqOfRust/core/iter/traits/iterator.v index 34b834235..7bd956568 100644 --- a/CoqOfRust/core/iter/traits/iterator.v +++ b/CoqOfRust/core/iter/traits/iterator.v @@ -102,7 +102,7 @@ Module iter. Value.Tuple [ Value.Integer IntegerKind.Usize 0; - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -291,7 +291,18 @@ Module iter. |), [ M.read (| self |); - Value.StructTuple "core::option::Option::None" []; + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + Self + "Item" + ] + []; M.get_associated_function (| Self, "some.last", [], [] |) ] |))) @@ -340,6 +351,8 @@ Module iter. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| n |)) @@ -483,6 +496,15 @@ Module iter. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply + (Ty.path + "core::num::nonzero::NonZero") + [] + [ Ty.path "usize" ] + ] [ M.call_closure (| Ty.apply @@ -526,7 +548,16 @@ Module iter. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1511,6 +1542,8 @@ Module iter. [ Value.StructTuple "core::iter::adapters::by_ref_sized::ByRefSized" + [] + [ Self ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |) ]; M.closure (fun γ => @@ -2539,6 +2572,15 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + Self + "Item" + ] [ M.call_closure (| Ty.associated_in_trait @@ -2724,7 +2766,20 @@ Module iter. [], [] |), - [ Value.StructTuple "core::option::Option::None" [] ] + [ + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + Self + "Item" + ] + [] + ] |) |) |) @@ -2951,7 +3006,19 @@ Module iter. [], [] |), - [ Value.StructTuple "core::option::Option::Some" [ M.read (| i |) ] + [ + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + Self + "Item" + ] + [ M.read (| i |) ] ] |) |))) @@ -3031,6 +3098,8 @@ Module iter. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" + [] + [ Ty.tuple []; Ty.tuple [] ] [ Value.Tuple [] ] |) |) @@ -3108,6 +3177,8 @@ Module iter. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Break" + [] + [ Ty.tuple []; Ty.tuple [] ] [ Value.Tuple [] ] |) |) @@ -3452,7 +3523,20 @@ Module iter. [], [] |), - [ Value.StructTuple "core::option::Option::None" [] ] + [ + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + Self + "Item" + ] + [] + ] |) |))) ] @@ -4057,7 +4141,18 @@ Module iter. let γ0_1 := M.SubPointer.get_tuple_field (| γ, 1 |) in let x := M.copy (| γ0_1 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| x |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + Self + "Item" + ] + [ M.read (| x |) ] |))) ] |) @@ -4397,7 +4492,18 @@ Module iter. let γ0_1 := M.SubPointer.get_tuple_field (| γ, 1 |) in let x := M.copy (| γ0_1 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| x |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + Self + "Item" + ] + [ M.read (| x |) ] |))) ] |) @@ -5155,7 +5261,11 @@ Module iter. |) in let ord := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| ord |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] + [ M.read (| ord |) ] |))); fun γ => ltac:(M.monadic @@ -5411,7 +5521,9 @@ Module iter. M.borrow (| Pointer.Kind.Ref, ord |); M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] |) + M.alloc (| + Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] + |) |) ] |) @@ -5504,7 +5616,9 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -5623,7 +5737,9 @@ Module iter. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -6253,6 +6369,8 @@ Module iter. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" + [] + [ T; Ty.path "core::cmp::Ordering" ] [ M.read (| M.match_operator (| @@ -6288,7 +6406,7 @@ Module iter. (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in M.alloc (| - Value.StructTuple "core::cmp::Ordering::Equal" [] + Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] |))); fun γ => ltac:(M.monadic @@ -6299,7 +6417,7 @@ Module iter. 0 |) in M.alloc (| - Value.StructTuple "core::cmp::Ordering::Less" [] + Value.StructTuple "core::cmp::Ordering::Less" [] [] [] |))) ] |) @@ -6435,13 +6553,25 @@ Module iter. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Break" + [] + [ + Ty.apply + (Ty.path "core::ops::control_flow::ControlFlow") + [] + [ T; Ty.path "core::cmp::Ordering" ]; + Ty.tuple [] + ] [ Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" + [] + [ T; Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] ] |))); @@ -6520,6 +6650,8 @@ Module iter. |); M.constructor_as_closure "core::ops::control_flow::ControlFlow::Break" + [] + [ T; Ty.path "core::cmp::Ordering" ] ] |) |))) diff --git a/CoqOfRust/core/links/cmpOrdering.v b/CoqOfRust/core/links/cmpOrdering.v index 738d71f22..a9fd6ddaf 100644 --- a/CoqOfRust/core/links/cmpOrdering.v +++ b/CoqOfRust/core/links/cmpOrdering.v @@ -18,9 +18,9 @@ Module Ordering. Φ := Ty.path "core::cmp::Ordering"; φ x := match x with - | Less => Value.StructTuple "core::cmp::Ordering::Less" [] - | Equal => Value.StructTuple "core::cmp::Ordering::Equal" [] - | Greater => Value.StructTuple "core::cmp::Ordering::Greater" [] + | Less => Value.StructTuple "core::cmp::Ordering::Less" [] [] [] + | Equal => Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] + | Greater => Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] end; }. @@ -29,29 +29,29 @@ Module Ordering. Smpl Add apply of_ty : of_ty. Lemma of_value_with_Less : - Value.StructTuple "core::cmp::Ordering::Less" [] = φ Less. + Value.StructTuple "core::cmp::Ordering::Less" [] [] [] = φ Less. Proof. reflexivity. Qed. Smpl Add apply of_value_with_Less : of_value. Lemma of_value_with_Equal : - Value.StructTuple "core::cmp::Ordering::Equal" [] = φ Equal. + Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] = φ Equal. Proof. reflexivity. Qed. Smpl Add apply of_value_with_Equal : of_value. Lemma of_value_with_Greater : - Value.StructTuple "core::cmp::Ordering::Greater" [] = φ Greater. + Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] = φ Greater. Proof. reflexivity. Qed. Smpl Add apply of_value_with_Greater : of_value. - Definition of_value_Less : OfValue.t (Value.StructTuple "core::cmp::Ordering::Less" []). + Definition of_value_Less : OfValue.t (Value.StructTuple "core::cmp::Ordering::Less" [] [] []). Proof. eapply OfValue.Make with (value := Less); reflexivity. Defined. Smpl Add apply of_value_Less : of_value. - Definition of_value_Equal : OfValue.t (Value.StructTuple "core::cmp::Ordering::Equal" []). + Definition of_value_Equal : OfValue.t (Value.StructTuple "core::cmp::Ordering::Equal" [] [] []). Proof. eapply OfValue.Make with (value := Equal); reflexivity. Defined. Smpl Add apply of_value_Equal : of_value. - Definition of_value_Greater : OfValue.t (Value.StructTuple "core::cmp::Ordering::Greater" []). + Definition of_value_Greater : OfValue.t (Value.StructTuple "core::cmp::Ordering::Greater" [] [] []). Proof. eapply OfValue.Make with (value := Greater); reflexivity. Defined. Smpl Add apply of_value_Greater : of_value. End Ordering. diff --git a/CoqOfRust/core/links/option.v b/CoqOfRust/core/links/option.v index c21d4c7cf..58c6a1fbe 100644 --- a/CoqOfRust/core/links/option.v +++ b/CoqOfRust/core/links/option.v @@ -11,8 +11,8 @@ Module Option. Φ := Ty.apply (Ty.path "core::option::Option") [] [Φ A]; φ x := match x with - | None => Value.StructTuple "core::option::Option::None" [] - | Some x => Value.StructTuple "core::option::Option::Some" [φ x] + | None => Value.StructTuple "core::option::Option::None" [] [Φ A] [] + | Some x => Value.StructTuple "core::option::Option::Some" [] [Φ A] [φ x] end; }. @@ -25,35 +25,44 @@ Module Option. Defined. Smpl Add apply of_ty : of_ty. - Lemma of_value_with_None {A : Set} `{Link A} : - Value.StructTuple "core::option::Option::None" [] = + Lemma of_value_with_None {A : Set} `{Link A} A' : + A' = Φ A -> + Value.StructTuple "core::option::Option::None" [] [A'] [] = φ (None (A := A)). - Proof. reflexivity. Qed. + Proof. now intros; subst. Qed. Smpl Add apply of_value_with_None : of_value. Lemma of_value_with_Some {A : Set} `{Link A} (value : A) value' : value' = φ value -> - Value.StructTuple "core::option::Option::Some" [value'] = + Value.StructTuple "core::option::Option::Some" [] [Φ A] [value'] = φ (Some value). Proof. intros; subst; reflexivity. Qed. Smpl Add apply of_value_with_Some : of_value. - Definition of_value_None {A : Set} `{Link A} : - OfValue.t (Value.StructTuple "core::option::Option::None" []). - Proof. eapply OfValue.Make with (A := option A); apply of_value_with_None. Defined. - Smpl Add eapply of_value_None : of_value. + Definition of_value_None A' : + OfTy.t A' -> + OfValue.t (Value.StructTuple "core::option::Option::None" [] [A'] []). + Proof. + intros [A]. + eapply OfValue.Make with (A := option A) (value := None). + now subst. + Defined. + Smpl Add unshelve eapply of_value_None : of_value. - Definition of_value_Some value' : - OfValue.t value' -> - OfValue.t (Value.StructTuple "core::option::Option::Some" [value']). + Definition of_value_Some A' value' : + forall + (of_value_value : OfValue.t value'), + A' = Φ (OfValue.get_Set of_value_value) -> + OfValue.t (Value.StructTuple "core::option::Option::Some" [] [A'] [value']). Proof. - intros [A]; eapply OfValue.Make with (A := option A). - apply of_value_with_Some; eassumption. + intros [A ? value] **. + eapply OfValue.Make with (A := option A) (value := Some value). + now subst. Defined. - Smpl Add eapply of_value_Some : of_value. + Smpl Add unshelve eapply of_value_Some : of_value. Module SubPointer. - Definition get_Some_0 {A : Set} `{Link A} : + Definition get_Some_0 (A : Set) `{Link A} : SubPointer.Runner.t (option A) (Pointer.Index.StructTuple "core::option::Option::Some" 0) := {| SubPointer.Runner.projection (x : option A) := x; @@ -64,8 +73,8 @@ Module Option. end; |}. - Lemma get_Some_0_is_valid {A : Set} `{Link A} : - SubPointer.Runner.Valid.t (get_Some_0 (A := A)). + Lemma get_Some_0_is_valid (A : Set) `{Link A} : + SubPointer.Runner.Valid.t (get_Some_0 A). Proof. sauto lq: on. Qed. @@ -93,7 +102,10 @@ Module Impl_Option. Run.Trait (option.Impl_core_option_Option_T.ok_or (Φ T)) [] [ Φ E ] [ φ self; φ err ] (Result.t T E). - Admitted. + Proof. + constructor. + run_symbolic. + Defined. (* pub const fn unwrap(self) -> T *) Instance run_unwrap {T : Set} `{Link T} @@ -101,6 +113,9 @@ Module Impl_Option. Run.Trait (option.Impl_core_option_Option_T.unwrap (Φ T)) [] [] [ φ self ] T. + Proof. + constructor. + run_symbolic. Admitted. (* pub const unsafe fn unwrap_unchecked(self) -> T *) diff --git a/CoqOfRust/core/links/panicking.v b/CoqOfRust/core/links/panicking.v index fa1505ece..e4927cf20 100644 --- a/CoqOfRust/core/links/panicking.v +++ b/CoqOfRust/core/links/panicking.v @@ -37,9 +37,9 @@ Module AssertKind. Φ := Ty.path "core::panicking::AssertKind"; φ x := match x with - | Eq => Value.StructTuple "core::panicking::AssertKind::Eq" [] - | Ne => Value.StructTuple "core::panicking::AssertKind::Ne" [] - | Match => Value.StructTuple "core::panicking::AssertKind::Match" [] + | Eq => Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] + | Ne => Value.StructTuple "core::panicking::AssertKind::Ne" [] [] [] + | Match => Value.StructTuple "core::panicking::AssertKind::Match" [] [] [] end; }. @@ -48,32 +48,32 @@ Module AssertKind. Smpl Add apply of_ty : of_ty. Lemma of_value_with_Eq : - Value.StructTuple "core::panicking::AssertKind::Eq" [] = φ Eq. + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] = φ Eq. Proof. reflexivity. Qed. Smpl Add apply of_value_with_Eq : of_value. Lemma of_value_with_Ne : - Value.StructTuple "core::panicking::AssertKind::Ne" [] = φ Ne. + Value.StructTuple "core::panicking::AssertKind::Ne" [] [] [] = φ Ne. Proof. reflexivity. Qed. Smpl Add apply of_value_with_Ne : of_value. Lemma of_value_with_Match : - Value.StructTuple "core::panicking::AssertKind::Match" [] = φ Match. + Value.StructTuple "core::panicking::AssertKind::Match" [] [] [] = φ Match. Proof. reflexivity. Qed. Smpl Add apply of_value_with_Match : of_value. Definition of_value_Eq : - OfValue.t (Value.StructTuple "core::panicking::AssertKind::Eq" []). + OfValue.t (Value.StructTuple "core::panicking::AssertKind::Eq" [] [] []). Proof. econstructor; apply of_value_with_Eq. Defined. Smpl Add apply of_value_Eq : of_value. Definition of_value_Ne : - OfValue.t (Value.StructTuple "core::panicking::AssertKind::Ne" []). + OfValue.t (Value.StructTuple "core::panicking::AssertKind::Ne" [] [] []). Proof. econstructor; apply of_value_with_Ne. Defined. Smpl Add apply of_value_Ne : of_value. Definition of_value_Match : - OfValue.t (Value.StructTuple "core::panicking::AssertKind::Match" []). + OfValue.t (Value.StructTuple "core::panicking::AssertKind::Match" [] [] []). Proof. econstructor; apply of_value_with_Match. Defined. Smpl Add apply of_value_Match : of_value. End AssertKind. diff --git a/CoqOfRust/core/links/result.v b/CoqOfRust/core/links/result.v index 3428a9c62..4b5563dd7 100644 --- a/CoqOfRust/core/links/result.v +++ b/CoqOfRust/core/links/result.v @@ -1,6 +1,7 @@ Require Import CoqOfRust.CoqOfRust. Require Import links.M. Require Import core.result. + Module Result. Inductive t {T E : Set} : Set := | Ok : T -> t @@ -11,8 +12,8 @@ Module Result. Φ := Ty.apply (Ty.path "core::result::Result") [] [Φ T; Φ E]; φ x := match x with - | Ok x => Value.StructTuple "core::result::Result::Ok" [φ x] - | Err x => Value.StructTuple "core::result::Result::Err" [φ x] + | Ok x => Value.StructTuple "core::result::Result::Ok" [] [Φ T; Φ E] [φ x] + | Err x => Value.StructTuple "core::result::Result::Err" [] [Φ T; Φ E] [φ x] end; }. @@ -25,6 +26,96 @@ Module Result. subst; reflexivity. Defined. Smpl Add apply of_ty : of_ty. + + Lemma of_value_with_Ok (T E : Set) `{Link T} `{Link E} (x : T) x' : + x' = φ x -> + Value.StructTuple "core::result::Result::Ok" [] [Φ T; Φ E] [x'] = + φ (Ok (T := T) (E := E) x). + Proof. + intros; subst; reflexivity. + Qed. + Smpl Add apply of_value_with_Ok : of_value. + + Lemma of_value_with_Err (T E : Set) `{Link T} `{Link E} (err : E) err' : + err' = φ err -> + Value.StructTuple "core::result::Result::Err" [] [Φ T; Φ E] [err'] = + φ (Err (T := T) (E := E) err). + Proof. + intros; subst; reflexivity. + Qed. + Smpl Add apply of_value_with_Err : of_value. + + Definition of_value_Ok T' E' x' : + forall + (of_ty_E : OfTy.t E') + (of_value_x : OfValue.t x'), + T' = Φ (OfValue.get_Set of_value_x) -> + OfValue.t (Value.StructTuple "core::result::Result::Ok" [] [T'; E'] [x']). + Proof. + intros [E] [T ? x] **. + eapply OfValue.Make with (A := t T E) (value := Ok x). + now subst. + Defined. + Smpl Add unshelve eapply of_value_Ok : of_value. + + Definition of_value_Err T' E' err' : + forall + (of_ty_T : OfTy.t T') + (of_value_err : OfValue.t err'), + E' = Φ (OfValue.get_Set of_value_err) -> + OfValue.t (Value.StructTuple "core::result::Result::Err" [] [T'; E'] [err']). + Proof. + intros [T] [E ? err] **. + eapply OfValue.Make with (A := t T E) (value := Err err). + now subst. + Defined. + Smpl Add unshelve eapply of_value_Err : of_value. + + Module SubPointer. + Definition get_Ok_0 (T E : Set) `{Link T} `{Link E} : SubPointer.Runner.t (t T E) + (Pointer.Index.StructTuple "core::result::Result::Ok" 0) := + {| + SubPointer.Runner.projection x := + match x with + | Ok x => Some x + | Err _ => None + end; + SubPointer.Runner.injection x y := + match x with + | Ok _ => Some (Ok y) + | Err _ => None + end; + |}. + + Lemma get_Ok_0_is_valid (T E : Set) `{Link T} `{Link E} : + SubPointer.Runner.Valid.t (get_Ok_0 T E). + Proof. + sauto lq: on. + Qed. + Smpl Add apply get_Ok_0_is_valid : run_sub_pointer. + + Definition get_Err_0 (T E : Set) `{Link T} `{Link E} : SubPointer.Runner.t (t T E) + (Pointer.Index.StructTuple "core::result::Result::Err" 0) := + {| + SubPointer.Runner.projection x := + match x with + | Ok _ => None + | Err err => Some err + end; + SubPointer.Runner.injection x y := + match x with + | Ok _ => None + | Err _ => Some (Err y) + end; + |}. + + Lemma get_Err_0_is_valid (T E : Set) `{Link T} `{Link E} : + SubPointer.Runner.Valid.t (get_Err_0 T E). + Proof. + sauto lq: on. + Qed. + Smpl Add apply get_Err_0_is_valid : run_sub_pointer. + End SubPointer. End Result. Module Impl_Result_T_E. @@ -42,7 +133,7 @@ Module Impl_Result_T_E. Proof. constructor. run_symbolic. - Admitted. + Defined. (* pub fn expect(self, msg: &str) -> T diff --git a/CoqOfRust/core/marker.v b/CoqOfRust/core/marker.v index 972900bbb..59daa724e 100644 --- a/CoqOfRust/core/marker.v +++ b/CoqOfRust/core/marker.v @@ -679,7 +679,9 @@ Module marker. let _other := M.alloc (| _other |) in Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ])) + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -708,7 +710,7 @@ Module marker. ltac:(M.monadic (let self := M.alloc (| self |) in let _other := M.alloc (| _other |) in - Value.StructTuple "core::cmp::Ordering::Equal" [])) + Value.StructTuple "core::cmp::Ordering::Equal" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -936,7 +938,7 @@ Module marker. (* Default *) Definition default (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "core::marker::PhantomPinned" [])) + | [], [], [] => ltac:(M.monadic (Value.StructTuple "core::marker::PhantomPinned" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1055,7 +1057,7 @@ Module marker. ltac:(M.monadic (let self := M.alloc (| self |) in let other := M.alloc (| other |) in - Value.StructTuple "core::cmp::Ordering::Equal" [])) + Value.StructTuple "core::cmp::Ordering::Equal" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1080,7 +1082,9 @@ Module marker. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ])) + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/mem/manually_drop.v b/CoqOfRust/core/mem/manually_drop.v index 096c4d8a9..30932635f 100644 --- a/CoqOfRust/core/mem/manually_drop.v +++ b/CoqOfRust/core/mem/manually_drop.v @@ -38,6 +38,8 @@ Module mem. (let self := M.alloc (| self |) in Value.StructRecord "core::mem::manually_drop::ManuallyDrop" + [] + [ T ] [ ("value", M.call_closure (| @@ -147,6 +149,8 @@ Module mem. ltac:(M.monadic (Value.StructRecord "core::mem::manually_drop::ManuallyDrop" + [] + [ T ] [ ("value", M.call_closure (| @@ -444,6 +448,8 @@ Module mem. (let value := M.alloc (| value |) in Value.StructRecord "core::mem::manually_drop::ManuallyDrop" + [] + [ T ] [ ("value", M.read (| value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/mem/maybe_uninit.v b/CoqOfRust/core/mem/maybe_uninit.v index aeac68bf9..73808a307 100644 --- a/CoqOfRust/core/mem/maybe_uninit.v +++ b/CoqOfRust/core/mem/maybe_uninit.v @@ -182,6 +182,8 @@ Module mem. (let val := M.alloc (| val |) in Value.StructRecord "core::mem::maybe_uninit::MaybeUninit" + [] + [ T ] [ ("value", M.call_closure (| @@ -216,6 +218,8 @@ Module mem. ltac:(M.monadic (Value.StructRecord "core::mem::maybe_uninit::MaybeUninit" + [] + [ T ] [ ("uninit", Value.Tuple []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1285,7 +1289,11 @@ Module mem. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple + "core::panicking::AssertKind::Eq" + [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1317,6 +1325,8 @@ Module mem. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::fmt::Arguments" ] [ M.call_closure (| Ty.path "core::fmt::Arguments", @@ -1402,6 +1412,8 @@ Module mem. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| src |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| len |)) ] ] |) @@ -1416,6 +1428,8 @@ Module mem. M.alloc (| Value.StructRecord "core::mem::maybe_uninit::Guard" + [] + [ T ] [ ("slice", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| this |) |) |)); @@ -1441,6 +1455,8 @@ Module mem. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| len |)) @@ -1751,6 +1767,8 @@ Module mem. M.alloc (| Value.StructRecord "core::mem::maybe_uninit::Guard" + [] + [ T ] [ ("slice", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| this |) |) |)); @@ -2086,6 +2104,8 @@ Module mem. M.alloc (| Value.StructRecord "core::mem::maybe_uninit::Guard" + [] + [ T ] [ ("slice", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| this |) |) |)); @@ -3133,6 +3153,8 @@ Module mem. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -3237,6 +3259,8 @@ Module mem. M.alloc (| Value.StructRecord "core::mem::maybe_uninit::Guard" + [] + [ T ] [ ("slice", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |)); diff --git a/CoqOfRust/core/mem/mod.v b/CoqOfRust/core/mem/mod.v index d2ee7c108..423364883 100644 --- a/CoqOfRust/core/mem/mod.v +++ b/CoqOfRust/core/mem/mod.v @@ -1023,6 +1023,8 @@ Module mem. (let v := M.alloc (| v |) in Value.StructTuple "core::mem::Discriminant" + [] + [ T ] [ M.call_closure (| Ty.associated_in_trait "core::marker::DiscriminantKind" [] [] T "Discriminant", diff --git a/CoqOfRust/core/mem/transmutability.v b/CoqOfRust/core/mem/transmutability.v index 7a368c67b..ab99fcf88 100644 --- a/CoqOfRust/core/mem/transmutability.v +++ b/CoqOfRust/core/mem/transmutability.v @@ -30,6 +30,8 @@ Module mem. M.alloc (| Value.StructRecord "core::mem::transmutability::TransmuteFrom::transmute::Transmute" + [] + [ Src; Self ] [ ("src", M.call_closure (| @@ -434,6 +436,8 @@ Module mem. (M.alloc (| Value.StructRecord "core::mem::transmutability::Assume" + [] + [] [ ("alignment", Value.Bool false); ("lifetimes", Value.Bool false); @@ -549,6 +553,8 @@ Module mem. let other_assumptions := M.alloc (| other_assumptions |) in Value.StructRecord "core::mem::transmutability::Assume" + [] + [] [ ("alignment", LogicalOp.or (| @@ -648,6 +654,8 @@ Module mem. let other_assumptions := M.alloc (| other_assumptions |) in Value.StructRecord "core::mem::transmutability::Assume" + [] + [] [ ("alignment", LogicalOp.and (| diff --git a/CoqOfRust/core/net/display_buffer.v b/CoqOfRust/core/net/display_buffer.v index 96483e1f7..670dd78ef 100644 --- a/CoqOfRust/core/net/display_buffer.v +++ b/CoqOfRust/core/net/display_buffer.v @@ -35,6 +35,8 @@ Module net. ltac:(M.monadic (Value.StructRecord "core::net::display_buffer::DisplayBuffer" + [ SIZE ] + [] [ ("buf", repeat (| @@ -156,6 +158,8 @@ Module net. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -305,6 +309,8 @@ Module net. |)); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -420,14 +426,20 @@ Module net. |) |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::fmt::Error" [] ] + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.StructTuple "core::fmt::Error" [] [] [] ] |))) ] |) diff --git a/CoqOfRust/core/net/ip_addr.v b/CoqOfRust/core/net/ip_addr.v index 6ee3d554a..117dd942e 100644 --- a/CoqOfRust/core/net/ip_addr.v +++ b/CoqOfRust/core/net/ip_addr.v @@ -2164,6 +2164,8 @@ Module net. let d := M.alloc (| d |) in Value.StructRecord "core::net::ip_addr::Ipv4Addr" + [] + [] [ ("octets", Value.Array [ M.read (| a |); M.read (| b |); M.read (| c |); M.read (| d |) ]) @@ -2227,6 +2229,8 @@ Module net. (let bits := M.alloc (| bits |) in Value.StructRecord "core::net::ip_addr::Ipv4Addr" + [] + [] [ ("octets", M.call_closure (| @@ -2346,7 +2350,11 @@ Module net. | [], [], [ octets ] => ltac:(M.monadic (let octets := M.alloc (| octets |) in - Value.StructRecord "core::net::ip_addr::Ipv4Addr" [ ("octets", M.read (| octets |)) ])) + Value.StructRecord + "core::net::ip_addr::Ipv4Addr" + [] + [] + [ ("octets", M.read (| octets |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3488,6 +3496,8 @@ Module net. M.alloc (| Value.StructRecord "core::net::ip_addr::Ipv6Addr" + [] + [] [ ("octets", Value.Array @@ -3565,6 +3575,8 @@ Module net. M.alloc (| Value.StructRecord "core::net::ip_addr::Ipv6Addr" + [] + [] [ ("octets", Value.Array @@ -3765,7 +3777,7 @@ Module net. | [], [], [ ipv4 ] => ltac:(M.monadic (let ipv4 := M.alloc (| ipv4 |) in - Value.StructTuple "core::net::ip_addr::IpAddr::V4" [ M.read (| ipv4 |) ])) + Value.StructTuple "core::net::ip_addr::IpAddr::V4" [] [] [ M.read (| ipv4 |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3791,7 +3803,7 @@ Module net. | [], [], [ ipv6 ] => ltac:(M.monadic (let ipv6 := M.alloc (| ipv6 |) in - Value.StructTuple "core::net::ip_addr::IpAddr::V6" [ M.read (| ipv6 |) ])) + Value.StructTuple "core::net::ip_addr::IpAddr::V6" [] [] [ M.read (| ipv6 |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4571,6 +4583,8 @@ Module net. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -4670,7 +4684,9 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |))) ] |) @@ -4756,7 +4772,9 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |))) ] |) @@ -4917,7 +4935,11 @@ Module net. | [], [], [ octets ] => ltac:(M.monadic (let octets := M.alloc (| octets |) in - Value.StructRecord "core::net::ip_addr::Ipv4Addr" [ ("octets", M.read (| octets |)) ])) + Value.StructRecord + "core::net::ip_addr::Ipv4Addr" + [] + [] + [ ("octets", M.read (| octets |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4946,6 +4968,8 @@ Module net. (let octets := M.alloc (| octets |) in Value.StructTuple "core::net::ip_addr::IpAddr::V4" + [] + [] [ M.call_closure (| Ty.path "core::net::ip_addr::Ipv4Addr", @@ -5072,6 +5096,8 @@ Module net. M.alloc (| Value.StructRecord "core::net::ip_addr::Ipv6Addr" + [] + [] [ ("octets", M.call_closure (| @@ -5157,6 +5183,8 @@ Module net. (let bits := M.alloc (| bits |) in Value.StructRecord "core::net::ip_addr::Ipv6Addr" + [] + [] [ ("octets", M.call_closure (| @@ -6824,10 +6852,14 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::net::ip_addr::Ipv6MulticastScope" ] [ Value.StructTuple "core::net::ip_addr::Ipv6MulticastScope::InterfaceLocal" [] + [] + [] ] |))); fun γ => @@ -6840,10 +6872,14 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::net::ip_addr::Ipv6MulticastScope" ] [ Value.StructTuple "core::net::ip_addr::Ipv6MulticastScope::LinkLocal" [] + [] + [] ] |))); fun γ => @@ -6856,10 +6892,14 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::net::ip_addr::Ipv6MulticastScope" ] [ Value.StructTuple "core::net::ip_addr::Ipv6MulticastScope::RealmLocal" [] + [] + [] ] |))); fun γ => @@ -6872,10 +6912,14 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::net::ip_addr::Ipv6MulticastScope" ] [ Value.StructTuple "core::net::ip_addr::Ipv6MulticastScope::AdminLocal" [] + [] + [] ] |))); fun γ => @@ -6888,10 +6932,14 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::net::ip_addr::Ipv6MulticastScope" ] [ Value.StructTuple "core::net::ip_addr::Ipv6MulticastScope::SiteLocal" [] + [] + [] ] |))); fun γ => @@ -6904,10 +6952,14 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::net::ip_addr::Ipv6MulticastScope" ] [ Value.StructTuple "core::net::ip_addr::Ipv6MulticastScope::OrganizationLocal" [] + [] + [] ] |))); fun γ => @@ -6920,20 +6972,36 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::net::ip_addr::Ipv6MulticastScope" ] [ Value.StructTuple "core::net::ip_addr::Ipv6MulticastScope::Global" [] + [] + [] ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::net::ip_addr::Ipv6MulticastScope" ] + [] + |))) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::net::ip_addr::Ipv6MulticastScope" ] + [] + |))) ] |) |))) @@ -7206,6 +7274,8 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::net::ip_addr::Ipv4Addr" ] [ M.call_closure (| Ty.path "core::net::ip_addr::Ipv4Addr", @@ -7221,7 +7291,13 @@ Module net. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::net::ip_addr::Ipv4Addr" ] + [] + |))) ] |) |))) @@ -7409,6 +7485,8 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::net::ip_addr::Ipv4Addr" ] [ M.call_closure (| Ty.path "core::net::ip_addr::Ipv4Addr", @@ -7436,7 +7514,13 @@ Module net. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::net::ip_addr::Ipv4Addr" ] + [] + |))) ] |) |))) @@ -7500,6 +7584,8 @@ Module net. M.return_ (| Value.StructTuple "core::net::ip_addr::IpAddr::V4" + [] + [] [ M.read (| mapped |) ] |) |) @@ -7511,6 +7597,8 @@ Module net. M.alloc (| Value.StructTuple "core::net::ip_addr::IpAddr::V6" + [] + [] [ M.read (| M.deref (| M.read (| self |) |) |) ] |) |))) @@ -7557,7 +7645,11 @@ Module net. | [], [], [ octets ] => ltac:(M.monadic (let octets := M.alloc (| octets |) in - Value.StructRecord "core::net::ip_addr::Ipv6Addr" [ ("octets", M.read (| octets |)) ])) + Value.StructRecord + "core::net::ip_addr::Ipv6Addr" + [] + [] + [ ("octets", M.read (| octets |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -8494,6 +8586,8 @@ Module net. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -8757,6 +8851,8 @@ Module net. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -9216,6 +9312,8 @@ Module net. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -9284,7 +9382,9 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |))); fun γ => ltac:(M.monadic @@ -9370,7 +9470,9 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |))); fun γ => ltac:(M.monadic @@ -9582,7 +9684,11 @@ Module net. | [], [], [ octets ] => ltac:(M.monadic (let octets := M.alloc (| octets |) in - Value.StructRecord "core::net::ip_addr::Ipv6Addr" [ ("octets", M.read (| octets |)) ])) + Value.StructRecord + "core::net::ip_addr::Ipv6Addr" + [] + [] + [ ("octets", M.read (| octets |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -9685,6 +9791,8 @@ Module net. (let octets := M.alloc (| octets |) in Value.StructTuple "core::net::ip_addr::IpAddr::V6" + [] + [] [ M.call_closure (| Ty.path "core::net::ip_addr::Ipv6Addr", @@ -9733,6 +9841,8 @@ Module net. (let segments := M.alloc (| segments |) in Value.StructTuple "core::net::ip_addr::IpAddr::V6" + [] + [] [ M.call_closure (| Ty.path "core::net::ip_addr::Ipv6Addr", diff --git a/CoqOfRust/core/net/parser.v b/CoqOfRust/core/net/parser.v index 569688f48..77c259294 100644 --- a/CoqOfRust/core/net/parser.v +++ b/CoqOfRust/core/net/parser.v @@ -921,6 +921,8 @@ Module net. (let input := M.alloc (| input |) in Value.StructRecord "core::net::parser::Parser" + [] + [] [ ("state", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| input |) |) |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1135,11 +1137,17 @@ Module net. result)); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ T ] [] + |))) ] |) |); - Value.StructTuple "core::net::parser::AddrParseError" [ M.read (| kind |) ] + Value.StructTuple + "core::net::parser::AddrParseError" + [] + [] + [ M.read (| kind |) ] ] |) |) @@ -1572,6 +1580,8 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.tuple [] ] [ Value.Tuple [] ] |))); fun γ => @@ -1580,6 +1590,8 @@ Module net. Value.StructTuple "core::option::Option::None" [] + [ Ty.tuple [] ] + [] |))) ] |) @@ -2018,6 +2030,8 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "char" ] [ Value.UnicodeChar 48 ] |) |) @@ -2515,6 +2529,8 @@ Module net. Value.StructTuple "core::option::Option::None" [] + [ T ] + [] |) |) |) @@ -3224,6 +3240,8 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.read (| result |) ] |))) ] @@ -3256,7 +3274,11 @@ Module net. Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ T ] + [] |))); fun γ => ltac:(M.monadic @@ -3301,6 +3323,8 @@ Module net. Value.StructTuple "core::option::Option::None" [] + [ T ] + [] |))); fun γ => ltac:(M.monadic result) ] @@ -3766,6 +3790,11 @@ Module net. 10; Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "usize" + ] [ Value.Integer IntegerKind.Usize @@ -3871,6 +3900,8 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::net::ip_addr::Ipv4Addr" ] [ M.call_closure (| Ty.path "core::net::ip_addr::Ipv4Addr", @@ -4121,6 +4152,11 @@ Module net. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::net::ip_addr::Ipv6Addr" + ] [ M.call_closure (| Ty.path @@ -4175,6 +4211,11 @@ Module net. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::net::ip_addr::Ipv6Addr" + ] + [] |) |) |) @@ -4517,6 +4558,8 @@ Module net. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| limit |)) ] ] |) @@ -4592,6 +4635,8 @@ Module net. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -4658,6 +4703,8 @@ Module net. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -4676,6 +4723,8 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::net::ip_addr::Ipv6Addr" ] [ M.call_closure (| Ty.path "core::net::ip_addr::Ipv6Addr", @@ -4780,7 +4829,7 @@ Module net. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |) ] |); - M.constructor_as_closure "core::net::ip_addr::IpAddr::V4" + M.constructor_as_closure "core::net::ip_addr::IpAddr::V4" [] [] ] |); M.closure @@ -4843,7 +4892,10 @@ Module net. |) ] |); - M.constructor_as_closure "core::net::ip_addr::IpAddr::V6" + M.constructor_as_closure + "core::net::ip_addr::IpAddr::V6" + [] + [] ] |))) ] @@ -5043,7 +5095,11 @@ Module net. M.deref (| M.read (| p |) |) |); Value.Integer IntegerKind.U32 10; - Value.StructTuple "core::option::Option::None" []; + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + []; Value.Bool true ] |) @@ -5246,7 +5302,11 @@ Module net. M.deref (| M.read (| p |) |) |); Value.Integer IntegerKind.U32 10; - Value.StructTuple "core::option::Option::None" []; + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + []; Value.Bool true ] |) @@ -5574,6 +5634,8 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::net::socket_addr::SocketAddrV4" ] [ M.call_closure (| Ty.path "core::net::socket_addr::SocketAddrV4", @@ -6172,6 +6234,8 @@ Module net. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::net::socket_addr::SocketAddrV6" ] [ M.call_closure (| Ty.path "core::net::socket_addr::SocketAddrV6", @@ -6272,7 +6336,7 @@ Module net. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |) ] |); - M.constructor_as_closure "core::net::socket_addr::SocketAddr::V4" + M.constructor_as_closure "core::net::socket_addr::SocketAddr::V4" [] [] ] |); M.closure @@ -6337,6 +6401,8 @@ Module net. |); M.constructor_as_closure "core::net::socket_addr::SocketAddr::V6" + [] + [] ] |))) ] @@ -6459,7 +6525,7 @@ Module net. |))) | _ => M.impossible "wrong number of arguments" end)); - Value.StructTuple "core::net::parser::AddrKind::Ip" [] + Value.StructTuple "core::net::parser::AddrKind::Ip" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6586,10 +6652,17 @@ Module net. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "core::net::ip_addr::Ipv4Addr"; + Ty.path "core::net::parser::AddrParseError" + ] [ Value.StructTuple "core::net::parser::AddrParseError" - [ Value.StructTuple "core::net::parser::AddrKind::Ipv4" [] ] + [] + [] + [ Value.StructTuple "core::net::parser::AddrKind::Ipv4" [] [] [] ] ] |))); fun γ => @@ -6694,7 +6767,7 @@ Module net. |))) | _ => M.impossible "wrong number of arguments" end)); - Value.StructTuple "core::net::parser::AddrKind::Ipv4" [] + Value.StructTuple "core::net::parser::AddrKind::Ipv4" [] [] [] ] |) |))) @@ -6873,7 +6946,7 @@ Module net. |))) | _ => M.impossible "wrong number of arguments" end)); - Value.StructTuple "core::net::parser::AddrKind::Ipv6" [] + Value.StructTuple "core::net::parser::AddrKind::Ipv6" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7048,7 +7121,7 @@ Module net. |))) | _ => M.impossible "wrong number of arguments" end)); - Value.StructTuple "core::net::parser::AddrKind::SocketV4" [] + Value.StructTuple "core::net::parser::AddrKind::SocketV4" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7223,7 +7296,7 @@ Module net. |))) | _ => M.impossible "wrong number of arguments" end)); - Value.StructTuple "core::net::parser::AddrKind::SocketV6" [] + Value.StructTuple "core::net::parser::AddrKind::SocketV6" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7398,7 +7471,7 @@ Module net. |))) | _ => M.impossible "wrong number of arguments" end)); - Value.StructTuple "core::net::parser::AddrKind::Socket" [] + Value.StructTuple "core::net::parser::AddrKind::Socket" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7613,32 +7686,42 @@ Module net. ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::net::parser::AddrKind::Ip" |) in - M.alloc (| Value.StructTuple "core::net::parser::AddrKind::Ip" [] |))); + M.alloc (| Value.StructTuple "core::net::parser::AddrKind::Ip" [] [] [] |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::net::parser::AddrKind::Ipv4" |) in - M.alloc (| Value.StructTuple "core::net::parser::AddrKind::Ipv4" [] |))); + M.alloc (| + Value.StructTuple "core::net::parser::AddrKind::Ipv4" [] [] [] + |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::net::parser::AddrKind::Ipv6" |) in - M.alloc (| Value.StructTuple "core::net::parser::AddrKind::Ipv6" [] |))); + M.alloc (| + Value.StructTuple "core::net::parser::AddrKind::Ipv6" [] [] [] + |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::net::parser::AddrKind::Socket" |) in - M.alloc (| Value.StructTuple "core::net::parser::AddrKind::Socket" [] |))); + M.alloc (| + Value.StructTuple "core::net::parser::AddrKind::Socket" [] [] [] + |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::net::parser::AddrKind::SocketV4" |) in - M.alloc (| Value.StructTuple "core::net::parser::AddrKind::SocketV4" [] |))); + M.alloc (| + Value.StructTuple "core::net::parser::AddrKind::SocketV4" [] [] [] + |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::net::parser::AddrKind::SocketV6" |) in - M.alloc (| Value.StructTuple "core::net::parser::AddrKind::SocketV6" [] |))) + M.alloc (| + Value.StructTuple "core::net::parser::AddrKind::SocketV6" [] [] [] + |))) ] |) |))) @@ -7825,6 +7908,8 @@ Module net. (let self := M.alloc (| self |) in Value.StructTuple "core::net::parser::AddrParseError" + [] + [] [ M.call_closure (| Ty.path "core::net::parser::AddrKind", diff --git a/CoqOfRust/core/net/socket_addr.v b/CoqOfRust/core/net/socket_addr.v index a061016ae..044d545fc 100644 --- a/CoqOfRust/core/net/socket_addr.v +++ b/CoqOfRust/core/net/socket_addr.v @@ -2247,6 +2247,8 @@ Module net. M.alloc (| Value.StructTuple "core::net::socket_addr::SocketAddr::V4" + [] + [] [ M.call_closure (| Ty.path "core::net::socket_addr::SocketAddrV4", @@ -2272,6 +2274,8 @@ Module net. M.alloc (| Value.StructTuple "core::net::socket_addr::SocketAddr::V6" + [] + [] [ M.call_closure (| Ty.path "core::net::socket_addr::SocketAddrV6", @@ -2330,6 +2334,8 @@ Module net. M.alloc (| Value.StructTuple "core::net::ip_addr::IpAddr::V4" + [] + [] [ M.read (| M.deref (| @@ -2362,6 +2368,8 @@ Module net. M.alloc (| Value.StructTuple "core::net::ip_addr::IpAddr::V6" + [] + [] [ M.read (| M.deref (| @@ -2760,6 +2768,8 @@ Module net. let port := M.alloc (| port |) in Value.StructRecord "core::net::socket_addr::SocketAddrV4" + [] + [] [ ("ip", M.read (| ip |)); ("port", M.read (| port |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2906,6 +2916,8 @@ Module net. let scope_id := M.alloc (| scope_id |) in Value.StructRecord "core::net::socket_addr::SocketAddrV6" + [] + [] [ ("ip", M.read (| ip |)); ("port", M.read (| port |)); @@ -3168,7 +3180,11 @@ Module net. | [], [], [ sock4 ] => ltac:(M.monadic (let sock4 := M.alloc (| sock4 |) in - Value.StructTuple "core::net::socket_addr::SocketAddr::V4" [ M.read (| sock4 |) ])) + Value.StructTuple + "core::net::socket_addr::SocketAddr::V4" + [] + [] + [ M.read (| sock4 |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3194,7 +3210,11 @@ Module net. | [], [], [ sock6 ] => ltac:(M.monadic (let sock6 := M.alloc (| sock6 |) in - Value.StructTuple "core::net::socket_addr::SocketAddr::V6" [ M.read (| sock6 |) ])) + Value.StructTuple + "core::net::socket_addr::SocketAddr::V6" + [] + [] + [ M.read (| sock6 |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/num/bignum.v b/CoqOfRust/core/num/bignum.v index a8b098898..aa56c196d 100644 --- a/CoqOfRust/core/num/bignum.v +++ b/CoqOfRust/core/num/bignum.v @@ -651,6 +651,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::bignum::Big32x40" + [] + [] [ ("size", Value.Integer IntegerKind.Usize 1); ("base", M.read (| base |)) ] |) |))) @@ -774,6 +776,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::bignum::Big32x40" + [] + [] [ ("size", M.read (| sz |)); ("base", M.read (| base |)) ] |) |))) @@ -826,6 +830,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -1351,6 +1357,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| sz |)) ] ] |) @@ -1392,6 +1400,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| sz |)) ] ] |) @@ -1983,6 +1993,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| sz |)) ] ] |) @@ -2024,6 +2036,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| sz |)) ] ] |) @@ -2298,6 +2312,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| sz |)) ] ] |) @@ -2701,6 +2717,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -2955,6 +2973,8 @@ Module num. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -3085,6 +3105,8 @@ Module num. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| digits |)) @@ -3346,6 +3368,8 @@ Module num. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -3747,6 +3771,8 @@ Module num. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| e |)) @@ -4296,6 +4322,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| sz |)) ] ] |) @@ -4575,7 +4603,7 @@ Module num. "base" |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -4699,7 +4727,7 @@ Module num. "base" |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -4858,6 +4886,8 @@ Module num. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| end_ |)) @@ -5307,6 +5337,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -5501,6 +5533,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -5653,7 +5687,7 @@ Module num. "base" |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -5684,7 +5718,7 @@ Module num. "base" |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -5731,6 +5765,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -5902,6 +5938,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| sz |)) ] ] |) @@ -6013,6 +6051,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| sz |)) ] ] |) @@ -6086,6 +6126,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructRecord "core::num::bignum::Big32x40" + [] + [] [ ("size", M.read (| @@ -6331,14 +6373,20 @@ Module num. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -6512,6 +6560,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -6755,15 +6805,21 @@ Module num. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 8; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Param" + [] + [] [ Value.Integer IntegerKind.Usize @@ -6866,7 +6922,13 @@ Module num. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6934,6 +6996,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::bignum::tests::Big8x3" + [] + [] [ ("size", Value.Integer IntegerKind.Usize 1); ("base", M.read (| base |)) ] |) |))) @@ -7059,6 +7123,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::bignum::tests::Big8x3" + [] + [] [ ("size", M.read (| sz |)); ("base", M.read (| base |)) ] |) |))) @@ -7114,6 +7180,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -7641,6 +7709,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| sz |)) ] ] |) @@ -7682,6 +7752,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| sz |)) ] ] |) @@ -8289,6 +8361,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| sz |)) ] ] |) @@ -8330,6 +8404,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| sz |)) ] ] |) @@ -8615,6 +8691,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| sz |)) ] ] |) @@ -9028,6 +9106,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -9288,6 +9368,8 @@ Module num. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -9420,6 +9502,8 @@ Module num. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| digits |)) @@ -9684,6 +9768,8 @@ Module num. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -10098,6 +10184,8 @@ Module num. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| e |)) @@ -10662,6 +10750,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| sz |)) ] ] |) @@ -10949,7 +11039,7 @@ Module num. "base" |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -11076,7 +11166,7 @@ Module num. "base" |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -11243,6 +11333,8 @@ Module num. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| end_ |)) @@ -11719,6 +11811,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -11918,6 +12012,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -12075,7 +12171,7 @@ Module num. "base" |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12109,7 +12205,7 @@ Module num. "base" |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -12156,6 +12252,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -12327,6 +12425,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| sz |)) ] ] |) @@ -12438,6 +12538,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| sz |)) ] ] |) @@ -12511,6 +12613,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructRecord "core::num::bignum::tests::Big8x3" + [] + [] [ ("size", M.read (| @@ -12762,14 +12866,20 @@ Module num. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -12947,6 +13057,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -13195,15 +13307,21 @@ Module num. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 8; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Param" + [] + [] [ Value.Integer IntegerKind.Usize @@ -13308,7 +13426,13 @@ Module num. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/core/num/dec2flt/common.v b/CoqOfRust/core/num/dec2flt/common.v index 21c996253..7bda476d6 100644 --- a/CoqOfRust/core/num/dec2flt/common.v +++ b/CoqOfRust/core/num/dec2flt/common.v @@ -80,6 +80,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 8) ] ] |) @@ -142,6 +144,8 @@ Module num. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 8) ] ] |) @@ -723,6 +727,8 @@ Module num. ltac:(M.monadic (Value.StructRecord "core::num::dec2flt::common::BiasedFp" + [] + [] [ ("f", M.call_closure (| @@ -780,6 +786,8 @@ Module num. (let e := M.alloc (| e |) in Value.StructRecord "core::num::dec2flt::common::BiasedFp" + [] + [] [ ("f", Value.Integer IntegerKind.U64 0); ("e", M.read (| e |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/num/dec2flt/decimal.v b/CoqOfRust/core/num/dec2flt/decimal.v index cd9261823..07ab2ceae 100644 --- a/CoqOfRust/core/num/dec2flt/decimal.v +++ b/CoqOfRust/core/num/dec2flt/decimal.v @@ -36,6 +36,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructRecord "core::num::dec2flt::decimal::Decimal" + [] + [] [ ("num_digits", M.call_closure (| @@ -182,6 +184,8 @@ Module num. ltac:(M.monadic (Value.StructRecord "core::num::dec2flt::decimal::Decimal" + [] + [] [ ("num_digits", Value.Integer IntegerKind.Usize 0); ("decimal_point", Value.Integer IntegerKind.I32 0); @@ -701,6 +705,8 @@ Module num. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| dp |)) @@ -3120,6 +3126,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -3206,6 +3214,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 8) @@ -3482,6 +3492,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -4222,6 +4234,8 @@ Module num. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -4541,6 +4555,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| pow5_a |)) ] ] |) diff --git a/CoqOfRust/core/num/dec2flt/lemire.v b/CoqOfRust/core/num/dec2flt/lemire.v index 8ba8372c6..b5ce15344 100644 --- a/CoqOfRust/core/num/dec2flt/lemire.v +++ b/CoqOfRust/core/num/dec2flt/lemire.v @@ -610,6 +610,8 @@ Module num. M.return_ (| Value.StructRecord "core::num::dec2flt::common::BiasedFp" + [] + [] [ ("f", M.read (| mantissa |)); ("e", M.read (| power2 |)) @@ -935,6 +937,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::dec2flt::common::BiasedFp" + [] + [] [ ("f", M.read (| mantissa |)); ("e", M.read (| power2 |)) ] |))) ] diff --git a/CoqOfRust/core/num/dec2flt/mod.v b/CoqOfRust/core/num/dec2flt/mod.v index a9b606410..9e374b66e 100644 --- a/CoqOfRust/core/num/dec2flt/mod.v +++ b/CoqOfRust/core/num/dec2flt/mod.v @@ -155,6 +155,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructRecord "core::num::dec2flt::ParseFloatError" + [] + [] [ ("kind", M.call_closure (| @@ -400,7 +402,7 @@ Module num. let _ := M.is_struct_tuple (| γ, "core::num::dec2flt::FloatErrorKind::Empty" |) in M.alloc (| - Value.StructTuple "core::num::dec2flt::FloatErrorKind::Empty" [] + Value.StructTuple "core::num::dec2flt::FloatErrorKind::Empty" [] [] [] |))); fun γ => ltac:(M.monadic @@ -408,7 +410,7 @@ Module num. let _ := M.is_struct_tuple (| γ, "core::num::dec2flt::FloatErrorKind::Invalid" |) in M.alloc (| - Value.StructTuple "core::num::dec2flt::FloatErrorKind::Invalid" [] + Value.StructTuple "core::num::dec2flt::FloatErrorKind::Invalid" [] [] [] |))) ] |) @@ -645,7 +647,9 @@ Module num. ltac:(M.monadic (Value.StructRecord "core::num::dec2flt::ParseFloatError" - [ ("kind", Value.StructTuple "core::num::dec2flt::FloatErrorKind::Empty" []) ])) + [] + [] + [ ("kind", Value.StructTuple "core::num::dec2flt::FloatErrorKind::Empty" [] [] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -665,7 +669,9 @@ Module num. ltac:(M.monadic (Value.StructRecord "core::num::dec2flt::ParseFloatError" - [ ("kind", Value.StructTuple "core::num::dec2flt::FloatErrorKind::Invalid" []) ])) + [] + [] + [ ("kind", Value.StructTuple "core::num::dec2flt::FloatErrorKind::Invalid" [] [] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -869,6 +875,8 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ F; Ty.path "core::num::dec2flt::ParseFloatError" ] [ M.call_closure (| Ty.path "core::num::dec2flt::ParseFloatError", @@ -957,6 +965,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1) ] ] |) @@ -999,6 +1009,8 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ F; Ty.path "core::num::dec2flt::ParseFloatError" ] [ M.call_closure (| Ty.path "core::num::dec2flt::ParseFloatError", @@ -1074,6 +1086,8 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ F; Ty.path "core::num::dec2flt::ParseFloatError" ] [ M.read (| value |) ] |) |) @@ -1088,6 +1102,8 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ F; Ty.path "core::num::dec2flt::ParseFloatError" ] [ M.call_closure (| Ty.path "core::num::dec2flt::ParseFloatError", @@ -1159,6 +1175,8 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ F; Ty.path "core::num::dec2flt::ParseFloatError" ] [ M.read (| value |) ] |) |) @@ -1393,7 +1411,13 @@ Module num. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| float |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ F; Ty.path "core::num::dec2flt::ParseFloatError" ] + [ M.read (| float |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/core/num/dec2flt/number.v b/CoqOfRust/core/num/dec2flt/number.v index f6628cf8f..d2dbe4aa6 100644 --- a/CoqOfRust/core/num/dec2flt/number.v +++ b/CoqOfRust/core/num/dec2flt/number.v @@ -226,6 +226,8 @@ Module num. ltac:(M.monadic (Value.StructRecord "core::num::dec2flt::number::Number" + [] + [] [ ("exponent", M.call_closure (| @@ -1016,6 +1018,8 @@ Module num. Value.StructTuple "core::option::Option::None" [] + [ F ] + [] |) |) |) @@ -1121,11 +1125,17 @@ Module num. ] |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| value |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ F ] + [ M.read (| value |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ F ] [] + |))) ] |) |))) diff --git a/CoqOfRust/core/num/dec2flt/parse.v b/CoqOfRust/core/num/dec2flt/parse.v index 8cef25220..5fe9f4cdf 100644 --- a/CoqOfRust/core/num/dec2flt/parse.v +++ b/CoqOfRust/core/num/dec2flt/parse.v @@ -366,6 +366,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 8) @@ -1057,6 +1059,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i64" ] [ UnOp.neg (| M.read (| exponent |) |) ] |))); fun γ => @@ -1064,6 +1068,8 @@ Module num. (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i64" ] [ M.read (| exponent |) ] |))) ] @@ -1077,7 +1083,9 @@ Module num. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| s |) |) |) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i64" ] [] + |))) ] |) |))) @@ -1525,7 +1533,19 @@ Module num. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.path "core::num::dec2flt::number::Number"; + Ty.path "usize" + ] + ] + [] + |) |) |) |))); @@ -1807,11 +1827,21 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.path "core::num::dec2flt::number::Number"; + Ty.path "usize" + ] + ] [ Value.Tuple [ Value.StructRecord "core::num::dec2flt::number::Number" + [] + [] [ ("exponent", M.read (| exponent |)); ("mantissa", M.read (| mantissa |)); @@ -2168,6 +2198,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer @@ -2279,11 +2311,15 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.tuple [ Ty.path "core::num::dec2flt::number::Number"; Ty.path "usize" ] ] [ Value.Tuple [ Value.StructRecord "core::num::dec2flt::number::Number" + [] + [] [ ("exponent", M.read (| exponent |)); ("mantissa", M.read (| mantissa |)); @@ -2407,6 +2443,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::num::dec2flt::number::Number" ] [ M.read (| float |) ] |) |) @@ -2418,7 +2456,13 @@ Module num. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::num::dec2flt::number::Number" ] + [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2662,7 +2706,11 @@ Module num. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ F ] + [] |) |) |) @@ -2746,7 +2794,7 @@ Module num. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ F ] [] |) |) |) @@ -2769,6 +2817,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ F ] [ M.call_closure (| F, @@ -2788,7 +2838,11 @@ Module num. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| float |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ F ] + [ M.read (| float |) ] |))) ] |) diff --git a/CoqOfRust/core/num/dec2flt/slow.v b/CoqOfRust/core/num/dec2flt/slow.v index a5f72e983..1a7028993 100644 --- a/CoqOfRust/core/num/dec2flt/slow.v +++ b/CoqOfRust/core/num/dec2flt/slow.v @@ -1232,6 +1232,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::dec2flt::common::BiasedFp" + [] + [] [ ("f", M.read (| mantissa |)); ("e", M.read (| power2 |)) ] |) |))) diff --git a/CoqOfRust/core/num/diy_float.v b/CoqOfRust/core/num/diy_float.v index 200486c57..d0ce969a5 100644 --- a/CoqOfRust/core/num/diy_float.v +++ b/CoqOfRust/core/num/diy_float.v @@ -389,6 +389,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::diy_float::Fp" + [] + [] [ ("f", M.read (| f |)); ("e", M.read (| e |)) ] |) |))) @@ -886,6 +888,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::diy_float::Fp" + [] + [] [ ("f", M.read (| f |)); ("e", M.read (| e |)) ] |) |))) @@ -1046,7 +1050,11 @@ Module num. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple + "core::panicking::AssertKind::Eq" + [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1076,7 +1084,11 @@ Module num. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -1091,6 +1103,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::diy_float::Fp" + [] + [] [ ("f", M.call_closure (| diff --git a/CoqOfRust/core/num/error.v b/CoqOfRust/core/num/error.v index 37a22c2a5..882dba6e0 100644 --- a/CoqOfRust/core/num/error.v +++ b/CoqOfRust/core/num/error.v @@ -431,6 +431,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", M.call_closure (| @@ -728,14 +730,16 @@ Module num. ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::num::error::IntErrorKind::Empty" |) in - M.alloc (| Value.StructTuple "core::num::error::IntErrorKind::Empty" [] |))); + M.alloc (| + Value.StructTuple "core::num::error::IntErrorKind::Empty" [] [] [] + |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::num::error::IntErrorKind::InvalidDigit" |) in M.alloc (| - Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" [] + Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" [] [] [] |))); fun γ => ltac:(M.monadic @@ -743,7 +747,7 @@ Module num. let _ := M.is_struct_tuple (| γ, "core::num::error::IntErrorKind::PosOverflow" |) in M.alloc (| - Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" [] + Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" [] [] [] |))); fun γ => ltac:(M.monadic @@ -751,13 +755,15 @@ Module num. let _ := M.is_struct_tuple (| γ, "core::num::error::IntErrorKind::NegOverflow" |) in M.alloc (| - Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" [] + Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" [] [] [] |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::num::error::IntErrorKind::Zero" |) in - M.alloc (| Value.StructTuple "core::num::error::IntErrorKind::Zero" [] |))) + M.alloc (| + Value.StructTuple "core::num::error::IntErrorKind::Zero" [] [] [] + |))) ] |) |))) diff --git a/CoqOfRust/core/num/f128.v b/CoqOfRust/core/num/f128.v index 483378823..26f85e5c6 100644 --- a/CoqOfRust/core/num/f128.v +++ b/CoqOfRust/core/num/f128.v @@ -664,7 +664,7 @@ Module f128. M.read (| γ0_1 |), Value.Integer IntegerKind.U128 170135991163610696904058773219554885632 |) in - M.alloc (| Value.StructTuple "core::num::FpCategory::Infinite" [] |))); + M.alloc (| Value.StructTuple "core::num::FpCategory::Infinite" [] [] [] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -674,7 +674,7 @@ Module f128. M.read (| γ0_1 |), Value.Integer IntegerKind.U128 170135991163610696904058773219554885632 |) in - M.alloc (| Value.StructTuple "core::num::FpCategory::Nan" [] |))); + M.alloc (| Value.StructTuple "core::num::FpCategory::Nan" [] [] [] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -689,7 +689,7 @@ Module f128. M.read (| γ0_1 |), Value.Integer IntegerKind.U128 0 |) in - M.alloc (| Value.StructTuple "core::num::FpCategory::Zero" [] |))); + M.alloc (| Value.StructTuple "core::num::FpCategory::Zero" [] [] [] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -699,10 +699,10 @@ Module f128. M.read (| γ0_1 |), Value.Integer IntegerKind.U128 0 |) in - M.alloc (| Value.StructTuple "core::num::FpCategory::Subnormal" [] |))); + M.alloc (| Value.StructTuple "core::num::FpCategory::Subnormal" [] [] [] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::num::FpCategory::Normal" [] |))) + (M.alloc (| Value.StructTuple "core::num::FpCategory::Normal" [] [] [] |))) ] |) |))) diff --git a/CoqOfRust/core/num/f16.v b/CoqOfRust/core/num/f16.v index 92918550b..2e0c28362 100644 --- a/CoqOfRust/core/num/f16.v +++ b/CoqOfRust/core/num/f16.v @@ -659,7 +659,7 @@ Module f16. M.read (| γ0_1 |), Value.Integer IntegerKind.U16 31744 |) in - M.alloc (| Value.StructTuple "core::num::FpCategory::Infinite" [] |))); + M.alloc (| Value.StructTuple "core::num::FpCategory::Infinite" [] [] [] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -669,7 +669,7 @@ Module f16. M.read (| γ0_1 |), Value.Integer IntegerKind.U16 31744 |) in - M.alloc (| Value.StructTuple "core::num::FpCategory::Nan" [] |))); + M.alloc (| Value.StructTuple "core::num::FpCategory::Nan" [] [] [] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -684,7 +684,7 @@ Module f16. M.read (| γ0_1 |), Value.Integer IntegerKind.U16 0 |) in - M.alloc (| Value.StructTuple "core::num::FpCategory::Zero" [] |))); + M.alloc (| Value.StructTuple "core::num::FpCategory::Zero" [] [] [] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -694,10 +694,10 @@ Module f16. M.read (| γ0_1 |), Value.Integer IntegerKind.U16 0 |) in - M.alloc (| Value.StructTuple "core::num::FpCategory::Subnormal" [] |))); + M.alloc (| Value.StructTuple "core::num::FpCategory::Subnormal" [] [] [] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::num::FpCategory::Normal" [] |))) + (M.alloc (| Value.StructTuple "core::num::FpCategory::Normal" [] [] [] |))) ] |) |))) diff --git a/CoqOfRust/core/num/f32.v b/CoqOfRust/core/num/f32.v index b66b1ae4c..d82fa33aa 100644 --- a/CoqOfRust/core/num/f32.v +++ b/CoqOfRust/core/num/f32.v @@ -776,7 +776,7 @@ Module f32. M.read (| γ0_1 |), Value.Integer IntegerKind.U32 2139095040 |) in - M.alloc (| Value.StructTuple "core::num::FpCategory::Infinite" [] |))); + M.alloc (| Value.StructTuple "core::num::FpCategory::Infinite" [] [] [] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -786,7 +786,7 @@ Module f32. M.read (| γ0_1 |), Value.Integer IntegerKind.U32 2139095040 |) in - M.alloc (| Value.StructTuple "core::num::FpCategory::Nan" [] |))); + M.alloc (| Value.StructTuple "core::num::FpCategory::Nan" [] [] [] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -801,7 +801,7 @@ Module f32. M.read (| γ0_1 |), Value.Integer IntegerKind.U32 0 |) in - M.alloc (| Value.StructTuple "core::num::FpCategory::Zero" [] |))); + M.alloc (| Value.StructTuple "core::num::FpCategory::Zero" [] [] [] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -811,10 +811,10 @@ Module f32. M.read (| γ0_1 |), Value.Integer IntegerKind.U32 0 |) in - M.alloc (| Value.StructTuple "core::num::FpCategory::Subnormal" [] |))); + M.alloc (| Value.StructTuple "core::num::FpCategory::Subnormal" [] [] [] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::num::FpCategory::Normal" [] |))) + (M.alloc (| Value.StructTuple "core::num::FpCategory::Normal" [] [] [] |))) ] |) |))) diff --git a/CoqOfRust/core/num/f64.v b/CoqOfRust/core/num/f64.v index 40fe60cc4..398c6dd41 100644 --- a/CoqOfRust/core/num/f64.v +++ b/CoqOfRust/core/num/f64.v @@ -776,7 +776,7 @@ Module f64. M.read (| γ0_1 |), Value.Integer IntegerKind.U64 9218868437227405312 |) in - M.alloc (| Value.StructTuple "core::num::FpCategory::Infinite" [] |))); + M.alloc (| Value.StructTuple "core::num::FpCategory::Infinite" [] [] [] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -786,7 +786,7 @@ Module f64. M.read (| γ0_1 |), Value.Integer IntegerKind.U64 9218868437227405312 |) in - M.alloc (| Value.StructTuple "core::num::FpCategory::Nan" [] |))); + M.alloc (| Value.StructTuple "core::num::FpCategory::Nan" [] [] [] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -801,7 +801,7 @@ Module f64. M.read (| γ0_1 |), Value.Integer IntegerKind.U64 0 |) in - M.alloc (| Value.StructTuple "core::num::FpCategory::Zero" [] |))); + M.alloc (| Value.StructTuple "core::num::FpCategory::Zero" [] [] [] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -811,10 +811,10 @@ Module f64. M.read (| γ0_1 |), Value.Integer IntegerKind.U64 0 |) in - M.alloc (| Value.StructTuple "core::num::FpCategory::Subnormal" [] |))); + M.alloc (| Value.StructTuple "core::num::FpCategory::Subnormal" [] [] [] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::num::FpCategory::Normal" [] |))) + (M.alloc (| Value.StructTuple "core::num::FpCategory::Normal" [] [] [] |))) ] |) |))) diff --git a/CoqOfRust/core/num/flt2dec/decoder.v b/CoqOfRust/core/num/flt2dec/decoder.v index 301dfad46..76bf6bae2 100644 --- a/CoqOfRust/core/num/flt2dec/decoder.v +++ b/CoqOfRust/core/num/flt2dec/decoder.v @@ -967,6 +967,8 @@ Module num. Value.StructTuple "core::num::flt2dec::decoder::FullDecoded::Nan" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -976,6 +978,8 @@ Module num. Value.StructTuple "core::num::flt2dec::decoder::FullDecoded::Infinite" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -985,6 +989,8 @@ Module num. Value.StructTuple "core::num::flt2dec::decoder::FullDecoded::Zero" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -993,9 +999,13 @@ Module num. M.alloc (| Value.StructTuple "core::num::flt2dec::decoder::FullDecoded::Finite" + [] + [] [ Value.StructRecord "core::num::flt2dec::decoder::Decoded" + [] + [] [ ("mant", M.read (| mant |)); ("minus", Value.Integer IntegerKind.U64 1); @@ -1075,9 +1085,13 @@ Module num. M.alloc (| Value.StructTuple "core::num::flt2dec::decoder::FullDecoded::Finite" + [] + [] [ Value.StructRecord "core::num::flt2dec::decoder::Decoded" + [] + [] [ ("mant", M.call_closure (| @@ -1108,9 +1122,13 @@ Module num. (M.alloc (| Value.StructTuple "core::num::flt2dec::decoder::FullDecoded::Finite" + [] + [] [ Value.StructRecord "core::num::flt2dec::decoder::Decoded" + [] + [] [ ("mant", M.call_closure (| diff --git a/CoqOfRust/core/num/flt2dec/mod.v b/CoqOfRust/core/num/flt2dec/mod.v index 06792d5f3..a0a0ccf7b 100644 --- a/CoqOfRust/core/num/flt2dec/mod.v +++ b/CoqOfRust/core/num/flt2dec/mod.v @@ -158,6 +158,8 @@ Module num. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -260,7 +262,9 @@ Module num. |))) ] |)) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u8" ] [] + |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in @@ -314,6 +318,8 @@ Module num. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1); ("end_", @@ -414,6 +420,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ M.read (| UnsupportedLiteral |) ] |))); fun γ => @@ -422,6 +430,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ M.read (| UnsupportedLiteral |) ] |))) ] @@ -702,6 +712,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -738,6 +750,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Zero" + [] + [] [ M.read (| minus_exp |) ] ] |) @@ -767,6 +781,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| buf |) |) |) ] ] |) @@ -870,6 +886,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Zero" + [] + [] [ M.call_closure (| Ty.path "usize", @@ -984,6 +1002,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 4) ] ] |) @@ -1074,6 +1094,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 3) ] ] |) @@ -1158,6 +1180,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -1199,6 +1223,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| exp |)) ] ] |) @@ -1235,6 +1261,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -1271,6 +1299,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -1312,6 +1342,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| exp |)) ] ] |) @@ -1408,6 +1440,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Zero" + [] + [] [ M.call_closure (| Ty.path "usize", @@ -1522,6 +1556,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 4) @@ -1615,6 +1651,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 3) @@ -1658,6 +1696,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -1692,6 +1732,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Zero" + [] + [] [ M.call_closure (| Ty.path "usize", @@ -1780,6 +1822,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -1816,6 +1860,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Zero" + [] + [] [ M.read (| frac_digits |) ] ] |) @@ -1897,6 +1943,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 4) @@ -1990,6 +2038,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 2) @@ -2230,6 +2280,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -2263,6 +2315,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 1) ] ] |) @@ -2353,6 +2407,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -2393,6 +2449,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -2426,6 +2484,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1) ] ] |) @@ -2508,6 +2568,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Zero" + [] + [] [ M.call_closure (| Ty.path "usize", @@ -2604,6 +2666,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ M.read (| M.match_operator (| @@ -2680,6 +2744,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Num" + [] + [] [ M.cast (Ty.path "u16") (UnOp.neg (| M.read (| exp |) |)) ] ] |) @@ -2712,6 +2778,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ M.read (| M.match_operator (| @@ -2788,6 +2856,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Num" + [] + [] [ M.cast (Ty.path "u16") (M.read (| exp |)) ] ] |) @@ -2862,6 +2932,8 @@ Module num. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| parts |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -3437,6 +3509,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -3452,6 +3526,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -3534,6 +3610,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 1) @@ -3581,6 +3659,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -3596,6 +3676,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -3678,6 +3760,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 1) @@ -3748,6 +3832,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -3784,6 +3870,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Zero" + [] + [] [ M.read (| frac_digits |) ] ] |) @@ -3792,6 +3880,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -3882,6 +3972,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer @@ -3926,6 +4018,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -3941,6 +4035,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -4031,6 +4127,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer @@ -4129,6 +4227,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -4469,6 +4569,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -4484,6 +4586,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -4566,6 +4670,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 1) @@ -4613,6 +4719,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -4628,6 +4736,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -4710,6 +4820,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 1) @@ -4811,6 +4923,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -4844,6 +4958,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ M.read (| M.match_operator (| @@ -4912,6 +5028,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -4994,6 +5112,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 1) @@ -5247,6 +5367,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -5570,6 +5692,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -5585,6 +5709,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -5667,6 +5793,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 1) @@ -5714,6 +5842,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -5729,6 +5859,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -5811,6 +5943,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 1) @@ -5881,6 +6015,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -5917,6 +6053,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Zero" + [] + [] [ M.call_closure (| Ty.path "usize", @@ -5955,6 +6093,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ M.read (| M.match_operator (| @@ -6015,6 +6155,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -6105,6 +6247,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer @@ -6149,6 +6293,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ M.read (| M.match_operator (| @@ -6209,6 +6355,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -6299,6 +6447,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer @@ -6578,6 +6728,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| trunc |)) ] ] |) @@ -6606,6 +6758,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -6883,6 +7037,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -6898,6 +7054,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -6980,6 +7138,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 1) @@ -7027,6 +7187,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -7042,6 +7204,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -7124,6 +7288,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 1) @@ -7194,6 +7360,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -7230,6 +7398,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Zero" + [] + [] [ M.read (| frac_digits |) ] ] |) @@ -7238,6 +7408,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -7328,6 +7500,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer @@ -7372,6 +7546,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -7387,6 +7563,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -7477,6 +7655,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer @@ -7731,6 +7911,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| maxlen |)) ] ] |) @@ -7903,6 +8085,8 @@ Module num. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -7950,6 +8134,11 @@ Module num. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -8023,6 +8212,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -8066,6 +8257,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Zero" + [] + [] [ M.read (| frac_digits |) ] ] |) @@ -8074,6 +8267,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -8178,6 +8373,9 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" + ] [ ("end_", Value.Integer @@ -8225,6 +8423,8 @@ Module num. [ Value.StructTuple "core::num::fmt::Part::Copy" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -8244,6 +8444,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -8348,6 +8550,9 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" + ] [ ("end_", Value.Integer @@ -8373,6 +8578,8 @@ Module num. (M.alloc (| Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| diff --git a/CoqOfRust/core/num/flt2dec/strategy/dragon.v b/CoqOfRust/core/num/flt2dec/strategy/dragon.v index 9ef4ce86d..08eeb9fb4 100644 --- a/CoqOfRust/core/num/flt2dec/strategy/dragon.v +++ b/CoqOfRust/core/num/flt2dec/strategy/dragon.v @@ -2156,10 +2156,12 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::cmp::Ordering::Greater" [] |))); + M.alloc (| + Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] |))) + (M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] |))) ] |) |) in @@ -3464,6 +3466,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| i |)) ] ] |) @@ -3614,6 +3618,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| i |)) ] ] |) @@ -4793,6 +4799,8 @@ Module num. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| len |)) @@ -5018,6 +5026,11 @@ Module num. |); Value.StructRecord "core::ops::range::Range" + [] + [ + Ty.path + "usize" + ] [ ("start", M.read (| @@ -5315,6 +5328,11 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ + Ty.path + "usize" + ] [ ("end_", M.read (| @@ -6169,7 +6187,11 @@ Module num. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.StructTuple "core::cmp::Ordering::Greater" [] + Value.StructTuple + "core::cmp::Ordering::Greater" + [] + [] + [] |) |) ] @@ -6196,6 +6218,8 @@ Module num. Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] |) |) ] @@ -6359,6 +6383,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| len |)) ] ] @@ -6573,6 +6599,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| len |)) ] ] |) diff --git a/CoqOfRust/core/num/flt2dec/strategy/grisu.v b/CoqOfRust/core/num/flt2dec/strategy/grisu.v index 14e92e45a..ad0c2b673 100644 --- a/CoqOfRust/core/num/flt2dec/strategy/grisu.v +++ b/CoqOfRust/core/num/flt2dec/strategy/grisu.v @@ -781,6 +781,8 @@ Module num. M.read (| k |); Value.StructRecord "core::num::diy_float::Fp" + [] + [] [ ("f", M.read (| f |)); ("e", M.read (| e |)) ] ] |))) @@ -2158,6 +2160,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::diy_float::Fp" + [] + [] [ ("f", M.call_closure (| @@ -2211,6 +2215,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::diy_float::Fp" + [] + [] [ ("f", M.call_closure (| @@ -2270,6 +2276,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::diy_float::Fp" + [] + [] [ ("f", M.read (| @@ -2536,6 +2544,8 @@ Module num. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -2573,6 +2583,11 @@ Module num. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -2684,6 +2699,8 @@ Module num. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -2721,6 +2738,11 @@ Module num. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -3227,6 +3249,11 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ + Ty.path + "usize" + ] [ ("end_", M.read (| @@ -3438,6 +3465,8 @@ Module num. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -3486,6 +3515,11 @@ Module num. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -3949,6 +3983,11 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ + Ty.path + "usize" + ] [ ("end_", M.read (| @@ -4541,7 +4580,21 @@ Module num. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] + ]; + Ty.path "i16" + ] + ] + [] |) |) |) @@ -4618,6 +4671,17 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.path "i16" + ] + ] [ Value.Tuple [ @@ -4631,7 +4695,22 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.path "i16" + ] + ] + [] + |))) ] |) |))) @@ -5258,6 +5337,8 @@ Module num. M.alloc (| Value.StructRecord "core::num::diy_float::Fp" + [] + [] [ ("f", M.read (| @@ -5537,7 +5618,25 @@ Module num. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ Ty.path "u8" ] + ]; + Ty.path "i16" + ] + ] + [] |) |) |) @@ -6284,6 +6383,8 @@ Module num. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -6332,6 +6433,11 @@ Module num. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -6493,6 +6599,8 @@ Module num. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -6541,6 +6649,11 @@ Module num. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -6982,7 +7095,21 @@ Module num. |))) |) in M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] + ]; + Ty.path "i16" + ] + ] + [] |))) ] |))) @@ -7254,7 +7381,21 @@ Module num. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] + ]; + Ty.path "i16" + ] + ] + [] |) |) |) @@ -7294,7 +7435,21 @@ Module num. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] + ]; + Ty.path "i16" + ] + ] + [] |) |) |) @@ -7366,6 +7521,18 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] + ]; + Ty.path "i16" + ] + ] [ Value.Tuple [ @@ -7446,6 +7613,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| len |)) ] ] |) @@ -7627,6 +7796,9 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" + ] [ ("end_", M.read (| @@ -7792,6 +7964,18 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] + ]; + Ty.path "i16" + ] + ] [ Value.Tuple [ @@ -7872,6 +8056,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| len |)) ] ] |) @@ -7893,7 +8079,22 @@ Module num. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.path "i16" + ] + ] + [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/core/num/fmt.v b/CoqOfRust/core/num/fmt.v index 87b6ea8bf..82edf3351 100644 --- a/CoqOfRust/core/num/fmt.v +++ b/CoqOfRust/core/num/fmt.v @@ -823,6 +823,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| nzeroes |)) ] ] |) @@ -1027,6 +1029,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| len |)) ] ] |) @@ -1213,6 +1217,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -1249,11 +1255,17 @@ Module num. ] |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| len |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| len |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))) ] |) |))) @@ -1292,6 +1304,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructRecord "core::num::fmt::Formatted" + [] + [] [ ("sign", M.borrow (| @@ -1637,7 +1651,13 @@ Module num. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] + |) |) |) |))); @@ -1684,6 +1704,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -1949,6 +1971,8 @@ Module num. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| written |)) @@ -2044,7 +2068,11 @@ Module num. ] |)) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| written |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| written |) ] |) |))) |))) diff --git a/CoqOfRust/core/num/links/nonzero.v b/CoqOfRust/core/num/links/nonzero.v index 448d7d8ef..0ea176c25 100644 --- a/CoqOfRust/core/num/links/nonzero.v +++ b/CoqOfRust/core/num/links/nonzero.v @@ -12,7 +12,7 @@ Module NonZero. Global Instance IsLink {T : Set} `{Link T} : Link (t T) := { Φ := Ty.path "core::num::NonZero"; φ x := - Value.StructTuple "core::num::NonZero" [ + Value.StructTuple "core::num::NonZero" [] [Φ T] [ φ x.(value) ]; }. diff --git a/CoqOfRust/core/num/mod.v b/CoqOfRust/core/num/mod.v index aa3a4166b..db3a76476 100644 --- a/CoqOfRust/core/num/mod.v +++ b/CoqOfRust/core/num/mod.v @@ -464,11 +464,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i8" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i8" ] + [ M.read (| a |) ] |))) ] |))) @@ -670,11 +676,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i8" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i8" ] + [ M.read (| a |) ] |))) ] |))) @@ -802,11 +814,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i8" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i8" ] + [ M.read (| a |) ] |))) ] |))) @@ -1008,11 +1026,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i8" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i8" ] + [ M.read (| a |) ] |))) ] |))) @@ -1140,11 +1164,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i8" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i8" ] + [ M.read (| a |) ] |))) ] |))) @@ -1361,12 +1391,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i8" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -1521,12 +1555,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i8" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -1674,12 +1712,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i8" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -1834,12 +1876,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i8" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -1971,11 +2017,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i8" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i8" ] + [ M.read (| a |) ] |))) ] |))) @@ -2167,6 +2219,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -2176,7 +2230,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i8" ] [] + |))) ] |) |))) @@ -2429,6 +2486,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -2438,7 +2497,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i8" ] [] + |))) ] |) |))) @@ -2714,7 +2776,11 @@ Module num. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i8" ] + [ M.read (| self |) ] |))) ] |) @@ -2831,6 +2897,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i8" ] [ Value.Integer IntegerKind.I8 1 ] |) |) @@ -2924,6 +2992,8 @@ Module num. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "i8" ] + [] |) |) |) @@ -2962,6 +3032,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i8" ] [ M.read (| acc |) ] |) |) @@ -3029,7 +3101,11 @@ Module num. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i8" ] + [] |) |) |) @@ -3301,7 +3377,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i8" ] [] + |))); fun γ => ltac:(M.monadic (let~ result : Ty.apply (Ty.path "*") [] [ Ty.path "i8" ] := @@ -3354,7 +3432,11 @@ Module num. |) in M.alloc (| Value.Tuple [] |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| result |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i8" ] + [ M.read (| result |) ] |))) ] |) @@ -6774,6 +6856,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i8" ] [ M.read (| self |) ] |) |) @@ -6810,7 +6894,13 @@ Module num. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i8" ] + [] + |) |) |) |))) @@ -6891,7 +6981,11 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i8" ] + [ M.read (| self |) ] |))); fun γ => ltac:(M.monadic @@ -7213,7 +7307,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -7273,7 +7369,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (let~ log : Ty.apply (Ty.path "*") [] [ Ty.path "u32" ] := @@ -7310,7 +7408,11 @@ Module num. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| log |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| log |) ] |))) ] |) @@ -7360,6 +7462,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -7369,7 +7473,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -8033,13 +8140,19 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "i8"; Ty.path "core::num::error::ParseIntError" ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Empty" + [] + [] []) ] ] @@ -8135,13 +8248,22 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i8"; + Ty.path "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -8337,13 +8459,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i8"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -8512,13 +8644,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i8"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -8719,13 +8861,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i8"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -8777,13 +8929,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i8"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -8854,13 +9016,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i8"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -9027,13 +9199,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i8"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -9085,13 +9267,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i8"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -9162,13 +9354,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i8"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -9224,7 +9426,11 @@ Module num. ] |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| result |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "i8"; Ty.path "core::num::error::ParseIntError" ] + [ M.read (| result |) ] |))) ] |) @@ -9701,11 +9907,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i16" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i16" ] + [ M.read (| a |) ] |))) ] |))) @@ -9907,11 +10119,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i16" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i16" ] + [ M.read (| a |) ] |))) ] |))) @@ -10039,11 +10257,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i16" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i16" ] + [ M.read (| a |) ] |))) ] |))) @@ -10245,11 +10469,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i16" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i16" ] + [ M.read (| a |) ] |))) ] |))) @@ -10377,11 +10607,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i16" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i16" ] + [ M.read (| a |) ] |))) ] |))) @@ -10598,12 +10834,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i16" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -10758,12 +10998,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i16" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -10911,12 +11155,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i16" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -11071,12 +11319,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i16" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -11208,11 +11460,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i16" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i16" ] + [ M.read (| a |) ] |))) ] |))) @@ -11404,6 +11662,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -11413,7 +11673,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i16" ] [] + |))) ] |) |))) @@ -11666,6 +11929,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -11675,7 +11940,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i16" ] [] + |))) ] |) |))) @@ -11951,7 +12219,11 @@ Module num. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i16" ] + [ M.read (| self |) ] |))) ] |) @@ -12068,6 +12340,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i16" ] [ Value.Integer IntegerKind.I16 1 ] |) |) @@ -12161,6 +12435,8 @@ Module num. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "i16" ] + [] |) |) |) @@ -12199,6 +12475,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i16" ] [ M.read (| acc |) ] |) |) @@ -12266,7 +12544,11 @@ Module num. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i16" ] + [] |) |) |) @@ -12538,7 +12820,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i16" ] [] + |))); fun γ => ltac:(M.monadic (let~ result : Ty.apply (Ty.path "*") [] [ Ty.path "i16" ] := @@ -12591,7 +12875,11 @@ Module num. |) in M.alloc (| Value.Tuple [] |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| result |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i16" ] + [ M.read (| result |) ] |))) ] |) @@ -16016,6 +16304,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i16" ] [ M.read (| self |) ] |) |) @@ -16052,7 +16342,13 @@ Module num. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i16" ] + [] + |) |) |) |))) @@ -16133,7 +16429,11 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i16" ] + [ M.read (| self |) ] |))); fun γ => ltac:(M.monadic @@ -16455,7 +16755,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -16515,7 +16817,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (let~ log : Ty.apply (Ty.path "*") [] [ Ty.path "u32" ] := @@ -16552,7 +16856,11 @@ Module num. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| log |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| log |) ] |))) ] |) @@ -16602,6 +16910,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -16611,7 +16921,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -17275,13 +17588,19 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "i16"; Ty.path "core::num::error::ParseIntError" ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Empty" + [] + [] []) ] ] @@ -17379,13 +17698,22 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i16"; + Ty.path "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -17581,13 +17909,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i16"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -17756,13 +18094,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i16"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -17963,13 +18311,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i16"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -18021,13 +18379,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i16"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -18098,13 +18466,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i16"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -18271,13 +18649,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i16"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -18329,13 +18717,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i16"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -18406,13 +18804,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i16"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -18468,7 +18876,11 @@ Module num. ] |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| result |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "i16"; Ty.path "core::num::error::ParseIntError" ] + [ M.read (| result |) ] |))) ] |) @@ -18945,11 +19357,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i32" ] + [ M.read (| a |) ] |))) ] |))) @@ -19151,11 +19569,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i32" ] + [ M.read (| a |) ] |))) ] |))) @@ -19283,11 +19707,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i32" ] + [ M.read (| a |) ] |))) ] |))) @@ -19489,11 +19919,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i32" ] + [ M.read (| a |) ] |))) ] |))) @@ -19621,11 +20057,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i32" ] + [ M.read (| a |) ] |))) ] |))) @@ -19842,12 +20284,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -20002,12 +20448,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -20155,12 +20605,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -20315,12 +20769,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -20452,11 +20910,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i32" ] + [ M.read (| a |) ] |))) ] |))) @@ -20648,6 +21112,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -20657,7 +21123,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] + |))) ] |) |))) @@ -20910,6 +21379,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -20919,7 +21390,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] + |))) ] |) |))) @@ -21195,7 +21669,11 @@ Module num. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i32" ] + [ M.read (| self |) ] |))) ] |) @@ -21312,6 +21790,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i32" ] [ Value.Integer IntegerKind.I32 1 ] |) |) @@ -21405,6 +21885,8 @@ Module num. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "i32" ] + [] |) |) |) @@ -21443,6 +21925,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i32" ] [ M.read (| acc |) ] |) |) @@ -21510,7 +21994,11 @@ Module num. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i32" ] + [] |) |) |) @@ -21782,7 +22270,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] + |))); fun γ => ltac:(M.monadic (let~ result : Ty.apply (Ty.path "*") [] [ Ty.path "i32" ] := @@ -21835,7 +22325,11 @@ Module num. |) in M.alloc (| Value.Tuple [] |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| result |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i32" ] + [ M.read (| result |) ] |))) ] |) @@ -25260,6 +25754,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i32" ] [ M.read (| self |) ] |) |) @@ -25296,7 +25792,13 @@ Module num. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i32" ] + [] + |) |) |) |))) @@ -25377,7 +25879,11 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i32" ] + [ M.read (| self |) ] |))); fun γ => ltac:(M.monadic @@ -25699,7 +26205,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -25759,7 +26267,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (let~ log : Ty.apply (Ty.path "*") [] [ Ty.path "u32" ] := @@ -25796,7 +26306,11 @@ Module num. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| log |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| log |) ] |))) ] |) @@ -25846,6 +26360,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -25855,7 +26371,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -26519,13 +27038,19 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Empty" + [] + [] []) ] ] @@ -26623,13 +27148,22 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i32"; + Ty.path "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -26825,13 +27359,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i32"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -27000,13 +27544,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i32"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -27207,13 +27761,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i32"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -27265,13 +27829,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i32"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -27342,13 +27916,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i32"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -27515,13 +28099,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i32"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -27573,13 +28167,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i32"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -27650,13 +28254,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i32"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -27712,7 +28326,11 @@ Module num. ] |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| result |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ] + [ M.read (| result |) ] |))) ] |) @@ -28189,11 +28807,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i64" ] + [ M.read (| a |) ] |))) ] |))) @@ -28395,11 +29019,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i64" ] + [ M.read (| a |) ] |))) ] |))) @@ -28527,11 +29157,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i64" ] + [ M.read (| a |) ] |))) ] |))) @@ -28733,11 +29369,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i64" ] + [ M.read (| a |) ] |))) ] |))) @@ -28865,11 +29507,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i64" ] + [ M.read (| a |) ] |))) ] |))) @@ -29086,12 +29734,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -29246,12 +29898,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -29399,12 +30055,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -29559,12 +30219,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -29696,11 +30360,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i64" ] + [ M.read (| a |) ] |))) ] |))) @@ -29892,6 +30562,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -29901,7 +30573,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i64" ] [] + |))) ] |) |))) @@ -30154,6 +30829,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -30163,7 +30840,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i64" ] [] + |))) ] |) |))) @@ -30439,7 +31119,11 @@ Module num. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i64" ] + [ M.read (| self |) ] |))) ] |) @@ -30556,6 +31240,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i64" ] [ Value.Integer IntegerKind.I64 1 ] |) |) @@ -30649,6 +31335,8 @@ Module num. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "i64" ] + [] |) |) |) @@ -30687,6 +31375,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i64" ] [ M.read (| acc |) ] |) |) @@ -30754,7 +31444,11 @@ Module num. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i64" ] + [] |) |) |) @@ -31026,7 +31720,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i64" ] [] + |))); fun γ => ltac:(M.monadic (let~ result : Ty.apply (Ty.path "*") [] [ Ty.path "i64" ] := @@ -31079,7 +31775,11 @@ Module num. |) in M.alloc (| Value.Tuple [] |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| result |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i64" ] + [ M.read (| result |) ] |))) ] |) @@ -34504,6 +35204,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i64" ] [ M.read (| self |) ] |) |) @@ -34540,7 +35242,13 @@ Module num. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i64" ] + [] + |) |) |) |))) @@ -34621,7 +35329,11 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i64" ] + [ M.read (| self |) ] |))); fun γ => ltac:(M.monadic @@ -34943,7 +35655,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -35003,7 +35717,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (let~ log : Ty.apply (Ty.path "*") [] [ Ty.path "u32" ] := @@ -35040,7 +35756,11 @@ Module num. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| log |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| log |) ] |))) ] |) @@ -35090,6 +35810,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -35099,7 +35821,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -35826,13 +36551,19 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "i64"; Ty.path "core::num::error::ParseIntError" ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Empty" + [] + [] []) ] ] @@ -35930,13 +36661,22 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i64"; + Ty.path "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -36132,13 +36872,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i64"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -36307,13 +37057,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i64"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -36514,13 +37274,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i64"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -36572,13 +37342,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i64"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -36649,13 +37429,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i64"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -36822,13 +37612,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i64"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -36880,13 +37680,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i64"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -36957,13 +37767,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i64"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -37019,7 +37839,11 @@ Module num. ] |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| result |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "i64"; Ty.path "core::num::error::ParseIntError" ] + [ M.read (| result |) ] |))) ] |) @@ -37496,11 +38320,21 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i128" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i128" ] + [ M.read (| a |) ] |))) ] |))) @@ -37707,11 +38541,21 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i128" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i128" ] + [ M.read (| a |) ] |))) ] |))) @@ -37844,11 +38688,21 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i128" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i128" ] + [ M.read (| a |) ] |))) ] |))) @@ -38055,11 +38909,21 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i128" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i128" ] + [ M.read (| a |) ] |))) ] |))) @@ -38192,11 +39056,21 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i128" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i128" ] + [ M.read (| a |) ] |))) ] |))) @@ -38413,12 +39287,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i128" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -38573,12 +39451,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i128" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -38726,12 +39608,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i128" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -38886,12 +39772,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i128" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -39023,11 +39913,21 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i128" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i128" ] + [ M.read (| a |) ] |))) ] |))) @@ -39219,6 +40119,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -39228,7 +40130,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i128" ] [] + |))) ] |) |))) @@ -39481,6 +40386,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -39490,7 +40397,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i128" ] [] + |))) ] |) |))) @@ -39766,7 +40676,11 @@ Module num. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i128" ] + [ M.read (| self |) ] |))) ] |) @@ -39883,6 +40797,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i128" ] [ Value.Integer IntegerKind.I128 1 ] |) |) @@ -39976,6 +40892,8 @@ Module num. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "i128" ] + [] |) |) |) @@ -40014,6 +40932,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i128" ] [ M.read (| acc |) ] |) |) @@ -40081,7 +41001,11 @@ Module num. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i128" ] + [] |) |) |) @@ -40353,7 +41277,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i128" ] [] + |))); fun γ => ltac:(M.monadic (let~ result : Ty.apply (Ty.path "*") [] [ Ty.path "i128" ] := @@ -40406,7 +41332,11 @@ Module num. |) in M.alloc (| Value.Tuple [] |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| result |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i128" ] + [ M.read (| result |) ] |))) ] |) @@ -43843,6 +44773,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i128" ] [ M.read (| self |) ] |) |) @@ -43879,7 +44811,13 @@ Module num. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i128" ] + [] + |) |) |) |))) @@ -43960,7 +44898,11 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i128" ] + [ M.read (| self |) ] |))); fun γ => ltac:(M.monadic @@ -44282,7 +45224,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -44342,7 +45286,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (let~ log : Ty.apply (Ty.path "*") [] [ Ty.path "u32" ] := @@ -44383,7 +45329,11 @@ Module num. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| log |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| log |) ] |))) ] |) @@ -44433,6 +45383,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -44442,7 +45394,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -45169,13 +46124,19 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "i128"; Ty.path "core::num::error::ParseIntError" ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Empty" + [] + [] []) ] ] @@ -45273,13 +46234,22 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i128"; + Ty.path "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -45475,13 +46445,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i128"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -45650,13 +46630,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i128"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -45857,13 +46847,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i128"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -45915,13 +46915,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i128"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -45992,13 +47002,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i128"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -46165,13 +47185,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i128"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -46223,13 +47253,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i128"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -46300,13 +47340,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i128"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -46362,7 +47412,11 @@ Module num. ] |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| result |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "i128"; Ty.path "core::num::error::ParseIntError" ] + [ M.read (| result |) ] |))) ] |) @@ -46839,11 +47893,21 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "isize" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "isize" ] + [ M.read (| a |) ] |))) ] |))) @@ -47050,11 +48114,21 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "isize" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "isize" ] + [ M.read (| a |) ] |))) ] |))) @@ -47187,11 +48261,21 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "isize" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "isize" ] + [ M.read (| a |) ] |))) ] |))) @@ -47398,11 +48482,21 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "isize" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "isize" ] + [ M.read (| a |) ] |))) ] |))) @@ -47535,11 +48629,21 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "isize" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "isize" ] + [ M.read (| a |) ] |))) ] |))) @@ -47756,12 +48860,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "isize" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -47916,12 +49024,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "isize" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -48069,12 +49181,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "isize" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -48229,12 +49345,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "isize" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -48366,11 +49486,21 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "isize" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "isize" ] + [ M.read (| a |) ] |))) ] |))) @@ -48562,6 +49692,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -48576,7 +49708,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "isize" ] [] + |))) ] |) |))) @@ -48829,6 +49964,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -48843,7 +49980,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "isize" ] [] + |))) ] |) |))) @@ -49119,7 +50259,11 @@ Module num. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "isize" ] + [ M.read (| self |) ] |))) ] |) @@ -49236,6 +50380,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "isize" ] [ Value.Integer IntegerKind.Isize 1 ] |) |) @@ -49329,6 +50475,8 @@ Module num. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "isize" ] + [] |) |) |) @@ -49367,6 +50515,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "isize" ] [ M.read (| acc |) ] |) |) @@ -49434,7 +50584,11 @@ Module num. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "isize" ] + [] |) |) |) @@ -49706,7 +50860,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "isize" ] [] + |))); fun γ => ltac:(M.monadic (let~ result : Ty.apply (Ty.path "*") [] [ Ty.path "isize" ] := @@ -49758,7 +50914,11 @@ Module num. |) in M.alloc (| Value.Tuple [] |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| result |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "isize" ] + [ M.read (| result |) ] |))) ] |) @@ -53221,6 +54381,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "isize" ] [ M.read (| self |) ] |) |) @@ -53257,7 +54419,13 @@ Module num. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "isize" ] + [] + |) |) |) |))) @@ -53338,7 +54506,11 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "isize" ] + [ M.read (| self |) ] |))); fun γ => ltac:(M.monadic @@ -53660,7 +54832,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -53720,7 +54894,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (let~ log : Ty.apply (Ty.path "*") [] [ Ty.path "u32" ] := @@ -53761,7 +54937,11 @@ Module num. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| log |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| log |) ] |))) ] |) @@ -53811,6 +54991,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -53820,7 +55002,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -54421,6 +55606,8 @@ Module num. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "isize"; Ty.path "core::num::error::ParseIntError" ] [ M.cast (Ty.path "isize") (M.read (| x |)) ] |))); fun γ => @@ -54428,7 +55615,13 @@ Module num. (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Err", 0 |) in let e := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "isize"; Ty.path "core::num::error::ParseIntError" ] + [ M.read (| e |) ] + |))) ] |) |))) @@ -54960,12 +56153,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u8" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -55176,11 +56373,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u8" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u8" ] + [ M.read (| a |) ] |))) ] |))) @@ -55297,12 +56500,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u8" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -55511,11 +56718,17 @@ Module num. let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| res |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u8" ] + [ M.read (| res |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u8" ] [] + |))) ] |))) ] @@ -55589,10 +56802,17 @@ Module num. (let γ := M.use (M.alloc (| UnOp.not (| M.read (| overflow |) |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| res |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i8" ] + [ M.read (| res |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i8" ] [] + |))) ] |) |))) @@ -55656,11 +56876,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u8" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u8" ] + [ M.read (| a |) ] |))) ] |))) @@ -55853,12 +57079,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u8" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -55947,12 +57177,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u8" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -56039,12 +57273,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u8" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -56133,12 +57371,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u8" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -56496,7 +57738,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -56522,6 +57766,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ Value.Integer IntegerKind.U32 0 ] |))); fun γ => @@ -56694,7 +57940,11 @@ Module num. |))) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| n |) ] |))) ] |))) @@ -56756,6 +58006,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -56772,7 +58024,9 @@ Module num. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -56831,6 +58085,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -56847,7 +58103,9 @@ Module num. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -56910,11 +58168,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u8" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u8" ] + [ M.read (| a |) ] |))) ] |))) @@ -57034,6 +58298,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -57043,7 +58309,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u8" ] [] + |))) ] |) |))) @@ -57296,6 +58565,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -57305,7 +58576,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u8" ] [] + |))) ] |) |))) @@ -57567,6 +58841,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ Value.Integer IntegerKind.U8 1 ] |) |) @@ -57660,6 +58936,8 @@ Module num. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "u8" ] + [] |) |) |) @@ -57698,6 +58976,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ M.read (| acc |) ] |) |) @@ -57765,7 +59045,11 @@ Module num. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u8" ] + [] |) |) |) @@ -60668,7 +61952,13 @@ Module num. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u8" ] + [] + |) |) |) |))) @@ -60683,7 +61973,11 @@ Module num. Value.Integer IntegerKind.U8 0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u8" ] + [ M.read (| self |) ] |))); fun γ => ltac:(M.monadic @@ -62347,13 +63641,19 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u8"; Ty.path "core::num::error::ParseIntError" ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Empty" + [] + [] []) ] ] @@ -62449,13 +63749,22 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u8"; + Ty.path "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -62651,13 +63960,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u8"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -62826,13 +64145,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u8"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -63033,13 +64362,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u8"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -63091,13 +64430,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u8"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -63168,13 +64517,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u8"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -63341,13 +64700,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u8"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -63399,13 +64768,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u8"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -63476,13 +64855,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u8"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -63538,7 +64927,11 @@ Module num. ] |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| result |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "u8"; Ty.path "core::num::error::ParseIntError" ] + [ M.read (| result |) ] |))) ] |) @@ -64064,12 +65457,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u16" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -64280,11 +65677,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u16" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u16" ] + [ M.read (| a |) ] |))) ] |))) @@ -64401,12 +65804,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u16" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -64615,11 +66022,17 @@ Module num. let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| res |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u16" ] + [ M.read (| res |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u16" ] [] + |))) ] |))) ] @@ -64693,10 +66106,17 @@ Module num. (let γ := M.use (M.alloc (| UnOp.not (| M.read (| overflow |) |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| res |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i16" ] + [ M.read (| res |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i16" ] [] + |))) ] |) |))) @@ -64760,11 +66180,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u16" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u16" ] + [ M.read (| a |) ] |))) ] |))) @@ -64957,12 +66383,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u16" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -65051,12 +66481,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u16" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -65143,12 +66577,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u16" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -65237,12 +66675,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u16" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -65600,7 +67042,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -65626,6 +67070,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ Value.Integer IntegerKind.U32 0 ] |))); fun γ => @@ -65798,7 +67244,11 @@ Module num. |))) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| n |) ] |))) ] |))) @@ -65860,6 +67310,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -65876,7 +67328,9 @@ Module num. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -65935,6 +67389,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -65951,7 +67407,9 @@ Module num. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -66014,11 +67472,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u16" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u16" ] + [ M.read (| a |) ] |))) ] |))) @@ -66138,6 +67602,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -66147,7 +67613,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u16" ] [] + |))) ] |) |))) @@ -66400,6 +67869,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -66409,7 +67880,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u16" ] [] + |))) ] |) |))) @@ -66671,6 +68145,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u16" ] [ Value.Integer IntegerKind.U16 1 ] |) |) @@ -66764,6 +68240,8 @@ Module num. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "u16" ] + [] |) |) |) @@ -66802,6 +68280,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u16" ] [ M.read (| acc |) ] |) |) @@ -66869,7 +68349,11 @@ Module num. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u16" ] + [] |) |) |) @@ -69773,7 +71257,13 @@ Module num. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u16" ] + [] + |) |) |) |))) @@ -69788,7 +71278,11 @@ Module num. Value.Integer IntegerKind.U16 0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u16" ] + [ M.read (| self |) ] |))); fun γ => ltac:(M.monadic @@ -70664,13 +72158,19 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u16"; Ty.path "core::num::error::ParseIntError" ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Empty" + [] + [] []) ] ] @@ -70768,13 +72268,22 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u16"; + Ty.path "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -70970,13 +72479,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u16"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -71145,13 +72664,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u16"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -71352,13 +72881,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u16"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -71410,13 +72949,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u16"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -71487,13 +73036,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u16"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -71660,13 +73219,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u16"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -71718,13 +73287,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u16"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -71795,13 +73374,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u16"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -71857,7 +73446,11 @@ Module num. ] |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| result |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "u16"; Ty.path "core::num::error::ParseIntError" ] + [ M.read (| result |) ] |))) ] |) @@ -72383,12 +73976,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -72599,11 +74196,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| a |) ] |))) ] |))) @@ -72720,12 +74323,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -72934,11 +74541,17 @@ Module num. let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| res |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| res |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |))) ] @@ -73012,10 +74625,17 @@ Module num. (let γ := M.use (M.alloc (| UnOp.not (| M.read (| overflow |) |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| res |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i32" ] + [ M.read (| res |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] + |))) ] |) |))) @@ -73079,11 +74699,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| a |) ] |))) ] |))) @@ -73276,12 +74902,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -73370,12 +75000,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -73462,12 +75096,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -73556,12 +75194,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -73919,7 +75561,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -73945,6 +75589,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ Value.Integer IntegerKind.U32 0 ] |))); fun γ => @@ -74117,7 +75763,11 @@ Module num. |))) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| n |) ] |))) ] |))) @@ -74179,6 +75829,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -74195,7 +75847,9 @@ Module num. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -74254,6 +75908,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -74270,7 +75926,9 @@ Module num. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -74333,11 +75991,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| a |) ] |))) ] |))) @@ -74457,6 +76121,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -74466,7 +76132,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -74719,6 +76388,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -74728,7 +76399,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -74990,6 +76664,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ Value.Integer IntegerKind.U32 1 ] |) |) @@ -75083,6 +76759,8 @@ Module num. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "u32" ] + [] |) |) |) @@ -75121,6 +76799,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.read (| acc |) ] |) |) @@ -75188,7 +76868,11 @@ Module num. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u32" ] + [] |) |) |) @@ -78092,7 +79776,13 @@ Module num. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u32" ] + [] + |) |) |) |))) @@ -78107,7 +79797,11 @@ Module num. Value.Integer IntegerKind.U32 0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| self |) ] |))); fun γ => ltac:(M.monadic @@ -78955,13 +80649,19 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u32"; Ty.path "core::num::error::ParseIntError" ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Empty" + [] + [] []) ] ] @@ -79059,13 +80759,22 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u32"; + Ty.path "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -79259,13 +80968,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u32"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -79430,13 +81149,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u32"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -79631,13 +81360,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u32"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -79688,13 +81427,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u32"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -79765,13 +81514,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u32"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -79934,13 +81693,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u32"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -79991,13 +81760,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u32"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -80068,13 +81847,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u32"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -80130,7 +81919,11 @@ Module num. ] |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| result |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "u32"; Ty.path "core::num::error::ParseIntError" ] + [ M.read (| result |) ] |))) ] |) @@ -80656,12 +82449,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -80872,11 +82669,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u64" ] + [ M.read (| a |) ] |))) ] |))) @@ -80993,12 +82796,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -81207,11 +83014,17 @@ Module num. let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| res |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u64" ] + [ M.read (| res |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] [] + |))) ] |))) ] @@ -81285,10 +83098,17 @@ Module num. (let γ := M.use (M.alloc (| UnOp.not (| M.read (| overflow |) |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| res |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i64" ] + [ M.read (| res |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i64" ] [] + |))) ] |) |))) @@ -81352,11 +83172,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u64" ] + [ M.read (| a |) ] |))) ] |))) @@ -81549,12 +83375,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -81643,12 +83473,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -81735,12 +83569,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -81829,12 +83667,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -82192,7 +84034,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -82218,6 +84062,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ Value.Integer IntegerKind.U32 0 ] |))); fun γ => @@ -82390,7 +84236,11 @@ Module num. |))) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| n |) ] |))) ] |))) @@ -82452,6 +84302,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -82468,7 +84320,9 @@ Module num. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -82527,6 +84381,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -82543,7 +84399,9 @@ Module num. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -82606,11 +84464,17 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u64" ] + [ M.read (| a |) ] |))) ] |))) @@ -82730,6 +84594,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -82739,7 +84605,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] [] + |))) ] |) |))) @@ -82992,6 +84861,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -83001,7 +84872,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] [] + |))) ] |) |))) @@ -83263,6 +85137,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u64" ] [ Value.Integer IntegerKind.U64 1 ] |) |) @@ -83356,6 +85232,8 @@ Module num. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "u64" ] + [] |) |) |) @@ -83394,6 +85272,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u64" ] [ M.read (| acc |) ] |) |) @@ -83461,7 +85341,11 @@ Module num. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u64" ] + [] |) |) |) @@ -86365,7 +88249,13 @@ Module num. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u64" ] + [] + |) |) |) |))) @@ -86380,7 +88270,11 @@ Module num. Value.Integer IntegerKind.U64 0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u64" ] + [ M.read (| self |) ] |))); fun γ => ltac:(M.monadic @@ -87228,13 +89122,19 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u64"; Ty.path "core::num::error::ParseIntError" ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Empty" + [] + [] []) ] ] @@ -87332,13 +89232,22 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u64"; + Ty.path "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -87534,13 +89443,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u64"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -87709,13 +89628,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u64"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -87916,13 +89845,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u64"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -87974,13 +89913,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u64"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -88051,13 +90000,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u64"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -88224,13 +90183,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u64"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -88282,13 +90251,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u64"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -88359,13 +90338,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u64"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -88421,7 +90410,11 @@ Module num. ] |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| result |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "u64"; Ty.path "core::num::error::ParseIntError" ] + [ M.read (| result |) ] |))) ] |) @@ -88947,12 +90940,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u128" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -89163,11 +91160,21 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u128" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u128" ] + [ M.read (| a |) ] |))) ] |))) @@ -89284,12 +91291,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u128" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -89498,11 +91509,21 @@ Module num. let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| res |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u128" ] + [ M.read (| res |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u128" ] + [] + |))) ] |))) ] @@ -89576,10 +91597,17 @@ Module num. (let γ := M.use (M.alloc (| UnOp.not (| M.read (| overflow |) |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| res |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i128" ] + [ M.read (| res |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i128" ] [] + |))) ] |) |))) @@ -89643,11 +91671,21 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u128" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u128" ] + [ M.read (| a |) ] |))) ] |))) @@ -89840,12 +91878,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u128" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -89934,12 +91976,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u128" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -90026,12 +92072,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u128" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -90120,12 +92170,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u128" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -90483,7 +92537,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -90509,6 +92565,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ Value.Integer IntegerKind.U32 0 ] |))); fun γ => @@ -90681,7 +92739,11 @@ Module num. |))) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| n |) ] |))) ] |))) @@ -90743,6 +92805,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -90762,7 +92826,9 @@ Module num. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -90821,6 +92887,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -90840,7 +92908,9 @@ Module num. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -90903,11 +92973,21 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u128" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u128" ] + [ M.read (| a |) ] |))) ] |))) @@ -91027,6 +93107,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -91036,7 +93118,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u128" ] [] + |))) ] |) |))) @@ -91289,6 +93374,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -91298,7 +93385,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u128" ] [] + |))) ] |) |))) @@ -91560,6 +93650,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u128" ] [ Value.Integer IntegerKind.U128 1 ] |) |) @@ -91653,6 +93745,8 @@ Module num. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "u128" ] + [] |) |) |) @@ -91691,6 +93785,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u128" ] [ M.read (| acc |) ] |) |) @@ -91758,7 +93854,11 @@ Module num. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u128" ] + [] |) |) |) @@ -94674,7 +96774,13 @@ Module num. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u128" ] + [] + |) |) |) |))) @@ -94689,7 +96795,11 @@ Module num. Value.Integer IntegerKind.U128 0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u128" ] + [ M.read (| self |) ] |))); fun γ => ltac:(M.monadic @@ -95437,13 +97547,19 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u128"; Ty.path "core::num::error::ParseIntError" ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Empty" + [] + [] []) ] ] @@ -95541,13 +97657,22 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u128"; + Ty.path "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -95743,13 +97868,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u128"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -95918,13 +98053,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u128"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -96125,13 +98270,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u128"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -96183,13 +98338,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u128"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -96260,13 +98425,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u128"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::PosOverflow" + [] + [] []) ] ] @@ -96433,13 +98608,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u128"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::InvalidDigit" + [] + [] []) ] ] @@ -96491,13 +98676,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u128"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -96568,13 +98763,23 @@ Module num. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u128"; + Ty.path + "core::num::error::ParseIntError" + ] [ Value.StructRecord "core::num::error::ParseIntError" + [] + [] [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::NegOverflow" + [] + [] []) ] ] @@ -96630,7 +98835,11 @@ Module num. ] |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| result |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "u128"; Ty.path "core::num::error::ParseIntError" ] + [ M.read (| result |) ] |))) ] |) @@ -97154,12 +99363,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -97370,11 +99583,21 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| a |) ] |))) ] |))) @@ -97491,12 +99714,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -97705,11 +99932,21 @@ Module num. let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| res |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| res |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] + |))) ] |))) ] @@ -97783,10 +100020,17 @@ Module num. (let γ := M.use (M.alloc (| UnOp.not (| M.read (| overflow |) |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| res |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "isize" ] + [ M.read (| res |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "isize" ] [] + |))) ] |) |))) @@ -97850,11 +100094,21 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| a |) ] |))) ] |))) @@ -98047,12 +100301,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -98141,12 +100399,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -98233,12 +100495,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -98327,12 +100593,16 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -98690,7 +100960,9 @@ Module num. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -98716,6 +100988,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ Value.Integer IntegerKind.U32 0 ] |))); fun γ => @@ -98888,7 +101162,11 @@ Module num. |))) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| n |) ] |))) ] |))) @@ -98950,6 +101228,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -98969,7 +101249,9 @@ Module num. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -99028,6 +101310,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -99047,7 +101331,9 @@ Module num. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] [] + |))) ] |) |))) @@ -99110,11 +101396,21 @@ Module num. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| a |) ] |))) ] |))) @@ -99234,6 +101530,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -99248,7 +101546,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))) ] |) |))) @@ -99501,6 +101802,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -99515,7 +101818,10 @@ Module num. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))) ] |) |))) @@ -99777,6 +102083,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 1 ] |) |) @@ -99870,6 +102178,8 @@ Module num. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "usize" ] + [] |) |) |) @@ -99908,6 +102218,8 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| acc |) ] |) |) @@ -99975,7 +102287,11 @@ Module num. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] |) |) |) @@ -102906,7 +105222,13 @@ Module num. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] + |) |) |) |))) @@ -102921,7 +105243,11 @@ Module num. Value.Integer IntegerKind.Usize 0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| self |) ] |))); fun γ => ltac:(M.monadic @@ -103783,6 +106109,8 @@ Module num. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "usize"; Ty.path "core::num::error::ParseIntError" ] [ M.cast (Ty.path "usize") (M.read (| x |)) ] |))); fun γ => @@ -103790,7 +106118,13 @@ Module num. (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Err", 0 |) in let e := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "usize"; Ty.path "core::num::error::ParseIntError" ] + [ M.read (| e |) ] + |))) ] |) |))) diff --git a/CoqOfRust/core/num/nonzero.v b/CoqOfRust/core/num/nonzero.v index 375371986..e6821abbe 100644 --- a/CoqOfRust/core/num/nonzero.v +++ b/CoqOfRust/core/num/nonzero.v @@ -3945,6 +3945,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ], @@ -3963,7 +3965,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ] ] + [] + |))) ] |) |))) @@ -4149,6 +4157,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ], @@ -4167,7 +4177,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ] ] + [] + |))) ] |) |))) @@ -4504,6 +4520,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ], @@ -4522,7 +4540,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ] ] + [] + |))) ] |) |))) @@ -4725,6 +4749,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ], @@ -4743,7 +4769,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u8" ] ] + [] + |))) ] |) |))) @@ -5065,7 +5097,10 @@ Module num. |); Value.StructRecord "core::num::error::ParseIntError" - [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" []) ] + [] + [] + [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" [] [] []) + ] ] |))) |))) @@ -6001,6 +6036,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ], @@ -6019,7 +6056,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ] ] + [] + |))) ] |) |))) @@ -6205,6 +6248,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ], @@ -6223,7 +6268,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ] ] + [] + |))) ] |) |))) @@ -6560,6 +6611,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ], @@ -6578,7 +6631,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ] ] + [] + |))) ] |) |))) @@ -6781,6 +6840,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ], @@ -6799,7 +6860,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u16" ] ] + [] + |))) ] |) |))) @@ -7121,7 +7188,10 @@ Module num. |); Value.StructRecord "core::num::error::ParseIntError" - [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" []) ] + [] + [] + [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" [] [] []) + ] ] |))) |))) @@ -8057,6 +8127,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ], @@ -8075,7 +8147,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ] ] + [] + |))) ] |) |))) @@ -8261,6 +8339,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ], @@ -8279,7 +8359,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ] ] + [] + |))) ] |) |))) @@ -8616,6 +8702,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ], @@ -8634,7 +8722,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ] ] + [] + |))) ] |) |))) @@ -8837,6 +8931,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ], @@ -8855,7 +8951,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u32" ] ] + [] + |))) ] |) |))) @@ -9177,7 +9279,10 @@ Module num. |); Value.StructRecord "core::num::error::ParseIntError" - [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" []) ] + [] + [] + [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" [] [] []) + ] ] |))) |))) @@ -10113,6 +10218,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ], @@ -10131,7 +10238,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ] ] + [] + |))) ] |) |))) @@ -10317,6 +10430,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ], @@ -10335,7 +10450,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ] ] + [] + |))) ] |) |))) @@ -10672,6 +10793,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ], @@ -10690,7 +10813,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ] ] + [] + |))) ] |) |))) @@ -10893,6 +11022,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ], @@ -10911,7 +11042,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u64" ] ] + [] + |))) ] |) |))) @@ -11233,7 +11370,10 @@ Module num. |); Value.StructRecord "core::num::error::ParseIntError" - [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" []) ] + [] + [] + [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" [] [] []) + ] ] |))) |))) @@ -12170,6 +12310,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ] ] [ M.call_closure (| Ty.apply @@ -12191,7 +12333,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ] ] + [] + |))) ] |) |))) @@ -12377,6 +12525,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ] ] [ M.call_closure (| Ty.apply @@ -12398,7 +12548,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ] ] + [] + |))) ] |) |))) @@ -12735,6 +12891,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ] ] [ M.call_closure (| Ty.apply @@ -12756,7 +12914,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ] ] + [] + |))) ] |) |))) @@ -12959,6 +13123,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ] ] [ M.call_closure (| Ty.apply @@ -12980,7 +13146,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "u128" ] ] + [] + |))) ] |) |))) @@ -13302,7 +13474,10 @@ Module num. |); Value.StructRecord "core::num::error::ParseIntError" - [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" []) ] + [] + [] + [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" [] [] []) + ] ] |))) |))) @@ -14242,6 +14417,9 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] [ M.call_closure (| Ty.apply @@ -14263,7 +14441,14 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [] + |))) ] |) |))) @@ -14449,6 +14634,9 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] [ M.call_closure (| Ty.apply @@ -14470,7 +14658,14 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [] + |))) ] |) |))) @@ -14807,6 +15002,9 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] [ M.call_closure (| Ty.apply @@ -14828,7 +15026,14 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [] + |))) ] |) |))) @@ -15031,6 +15236,9 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] [ M.call_closure (| Ty.apply @@ -15052,7 +15260,14 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [] + |))) ] |) |))) @@ -15375,7 +15590,10 @@ Module num. |); Value.StructRecord "core::num::error::ParseIntError" - [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" []) ] + [] + [] + [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" [] [] []) + ] ] |))) |))) @@ -16342,6 +16560,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ], @@ -16360,7 +16580,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ] ] + [] + |))) ] |) |))) @@ -16728,6 +16954,13 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "i8" ] + ] [ M.call_closure (| Ty.apply @@ -16753,7 +16986,13 @@ Module num. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ] ] + [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -17053,6 +17292,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ], @@ -17071,7 +17312,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ] ] + [] + |))) ] |) |))) @@ -17274,6 +17521,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ], @@ -17292,7 +17541,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i8" ] ] + [] + |))) ] |) |))) @@ -17551,7 +17806,10 @@ Module num. |); Value.StructRecord "core::num::error::ParseIntError" - [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" []) ] + [] + [] + [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" [] [] []) + ] ] |))) |))) @@ -18386,6 +18644,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ], @@ -18404,7 +18664,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ] ] + [] + |))) ] |) |))) @@ -18772,6 +19038,13 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "i16" ] + ] [ M.call_closure (| Ty.apply @@ -18797,7 +19070,13 @@ Module num. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ] ] + [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -19098,6 +19377,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ], @@ -19116,7 +19397,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ] ] + [] + |))) ] |) |))) @@ -19319,6 +19606,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ], @@ -19337,7 +19626,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i16" ] ] + [] + |))) ] |) |))) @@ -19596,7 +19891,10 @@ Module num. |); Value.StructRecord "core::num::error::ParseIntError" - [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" []) ] + [] + [] + [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" [] [] []) + ] ] |))) |))) @@ -20431,6 +20729,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ], @@ -20449,7 +20749,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ] ] + [] + |))) ] |) |))) @@ -20817,6 +21123,13 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "i32" ] + ] [ M.call_closure (| Ty.apply @@ -20842,7 +21155,13 @@ Module num. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ] ] + [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -21143,6 +21462,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ], @@ -21161,7 +21482,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ] ] + [] + |))) ] |) |))) @@ -21364,6 +21691,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ], @@ -21382,7 +21711,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i32" ] ] + [] + |))) ] |) |))) @@ -21641,7 +21976,10 @@ Module num. |); Value.StructRecord "core::num::error::ParseIntError" - [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" []) ] + [] + [] + [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" [] [] []) + ] ] |))) |))) @@ -22476,6 +22814,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ], @@ -22494,7 +22834,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ] ] + [] + |))) ] |) |))) @@ -22862,6 +23208,13 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "i64" ] + ] [ M.call_closure (| Ty.apply @@ -22887,7 +23240,13 @@ Module num. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ] ] + [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -23188,6 +23547,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ], @@ -23206,7 +23567,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ] ] + [] + |))) ] |) |))) @@ -23409,6 +23776,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ] ] [ M.call_closure (| Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ], @@ -23427,7 +23796,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i64" ] ] + [] + |))) ] |) |))) @@ -23686,7 +24061,10 @@ Module num. |); Value.StructRecord "core::num::error::ParseIntError" - [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" []) ] + [] + [] + [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" [] [] []) + ] ] |))) |))) @@ -24523,6 +24901,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i128" ] ] [ M.call_closure (| Ty.apply @@ -24544,7 +24924,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i128" ] ] + [] + |))) ] |) |))) @@ -24915,6 +25301,13 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "i128" ] + ] [ M.call_closure (| Ty.apply @@ -24940,7 +25333,13 @@ Module num. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i128" ] ] + [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -25244,6 +25643,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i128" ] ] [ M.call_closure (| Ty.apply @@ -25265,7 +25666,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i128" ] ] + [] + |))) ] |) |))) @@ -25468,6 +25875,8 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i128" ] ] [ M.call_closure (| Ty.apply @@ -25489,7 +25898,13 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "i128" ] ] + [] + |))) ] |) |))) @@ -25748,7 +26163,10 @@ Module num. |); Value.StructRecord "core::num::error::ParseIntError" - [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" []) ] + [] + [] + [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" [] [] []) + ] ] |))) |))) @@ -26591,6 +27009,9 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ] + ] [ M.call_closure (| Ty.apply @@ -26612,7 +27033,14 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ] + ] + [] + |))) ] |) |))) @@ -26983,6 +27411,13 @@ Module num. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::num::nonzero::NonZero") + [] + [ Ty.path "isize" ] + ] [ M.call_closure (| Ty.apply @@ -27008,7 +27443,13 @@ Module num. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ] ] + [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -27312,6 +27753,9 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ] + ] [ M.call_closure (| Ty.apply @@ -27333,7 +27777,14 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ] + ] + [] + |))) ] |) |))) @@ -27536,6 +27987,9 @@ Module num. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ] + ] [ M.call_closure (| Ty.apply @@ -27557,7 +28011,14 @@ Module num. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "isize" ] + ] + [] + |))) ] |) |))) @@ -27817,7 +28278,10 @@ Module num. |); Value.StructRecord "core::num::error::ParseIntError" - [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" []) ] + [] + [] + [ ("kind", Value.StructTuple "core::num::error::IntErrorKind::Zero" [] [] []) + ] ] |))) |))) diff --git a/CoqOfRust/core/num/saturating.v b/CoqOfRust/core/num/saturating.v index 974b94de8..0c897d82d 100644 --- a/CoqOfRust/core/num/saturating.v +++ b/CoqOfRust/core/num/saturating.v @@ -238,6 +238,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ T ] [ M.call_closure (| T, @@ -298,6 +300,8 @@ Module num. ltac:(M.monadic (Value.StructTuple "core::num::saturating::Saturating" + [] + [ T ] [ M.call_closure (| T, @@ -666,6 +670,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -801,7 +807,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] + [ M.read (| other |) ] ] |) |) @@ -841,6 +851,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -976,7 +988,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] + [ M.read (| other |) ] ] |) |) @@ -1016,6 +1032,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -1151,7 +1169,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] + [ M.read (| other |) ] ] |) |) @@ -1191,6 +1213,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -1326,7 +1350,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] + [ M.read (| other |) ] ] |) |) @@ -1366,6 +1394,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -1509,7 +1539,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] + [ M.read (| other |) ] ] |) |) @@ -1548,6 +1582,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ UnOp.not (| M.read (| @@ -1593,6 +1629,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -1728,7 +1766,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] + [ M.read (| other |) ] ] |) |) @@ -1768,6 +1810,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -1903,7 +1947,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] + [ M.read (| other |) ] ] |) |) @@ -1943,6 +1991,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -2078,7 +2128,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] + [ M.read (| other |) ] ] |) |) @@ -2118,6 +2172,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -2239,7 +2295,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] + [ M.read (| other |) ] ] |) |) @@ -2279,6 +2339,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -2400,7 +2462,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] + [ M.read (| other |) ] ] |) |) @@ -2440,6 +2506,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -2561,7 +2629,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] + [ M.read (| other |) ] ] |) |) @@ -2601,6 +2673,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -2722,7 +2796,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] + [ M.read (| other |) ] ] |) |) @@ -2762,6 +2840,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -2891,7 +2971,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] + [ M.read (| other |) ] ] |) |) @@ -2930,6 +3014,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ UnOp.not (| M.read (| @@ -2975,6 +3061,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -3096,7 +3184,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] + [ M.read (| other |) ] ] |) |) @@ -3136,6 +3228,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -3257,7 +3351,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] + [ M.read (| other |) ] ] |) |) @@ -3297,6 +3395,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -3418,7 +3518,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] + [ M.read (| other |) ] ] |) |) @@ -3458,6 +3562,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -3587,7 +3693,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] + [ M.read (| other |) ] ] |) |) @@ -3627,6 +3737,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -3756,7 +3868,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] + [ M.read (| other |) ] ] |) |) @@ -3796,6 +3912,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -3925,7 +4043,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] + [ M.read (| other |) ] ] |) |) @@ -3965,6 +4087,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -4094,7 +4218,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] + [ M.read (| other |) ] ] |) |) @@ -4134,6 +4262,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -4271,7 +4401,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] + [ M.read (| other |) ] ] |) |) @@ -4310,6 +4444,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ UnOp.not (| M.read (| @@ -4355,6 +4491,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -4484,7 +4622,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] + [ M.read (| other |) ] ] |) |) @@ -4524,6 +4666,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -4653,7 +4797,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] + [ M.read (| other |) ] ] |) |) @@ -4693,6 +4841,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -4822,7 +4972,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] + [ M.read (| other |) ] ] |) |) @@ -4862,6 +5016,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -4991,7 +5147,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] + [ M.read (| other |) ] ] |) |) @@ -5031,6 +5191,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -5160,7 +5322,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] + [ M.read (| other |) ] ] |) |) @@ -5200,6 +5366,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -5329,7 +5497,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] + [ M.read (| other |) ] ] |) |) @@ -5369,6 +5541,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -5498,7 +5672,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] + [ M.read (| other |) ] ] |) |) @@ -5538,6 +5716,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -5675,7 +5855,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] + [ M.read (| other |) ] ] |) |) @@ -5714,6 +5898,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ UnOp.not (| M.read (| @@ -5759,6 +5945,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -5888,7 +6076,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] + [ M.read (| other |) ] ] |) |) @@ -5928,6 +6120,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -6057,7 +6251,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] + [ M.read (| other |) ] ] |) |) @@ -6097,6 +6295,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -6226,7 +6426,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] + [ M.read (| other |) ] ] |) |) @@ -6266,6 +6470,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -6395,7 +6601,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] + [ M.read (| other |) ] ] |) |) @@ -6435,6 +6645,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -6564,7 +6776,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] + [ M.read (| other |) ] ] |) |) @@ -6604,6 +6820,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -6733,7 +6951,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] + [ M.read (| other |) ] ] |) |) @@ -6773,6 +6995,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -6902,7 +7126,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] + [ M.read (| other |) ] ] |) |) @@ -6942,6 +7170,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -7079,7 +7309,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] + [ M.read (| other |) ] ] |) |) @@ -7118,6 +7352,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ UnOp.not (| M.read (| @@ -7163,6 +7399,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -7292,7 +7530,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] + [ M.read (| other |) ] ] |) |) @@ -7332,6 +7574,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -7461,7 +7705,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] + [ M.read (| other |) ] ] |) |) @@ -7501,6 +7749,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -7630,7 +7880,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] + [ M.read (| other |) ] ] |) |) @@ -7670,6 +7924,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -7805,7 +8061,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] + [ M.read (| other |) ] ] |) |) @@ -7845,6 +8105,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -7980,7 +8242,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] + [ M.read (| other |) ] ] |) |) @@ -8020,6 +8286,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -8155,7 +8423,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] + [ M.read (| other |) ] ] |) |) @@ -8195,6 +8467,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -8330,7 +8604,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] + [ M.read (| other |) ] ] |) |) @@ -8370,6 +8648,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -8513,7 +8793,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] + [ M.read (| other |) ] ] |) |) @@ -8552,6 +8836,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ UnOp.not (| M.read (| @@ -8597,6 +8883,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -8732,7 +9020,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] + [ M.read (| other |) ] ] |) |) @@ -8772,6 +9064,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -8907,7 +9201,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] + [ M.read (| other |) ] ] |) |) @@ -8947,6 +9245,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -9082,7 +9382,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] + [ M.read (| other |) ] ] |) |) @@ -9122,6 +9426,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -9257,7 +9563,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] + [ M.read (| other |) ] ] |) |) @@ -9297,6 +9607,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -9432,7 +9744,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] + [ M.read (| other |) ] ] |) |) @@ -9472,6 +9788,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -9607,7 +9925,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] + [ M.read (| other |) ] ] |) |) @@ -9647,6 +9969,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -9782,7 +10106,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] + [ M.read (| other |) ] ] |) |) @@ -9822,6 +10150,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -9965,7 +10295,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] + [ M.read (| other |) ] ] |) |) @@ -10004,6 +10338,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ UnOp.not (| M.read (| @@ -10049,6 +10385,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -10184,7 +10522,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] + [ M.read (| other |) ] ] |) |) @@ -10224,6 +10566,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -10359,7 +10703,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] + [ M.read (| other |) ] ] |) |) @@ -10399,6 +10747,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -10534,7 +10884,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] + [ M.read (| other |) ] ] |) |) @@ -10574,6 +10928,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -10695,7 +11051,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] + [ M.read (| other |) ] ] |) |) @@ -10735,6 +11095,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -10856,7 +11218,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] + [ M.read (| other |) ] ] |) |) @@ -10896,6 +11262,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -11017,7 +11385,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] + [ M.read (| other |) ] ] |) |) @@ -11057,6 +11429,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -11178,7 +11552,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] + [ M.read (| other |) ] ] |) |) @@ -11218,6 +11596,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -11347,7 +11727,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] + [ M.read (| other |) ] ] |) |) @@ -11386,6 +11770,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ UnOp.not (| M.read (| @@ -11431,6 +11817,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -11552,7 +11940,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] + [ M.read (| other |) ] ] |) |) @@ -11592,6 +11984,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -11713,7 +12107,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] + [ M.read (| other |) ] ] |) |) @@ -11753,6 +12151,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -11874,7 +12274,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] + [ M.read (| other |) ] ] |) |) @@ -11914,6 +12318,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -12043,7 +12449,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] + [ M.read (| other |) ] ] |) |) @@ -12083,6 +12493,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -12212,7 +12624,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] + [ M.read (| other |) ] ] |) |) @@ -12252,6 +12668,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -12381,7 +12799,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] + [ M.read (| other |) ] ] |) |) @@ -12421,6 +12843,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -12550,7 +12974,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] + [ M.read (| other |) ] ] |) |) @@ -12590,6 +13018,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -12727,7 +13157,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] + [ M.read (| other |) ] ] |) |) @@ -12766,6 +13200,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ UnOp.not (| M.read (| @@ -12811,6 +13247,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -12940,7 +13378,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] + [ M.read (| other |) ] ] |) |) @@ -12980,6 +13422,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -13109,7 +13553,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] + [ M.read (| other |) ] ] |) |) @@ -13149,6 +13597,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -13278,7 +13728,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] + [ M.read (| other |) ] ] |) |) @@ -13318,6 +13772,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -13447,7 +13903,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] + [ M.read (| other |) ] ] |) |) @@ -13487,6 +13947,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -13616,7 +14078,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] + [ M.read (| other |) ] ] |) |) @@ -13656,6 +14122,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -13785,7 +14253,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] + [ M.read (| other |) ] ] |) |) @@ -13825,6 +14297,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -13954,7 +14428,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] + [ M.read (| other |) ] ] |) |) @@ -13994,6 +14472,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -14131,7 +14611,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] + [ M.read (| other |) ] ] |) |) @@ -14170,6 +14654,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ UnOp.not (| M.read (| @@ -14215,6 +14701,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -14344,7 +14832,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] + [ M.read (| other |) ] ] |) |) @@ -14384,6 +14876,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -14513,7 +15007,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] + [ M.read (| other |) ] ] |) |) @@ -14553,6 +15051,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -14682,7 +15182,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] + [ M.read (| other |) ] ] |) |) @@ -14722,6 +15226,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -14851,7 +15357,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] + [ M.read (| other |) ] ] |) |) @@ -14891,6 +15401,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -15020,7 +15532,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] + [ M.read (| other |) ] ] |) |) @@ -15060,6 +15576,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -15189,7 +15707,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] + [ M.read (| other |) ] ] |) |) @@ -15229,6 +15751,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -15358,7 +15882,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] + [ M.read (| other |) ] ] |) |) @@ -15398,6 +15926,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -15535,7 +16065,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] + [ M.read (| other |) ] ] |) |) @@ -15574,6 +16108,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ UnOp.not (| M.read (| @@ -15619,6 +16155,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -15748,7 +16286,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] + [ M.read (| other |) ] ] |) |) @@ -15788,6 +16330,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -15917,7 +16461,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] + [ M.read (| other |) ] ] |) |) @@ -15957,6 +16505,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -16086,7 +16636,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] + [ M.read (| other |) ] ] |) |) @@ -16126,6 +16680,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -16261,7 +16817,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] + [ M.read (| other |) ] ] |) |) @@ -16301,6 +16861,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -16436,7 +16998,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] + [ M.read (| other |) ] ] |) |) @@ -16476,6 +17042,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -16611,7 +17179,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] + [ M.read (| other |) ] ] |) |) @@ -16651,6 +17223,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -16786,7 +17360,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] + [ M.read (| other |) ] ] |) |) @@ -16826,6 +17404,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -16969,7 +17549,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] + [ M.read (| other |) ] ] |) |) @@ -17008,6 +17592,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ UnOp.not (| M.read (| @@ -17053,6 +17639,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -17188,7 +17776,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] + [ M.read (| other |) ] ] |) |) @@ -17228,6 +17820,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -17363,7 +17957,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] + [ M.read (| other |) ] ] |) |) @@ -17403,6 +18001,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -17538,7 +18138,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::saturating::Saturating" [ M.read (| other |) ] + Value.StructTuple + "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] + [ M.read (| other |) ] ] |) |) @@ -17568,6 +18172,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ M.read (| get_associated_constant (| Ty.path "usize", "MIN", Ty.path "usize" |) |) ] |))). @@ -17582,6 +18188,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ M.read (| get_associated_constant (| Ty.path "usize", "MAX", Ty.path "usize" |) |) ] |))). @@ -17705,6 +18313,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -17742,6 +18352,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -17778,6 +18390,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -17813,6 +18427,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -17848,6 +18464,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -17882,6 +18500,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -17916,6 +18536,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -17950,6 +18572,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -17985,6 +18609,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -18081,6 +18707,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ M.read (| get_associated_constant (| Ty.path "u8", "MIN", Ty.path "u8" |) |) ] |))). @@ -18095,6 +18723,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ M.read (| get_associated_constant (| Ty.path "u8", "MAX", Ty.path "u8" |) |) ] |))). @@ -18218,6 +18848,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -18255,6 +18887,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -18291,6 +18925,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -18326,6 +18962,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -18361,6 +18999,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -18395,6 +19035,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -18429,6 +19071,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -18463,6 +19107,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -18498,6 +19144,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -18594,6 +19242,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ M.read (| get_associated_constant (| Ty.path "u16", "MIN", Ty.path "u16" |) |) ] |))). @@ -18608,6 +19258,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ M.read (| get_associated_constant (| Ty.path "u16", "MAX", Ty.path "u16" |) |) ] |))). @@ -18731,6 +19383,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -18768,6 +19422,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -18804,6 +19460,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -18839,6 +19497,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -18874,6 +19534,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -18908,6 +19570,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -18942,6 +19606,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -18976,6 +19642,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -19011,6 +19679,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -19107,6 +19777,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ M.read (| get_associated_constant (| Ty.path "u32", "MIN", Ty.path "u32" |) |) ] |))). @@ -19121,6 +19793,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ M.read (| get_associated_constant (| Ty.path "u32", "MAX", Ty.path "u32" |) |) ] |))). @@ -19244,6 +19918,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -19281,6 +19957,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -19317,6 +19995,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -19352,6 +20032,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -19387,6 +20069,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -19421,6 +20105,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -19455,6 +20141,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -19489,6 +20177,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -19524,6 +20214,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -19620,6 +20312,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ M.read (| get_associated_constant (| Ty.path "u64", "MIN", Ty.path "u64" |) |) ] |))). @@ -19634,6 +20328,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ M.read (| get_associated_constant (| Ty.path "u64", "MAX", Ty.path "u64" |) |) ] |))). @@ -19757,6 +20453,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -19794,6 +20492,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -19830,6 +20530,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -19865,6 +20567,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -19900,6 +20604,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -19934,6 +20640,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -19968,6 +20676,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -20002,6 +20712,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -20037,6 +20749,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -20133,6 +20847,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ M.read (| get_associated_constant (| Ty.path "u128", "MIN", Ty.path "u128" |) |) ] |))). @@ -20147,6 +20863,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ M.read (| get_associated_constant (| Ty.path "u128", "MAX", Ty.path "u128" |) |) ] |))). @@ -20270,6 +20988,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -20307,6 +21027,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -20343,6 +21065,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -20378,6 +21102,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -20413,6 +21139,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -20447,6 +21175,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -20481,6 +21211,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -20515,6 +21247,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -20550,6 +21284,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -20646,6 +21382,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.read (| get_associated_constant (| Ty.path "isize", "MIN", Ty.path "isize" |) |) ] |))). @@ -20660,6 +21398,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.read (| get_associated_constant (| Ty.path "isize", "MAX", Ty.path "isize" |) |) ] |))). @@ -20783,6 +21523,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -20820,6 +21562,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -20856,6 +21600,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -20891,6 +21637,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -20926,6 +21674,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -20960,6 +21710,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -20994,6 +21746,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -21028,6 +21782,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -21063,6 +21819,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -21128,6 +21886,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -21162,6 +21922,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -21258,6 +22020,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.read (| get_associated_constant (| Ty.path "i8", "MIN", Ty.path "i8" |) |) ] |))). @@ -21272,6 +22036,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.read (| get_associated_constant (| Ty.path "i8", "MAX", Ty.path "i8" |) |) ] |))). @@ -21395,6 +22161,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -21432,6 +22200,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -21468,6 +22238,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -21503,6 +22275,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -21538,6 +22312,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -21572,6 +22348,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -21606,6 +22384,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -21640,6 +22420,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -21675,6 +22457,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -21740,6 +22524,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -21774,6 +22560,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -21870,6 +22658,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.read (| get_associated_constant (| Ty.path "i16", "MIN", Ty.path "i16" |) |) ] |))). @@ -21884,6 +22674,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.read (| get_associated_constant (| Ty.path "i16", "MAX", Ty.path "i16" |) |) ] |))). @@ -22007,6 +22799,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -22044,6 +22838,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -22080,6 +22876,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -22115,6 +22913,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -22150,6 +22950,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -22184,6 +22986,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -22218,6 +23022,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -22252,6 +23058,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -22287,6 +23095,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -22352,6 +23162,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -22386,6 +23198,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -22482,6 +23296,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.read (| get_associated_constant (| Ty.path "i32", "MIN", Ty.path "i32" |) |) ] |))). @@ -22496,6 +23312,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.read (| get_associated_constant (| Ty.path "i32", "MAX", Ty.path "i32" |) |) ] |))). @@ -22619,6 +23437,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -22656,6 +23476,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -22692,6 +23514,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -22727,6 +23551,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -22762,6 +23588,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -22796,6 +23624,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -22830,6 +23660,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -22864,6 +23696,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -22899,6 +23733,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -22964,6 +23800,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -22998,6 +23836,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -23094,6 +23934,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.read (| get_associated_constant (| Ty.path "i64", "MIN", Ty.path "i64" |) |) ] |))). @@ -23108,6 +23950,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.read (| get_associated_constant (| Ty.path "i64", "MAX", Ty.path "i64" |) |) ] |))). @@ -23231,6 +24075,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -23268,6 +24114,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -23304,6 +24152,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -23339,6 +24189,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -23374,6 +24226,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -23408,6 +24262,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -23442,6 +24298,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -23476,6 +24334,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -23511,6 +24371,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -23576,6 +24438,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -23610,6 +24474,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -23706,6 +24572,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.read (| get_associated_constant (| Ty.path "i128", "MIN", Ty.path "i128" |) |) ] |))). @@ -23720,6 +24588,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.read (| get_associated_constant (| Ty.path "i128", "MAX", Ty.path "i128" |) |) ] |))). @@ -23843,6 +24713,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -23880,6 +24752,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -23916,6 +24790,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -23951,6 +24827,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -23986,6 +24864,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -24020,6 +24900,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -24054,6 +24936,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -24088,6 +24972,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -24123,6 +25009,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -24188,6 +25076,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -24222,6 +25112,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -24328,6 +25220,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -24377,6 +25271,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -24426,6 +25322,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -24475,6 +25373,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -24524,6 +25424,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -24573,6 +25475,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::saturating::Saturating" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", diff --git a/CoqOfRust/core/num/wrapping.v b/CoqOfRust/core/num/wrapping.v index 2a056154f..d62dfb4d5 100644 --- a/CoqOfRust/core/num/wrapping.v +++ b/CoqOfRust/core/num/wrapping.v @@ -238,6 +238,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ T ] [ M.call_closure (| T, @@ -298,6 +300,8 @@ Module num. ltac:(M.monadic (Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ T ] [ M.call_closure (| T, @@ -666,6 +670,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -778,6 +784,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -890,6 +898,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -1005,6 +1015,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -1120,6 +1132,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -1235,6 +1249,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -1350,6 +1366,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -1465,6 +1483,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -1580,6 +1600,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -1695,6 +1717,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -1810,6 +1834,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -1925,6 +1951,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -2040,6 +2068,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -2152,6 +2182,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -2264,6 +2296,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -2379,6 +2413,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -2494,6 +2530,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -2609,6 +2647,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -2724,6 +2764,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -2839,6 +2881,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -2954,6 +2998,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -3069,6 +3115,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -3184,6 +3232,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -3299,6 +3349,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -3414,6 +3466,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -3535,7 +3589,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] + [ M.read (| other |) ] ] |) |) @@ -3575,6 +3633,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -3696,7 +3756,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] + [ M.read (| other |) ] ] |) |) @@ -3736,6 +3800,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -3857,7 +3923,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] + [ M.read (| other |) ] ] |) |) @@ -3897,6 +3967,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -4018,7 +4090,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] + [ M.read (| other |) ] ] |) |) @@ -4058,6 +4134,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -4179,7 +4257,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] + [ M.read (| other |) ] ] |) |) @@ -4218,6 +4300,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ UnOp.not (| M.read (| @@ -4263,6 +4347,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -4384,7 +4470,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] + [ M.read (| other |) ] ] |) |) @@ -4424,6 +4514,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -4545,7 +4637,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] + [ M.read (| other |) ] ] |) |) @@ -4585,6 +4681,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -4706,7 +4804,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] + [ M.read (| other |) ] ] |) |) @@ -4757,6 +4859,8 @@ Module num. [ Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ]; M.read (| self |) ] @@ -4795,6 +4899,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -4914,7 +5020,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] + [ M.read (| other |) ] ] |) |) @@ -4954,6 +5064,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -5073,7 +5185,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] + [ M.read (| other |) ] ] |) |) @@ -5113,6 +5229,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -5232,7 +5350,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] + [ M.read (| other |) ] ] |) |) @@ -5272,6 +5394,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -5391,7 +5515,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] + [ M.read (| other |) ] ] |) |) @@ -5431,6 +5559,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -5550,7 +5680,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] + [ M.read (| other |) ] ] |) |) @@ -5589,6 +5723,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ UnOp.not (| M.read (| @@ -5634,6 +5770,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -5753,7 +5891,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] + [ M.read (| other |) ] ] |) |) @@ -5793,6 +5935,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -5912,7 +6056,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] + [ M.read (| other |) ] ] |) |) @@ -5952,6 +6100,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -6071,7 +6221,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] + [ M.read (| other |) ] ] |) |) @@ -6122,6 +6276,8 @@ Module num. [ Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ Value.Integer IntegerKind.U8 0 ]; M.read (| self |) ] @@ -6160,6 +6316,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -6279,7 +6437,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] + [ M.read (| other |) ] ] |) |) @@ -6319,6 +6481,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -6438,7 +6602,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] + [ M.read (| other |) ] ] |) |) @@ -6478,6 +6646,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -6597,7 +6767,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] + [ M.read (| other |) ] ] |) |) @@ -6637,6 +6811,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -6756,7 +6932,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] + [ M.read (| other |) ] ] |) |) @@ -6796,6 +6976,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -6915,7 +7097,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] + [ M.read (| other |) ] ] |) |) @@ -6954,6 +7140,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ UnOp.not (| M.read (| @@ -6999,6 +7187,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -7118,7 +7308,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] + [ M.read (| other |) ] ] |) |) @@ -7158,6 +7352,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -7277,7 +7473,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] + [ M.read (| other |) ] ] |) |) @@ -7317,6 +7517,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -7436,7 +7638,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] + [ M.read (| other |) ] ] |) |) @@ -7487,6 +7693,8 @@ Module num. [ Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ Value.Integer IntegerKind.U16 0 ]; M.read (| self |) ] @@ -7525,6 +7733,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -7644,7 +7854,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] + [ M.read (| other |) ] ] |) |) @@ -7684,6 +7898,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -7803,7 +8019,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] + [ M.read (| other |) ] ] |) |) @@ -7843,6 +8063,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -7962,7 +8184,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] + [ M.read (| other |) ] ] |) |) @@ -8002,6 +8228,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -8121,7 +8349,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] + [ M.read (| other |) ] ] |) |) @@ -8161,6 +8393,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -8280,7 +8514,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] + [ M.read (| other |) ] ] |) |) @@ -8319,6 +8557,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ UnOp.not (| M.read (| @@ -8364,6 +8604,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -8483,7 +8725,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] + [ M.read (| other |) ] ] |) |) @@ -8523,6 +8769,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -8642,7 +8890,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] + [ M.read (| other |) ] ] |) |) @@ -8682,6 +8934,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -8801,7 +9055,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] + [ M.read (| other |) ] ] |) |) @@ -8852,6 +9110,8 @@ Module num. [ Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ Value.Integer IntegerKind.U32 0 ]; M.read (| self |) ] @@ -8890,6 +9150,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -9009,7 +9271,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] + [ M.read (| other |) ] ] |) |) @@ -9049,6 +9315,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -9168,7 +9436,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] + [ M.read (| other |) ] ] |) |) @@ -9208,6 +9480,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -9327,7 +9601,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] + [ M.read (| other |) ] ] |) |) @@ -9367,6 +9645,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -9486,7 +9766,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] + [ M.read (| other |) ] ] |) |) @@ -9526,6 +9810,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -9645,7 +9931,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] + [ M.read (| other |) ] ] |) |) @@ -9684,6 +9974,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ UnOp.not (| M.read (| @@ -9729,6 +10021,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -9848,7 +10142,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] + [ M.read (| other |) ] ] |) |) @@ -9888,6 +10186,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -10007,7 +10307,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] + [ M.read (| other |) ] ] |) |) @@ -10047,6 +10351,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -10166,7 +10472,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] + [ M.read (| other |) ] ] |) |) @@ -10217,6 +10527,8 @@ Module num. [ Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ Value.Integer IntegerKind.U64 0 ]; M.read (| self |) ] @@ -10255,6 +10567,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -10376,7 +10690,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] + [ M.read (| other |) ] ] |) |) @@ -10416,6 +10734,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -10537,7 +10857,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] + [ M.read (| other |) ] ] |) |) @@ -10577,6 +10901,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -10698,7 +11024,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] + [ M.read (| other |) ] ] |) |) @@ -10738,6 +11068,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -10859,7 +11191,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] + [ M.read (| other |) ] ] |) |) @@ -10899,6 +11235,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -11020,7 +11358,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] + [ M.read (| other |) ] ] |) |) @@ -11059,6 +11401,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ UnOp.not (| M.read (| @@ -11104,6 +11448,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -11225,7 +11571,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] + [ M.read (| other |) ] ] |) |) @@ -11265,6 +11615,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -11386,7 +11738,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] + [ M.read (| other |) ] ] |) |) @@ -11426,6 +11782,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -11547,7 +11905,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] + [ M.read (| other |) ] ] |) |) @@ -11598,6 +11960,8 @@ Module num. [ Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ Value.Integer IntegerKind.U128 0 ]; M.read (| self |) ] @@ -11636,6 +12000,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -11757,7 +12123,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] + [ M.read (| other |) ] ] |) |) @@ -11797,6 +12167,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -11918,7 +12290,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] + [ M.read (| other |) ] ] |) |) @@ -11958,6 +12334,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -12079,7 +12457,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] + [ M.read (| other |) ] ] |) |) @@ -12119,6 +12501,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -12240,7 +12624,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] + [ M.read (| other |) ] ] |) |) @@ -12280,6 +12668,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -12401,7 +12791,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] + [ M.read (| other |) ] ] |) |) @@ -12440,6 +12834,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ UnOp.not (| M.read (| @@ -12485,6 +12881,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -12606,7 +13004,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] + [ M.read (| other |) ] ] |) |) @@ -12646,6 +13048,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -12767,7 +13171,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] + [ M.read (| other |) ] ] |) |) @@ -12807,6 +13215,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -12928,7 +13338,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] + [ M.read (| other |) ] ] |) |) @@ -12979,6 +13393,8 @@ Module num. [ Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ Value.Integer IntegerKind.Isize 0 ]; M.read (| self |) ] @@ -13017,6 +13433,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -13136,7 +13554,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] + [ M.read (| other |) ] ] |) |) @@ -13176,6 +13598,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -13295,7 +13719,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] + [ M.read (| other |) ] ] |) |) @@ -13335,6 +13763,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -13454,7 +13884,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] + [ M.read (| other |) ] ] |) |) @@ -13494,6 +13928,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -13613,7 +14049,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] + [ M.read (| other |) ] ] |) |) @@ -13653,6 +14093,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -13772,7 +14214,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] + [ M.read (| other |) ] ] |) |) @@ -13811,6 +14257,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ UnOp.not (| M.read (| @@ -13856,6 +14304,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -13975,7 +14425,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] + [ M.read (| other |) ] ] |) |) @@ -14015,6 +14469,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -14134,7 +14590,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] + [ M.read (| other |) ] ] |) |) @@ -14174,6 +14634,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -14293,7 +14755,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] + [ M.read (| other |) ] ] |) |) @@ -14344,6 +14810,8 @@ Module num. [ Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ Value.Integer IntegerKind.I8 0 ]; M.read (| self |) ] @@ -14382,6 +14850,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -14501,7 +14971,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] + [ M.read (| other |) ] ] |) |) @@ -14541,6 +15015,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -14660,7 +15136,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] + [ M.read (| other |) ] ] |) |) @@ -14700,6 +15180,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -14819,7 +15301,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] + [ M.read (| other |) ] ] |) |) @@ -14859,6 +15345,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -14978,7 +15466,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] + [ M.read (| other |) ] ] |) |) @@ -15018,6 +15510,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -15137,7 +15631,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] + [ M.read (| other |) ] ] |) |) @@ -15176,6 +15674,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ UnOp.not (| M.read (| @@ -15221,6 +15721,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -15340,7 +15842,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] + [ M.read (| other |) ] ] |) |) @@ -15380,6 +15886,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -15499,7 +16007,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] + [ M.read (| other |) ] ] |) |) @@ -15539,6 +16051,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -15658,7 +16172,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] + [ M.read (| other |) ] ] |) |) @@ -15709,6 +16227,8 @@ Module num. [ Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ Value.Integer IntegerKind.I16 0 ]; M.read (| self |) ] @@ -15747,6 +16267,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -15866,7 +16388,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] + [ M.read (| other |) ] ] |) |) @@ -15906,6 +16432,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -16025,7 +16553,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] + [ M.read (| other |) ] ] |) |) @@ -16065,6 +16597,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -16184,7 +16718,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] + [ M.read (| other |) ] ] |) |) @@ -16224,6 +16762,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -16343,7 +16883,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] + [ M.read (| other |) ] ] |) |) @@ -16383,6 +16927,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -16502,7 +17048,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] + [ M.read (| other |) ] ] |) |) @@ -16541,6 +17091,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ UnOp.not (| M.read (| @@ -16586,6 +17138,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -16705,7 +17259,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] + [ M.read (| other |) ] ] |) |) @@ -16745,6 +17303,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -16864,7 +17424,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] + [ M.read (| other |) ] ] |) |) @@ -16904,6 +17468,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -17023,7 +17589,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] + [ M.read (| other |) ] ] |) |) @@ -17074,6 +17644,8 @@ Module num. [ Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ Value.Integer IntegerKind.I32 0 ]; M.read (| self |) ] @@ -17112,6 +17684,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -17231,7 +17805,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] + [ M.read (| other |) ] ] |) |) @@ -17271,6 +17849,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -17390,7 +17970,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] + [ M.read (| other |) ] ] |) |) @@ -17430,6 +18014,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -17549,7 +18135,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] + [ M.read (| other |) ] ] |) |) @@ -17589,6 +18179,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -17708,7 +18300,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] + [ M.read (| other |) ] ] |) |) @@ -17748,6 +18344,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -17867,7 +18465,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] + [ M.read (| other |) ] ] |) |) @@ -17906,6 +18508,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ UnOp.not (| M.read (| @@ -17951,6 +18555,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -18070,7 +18676,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] + [ M.read (| other |) ] ] |) |) @@ -18110,6 +18720,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -18229,7 +18841,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] + [ M.read (| other |) ] ] |) |) @@ -18269,6 +18885,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -18388,7 +19006,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] + [ M.read (| other |) ] ] |) |) @@ -18439,6 +19061,8 @@ Module num. [ Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ Value.Integer IntegerKind.I64 0 ]; M.read (| self |) ] @@ -18477,6 +19101,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -18598,7 +19224,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] + [ M.read (| other |) ] ] |) |) @@ -18638,6 +19268,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -18759,7 +19391,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] + [ M.read (| other |) ] ] |) |) @@ -18799,6 +19435,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -18920,7 +19558,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] + [ M.read (| other |) ] ] |) |) @@ -18960,6 +19602,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -19081,7 +19725,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] + [ M.read (| other |) ] ] |) |) @@ -19121,6 +19769,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -19242,7 +19892,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] + [ M.read (| other |) ] ] |) |) @@ -19281,6 +19935,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ UnOp.not (| M.read (| @@ -19326,6 +19982,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -19447,7 +20105,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] + [ M.read (| other |) ] ] |) |) @@ -19487,6 +20149,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -19608,7 +20272,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] + [ M.read (| other |) ] ] |) |) @@ -19648,6 +20316,8 @@ Module num. let other := M.alloc (| other |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -19769,7 +20439,11 @@ Module num. |), [ M.read (| M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| other |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] + [ M.read (| other |) ] ] |) |) @@ -19820,6 +20494,8 @@ Module num. [ Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ Value.Integer IntegerKind.I128 0 ]; M.read (| self |) ] @@ -19848,6 +20524,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.read (| get_associated_constant (| Ty.path "usize", "MIN", Ty.path "usize" |) |) ] |))). @@ -19862,6 +20540,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.read (| get_associated_constant (| Ty.path "usize", "MAX", Ty.path "usize" |) |) ] |))). @@ -19973,6 +20653,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -20010,6 +20692,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -20046,6 +20730,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -20081,6 +20767,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -20116,6 +20804,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -20150,6 +20840,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -20184,6 +20876,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -20218,6 +20912,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -20253,6 +20949,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -20341,6 +21039,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -20381,6 +21081,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.read (| get_associated_constant (| Ty.path "u8", "MIN", Ty.path "u8" |) |) ] |))). @@ -20395,6 +21097,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.read (| get_associated_constant (| Ty.path "u8", "MAX", Ty.path "u8" |) |) ] |))). @@ -20506,6 +21210,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -20543,6 +21249,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -20579,6 +21287,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -20614,6 +21324,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -20649,6 +21361,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -20683,6 +21397,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -20717,6 +21433,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -20751,6 +21469,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -20786,6 +21506,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -20874,6 +21596,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u8" ] [ M.call_closure (| Ty.path "u8", @@ -20914,6 +21638,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.read (| get_associated_constant (| Ty.path "u16", "MIN", Ty.path "u16" |) |) ] |))). @@ -20928,6 +21654,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.read (| get_associated_constant (| Ty.path "u16", "MAX", Ty.path "u16" |) |) ] |))). @@ -21039,6 +21767,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -21076,6 +21806,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -21112,6 +21844,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -21147,6 +21881,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -21182,6 +21918,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -21216,6 +21954,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -21250,6 +21990,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -21284,6 +22026,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -21319,6 +22063,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -21407,6 +22153,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u16" ] [ M.call_closure (| Ty.path "u16", @@ -21447,6 +22195,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.read (| get_associated_constant (| Ty.path "u32", "MIN", Ty.path "u32" |) |) ] |))). @@ -21461,6 +22211,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.read (| get_associated_constant (| Ty.path "u32", "MAX", Ty.path "u32" |) |) ] |))). @@ -21572,6 +22324,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -21609,6 +22363,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -21645,6 +22401,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -21680,6 +22438,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -21715,6 +22475,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -21749,6 +22511,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -21783,6 +22547,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -21817,6 +22583,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -21852,6 +22620,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -21940,6 +22710,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u32" ] [ M.call_closure (| Ty.path "u32", @@ -21980,6 +22752,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.read (| get_associated_constant (| Ty.path "u64", "MIN", Ty.path "u64" |) |) ] |))). @@ -21994,6 +22768,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.read (| get_associated_constant (| Ty.path "u64", "MAX", Ty.path "u64" |) |) ] |))). @@ -22105,6 +22881,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -22142,6 +22920,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -22178,6 +22958,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -22213,6 +22995,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -22248,6 +23032,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -22282,6 +23068,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -22316,6 +23104,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -22350,6 +23140,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -22385,6 +23177,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -22473,6 +23267,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", @@ -22513,6 +23309,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.read (| get_associated_constant (| Ty.path "u128", "MIN", Ty.path "u128" |) |) ] |))). @@ -22527,6 +23325,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.read (| get_associated_constant (| Ty.path "u128", "MAX", Ty.path "u128" |) |) ] |))). @@ -22638,6 +23438,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -22675,6 +23477,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -22711,6 +23515,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -22746,6 +23552,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -22781,6 +23589,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -22815,6 +23625,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -22849,6 +23661,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -22883,6 +23697,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -22918,6 +23734,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -23006,6 +23824,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u128" ] [ M.call_closure (| Ty.path "u128", @@ -23046,6 +23866,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.read (| get_associated_constant (| Ty.path "isize", "MIN", Ty.path "isize" |) |) ] |))). @@ -23060,6 +23882,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.read (| get_associated_constant (| Ty.path "isize", "MAX", Ty.path "isize" |) |) ] |))). @@ -23171,6 +23995,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -23208,6 +24034,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -23244,6 +24072,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -23279,6 +24109,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -23314,6 +24146,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -23348,6 +24182,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -23382,6 +24218,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -23416,6 +24254,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -23451,6 +24291,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -23512,6 +24354,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -23546,6 +24390,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "isize" ] [ M.call_closure (| Ty.path "isize", @@ -23634,6 +24480,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.read (| get_associated_constant (| Ty.path "i8", "MIN", Ty.path "i8" |) |) ] |))). @@ -23648,6 +24496,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.read (| get_associated_constant (| Ty.path "i8", "MAX", Ty.path "i8" |) |) ] |))). @@ -23759,6 +24609,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -23796,6 +24648,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -23832,6 +24686,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -23867,6 +24723,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -23902,6 +24760,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -23936,6 +24796,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -23970,6 +24832,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -24004,6 +24868,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -24039,6 +24905,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -24100,6 +24968,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -24134,6 +25004,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i8" ] [ M.call_closure (| Ty.path "i8", @@ -24222,6 +25094,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.read (| get_associated_constant (| Ty.path "i16", "MIN", Ty.path "i16" |) |) ] |))). @@ -24236,6 +25110,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.read (| get_associated_constant (| Ty.path "i16", "MAX", Ty.path "i16" |) |) ] |))). @@ -24347,6 +25223,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -24384,6 +25262,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -24420,6 +25300,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -24455,6 +25337,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -24490,6 +25374,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -24524,6 +25410,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -24558,6 +25446,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -24592,6 +25482,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -24627,6 +25519,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -24688,6 +25582,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -24722,6 +25618,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i16" ] [ M.call_closure (| Ty.path "i16", @@ -24810,6 +25708,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.read (| get_associated_constant (| Ty.path "i32", "MIN", Ty.path "i32" |) |) ] |))). @@ -24824,6 +25724,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.read (| get_associated_constant (| Ty.path "i32", "MAX", Ty.path "i32" |) |) ] |))). @@ -24935,6 +25837,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -24972,6 +25876,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -25008,6 +25914,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -25043,6 +25951,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -25078,6 +25988,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -25112,6 +26024,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -25146,6 +26060,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -25180,6 +26096,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -25215,6 +26133,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -25276,6 +26196,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -25310,6 +26232,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -25398,6 +26322,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.read (| get_associated_constant (| Ty.path "i64", "MIN", Ty.path "i64" |) |) ] |))). @@ -25412,6 +26338,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.read (| get_associated_constant (| Ty.path "i64", "MAX", Ty.path "i64" |) |) ] |))). @@ -25523,6 +26451,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -25560,6 +26490,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -25596,6 +26528,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -25631,6 +26565,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -25666,6 +26602,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -25700,6 +26638,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -25734,6 +26674,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -25768,6 +26710,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -25803,6 +26747,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -25864,6 +26810,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -25898,6 +26846,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i64" ] [ M.call_closure (| Ty.path "i64", @@ -25986,6 +26936,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.read (| get_associated_constant (| Ty.path "i128", "MIN", Ty.path "i128" |) |) ] |))). @@ -26000,6 +26952,8 @@ Module num. (M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.read (| get_associated_constant (| Ty.path "i128", "MAX", Ty.path "i128" |) |) ] |))). @@ -26111,6 +27065,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -26148,6 +27104,8 @@ Module num. let n := M.alloc (| n |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -26184,6 +27142,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -26219,6 +27179,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -26254,6 +27216,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -26288,6 +27252,8 @@ Module num. (let x := M.alloc (| x |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -26322,6 +27288,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -26356,6 +27324,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -26391,6 +27361,8 @@ Module num. let exp := M.alloc (| exp |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -26452,6 +27424,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", @@ -26486,6 +27460,8 @@ Module num. (let self := M.alloc (| self |) in Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "i128" ] [ M.call_closure (| Ty.path "i128", diff --git a/CoqOfRust/core/ops/control_flow.v b/CoqOfRust/core/ops/control_flow.v index 03302531c..0a3d942f5 100644 --- a/CoqOfRust/core/ops/control_flow.v +++ b/CoqOfRust/core/ops/control_flow.v @@ -168,6 +168,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" + [] + [ B; C ] [ M.call_closure (| C, @@ -198,6 +200,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Break" + [] + [ B; C ] [ M.call_closure (| B, @@ -617,6 +621,8 @@ Module ops. (let output := M.alloc (| output |) in Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" + [] + [ B; C ] [ M.read (| output |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -666,6 +672,14 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" + [] + [ + Ty.apply + (Ty.path "core::ops::control_flow::ControlFlow") + [] + [ B; Ty.path "core::convert::Infallible" ]; + C + ] [ M.read (| c |) ] |))); fun γ => @@ -680,9 +694,19 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Break" + [] + [ + Ty.apply + (Ty.path "core::ops::control_flow::ControlFlow") + [] + [ B; Ty.path "core::convert::Infallible" ]; + C + ] [ Value.StructTuple "core::ops::control_flow::ControlFlow::Break" + [] + [ B; Ty.path "core::convert::Infallible" ] [ M.read (| b |) ] ] |))) @@ -750,6 +774,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Break" + [] + [ B; C ] [ M.read (| b |) ] |))) ] @@ -911,7 +937,7 @@ Module ops. γ, "core::ops::control_flow::ControlFlow::Continue" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ B ] [] |))); fun γ => ltac:(M.monadic (let γ0_0 := @@ -922,7 +948,7 @@ Module ops. |) in let x := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| x |) ] + Value.StructTuple "core::option::Option::Some" [] [ B ] [ M.read (| x |) ] |))) ] |) @@ -971,6 +997,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" + [] + [ T; C ] [ M.read (| x |) ] |))); fun γ => @@ -985,6 +1013,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Break" + [] + [ T; C ] [ M.call_closure (| T, @@ -1047,13 +1077,13 @@ Module ops. |) in let x := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| x |) ] + Value.StructTuple "core::option::Option::Some" [] [ C ] [ M.read (| x |) ] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::ops::control_flow::ControlFlow::Break" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ C ] [] |))) ] |) |))) @@ -1106,6 +1136,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" + [] + [ B; T ] [ M.call_closure (| T, @@ -1134,6 +1166,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Break" + [] + [ B; T ] [ M.read (| x |) ] |))) ] @@ -1215,6 +1249,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" + [] + [ R; Ty.associated_in_trait "core::ops::try_trait::Try" [] [] R "Output" ] [ M.read (| v |) ] |))); fun γ => @@ -1229,6 +1265,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Break" + [] + [ R; Ty.associated_in_trait "core::ops::try_trait::Try" [] [] R "Output" ] [ M.call_closure (| R, diff --git a/CoqOfRust/core/ops/coroutine.v b/CoqOfRust/core/ops/coroutine.v index 148ba02c6..a1496b0a7 100644 --- a/CoqOfRust/core/ops/coroutine.v +++ b/CoqOfRust/core/ops/coroutine.v @@ -59,6 +59,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::coroutine::CoroutineState::Yielded" + [] + [ Y; R ] [ M.call_closure (| Y, @@ -89,6 +91,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::coroutine::CoroutineState::Complete" + [] + [ Y; R ] [ M.call_closure (| R, diff --git a/CoqOfRust/core/ops/index_range.v b/CoqOfRust/core/ops/index_range.v index b43f37674..85b3e6378 100644 --- a/CoqOfRust/core/ops/index_range.v +++ b/CoqOfRust/core/ops/index_range.v @@ -22,6 +22,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructRecord "core::ops::index_range::IndexRange" + [] + [] [ ("start", M.call_closure (| @@ -334,6 +336,8 @@ Module ops. M.alloc (| Value.StructRecord "core::ops::index_range::IndexRange" + [] + [] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)) ] |) |))) @@ -357,6 +361,8 @@ Module ops. (let end_ := M.alloc (| end_ |) in Value.StructRecord "core::ops::index_range::IndexRange" + [] + [] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| end_ |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -775,6 +781,8 @@ Module ops. M.alloc (| Value.StructRecord "core::ops::index_range::IndexRange" + [] + [] [ ("start", M.read (| @@ -902,6 +910,8 @@ Module ops. M.alloc (| Value.StructRecord "core::ops::index_range::IndexRange" + [] + [] [ ("start", M.read (| mid |)); ("end_", @@ -998,6 +1008,8 @@ Module ops. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -1014,7 +1026,9 @@ Module ops. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))) ] |) |))) @@ -1050,7 +1064,11 @@ Module ops. Value.Tuple [ M.read (| len |); - Value.StructTuple "core::option::Option::Some" [ M.read (| len |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| len |) ] ] |) |))) @@ -1154,8 +1172,21 @@ Module ops. |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) @@ -1237,6 +1268,8 @@ Module ops. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -1253,7 +1286,9 @@ Module ops. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))) ] |) |))) @@ -1357,8 +1392,21 @@ Module ops. |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) diff --git a/CoqOfRust/core/ops/links/control_flow.v b/CoqOfRust/core/ops/links/control_flow.v index c1af32f45..1c43cc9bb 100644 --- a/CoqOfRust/core/ops/links/control_flow.v +++ b/CoqOfRust/core/ops/links/control_flow.v @@ -17,8 +17,8 @@ Module ControlFlow. Global Instance IsLink (B C : Set) `{Link B} `{Link C} : Link (t B C) := { Φ := Ty.apply (Ty.path "core::ops::control_flow::ControlFlow") [] [Φ B; Φ C]; φ x := match x with - | Continue c => Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" [φ c] - | Break b => Value.StructTuple "core::ops::control_flow::ControlFlow::Break" [φ b] + | Continue c => Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" [] [Φ B; Φ C] [φ c] + | Break b => Value.StructTuple "core::ops::control_flow::ControlFlow::Break" [] [Φ B; Φ C] [φ b] end; }. @@ -34,8 +34,8 @@ Module ControlFlow. Lemma of_value_with_Continue {B C : Set} `{Link B} `{Link C} (c : C) c' : c' = φ c -> - Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" [c'] = - φ (Continue c). + Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" [] [Φ B; Φ C] [c'] = + φ (Continue (B := B) (C := C) c). Proof. intros; subst; reflexivity. Qed. @@ -44,35 +44,43 @@ Module ControlFlow. Lemma of_value_with_Break {B C : Set} `{Link B} `{Link C} (b : B) b' : b' = φ b -> - Value.StructTuple "core::ops::control_flow::ControlFlow::Break" [b'] = - φ (Break b). + Value.StructTuple "core::ops::control_flow::ControlFlow::Break" [] [Φ B; Φ C] [b'] = + φ (Break (B := B) (C := C) b). Proof. intros; subst; reflexivity. Qed. Smpl Add apply of_value_with_Break : of_value. - Definition of_value_Continue {B C : Set} `{Link B} `{Link C} - (c : C) c' : - c' = φ c -> - OfValue.t (Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" [c']). + Definition of_value_Continue B' C' c' : + forall + (of_ty_B : OfTy.t B') + (of_value_c : OfValue.t c'), + C' = Φ (OfValue.get_Set of_value_c) -> + OfValue.t (Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" [] [B'; C'] [c']). Proof. - intros; eapply OfValue.Make with (A := t B C) (value := Continue c). - now subst. + intros [B] [C ? c] **. + eapply OfValue.Make with (A := t B C) (value := Continue c). + subst. + now eapply of_value_with_Continue. Defined. - Smpl Add eapply of_value_Continue : of_value. + Smpl Add unshelve eapply of_value_Continue : of_value. - Definition of_value_Break {B C : Set} `{Link B} `{Link C} - (b : B) b' : - b' = φ b -> - OfValue.t (Value.StructTuple "core::ops::control_flow::ControlFlow::Break" [b']). + Definition of_value_Break B' C' b' : + forall + (of_ty_C : OfTy.t C') + (of_value_b : OfValue.t b'), + B' = Φ (OfValue.get_Set of_value_b) -> + OfValue.t (Value.StructTuple "core::ops::control_flow::ControlFlow::Break" [] [B'; C'] [b']). Proof. - intros; eapply OfValue.Make with (A := t B C) (value := Break b). - now subst. + intros [C] [B ? b] **. + eapply OfValue.Make with (A := t B C) (value := Break b). + subst. + now eapply of_value_with_Break. Defined. - Smpl Add eapply of_value_Break : of_value. + Smpl Add unshelve eapply of_value_Break : of_value. Module SubPointer. - Definition get_Continue_0 {B C : Set} `{Link B} `{Link C} : + Definition get_Continue_0 (B C : Set) `{Link B} `{Link C} : SubPointer.Runner.t (t B C) (Pointer.Index.StructTuple "core::ops::control_flow::ControlFlow::Continue" 0) := @@ -90,13 +98,13 @@ Module ControlFlow. |}. Lemma get_Continue_0_is_valid {B C : Set} `{Link B} `{Link C} : - SubPointer.Runner.Valid.t (get_Continue_0 (B := B) (C := C)). + SubPointer.Runner.Valid.t (get_Continue_0 B C). Proof. sauto lq: on. Qed. Smpl Add apply get_Continue_0_is_valid : run_sub_pointer. - Definition get_Break_0 {B C : Set} `{Link B} `{Link C} : + Definition get_Break_0 (B C : Set) `{Link B} `{Link C} : SubPointer.Runner.t (t B C) (Pointer.Index.StructTuple "core::ops::control_flow::ControlFlow::Break" 0) := @@ -114,7 +122,7 @@ Module ControlFlow. |}. Lemma get_Break_0_is_valid {B C : Set} `{Link B} `{Link C} : - SubPointer.Runner.Valid.t (get_Break_0 (B := B) (C := C)). + SubPointer.Runner.Valid.t (get_Break_0 B C). Proof. sauto lq: on. Qed. diff --git a/CoqOfRust/core/ops/links/index_range.v b/CoqOfRust/core/ops/links/index_range.v index 145c186db..c9a8799d1 100644 --- a/CoqOfRust/core/ops/links/index_range.v +++ b/CoqOfRust/core/ops/links/index_range.v @@ -16,7 +16,7 @@ Module IndexRange. Global Instance IsLink : Link t := { Φ := Ty.path "core::ops::index_range::IndexRange"; - φ x := Value.StructRecord "core::ops::index_range::IndexRange" [ + φ x := Value.StructRecord "core::ops::index_range::IndexRange" [] [] [ ("start", φ x.(start)); ("end_", φ x.(end_)) ]; @@ -29,7 +29,7 @@ Module IndexRange. Lemma of_value_with start start' end_ end_' : start' = φ start -> end_' = φ end_ -> - Value.StructRecord "core::ops::index_range::IndexRange" [ + Value.StructRecord "core::ops::index_range::IndexRange" [] [] [ ("start", start'); ("end_", end_') ] = φ (Build_t start end_). @@ -39,7 +39,7 @@ Module IndexRange. Definition of_value (start : Usize.t) start' (end_ : Usize.t) end_' : start' = φ start -> end_' = φ end_ -> - OfValue.t (Value.StructRecord "core::ops::index_range::IndexRange" [ + OfValue.t (Value.StructRecord "core::ops::index_range::IndexRange" [] [] [ ("start", start'); ("end_", end_') ]). diff --git a/CoqOfRust/core/ops/links/range.v b/CoqOfRust/core/ops/links/range.v index 5d340afaf..ead6ededd 100644 --- a/CoqOfRust/core/ops/links/range.v +++ b/CoqOfRust/core/ops/links/range.v @@ -20,7 +20,7 @@ Module Range. Φ := Ty.apply (Ty.path "core::ops::range::Range") [] [ Φ Idx ]; φ x := - Value.StructRecord "core::ops::range::Range" [ + Value.StructRecord "core::ops::range::Range" [] [ Φ Idx ] [ ("start", φ x.(start)); ("end", φ x.(end_)) ]; @@ -69,9 +69,9 @@ Module Bound. Φ := Ty.apply (Ty.path "core::ops::Range::Bound") [] [Φ T]; φ x := match x with - | Included x => Value.StructTuple "core::ops::Range::Bound::Included" [φ x] - | Excluded x => Value.StructTuple "core::ops::Range::Bound::Excluded" [φ x] - | Unbounded => Value.StructTuple "core::ops::Range::Bound::Unbounded" [] + | Included x => Value.StructTuple "core::ops::Range::Bound::Included" [] [Φ T] [φ x] + | Excluded x => Value.StructTuple "core::ops::Range::Bound::Excluded" [] [Φ T] [φ x] + | Unbounded => Value.StructTuple "core::ops::Range::Bound::Unbounded" [] [Φ T] [] end; }. End Bound. @@ -154,7 +154,7 @@ Module RangeTo. Global Instance IsLink (Idx : Set) `{Link Idx} : Link (t Idx) := { Φ := Ty.apply (Ty.path "core::ops::range::RangeTo") [] [Φ Idx]; - φ x := Value.StructRecord "core::ops::range::RangeTo" [("end_", φ x.(end_))]; + φ x := Value.StructRecord "core::ops::range::RangeTo" [] [Φ Idx] [("end_", φ x.(end_))]; }. Definition of_ty (Idx_ty : Ty.t) : @@ -168,24 +168,26 @@ Module RangeTo. Defined. Smpl Add eapply of_ty : of_ty. - Lemma of_value_with {Idx : Set} `{Link Idx} (end_ : Idx) end_' : + Lemma of_value_with {Idx : Set} `{Link Idx} Idx' (end_ : Idx) end_' : + Idx' = Φ Idx -> end_' = φ end_ -> - Value.StructRecord "core::ops::range::RangeTo" [("end_", end_')] = - φ (Build_t _ end_). + Value.StructRecord "core::ops::range::RangeTo" [] [Idx'] [("end_", end_')] = + φ (Build_t Idx end_). Proof. now intros; subst. Qed. Smpl Add eapply of_value_with : of_value. - Definition of_value end_' : - OfValue.t end_' -> - OfValue.t (Value.StructRecord "core::ops::range::RangeTo" [("end_", end_')]). + Definition of_value Idx' end_' : + forall + (of_value_end : OfValue.t end_'), + Idx' = Φ (OfValue.get_Set of_value_end) -> + OfValue.t (Value.StructRecord "core::ops::range::RangeTo" [] [Idx'] [("end_", end_')]). Proof. - intros [Idx ? end_]. + intros [Idx ? end_] **. eapply OfValue.Make with (A := t Idx) (value := Build_t Idx end_). - subst. - reflexivity. + now subst. Defined. - Smpl Add eapply of_value : of_value. + Smpl Add unshelve eapply of_value : of_value. End RangeTo. Export RangeTo. diff --git a/CoqOfRust/core/ops/range.v b/CoqOfRust/core/ops/range.v index 2942e8249..f8a8f4638 100644 --- a/CoqOfRust/core/ops/range.v +++ b/CoqOfRust/core/ops/range.v @@ -51,7 +51,7 @@ Module ops. (* Default *) Definition default (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "core::ops::range::RangeFull" [])) + | [], [], [] => ltac:(M.monadic (Value.StructTuple "core::ops::range::RangeFull" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -226,6 +226,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructRecord "core::ops::range::Range" + [] + [ Idx ] [ ("start", M.call_closure (| @@ -293,6 +295,8 @@ Module ops. ltac:(M.monadic (Value.StructRecord "core::ops::range::Range" + [] + [ Idx ] [ ("start", M.call_closure (| @@ -909,7 +913,13 @@ Module ops. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1036,6 +1046,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Idx ] [ ("start", M.call_closure (| @@ -1478,7 +1490,13 @@ Module ops. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1575,6 +1593,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructRecord "core::ops::range::RangeTo" + [] + [ Idx ] [ ("end_", M.call_closure (| @@ -2017,7 +2037,13 @@ Module ops. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2100,6 +2126,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructRecord "core::ops::range::RangeInclusive" + [] + [ Idx ] [ ("start", M.call_closure (| @@ -2460,6 +2488,8 @@ Module ops. let end_ := M.alloc (| end_ |) in Value.StructRecord "core::ops::range::RangeInclusive" + [] + [ Idx ] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)); @@ -2753,6 +2783,8 @@ Module ops. M.alloc (| Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", M.read (| exclusive_end |)) ] |) |))) @@ -3296,7 +3328,13 @@ Module ops. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3348,6 +3386,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructRecord "core::ops::range::RangeToInclusive" + [] + [ Idx ] [ ("end_", M.call_closure (| @@ -3790,7 +3830,13 @@ Module ops. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3907,6 +3953,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::range::Bound::Included" + [] + [ T ] [ M.call_closure (| T, @@ -3937,6 +3985,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::range::Bound::Excluded" + [] + [ T ] [ M.call_closure (| T, @@ -3958,7 +4008,9 @@ Module ops. ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::ops::range::Bound::Unbounded" |) in - M.alloc (| Value.StructTuple "core::ops::range::Bound::Unbounded" [] |))) + M.alloc (| + Value.StructTuple "core::ops::range::Bound::Unbounded" [] [ T ] [] + |))) ] |) |))) @@ -4478,6 +4530,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| x |) |) |) ] |))); fun γ => @@ -4492,12 +4546,20 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::range::Bound::Excluded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| x |) |) |) ] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::ops::range::Bound::Unbounded" |) in - M.alloc (| Value.StructTuple "core::ops::range::Bound::Unbounded" [] |))) + M.alloc (| + Value.StructTuple + "core::ops::range::Bound::Unbounded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |))) ] |) |))) @@ -4550,6 +4612,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| x |) |) |) ] |))); fun γ => @@ -4564,12 +4628,20 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::range::Bound::Excluded" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| x |) |) |) ] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::ops::range::Bound::Unbounded" |) in - M.alloc (| Value.StructTuple "core::ops::range::Bound::Unbounded" [] |))) + M.alloc (| + Value.StructTuple + "core::ops::range::Bound::Unbounded" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + [] + |))) ] |) |))) @@ -4606,7 +4678,9 @@ Module ops. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::ops::range::Bound::Unbounded" |) in - M.alloc (| Value.StructTuple "core::ops::range::Bound::Unbounded" [] |))); + M.alloc (| + Value.StructTuple "core::ops::range::Bound::Unbounded" [] [ U ] [] + |))); fun γ => ltac:(M.monadic (let γ0_0 := @@ -4619,6 +4693,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::range::Bound::Included" + [] + [ U ] [ M.call_closure (| U, @@ -4647,6 +4723,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::range::Bound::Excluded" + [] + [ U ] [ M.call_closure (| U, @@ -4703,7 +4781,9 @@ Module ops. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::ops::range::Bound::Unbounded" |) in - M.alloc (| Value.StructTuple "core::ops::range::Bound::Unbounded" [] |))); + M.alloc (| + Value.StructTuple "core::ops::range::Bound::Unbounded" [] [ T ] [] + |))); fun γ => ltac:(M.monadic (let γ0_0 := @@ -4716,6 +4796,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::range::Bound::Included" + [] + [ T ] [ M.call_closure (| T, @@ -4744,6 +4826,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::range::Bound::Excluded" + [] + [ T ] [ M.call_closure (| T, @@ -4998,7 +5082,11 @@ Module ops. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::ops::range::Bound::Unbounded" [])) + Value.StructTuple + "core::ops::range::Bound::Unbounded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5013,7 +5101,11 @@ Module ops. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::ops::range::Bound::Unbounded" [])) + Value.StructTuple + "core::ops::range::Bound::Unbounded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5048,6 +5140,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -5077,7 +5171,11 @@ Module ops. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::ops::range::Bound::Unbounded" [])) + Value.StructTuple + "core::ops::range::Bound::Unbounded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5109,7 +5207,11 @@ Module ops. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::ops::range::Bound::Unbounded" [])) + Value.StructTuple + "core::ops::range::Bound::Unbounded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5126,6 +5228,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Excluded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -5174,6 +5278,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -5205,6 +5311,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Excluded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -5254,6 +5362,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -5315,6 +5425,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::range::Bound::Excluded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -5336,6 +5448,8 @@ Module ops. (M.alloc (| Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -5387,7 +5501,11 @@ Module ops. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::ops::range::Bound::Unbounded" [])) + Value.StructTuple + "core::ops::range::Bound::Unbounded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5404,6 +5522,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -5486,6 +5606,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| start |) |) |) ] |))); fun γ => @@ -5502,6 +5624,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::range::Bound::Excluded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| start |) |) |) ] |))); fun γ => @@ -5509,7 +5633,13 @@ Module ops. (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in let γ0_1 := M.SubPointer.get_tuple_field (| γ, 1 |) in let _ := M.is_struct_tuple (| γ0_0, "core::ops::range::Bound::Unbounded" |) in - M.alloc (| Value.StructTuple "core::ops::range::Bound::Unbounded" [] |))) + M.alloc (| + Value.StructTuple + "core::ops::range::Bound::Unbounded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |))) ] |) |))) @@ -5558,6 +5688,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| end_ |) |) |) ] |))); fun γ => @@ -5574,6 +5706,8 @@ Module ops. M.alloc (| Value.StructTuple "core::ops::range::Bound::Excluded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| end_ |) |) |) ] |))); fun γ => @@ -5581,7 +5715,13 @@ Module ops. (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in let γ0_1 := M.SubPointer.get_tuple_field (| γ, 1 |) in let _ := M.is_struct_tuple (| γ0_1, "core::ops::range::Bound::Unbounded" |) in - M.alloc (| Value.StructTuple "core::ops::range::Bound::Unbounded" [] |))) + M.alloc (| + Value.StructTuple + "core::ops::range::Bound::Unbounded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |))) ] |) |))) @@ -5671,6 +5811,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -5699,7 +5841,11 @@ Module ops. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::ops::range::Bound::Unbounded" [])) + Value.StructTuple + "core::ops::range::Bound::Unbounded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5732,7 +5878,11 @@ Module ops. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::ops::range::Bound::Unbounded" [])) + Value.StructTuple + "core::ops::range::Bound::Unbounded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5749,6 +5899,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Excluded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -5797,6 +5949,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -5827,6 +5981,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Excluded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -5878,6 +6034,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -5908,6 +6066,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -5957,7 +6117,11 @@ Module ops. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::ops::range::Bound::Unbounded" [])) + Value.StructTuple + "core::ops::range::Bound::Unbounded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5974,6 +6138,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, diff --git a/CoqOfRust/core/ops/try_trait.v b/CoqOfRust/core/ops/try_trait.v index 1feb6f517..39a164c3b 100644 --- a/CoqOfRust/core/ops/try_trait.v +++ b/CoqOfRust/core/ops/try_trait.v @@ -33,7 +33,7 @@ Module ops. [], [] |), - [ Value.StructTuple "core::ops::try_trait::Yeet" [ M.read (| yeeted |) ] ] + [ Value.StructTuple "core::ops::try_trait::Yeet" [] [ Y ] [ M.read (| yeeted |) ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -104,6 +104,8 @@ Module ops. (let a := M.copy (| γ |) in Value.StructTuple "core::ops::try_trait::NeverShortCircuit" + [] + [ T ] [ M.call_closure (| T, @@ -188,6 +190,8 @@ Module ops. (let b := M.copy (| γ |) in Value.StructTuple "core::ops::try_trait::NeverShortCircuit" + [] + [ T ] [ M.call_closure (| T, @@ -256,6 +260,8 @@ Module ops. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" + [] + [ Ty.path "core::ops::try_trait::NeverShortCircuitResidual"; T ] [ M.read (| M.SubPointer.get_struct_tuple_field (| @@ -279,7 +285,11 @@ Module ops. | [], [], [ x ] => ltac:(M.monadic (let x := M.alloc (| x |) in - Value.StructTuple "core::ops::try_trait::NeverShortCircuit" [ M.read (| x |) ])) + Value.StructTuple + "core::ops::try_trait::NeverShortCircuit" + [] + [ T ] + [ M.read (| x |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/option.v b/CoqOfRust/core/option.v index a26d4a08d..857c76a9b 100644 --- a/CoqOfRust/core/option.v +++ b/CoqOfRust/core/option.v @@ -484,12 +484,20 @@ Module option. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| x |) |) |) ] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |))) ] |) |))) @@ -541,12 +549,20 @@ Module option. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| x |) |) |) ] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + [] + |))) ] |) |))) @@ -639,6 +655,9 @@ Module option. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::pin::Pin") [] [ Ty.apply (Ty.path "&") [] [ T ] ] + ] [ M.call_closure (| Ty.apply @@ -661,7 +680,14 @@ Module option. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::pin::Pin") [] [ Ty.apply (Ty.path "&") [] [ T ] ] + ] + [] + |))) ] |) |))) @@ -760,6 +786,13 @@ Module option. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "core::pin::Pin") + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + ] [ M.call_closure (| Ty.apply @@ -782,7 +815,18 @@ Module option. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::pin::Pin") + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + ] + [] + |))) ] |) |))) @@ -1426,6 +1470,8 @@ Module option. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ U ] [ M.call_closure (| U, @@ -1445,7 +1491,7 @@ Module option. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ U ] [] |))) ] |) |))) @@ -1697,12 +1743,14 @@ Module option. 0 |) in let v := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| v |) ] |))); + M.alloc (| + Value.StructTuple "core::result::Result::Ok" [] [ T; E ] [ M.read (| v |) ] + |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| err |) ] + Value.StructTuple "core::result::Result::Err" [] [ T; E ] [ M.read (| err |) ] |))) ] |) @@ -1748,13 +1796,17 @@ Module option. 0 |) in let v := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| v |) ] |))); + M.alloc (| + Value.StructTuple "core::result::Result::Ok" [] [ T; E ] [ M.read (| v |) ] + |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ T; E ] [ M.call_closure (| E, @@ -2037,10 +2089,14 @@ Module option. (let self := M.alloc (| self |) in Value.StructRecord "core::option::Iter" + [] + [ T ] [ ("inner", Value.StructRecord "core::option::Item" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ ("opt", M.call_closure (| @@ -2080,10 +2136,14 @@ Module option. (let self := M.alloc (| self |) in Value.StructRecord "core::option::IterMut" + [] + [ T ] [ ("inner", Value.StructRecord "core::option::Item" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ ("opt", M.call_closure (| @@ -2142,7 +2202,7 @@ Module option. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ U ] [] |))) ] |) |))) @@ -2205,7 +2265,7 @@ Module option. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ U ] [] |))) ] |) |))) @@ -2299,6 +2359,8 @@ Module option. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.read (| x |) ] |) |) @@ -2310,7 +2372,7 @@ Module option. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2479,7 +2541,8 @@ Module option. |) in b)); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))) ] |) |))) @@ -2515,7 +2578,7 @@ Module option. M.alloc (| M.write (| M.deref (| M.read (| self |) |), - Value.StructTuple "core::option::Option::Some" [ M.read (| value |) ] + Value.StructTuple "core::option::Option::Some" [] [ T ] [ M.read (| value |) ] |) |) in M.alloc (| @@ -2735,6 +2798,8 @@ Module option. M.deref (| M.read (| self |) |), Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.call_closure (| T, @@ -2833,7 +2898,7 @@ Module option. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ T ] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2919,7 +2984,8 @@ Module option. |) |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))) ] |) |))) @@ -2953,7 +3019,7 @@ Module option. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::option::Option::Some" [ M.read (| value |) ] + Value.StructTuple "core::option::Option::Some" [] [ T ] [ M.read (| value |) ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3009,10 +3075,15 @@ Module option. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.tuple [ T; U ] ] [ Value.Tuple [ M.read (| a |); M.read (| b |) ] ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.tuple [ T; U ] ] [] + |))) ] |) |))) @@ -3070,6 +3141,8 @@ Module option. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ R ] [ M.call_closure (| R, @@ -3087,7 +3160,8 @@ Module option. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| Value.StructTuple "core::option::Option::None" [] [ R ] [] |))) ] |) |))) @@ -3148,8 +3222,12 @@ Module option. M.alloc (| Value.Tuple [ - Value.StructTuple "core::option::Option::Some" [ M.read (| a |) ]; - Value.StructTuple "core::option::Option::Some" [ M.read (| b |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ T ] + [ M.read (| a |) ]; + Value.StructTuple "core::option::Option::Some" [] [ U ] [ M.read (| b |) ] ] |))); fun γ => @@ -3158,8 +3236,8 @@ Module option. M.alloc (| Value.Tuple [ - Value.StructTuple "core::option::Option::None" []; - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple "core::option::Option::None" [] [ T ] []; + Value.StructTuple "core::option::Option::None" [] [ U ] [] ] |))) ] @@ -3214,12 +3292,12 @@ Module option. let γ0_0 := M.read (| γ0_0 |) in let v := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| v |) ] + Value.StructTuple "core::option::Option::Some" [] [ T ] [ M.read (| v |) ] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))) ] |) |))) @@ -3266,6 +3344,8 @@ Module option. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.call_closure (| T, @@ -3285,7 +3365,7 @@ Module option. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))) ] |) |))) @@ -3336,12 +3416,12 @@ Module option. let γ0_0 := M.read (| γ0_0 |) in let t := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| t |) ] + Value.StructTuple "core::option::Option::Some" [] [ T ] [ M.read (| t |) ] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))) ] |) |))) @@ -3388,6 +3468,8 @@ Module option. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.call_closure (| T, @@ -3407,7 +3489,7 @@ Module option. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))) ] |) |))) @@ -3474,7 +3556,10 @@ Module option. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "core::option::Option::Some" [ M.read (| x |) ] ] + [] + [ Ty.apply (Ty.path "core::option::Option") [] [ T ]; E ] + [ Value.StructTuple "core::option::Option::Some" [] [ T ] [ M.read (| x |) ] + ] |))); fun γ => ltac:(M.monadic @@ -3492,7 +3577,11 @@ Module option. |) in let e := M.copy (| γ1_0 |) in M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.apply (Ty.path "core::option::Option") [] [ T ]; E ] + [ M.read (| e |) ] |))); fun γ => ltac:(M.monadic @@ -3500,7 +3589,9 @@ Module option. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "core::option::Option::None" [] ] + [] + [ Ty.apply (Ty.path "core::option::Option") [] [ T ]; E ] + [ Value.StructTuple "core::option::Option::None" [] [ T ] [] ] |))) ] |) @@ -3599,6 +3690,8 @@ Module option. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.call_closure (| T, @@ -3619,7 +3712,7 @@ Module option. ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))) ] |) |))) @@ -3739,7 +3832,7 @@ Module option. Definition default (T : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := let Self : Ty.t := Self T in match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "core::option::Option::None" [])) + | [], [], [] => ltac:(M.monadic (Value.StructTuple "core::option::Option::None" [] [ T ] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3775,7 +3868,12 @@ Module option. (let self := M.alloc (| self |) in Value.StructRecord "core::option::IntoIter" - [ ("inner", Value.StructRecord "core::option::Item" [ ("opt", M.read (| self |)) ]) ])) + [] + [ T ] + [ + ("inner", + Value.StructRecord "core::option::Item" [] [ T ] [ ("opt", M.read (| self |)) ]) + ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3906,7 +4004,7 @@ Module option. | [], [], [ val ] => ltac:(M.monadic (let val := M.alloc (| val |) in - Value.StructTuple "core::option::Option::Some" [ M.read (| val |) ])) + Value.StructTuple "core::option::Option::Some" [] [ T ] [ M.read (| val |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4206,7 +4304,9 @@ Module option. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |))); fun γ => ltac:(M.monadic @@ -4224,7 +4324,9 @@ Module option. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |))); fun γ => ltac:(M.monadic @@ -4237,7 +4339,9 @@ Module option. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |))) ] |) @@ -4323,7 +4427,7 @@ Module option. |) in let γ0_1 := M.read (| γ0_1 |) in let _ := M.is_struct_tuple (| γ0_1, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::cmp::Ordering::Greater" [] |))); + M.alloc (| Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -4337,7 +4441,7 @@ Module option. "core::option::Option::Some", 0 |) in - M.alloc (| Value.StructTuple "core::cmp::Ordering::Less" [] |))); + M.alloc (| Value.StructTuple "core::cmp::Ordering::Less" [] [] [] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -4346,7 +4450,7 @@ Module option. let _ := M.is_struct_tuple (| γ0_0, "core::option::Option::None" |) in let γ0_1 := M.read (| γ0_1 |) in let _ := M.is_struct_tuple (| γ0_1, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] |))) + M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] |))) ] |) |))) @@ -4383,6 +4487,8 @@ Module option. (let self := M.alloc (| self |) in Value.StructRecord "core::option::Item" + [] + [ A ] [ ("opt", M.call_closure (| @@ -4559,7 +4665,11 @@ Module option. Value.Tuple [ M.read (| len |); - Value.StructTuple "core::option::Option::Some" [ M.read (| len |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| len |) ] ] |) |))) @@ -4968,6 +5078,8 @@ Module option. (let self := M.alloc (| self |) in Value.StructRecord "core::option::Iter" + [] + [ A ] [ ("inner", M.call_closure (| @@ -5281,6 +5393,8 @@ Module option. (let self := M.alloc (| self |) in Value.StructRecord "core::option::IntoIter" + [] + [ A ] [ ("inner", M.call_closure (| @@ -5751,7 +5865,7 @@ Module option. | [], [], [ output ] => ltac:(M.monadic (let output := M.alloc (| output |) in - Value.StructTuple "core::option::Option::Some" [ M.read (| output |) ])) + Value.StructTuple "core::option::Option::Some" [] [ T ] [ M.read (| output |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5800,6 +5914,14 @@ Module option. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ Ty.path "core::convert::Infallible" ]; + T + ] [ M.read (| v |) ] |))); fun γ => @@ -5808,7 +5930,21 @@ Module option. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Break" - [ Value.StructTuple "core::option::Option::None" [] ] + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ Ty.path "core::convert::Infallible" ]; + T + ] + [ + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::convert::Infallible" ] + [] + ] |))) ] |) @@ -5856,7 +5992,7 @@ Module option. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))) ] |) |))) @@ -5896,7 +6032,7 @@ Module option. ltac:(M.monadic (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::ops::try_trait::Yeet", 0 |) in - Value.StructTuple "core::option::Option::None" [])) + Value.StructTuple "core::option::Option::None" [] [ T ] [])) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5970,7 +6106,7 @@ Module option. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))) ] |) |))) diff --git a/CoqOfRust/core/panic.v b/CoqOfRust/core/panic.v index f4a4e33ac..b5ed237c8 100644 --- a/CoqOfRust/core/panic.v +++ b/CoqOfRust/core/panic.v @@ -1032,7 +1032,11 @@ Module panic. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::option::Option::None" [])) + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/panic/location.v b/CoqOfRust/core/panic/location.v index 8c741b50a..a4d55c1cd 100644 --- a/CoqOfRust/core/panic/location.v +++ b/CoqOfRust/core/panic/location.v @@ -914,6 +914,8 @@ Module panic. let col := M.alloc (| col |) in Value.StructRecord "core::panic::location::Location" + [] + [] [ ("file", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| file |) |) |)); ("line", M.read (| line |)); diff --git a/CoqOfRust/core/panic/panic_info.v b/CoqOfRust/core/panic/panic_info.v index 90131a479..e65d03021 100644 --- a/CoqOfRust/core/panic/panic_info.v +++ b/CoqOfRust/core/panic/panic_info.v @@ -155,6 +155,8 @@ Module panic. let force_no_backtrace := M.alloc (| force_no_backtrace |) in Value.StructRecord "core::panic::panic_info::PanicInfo" + [] + [] [ ("location", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| location |) |) |)); ("message", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| message |) |) |)); @@ -180,6 +182,8 @@ Module panic. (let self := M.alloc (| self |) in Value.StructRecord "core::panic::panic_info::PanicMessage" + [] + [] [ ("message", M.borrow (| @@ -216,6 +220,8 @@ Module panic. (let self := M.alloc (| self |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "core::panic::location::Location" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -267,7 +273,7 @@ Module panic. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.StructTuple "core::panic::panic_info::payload::NoPayload" [] + Value.StructTuple "core::panic::panic_info::payload::NoPayload" [] [] [] |) |) |) @@ -813,7 +819,13 @@ Module panic. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/core/panic/unwind_safe.v b/CoqOfRust/core/panic/unwind_safe.v index 107741009..038de1634 100644 --- a/CoqOfRust/core/panic/unwind_safe.v +++ b/CoqOfRust/core/panic/unwind_safe.v @@ -543,6 +543,8 @@ Module panic. ltac:(M.monadic (Value.StructTuple "core::panic::unwind_safe::AssertUnwindSafe" + [] + [ T ] [ M.call_closure (| T, diff --git a/CoqOfRust/core/panicking.v b/CoqOfRust/core/panicking.v index 0bbe88cf0..cbb73783b 100644 --- a/CoqOfRust/core/panicking.v +++ b/CoqOfRust/core/panicking.v @@ -1789,10 +1789,14 @@ Module panicking. [ Value.Integer IntegerKind.Usize 0; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple + "core::fmt::rt::Alignment::Unknown" + [] + [] + []; Value.Integer IntegerKind.U32 4; - Value.StructTuple "core::fmt::rt::Count::Implied" []; - Value.StructTuple "core::fmt::rt::Count::Implied" [] + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] [] ] |); M.call_closure (| @@ -1806,10 +1810,14 @@ Module panicking. [ Value.Integer IntegerKind.Usize 1; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple + "core::fmt::rt::Alignment::Unknown" + [] + [] + []; Value.Integer IntegerKind.U32 4; - Value.StructTuple "core::fmt::rt::Count::Implied" []; - Value.StructTuple "core::fmt::rt::Count::Implied" [] + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] [] ] |) ] @@ -2139,7 +2147,7 @@ Module panicking. Ty.path "never", M.get_function (| "core::panicking::assert_failed_inner", [], [] |), [ - Value.StructTuple "core::panicking::AssertKind::Match" []; + Value.StructTuple "core::panicking::AssertKind::Match" [] [] []; (* Unsize *) M.pointer_coercion (M.borrow (| @@ -2156,6 +2164,8 @@ Module panicking. M.alloc (| Value.StructTuple "core::panicking::assert_matches_failed::Pattern" + [] + [] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| right |) |) |) ] |) |) diff --git a/CoqOfRust/core/pin.v b/CoqOfRust/core/pin.v index fe65b56d9..0a0ef855d 100644 --- a/CoqOfRust/core/pin.v +++ b/CoqOfRust/core/pin.v @@ -35,6 +35,8 @@ Module pin. (let self := M.alloc (| self |) in Value.StructRecord "core::pin::Pin" + [] + [ Ptr ] [ ("__pointer", M.call_closure (| @@ -846,7 +848,7 @@ Module pin. | [], [], [ pointer ] => ltac:(M.monadic (let pointer := M.alloc (| pointer |) in - Value.StructRecord "core::pin::Pin" [ ("__pointer", M.read (| pointer |)) ])) + Value.StructRecord "core::pin::Pin" [] [ Ptr ] [ ("__pointer", M.read (| pointer |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1354,6 +1356,8 @@ Module pin. (let self := M.alloc (| self |) in Value.StructRecord "core::pin::Pin" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ ("__pointer", M.borrow (| diff --git a/CoqOfRust/core/ptr/alignment.v b/CoqOfRust/core/ptr/alignment.v index 4981db2f2..dfe38d1e2 100644 --- a/CoqOfRust/core/ptr/alignment.v +++ b/CoqOfRust/core/ptr/alignment.v @@ -205,7 +205,9 @@ Module ptr. (M.alloc (| Value.StructTuple "core::ptr::alignment::Alignment" - [ Value.StructTuple "core::ptr::alignment::AlignmentEnum::_Align1Shl0" [] ] + [] + [] + [ Value.StructTuple "core::ptr::alignment::AlignmentEnum::_Align1Shl0" [] [] [] ] |))). Global Instance AssociatedConstant_value_MIN : M.IsAssociatedFunction.C Self "MIN" value_MIN. @@ -293,6 +295,8 @@ Module ptr. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::ptr::alignment::Alignment" ] [ M.call_closure (| Ty.path "core::ptr::alignment::Alignment", @@ -308,7 +312,13 @@ Module ptr. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::ptr::alignment::Alignment" ] + [] + |))) ] |) |))) @@ -841,7 +851,7 @@ Module ptr. |), [ M.read (| align |) ] |); - Value.StructTuple "core::num::error::TryFromIntError" [ Value.Tuple [] ] + Value.StructTuple "core::num::error::TryFromIntError" [] [] [ Value.Tuple [] ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1036,6 +1046,8 @@ Module ptr. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", diff --git a/CoqOfRust/core/ptr/const_ptr.v b/CoqOfRust/core/ptr/const_ptr.v index 37da76ff1..f0c785010 100644 --- a/CoqOfRust/core/ptr/const_ptr.v +++ b/CoqOfRust/core/ptr/const_ptr.v @@ -448,12 +448,20 @@ Module ptr. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -561,12 +569,30 @@ Module ptr. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ] ] + ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -1334,13 +1360,17 @@ Module ptr. M.read (| γ |), Value.Integer IntegerKind.U8 2 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "bool" ] [] + |))); fun γ => ltac:(M.monadic (let other := M.copy (| γ |) in M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "bool" ] [ M.call_closure (| Ty.path "bool", @@ -1406,7 +1436,9 @@ Module ptr. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "bool" ] [] + |))); fun γ => ltac:(M.monadic (let γ0_0 := @@ -1419,6 +1451,8 @@ Module ptr. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "bool" ] [ UnOp.not (| M.read (| eq |) |) ] |))) ] @@ -2636,11 +2670,31 @@ Module ptr. |)) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| me |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "*const") + [] + [ Ty.apply (Ty.path "array") [ N ] [ T ] ] + ] + [ M.read (| me |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "*const") + [] + [ Ty.apply (Ty.path "array") [ N ] [ T ] ] + ] + [] + |))) ] |) |))) @@ -2770,12 +2824,50 @@ Module ptr. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ + Ty.apply + (Ty.path "core::mem::maybe_uninit::MaybeUninit") + [] + [ T ] + ] + ] + ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ + Ty.apply + (Ty.path "core::mem::maybe_uninit::MaybeUninit") + [] + [ T ] + ] + ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -3015,7 +3107,7 @@ Module ptr. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::cmp::Ordering::Less" [] |))); + M.alloc (| Value.StructTuple "core::cmp::Ordering::Less" [] [] [] |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -3054,10 +3146,14 @@ Module ptr. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] |))); + M.alloc (| + Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] + |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::cmp::Ordering::Greater" [] |))) + (M.alloc (| + Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + |))) ] |))) ] @@ -3093,6 +3189,8 @@ Module ptr. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", diff --git a/CoqOfRust/core/ptr/metadata.v b/CoqOfRust/core/ptr/metadata.v index 0fb8e28e5..f9ede638b 100644 --- a/CoqOfRust/core/ptr/metadata.v +++ b/CoqOfRust/core/ptr/metadata.v @@ -670,6 +670,8 @@ Module ptr. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", diff --git a/CoqOfRust/core/ptr/mut_ptr.v b/CoqOfRust/core/ptr/mut_ptr.v index 9d6fe4b3f..d2c88fcbc 100644 --- a/CoqOfRust/core/ptr/mut_ptr.v +++ b/CoqOfRust/core/ptr/mut_ptr.v @@ -427,12 +427,20 @@ Module ptr. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -540,12 +548,30 @@ Module ptr. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ] ] + ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -956,12 +982,20 @@ Module ptr. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -1081,12 +1115,30 @@ Module ptr. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ] ] + ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "core::mem::maybe_uninit::MaybeUninit") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -2890,11 +2942,23 @@ Module ptr. |)) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| me |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "*mut") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] + ] + [ M.read (| me |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "*mut") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] + ] + [] + |))) ] |) |))) @@ -3235,12 +3299,50 @@ Module ptr. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ + Ty.apply + (Ty.path "core::mem::maybe_uninit::MaybeUninit") + [] + [ T ] + ] + ] + ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ + Ty.apply + (Ty.path "core::mem::maybe_uninit::MaybeUninit") + [] + [ T ] + ] + ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -3377,12 +3479,50 @@ Module ptr. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ + Ty.apply + (Ty.path "core::mem::maybe_uninit::MaybeUninit") + [] + [ T ] + ] + ] + ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ + Ty.apply + (Ty.path "core::mem::maybe_uninit::MaybeUninit") + [] + [ T ] + ] + ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -3627,7 +3767,7 @@ Module ptr. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::cmp::Ordering::Less" [] |))); + M.alloc (| Value.StructTuple "core::cmp::Ordering::Less" [] [] [] |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -3666,10 +3806,14 @@ Module ptr. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] |))); + M.alloc (| + Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] + |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::cmp::Ordering::Greater" [] |))) + (M.alloc (| + Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + |))) ] |))) ] @@ -3705,6 +3849,8 @@ Module ptr. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", diff --git a/CoqOfRust/core/ptr/non_null.v b/CoqOfRust/core/ptr/non_null.v index bf0627274..ab7b2c3c0 100644 --- a/CoqOfRust/core/ptr/non_null.v +++ b/CoqOfRust/core/ptr/non_null.v @@ -313,6 +313,8 @@ Module ptr. M.alloc (| Value.StructRecord "core::ptr::non_null::NonNull" + [] + [ T ] [ ("pointer", M.cast @@ -381,6 +383,8 @@ Module ptr. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::ptr::non_null::NonNull") [] [ T ] ] [ M.call_closure (| Ty.apply (Ty.path "core::ptr::non_null::NonNull") [] [ T ], @@ -396,7 +400,13 @@ Module ptr. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::ptr::non_null::NonNull") [] [ T ] ] + [] + |))) ] |) |))) @@ -423,6 +433,8 @@ Module ptr. (let r := M.alloc (| r |) in Value.StructRecord "core::ptr::non_null::NonNull" + [] + [ T ] [ ("pointer", M.read (| @@ -455,6 +467,8 @@ Module ptr. (let r := M.alloc (| r |) in Value.StructRecord "core::ptr::non_null::NonNull" + [] + [ T ] [ ("pointer", (* MutToConstPointer *) @@ -936,6 +950,8 @@ Module ptr. (let self := M.alloc (| self |) in Value.StructRecord "core::ptr::non_null::NonNull" + [] + [ U ] [ ("pointer", (* MutToConstPointer *) @@ -983,6 +999,8 @@ Module ptr. let count := M.alloc (| count |) in Value.StructRecord "core::ptr::non_null::NonNull" + [] + [ T ] [ ("pointer", M.call_closure (| @@ -1037,6 +1055,8 @@ Module ptr. let count := M.alloc (| count |) in Value.StructRecord "core::ptr::non_null::NonNull" + [] + [ T ] [ ("pointer", (* MutToConstPointer *) @@ -1094,6 +1114,8 @@ Module ptr. let count := M.alloc (| count |) in Value.StructRecord "core::ptr::non_null::NonNull" + [] + [ T ] [ ("pointer", M.call_closure (| @@ -1148,6 +1170,8 @@ Module ptr. let count := M.alloc (| count |) in Value.StructRecord "core::ptr::non_null::NonNull" + [] + [ T ] [ ("pointer", (* MutToConstPointer *) @@ -1282,6 +1306,8 @@ Module ptr. let count := M.alloc (| count |) in Value.StructRecord "core::ptr::non_null::NonNull" + [] + [ T ] [ ("pointer", (* MutToConstPointer *) diff --git a/CoqOfRust/core/ptr/unique.v b/CoqOfRust/core/ptr/unique.v index 8835d684d..8a861b0ef 100644 --- a/CoqOfRust/core/ptr/unique.v +++ b/CoqOfRust/core/ptr/unique.v @@ -57,6 +57,8 @@ Module ptr. ltac:(M.monadic (Value.StructRecord "core::ptr::unique::Unique" + [] + [ T ] [ ("pointer", M.call_closure (| @@ -69,7 +71,7 @@ Module ptr. |), [] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ T ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -98,6 +100,8 @@ Module ptr. (let ptr := M.alloc (| ptr |) in Value.StructRecord "core::ptr::unique::Unique" + [] + [ T ] [ ("pointer", M.call_closure (| @@ -110,7 +114,7 @@ Module ptr. |), [ M.read (| ptr |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ T ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -177,18 +181,29 @@ Module ptr. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::ptr::unique::Unique") [] [ T ] ] [ Value.StructRecord "core::ptr::unique::Unique" + [] + [ T ] [ ("pointer", M.read (| pointer |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple "core::marker::PhantomData" [] [ T ] []) ] ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::ptr::unique::Unique") [] [ T ] ] + [] + |))) ] |) |))) @@ -388,6 +403,8 @@ Module ptr. (let self := M.alloc (| self |) in Value.StructRecord "core::ptr::unique::Unique" + [] + [ U ] [ ("pointer", M.call_closure (| @@ -408,7 +425,7 @@ Module ptr. |) ] |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ U ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -705,9 +722,11 @@ Module ptr. (let pointer := M.alloc (| pointer |) in Value.StructRecord "core::ptr::unique::Unique" + [] + [ T ] [ ("pointer", M.read (| pointer |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", Value.StructTuple "core::marker::PhantomData" [] [ T ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/range.v b/CoqOfRust/core/range.v index 4906334ab..2d7369092 100644 --- a/CoqOfRust/core/range.v +++ b/CoqOfRust/core/range.v @@ -22,6 +22,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructRecord "core::range::Range" + [] + [ Idx ] [ ("start", M.call_closure (| @@ -101,6 +103,8 @@ Module range. ltac:(M.monadic (Value.StructRecord "core::range::Range" + [] + [ Idx ] [ ("start", M.call_closure (| @@ -679,7 +683,13 @@ Module range. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -847,6 +857,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -878,6 +890,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Excluded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -927,6 +941,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -957,6 +973,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Excluded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -1004,6 +1022,8 @@ Module range. (let value := M.alloc (| value |) in Value.StructRecord "core::ops::range::Range" + [] + [ T ] [ ("start", M.read (| @@ -1043,6 +1063,8 @@ Module range. (let value := M.alloc (| value |) in Value.StructRecord "core::range::Range" + [] + [ T ] [ ("start", M.read (| @@ -1091,6 +1113,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructRecord "core::range::RangeInclusive" + [] + [ Idx ] [ ("start", M.call_closure (| @@ -1717,7 +1741,13 @@ Module range. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1886,6 +1916,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructRecord "core::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -1936,6 +1968,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -1967,6 +2001,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -2016,6 +2052,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -2046,6 +2084,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -2241,6 +2281,8 @@ Module range. M.alloc (| Value.StructRecord "core::range::RangeInclusive" + [] + [ T ] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)) ] |))) ] @@ -2280,6 +2322,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructRecord "core::range::RangeFrom" + [] + [ Idx ] [ ("start", M.call_closure (| @@ -2720,7 +2764,13 @@ Module range. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2844,6 +2894,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -2873,7 +2925,11 @@ Module range. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::ops::range::Bound::Unbounded" [])) + Value.StructTuple + "core::ops::range::Bound::Unbounded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2908,6 +2964,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructTuple "core::ops::range::Bound::Included" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -2936,7 +2994,11 @@ Module range. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::ops::range::Bound::Unbounded" [])) + Value.StructTuple + "core::ops::range::Bound::Unbounded" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2970,6 +3032,8 @@ Module range. (let value := M.alloc (| value |) in Value.StructRecord "core::ops::range::RangeFrom" + [] + [ T ] [ ("start", M.read (| @@ -3009,6 +3073,8 @@ Module range. (let value := M.alloc (| value |) in Value.StructRecord "core::range::RangeFrom" + [] + [ T ] [ ("start", M.read (| diff --git a/CoqOfRust/core/range/iter.v b/CoqOfRust/core/range/iter.v index 570d8da42..572e3154b 100644 --- a/CoqOfRust/core/range/iter.v +++ b/CoqOfRust/core/range/iter.v @@ -85,6 +85,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructTuple "core::range::iter::IterRange" + [] + [ A ] [ M.call_closure (| Ty.apply (Ty.path "core::ops::range::Range") [] [ A ], @@ -144,6 +146,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructRecord "core::range::Range" + [] + [ A ] [ ("start", M.read (| @@ -1124,6 +1128,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructTuple "core::range::iter::IterRange" + [] + [ A ] [ M.call_closure (| Ty.apply (Ty.path "core::ops::range::Range") [] [ A ], @@ -1239,6 +1245,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructTuple "core::range::iter::IterRangeInclusive" + [] + [ A ] [ M.call_closure (| Ty.apply (Ty.path "core::ops::range::RangeInclusive") [] [ A ], @@ -1345,7 +1353,13 @@ Module range. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::range::RangeInclusive") [] [ A ] ] + [] + |) |) |) |))); @@ -1355,9 +1369,13 @@ Module range. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::range::RangeInclusive") [] [ A ] ] [ Value.StructRecord "core::range::RangeInclusive" + [] + [ A ] [ ("start", M.read (| @@ -1938,6 +1956,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructTuple "core::range::iter::IterRangeInclusive" + [] + [ A ] [ M.call_closure (| Ty.apply (Ty.path "core::ops::range::RangeInclusive") [] [ A ], @@ -2157,6 +2177,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructTuple "core::range::iter::IterRangeFrom" + [] + [ A ] [ M.call_closure (| Ty.apply (Ty.path "core::ops::range::RangeFrom") [] [ A ], @@ -2216,6 +2238,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructRecord "core::range::RangeFrom" + [] + [ A ] [ ("start", M.read (| @@ -2426,6 +2450,8 @@ Module range. (let self := M.alloc (| self |) in Value.StructTuple "core::range::iter::IterRangeFrom" + [] + [ A ] [ M.call_closure (| Ty.apply (Ty.path "core::ops::range::RangeFrom") [] [ A ], diff --git a/CoqOfRust/core/result.v b/CoqOfRust/core/result.v index a945b178f..a2e5019e6 100644 --- a/CoqOfRust/core/result.v +++ b/CoqOfRust/core/result.v @@ -992,13 +992,13 @@ Module result. M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Ok", 0 |) in let x := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| x |) ] + Value.StructTuple "core::option::Option::Some" [] [ T ] [ M.read (| x |) ] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Err", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))) ] |) |))) @@ -1034,14 +1034,14 @@ Module result. ltac:(M.monadic (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Ok", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ E ] [] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Err", 0 |) in let x := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| x |) ] + Value.StructTuple "core::option::Option::Some" [] [ E ] [ M.read (| x |) ] |))) ] |) @@ -1090,6 +1090,8 @@ Module result. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.apply (Ty.path "&") [] [ T ]; Ty.apply (Ty.path "&") [] [ E ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| x |) |) |) ] |))); fun γ => @@ -1100,6 +1102,8 @@ Module result. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.apply (Ty.path "&") [] [ T ]; Ty.apply (Ty.path "&") [] [ E ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| x |) |) |) ] |))) ] @@ -1149,6 +1153,8 @@ Module result. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ]; Ty.apply (Ty.path "&mut") [] [ E ] ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| x |) |) |) ] |))); fun γ => @@ -1159,6 +1165,8 @@ Module result. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ]; Ty.apply (Ty.path "&mut") [] [ E ] ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| x |) |) |) ] |))) ] @@ -1201,6 +1209,8 @@ Module result. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ U; E ] [ M.call_closure (| U, @@ -1222,7 +1232,9 @@ Module result. (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Err", 0 |) in let e := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] |))) + M.alloc (| + Value.StructTuple "core::result::Result::Err" [] [ U; E ] [ M.read (| e |) ] + |))) ] |) |))) @@ -1391,7 +1403,9 @@ Module result. (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Ok", 0 |) in let t := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| t |) ] |))); + M.alloc (| + Value.StructTuple "core::result::Result::Ok" [] [ T; F ] [ M.read (| t |) ] + |))); fun γ => ltac:(M.monadic (let γ0_0 := @@ -1400,6 +1414,8 @@ Module result. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ T; F ] [ M.call_closure (| F, @@ -1835,6 +1851,8 @@ Module result. (let self := M.alloc (| self |) in Value.StructRecord "core::result::Iter" + [] + [ T ] [ ("inner", M.call_closure (| @@ -1887,6 +1905,8 @@ Module result. (let self := M.alloc (| self |) in Value.StructRecord "core::result::IterMut" + [] + [ T ] [ ("inner", M.call_closure (| @@ -2407,7 +2427,9 @@ Module result. (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Err", 0 |) in let e := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] |))) + M.alloc (| + Value.StructTuple "core::result::Result::Err" [] [ U; E ] [ M.read (| e |) ] + |))) ] |) |))) @@ -2465,7 +2487,9 @@ Module result. (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Err", 0 |) in let e := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] |))) + M.alloc (| + Value.StructTuple "core::result::Result::Err" [] [ U; E ] [ M.read (| e |) ] + |))) ] |) |))) @@ -2503,7 +2527,9 @@ Module result. (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Ok", 0 |) in let v := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| v |) ] |))); + M.alloc (| + Value.StructTuple "core::result::Result::Ok" [] [ T; F ] [ M.read (| v |) ] + |))); fun γ => ltac:(M.monadic (let γ0_0 := @@ -2546,7 +2572,9 @@ Module result. (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Ok", 0 |) in let t := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| t |) ] |))); + M.alloc (| + Value.StructTuple "core::result::Result::Ok" [] [ T; F ] [ M.read (| t |) ] + |))); fun γ => ltac:(M.monadic (let γ0_0 := @@ -2832,13 +2860,17 @@ Module result. M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Ok", 0 |) in let γ0_0 := M.read (| γ0_0 |) in let v := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| v |) ] |))); + M.alloc (| + Value.StructTuple "core::result::Result::Ok" [] [ T; E ] [ M.read (| v |) ] + |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Err", 0 |) in let e := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] |))) + M.alloc (| + Value.StructTuple "core::result::Result::Err" [] [ T; E ] [ M.read (| e |) ] + |))) ] |) |))) @@ -2954,13 +2986,17 @@ Module result. M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Ok", 0 |) in let γ0_0 := M.read (| γ0_0 |) in let v := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| v |) ] |))); + M.alloc (| + Value.StructTuple "core::result::Result::Ok" [] [ T; E ] [ M.read (| v |) ] + |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Err", 0 |) in let e := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] |))) + M.alloc (| + Value.StructTuple "core::result::Result::Err" [] [ T; E ] [ M.read (| e |) ] + |))) ] |) |))) @@ -3094,14 +3130,28 @@ Module result. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::result::Result::Ok" [ M.read (| x |) ] ] + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ T; E ] ] + [ + Value.StructTuple + "core::result::Result::Ok" + [] + [ T; E ] + [ M.read (| x |) ] + ] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Ok", 0 |) in let _ := M.is_struct_tuple (| γ0_0, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ T; E ] ] + [] + |))); fun γ => ltac:(M.monadic (let γ0_0 := @@ -3110,7 +3160,15 @@ Module result. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] ] + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ T; E ] ] + [ + Value.StructTuple + "core::result::Result::Err" + [] + [ T; E ] + [ M.read (| e |) ] + ] |))) ] |) @@ -3163,7 +3221,9 @@ Module result. (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Err", 0 |) in let e := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] |))) + M.alloc (| + Value.StructTuple "core::result::Result::Err" [] [ T; E ] [ M.read (| e |) ] + |))) ] |) |))) @@ -3301,6 +3361,8 @@ Module result. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ T; E ] [ M.call_closure (| T, @@ -3326,6 +3388,8 @@ Module result. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ T; E ] [ M.call_closure (| E, @@ -3512,6 +3576,8 @@ Module result. (let self := M.alloc (| self |) in Value.StructRecord "core::result::IntoIter" + [] + [ T ] [ ("inner", M.call_closure (| @@ -3808,7 +3874,13 @@ Module result. |) in M.alloc (| Value.Tuple - [ M.read (| n |); Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + [ + M.read (| n |); + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| n |) ] ] |) |))) @@ -3931,6 +4003,8 @@ Module result. (let self := M.alloc (| self |) in Value.StructRecord "core::result::Iter" + [] + [ T ] [ ("inner", M.read (| @@ -4121,7 +4195,13 @@ Module result. |) in M.alloc (| Value.Tuple - [ M.read (| n |); Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + [ + M.read (| n |); + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| n |) ] ] |) |))) @@ -4248,6 +4328,8 @@ Module result. (let self := M.alloc (| self |) in Value.StructRecord "core::result::IntoIter" + [] + [ T ] [ ("inner", M.call_closure (| @@ -4443,7 +4525,13 @@ Module result. |) in M.alloc (| Value.Tuple - [ M.read (| n |); Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + [ + M.read (| n |); + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| n |) ] ] |) |))) @@ -4731,7 +4819,7 @@ Module result. | [], [], [ output ] => ltac:(M.monadic (let output := M.alloc (| output |) in - Value.StructTuple "core::result::Result::Ok" [ M.read (| output |) ])) + Value.StructTuple "core::result::Result::Ok" [] [ T; E ] [ M.read (| output |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4776,6 +4864,14 @@ Module result. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" + [] + [ + Ty.apply + (Ty.path "core::result::Result") + [] + [ Ty.path "core::convert::Infallible"; E ]; + T + ] [ M.read (| v |) ] |))); fun γ => @@ -4786,7 +4882,21 @@ Module result. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Break" - [ Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] ] + [] + [ + Ty.apply + (Ty.path "core::result::Result") + [] + [ Ty.path "core::convert::Infallible"; E ]; + T + ] + [ + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "core::convert::Infallible"; E ] + [ M.read (| e |) ] + ] |))) ] |) @@ -4844,6 +4954,8 @@ Module result. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ T; F ] [ M.call_closure (| F, @@ -4907,6 +5019,8 @@ Module result. let e := M.copy (| γ0_0 |) in Value.StructTuple "core::result::Result::Err" + [] + [ T; F ] [ M.call_closure (| F, diff --git a/CoqOfRust/core/slice/ascii.v b/CoqOfRust/core/slice/ascii.v index 14d578b2d..4b7dac904 100644 --- a/CoqOfRust/core/slice/ascii.v +++ b/CoqOfRust/core/slice/ascii.v @@ -87,6 +87,18 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ Ty.path "core::ascii::ascii_char::AsciiChar" ] + ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -116,7 +128,23 @@ Module slice. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ Ty.path "core::ascii::ascii_char::AsciiChar" ] + ] + ] + [] + |))) ] |) |))) @@ -691,6 +719,8 @@ Module slice. (let self := M.alloc (| self |) in Value.StructRecord "core::slice::ascii::EscapeAscii" + [] + [] [ ("inner", M.call_closure (| @@ -725,7 +755,7 @@ Module slice. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |) ] |); - Value.StructTuple "core::slice::ascii::EscapeByte" [] + Value.StructTuple "core::slice::ascii::EscapeByte" [] [] [] ] |)) ])) @@ -1027,7 +1057,7 @@ Module slice. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::slice::ascii::EscapeByte" [])) + Value.StructTuple "core::slice::ascii::EscapeByte" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1070,6 +1100,8 @@ Module slice. (let self := M.alloc (| self |) in Value.StructRecord "core::slice::ascii::EscapeAscii" + [] + [] [ ("inner", M.call_closure (| @@ -2585,6 +2617,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer @@ -2842,7 +2876,11 @@ Module slice. ] |)) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] |))) ] |) diff --git a/CoqOfRust/core/slice/cmp.v b/CoqOfRust/core/slice/cmp.v index 168c61201..2927497c1 100644 --- a/CoqOfRust/core/slice/cmp.v +++ b/CoqOfRust/core/slice/cmp.v @@ -317,6 +317,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -720,6 +722,8 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| left |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| l |)) ] ] |) @@ -755,6 +759,8 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| right |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| l |)) ] ] |) @@ -780,6 +786,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| l |)) @@ -1012,6 +1020,8 @@ Module slice. let right := M.alloc (| right |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -1372,6 +1382,8 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| left |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| l |)) ] ] |) @@ -1407,6 +1419,8 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| right |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| l |)) ] ] |) @@ -1432,6 +1446,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| l |)) diff --git a/CoqOfRust/core/slice/index.v b/CoqOfRust/core/slice/index.v index 441d01876..9ff6738f6 100644 --- a/CoqOfRust/core/slice/index.v +++ b/CoqOfRust/core/slice/index.v @@ -736,6 +736,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -766,7 +768,13 @@ Module slice. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |))) ] |) |))) @@ -835,6 +843,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -865,7 +875,13 @@ Module slice. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + [] + |))) ] |) |))) @@ -1234,6 +1250,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -1286,7 +1304,13 @@ Module slice. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))) ] |) |))) @@ -1364,6 +1388,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -1416,7 +1442,13 @@ Module slice. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))) ] |) |))) @@ -2125,6 +2157,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -2165,7 +2199,13 @@ Module slice. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))) ] |) |))) @@ -2272,6 +2312,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -2312,7 +2354,13 @@ Module slice. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))) ] |) |))) @@ -3352,6 +3400,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -3398,6 +3448,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -3447,6 +3499,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -3496,6 +3550,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -3542,6 +3598,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -3593,6 +3651,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -3669,6 +3729,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -3725,6 +3787,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -3784,6 +3848,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -3843,6 +3909,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -4505,6 +4573,8 @@ Module slice. let slice := M.alloc (| slice |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| slice |) |) |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4523,6 +4593,8 @@ Module slice. let slice := M.alloc (| slice |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| slice |) |) |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4692,7 +4764,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -4796,7 +4874,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -6210,6 +6294,8 @@ Module slice. M.alloc (| Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)) ] |) |))) @@ -6617,15 +6703,25 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::ops::range::Range") [] [ Ty.path "usize" ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::ops::range::Range") [] [ Ty.path "usize" ] ] [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)) ] ] |))) @@ -6763,6 +6859,8 @@ Module slice. M.alloc (| Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)) ] |) |))) @@ -7124,9 +7222,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::ops::range::Range") [] [ Ty.path "usize" ] ] [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)) ] ] |) @@ -7379,6 +7481,8 @@ Module slice. M.alloc (| Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)) ] |) |))) diff --git a/CoqOfRust/core/slice/iter.v b/CoqOfRust/core/slice/iter.v index ac4584236..83178fc1e 100644 --- a/CoqOfRust/core/slice/iter.v +++ b/CoqOfRust/core/slice/iter.v @@ -391,10 +391,17 @@ Module slice. M.alloc (| Value.StructRecord "core::slice::iter::Iter" + [] + [ T ] [ ("ptr", M.read (| ptr |)); ("end_or_len", M.read (| end_or_len |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + []) ] |) |))) @@ -459,6 +466,8 @@ Module slice. (let self := M.alloc (| self |) in Value.StructRecord "core::slice::iter::Iter" + [] + [ T ] [ ("ptr", M.read (| @@ -838,10 +847,17 @@ Module slice. M.alloc (| Value.StructRecord "core::slice::iter::IterMut" + [] + [ T ] [ ("ptr", M.read (| ptr |)); ("end_or_len", M.read (| end_or_len |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + []) ] |) |))) @@ -1331,6 +1347,8 @@ Module slice. let pred := M.alloc (| pred |) in Value.StructRecord "core::slice::iter::Split" + [] + [ T; P ] [ ("v", M.read (| slice |)); ("pred", M.read (| pred |)); @@ -1569,6 +1587,8 @@ Module slice. (let self := M.alloc (| self |) in Value.StructRecord "core::slice::iter::Split" + [] + [ T; P ] [ ("v", M.borrow (| @@ -1680,7 +1700,18 @@ Module slice. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] + |) |) |) |))); @@ -1880,6 +1911,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| idx |)) ] ] |); @@ -1914,6 +1947,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -1952,6 +1987,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.read (| left |) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -2025,6 +2067,8 @@ Module slice. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))); @@ -2036,6 +2080,8 @@ Module slice. Value.Integer IntegerKind.Usize 1; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -2147,7 +2193,18 @@ Module slice. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] + |) |) |) |))); @@ -2347,6 +2404,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| idx |)) ] ] |); @@ -2381,6 +2440,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -2419,6 +2480,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.read (| right |) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -2498,7 +2566,13 @@ Module slice. "finished" |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -2515,6 +2589,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -2607,6 +2683,8 @@ Module slice. M.alloc (| Value.StructRecord "core::slice::iter::SplitInclusive" + [] + [ T; P ] [ ("v", M.read (| slice |)); ("pred", M.read (| pred |)); @@ -2778,6 +2856,8 @@ Module slice. (let self := M.alloc (| self |) in Value.StructRecord "core::slice::iter::SplitInclusive" + [] + [ T; P ] [ ("v", M.borrow (| @@ -2885,7 +2965,18 @@ Module slice. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] + |) |) |) |))); @@ -3148,6 +3239,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -3183,6 +3276,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| idx |)) ] ] |) @@ -3235,6 +3330,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| idx |)) ] ] |) @@ -3298,6 +3395,8 @@ Module slice. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))); @@ -3309,6 +3408,8 @@ Module slice. Value.Integer IntegerKind.Usize 1; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -3419,7 +3520,18 @@ Module slice. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] + |) |) |) |))); @@ -3520,6 +3632,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -3762,6 +3876,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -3797,6 +3913,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| idx |)) ] ] |) @@ -3849,6 +3967,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| idx |)) ] ] |) @@ -3919,6 +4039,8 @@ Module slice. let pred := M.alloc (| pred |) in Value.StructRecord "core::slice::iter::SplitMut" + [] + [ T; P ] [ ("v", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| slice |) |) |)); ("pred", M.read (| pred |)); @@ -4111,7 +4233,13 @@ Module slice. "finished" |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -4128,6 +4256,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -4244,7 +4374,18 @@ Module slice. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] + |) |) |) |))); @@ -4513,6 +4654,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -4546,6 +4694,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| idx |)) ] ] |) @@ -4611,6 +4761,8 @@ Module slice. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))); @@ -4622,6 +4774,8 @@ Module slice. Value.Integer IntegerKind.Usize 1; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -4735,7 +4889,18 @@ Module slice. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] + |) |) |) |))); @@ -5016,6 +5181,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -5049,6 +5221,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1) ] ] @@ -5139,6 +5313,8 @@ Module slice. M.alloc (| Value.StructRecord "core::slice::iter::SplitInclusiveMut" + [] + [ T; P ] [ ("v", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| slice |) |) |)); ("pred", M.read (| pred |)); @@ -5354,7 +5530,18 @@ Module slice. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] + |) |) |) |))); @@ -5699,6 +5886,9 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| head |) |) |) ] |))) @@ -5757,6 +5947,8 @@ Module slice. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))); @@ -5768,6 +5960,8 @@ Module slice. Value.Integer IntegerKind.Usize 1; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -5887,7 +6081,18 @@ Module slice. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] + |) |) |) |))); @@ -5938,7 +6143,13 @@ Module slice. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] + |))); fun γ => ltac:(M.monadic (let~ pred : @@ -6004,6 +6215,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -6313,6 +6526,9 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| tail |) |) |) ] |))) @@ -6373,6 +6589,8 @@ Module slice. let pred := M.alloc (| pred |) in Value.StructRecord "core::slice::iter::RSplit" + [] + [ T; P ] [ ("inner", M.call_closure (| @@ -6561,6 +6779,8 @@ Module slice. (let self := M.alloc (| self |) in Value.StructRecord "core::slice::iter::RSplit" + [] + [ T; P ] [ ("inner", M.call_closure (| @@ -6845,6 +7065,8 @@ Module slice. let pred := M.alloc (| pred |) in Value.StructRecord "core::slice::iter::RSplitMut" + [] + [ T; P ] [ ("inner", M.call_closure (| @@ -7366,7 +7588,7 @@ Module slice. M.read (| γ |), Value.Integer IntegerKind.Usize 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))); fun γ => ltac:(M.monadic (let _ := @@ -7545,6 +7767,8 @@ Module slice. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -7670,10 +7894,14 @@ Module slice. let n := M.alloc (| n |) in Value.StructRecord "core::slice::iter::SplitN" + [] + [ T; P ] [ ("inner", Value.StructRecord "core::slice::iter::GenericSplitN" + [] + [ Ty.apply (Ty.path "core::slice::iter::Split") [] [ T; P ] ] [ ("iter", M.read (| s |)); ("count", M.read (| n |)) ]) ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -7812,10 +8040,14 @@ Module slice. let n := M.alloc (| n |) in Value.StructRecord "core::slice::iter::RSplitN" + [] + [ T; P ] [ ("inner", Value.StructRecord "core::slice::iter::GenericSplitN" + [] + [ Ty.apply (Ty.path "core::slice::iter::RSplit") [] [ T; P ] ] [ ("iter", M.read (| s |)); ("count", M.read (| n |)) ]) ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -7957,10 +8189,14 @@ Module slice. let n := M.alloc (| n |) in Value.StructRecord "core::slice::iter::SplitNMut" + [] + [ T; P ] [ ("inner", Value.StructRecord "core::slice::iter::GenericSplitN" + [] + [ Ty.apply (Ty.path "core::slice::iter::SplitMut") [] [ T; P ] ] [ ("iter", M.read (| s |)); ("count", M.read (| n |)) ]) ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -8102,10 +8338,14 @@ Module slice. let n := M.alloc (| n |) in Value.StructRecord "core::slice::iter::RSplitNMut" + [] + [ T; P ] [ ("inner", Value.StructRecord "core::slice::iter::GenericSplitN" + [] + [ Ty.apply (Ty.path "core::slice::iter::RSplitMut") [] [ T; P ] ] [ ("iter", M.read (| s |)); ("count", M.read (| n |)) ]) ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -8320,6 +8560,8 @@ Module slice. let size := M.alloc (| size |) in Value.StructRecord "core::slice::iter::Windows" + [] + [ T ] [ ("v", M.read (| slice |)); ("size", M.read (| size |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -8347,6 +8589,8 @@ Module slice. (let self := M.alloc (| self |) in Value.StructRecord "core::slice::iter::Windows" + [] + [ T ] [ ("v", M.borrow (| @@ -8477,7 +8721,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ ret : @@ -8494,6 +8744,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -8532,6 +8784,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -8610,6 +8864,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1) ] ] |) @@ -8719,6 +8975,8 @@ Module slice. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))); @@ -8788,7 +9046,11 @@ Module slice. Value.Tuple [ M.read (| size |); - Value.StructTuple "core::option::Option::Some" [ M.read (| size |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| size |) ] ] |))) ] @@ -8963,7 +9225,18 @@ Module slice. |)) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] + |))); fun γ => ltac:(M.monadic (let~ nth : @@ -9014,6 +9287,8 @@ Module slice. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| n |)); ("end_", M.read (| end_ |)) ] ] @@ -9069,6 +9344,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -9091,6 +9368,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| nth |) |) |) ] |))) @@ -9188,7 +9472,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ start : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -9247,6 +9537,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -9288,6 +9580,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)) ] ] |) @@ -9500,7 +9794,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ ret : @@ -9517,6 +9817,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -9555,6 +9857,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -9662,6 +9966,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -9852,7 +10158,18 @@ Module slice. |)) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] + |))); fun γ => ltac:(M.monadic (let~ ret : @@ -9903,6 +10220,8 @@ Module slice. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -9988,6 +10307,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -10010,6 +10331,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| ret |) |) |) ] |))) @@ -10218,6 +10546,8 @@ Module slice. let size := M.alloc (| size |) in Value.StructRecord "core::slice::iter::Chunks" + [] + [ T ] [ ("v", M.read (| slice |)); ("chunk_size", M.read (| size |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -10245,6 +10575,8 @@ Module slice. (let self := M.alloc (| self |) in Value.StructRecord "core::slice::iter::Chunks" + [] + [ T ] [ ("v", M.borrow (| @@ -10349,9 +10681,15 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); - fun γ => - ltac:(M.monadic + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); + fun γ => + ltac:(M.monadic (let~ chunksz : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := M.alloc (| M.call_closure (| @@ -10452,6 +10790,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| fst |) |) |) ] |))) @@ -10531,6 +10876,8 @@ Module slice. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))); @@ -10651,7 +10998,11 @@ Module slice. Value.Tuple [ M.read (| n |); - Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| n |) ] ] |))) ] @@ -10819,7 +11170,18 @@ Module slice. |)) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] + |))); fun γ => ltac:(M.monadic (let~ end_ : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -10979,6 +11341,8 @@ Module slice. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)) @@ -11036,6 +11400,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| end_ |)) ] ] |) @@ -11048,6 +11414,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| nth |) |) |) ] |))) @@ -11118,7 +11491,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ start : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -11183,6 +11562,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -11224,6 +11605,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)) ] ] |) @@ -11482,7 +11865,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ remainder : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -11650,6 +12039,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| snd |) |) |) ] |))) @@ -11748,7 +12144,13 @@ Module slice. |)) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ start : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -11922,6 +12324,8 @@ Module slice. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)) ] ] |) @@ -11976,6 +12380,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| start |)) ] ] |) @@ -11988,6 +12394,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| nth_back |) |) |) ] |))) ] @@ -12216,10 +12624,17 @@ Module slice. let size := M.alloc (| size |) in Value.StructRecord "core::slice::iter::ChunksMut" + [] + [ T ] [ ("v", M.borrow (| Pointer.Kind.MutPointer, M.deref (| M.read (| slice |) |) |)); ("chunk_size", M.read (| size |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -12300,7 +12715,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ sz : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -12400,6 +12821,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -12491,6 +12919,8 @@ Module slice. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))); @@ -12607,7 +13037,11 @@ Module slice. Value.Tuple [ M.read (| n |); - Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| n |) ] ] |))) ] @@ -12778,7 +13212,18 @@ Module slice. |)) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] + |))); fun γ => ltac:(M.monadic (let~ end_ : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -13003,6 +13448,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -13090,7 +13542,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ start : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -13153,6 +13611,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -13192,6 +13652,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)) ] ] |) @@ -13461,7 +13923,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ remainder : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -13622,6 +14090,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -13738,7 +14213,13 @@ Module slice. |)) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ start : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -13975,6 +14456,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -14328,6 +14816,8 @@ Module slice. M.alloc (| Value.StructRecord "core::slice::iter::ChunksExact" + [] + [ T ] [ ("v", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| fst |) |) |)); ("rem", @@ -14392,6 +14882,8 @@ Module slice. (let self := M.alloc (| self |) in Value.StructRecord "core::slice::iter::ChunksExact" + [] + [ T ] [ ("v", M.borrow (| @@ -14522,7 +15014,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -14592,6 +15090,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| fst |) |) |) ] |))) @@ -14659,7 +15164,11 @@ Module slice. Value.Tuple [ M.read (| n |); - Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| n |) ] ] |) |))) @@ -14821,7 +15330,18 @@ Module slice. |)) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -15158,7 +15678,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -15257,6 +15783,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| snd |) |) |) ] |))) @@ -15352,7 +15885,13 @@ Module slice. |)) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ start : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -15440,6 +15979,8 @@ Module slice. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)) ] ] |) @@ -15494,6 +16035,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| start |)) ] ] |) @@ -15506,6 +16049,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| nth_back |) |) |) ] |))) ] @@ -15870,6 +16415,8 @@ Module slice. M.alloc (| Value.StructRecord "core::slice::iter::ChunksExactMut" + [] + [ T ] [ ("v", M.borrow (| @@ -15879,7 +16426,12 @@ Module slice. ("rem", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| snd |) |) |)); ("chunk_size", M.read (| chunk_size |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + []) ] |))) ] @@ -16018,7 +16570,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -16087,6 +16645,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -16163,7 +16728,11 @@ Module slice. Value.Tuple [ M.read (| n |); - Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| n |) ] ] |) |))) @@ -16325,7 +16894,18 @@ Module slice. |)) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -16669,7 +17249,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -16765,6 +17351,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -16878,7 +17471,13 @@ Module slice. |)) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ start : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -17068,6 +17667,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -17387,6 +17993,8 @@ Module slice. (let self := M.alloc (| self |) in Value.StructRecord "core::slice::iter::ArrayWindows" + [ N ] + [ T ] [ ("slice_head", M.call_closure (| @@ -17556,6 +18164,8 @@ Module slice. M.alloc (| Value.StructRecord "core::slice::iter::ArrayWindows" + [ N ] + [ T ] [ ("slice_head", M.call_closure (| @@ -17569,7 +18179,12 @@ Module slice. [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| slice |) |) |) ] |)); ("num", M.read (| num_windows |)); - ("marker", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] ] + []) ] |) |))) @@ -17663,7 +18278,18 @@ Module slice. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "array") [ N ] [ T ] ] + ] + [] + |) |) |) |))); @@ -17752,6 +18378,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| ret |) |) |) ] |) |))) @@ -17787,6 +18415,8 @@ Module slice. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -17911,7 +18541,18 @@ Module slice. Value.Integer IntegerKind.Usize 0 |) |) in - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "array") [ N ] [ T ] ] + ] + [] + |) |) |) |))); @@ -18023,6 +18664,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| ret |) |) |) ] |) |))) @@ -18276,7 +18919,18 @@ Module slice. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "array") [ N ] [ T ] ] + ] + [] + |) |) |) |))); @@ -18361,6 +19015,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| ret |) |) |) ] |) |))) @@ -18441,7 +19097,18 @@ Module slice. Value.Integer IntegerKind.Usize 0 |) |) in - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "array") [ N ] [ T ] ] + ] + [] + |) |) |) |))); @@ -18537,6 +19204,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| ret |) |) |) ] |) |))) @@ -18764,6 +19433,8 @@ Module slice. M.alloc (| Value.StructRecord "core::slice::iter::ArrayChunks" + [ N ] + [ T ] [ ("iter", M.call_closure (| @@ -18859,6 +19530,8 @@ Module slice. (let self := M.alloc (| self |) in Value.StructRecord "core::slice::iter::ArrayChunks" + [ N ] + [ T ] [ ("iter", M.call_closure (| @@ -19630,6 +20303,8 @@ Module slice. M.alloc (| Value.StructRecord "core::slice::iter::ArrayChunksMut" + [ N ] + [ T ] [ ("iter", M.call_closure (| @@ -20390,6 +21065,8 @@ Module slice. let size := M.alloc (| size |) in Value.StructRecord "core::slice::iter::RChunks" + [] + [ T ] [ ("v", M.read (| slice |)); ("chunk_size", M.read (| size |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -20417,6 +21094,8 @@ Module slice. (let self := M.alloc (| self |) in Value.StructRecord "core::slice::iter::RChunks" + [] + [ T ] [ ("v", M.borrow (| @@ -20527,7 +21206,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ len : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -20638,6 +21323,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| snd |) |) |) ] |))) @@ -20717,6 +21409,8 @@ Module slice. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))); @@ -20837,7 +21531,11 @@ Module slice. Value.Tuple [ M.read (| n |); - Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| n |) ] ] |))) ] @@ -21007,7 +21705,18 @@ Module slice. |)) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] + |))); fun γ => ltac:(M.monadic (let~ end_ : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -21141,6 +21850,8 @@ Module slice. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)) @@ -21198,6 +21909,8 @@ Module slice. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| start |)) @@ -21213,6 +21926,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| nth |) |) |) ] |))) @@ -21284,7 +22004,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ rem : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -21360,6 +22086,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -21401,6 +22129,8 @@ Module slice. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| end_ |)) @@ -21669,7 +22399,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ remainder : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -21808,6 +22544,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| fst |) |) |) ] |))) @@ -21905,7 +22648,13 @@ Module slice. |)) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ offset_from_end : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -22031,6 +22780,8 @@ Module slice. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)) ] ] |) @@ -22085,6 +22836,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| end_ |)) ] ] |) @@ -22097,6 +22850,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| nth_back |) |) |) ] |))) ] @@ -22325,10 +23080,17 @@ Module slice. let size := M.alloc (| size |) in Value.StructRecord "core::slice::iter::RChunksMut" + [] + [ T ] [ ("v", M.borrow (| Pointer.Kind.MutPointer, M.deref (| M.read (| slice |) |) |)); ("chunk_size", M.read (| size |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -22414,7 +23176,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ sz : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -22539,6 +23307,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -22630,6 +23405,8 @@ Module slice. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))); @@ -22746,7 +23523,11 @@ Module slice. Value.Tuple [ M.read (| n |); - Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| n |) ] ] |))) ] @@ -22921,7 +23702,18 @@ Module slice. |)) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] + |))); fun γ => ltac:(M.monadic (let~ end_ : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -23129,6 +23921,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -23217,7 +24016,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ rem : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -23291,6 +24096,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -23330,6 +24137,8 @@ Module slice. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| end_ |)) @@ -23608,7 +24417,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ remainder : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -23744,6 +24559,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -23859,7 +24681,13 @@ Module slice. |)) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ offset_from_end : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -24049,6 +24877,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -24381,6 +25216,8 @@ Module slice. M.alloc (| Value.StructRecord "core::slice::iter::RChunksExact" + [] + [ T ] [ ("v", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| snd |) |) |)); ("rem", @@ -24445,6 +25282,8 @@ Module slice. (let self := M.alloc (| self |) in Value.StructRecord "core::slice::iter::RChunksExact" + [] + [ T ] [ ("v", M.borrow (| @@ -24575,7 +25414,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -24674,6 +25519,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| snd |) |) |) ] |))) @@ -24741,7 +25593,11 @@ Module slice. Value.Tuple [ M.read (| n |); - Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| n |) ] ] |) |))) @@ -24903,7 +25759,18 @@ Module slice. |)) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -25316,7 +26183,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -25386,6 +26259,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| fst |) |) |) ] |))) @@ -25484,7 +26364,13 @@ Module slice. |)) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ offset : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -25598,6 +26484,8 @@ Module slice. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)) ] ] |) @@ -25652,6 +26540,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| end_ |)) ] ] |) @@ -25664,6 +26554,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| nth_back |) |) |) ] |))) ] @@ -25986,6 +26878,8 @@ Module slice. M.alloc (| Value.StructRecord "core::slice::iter::RChunksExactMut" + [] + [ T ] [ ("v", M.borrow (| @@ -26134,7 +27028,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ len : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -26231,6 +27131,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -26307,7 +27214,11 @@ Module slice. Value.Tuple [ M.read (| n |); - Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| n |) ] ] |) |))) @@ -26470,7 +27381,18 @@ Module slice. |)) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] + |))); fun γ => ltac:(M.monadic (let~ len : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -26884,7 +27806,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -26953,6 +27881,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -27069,7 +28004,13 @@ Module slice. |)) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ offset : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -27247,6 +28188,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -27536,6 +28484,8 @@ Module slice. let predicate := M.alloc (| predicate |) in Value.StructRecord "core::slice::iter::ChunkBy" + [] + [ T; P ] [ ("slice", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| slice |) |) |)); ("predicate", M.read (| predicate |)) @@ -27623,7 +28573,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ len : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -27859,6 +28815,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| head |) |) |) ] |))) @@ -27931,6 +28894,8 @@ Module slice. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))); @@ -27942,6 +28907,8 @@ Module slice. Value.Integer IntegerKind.Usize 1; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -28090,7 +29057,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ len : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -28355,6 +29328,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| tail |) |) |) ] |))) @@ -28516,6 +29496,8 @@ Module slice. let predicate := M.alloc (| predicate |) in Value.StructRecord "core::slice::iter::ChunkByMut" + [] + [ T; P ] [ ("slice", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| slice |) |) |)); ("predicate", M.read (| predicate |)) @@ -28604,7 +29586,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ len : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -28868,6 +29856,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -28944,6 +29939,8 @@ Module slice. Value.Integer IntegerKind.Usize 0; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] ] |))); @@ -28955,6 +29952,8 @@ Module slice. Value.Integer IntegerKind.Usize 1; Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -29104,7 +30103,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ len : Ty.apply (Ty.path "*") [] [ Ty.path "usize" ] := @@ -29389,6 +30394,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, diff --git a/CoqOfRust/core/slice/iter/macros.v b/CoqOfRust/core/slice/iter/macros.v index cd241ce72..6bb6022b0 100644 --- a/CoqOfRust/core/slice/iter/macros.v +++ b/CoqOfRust/core/slice/iter/macros.v @@ -1021,12 +1021,20 @@ Module slice. ] |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -1174,7 +1182,11 @@ Module slice. Value.Tuple [ M.read (| exact |); - Value.StructTuple "core::option::Option::Some" [ M.read (| exact |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| exact |) ] ] |) |))) @@ -1611,7 +1623,13 @@ Module slice. |))) ] |) in - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |) |) |) |))); @@ -1641,6 +1659,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -1880,8 +1900,21 @@ Module slice. |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) @@ -2827,6 +2860,8 @@ Module slice. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -2856,7 +2891,13 @@ Module slice. ] |))) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2971,6 +3012,8 @@ Module slice. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ B ] [ M.read (| y |) ] |) |) @@ -2995,7 +3038,7 @@ Module slice. ] |))) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ B ] [] |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3238,6 +3281,8 @@ Module slice. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| i |) ] |) |) @@ -3275,7 +3320,9 @@ Module slice. ] |))) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3540,6 +3587,8 @@ Module slice. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| i |) ] |) |) @@ -3564,7 +3613,9 @@ Module slice. ] |))) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3972,12 +4023,20 @@ Module slice. ] |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -4329,7 +4388,13 @@ Module slice. |))) ] |) in - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |) |) |) |))); @@ -4359,6 +4424,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -4600,8 +4667,21 @@ Module slice. |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) @@ -5801,12 +5881,20 @@ Module slice. ] |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -5954,7 +6042,11 @@ Module slice. Value.Tuple [ M.read (| exact |); - Value.StructTuple "core::option::Option::Some" [ M.read (| exact |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| exact |) ] ] |) |))) @@ -6393,7 +6485,13 @@ Module slice. |))) ] |) in - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + [] + |) |) |) |))); @@ -6423,6 +6521,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -6662,8 +6762,21 @@ Module slice. |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) @@ -7621,6 +7734,8 @@ Module slice. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -7650,7 +7765,13 @@ Module slice. ] |))) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7765,6 +7886,8 @@ Module slice. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ B ] [ M.read (| y |) ] |) |) @@ -7789,7 +7912,7 @@ Module slice. ] |))) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ B ] [] |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -8034,6 +8157,8 @@ Module slice. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| i |) ] |) |) @@ -8071,7 +8196,9 @@ Module slice. ] |))) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -8339,6 +8466,8 @@ Module slice. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| i |) ] |) |) @@ -8363,7 +8492,9 @@ Module slice. ] |))) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -8639,12 +8770,20 @@ Module slice. ] |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -8998,7 +9137,13 @@ Module slice. |))) ] |) in - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + [] + |) |) |) |))); @@ -9028,6 +9173,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -9269,8 +9416,21 @@ Module slice. |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) diff --git a/CoqOfRust/core/slice/memchr.v b/CoqOfRust/core/slice/memchr.v index a3153b0a8..c007bf0e0 100644 --- a/CoqOfRust/core/slice/memchr.v +++ b/CoqOfRust/core/slice/memchr.v @@ -312,6 +312,8 @@ Module slice. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.read (| i |) ] |) |) @@ -349,7 +351,9 @@ Module slice. ] |))) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -740,6 +744,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| offset |)) ] ] |) @@ -807,6 +813,8 @@ Module slice. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -1085,6 +1093,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| offset |)) ] ] |) diff --git a/CoqOfRust/core/slice/mod.v b/CoqOfRust/core/slice/mod.v index 6c08f5787..6f1fabee2 100644 --- a/CoqOfRust/core/slice/mod.v +++ b/CoqOfRust/core/slice/mod.v @@ -28,6 +28,8 @@ Module slice. ltac:(M.monadic (Value.StructTuple "core::option::Option::Some" + [] + [ Ty.tuple [ Ty.path "core::slice::Direction"; Ty.path "usize" ] ] [ M.read (| M.match_operator (| @@ -89,7 +91,7 @@ Module slice. M.alloc (| Value.Tuple [ - Value.StructTuple "core::slice::Direction::Front" []; + Value.StructTuple "core::slice::Direction::Front" [] [] []; M.read (| M.deref (| M.read (| i |) |) |) ] |))); @@ -109,7 +111,7 @@ Module slice. M.alloc (| Value.Tuple [ - Value.StructTuple "core::slice::Direction::Front" []; + Value.StructTuple "core::slice::Direction::Front" [] [] []; M.read (| M.match_operator (| Ty.apply (Ty.path "*") [] [ Ty.path "usize" ], @@ -242,7 +244,7 @@ Module slice. M.alloc (| Value.Tuple [ - Value.StructTuple "core::slice::Direction::Back" []; + Value.StructTuple "core::slice::Direction::Back" [] [] []; M.read (| M.match_operator (| Ty.apply (Ty.path "*") [] [ Ty.path "usize" ], @@ -375,7 +377,7 @@ Module slice. M.alloc (| Value.Tuple [ - Value.StructTuple "core::slice::Direction::Back" []; + Value.StructTuple "core::slice::Direction::Back" [] [] []; M.read (| M.deref (| M.read (| i |) |) |) ] |))); @@ -519,10 +521,19 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| first |) |) |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |))) ] |) |))) @@ -569,10 +580,19 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| first |) |) |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + [] + |))) ] |) |))) @@ -626,6 +646,14 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ T ]; + Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + ] [ Value.Tuple [ @@ -635,7 +663,20 @@ Module slice. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ T ]; + Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + ] + [] + |))) ] |) |))) @@ -694,6 +735,14 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&mut") [] [ T ]; + Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + ] [ Value.Tuple [ @@ -703,7 +752,20 @@ Module slice. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&mut") [] [ T ]; + Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + ] + [] + |))) ] |) |))) @@ -757,6 +819,14 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ T ]; + Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + ] [ Value.Tuple [ @@ -766,7 +836,20 @@ Module slice. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ T ]; + Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + ] + [] + |))) ] |) |))) @@ -825,6 +908,14 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&mut") [] [ T ]; + Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + ] [ Value.Tuple [ @@ -834,7 +925,20 @@ Module slice. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&mut") [] [ T ]; + Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + ] + [] + |))) ] |) |))) @@ -877,10 +981,19 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| last |) |) |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |))) ] |) |))) @@ -927,10 +1040,19 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| last |) |) |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] + [] + |))) ] |) |))) @@ -997,12 +1119,20 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -1117,12 +1247,20 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -1250,7 +1388,19 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ]; + Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + ] + [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -1298,6 +1448,20 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "array") [ N ] [ T ] ]; + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + ] [ Value.Tuple [ @@ -1432,7 +1596,22 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "array") [ N ] [ T ] ]; + Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + ] + [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -1483,6 +1662,20 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "array") [ N ] [ T ] ]; + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + ] [ Value.Tuple [ @@ -1619,7 +1812,19 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ]; + Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] + ] + ] + [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -1687,6 +1892,20 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ]; + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "array") [ N ] [ T ] ] + ] + ] [ Value.Tuple [ @@ -1821,7 +2040,22 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ]; + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "array") [ N ] [ T ] ] + ] + ] + [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -1892,6 +2126,20 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ]; + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "array") [ N ] [ T ] ] + ] + ] [ Value.Tuple [ @@ -2018,7 +2266,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ last : @@ -2074,6 +2328,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -2192,7 +2448,13 @@ Module slice. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let~ last : @@ -2265,6 +2527,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -2703,6 +2967,8 @@ Module slice. M.alloc (| Value.StructRecord "core::ops::range::Range" + [] + [ Ty.apply (Ty.path "*const") [] [ T ] ] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)) ] |) |))) @@ -2771,6 +3037,8 @@ Module slice. M.alloc (| Value.StructRecord "core::ops::range::Range" + [] + [ Ty.apply (Ty.path "*mut") [] [ T ] ] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)) ] |) |))) @@ -2878,10 +3146,19 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| me |) |) |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] ] + [] + |))) ] |) |))) @@ -2987,10 +3264,19 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| me |) |) |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "array") [ N ] [ T ] ] ] + [] + |))) ] |) |))) @@ -6346,6 +6632,14 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ]; + Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + ] [ M.call_closure (| Ty.tuple @@ -6367,7 +6661,20 @@ Module slice. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ]; + Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + ] + [] + |))) ] |) |))) @@ -6449,6 +6756,14 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ]; + Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + ] [ M.call_closure (| Ty.tuple @@ -6473,7 +6788,20 @@ Module slice. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ]; + Ty.apply (Ty.path "&mut") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + ] + [] + |))) ] |) |))) @@ -7078,6 +7406,14 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ]; + Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + ] [ Value.Tuple [ @@ -7113,6 +7449,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| index |)) ] ] |) @@ -7152,6 +7490,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -7358,6 +7698,14 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ]; + Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + ] [ Value.Tuple [ @@ -7393,6 +7741,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| index |)) ] ] |) @@ -7432,6 +7782,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -7592,6 +7944,8 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| n |)) ] ] |) @@ -7717,6 +8071,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -7925,6 +8281,13 @@ Module slice. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -7943,7 +8306,13 @@ Module slice. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -8161,6 +8530,18 @@ Module slice. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ T ] + ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -8180,7 +8561,13 @@ Module slice. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ T ] ] ] + [] + |))) ] |) |))) @@ -8382,6 +8769,8 @@ Module slice. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "usize"; Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] |) |) @@ -8500,7 +8889,11 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.StructTuple "core::cmp::Ordering::Greater" [] + Value.StructTuple + "core::cmp::Ordering::Greater" + [] + [] + [] |) |) ] @@ -8614,7 +9007,9 @@ Module slice. M.borrow (| Pointer.Kind.Ref, cmp |); M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] |) + M.alloc (| + Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] + |) |) ] |) @@ -8652,7 +9047,11 @@ Module slice. |) |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| base |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "usize"; Ty.path "usize" ] + [ M.read (| base |) ] |))); fun γ => ltac:(M.monadic @@ -8681,7 +9080,7 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.StructTuple "core::cmp::Ordering::Less" [] + Value.StructTuple "core::cmp::Ordering::Less" [] [] [] |) |) ] @@ -8721,7 +9120,11 @@ Module slice. |) |) in M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| result |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "usize"; Ty.path "usize" ] + [ M.read (| result |) ] |))) ] |) @@ -9069,6 +9472,8 @@ Module slice. Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] |) |) ] @@ -9506,7 +9911,11 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.StructTuple "core::cmp::Ordering::Less" [] + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] |) |) ] @@ -11192,6 +11601,8 @@ Module slice. M.read (| src |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -12656,7 +13067,7 @@ Module slice. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -12686,7 +13097,11 @@ Module slice. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -12831,7 +13246,7 @@ Module slice. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -12861,7 +13276,11 @@ Module slice. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -13199,6 +13618,8 @@ Module slice. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| i |)); ("end_", @@ -13526,6 +13947,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| i |)) ] ] |) @@ -13909,12 +14332,20 @@ Module slice. Value.Bool true |) in M.alloc (| - Value.StructTuple "core::cmp::Ordering::Less" [] + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::cmp::Ordering::Greater" [] + Value.StructTuple + "core::cmp::Ordering::Greater" + [] + [] + [] |))) ] |) @@ -14156,7 +14587,16 @@ Module slice. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] |) |) |) @@ -14241,6 +14681,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -14268,6 +14715,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -14494,7 +14948,16 @@ Module slice. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] + [] |) |) |) @@ -14612,6 +15075,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -14639,6 +15109,13 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -14837,6 +15314,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| first |) |) |) ] |))) ] @@ -15057,6 +15536,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| first |) |) |) ] |))) ] @@ -15246,6 +15727,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| last |) |) |) ] |))) ] @@ -15461,6 +15944,8 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ T ] ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| last |) |) |) ] |))) ] @@ -15701,6 +16186,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", N) ] ] |) @@ -16126,9 +16613,31 @@ Module slice. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "array") + [ N ] + [ + Ty.apply + (Ty.path "&mut") + [] + [ + Ty.associated_in_trait + "core::slice::index::SliceIndex" + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + I + "Output" + ] + ]; + Ty.apply (Ty.path "core::slice::GetManyMutError") [ N ] [] + ] [ Value.StructRecord "core::slice::GetManyMutError" + [ N ] + [] [ ("_private", Value.Tuple []) ] ] |) @@ -16141,6 +16650,26 @@ Module slice. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "array") + [ N ] + [ + Ty.apply + (Ty.path "&mut") + [] + [ + Ty.associated_in_trait + "core::slice::index::SliceIndex" + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] + I + "Output" + ] + ]; + Ty.apply (Ty.path "core::slice::GetManyMutError") [ N ] [] + ] [ M.call_closure (| Ty.apply @@ -16349,7 +16878,13 @@ Module slice. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] + |) |) |) |))); @@ -16408,11 +16943,17 @@ Module slice. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| offset |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| offset |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))) ] |) |))) @@ -16607,7 +17148,18 @@ Module slice. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ops::range::Range") + [] + [ Ty.path "usize" ] + ] + [] + |) |) |) |))); @@ -16718,15 +17270,25 @@ Module slice. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::ops::range::Range") [] [ Ty.path "usize" ] ] [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)) ] ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::ops::range::Range") [] [ Ty.path "usize" ] ] + [] + |))) ] |) |))) @@ -17370,6 +17932,8 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| src |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| len |)) ] ] |) @@ -17394,6 +17958,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| len |)) ] ] |) @@ -17920,6 +18486,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| i |)) ] ] |) @@ -18082,6 +18650,8 @@ Module slice. (let self := M.alloc (| self |) in Value.StructRecord "core::slice::GetManyMutError" + [ N ] + [] [ ("_private", M.call_closure (| diff --git a/CoqOfRust/core/slice/rotate.v b/CoqOfRust/core/slice/rotate.v index ff0556681..99bf1e93e 100644 --- a/CoqOfRust/core/slice/rotate.v +++ b/CoqOfRust/core/slice/rotate.v @@ -577,6 +577,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1); diff --git a/CoqOfRust/core/slice/sort/select.v b/CoqOfRust/core/slice/sort/select.v index 3858dbdea..20ab6b6c1 100644 --- a/CoqOfRust/core/slice/sort/select.v +++ b/CoqOfRust/core/slice/sort/select.v @@ -384,7 +384,11 @@ Module slice. M.deref (| M.read (| v |) |) |); M.read (| index |); - Value.StructTuple "core::option::Option::None" []; + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + []; M.borrow (| Pointer.Kind.MutRef, M.deref (| @@ -1243,6 +1247,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| mid |)) @@ -1275,6 +1281,8 @@ Module slice. Value.StructTuple "core::option::Option::None" [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] |) |) in M.continue (||) @@ -1457,6 +1465,8 @@ Module slice. ancestor_pivot, Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -2730,6 +2740,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| p |)) ] ] |) @@ -2780,6 +2792,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -3161,6 +3175,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| lo |)); ("end_", M.read (| hi |)) ] ] |) @@ -3356,6 +3372,8 @@ Module slice. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| v |) |) |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| lo |)); ("end_", diff --git a/CoqOfRust/core/slice/sort/shared/smallsort.v b/CoqOfRust/core/slice/sort/shared/smallsort.v index 6c5c34230..bf610bb5a 100644 --- a/CoqOfRust/core/slice/sort/shared/smallsort.v +++ b/CoqOfRust/core/slice/sort/shared/smallsort.v @@ -2025,6 +2025,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| presorted_len |)); ("end_", M.read (| desired_len |)) @@ -2238,6 +2240,8 @@ Module slice. M.alloc (| Value.StructRecord "core::slice::sort::shared::smallsort::CopyOnDrop" + [] + [ T ] [ ("src", (* MutToConstPointer *) @@ -4889,6 +4893,8 @@ Module slice. M.alloc (| Value.StructRecord "core::slice::sort::shared::smallsort::CopyOnDrop" + [] + [ T ] [ ("src", M.borrow (| @@ -6612,6 +6618,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| len_div_2 |)) diff --git a/CoqOfRust/core/slice/sort/stable/drift.v b/CoqOfRust/core/slice/sort/stable/drift.v index 8583fc6c8..569ed6efd 100644 --- a/CoqOfRust/core/slice/sort/stable/drift.v +++ b/CoqOfRust/core/slice/sort/stable/drift.v @@ -560,6 +560,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| scan_idx |)) @@ -867,6 +869,8 @@ Module slice. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| merge_start_idx |)); @@ -1619,6 +1623,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -1725,6 +1731,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -2048,6 +2056,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -2169,6 +2179,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| eager_run_len |)) ] ] |) @@ -2181,7 +2193,11 @@ Module slice. M.deref (| M.read (| scratch |) |) |); Value.Integer IntegerKind.U32 0; - Value.StructTuple "core::option::Option::None" []; + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + []; M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| is_less |) |) @@ -2299,7 +2315,11 @@ Module slice. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| v |) |) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| scratch |) |) |); M.read (| limit |); - Value.StructTuple "core::option::Option::None" []; + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + []; M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| is_less |) |) |) ] |) @@ -2380,6 +2400,8 @@ Module slice. (let length := M.alloc (| length |) in Value.StructTuple "core::slice::sort::stable::drift::DriftsortRun" + [] + [] [ M.call_closure (| Ty.path "usize", @@ -2414,6 +2436,8 @@ Module slice. (let length := M.alloc (| length |) in Value.StructTuple "core::slice::sort::stable::drift::DriftsortRun" + [] + [] [ M.call_closure (| Ty.path "usize", diff --git a/CoqOfRust/core/slice/sort/stable/merge.v b/CoqOfRust/core/slice/sort/stable/merge.v index b6d7561b0..024a144f5 100644 --- a/CoqOfRust/core/slice/sort/stable/merge.v +++ b/CoqOfRust/core/slice/sort/stable/merge.v @@ -303,6 +303,8 @@ Module slice. M.alloc (| Value.StructRecord "core::slice::sort::stable::merge::MergeState" + [] + [ T ] [ ("start", M.read (| buf |)); ("end_", diff --git a/CoqOfRust/core/slice/sort/stable/mod.v b/CoqOfRust/core/slice/sort/stable/mod.v index 1369ab0d1..e3e410ac8 100644 --- a/CoqOfRust/core/slice/sort/stable/mod.v +++ b/CoqOfRust/core/slice/sort/stable/mod.v @@ -655,6 +655,8 @@ Module slice. ltac:(M.monadic (Value.StructRecord "core::slice::sort::stable::AlignedStorage" + [ N ] + [ T ] [ ("_align", Value.Array []); ("storage", diff --git a/CoqOfRust/core/slice/sort/stable/quicksort.v b/CoqOfRust/core/slice/sort/stable/quicksort.v index bcdbf95c7..1b1df4723 100644 --- a/CoqOfRust/core/slice/sort/stable/quicksort.v +++ b/CoqOfRust/core/slice/sort/stable/quicksort.v @@ -775,6 +775,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| mid_eq |)) ] ] |) @@ -788,7 +790,11 @@ Module slice. M.alloc (| M.write (| left_ancestor_pivot, - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] |) |) in M.continue (||) @@ -1857,6 +1863,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -2070,6 +2078,8 @@ Module slice. let len := M.alloc (| len |) in Value.StructRecord "core::slice::sort::stable::quicksort::PartitionState" + [] + [ T ] [ ("scratch_base", M.read (| scratch |)); ("scan", M.read (| scan |)); diff --git a/CoqOfRust/core/slice/sort/unstable/heapsort.v b/CoqOfRust/core/slice/sort/unstable/heapsort.v index f4f8c8efd..a4530a068 100644 --- a/CoqOfRust/core/slice/sort/unstable/heapsort.v +++ b/CoqOfRust/core/slice/sort/unstable/heapsort.v @@ -89,6 +89,8 @@ Module slice. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -270,6 +272,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| diff --git a/CoqOfRust/core/slice/sort/unstable/mod.v b/CoqOfRust/core/slice/sort/unstable/mod.v index 08d036c38..5e106d42d 100644 --- a/CoqOfRust/core/slice/sort/unstable/mod.v +++ b/CoqOfRust/core/slice/sort/unstable/mod.v @@ -405,7 +405,11 @@ Module slice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| v |) |) |); - Value.StructTuple "core::option::Option::None" []; + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + []; M.read (| limit |); M.borrow (| Pointer.Kind.MutRef, diff --git a/CoqOfRust/core/slice/sort/unstable/quicksort.v b/CoqOfRust/core/slice/sort/unstable/quicksort.v index 5456f3004..64a018732 100644 --- a/CoqOfRust/core/slice/sort/unstable/quicksort.v +++ b/CoqOfRust/core/slice/sort/unstable/quicksort.v @@ -576,6 +576,8 @@ Module slice. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -605,6 +607,8 @@ Module slice. Value.StructTuple "core::option::Option::None" [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] |) |) in M.continue (||) @@ -791,6 +795,8 @@ Module slice. ancestor_pivot, Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -1360,7 +1366,18 @@ Module slice. [ T ] ] ] := - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) in + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::slice::sort::unstable::quicksort::GapGuard") + [] + [ T ] + ] + [] + |) in let~ v_base : Ty.apply (Ty.path "*") [] [ Ty.apply (Ty.path "*mut") [] [ T ] ] := M.alloc (| @@ -1652,9 +1669,19 @@ Module slice. gap_opt, Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "core::slice::sort::unstable::quicksort::GapGuard") + [] + [ T ] + ] [ Value.StructRecord "core::slice::sort::unstable::quicksort::GapGuard" + [] + [ T ] [ ("pos", M.read (| right |)); ("value", @@ -2375,6 +2402,8 @@ Module slice. M.alloc (| Value.StructRecord "core::slice::sort::unstable::quicksort::PartitionState" + [] + [ T ] [ ("num_lt", Value.Integer IntegerKind.Usize 0); ("right", @@ -2391,6 +2420,8 @@ Module slice. ("gap", Value.StructRecord "core::slice::sort::unstable::quicksort::GapGuardRaw" + [] + [ T ] [ ("pos", M.read (| v_base |)); ("value", diff --git a/CoqOfRust/core/str/converts.v b/CoqOfRust/core/str/converts.v index d183da333..02660598a 100644 --- a/CoqOfRust/core/str/converts.v +++ b/CoqOfRust/core/str/converts.v @@ -52,6 +52,11 @@ Module str. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "&") [] [ Ty.path "str" ]; + Ty.path "core::str::error::Utf8Error" + ] [ M.borrow (| Pointer.Kind.Ref, @@ -75,7 +80,14 @@ Module str. M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Err", 0 |) in let err := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| err |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "&") [] [ Ty.path "str" ]; + Ty.path "core::str::error::Utf8Error" + ] + [ M.read (| err |) ] |))) ] |) @@ -137,6 +149,11 @@ Module str. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "&mut") [] [ Ty.path "str" ]; + Ty.path "core::str::error::Utf8Error" + ] [ M.borrow (| Pointer.Kind.MutRef, @@ -170,7 +187,14 @@ Module str. M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Err", 0 |) in let err := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| err |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "&mut") [] [ Ty.path "str" ]; + Ty.path "core::str::error::Utf8Error" + ] + [ M.read (| err |) ] |))) ] |) diff --git a/CoqOfRust/core/str/error.v b/CoqOfRust/core/str/error.v index 1cddd0f26..7374ce0d1 100644 --- a/CoqOfRust/core/str/error.v +++ b/CoqOfRust/core/str/error.v @@ -332,12 +332,16 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.cast (Ty.path "usize") (M.read (| len |)) ] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |))) ] |) |))) @@ -680,7 +684,7 @@ Module str. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::str::error::ParseBoolError" [])) + Value.StructTuple "core::str::error::ParseBoolError" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/str/iter.v b/CoqOfRust/core/str/iter.v index cfe45483b..9957a2cbb 100644 --- a/CoqOfRust/core/str/iter.v +++ b/CoqOfRust/core/str/iter.v @@ -22,6 +22,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::iter::Chars" + [] + [] [ ("iter", M.call_closure (| @@ -454,6 +456,8 @@ Module str. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -1208,8 +1212,21 @@ Module str. |), [ M.read (| remainder |) ] |); - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] + [ Value.Tuple [] ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.apply (Ty.path "core::num::nonzero::NonZero") [] [ Ty.path "usize" ] + ] ] |) |) @@ -1272,7 +1289,11 @@ Module str. Value.Integer IntegerKind.Usize 4 ] |); - Value.StructTuple "core::option::Option::Some" [ M.read (| len |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| len |) ] ] |) |))) @@ -1752,7 +1773,13 @@ Module str. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1949,6 +1976,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::iter::CharIndices" + [] + [] [ ("front_offset", M.call_closure (| @@ -2187,7 +2216,13 @@ Module str. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.tuple [ Ty.path "usize"; Ty.path "char" ] ] + [] + |))); fun γ => ltac:(M.monadic (let γ0_0 := @@ -2261,6 +2296,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.tuple [ Ty.path "usize"; Ty.path "char" ] ] [ Value.Tuple [ M.read (| index |); M.read (| ch |) ] ] |))) ] @@ -2635,6 +2672,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::iter::Bytes" + [] + [] [ M.call_closure (| Ty.apply @@ -4020,6 +4059,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -4044,6 +4085,8 @@ Module str. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -4060,7 +4103,13 @@ Module str. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4122,7 +4171,13 @@ Module str. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |) |) |) |))); @@ -4231,6 +4286,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -4259,6 +4316,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| elt |) |) |) ] |))); fun γ => @@ -4350,7 +4409,13 @@ Module str. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |) |) |) |))); @@ -4458,6 +4523,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -4486,6 +4553,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| elt |) |) |) ] |))); fun γ => @@ -4589,7 +4658,13 @@ Module str. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |) |) |) |))); @@ -4692,6 +4767,8 @@ Module str. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -4729,6 +4806,9 @@ Module str. Value.StructTuple "core::option::Option::None" [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] + [] |) |) |) @@ -4843,6 +4923,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| b |)); ("end_", @@ -4871,6 +4953,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| elt |) |) |) ] |))); fun γ => @@ -4890,6 +4974,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -4914,6 +5000,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -5031,7 +5119,13 @@ Module str. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |) |) |) |))); @@ -5134,6 +5228,8 @@ Module str. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -5171,6 +5267,9 @@ Module str. Value.StructTuple "core::option::Option::None" [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] + [] |) |) |) @@ -5284,6 +5383,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| b |)); ("end_", @@ -5312,6 +5413,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| elt |) |) |) ] |))); fun γ => @@ -5331,6 +5434,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -5355,6 +5460,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -5435,7 +5542,13 @@ Module str. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |) |) |) |))); @@ -5445,6 +5558,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -5497,6 +5612,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -5703,6 +5820,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::iter::Split" + [] + [ P ] [ M.call_closure (| Ty.apply (Ty.path "core::str::iter::SplitInternal") [] [ P ], @@ -5910,6 +6029,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::iter::RSplit" + [] + [ P ] [ M.call_closure (| Ty.apply (Ty.path "core::str::iter::SplitInternal") [] [ P ], @@ -6339,6 +6460,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::iter::SplitTerminator" + [] + [ P ] [ M.call_closure (| Ty.apply (Ty.path "core::str::iter::SplitInternal") [] [ P ], @@ -6552,6 +6675,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::iter::RSplitTerminator" + [] + [ P ] [ M.call_closure (| Ty.apply (Ty.path "core::str::iter::SplitInternal") [] [ P ], @@ -7080,7 +7205,13 @@ Module str. M.read (| γ |), Value.Integer IntegerKind.Usize 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |))); fun γ => ltac:(M.monadic (let _ := @@ -7226,7 +7357,13 @@ Module str. M.read (| γ |), Value.Integer IntegerKind.Usize 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |))); fun γ => ltac:(M.monadic (let _ := @@ -7537,6 +7674,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::iter::SplitN" + [] + [ P ] [ M.call_closure (| Ty.apply (Ty.path "core::str::iter::SplitNInternal") [] [ P ], @@ -7747,6 +7886,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::iter::RSplitN" + [] + [ P ] [ M.call_closure (| Ty.apply (Ty.path "core::str::iter::SplitNInternal") [] [ P ], @@ -7933,6 +8074,8 @@ Module str. M.alloc (| Value.StructTuple "core::str::iter::MatchIndicesInternal" + [] + [ P ] [ M.call_closure (| Ty.associated_in_trait "core::str::pattern::Pattern" [] [] P "Searcher", @@ -8214,6 +8357,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)) @@ -8374,6 +8519,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", M.read (| end_ |)) @@ -8574,6 +8721,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::iter::MatchIndices" + [] + [ P ] [ M.call_closure (| Ty.apply (Ty.path "core::str::iter::MatchIndicesInternal") [] [ P ], @@ -8788,6 +8937,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::iter::RMatchIndices" + [] + [ P ] [ M.call_closure (| Ty.apply (Ty.path "core::str::iter::MatchIndicesInternal") [] [ P ], @@ -8984,6 +9135,8 @@ Module str. M.alloc (| Value.StructTuple "core::str::iter::MatchesInternal" + [] + [ P ] [ M.call_closure (| Ty.associated_in_trait "core::str::pattern::Pattern" [] [] P "Searcher", @@ -9261,6 +9414,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| a |)); ("end_", M.read (| b |)) ] ] |))) @@ -9413,6 +9568,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| a |)); ("end_", M.read (| b |)) ] ] |))) @@ -9605,6 +9762,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::iter::Matches" + [] + [ P ] [ M.call_closure (| Ty.apply (Ty.path "core::str::iter::MatchesInternal") [] [ P ], @@ -9815,6 +9974,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::iter::RMatches" + [] + [ P ] [ M.call_closure (| Ty.apply (Ty.path "core::str::iter::MatchesInternal") [] [ P ], @@ -10004,6 +10165,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::iter::Lines" + [] + [] [ M.call_closure (| Ty.apply @@ -10387,6 +10550,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::iter::LinesAny" + [] + [] [ M.call_closure (| Ty.path "core::str::iter::Lines", @@ -10675,6 +10840,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::iter::SplitWhitespace" + [] + [] [ ("inner", M.call_closure (| @@ -10832,6 +10999,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::iter::SplitAsciiWhitespace" + [] + [] [ ("inner", M.call_closure (| @@ -11524,7 +11693,13 @@ Module str. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |) |) |) |))); @@ -11534,6 +11709,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -11759,6 +11936,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::iter::SplitInclusive" + [] + [ P ] [ M.call_closure (| Ty.apply (Ty.path "core::str::iter::SplitInternal") [] [ P ], @@ -11926,6 +12105,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::iter::EncodeUtf16" + [] + [] [ ("chars", M.call_closure (| @@ -12138,6 +12319,8 @@ Module str. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u16" ] [ M.read (| tmp |) ] |) |) @@ -12434,7 +12617,11 @@ Module str. Value.Integer IntegerKind.Usize 3 ] |); - Value.StructTuple "core::option::Option::Some" [ M.read (| len |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| len |) ] ] |))); fun γ => @@ -12463,6 +12650,8 @@ Module str. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -12548,6 +12737,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::iter::EscapeDebug" + [] + [] [ ("inner", M.call_closure (| @@ -12721,6 +12912,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::iter::EscapeDefault" + [] + [] [ ("inner", M.call_closure (| @@ -12866,6 +13059,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::iter::EscapeUnicode" + [] + [] [ ("inner", M.call_closure (| diff --git a/CoqOfRust/core/str/lossy.v b/CoqOfRust/core/str/lossy.v index 2a2b1643f..7e6ffab7a 100644 --- a/CoqOfRust/core/str/lossy.v +++ b/CoqOfRust/core/str/lossy.v @@ -18,6 +18,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::lossy::Utf8Chunks" + [] + [] [ ("source", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -52,6 +54,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::lossy::Utf8Chunk" + [] + [] [ ("valid", M.borrow (| @@ -1008,6 +1012,11 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ + Ty.path + "usize" + ] [ ("start", M.read (| @@ -1590,6 +1599,8 @@ Module str. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| from |)) @@ -1965,15 +1976,21 @@ Module str. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 8; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize @@ -2152,6 +2169,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::lossy::Utf8Chunks" + [] + [] [ ("source", M.borrow (| @@ -2220,6 +2239,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::lossy::Debug" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -2394,7 +2415,13 @@ Module str. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::str::lossy::Utf8Chunk" ] + [] + |) |) |) |))); @@ -3308,9 +3335,13 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::str::lossy::Utf8Chunk" ] [ Value.StructRecord "core::str::lossy::Utf8Chunk" + [] + [] [ ("valid", M.borrow (| diff --git a/CoqOfRust/core/str/mod.v b/CoqOfRust/core/str/mod.v index 61d850e0e..435ee6681 100644 --- a/CoqOfRust/core/str/mod.v +++ b/CoqOfRust/core/str/mod.v @@ -199,6 +199,8 @@ Module str. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| s |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| trunc_len |)) ] ] |) @@ -674,6 +676,8 @@ Module str. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| s |) |) |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| char_start |)) ] ] |) @@ -696,6 +700,8 @@ Module str. M.alloc (| Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| char_start |)); ("end_", @@ -1498,6 +1504,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| index |)); ("end_", M.read (| upper_bound |)) @@ -1986,6 +1994,8 @@ Module str. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| begin |)); ("end_", M.read (| end_ |)) ]; M.borrow (| Pointer.Kind.ConstPointer, M.deref (| M.read (| self |) |) |) ] @@ -2043,6 +2053,8 @@ Module str. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| begin |)); ("end_", M.read (| end_ |)) ]; M.borrow (| Pointer.Kind.MutPointer, @@ -2303,6 +2315,14 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ Ty.path "str" ]; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] + ] [ M.call_closure (| Ty.tuple @@ -2324,7 +2344,20 @@ Module str. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ Ty.path "str" ]; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] + ] + [] + |))) ] |) |))) @@ -2395,6 +2428,14 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&mut") [] [ Ty.path "str" ]; + Ty.apply (Ty.path "&mut") [] [ Ty.path "str" ] + ] + ] [ M.call_closure (| Ty.tuple @@ -2416,7 +2457,20 @@ Module str. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&mut") [] [ Ty.path "str" ]; + Ty.apply (Ty.path "&mut") [] [ Ty.path "str" ] + ] + ] + [] + |))) ] |) |))) @@ -2686,6 +2740,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::iter::Chars" + [] + [] [ ("iter", M.call_closure (| @@ -2732,6 +2788,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::iter::CharIndices" + [] + [] [ ("front_offset", Value.Integer IntegerKind.Usize 0); ("iter", @@ -2761,6 +2819,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::iter::Bytes" + [] + [] [ M.call_closure (| Ty.apply @@ -2823,6 +2883,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::iter::SplitWhitespace" + [] + [] [ ("inner", M.call_closure (| @@ -2862,10 +2924,10 @@ Module str. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::str::IsWhitespace" [] + Value.StructTuple "core::str::IsWhitespace" [] [] [] ] |); - Value.StructTuple "core::str::IsNotEmpty" [] + Value.StructTuple "core::str::IsNotEmpty" [] [] [] ] |)) ])) @@ -3002,19 +3064,21 @@ Module str. |) |) |); - Value.StructTuple "core::str::IsAsciiWhitespace" [] + Value.StructTuple "core::str::IsAsciiWhitespace" [] [] [] ] |); - Value.StructTuple "core::str::BytesIsNotEmpty" [] + Value.StructTuple "core::str::BytesIsNotEmpty" [] [] [] ] |); - Value.StructTuple "core::str::UnsafeBytesToStr" [] + Value.StructTuple "core::str::UnsafeBytesToStr" [] [] [] ] |) |) in M.alloc (| Value.StructRecord "core::str::iter::SplitAsciiWhitespace" + [] + [] [ ("inner", M.read (| inner |)) ] |) |))) @@ -3038,6 +3102,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::iter::Lines" + [] + [] [ M.call_closure (| Ty.apply @@ -3070,7 +3136,7 @@ Module str. Value.UnicodeChar 10 ] |); - Value.StructTuple "core::str::LinesMap" [] + Value.StructTuple "core::str::LinesMap" [] [] [] ] |) ])) @@ -3093,6 +3159,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::iter::LinesAny" + [] + [] [ M.call_closure (| Ty.path "core::str::iter::Lines", @@ -3120,6 +3188,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::iter::EncodeUtf16" + [] + [] [ ("chars", M.call_closure (| @@ -3461,9 +3531,13 @@ Module str. let pat := M.alloc (| pat |) in Value.StructTuple "core::str::iter::Split" + [] + [ P ] [ Value.StructRecord "core::str::iter::SplitInternal" + [] + [ P ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -3519,9 +3593,13 @@ Module str. let pat := M.alloc (| pat |) in Value.StructTuple "core::str::iter::SplitInclusive" + [] + [ P ] [ Value.StructRecord "core::str::iter::SplitInternal" + [] + [ P ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -3575,6 +3653,8 @@ Module str. let pat := M.alloc (| pat |) in Value.StructTuple "core::str::iter::RSplit" + [] + [ P ] [ M.read (| M.SubPointer.get_struct_tuple_field (| @@ -3613,6 +3693,8 @@ Module str. let pat := M.alloc (| pat |) in Value.StructTuple "core::str::iter::SplitTerminator" + [] + [ P ] [ M.struct_record_update (M.read (| @@ -3657,6 +3739,8 @@ Module str. let pat := M.alloc (| pat |) in Value.StructTuple "core::str::iter::RSplitTerminator" + [] + [ P ] [ M.read (| M.SubPointer.get_struct_tuple_field (| @@ -3697,9 +3781,13 @@ Module str. let pat := M.alloc (| pat |) in Value.StructTuple "core::str::iter::SplitN" + [] + [ P ] [ Value.StructRecord "core::str::iter::SplitNInternal" + [] + [ P ] [ ("iter", M.read (| @@ -3745,6 +3833,8 @@ Module str. let pat := M.alloc (| pat |) in Value.StructTuple "core::str::iter::RSplitN" + [] + [ P ] [ M.read (| M.SubPointer.get_struct_tuple_field (| @@ -3970,6 +4060,14 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ Ty.path "str" ]; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] + ] [ Value.Tuple [ @@ -3996,6 +4094,8 @@ Module str. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| start |)) ] ] |) @@ -4024,6 +4124,8 @@ Module str. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| end_ |)) ] ] |) @@ -4246,6 +4348,14 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply (Ty.path "&") [] [ Ty.path "str" ]; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] + ] [ Value.Tuple [ @@ -4272,6 +4382,8 @@ Module str. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| start |)) ] ] |) @@ -4300,6 +4412,8 @@ Module str. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| end_ |)) ] ] |) @@ -4333,9 +4447,13 @@ Module str. let pat := M.alloc (| pat |) in Value.StructTuple "core::str::iter::Matches" + [] + [ P ] [ Value.StructTuple "core::str::iter::MatchesInternal" + [] + [ P ] [ M.call_closure (| Ty.associated_in_trait "core::str::pattern::Pattern" [] [] P "Searcher", @@ -4378,6 +4496,8 @@ Module str. let pat := M.alloc (| pat |) in Value.StructTuple "core::str::iter::RMatches" + [] + [ P ] [ M.read (| M.SubPointer.get_struct_tuple_field (| @@ -4416,9 +4536,13 @@ Module str. let pat := M.alloc (| pat |) in Value.StructTuple "core::str::iter::MatchIndices" + [] + [ P ] [ Value.StructTuple "core::str::iter::MatchIndicesInternal" + [] + [ P ] [ M.call_closure (| Ty.associated_in_trait "core::str::pattern::Pattern" [] [] P "Searcher", @@ -4462,6 +4586,8 @@ Module str. let pat := M.alloc (| pat |) in Value.StructTuple "core::str::iter::RMatchIndices" + [] + [ P ] [ M.read (| M.SubPointer.get_struct_tuple_field (| @@ -4902,6 +5028,8 @@ Module str. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| i |)); ("end_", M.read (| j |)) ] ] |) @@ -5028,6 +5156,8 @@ Module str. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| i |)); ("end_", @@ -5234,6 +5364,8 @@ Module str. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| j |)) ] ] |) @@ -5804,6 +5936,8 @@ Module str. M.alloc (| Value.StructRecord "core::str::iter::EscapeDebug" + [] + [] [ ("inner", M.call_closure (| @@ -6004,7 +6138,7 @@ Module str. |), [ M.read (| chars |); - Value.StructTuple "core::str::CharEscapeDebugContinue" [] + Value.StructTuple "core::str::CharEscapeDebugContinue" [] [] [] ] |) ] @@ -6032,6 +6166,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::iter::EscapeDefault" + [] + [] [ ("inner", M.call_closure (| @@ -6058,7 +6194,7 @@ Module str. M.get_associated_function (| Ty.path "str", "chars", [], [] |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |) ] |); - Value.StructTuple "core::str::CharEscapeDefault" [] + Value.StructTuple "core::str::CharEscapeDefault" [] [] [] ] |)) ])) @@ -6082,6 +6218,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::iter::EscapeUnicode" + [] + [] [ ("inner", M.call_closure (| @@ -6108,7 +6246,7 @@ Module str. M.get_associated_function (| Ty.path "str", "chars", [], [] |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |) ] |); - Value.StructTuple "core::str::CharEscapeUnicode" [] + Value.StructTuple "core::str::CharEscapeUnicode" [] [] [] ] |)) ])) @@ -6314,7 +6452,7 @@ Module str. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::str::LinesMap" [])) + Value.StructTuple "core::str::LinesMap" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6336,7 +6474,7 @@ Module str. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::str::CharEscapeDebugContinue" [])) + Value.StructTuple "core::str::CharEscapeDebugContinue" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6358,7 +6496,7 @@ Module str. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::str::CharEscapeUnicode" [])) + Value.StructTuple "core::str::CharEscapeUnicode" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6380,7 +6518,7 @@ Module str. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::str::CharEscapeDefault" [])) + Value.StructTuple "core::str::CharEscapeDefault" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6402,7 +6540,7 @@ Module str. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::str::IsWhitespace" [])) + Value.StructTuple "core::str::IsWhitespace" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6424,7 +6562,7 @@ Module str. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::str::IsAsciiWhitespace" [])) + Value.StructTuple "core::str::IsAsciiWhitespace" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6446,7 +6584,7 @@ Module str. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::str::IsNotEmpty" [])) + Value.StructTuple "core::str::IsNotEmpty" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6468,7 +6606,7 @@ Module str. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::str::BytesIsNotEmpty" [])) + Value.StructTuple "core::str::BytesIsNotEmpty" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6490,7 +6628,7 @@ Module str. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::str::UnsafeBytesToStr" [])) + Value.StructTuple "core::str::UnsafeBytesToStr" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/str/pattern.v b/CoqOfRust/core/str/pattern.v index a59165d13..9b959696c 100644 --- a/CoqOfRust/core/str/pattern.v +++ b/CoqOfRust/core/str/pattern.v @@ -440,6 +440,8 @@ Module str. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -475,6 +477,8 @@ Module str. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::fmt::Arguments" ] [ M.call_closure (| Ty.path "core::fmt::Arguments", @@ -528,6 +532,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -552,6 +558,8 @@ Module str. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| len |)) ] ] |) @@ -561,7 +569,13 @@ Module str. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |))) ] |) |))) @@ -754,6 +768,8 @@ Module str. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -789,6 +805,8 @@ Module str. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::fmt::Arguments" ] [ M.call_closure (| Ty.path "core::fmt::Arguments", @@ -842,6 +860,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -866,6 +886,8 @@ Module str. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| start |)) ] ] |) @@ -875,7 +897,13 @@ Module str. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |))) ] |) |))) @@ -894,7 +922,11 @@ Module str. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::option::Option::None" [])) + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::str::pattern::Utf8Pattern" ] + [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1854,6 +1886,8 @@ Module str. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.tuple [ Ty.path "usize"; Ty.path "usize" ] ] [ Value.Tuple [ M.read (| a |); M.read (| b |) ] ] |) |) @@ -1870,7 +1904,11 @@ Module str. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.tuple [ Ty.path "usize"; Ty.path "usize" ] ] + [] |) |) |) @@ -1951,6 +1989,8 @@ Module str. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.tuple [ Ty.path "usize"; Ty.path "usize" ] ] [ Value.Tuple [ M.read (| a |); M.read (| b |) ] ] |) |) @@ -1967,7 +2007,11 @@ Module str. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.tuple [ Ty.path "usize"; Ty.path "usize" ] ] + [] |) |) |) @@ -2052,6 +2096,8 @@ Module str. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.tuple [ Ty.path "usize"; Ty.path "usize" ] ] [ Value.Tuple [ M.read (| a |); M.read (| b |) ] ] |) |) @@ -2068,7 +2114,11 @@ Module str. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.tuple [ Ty.path "usize"; Ty.path "usize" ] ] + [] |) |) |) @@ -2149,6 +2199,8 @@ Module str. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.tuple [ Ty.path "usize"; Ty.path "usize" ] ] [ Value.Tuple [ M.read (| a |); M.read (| b |) ] ] |) |) @@ -2165,7 +2217,11 @@ Module str. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.tuple [ Ty.path "usize"; Ty.path "usize" ] ] + [] |) |) |) @@ -2220,6 +2276,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::pattern::CharSearcher" + [] + [] [ ("haystack", M.borrow (| @@ -2770,6 +2828,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| old_finger |)); ("end_", @@ -2926,6 +2986,8 @@ Module str. M.alloc (| Value.StructTuple "core::str::pattern::SearchStep::Match" + [] + [] [ M.read (| old_finger |); M.read (| @@ -2942,6 +3004,8 @@ Module str. (M.alloc (| Value.StructTuple "core::str::pattern::SearchStep::Reject" + [] + [] [ M.read (| old_finger |); M.read (| @@ -2957,7 +3021,9 @@ Module str. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::str::pattern::SearchStep::Done" [] |))) + (M.alloc (| + Value.StructTuple "core::str::pattern::SearchStep::Done" [] [] [] + |))) ] |) |))) @@ -3132,6 +3198,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -3466,6 +3534,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| found_char |)); ("end_", @@ -3584,6 +3654,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer @@ -3632,6 +3704,14 @@ Module str. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.path "usize"; + Ty.path "usize" + ] + ] [ Value.Tuple [ @@ -3685,7 +3765,11 @@ Module str. |) |) in M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.tuple [ Ty.path "usize"; Ty.path "usize" ] ] + [] |) |) |) @@ -3777,6 +3861,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -3933,6 +4019,8 @@ Module str. M.alloc (| Value.StructTuple "core::str::pattern::SearchStep::Match" + [] + [] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -3949,6 +4037,8 @@ Module str. (M.alloc (| Value.StructTuple "core::str::pattern::SearchStep::Reject" + [] + [] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -3964,7 +4054,9 @@ Module str. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::str::pattern::SearchStep::Done" [] |))) + (M.alloc (| + Value.StructTuple "core::str::pattern::SearchStep::Done" [] [] [] + |))) ] |) |))) @@ -4154,6 +4246,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -4435,6 +4529,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| found_char |)); @@ -4580,6 +4676,11 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ + Ty.path + "usize" + ] [ ("start", Value.Integer @@ -4645,6 +4746,14 @@ Module str. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.path "usize"; + Ty.path "usize" + ] + ] [ Value.Tuple [ @@ -4749,7 +4858,11 @@ Module str. |) |) in M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.tuple [ Ty.path "usize"; Ty.path "usize" ] ] + [] |) |) |) @@ -4907,6 +5020,8 @@ Module str. M.alloc (| Value.StructRecord "core::str::pattern::CharSearcher" + [] + [] [ ("haystack", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |)); @@ -5318,9 +5433,13 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::str::pattern::Utf8Pattern" ] [ Value.StructTuple "core::str::pattern::Utf8Pattern::CharPattern" + [] + [] [ M.read (| M.deref (| M.read (| self |) |) |) ] ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -5715,6 +5834,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::pattern::MultiCharEqSearcher" + [] + [ C ] [ ("char_eq", M.call_closure (| @@ -5932,6 +6053,8 @@ Module str. let haystack := M.alloc (| haystack |) in Value.StructRecord "core::str::pattern::MultiCharEqSearcher" + [] + [ C ] [ ("haystack", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |)); ("char_eq", @@ -6184,6 +6307,8 @@ Module str. M.return_ (| Value.StructTuple "core::str::pattern::SearchStep::Match" + [] + [] [ M.read (| i |); M.call_closure (| @@ -6204,6 +6329,8 @@ Module str. M.return_ (| Value.StructTuple "core::str::pattern::SearchStep::Reject" + [] + [] [ M.read (| i |); M.call_closure (| @@ -6221,7 +6348,7 @@ Module str. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::str::pattern::SearchStep::Done" [] |) + M.alloc (| Value.StructTuple "core::str::pattern::SearchStep::Done" [] [] [] |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6436,6 +6563,8 @@ Module str. M.return_ (| Value.StructTuple "core::str::pattern::SearchStep::Match" + [] + [] [ M.read (| i |); M.call_closure (| @@ -6456,6 +6585,8 @@ Module str. M.return_ (| Value.StructTuple "core::str::pattern::SearchStep::Reject" + [] + [] [ M.read (| i |); M.call_closure (| @@ -6473,7 +6604,7 @@ Module str. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::str::pattern::SearchStep::Done" [] |) + M.alloc (| Value.StructTuple "core::str::pattern::SearchStep::Done" [] [] [] |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6535,6 +6666,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::pattern::CharArraySearcher" + [ N ] + [] [ M.call_closure (| Ty.apply @@ -6677,6 +6810,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::pattern::CharArrayRefSearcher" + [ N ] + [] [ M.call_closure (| Ty.apply @@ -6822,6 +6957,8 @@ Module str. let haystack := M.alloc (| haystack |) in Value.StructTuple "core::str::pattern::CharArraySearcher" + [ N ] + [] [ M.call_closure (| Ty.apply @@ -6843,6 +6980,8 @@ Module str. [ Value.StructTuple "core::str::pattern::MultiCharEqPattern" + [] + [ Ty.apply (Ty.path "array") [ N ] [ Ty.path "char" ] ] [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] @@ -6883,7 +7022,11 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ Ty.apply (Ty.path "array") [ N ] [ Ty.path "char" ] ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -6922,7 +7065,11 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ Ty.apply (Ty.path "array") [ N ] [ Ty.path "char" ] ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -6964,7 +7111,11 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ Ty.apply (Ty.path "array") [ N ] [ Ty.path "char" ] ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -7006,7 +7157,11 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ Ty.apply (Ty.path "array") [ N ] [ Ty.path "char" ] ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -7051,7 +7206,11 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ Ty.apply (Ty.path "array") [ N ] [ Ty.path "char" ] ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -7472,6 +7631,8 @@ Module str. let haystack := M.alloc (| haystack |) in Value.StructTuple "core::str::pattern::CharArrayRefSearcher" + [ N ] + [] [ M.call_closure (| Ty.apply @@ -7503,6 +7664,13 @@ Module str. [ Value.StructTuple "core::str::pattern::MultiCharEqPattern" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "array") [ N ] [ Ty.path "char" ] ] + ] [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] @@ -7548,7 +7716,16 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "array") [ N ] [ Ty.path "char" ] ] + ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -7592,7 +7769,16 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "array") [ N ] [ Ty.path "char" ] ] + ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -7639,7 +7825,16 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "array") [ N ] [ Ty.path "char" ] ] + ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -7686,7 +7881,16 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "array") [ N ] [ Ty.path "char" ] ] + ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -7736,7 +7940,16 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "array") [ N ] [ Ty.path "char" ] ] + ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -8195,6 +8408,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::pattern::CharSliceSearcher" + [] + [] [ M.call_closure (| Ty.apply @@ -8667,6 +8882,8 @@ Module str. let haystack := M.alloc (| haystack |) in Value.StructTuple "core::str::pattern::CharSliceSearcher" + [] + [] [ M.call_closure (| Ty.apply @@ -8694,6 +8911,13 @@ Module str. [ Value.StructTuple "core::str::pattern::MultiCharEqPattern" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "char" ] ] + ] [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] @@ -8729,7 +8953,11 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ Ty.path "char" ] ] ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -8763,7 +8991,11 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ Ty.path "char" ] ] ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -8800,7 +9032,11 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ Ty.path "char" ] ] ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -8837,7 +9073,11 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ Ty.path "char" ] ] ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -8877,7 +9117,11 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.apply (Ty.path "slice") [] [ Ty.path "char" ] ] ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -8931,6 +9175,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::str::pattern::CharPredicateSearcher" + [] + [ F ] [ M.call_closure (| Ty.apply (Ty.path "core::str::pattern::MultiCharEqSearcher") [] [ F ], @@ -9479,6 +9725,8 @@ Module str. let haystack := M.alloc (| haystack |) in Value.StructTuple "core::str::pattern::CharPredicateSearcher" + [] + [ F ] [ M.call_closure (| Ty.apply (Ty.path "core::str::pattern::MultiCharEqSearcher") [] [ F ], @@ -9494,6 +9742,8 @@ Module str. [ Value.StructTuple "core::str::pattern::MultiCharEqPattern" + [] + [ F ] [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] @@ -9531,7 +9781,11 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ F ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -9567,7 +9821,11 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ F ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -9606,7 +9864,11 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ F ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -9645,7 +9907,11 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ F ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -9687,7 +9953,11 @@ Module str. [] |), [ - Value.StructTuple "core::str::pattern::MultiCharEqPattern" [ M.read (| self |) ]; + Value.StructTuple + "core::str::pattern::MultiCharEqPattern" + [] + [ F ] + [ M.read (| self |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |) ] |))) @@ -11014,6 +11284,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -11038,6 +11310,8 @@ Module str. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -11088,7 +11362,13 @@ Module str. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |))) ] |) |))) @@ -11255,6 +11535,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -11279,6 +11561,8 @@ Module str. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| i |)) ] ] |) @@ -11288,7 +11572,13 @@ Module str. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |))) ] |) |))) @@ -11307,9 +11597,13 @@ Module str. (let self := M.alloc (| self |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::str::pattern::Utf8Pattern" ] [ Value.StructTuple "core::str::pattern::Utf8Pattern::StringPattern" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -11377,6 +11671,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::pattern::StrSearcher" + [] + [] [ ("haystack", M.borrow (| @@ -11627,6 +11923,8 @@ Module str. M.alloc (| Value.StructTuple "core::str::pattern::StrSearcherImpl::Empty" + [] + [] [ M.call_closure (| Ty.path "core::str::pattern::EmptyNeedle", @@ -11657,6 +11955,8 @@ Module str. M.alloc (| Value.StructTuple "core::str::pattern::StrSearcherImpl::TwoWay" + [] + [] [ M.call_closure (| Ty.path "core::str::pattern::TwoWaySearcher", @@ -11821,6 +12121,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::pattern::EmptyNeedle" + [] + [] [ ("position", M.call_closure (| @@ -12153,6 +12455,8 @@ Module str. M.alloc (| Value.StructRecord "core::str::pattern::StrSearcher" + [] + [] [ ("haystack", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |)); @@ -12161,9 +12465,13 @@ Module str. ("searcher", Value.StructTuple "core::str::pattern::StrSearcherImpl::Empty" + [] + [] [ Value.StructRecord "core::str::pattern::EmptyNeedle" + [] + [] [ ("position", Value.Integer IntegerKind.Usize 0); ("end_", @@ -12194,6 +12502,8 @@ Module str. (M.alloc (| Value.StructRecord "core::str::pattern::StrSearcher" + [] + [] [ ("haystack", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| haystack |) |) |)); @@ -12202,6 +12512,8 @@ Module str. ("searcher", Value.StructTuple "core::str::pattern::StrSearcherImpl::TwoWay" + [] + [] [ M.call_closure (| Ty.path "core::str::pattern::TwoWaySearcher", @@ -12392,6 +12704,8 @@ Module str. Value.StructTuple "core::str::pattern::SearchStep::Done" [] + [] + [] |) |) |) @@ -12495,6 +12809,8 @@ Module str. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| pos |)) ] ] |) @@ -12519,6 +12835,8 @@ Module str. M.alloc (| Value.StructTuple "core::str::pattern::SearchStep::Match" + [] + [] [ M.read (| pos |); M.read (| pos |) ] |))); fun γ => @@ -12537,7 +12855,11 @@ Module str. |) |) in M.alloc (| - Value.StructTuple "core::str::pattern::SearchStep::Done" [] + Value.StructTuple + "core::str::pattern::SearchStep::Done" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -12580,6 +12902,8 @@ Module str. M.alloc (| Value.StructTuple "core::str::pattern::SearchStep::Reject" + [] + [] [ M.read (| pos |); M.read (| @@ -12661,6 +12985,8 @@ Module str. Value.StructTuple "core::str::pattern::SearchStep::Done" [] + [] + [] |) |) |) @@ -12905,6 +13231,8 @@ Module str. M.alloc (| Value.StructTuple "core::str::pattern::SearchStep::Reject" + [] + [] [ M.read (| a |); M.read (| b |) ] |))); fun γ => @@ -13037,6 +13365,11 @@ Module str. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ Ty.path "usize"; Ty.path "usize" ] + ] [ Value.Tuple [ M.read (| a |); M.read (| b |) ] @@ -13059,6 +13392,11 @@ Module str. Value.StructTuple "core::option::Option::None" [] + [ + Ty.tuple + [ Ty.path "usize"; Ty.path "usize" ] + ] + [] |) |) |) @@ -13420,6 +13758,8 @@ Module str. Value.StructTuple "core::str::pattern::SearchStep::Done" [] + [] + [] |) |) |) @@ -13523,6 +13863,8 @@ Module str. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| end_ |)) ] ] |) @@ -13547,6 +13889,8 @@ Module str. M.alloc (| Value.StructTuple "core::str::pattern::SearchStep::Match" + [] + [] [ M.read (| end_ |); M.read (| end_ |) ] |))); fun γ => @@ -13565,7 +13909,11 @@ Module str. |) |) in M.alloc (| - Value.StructTuple "core::str::pattern::SearchStep::Done" [] + Value.StructTuple + "core::str::pattern::SearchStep::Done" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -13608,6 +13956,8 @@ Module str. M.alloc (| Value.StructTuple "core::str::pattern::SearchStep::Reject" + [] + [] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -13667,6 +14017,8 @@ Module str. Value.StructTuple "core::str::pattern::SearchStep::Done" [] + [] + [] |) |) |) @@ -13911,6 +14263,8 @@ Module str. M.alloc (| Value.StructTuple "core::str::pattern::SearchStep::Reject" + [] + [] [ M.read (| a |); M.read (| b |) ] |))); fun γ => @@ -14042,6 +14396,11 @@ Module str. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ Ty.path "usize"; Ty.path "usize" ] + ] [ Value.Tuple [ M.read (| a |); M.read (| b |) ] @@ -14064,6 +14423,11 @@ Module str. Value.StructTuple "core::option::Option::None" [] + [ + Ty.tuple + [ Ty.path "usize"; Ty.path "usize" ] + ] + [] |) |) |) @@ -14353,6 +14717,8 @@ Module str. (let self := M.alloc (| self |) in Value.StructRecord "core::str::pattern::TwoWaySearcher" + [] + [] [ ("crit_pos", M.call_closure (| @@ -15094,6 +15460,8 @@ Module str. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| crit_pos |)) ] ] @@ -15138,6 +15506,8 @@ Module str. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| period |)); ("end_", @@ -15239,6 +15609,8 @@ Module str. M.alloc (| Value.StructRecord "core::str::pattern::TwoWaySearcher" + [] + [] [ ("crit_pos", M.read (| crit_pos |)); ("crit_pos_back", M.read (| crit_pos_back |)); @@ -15297,6 +15669,8 @@ Module str. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| period |)) @@ -15338,6 +15712,8 @@ Module str. (M.alloc (| Value.StructRecord "core::str::pattern::TwoWaySearcher" + [] + [] [ ("crit_pos", M.read (| crit_pos |)); ("crit_pos_back", M.read (| crit_pos |)); @@ -16127,6 +16503,8 @@ Module str. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", @@ -16480,6 +16858,8 @@ Module str. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", @@ -17445,6 +17825,8 @@ Module str. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| crit |)) @@ -17819,6 +18201,8 @@ Module str. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -19137,7 +19521,11 @@ Module str. ltac:(M.monadic (let _a := M.alloc (| _a |) in let _b := M.alloc (| _b |) in - Value.StructTuple "core::option::Option::None" [])) + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.tuple [ Ty.path "usize"; Ty.path "usize" ] ] + [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -19154,6 +19542,8 @@ Module str. let b := M.alloc (| b |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.tuple [ Ty.path "usize"; Ty.path "usize" ] ] [ Value.Tuple [ M.read (| a |); M.read (| b |) ] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -19213,6 +19603,8 @@ Module str. let b := M.alloc (| b |) in Value.StructTuple "core::str::pattern::SearchStep::Reject" + [] + [] [ M.read (| a |); M.read (| b |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -19230,6 +19622,8 @@ Module str. let b := M.alloc (| b |) in Value.StructTuple "core::str::pattern::SearchStep::Match" + [] + [] [ M.read (| a |); M.read (| b |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -19567,6 +19961,8 @@ Module str. M.alloc (| Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -19740,6 +20136,8 @@ Module str. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "bool" ] [ M.call_closure (| Ty.path "bool", @@ -19994,6 +20392,8 @@ Module str. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| needle |) |) |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1) ] ] |) @@ -20299,6 +20699,11 @@ Module str. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ + Ty.path + "usize" + ] [ ("start", M.read (| @@ -20311,6 +20716,9 @@ Module str. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" + ] [ ("end_", M.call_closure (| @@ -20958,6 +21366,8 @@ Module str. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -21129,6 +21539,8 @@ Module str. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -21714,7 +22126,13 @@ Module str. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::option::Option::Some" [ M.read (| result |) ] |) + M.alloc (| + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "bool" ] + [ M.read (| result |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -21910,6 +22328,8 @@ Module str. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -21942,6 +22362,8 @@ Module str. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/core/str/traits.v b/CoqOfRust/core/str/traits.v index f20001c74..45b5d06a8 100644 --- a/CoqOfRust/core/str/traits.v +++ b/CoqOfRust/core/str/traits.v @@ -151,6 +151,8 @@ Module str. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -365,6 +367,8 @@ Module str. let slice := M.alloc (| slice |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| slice |) |) |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -382,6 +386,8 @@ Module str. let slice := M.alloc (| slice |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| slice |) |) |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -587,6 +593,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -624,7 +632,13 @@ Module str. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |))) ] |) |))) @@ -744,6 +758,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -786,7 +802,13 @@ Module str. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.path "str" ] ] + [] + |))) ] |) |))) @@ -1604,6 +1626,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -1641,7 +1665,13 @@ Module str. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |))) ] |) |))) @@ -1761,6 +1791,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -1803,7 +1835,13 @@ Module str. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.path "str" ] ] + [] + |))) ] |) |))) @@ -3123,6 +3161,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -3160,7 +3200,13 @@ Module str. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |))) ] |) |))) @@ -3226,6 +3272,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -3268,7 +3316,13 @@ Module str. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.path "str" ] ] + [] + |))) ] |) |))) @@ -3301,6 +3355,8 @@ Module str. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -3344,6 +3400,8 @@ Module str. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -3664,6 +3722,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -3701,7 +3761,13 @@ Module str. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |))) ] |) |))) @@ -3767,6 +3833,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -3809,7 +3877,13 @@ Module str. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.path "str" ] ] + [] + |))) ] |) |))) @@ -3868,6 +3942,8 @@ Module str. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -3939,6 +4015,8 @@ Module str. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -4302,6 +4380,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -4339,7 +4419,13 @@ Module str. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |))) ] |) |))) @@ -4405,6 +4491,8 @@ Module str. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.path "str" ] ] [ M.borrow (| Pointer.Kind.MutRef, @@ -4447,7 +4535,13 @@ Module str. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.path "str" ] ] + [] + |))) ] |) |))) @@ -4506,6 +4600,8 @@ Module str. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -4577,6 +4673,8 @@ Module str. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -4940,7 +5038,13 @@ Module str. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -5043,7 +5147,13 @@ Module str. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.path "str" ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -5471,7 +5581,13 @@ Module str. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -5564,7 +5680,13 @@ Module str. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&mut") [] [ Ty.path "str" ] ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -6300,21 +6422,31 @@ Module str. (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "true" |) |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Bool true ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "bool"; Ty.path "core::str::error::ParseBoolError" ] + [ Value.Bool true ] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "false" |) |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Bool false ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "bool"; Ty.path "core::str::error::ParseBoolError" ] + [ Value.Bool false ] |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::str::error::ParseBoolError" [] ] + [] + [ Ty.path "bool"; Ty.path "core::str::error::ParseBoolError" ] + [ Value.StructTuple "core::str::error::ParseBoolError" [] [] [] ] |))) ] |) diff --git a/CoqOfRust/core/str/validations.v b/CoqOfRust/core/str/validations.v index 64c693f15..cb467a483 100644 --- a/CoqOfRust/core/str/validations.v +++ b/CoqOfRust/core/str/validations.v @@ -282,6 +282,8 @@ Module str. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.cast (Ty.path "u32") (M.read (| x |)) ] |) |) @@ -549,7 +551,13 @@ Module str. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::option::Option::Some" [ M.read (| ch |) ] |) + M.alloc (| + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| ch |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -741,6 +749,8 @@ Module str. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u32" ] [ M.cast (Ty.path "u32") (M.read (| next_byte |)) ] |) |) @@ -1006,7 +1016,13 @@ Module str. |) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::Some" [ M.read (| ch |) ] |) + M.alloc (| + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| ch |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1480,9 +1496,18 @@ Module str. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + []; + Ty.path + "core::str::error::Utf8Error" + ] [ Value.StructRecord "core::str::error::Utf8Error" + [] + [] [ ("valid_up_to", M.read (| @@ -1491,6 +1516,11 @@ Module str. ("error_len", Value.StructTuple "core::option::Option::None" + [] + [ + Ty.path + "u8" + ] []) ] ] @@ -1527,15 +1557,25 @@ Module str. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "core::str::error::Utf8Error" + ] [ Value.StructRecord "core::str::error::Utf8Error" + [] + [] [ ("valid_up_to", M.read (| old_offset |)); ("error_len", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ Value.Integer IntegerKind.U8 @@ -1626,9 +1666,17 @@ Module str. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "core::str::error::Utf8Error" + ] [ Value.StructRecord "core::str::error::Utf8Error" + [] + [] [ ("valid_up_to", M.read (| @@ -1637,6 +1685,11 @@ Module str. ("error_len", Value.StructTuple "core::option::Option::None" + [] + [ + Ty.path + "u8" + ] []) ] ] @@ -1750,9 +1803,17 @@ Module str. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "core::str::error::Utf8Error" + ] [ Value.StructRecord "core::str::error::Utf8Error" + [] + [] [ ("valid_up_to", M.read (| @@ -1761,6 +1822,8 @@ Module str. ("error_len", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ Value.Integer IntegerKind.U8 @@ -1855,9 +1918,18 @@ Module str. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + []; + Ty.path + "core::str::error::Utf8Error" + ] [ Value.StructRecord "core::str::error::Utf8Error" + [] + [] [ ("valid_up_to", M.read (| @@ -1866,6 +1938,11 @@ Module str. ("error_len", Value.StructTuple "core::option::Option::None" + [] + [ + Ty.path + "u8" + ] []) ] ] @@ -1902,15 +1979,25 @@ Module str. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "core::str::error::Utf8Error" + ] [ Value.StructRecord "core::str::error::Utf8Error" + [] + [] [ ("valid_up_to", M.read (| old_offset |)); ("error_len", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ Value.Integer IntegerKind.U8 @@ -2001,9 +2088,17 @@ Module str. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "core::str::error::Utf8Error" + ] [ Value.StructRecord "core::str::error::Utf8Error" + [] + [] [ ("valid_up_to", M.read (| @@ -2012,6 +2107,11 @@ Module str. ("error_len", Value.StructTuple "core::option::Option::None" + [] + [ + Ty.path + "u8" + ] []) ] ] @@ -2112,9 +2212,17 @@ Module str. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "core::str::error::Utf8Error" + ] [ Value.StructRecord "core::str::error::Utf8Error" + [] + [] [ ("valid_up_to", M.read (| @@ -2123,6 +2231,8 @@ Module str. ("error_len", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ Value.Integer IntegerKind.U8 @@ -2222,9 +2332,18 @@ Module str. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + []; + Ty.path + "core::str::error::Utf8Error" + ] [ Value.StructRecord "core::str::error::Utf8Error" + [] + [] [ ("valid_up_to", M.read (| @@ -2233,6 +2352,11 @@ Module str. ("error_len", Value.StructTuple "core::option::Option::None" + [] + [ + Ty.path + "u8" + ] []) ] ] @@ -2271,9 +2395,17 @@ Module str. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "core::str::error::Utf8Error" + ] [ Value.StructRecord "core::str::error::Utf8Error" + [] + [] [ ("valid_up_to", M.read (| @@ -2282,6 +2414,8 @@ Module str. ("error_len", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ Value.Integer IntegerKind.U8 @@ -2379,9 +2513,18 @@ Module str. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + []; + Ty.path + "core::str::error::Utf8Error" + ] [ Value.StructRecord "core::str::error::Utf8Error" + [] + [] [ ("valid_up_to", M.read (| @@ -2390,6 +2533,11 @@ Module str. ("error_len", Value.StructTuple "core::option::Option::None" + [] + [ + Ty.path + "u8" + ] []) ] ] @@ -2426,15 +2574,25 @@ Module str. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "core::str::error::Utf8Error" + ] [ Value.StructRecord "core::str::error::Utf8Error" + [] + [] [ ("valid_up_to", M.read (| old_offset |)); ("error_len", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ Value.Integer IntegerKind.U8 @@ -2459,15 +2617,24 @@ Module str. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "core::str::error::Utf8Error" + ] [ Value.StructRecord "core::str::error::Utf8Error" + [] + [] [ ("valid_up_to", M.read (| old_offset |)); ("error_len", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ Value.Integer IntegerKind.U8 1 ]) ] @@ -2924,7 +3091,13 @@ Module str. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::str::error::Utf8Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/core/sync/atomic.v b/CoqOfRust/core/sync/atomic.v index 6e458f0a2..96b006112 100644 --- a/CoqOfRust/core/sync/atomic.v +++ b/CoqOfRust/core/sync/atomic.v @@ -489,6 +489,8 @@ Module sync. (let v := M.alloc (| v |) in Value.StructRecord "core::sync::atomic::AtomicBool" + [] + [] [ ("v", M.call_closure (| @@ -1228,7 +1230,11 @@ Module sync. "core::sync::atomic::Ordering::SeqCst" |) in M.alloc (| - Value.StructTuple "core::sync::atomic::Ordering::SeqCst" [] + Value.StructTuple + "core::sync::atomic::Ordering::SeqCst" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1240,7 +1246,11 @@ Module sync. "core::sync::atomic::Ordering::SeqCst" |) in M.alloc (| - Value.StructTuple "core::sync::atomic::Ordering::SeqCst" [] + Value.StructTuple + "core::sync::atomic::Ordering::SeqCst" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1252,7 +1262,11 @@ Module sync. "core::sync::atomic::Ordering::AcqRel" |) in M.alloc (| - Value.StructTuple "core::sync::atomic::Ordering::AcqRel" [] + Value.StructTuple + "core::sync::atomic::Ordering::AcqRel" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1315,7 +1329,11 @@ Module sync. "core::sync::atomic::Ordering::Acquire" |) in M.alloc (| - Value.StructTuple "core::sync::atomic::Ordering::AcqRel" [] + Value.StructTuple + "core::sync::atomic::Ordering::AcqRel" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1327,7 +1345,11 @@ Module sync. "core::sync::atomic::Ordering::Acquire" |) in M.alloc (| - Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] + Value.StructTuple + "core::sync::atomic::Ordering::Acquire" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1339,7 +1361,11 @@ Module sync. "core::sync::atomic::Ordering::Acquire" |) in M.alloc (| - Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] + Value.StructTuple + "core::sync::atomic::Ordering::Acquire" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1356,7 +1382,11 @@ Module sync. "core::sync::atomic::Ordering::Relaxed" |) in M.alloc (| - Value.StructTuple "core::sync::atomic::Ordering::Release" [] + Value.StructTuple + "core::sync::atomic::Ordering::Release" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1419,7 +1449,11 @@ Module sync. "core::sync::atomic::Ordering::Relaxed" |) in M.alloc (| - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple + "core::sync::atomic::Ordering::Relaxed" + [] + [] + [] |))) ] |) @@ -1515,12 +1549,20 @@ Module sync. let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| old |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "bool"; Ty.path "bool" ] + [ M.read (| old |) ] |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| old |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "bool"; Ty.path "bool" ] + [ M.read (| old |) ] |))) ] |))); @@ -1587,6 +1629,8 @@ Module sync. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "bool"; Ty.path "bool" ] [ M.call_closure (| Ty.path "bool", @@ -1607,6 +1651,8 @@ Module sync. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "bool"; Ty.path "bool" ] [ M.call_closure (| Ty.path "bool", @@ -1768,6 +1814,8 @@ Module sync. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "bool"; Ty.path "bool" ] [ M.call_closure (| Ty.path "bool", @@ -1788,6 +1836,8 @@ Module sync. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "bool"; Ty.path "bool" ] [ M.call_closure (| Ty.path "bool", @@ -2287,7 +2337,13 @@ Module sync. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| prev |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "bool"; Ty.path "bool" ] + [ M.read (| prev |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2316,6 +2372,8 @@ Module sync. (let p := M.alloc (| p |) in Value.StructRecord "core::sync::atomic::AtomicPtr" + [] + [ T ] [ ("p", M.call_closure (| @@ -3285,7 +3343,13 @@ Module sync. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| prev |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.apply (Ty.path "*mut") [] [ T ]; Ty.apply (Ty.path "*mut") [] [ T ] ] + [ M.read (| prev |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3976,7 +4040,7 @@ Module sync. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) @@ -4025,6 +4089,8 @@ Module sync. (let v := M.alloc (| v |) in Value.StructRecord "core::sync::atomic::AtomicI8" + [] + [] [ ("v", M.call_closure (| @@ -5163,7 +5229,13 @@ Module sync. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| prev |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "i8"; Ty.path "i8" ] + [ M.read (| prev |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5421,7 +5493,7 @@ Module sync. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) @@ -5470,6 +5542,8 @@ Module sync. (let v := M.alloc (| v |) in Value.StructRecord "core::sync::atomic::AtomicU8" + [] + [] [ ("v", M.call_closure (| @@ -6608,7 +6682,13 @@ Module sync. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| prev |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "u8"; Ty.path "u8" ] + [ M.read (| prev |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6876,7 +6956,7 @@ Module sync. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) @@ -6925,6 +7005,8 @@ Module sync. (let v := M.alloc (| v |) in Value.StructRecord "core::sync::atomic::AtomicI16" + [] + [] [ ("v", M.call_closure (| @@ -8070,7 +8152,13 @@ Module sync. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| prev |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "i16"; Ty.path "i16" ] + [ M.read (| prev |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -8338,7 +8426,7 @@ Module sync. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) @@ -8387,6 +8475,8 @@ Module sync. (let v := M.alloc (| v |) in Value.StructRecord "core::sync::atomic::AtomicU16" + [] + [] [ ("v", M.call_closure (| @@ -9532,7 +9622,13 @@ Module sync. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| prev |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "u16"; Ty.path "u16" ] + [ M.read (| prev |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -9800,7 +9896,7 @@ Module sync. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) @@ -9849,6 +9945,8 @@ Module sync. (let v := M.alloc (| v |) in Value.StructRecord "core::sync::atomic::AtomicI32" + [] + [] [ ("v", M.call_closure (| @@ -10994,7 +11092,13 @@ Module sync. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| prev |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "i32"; Ty.path "i32" ] + [ M.read (| prev |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -11262,7 +11366,7 @@ Module sync. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) @@ -11311,6 +11415,8 @@ Module sync. (let v := M.alloc (| v |) in Value.StructRecord "core::sync::atomic::AtomicU32" + [] + [] [ ("v", M.call_closure (| @@ -12456,7 +12562,13 @@ Module sync. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| prev |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "u32"; Ty.path "u32" ] + [ M.read (| prev |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -12724,7 +12836,7 @@ Module sync. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) @@ -12773,6 +12885,8 @@ Module sync. (let v := M.alloc (| v |) in Value.StructRecord "core::sync::atomic::AtomicI64" + [] + [] [ ("v", M.call_closure (| @@ -13918,7 +14032,13 @@ Module sync. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| prev |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "i64"; Ty.path "i64" ] + [ M.read (| prev |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -14186,7 +14306,7 @@ Module sync. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) @@ -14235,6 +14355,8 @@ Module sync. (let v := M.alloc (| v |) in Value.StructRecord "core::sync::atomic::AtomicU64" + [] + [] [ ("v", M.call_closure (| @@ -15380,7 +15502,13 @@ Module sync. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| prev |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "u64"; Ty.path "u64" ] + [ M.read (| prev |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -15648,7 +15776,7 @@ Module sync. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) @@ -15697,6 +15825,8 @@ Module sync. (let v := M.alloc (| v |) in Value.StructRecord "core::sync::atomic::AtomicIsize" + [] + [] [ ("v", M.call_closure (| @@ -16850,7 +16980,13 @@ Module sync. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| prev |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "isize"; Ty.path "isize" ] + [ M.read (| prev |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -17118,7 +17254,7 @@ Module sync. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) @@ -17167,6 +17303,8 @@ Module sync. (let v := M.alloc (| v |) in Value.StructRecord "core::sync::atomic::AtomicUsize" + [] + [] [ ("v", M.call_closure (| @@ -18320,7 +18458,13 @@ Module sync. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| prev |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "usize"; Ty.path "usize" ] + [ M.read (| prev |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -18532,23 +18676,33 @@ Module sync. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::sync::atomic::Ordering::Release" |) in - M.alloc (| Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] |))); + M.alloc (| + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] + |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::sync::atomic::Ordering::Relaxed" |) in - M.alloc (| Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] |))); + M.alloc (| + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] + |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::sync::atomic::Ordering::SeqCst" |) in - M.alloc (| Value.StructTuple "core::sync::atomic::Ordering::SeqCst" [] |))); + M.alloc (| + Value.StructTuple "core::sync::atomic::Ordering::SeqCst" [] [] [] + |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::sync::atomic::Ordering::Acquire" |) in - M.alloc (| Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] |))); + M.alloc (| + Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] + |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::sync::atomic::Ordering::AcqRel" |) in - M.alloc (| Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] |))) + M.alloc (| + Value.StructTuple "core::sync::atomic::Ordering::Acquire" [] [] [] + |))) ] |) |))) @@ -19553,12 +19707,20 @@ Module sync. let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| val |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ T; T ] + [ M.read (| val |) ] |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| val |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ T; T ] + [ M.read (| val |) ] |))) ] |))) @@ -20019,12 +20181,20 @@ Module sync. let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| val |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ T; T ] + [ M.read (| val |) ] |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| val |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ T; T ] + [ M.read (| val |) ] |))) ] |))) @@ -21016,7 +21186,7 @@ Module sync. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) @@ -21085,7 +21255,7 @@ Module sync. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) @@ -21155,7 +21325,7 @@ Module sync. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] + Value.StructTuple "core::sync::atomic::Ordering::Relaxed" [] [] [] ] |) |) diff --git a/CoqOfRust/core/sync/exclusive.v b/CoqOfRust/core/sync/exclusive.v index e34e530c1..46e2a36a2 100644 --- a/CoqOfRust/core/sync/exclusive.v +++ b/CoqOfRust/core/sync/exclusive.v @@ -23,6 +23,8 @@ Module sync. ltac:(M.monadic (Value.StructRecord "core::sync::exclusive::Exclusive" + [] + [ T ] [ ("inner", M.call_closure (| @@ -134,7 +136,11 @@ Module sync. | [], [], [ t ] => ltac:(M.monadic (let t := M.alloc (| t |) in - Value.StructRecord "core::sync::exclusive::Exclusive" [ ("inner", M.read (| t |)) ])) + Value.StructRecord + "core::sync::exclusive::Exclusive" + [] + [ T ] + [ ("inner", M.read (| t |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/task/poll.v b/CoqOfRust/core/task/poll.v index 36202d882..6bf8f2837 100644 --- a/CoqOfRust/core/task/poll.v +++ b/CoqOfRust/core/task/poll.v @@ -66,6 +66,8 @@ Module task. M.alloc (| Value.StructTuple "core::task::poll::Poll::Ready" + [] + [ T ] [ M.call_closure (| T, @@ -87,7 +89,9 @@ Module task. ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::task::poll::Poll::Pending" |) in - M.alloc (| Value.StructTuple "core::task::poll::Poll::Pending" [] |))) + M.alloc (| + Value.StructTuple "core::task::poll::Poll::Pending" [] [ T ] [] + |))) ] |) |))) @@ -472,7 +476,9 @@ Module task. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] |))) + (M.alloc (| + Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] + |))) ] |))); fun γ => @@ -758,6 +764,8 @@ Module task. M.alloc (| Value.StructTuple "core::task::poll::Poll::Ready" + [] + [ U ] [ M.call_closure (| U, @@ -777,7 +785,9 @@ Module task. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::task::poll::Poll::Pending" |) in - M.alloc (| Value.StructTuple "core::task::poll::Poll::Pending" [] |))) + M.alloc (| + Value.StructTuple "core::task::poll::Poll::Pending" [] [ U ] [] + |))) ] |) |))) @@ -918,9 +928,13 @@ Module task. M.alloc (| Value.StructTuple "core::task::poll::Poll::Ready" + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ U; E ] ] [ Value.StructTuple "core::result::Result::Ok" + [] + [ U; E ] [ M.call_closure (| U, @@ -956,12 +970,26 @@ Module task. M.alloc (| Value.StructTuple "core::task::poll::Poll::Ready" - [ Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] ] + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ U; E ] ] + [ + Value.StructTuple + "core::result::Result::Err" + [] + [ U; E ] + [ M.read (| e |) ] + ] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::task::poll::Poll::Pending" |) in - M.alloc (| Value.StructTuple "core::task::poll::Poll::Pending" [] |))) + M.alloc (| + Value.StructTuple + "core::task::poll::Poll::Pending" + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ U; E ] ] + [] + |))) ] |) |))) @@ -1024,7 +1052,15 @@ Module task. M.alloc (| Value.StructTuple "core::task::poll::Poll::Ready" - [ Value.StructTuple "core::result::Result::Ok" [ M.read (| t |) ] ] + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ T; U ] ] + [ + Value.StructTuple + "core::result::Result::Ok" + [] + [ T; U ] + [ M.read (| t |) ] + ] |))); fun γ => ltac:(M.monadic @@ -1044,9 +1080,13 @@ Module task. M.alloc (| Value.StructTuple "core::task::poll::Poll::Ready" + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ T; U ] ] [ Value.StructTuple "core::result::Result::Err" + [] + [ T; U ] [ M.call_closure (| U, @@ -1067,7 +1107,13 @@ Module task. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::task::poll::Poll::Pending" |) in - M.alloc (| Value.StructTuple "core::task::poll::Poll::Pending" [] |))) + M.alloc (| + Value.StructTuple + "core::task::poll::Poll::Pending" + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ T; U ] ] + [] + |))) ] |) |))) @@ -1155,12 +1201,23 @@ Module task. M.alloc (| Value.StructTuple "core::task::poll::Poll::Ready" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ U; E ] ] + ] [ Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ U; E ] ] [ Value.StructTuple "core::result::Result::Ok" + [] + [ U; E ] [ M.call_closure (| U, @@ -1203,10 +1260,25 @@ Module task. M.alloc (| Value.StructTuple "core::task::poll::Poll::Ready" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ U; E ] ] + ] [ Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] ] + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ U; E ] ] + [ + Value.StructTuple + "core::result::Result::Err" + [] + [ U; E ] + [ M.read (| e |) ] + ] ] |))); fun γ => @@ -1221,12 +1293,36 @@ Module task. M.alloc (| Value.StructTuple "core::task::poll::Poll::Ready" - [ Value.StructTuple "core::option::Option::None" [] ] + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ U; E ] ] + ] + [ + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ U; E ] ] + [] + ] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::task::poll::Poll::Pending" |) in - M.alloc (| Value.StructTuple "core::task::poll::Poll::Pending" [] |))) + M.alloc (| + Value.StructTuple + "core::task::poll::Poll::Pending" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ U; E ] ] + ] + [] + |))) ] |) |))) @@ -1301,10 +1397,25 @@ Module task. M.alloc (| Value.StructTuple "core::task::poll::Poll::Ready" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ T; U ] ] + ] [ Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::result::Result::Ok" [ M.read (| t |) ] ] + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ T; U ] ] + [ + Value.StructTuple + "core::result::Result::Ok" + [] + [ T; U ] + [ M.read (| t |) ] + ] ] |))); fun γ => @@ -1331,12 +1442,23 @@ Module task. M.alloc (| Value.StructTuple "core::task::poll::Poll::Ready" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ T; U ] ] + ] [ Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ T; U ] ] [ Value.StructTuple "core::result::Result::Err" + [] + [ T; U ] [ M.call_closure (| U, @@ -1367,12 +1489,36 @@ Module task. M.alloc (| Value.StructTuple "core::task::poll::Poll::Ready" - [ Value.StructTuple "core::option::Option::None" [] ] + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ T; U ] ] + ] + [ + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ T; U ] ] + [] + ] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::task::poll::Poll::Pending" |) in - M.alloc (| Value.StructTuple "core::task::poll::Poll::Pending" [] |))) + M.alloc (| + Value.StructTuple + "core::task::poll::Poll::Pending" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ T; U ] ] + ] + [] + |))) ] |) |))) @@ -1400,7 +1546,7 @@ Module task. | [], [], [ t ] => ltac:(M.monadic (let t := M.alloc (| t |) in - Value.StructTuple "core::task::poll::Poll::Ready" [ M.read (| t |) ])) + Value.StructTuple "core::task::poll::Poll::Ready" [] [ T ] [ M.read (| t |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1459,7 +1605,7 @@ Module task. Ty.function [ T ] (Ty.apply (Ty.path "core::result::Result") [] [ T; E ]) ] |), - [ M.read (| c |); M.constructor_as_closure "core::result::Result::Ok" ] + [ M.read (| c |); M.constructor_as_closure "core::result::Result::Ok" [] [ T; E ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1516,7 +1662,21 @@ Module task. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" - [ Value.StructTuple "core::task::poll::Poll::Ready" [ M.read (| x |) ] ] + [] + [ + Ty.apply + (Ty.path "core::result::Result") + [] + [ Ty.path "core::convert::Infallible"; E ]; + Ty.apply (Ty.path "core::task::poll::Poll") [] [ T ] + ] + [ + Value.StructTuple + "core::task::poll::Poll::Ready" + [] + [ T ] + [ M.read (| x |) ] + ] |))); fun γ => ltac:(M.monadic @@ -1536,7 +1696,21 @@ Module task. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Break" - [ Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] ] + [] + [ + Ty.apply + (Ty.path "core::result::Result") + [] + [ Ty.path "core::convert::Infallible"; E ]; + Ty.apply (Ty.path "core::task::poll::Poll") [] [ T ] + ] + [ + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "core::convert::Infallible"; E ] + [ M.read (| e |) ] + ] |))); fun γ => ltac:(M.monadic @@ -1544,7 +1718,15 @@ Module task. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" - [ Value.StructTuple "core::task::poll::Poll::Pending" [] ] + [] + [ + Ty.apply + (Ty.path "core::result::Result") + [] + [ Ty.path "core::convert::Infallible"; E ]; + Ty.apply (Ty.path "core::task::poll::Poll") [] [ T ] + ] + [ Value.StructTuple "core::task::poll::Poll::Pending" [] [ T ] [] ] |))) ] |) @@ -1618,9 +1800,13 @@ Module task. M.alloc (| Value.StructTuple "core::task::poll::Poll::Ready" + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ T; F ] ] [ Value.StructTuple "core::result::Result::Err" + [] + [ T; F ] [ M.call_closure (| F, @@ -1769,7 +1955,10 @@ Module task. |), [ M.read (| x |); - M.constructor_as_closure "core::result::Result::Ok" + M.constructor_as_closure + "core::result::Result::Ok" + [] + [ T; E ] ] |))) ] @@ -1843,10 +2032,29 @@ Module task. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" + [] + [ + Ty.apply + (Ty.path "core::result::Result") + [] + [ Ty.path "core::convert::Infallible"; E ]; + Ty.apply + (Ty.path "core::task::poll::Poll") + [] + [ Ty.apply (Ty.path "core::option::Option") [] [ T ] ] + ] [ Value.StructTuple "core::task::poll::Poll::Ready" - [ Value.StructTuple "core::option::Option::Some" [ M.read (| x |) ] ] + [] + [ Ty.apply (Ty.path "core::option::Option") [] [ T ] ] + [ + Value.StructTuple + "core::option::Option::Some" + [] + [ T ] + [ M.read (| x |) ] + ] ] |))); fun γ => @@ -1873,7 +2081,24 @@ Module task. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Break" - [ Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] ] + [] + [ + Ty.apply + (Ty.path "core::result::Result") + [] + [ Ty.path "core::convert::Infallible"; E ]; + Ty.apply + (Ty.path "core::task::poll::Poll") + [] + [ Ty.apply (Ty.path "core::option::Option") [] [ T ] ] + ] + [ + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "core::convert::Infallible"; E ] + [ M.read (| e |) ] + ] |))); fun γ => ltac:(M.monadic @@ -1887,10 +2112,23 @@ Module task. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" + [] + [ + Ty.apply + (Ty.path "core::result::Result") + [] + [ Ty.path "core::convert::Infallible"; E ]; + Ty.apply + (Ty.path "core::task::poll::Poll") + [] + [ Ty.apply (Ty.path "core::option::Option") [] [ T ] ] + ] [ Value.StructTuple "core::task::poll::Poll::Ready" - [ Value.StructTuple "core::option::Option::None" [] ] + [] + [ Ty.apply (Ty.path "core::option::Option") [] [ T ] ] + [ Value.StructTuple "core::option::Option::None" [] [ T ] [] ] ] |))); fun γ => @@ -1899,7 +2137,24 @@ Module task. M.alloc (| Value.StructTuple "core::ops::control_flow::ControlFlow::Continue" - [ Value.StructTuple "core::task::poll::Poll::Pending" [] ] + [] + [ + Ty.apply + (Ty.path "core::result::Result") + [] + [ Ty.path "core::convert::Infallible"; E ]; + Ty.apply + (Ty.path "core::task::poll::Poll") + [] + [ Ty.apply (Ty.path "core::option::Option") [] [ T ] ] + ] + [ + Value.StructTuple + "core::task::poll::Poll::Pending" + [] + [ Ty.apply (Ty.path "core::option::Option") [] [ T ] ] + [] + ] |))) ] |) @@ -1983,12 +2238,23 @@ Module task. M.alloc (| Value.StructTuple "core::task::poll::Poll::Ready" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ T; F ] ] + ] [ Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::result::Result") [] [ T; F ] ] [ Value.StructTuple "core::result::Result::Err" + [] + [ T; F ] [ M.call_closure (| F, diff --git a/CoqOfRust/core/task/wake.v b/CoqOfRust/core/task/wake.v index c53d062f0..1bafcf1ad 100644 --- a/CoqOfRust/core/task/wake.v +++ b/CoqOfRust/core/task/wake.v @@ -193,6 +193,8 @@ Module task. let vtable := M.alloc (| vtable |) in Value.StructRecord "core::task::wake::RawWaker" + [] + [] [ ("data", M.read (| data |)); ("vtable", M.read (| vtable |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -595,6 +597,8 @@ Module task. let drop := M.alloc (| drop |) in Value.StructRecord "core::task::wake::RawWakerVTable" + [] + [] [ ("clone", M.read (| clone |)); ("wake", M.read (| wake |)); @@ -1270,12 +1274,29 @@ Module task. M.alloc (| Value.StructRecord "core::task::wake::ContextBuilder" + [] + [] [ ("waker", M.read (| waker |)); ("local_waker", M.read (| local_waker |)); - ("ext", Value.StructTuple "core::task::wake::ExtData::None" [ Value.Tuple [] ]); - ("_marker", Value.StructTuple "core::marker::PhantomData" []); - ("_marker2", Value.StructTuple "core::marker::PhantomData" []) + ("ext", + Value.StructTuple "core::task::wake::ExtData::None" [] [] [ Value.Tuple [] ]); + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.function + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + (Ty.apply (Ty.path "&") [] [ Ty.tuple [] ]) + ] + []); + ("_marker2", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "*mut") [] [ Ty.tuple [] ] ] + []) ] |) |))) @@ -1340,6 +1361,8 @@ Module task. M.alloc (| Value.StructTuple "core::task::wake::ExtData::Some" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -1359,7 +1382,11 @@ Module task. 0 |) in M.alloc (| - Value.StructTuple "core::task::wake::ExtData::None" [ Value.Tuple [] ] + Value.StructTuple + "core::task::wake::ExtData::None" + [] + [] + [ Value.Tuple [] ] |))) ] |) @@ -1367,6 +1394,8 @@ Module task. M.alloc (| Value.StructRecord "core::task::wake::ContextBuilder" + [] + [] [ ("waker", M.borrow (| @@ -1395,8 +1424,22 @@ Module task. |) |)); ("ext", M.read (| ext |)); - ("_marker", Value.StructTuple "core::marker::PhantomData" []); - ("_marker2", Value.StructTuple "core::marker::PhantomData" []) + ("_marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.function + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + (Ty.apply (Ty.path "&") [] [ Ty.tuple [] ]) + ] + []); + ("_marker2", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "*mut") [] [ Ty.tuple [] ] ] + []) ] |) |))) @@ -1465,6 +1508,8 @@ Module task. ("ext", Value.StructTuple "core::task::wake::ExtData::Some" + [] + [] [ (* Unsize *) M.pointer_coercion @@ -1534,6 +1579,8 @@ Module task. M.alloc (| Value.StructRecord "core::task::wake::Context" + [] + [] [ ("waker", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| waker |) |) |)); @@ -1545,6 +1592,8 @@ Module task. ("ext", Value.StructTuple "core::panic::unwind_safe::AssertUnwindSafe" + [] + [ Ty.path "core::task::wake::ExtData" ] [ M.read (| ext |) ]); ("_marker", M.read (| _marker |)); ("_marker2", M.read (| _marker2 |)) @@ -1912,10 +1961,14 @@ Module task. let vtable := M.alloc (| vtable |) in Value.StructRecord "core::task::wake::Waker" + [] + [] [ ("waker", Value.StructRecord "core::task::wake::RawWaker" + [] + [] [ ("data", M.read (| data |)); ("vtable", M.read (| vtable |)) ]) ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -1935,7 +1988,7 @@ Module task. | [], [], [ waker ] => ltac:(M.monadic (let waker := M.alloc (| waker |) in - Value.StructRecord "core::task::wake::Waker" [ ("waker", M.read (| waker |)) ])) + Value.StructRecord "core::task::wake::Waker" [] [] [ ("waker", M.read (| waker |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2044,6 +2097,8 @@ Module task. (let self := M.alloc (| self |) in Value.StructRecord "core::task::wake::Waker" + [] + [] [ ("waker", M.call_closure (| @@ -2726,10 +2781,14 @@ Module task. let vtable := M.alloc (| vtable |) in Value.StructRecord "core::task::wake::LocalWaker" + [] + [] [ ("waker", Value.StructRecord "core::task::wake::RawWaker" + [] + [] [ ("data", M.read (| data |)); ("vtable", M.read (| vtable |)) ]) ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -2749,7 +2808,11 @@ Module task. | [], [], [ waker ] => ltac:(M.monadic (let waker := M.alloc (| waker |) in - Value.StructRecord "core::task::wake::LocalWaker" [ ("waker", M.read (| waker |)) ])) + Value.StructRecord + "core::task::wake::LocalWaker" + [] + [] + [ ("waker", M.read (| waker |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2858,6 +2921,8 @@ Module task. (let self := M.alloc (| self |) in Value.StructRecord "core::task::wake::LocalWaker" + [] + [] [ ("waker", M.call_closure (| diff --git a/CoqOfRust/core/time.v b/CoqOfRust/core/time.v index dcabfc7ae..529feba9d 100644 --- a/CoqOfRust/core/time.v +++ b/CoqOfRust/core/time.v @@ -375,7 +375,7 @@ Module time. Definition value_ZERO (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::time::Nanoseconds" [ Value.Integer IntegerKind.U32 0 ] + Value.StructTuple "core::time::Nanoseconds" [] [] [ Value.Integer IntegerKind.U32 0 ] |))). Global Instance AssociatedConstant_value_ZERO : M.IsAssociatedFunction.C Self "ZERO" value_ZERO. @@ -937,6 +937,8 @@ Module time. ltac:(M.monadic (Value.StructRecord "core::time::Duration" + [] + [] [ ("secs", M.call_closure (| @@ -1138,10 +1140,16 @@ Module time. M.alloc (| Value.StructRecord "core::time::Duration" + [] + [] [ ("secs", M.read (| secs |)); ("nanos", - Value.StructTuple "core::time::Nanoseconds" [ M.read (| nanos |) ]) + Value.StructTuple + "core::time::Nanoseconds" + [] + [] + [ M.read (| nanos |) ]) ] |))); fun γ => @@ -1202,10 +1210,16 @@ Module time. M.alloc (| Value.StructRecord "core::time::Duration" + [] + [] [ ("secs", M.read (| secs |)); ("nanos", - Value.StructTuple "core::time::Nanoseconds" [ M.read (| nanos |) ]) + Value.StructTuple + "core::time::Nanoseconds" + [] + [] + [ M.read (| nanos |) ]) ] |))) ] @@ -1230,6 +1244,8 @@ Module time. (let secs := M.alloc (| secs |) in Value.StructRecord "core::time::Duration" + [] + [] [ ("secs", M.read (| secs |)); ("nanos", @@ -1294,6 +1310,8 @@ Module time. M.alloc (| Value.StructTuple "core::time::Nanoseconds" + [] + [] [ M.call_closure (| Ty.path "u32", @@ -1308,6 +1326,8 @@ Module time. M.alloc (| Value.StructRecord "core::time::Duration" + [] + [] [ ("secs", M.read (| secs |)); ("nanos", M.read (| subsec_nanos |)) ] |) |))) @@ -1364,6 +1384,8 @@ Module time. M.alloc (| Value.StructTuple "core::time::Nanoseconds" + [] + [] [ M.call_closure (| Ty.path "u32", @@ -1378,6 +1400,8 @@ Module time. M.alloc (| Value.StructRecord "core::time::Duration" + [] + [] [ ("secs", M.read (| secs |)); ("nanos", M.read (| subsec_nanos |)) ] |) |))) @@ -1436,11 +1460,13 @@ Module time. |) in let~ subsec_nanos : Ty.apply (Ty.path "*") [] [ Ty.path "core::time::Nanoseconds" ] := M.alloc (| - Value.StructTuple "core::time::Nanoseconds" [ M.read (| subsec_nanos |) ] + Value.StructTuple "core::time::Nanoseconds" [] [] [ M.read (| subsec_nanos |) ] |) in M.alloc (| Value.StructRecord "core::time::Duration" + [] + [] [ ("secs", M.read (| secs |)); ("nanos", M.read (| subsec_nanos |)) ] |) |))) @@ -2662,7 +2688,11 @@ Module time. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::time::Duration" ] + [] |) |) |) @@ -2743,6 +2773,8 @@ Module time. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::time::Duration" ] [ M.call_closure (| Ty.path "core::time::Duration", @@ -2758,7 +2790,13 @@ Module time. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::time::Duration" ] + [] + |))) ] |) |))) @@ -3066,6 +3104,8 @@ Module time. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::time::Duration" ] + [] |) |) |) @@ -3146,6 +3186,8 @@ Module time. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::time::Duration" ] [ M.call_closure (| Ty.path "core::time::Duration", @@ -3161,7 +3203,13 @@ Module time. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::time::Duration" ] + [] + |))) ] |) |))) @@ -3457,6 +3505,8 @@ Module time. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::time::Duration" ] [ M.call_closure (| Ty.path "core::time::Duration", @@ -3479,7 +3529,13 @@ Module time. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::time::Duration" ] + [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3817,6 +3873,8 @@ Module time. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::time::Duration" ] [ M.call_closure (| Ty.path "core::time::Duration", @@ -3835,7 +3893,14 @@ Module time. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::time::Duration" ] + [] + |))) ] |) |))) @@ -4704,13 +4769,22 @@ Module time. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "core::time::Duration"; + Ty.path "core::time::TryFromFloatSecsError" + ] [ Value.StructRecord "core::time::TryFromFloatSecsError" + [] + [] [ ("kind", Value.StructTuple "core::time::TryFromFloatSecsErrorKind::Negative" + [] + [] []) ] ] @@ -5505,13 +5579,23 @@ Module time. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "core::time::Duration"; + Ty.path + "core::time::TryFromFloatSecsError" + ] [ Value.StructRecord "core::time::TryFromFloatSecsError" + [] + [] [ ("kind", Value.StructTuple "core::time::TryFromFloatSecsErrorKind::OverflowOrNan" + [] + [] []) ] ] @@ -5537,6 +5621,11 @@ Module time. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "core::time::Duration"; + Ty.path "core::time::TryFromFloatSecsError" + ] [ M.call_closure (| Ty.path "core::time::Duration", @@ -5610,13 +5699,22 @@ Module time. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "core::time::Duration"; + Ty.path "core::time::TryFromFloatSecsError" + ] [ Value.StructRecord "core::time::TryFromFloatSecsError" + [] + [] [ ("kind", Value.StructTuple "core::time::TryFromFloatSecsErrorKind::Negative" + [] + [] []) ] ] @@ -6411,13 +6509,23 @@ Module time. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "core::time::Duration"; + Ty.path + "core::time::TryFromFloatSecsError" + ] [ Value.StructRecord "core::time::TryFromFloatSecsError" + [] + [] [ ("kind", Value.StructTuple "core::time::TryFromFloatSecsErrorKind::OverflowOrNan" + [] + [] []) ] ] @@ -6443,6 +6551,11 @@ Module time. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "core::time::Duration"; + Ty.path "core::time::TryFromFloatSecsError" + ] [ M.call_closure (| Ty.path "core::time::Duration", @@ -8388,6 +8501,8 @@ Module time. (let self := M.alloc (| self |) in Value.StructRecord "core::time::TryFromFloatSecsError" + [] + [] [ ("kind", M.call_closure (| @@ -8753,7 +8868,7 @@ Module time. "core::time::TryFromFloatSecsErrorKind::Negative" |) in M.alloc (| - Value.StructTuple "core::time::TryFromFloatSecsErrorKind::Negative" [] + Value.StructTuple "core::time::TryFromFloatSecsErrorKind::Negative" [] [] [] |))); fun γ => ltac:(M.monadic @@ -8764,7 +8879,11 @@ Module time. "core::time::TryFromFloatSecsErrorKind::OverflowOrNan" |) in M.alloc (| - Value.StructTuple "core::time::TryFromFloatSecsErrorKind::OverflowOrNan" [] + Value.StructTuple + "core::time::TryFromFloatSecsErrorKind::OverflowOrNan" + [] + [] + [] |))) ] |) diff --git a/CoqOfRust/core/tuple.v b/CoqOfRust/core/tuple.v index c915c2534..d8a11de56 100644 --- a/CoqOfRust/core/tuple.v +++ b/CoqOfRust/core/tuple.v @@ -868,7 +868,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -902,7 +904,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -1044,7 +1048,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -1078,7 +1084,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -1220,7 +1228,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -1254,7 +1264,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -1396,7 +1408,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -1430,7 +1444,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -2200,7 +2216,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -2234,7 +2252,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -2330,7 +2350,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -2365,7 +2393,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -2509,7 +2539,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -2543,7 +2575,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -2639,7 +2673,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -2674,7 +2716,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -2818,7 +2862,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -2852,7 +2898,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -2948,7 +2996,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -2983,7 +3039,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -3127,7 +3186,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -3161,7 +3222,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -3257,7 +3320,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -3292,7 +3363,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -4231,7 +4305,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -4265,7 +4341,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -4361,7 +4439,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -4396,7 +4482,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -4492,10 +4580,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -4534,7 +4626,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] + ] |) |) ] @@ -4680,7 +4780,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -4714,7 +4816,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -4810,7 +4914,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -4845,7 +4957,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -4941,10 +5055,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -4983,7 +5101,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] + ] |) |) ] @@ -5129,7 +5255,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -5163,7 +5291,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -5259,7 +5389,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -5294,7 +5432,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -5390,10 +5531,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -5432,10 +5577,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -5582,7 +5731,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -5616,7 +5767,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -5712,7 +5865,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -5747,7 +5908,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -5843,10 +6007,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -5885,10 +6053,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -7022,7 +7194,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -7056,7 +7230,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -7152,7 +7328,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -7187,7 +7371,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -7283,10 +7469,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -7325,7 +7515,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] + ] |) |) ] @@ -7421,10 +7619,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -7463,10 +7665,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -7615,7 +7821,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -7649,7 +7857,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -7745,7 +7955,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -7780,7 +7998,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -7876,10 +8096,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -7918,7 +8142,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] + ] |) |) ] @@ -8014,10 +8246,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -8056,10 +8292,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -8208,7 +8448,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -8242,7 +8484,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -8338,7 +8582,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -8373,7 +8625,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -8469,10 +8724,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -8511,10 +8770,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -8611,10 +8874,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -8653,10 +8920,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -8805,7 +9076,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -8839,7 +9112,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -8935,7 +9210,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -8970,7 +9253,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -9066,10 +9352,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -9108,10 +9398,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -9208,10 +9502,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -9250,10 +9548,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -10574,7 +10876,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -10608,7 +10912,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -10704,7 +11010,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -10739,7 +11053,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -10835,10 +11151,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -10877,7 +11197,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] + ] |) |) ] @@ -10973,10 +11301,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -11015,10 +11347,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -11115,10 +11451,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -11157,10 +11498,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -11311,7 +11656,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -11345,7 +11692,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -11441,7 +11790,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -11476,7 +11833,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -11572,10 +11931,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -11614,7 +11977,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] + ] |) |) ] @@ -11710,10 +12081,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -11752,10 +12127,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -11852,10 +12231,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -11894,10 +12278,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -12048,7 +12436,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -12082,7 +12472,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -12178,7 +12570,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -12213,7 +12613,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -12309,10 +12712,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -12351,10 +12758,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -12451,10 +12862,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -12493,10 +12908,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -12593,10 +13012,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -12635,10 +13059,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -12789,7 +13217,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -12823,7 +13253,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -12919,7 +13351,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -12954,7 +13394,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -13050,10 +13493,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -13092,10 +13539,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -13192,10 +13643,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -13234,10 +13689,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -13334,10 +13793,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -13376,10 +13840,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -14920,7 +15388,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -14954,7 +15424,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -15050,7 +15522,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -15085,7 +15565,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -15181,10 +15663,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -15223,7 +15709,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] + ] |) |) ] @@ -15319,10 +15813,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -15361,10 +15859,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -15461,10 +15963,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -15503,10 +16010,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -15616,10 +16127,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -15666,10 +16184,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -15831,7 +16356,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -15865,7 +16392,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -15961,7 +16490,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -15996,7 +16533,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -16092,10 +16631,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -16134,7 +16677,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] + ] |) |) ] @@ -16230,10 +16781,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -16272,10 +16827,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -16372,10 +16931,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -16414,10 +16978,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -16527,10 +17095,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -16577,10 +17152,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -16742,7 +17324,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -16776,7 +17360,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -16872,7 +17458,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -16907,7 +17501,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -17003,10 +17600,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -17045,10 +17646,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -17145,10 +17750,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -17187,10 +17796,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -17287,10 +17900,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -17329,10 +17947,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -17442,10 +18064,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -17492,10 +18121,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -17657,7 +18293,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -17691,7 +18329,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -17787,7 +18427,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -17822,7 +18470,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -17918,10 +18569,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -17960,10 +18615,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -18060,10 +18719,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -18102,10 +18765,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -18202,10 +18869,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -18244,10 +18916,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -18357,10 +19033,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -18407,10 +19090,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -20206,7 +20896,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -20240,7 +20932,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -20336,7 +21030,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -20371,7 +21073,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -20467,10 +21171,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -20509,7 +21217,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] + ] |) |) ] @@ -20605,10 +21321,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -20647,10 +21367,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -20747,10 +21471,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -20789,10 +21518,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -20902,10 +21635,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -20952,10 +21692,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -21075,10 +21822,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -21128,10 +21882,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -21299,7 +22060,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -21333,7 +22096,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -21429,7 +22194,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -21464,7 +22237,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -21560,10 +22335,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -21602,7 +22381,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] + ] |) |) ] @@ -21698,10 +22485,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -21740,10 +22531,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -21840,10 +22635,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -21882,10 +22682,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -21995,10 +22799,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -22045,10 +22856,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -22168,10 +22986,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -22221,10 +23046,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -22392,7 +23224,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -22426,7 +23260,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -22522,7 +23358,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -22557,7 +23401,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -22653,10 +23500,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -22695,10 +23546,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -22795,10 +23650,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -22837,10 +23696,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -22937,10 +23800,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -22979,10 +23847,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -23092,10 +23964,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -23142,10 +24021,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -23265,10 +24151,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -23318,10 +24211,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -23489,7 +24389,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -23523,7 +24425,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -23619,7 +24523,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -23654,7 +24566,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -23750,10 +24665,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -23792,10 +24711,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -23892,10 +24815,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -23934,10 +24861,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -24034,10 +24965,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -24076,10 +25012,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -24189,10 +25129,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -24239,10 +25186,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -24362,10 +25316,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -24415,10 +25376,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -26466,7 +27434,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -26500,7 +27470,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -26596,7 +27568,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -26631,7 +27611,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -26727,10 +27709,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -26769,7 +27755,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] + ] |) |) ] @@ -26865,10 +27859,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -26907,10 +27905,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -27007,10 +28009,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -27049,10 +28056,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -27162,10 +28173,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -27212,10 +28230,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -27335,10 +28360,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -27388,10 +28420,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -27518,10 +28557,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -27571,10 +28617,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -27744,7 +28797,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -27778,7 +28833,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -27874,7 +28931,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -27909,7 +28974,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -28005,10 +29072,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -28047,7 +29118,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] + ] |) |) ] @@ -28143,10 +29222,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -28185,10 +29268,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -28285,10 +29372,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -28327,10 +29419,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -28440,10 +29536,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -28490,10 +29593,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -28613,10 +29723,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -28666,10 +29783,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -28796,10 +29920,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -28849,10 +29980,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -29022,7 +30160,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -29056,7 +30196,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -29152,7 +30294,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -29187,7 +30337,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -29283,10 +30436,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -29325,10 +30482,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -29425,10 +30586,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -29467,10 +30632,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -29567,10 +30736,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -29609,10 +30783,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -29722,10 +30900,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -29772,10 +30957,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -29895,10 +31087,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -29948,10 +31147,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -30078,10 +31284,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -30131,10 +31344,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -30304,7 +31524,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -30338,7 +31560,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -30434,7 +31658,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -30469,7 +31701,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -30565,10 +31800,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -30607,10 +31846,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -30707,10 +31950,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -30749,10 +31996,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -30849,10 +32100,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -30891,10 +32147,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -31004,10 +32264,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -31054,10 +32321,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -31177,10 +32451,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -31230,10 +32511,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -31360,10 +32648,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -31413,10 +32708,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -33713,7 +35015,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -33747,7 +35051,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -33843,7 +35149,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -33878,7 +35192,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -33974,10 +35290,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -34016,7 +35336,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] + ] |) |) ] @@ -34112,10 +35440,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -34154,10 +35486,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -34254,10 +35590,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -34296,10 +35637,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -34409,10 +35754,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -34459,10 +35811,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -34582,10 +35941,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -34635,10 +36001,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -34765,10 +36138,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -34818,10 +36198,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -34951,10 +36338,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -35008,10 +36402,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -35184,7 +36585,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -35218,7 +36621,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -35314,7 +36719,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -35349,7 +36762,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -35445,10 +36860,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -35487,7 +36906,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] + ] |) |) ] @@ -35583,10 +37010,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -35625,10 +37056,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -35725,10 +37160,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -35767,10 +37207,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -35880,10 +37324,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -35930,10 +37381,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -36053,10 +37511,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -36106,10 +37571,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -36236,10 +37708,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -36289,10 +37768,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -36422,10 +37908,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -36479,10 +37972,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -36655,7 +38155,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -36689,7 +38191,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -36785,7 +38289,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -36820,7 +38332,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -36916,10 +38431,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -36958,10 +38477,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -37058,10 +38581,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -37100,10 +38627,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -37200,10 +38731,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -37242,10 +38778,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -37355,10 +38895,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -37405,10 +38952,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -37528,10 +39082,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -37581,10 +39142,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -37711,10 +39279,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -37764,10 +39339,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -37897,10 +39479,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -37954,10 +39543,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -38130,7 +39726,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -38164,7 +39762,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -38260,7 +39860,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -38295,7 +39903,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -38391,10 +40002,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -38433,10 +40048,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -38533,10 +40152,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -38575,10 +40198,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -38675,10 +40302,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -38717,10 +40349,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -38830,10 +40466,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -38880,10 +40523,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -39003,10 +40653,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -39056,10 +40713,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -39186,10 +40850,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -39239,10 +40910,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -39372,10 +41050,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -39429,10 +41114,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -41982,7 +43674,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -42016,7 +43710,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -42112,7 +43808,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -42147,7 +43851,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -42243,10 +43949,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -42285,7 +43995,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] + ] |) |) ] @@ -42381,10 +44099,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -42423,10 +44145,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -42523,10 +44249,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -42565,10 +44296,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -42678,10 +44413,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -42728,10 +44470,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -42851,10 +44600,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -42904,10 +44660,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -43034,10 +44797,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -43087,10 +44857,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -43220,10 +44997,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -43277,10 +45061,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -43417,10 +45208,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -43474,10 +45272,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -43654,7 +45459,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -43688,7 +45495,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -43784,7 +45593,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -43819,7 +45636,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -43915,10 +45734,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -43957,7 +45780,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] + ] |) |) ] @@ -44053,10 +45884,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -44095,10 +45930,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -44195,10 +46034,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -44237,10 +46081,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -44350,10 +46198,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -44400,10 +46255,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -44523,10 +46385,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -44576,10 +46445,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -44706,10 +46582,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -44759,10 +46642,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -44892,10 +46782,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -44949,10 +46846,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -45089,10 +46993,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -45146,10 +47057,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -45326,7 +47244,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -45360,7 +47280,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -45456,7 +47378,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -45491,7 +47421,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -45587,10 +47520,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -45629,10 +47566,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -45729,10 +47670,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -45771,10 +47716,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -45871,10 +47820,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -45913,10 +47867,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -46026,10 +47984,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -46076,10 +48041,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -46199,10 +48171,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -46252,10 +48231,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -46382,10 +48368,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -46435,10 +48428,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -46568,10 +48568,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -46625,10 +48632,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -46765,10 +48779,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -46822,10 +48843,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -47002,7 +49030,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -47036,7 +49066,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -47132,7 +49164,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -47167,7 +49207,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -47263,10 +49306,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -47305,10 +49352,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -47405,10 +49456,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -47447,10 +49502,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -47547,10 +49606,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -47589,10 +49653,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -47702,10 +49770,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -47752,10 +49827,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -47875,10 +49957,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -47928,10 +50017,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -48058,10 +50154,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -48111,10 +50214,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -48244,10 +50354,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -48301,10 +50418,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -48441,10 +50565,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -48498,10 +50629,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -51309,7 +53447,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -51343,7 +53483,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -51439,7 +53581,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -51474,7 +53624,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -51570,10 +53722,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -51612,7 +53768,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] + ] |) |) ] @@ -51708,10 +53872,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -51750,10 +53918,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -51850,10 +54022,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -51892,10 +54069,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -52005,10 +54186,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -52055,10 +54243,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -52178,10 +54373,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -52231,10 +54433,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -52361,10 +54570,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -52414,10 +54630,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -52547,10 +54770,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -52604,10 +54834,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -52744,10 +54981,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -52801,10 +55045,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -52945,10 +55196,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -53003,10 +55261,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -53186,7 +55451,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -53220,7 +55487,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -53316,7 +55585,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -53351,7 +55628,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Less" [] [] [] ] |) |) ] @@ -53447,10 +55726,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -53489,7 +55772,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Less" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Less" + [] + [] + [] + ] |) |) ] @@ -53585,10 +55876,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -53627,10 +55922,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -53727,10 +56026,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -53769,10 +56073,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -53882,10 +56190,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -53932,10 +56247,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -54055,10 +56377,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -54108,10 +56437,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -54238,10 +56574,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -54291,10 +56634,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -54424,10 +56774,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -54481,10 +56838,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -54621,10 +56985,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -54678,10 +57049,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -54822,10 +57200,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -54880,10 +57265,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] ] |) |) @@ -55063,7 +57455,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -55097,7 +57491,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -55193,7 +57589,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -55228,7 +57632,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -55324,10 +57731,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -55366,10 +57777,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -55466,10 +57881,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -55508,10 +57927,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -55608,10 +58031,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -55650,10 +58078,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -55763,10 +58195,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -55813,10 +58252,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -55936,10 +58382,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -55989,10 +58442,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -56119,10 +58579,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -56172,10 +58639,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -56305,10 +58779,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -56362,10 +58843,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -56502,10 +58990,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -56559,10 +59054,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -56703,10 +59205,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -56761,10 +59270,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -56944,7 +59460,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |) |) ] @@ -56978,7 +59496,9 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] ] |) |) ] @@ -57074,7 +59594,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ + Value.StructTuple + "core::cmp::Ordering::Equal" + [] + [] + [] + ] |) |) ] @@ -57109,7 +59637,10 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Greater" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] + ] |) |) ] @@ -57205,10 +59736,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -57247,10 +59782,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -57347,10 +59886,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -57389,10 +59932,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -57489,10 +60036,15 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -57531,10 +60083,14 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -57644,10 +60200,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -57694,10 +60257,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -57817,10 +60387,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -57870,10 +60447,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -58000,10 +60584,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -58053,10 +60644,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -58186,10 +60784,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -58243,10 +60848,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -58383,10 +60995,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -58440,10 +61059,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) @@ -58584,10 +61210,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Equal" [] + [] + [] ] |) |) @@ -58642,10 +61275,17 @@ Module tuple. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "core::cmp::Ordering" + ] [ Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] ] |) |) diff --git a/CoqOfRust/core/unicode/printable.v b/CoqOfRust/core/unicode/printable.v index 21e7f7585..272d677fa 100644 --- a/CoqOfRust/core/unicode/printable.v +++ b/CoqOfRust/core/unicode/printable.v @@ -262,6 +262,8 @@ Module unicode. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| diff --git a/CoqOfRust/core/unicode/unicode_data.v b/CoqOfRust/core/unicode/unicode_data.v index a617a9bed..5cbfda75b 100644 --- a/CoqOfRust/core/unicode/unicode_data.v +++ b/CoqOfRust/core/unicode/unicode_data.v @@ -877,6 +877,8 @@ Module unicode. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", diff --git a/CoqOfRust/examples/default/examples/custom/constructor_as_function.v b/CoqOfRust/examples/default/examples/custom/constructor_as_function.v index 049abda41..ff2cc956f 100644 --- a/CoqOfRust/examples/default/examples/custom/constructor_as_function.v +++ b/CoqOfRust/examples/default/examples/custom/constructor_as_function.v @@ -268,7 +268,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) ] |); - M.constructor_as_closure "constructor_as_function::Constructor" + M.constructor_as_closure "constructor_as_function::Constructor" [] [] ] |) ] diff --git a/CoqOfRust/examples/default/examples/custom/hello_world.v b/CoqOfRust/examples/default/examples/custom/hello_world.v index 7f3db0b84..92e94917c 100644 --- a/CoqOfRust/examples/default/examples/custom/hello_world.v +++ b/CoqOfRust/examples/default/examples/custom/hello_world.v @@ -126,20 +126,24 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.apply (Ty.path "core::option::Option") [] [ Ty.path "i32" ] ] := M.alloc (| - Value.StructTuple "core::option::Option::Some" [ Value.Integer IntegerKind.I32 7 ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i32" ] + [ Value.Integer IntegerKind.I32 7 ] |) in let~ letter : Ty.apply (Ty.path "*") [] [ Ty.apply (Ty.path "core::option::Option") [] [ Ty.path "i32" ] ] := - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) in + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] |) in let~ emoticon : Ty.apply (Ty.path "*") [] [ Ty.apply (Ty.path "core::option::Option") [] [ Ty.path "i32" ] ] := - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) in + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.match_operator (| Ty.apply (Ty.path "*") [] [ Ty.tuple [] ], diff --git a/CoqOfRust/examples/default/examples/custom/mutual_loop.v b/CoqOfRust/examples/default/examples/custom/mutual_loop.v index 7ef2e75a3..6a75092d7 100644 --- a/CoqOfRust/examples/default/examples/custom/mutual_loop.v +++ b/CoqOfRust/examples/default/examples/custom/mutual_loop.v @@ -19,7 +19,7 @@ Module Impl_mutual_loop_LoopA. *) Definition new (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "mutual_loop::LoopA" [])) + | [], [], [] => ltac:(M.monadic (Value.StructTuple "mutual_loop::LoopA" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -84,6 +84,8 @@ Module Impl_mutual_loop_LoopB. ltac:(M.monadic (Value.StructRecord "mutual_loop::LoopB::Item" + [] + [] [ ("ident", M.call_closure (| diff --git a/CoqOfRust/examples/default/examples/custom/pattern_in_function_parameters.v b/CoqOfRust/examples/default/examples/custom/pattern_in_function_parameters.v index bab809d4b..99c0e1edd 100644 --- a/CoqOfRust/examples/default/examples/custom/pattern_in_function_parameters.v +++ b/CoqOfRust/examples/default/examples/custom/pattern_in_function_parameters.v @@ -254,7 +254,13 @@ Definition steps_between (ε : list Value.t) (τ : list Ty.t) (α : list Value.t |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] + |))) ] |) |))) diff --git a/CoqOfRust/examples/default/examples/custom/polymorphic_associated_function.v b/CoqOfRust/examples/default/examples/custom/polymorphic_associated_function.v index 1b296424e..5b6a18459 100644 --- a/CoqOfRust/examples/default/examples/custom/polymorphic_associated_function.v +++ b/CoqOfRust/examples/default/examples/custom/polymorphic_associated_function.v @@ -28,6 +28,8 @@ Module Impl_polymorphic_associated_function_Foo_A. (let self := M.alloc (| self |) in Value.StructRecord "polymorphic_associated_function::Foo" + [] + [ B ] [ ("data", M.call_closure (| @@ -75,6 +77,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "polymorphic_associated_function::Foo" + [] + [ Ty.path "i32" ] [ ("data", Value.Integer IntegerKind.I32 42) ] |) in let~ bar : @@ -149,7 +153,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -179,7 +183,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/custom/polymorphic_constants.v b/CoqOfRust/examples/default/examples/custom/polymorphic_constants.v index 9f3e28b6e..fb913717b 100644 --- a/CoqOfRust/examples/default/examples/custom/polymorphic_constants.v +++ b/CoqOfRust/examples/default/examples/custom/polymorphic_constants.v @@ -35,6 +35,8 @@ Module Impl_polymorphic_constants_Foo_N_A. (let self := M.alloc (| self |) in Value.StructRecord "polymorphic_constants::Foo" + [ Value.Integer IntegerKind.Usize 0 ] + [ B ] [ ("data", M.call_closure (| @@ -89,6 +91,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "polymorphic_constants::Foo" + [ Value.Integer IntegerKind.Usize 3 ] + [ Ty.path "i32" ] [ ("data", Value.Integer IntegerKind.I32 42); ("array", @@ -178,7 +182,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -208,7 +212,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -297,7 +305,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -336,7 +344,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/custom/provided_method.v b/CoqOfRust/examples/default/examples/custom/provided_method.v index 7fa1f5e1d..21b9efc44 100644 --- a/CoqOfRust/examples/default/examples/custom/provided_method.v +++ b/CoqOfRust/examples/default/examples/custom/provided_method.v @@ -182,7 +182,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -212,7 +212,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -291,7 +295,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -321,7 +325,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/ink_contracts/basic_contract_caller.v b/CoqOfRust/examples/default/examples/ink_contracts/basic_contract_caller.v index ddc64de79..196a7b480 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/basic_contract_caller.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/basic_contract_caller.v @@ -19,6 +19,8 @@ Module Impl_core_default_Default_for_basic_contract_caller_AccountId. ltac:(M.monadic (Value.StructTuple "basic_contract_caller::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -123,6 +125,8 @@ Module Impl_basic_contract_caller_OtherContract. (let init_value := M.alloc (| init_value |) in Value.StructRecord "basic_contract_caller::OtherContract" + [] + [] [ ("value", M.read (| init_value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -238,6 +242,8 @@ Module Impl_basic_contract_caller_BasicContractCaller. M.alloc (| Value.StructRecord "basic_contract_caller::BasicContractCaller" + [] + [] [ ("other_contract", M.read (| other_contract |)) ] |) |))) diff --git a/CoqOfRust/examples/default/examples/ink_contracts/call_runtime.v b/CoqOfRust/examples/default/examples/ink_contracts/call_runtime.v index d29dea624..90fbdf539 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/call_runtime.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/call_runtime.v @@ -19,6 +19,8 @@ Module Impl_core_default_Default_for_call_runtime_AccountId. ltac:(M.monadic (Value.StructTuple "call_runtime::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -201,7 +203,7 @@ Module Impl_core_default_Default_for_call_runtime_RuntimeCaller. (* Default *) Definition default (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "call_runtime::RuntimeCaller" [])) + | [], [], [] => ltac:(M.monadic (Value.StructTuple "call_runtime::RuntimeCaller" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -374,7 +376,7 @@ Module Impl_core_convert_From_call_runtime_EnvError_for_call_runtime_RuntimeErro (let _ := M.is_struct_tuple (| γ, "call_runtime::EnvError::CallRuntimeFailed" |) in M.alloc (| - Value.StructTuple "call_runtime::RuntimeError::CallRuntimeFailed" [] + Value.StructTuple "call_runtime::RuntimeError::CallRuntimeFailed" [] [] [] |))); fun γ => ltac:(M.monadic @@ -589,9 +591,13 @@ Module Impl_call_runtime_RuntimeCaller. M.alloc (| Value.StructTuple "call_runtime::RuntimeCall::Balances" + [] + [] [ Value.StructRecord "call_runtime::BalancesCall::Transfer" + [] + [] [ ("dest", M.call_closure (| diff --git a/CoqOfRust/examples/default/examples/ink_contracts/conditional_compilation.v b/CoqOfRust/examples/default/examples/ink_contracts/conditional_compilation.v index 82cf55670..18dd32dfb 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/conditional_compilation.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/conditional_compilation.v @@ -19,6 +19,8 @@ Module Impl_core_default_Default_for_conditional_compilation_AccountId. ltac:(M.monadic (Value.StructTuple "conditional_compilation::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -299,6 +301,8 @@ Module Impl_conditional_compilation_ConditionalCompilation. ltac:(M.monadic (Value.StructRecord "conditional_compilation::ConditionalCompilation" + [] + [] [ ("value", M.call_closure (| @@ -334,6 +338,8 @@ Module Impl_conditional_compilation_ConditionalCompilation. (let value := M.alloc (| value |) in Value.StructRecord "conditional_compilation::ConditionalCompilation" + [] + [] [ ("value", M.read (| value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -354,6 +360,8 @@ Module Impl_conditional_compilation_ConditionalCompilation. (let value := M.alloc (| value |) in Value.StructRecord "conditional_compilation::ConditionalCompilation" + [] + [] [ ("value", M.read (| value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -374,6 +382,8 @@ Module Impl_conditional_compilation_ConditionalCompilation. (let value := M.alloc (| value |) in Value.StructRecord "conditional_compilation::ConditionalCompilation" + [] + [] [ ("value", M.read (| value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -476,9 +486,13 @@ Module Impl_conditional_compilation_ConditionalCompilation. |); Value.StructTuple "conditional_compilation::Event::Changes" + [] + [] [ Value.StructRecord "conditional_compilation::Changes" + [] + [] [ ("new_value", M.read (| @@ -628,9 +642,13 @@ Module Impl_conditional_compilation_ConditionalCompilation. |); Value.StructTuple "conditional_compilation::Event::ChangesDated" + [] + [] [ Value.StructRecord "conditional_compilation::ChangesDated" + [] + [] [ ("new_value", M.read (| @@ -791,9 +809,13 @@ Module Impl_conditional_compilation_Flip_for_conditional_compilation_Conditional |); Value.StructTuple "conditional_compilation::Event::Changes" + [] + [] [ Value.StructRecord "conditional_compilation::Changes" + [] + [] [ ("new_value", M.read (| value |)); ("by_", M.read (| caller |)) ] ] ] diff --git a/CoqOfRust/examples/default/examples/ink_contracts/contract_terminate.v b/CoqOfRust/examples/default/examples/ink_contracts/contract_terminate.v index 021ed66ec..89ee82a06 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/contract_terminate.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/contract_terminate.v @@ -19,6 +19,8 @@ Module Impl_core_default_Default_for_contract_terminate_AccountId. ltac:(M.monadic (Value.StructTuple "contract_terminate::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -216,7 +218,8 @@ Module Impl_contract_terminate_JustTerminate. *) Definition new (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "contract_terminate::JustTerminate" [])) + | [], [], [] => + ltac:(M.monadic (Value.StructTuple "contract_terminate::JustTerminate" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/examples/default/examples/ink_contracts/contract_transfer.v b/CoqOfRust/examples/default/examples/ink_contracts/contract_transfer.v index bf1d62d61..969138d4d 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/contract_transfer.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/contract_transfer.v @@ -19,6 +19,8 @@ Module Impl_core_default_Default_for_contract_transfer_AccountId. ltac:(M.monadic (Value.StructTuple "contract_transfer::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -262,7 +264,7 @@ Module Impl_contract_transfer_GiveMe. *) Definition new (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "contract_transfer::GiveMe" [])) + | [], [], [] => ltac:(M.monadic (Value.StructTuple "contract_transfer::GiveMe" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/examples/default/examples/ink_contracts/custom_allocator.v b/CoqOfRust/examples/default/examples/ink_contracts/custom_allocator.v index ca6ce9283..bf4abcdab 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/custom_allocator.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/custom_allocator.v @@ -33,6 +33,8 @@ Module Impl_custom_allocator_CustomAllocator. (let init_value := M.alloc (| init_value |) in Value.StructRecord "custom_allocator::CustomAllocator" + [] + [] [ ("value", M.call_closure (| diff --git a/CoqOfRust/examples/default/examples/ink_contracts/custom_environment.v b/CoqOfRust/examples/default/examples/ink_contracts/custom_environment.v index fabaaa449..24ef5c2ee 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/custom_environment.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/custom_environment.v @@ -19,6 +19,8 @@ Module Impl_core_default_Default_for_custom_environment_AccountId. ltac:(M.monadic (Value.StructTuple "custom_environment::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -110,7 +112,7 @@ Module Impl_core_default_Default_for_custom_environment_Topics. (* Default *) Definition default (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "custom_environment::Topics" [])) + | [], [], [] => ltac:(M.monadic (Value.StructTuple "custom_environment::Topics" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -148,6 +150,8 @@ Module Impl_core_default_Default_for_custom_environment_EventWithTopics. ltac:(M.monadic (Value.StructRecord "custom_environment::EventWithTopics" + [] + [] [ ("first_topic", M.call_closure (| @@ -421,6 +425,8 @@ Module Impl_custom_environment_Topics. |); Value.StructTuple "custom_environment::Event::EventWithTopics" + [] + [] [ M.call_closure (| Ty.path "custom_environment::EventWithTopics", diff --git a/CoqOfRust/examples/default/examples/ink_contracts/dns.v b/CoqOfRust/examples/default/examples/ink_contracts/dns.v index 8385cf92a..41d43d509 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/dns.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/dns.v @@ -24,6 +24,8 @@ Module Impl_core_default_Default_where_core_default_Default_K_where_core_default ltac:(M.monadic (Value.StructRecord "dns::Mapping" + [] + [ K; V ] [ ("_key", M.call_closure (| @@ -284,6 +286,8 @@ Module Impl_core_default_Default_for_dns_AccountId. ltac:(M.monadic (Value.StructTuple "dns::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -853,6 +857,8 @@ Module Impl_core_default_Default_for_dns_DomainNameService. M.alloc (| Value.StructRecord "dns::DomainNameService" + [] + [] [ ("name_to_address", M.read (| name_to_address |)); ("name_to_owner", M.read (| name_to_owner |)); @@ -1173,7 +1179,9 @@ Module Impl_dns_DomainNameService. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "dns::Error::NameAlreadyExists" [] ] + [] + [ Ty.tuple []; Ty.path "dns::Error" ] + [ Value.StructTuple "dns::Error::NameAlreadyExists" [] [] [] ] |) |) |) @@ -1241,15 +1249,25 @@ Module Impl_dns_DomainNameService. |); Value.StructTuple "dns::Event::Register" + [] + [] [ Value.StructRecord "dns::Register" + [] + [] [ ("name", M.read (| name |)); ("from", M.read (| caller |)) ] ] ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "dns::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1432,7 +1450,9 @@ Module Impl_dns_DomainNameService. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "dns::Error::CallerIsNotOwner" [] ] + [] + [ Ty.tuple []; Ty.path "dns::Error" ] + [ Value.StructTuple "dns::Error::CallerIsNotOwner" [] [] [] ] |) |) |) @@ -1539,9 +1559,13 @@ Module Impl_dns_DomainNameService. |); Value.StructTuple "dns::Event::SetAddress" + [] + [] [ Value.StructRecord "dns::SetAddress" + [] + [] [ ("name", M.read (| name |)); ("from", M.read (| caller |)); @@ -1552,7 +1576,13 @@ Module Impl_dns_DomainNameService. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "dns::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1669,7 +1699,9 @@ Module Impl_dns_DomainNameService. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "dns::Error::CallerIsNotOwner" [] ] + [] + [ Ty.tuple []; Ty.path "dns::Error" ] + [ Value.StructTuple "dns::Error::CallerIsNotOwner" [] [] [] ] |) |) |) @@ -1776,9 +1808,13 @@ Module Impl_dns_DomainNameService. |); Value.StructTuple "dns::Event::Transfer" + [] + [] [ Value.StructRecord "dns::Transfer" + [] + [] [ ("name", M.read (| name |)); ("from", M.read (| caller |)); @@ -1789,7 +1825,13 @@ Module Impl_dns_DomainNameService. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "dns::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/examples/default/examples/ink_contracts/e2e_call_runtime.v b/CoqOfRust/examples/default/examples/ink_contracts/e2e_call_runtime.v index e97bbcff2..863c35995 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/e2e_call_runtime.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/e2e_call_runtime.v @@ -19,6 +19,8 @@ Module Impl_core_default_Default_for_e2e_call_runtime_AccountId. ltac:(M.monadic (Value.StructTuple "e2e_call_runtime::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -138,7 +140,7 @@ Module Impl_core_default_Default_for_e2e_call_runtime_Contract. (* Default *) Definition default (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "e2e_call_runtime::Contract" [])) + | [], [], [] => ltac:(M.monadic (Value.StructTuple "e2e_call_runtime::Contract" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -206,7 +208,7 @@ Module Impl_e2e_call_runtime_Contract. *) Definition new (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "e2e_call_runtime::Contract" [])) + | [], [], [] => ltac:(M.monadic (Value.StructTuple "e2e_call_runtime::Contract" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/examples/default/examples/ink_contracts/erc1155.v b/CoqOfRust/examples/default/examples/ink_contracts/erc1155.v index 2f847413b..46f8b97dc 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/erc1155.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/erc1155.v @@ -24,6 +24,8 @@ Module Impl_core_default_Default_where_core_default_Default_K_where_core_default ltac:(M.monadic (Value.StructRecord "erc1155::Mapping" + [] + [ K; V ] [ ("_key", M.call_closure (| @@ -258,6 +260,8 @@ Module Impl_core_default_Default_for_erc1155_AccountId. ltac:(M.monadic (Value.StructTuple "erc1155::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -801,6 +805,8 @@ Module Impl_core_default_Default_for_erc1155_Contract. ltac:(M.monadic (Value.StructRecord "erc1155::Contract" + [] + [] [ ("balances", M.call_closure (| @@ -1075,13 +1081,26 @@ Module Impl_erc1155_Contract. |); Value.StructTuple "erc1155::Event::TransferSingle" + [] + [] [ Value.StructRecord "erc1155::TransferSingle" + [] + [] [ ("operator", - Value.StructTuple "core::option::Option::Some" [ M.read (| caller |) ]); - ("from", Value.StructTuple "core::option::Option::None" []); + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "erc1155::AccountId" ] + [ M.read (| caller |) ]); + ("from", + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "erc1155::AccountId" ] + []); ("to", M.read (| M.match_operator (| @@ -1114,13 +1133,19 @@ Module Impl_erc1155_Contract. Value.Bool true |) in M.alloc (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "erc1155::AccountId" ] + [] |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "erc1155::AccountId" ] [ M.read (| caller |) ] |))) ] @@ -1220,6 +1245,8 @@ Module Impl_erc1155_Contract. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "erc1155::Error" ] [ M.call_closure (| Ty.path "erc1155::Error", @@ -1232,7 +1259,8 @@ Module Impl_erc1155_Contract. [], [] |), - [ Value.StructTuple "erc1155::Error::UnexistentToken" [] ] + [ Value.StructTuple "erc1155::Error::UnexistentToken" [] [] [] + ] |) ] |) @@ -1321,18 +1349,31 @@ Module Impl_erc1155_Contract. |); Value.StructTuple "erc1155::Event::TransferSingle" + [] + [] [ Value.StructRecord "erc1155::TransferSingle" + [] + [] [ ("operator", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "erc1155::AccountId" ] [ M.read (| caller |) ]); - ("from", Value.StructTuple "core::option::Option::None" []); + ("from", + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "erc1155::AccountId" ] + []); ("to", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "erc1155::AccountId" ] [ M.read (| caller |) ]); ("token_id", M.read (| token_id |)); ("value", M.read (| value |)) @@ -1341,7 +1382,13 @@ Module Impl_erc1155_Contract. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "erc1155::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1612,16 +1659,32 @@ Module Impl_erc1155_Contract. |); Value.StructTuple "erc1155::Event::TransferSingle" + [] + [] [ Value.StructRecord "erc1155::TransferSingle" + [] + [] [ ("operator", - Value.StructTuple "core::option::Option::Some" [ M.read (| caller |) ]); + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "erc1155::AccountId" ] + [ M.read (| caller |) ]); ("from", - Value.StructTuple "core::option::Option::Some" [ M.read (| from |) ]); + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "erc1155::AccountId" ] + [ M.read (| from |) ]); ("to", - Value.StructTuple "core::option::Option::Some" [ M.read (| to |) ]); + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "erc1155::AccountId" ] + [ M.read (| to |) ]); ("token_id", M.read (| token_id |)); ("value", M.read (| value |)) ] @@ -1979,6 +2042,8 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "erc1155::Error" ] [ M.call_closure (| Ty.path "erc1155::Error", @@ -1991,7 +2056,12 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. [], [] |), - [ Value.StructTuple "erc1155::Error::NotApproved" [] + [ + Value.StructTuple + "erc1155::Error::NotApproved" + [] + [] + [] ] |) ] @@ -2051,6 +2121,8 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "erc1155::Error" ] [ M.call_closure (| Ty.path "erc1155::Error", @@ -2063,7 +2135,13 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. [], [] |), - [ Value.StructTuple "erc1155::Error::ZeroAddressTransfer" [] ] + [ + Value.StructTuple + "erc1155::Error::ZeroAddressTransfer" + [] + [] + [] + ] |) ] |) @@ -2118,6 +2196,8 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "erc1155::Error" ] [ M.call_closure (| Ty.path "erc1155::Error", @@ -2130,7 +2210,13 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. [], [] |), - [ Value.StructTuple "erc1155::Error::InsufficientBalance" [] ] + [ + Value.StructTuple + "erc1155::Error::InsufficientBalance" + [] + [] + [] + ] |) ] |) @@ -2180,7 +2266,13 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "erc1155::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2337,6 +2429,8 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "erc1155::Error" ] [ M.call_closure (| Ty.path "erc1155::Error", @@ -2349,7 +2443,12 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. [], [] |), - [ Value.StructTuple "erc1155::Error::NotApproved" [] + [ + Value.StructTuple + "erc1155::Error::NotApproved" + [] + [] + [] ] |) ] @@ -2409,6 +2508,8 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "erc1155::Error" ] [ M.call_closure (| Ty.path "erc1155::Error", @@ -2421,7 +2522,13 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. [], [] |), - [ Value.StructTuple "erc1155::Error::ZeroAddressTransfer" [] ] + [ + Value.StructTuple + "erc1155::Error::ZeroAddressTransfer" + [] + [] + [] + ] |) ] |) @@ -2466,6 +2573,8 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "erc1155::Error" ] [ M.call_closure (| Ty.path "erc1155::Error", @@ -2478,7 +2587,12 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. [], [] |), - [ Value.StructTuple "erc1155::Error::BatchTransferMismatch" [] + [ + Value.StructTuple + "erc1155::Error::BatchTransferMismatch" + [] + [] + [] ] |) ] @@ -2541,6 +2655,8 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "erc1155::Error" ] [ M.call_closure (| Ty.path "erc1155::Error", @@ -2553,7 +2669,12 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. [], [] |), - [ Value.StructTuple "erc1155::Error::BatchTransferMismatch" [] + [ + Value.StructTuple + "erc1155::Error::BatchTransferMismatch" + [] + [] + [] ] |) ] @@ -2855,6 +2976,9 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "erc1155::Error" + ] [ M.call_closure (| Ty.path "erc1155::Error", @@ -2871,6 +2995,8 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. Value.StructTuple "erc1155::Error::InsufficientBalance" [] + [] + [] ] |) ] @@ -3087,7 +3213,13 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "erc1155::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3496,6 +3628,8 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "erc1155::Error" ] [ M.call_closure (| Ty.path "erc1155::Error", @@ -3508,7 +3642,7 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. [], [] |), - [ Value.StructTuple "erc1155::Error::SelfApproval" [] ] + [ Value.StructTuple "erc1155::Error::SelfApproval" [] [] [] ] |) ] |) @@ -3623,9 +3757,13 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. |); Value.StructTuple "erc1155::Event::ApprovalForAll" + [] + [] [ Value.StructRecord "erc1155::ApprovalForAll" + [] + [] [ ("owner", M.read (| caller |)); ("operator", M.read (| operator |)); @@ -3635,7 +3773,13 @@ Module Impl_erc1155_Erc1155_for_erc1155_Contract. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "erc1155::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/examples/default/examples/ink_contracts/erc20.v b/CoqOfRust/examples/default/examples/ink_contracts/erc20.v index 1c0cb5242..30a5b6b0c 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/erc20.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/erc20.v @@ -24,6 +24,8 @@ Module Impl_core_default_Default_where_core_default_Default_K_where_core_default ltac:(M.monadic (Value.StructRecord "erc20::Mapping" + [] + [ K; V ] [ ("_key", M.call_closure (| @@ -146,6 +148,8 @@ Module Impl_core_default_Default_for_erc20_AccountId. ltac:(M.monadic (Value.StructTuple "erc20::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -251,6 +255,8 @@ Module Impl_core_default_Default_for_erc20_Erc20. ltac:(M.monadic (Value.StructRecord "erc20::Erc20" + [] + [] [ ("total_supply", M.call_closure (| @@ -614,13 +620,26 @@ Module Impl_erc20_Erc20. |); Value.StructTuple "erc20::Event::Transfer" + [] + [] [ Value.StructRecord "erc20::Transfer" + [] + [] [ - ("from", Value.StructTuple "core::option::Option::None" []); + ("from", + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "erc20::AccountId" ] + []); ("to", - Value.StructTuple "core::option::Option::Some" [ M.read (| caller |) ]); + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "erc20::AccountId" ] + [ M.read (| caller |) ]); ("value", M.read (| total_supply |)) ] ] @@ -630,6 +649,8 @@ Module Impl_erc20_Erc20. M.alloc (| Value.StructRecord "erc20::Erc20" + [] + [] [ ("total_supply", M.read (| total_supply |)); ("balances", M.read (| balances |)); @@ -943,7 +964,9 @@ Module Impl_erc20_Erc20. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "erc20::Error::InsufficientBalance" [] ] + [] + [ Ty.tuple []; Ty.path "erc20::Error" ] + [ Value.StructTuple "erc20::Error::InsufficientBalance" [] [] [] ] |) |) |) @@ -1047,17 +1070,25 @@ Module Impl_erc20_Erc20. |); Value.StructTuple "erc20::Event::Transfer" + [] + [] [ Value.StructRecord "erc20::Transfer" + [] + [] [ ("from", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "erc20::AccountId" ] [ M.read (| M.deref (| M.read (| from |) |) |) ]); ("to", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "erc20::AccountId" ] [ M.read (| M.deref (| M.read (| to |) |) |) ]); ("value", M.read (| value |)) ] @@ -1065,7 +1096,13 @@ Module Impl_erc20_Erc20. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "erc20::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1219,9 +1256,13 @@ Module Impl_erc20_Erc20. |); Value.StructTuple "erc20::Event::Approval" + [] + [] [ Value.StructRecord "erc20::Approval" + [] + [] [ ("owner", M.read (| owner |)); ("spender", M.read (| spender |)); @@ -1231,7 +1272,13 @@ Module Impl_erc20_Erc20. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "erc20::Error" ] + [ Value.Tuple [] ] + |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1329,7 +1376,10 @@ Module Impl_erc20_Erc20. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "erc20::Error::InsufficientAllowance" [] ] + [] + [ Ty.tuple []; Ty.path "erc20::Error" ] + [ Value.StructTuple "erc20::Error::InsufficientAllowance" [] [] [] + ] |) |) |) @@ -1483,7 +1533,13 @@ Module Impl_erc20_Erc20. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "erc20::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/examples/default/examples/ink_contracts/erc721.v b/CoqOfRust/examples/default/examples/ink_contracts/erc721.v index 83d609006..26cc9a941 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/erc721.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/erc721.v @@ -24,6 +24,8 @@ Module Impl_core_default_Default_where_core_default_Default_K_where_core_default ltac:(M.monadic (Value.StructRecord "erc721::Mapping" + [] + [ K; V ] [ ("_key", M.call_closure (| @@ -258,6 +260,8 @@ Module Impl_core_default_Default_for_erc721_AccountId. ltac:(M.monadic (Value.StructTuple "erc721::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -455,6 +459,8 @@ Module Impl_core_default_Default_for_erc721_Erc721. ltac:(M.monadic (Value.StructRecord "erc721::Erc721" + [] + [] [ ("token_owner", M.call_closure (| @@ -1172,6 +1178,8 @@ Module Impl_erc721_Erc721. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "erc721::AccountId" ] [ M.call_closure (| Ty.path "erc721::AccountId", @@ -1568,7 +1576,9 @@ Module Impl_erc721_Erc721. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "erc721::Error::NotAllowed" [] ] + [] + [ Ty.tuple []; Ty.path "erc721::Error" ] + [ Value.StructTuple "erc721::Error::NotAllowed" [] [] [] ] |) |) |) @@ -1594,9 +1604,13 @@ Module Impl_erc721_Erc721. |); Value.StructTuple "erc721::Event::ApprovalForAll" + [] + [] [ Value.StructRecord "erc721::ApprovalForAll" + [] + [] [ ("owner", M.read (| caller |)); ("operator", M.read (| to |)); @@ -1686,7 +1700,13 @@ Module Impl_erc721_Erc721. M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "erc721::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1819,7 +1839,13 @@ Module Impl_erc721_Erc721. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "erc721::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1943,6 +1969,8 @@ Module Impl_erc721_Erc721. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "erc721::AccountId" ] [ M.read (| caller |) ] |) |) @@ -1994,7 +2022,9 @@ Module Impl_erc721_Erc721. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "erc721::Error::NotAllowed" [] ] + [] + [ Ty.tuple []; Ty.path "erc721::Error" ] + [ Value.StructTuple "erc721::Error::NotAllowed" [] [] [] ] |) |) |) @@ -2063,7 +2093,9 @@ Module Impl_erc721_Erc721. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "erc721::Error::NotAllowed" [] ] + [] + [ Ty.tuple []; Ty.path "erc721::Error" ] + [ Value.StructTuple "erc721::Error::NotAllowed" [] [] [] ] |) |) |) @@ -2115,7 +2147,9 @@ Module Impl_erc721_Erc721. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "erc721::Error::CannotInsert" [] ] + [] + [ Ty.tuple []; Ty.path "erc721::Error" ] + [ Value.StructTuple "erc721::Error::CannotInsert" [] [] [] ] |) |) |) @@ -2174,9 +2208,13 @@ Module Impl_erc721_Erc721. |); Value.StructTuple "erc721::Event::Approval" + [] + [] [ Value.StructRecord "erc721::Approval" + [] + [] [ ("from", M.read (| caller |)); ("to", M.read (| M.deref (| M.read (| to |) |) |)); @@ -2186,7 +2224,13 @@ Module Impl_erc721_Erc721. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "erc721::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2322,7 +2366,13 @@ Module Impl_erc721_Erc721. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "erc721::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2440,7 +2490,15 @@ Module Impl_erc721_Erc721. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "erc721::Error::TokenNotFound" [] ] + [] + [ Ty.tuple []; Ty.path "erc721::Error" ] + [ + Value.StructTuple + "erc721::Error::TokenNotFound" + [] + [] + [] + ] |) |) |) @@ -2579,7 +2637,7 @@ Module Impl_erc721_Erc721. end)) ] |); - Value.StructTuple "erc721::Error::CannotFetchValue" [] + Value.StructTuple "erc721::Error::CannotFetchValue" [] [] [] ] |) ] @@ -2693,7 +2751,11 @@ Module Impl_erc721_Erc721. |) |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "erc721::Error" ] + [ Value.Tuple [] ] |))) ] |) @@ -2920,7 +2982,13 @@ Module Impl_erc721_Erc721. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "erc721::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3065,7 +3133,13 @@ Module Impl_erc721_Erc721. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "erc721::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3243,13 +3317,19 @@ Module Impl_erc721_Erc721. |); Value.StructTuple "erc721::Event::Transfer" + [] + [] [ Value.StructRecord "erc721::Transfer" + [] + [] [ ("from", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "erc721::AccountId" ] [ M.call_closure (| Ty.path "erc721::AccountId", @@ -3278,6 +3358,8 @@ Module Impl_erc721_Erc721. ("to", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "erc721::AccountId" ] [ M.read (| caller |) ]); ("id", M.read (| id |)) ] @@ -3285,7 +3367,13 @@ Module Impl_erc721_Erc721. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "erc721::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/examples/default/examples/ink_contracts/flipper.v b/CoqOfRust/examples/default/examples/ink_contracts/flipper.v index 532ef86bb..a7d67386e 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/flipper.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/flipper.v @@ -22,7 +22,7 @@ Module Impl_flipper_Flipper. | [], [], [ init_value ] => ltac:(M.monadic (let init_value := M.alloc (| init_value |) in - Value.StructRecord "flipper::Flipper" [ ("value", M.read (| init_value |)) ])) + Value.StructRecord "flipper::Flipper" [] [] [ ("value", M.read (| init_value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/examples/default/examples/ink_contracts/incrementer.v b/CoqOfRust/examples/default/examples/ink_contracts/incrementer.v index b34d0dbde..1f2b9c807 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/incrementer.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/incrementer.v @@ -22,7 +22,7 @@ Module Impl_incrementer_Incrementer. | [], [], [ init_value ] => ltac:(M.monadic (let init_value := M.alloc (| init_value |) in - Value.StructRecord "incrementer::Incrementer" [ ("value", M.read (| init_value |)) ])) + Value.StructRecord "incrementer::Incrementer" [] [] [ ("value", M.read (| init_value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/call_builder.v b/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/call_builder.v index 1cf523f29..86c197a04 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/call_builder.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/call_builder.v @@ -19,6 +19,8 @@ Module Impl_core_default_Default_for_call_builder_AccountId. ltac:(M.monadic (Value.StructTuple "call_builder::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -166,7 +168,7 @@ Module Impl_core_default_Default_for_call_builder_CallBuilderTest. (* Default *) Definition default (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "call_builder::CallBuilderTest" [])) + | [], [], [] => ltac:(M.monadic (Value.StructTuple "call_builder::CallBuilderTest" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -269,7 +271,13 @@ Module Impl_call_builder_CallBuilderTest. ltac:(M.monadic (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Ok", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "call_builder::LangError" ] + [] + |))); fun γ => ltac:(M.monadic (let γ0_0 := @@ -277,7 +285,13 @@ Module Impl_call_builder_CallBuilderTest. let e := M.copy (| γ0_0 |) in let _ := M.is_struct_tuple (| γ0_0, "call_builder::LangError::CouldNotReadInput" |) in - M.alloc (| Value.StructTuple "core::option::Option::Some" [ M.read (| e |) ] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "call_builder::LangError" ] + [ M.read (| e |) ] + |))); fun γ => ltac:(M.monadic (let γ0_0 := @@ -417,7 +431,7 @@ Module Impl_call_builder_CallBuilderTest. let code_hash := M.alloc (| code_hash |) in let selector := M.alloc (| selector |) in let init_value := M.alloc (| init_value |) in - Value.StructTuple "core::option::Option::None" [])) + Value.StructTuple "core::option::Option::None" [] [ Ty.path "call_builder::LangError" ] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -461,7 +475,7 @@ Module Impl_call_builder_CallBuilderTest. let code_hash := M.alloc (| code_hash |) in let selector := M.alloc (| selector |) in let init_value := M.alloc (| init_value |) in - Value.StructTuple "core::option::Option::None" [])) + Value.StructTuple "core::option::Option::None" [] [ Ty.tuple [] ] [])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/call_builder_delegate.v b/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/call_builder_delegate.v index 9da862b27..4f662dfd3 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/call_builder_delegate.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/call_builder_delegate.v @@ -41,6 +41,8 @@ Module Impl_core_default_Default_for_call_builder_delegate_CallBuilderDelegateTe ltac:(M.monadic (Value.StructRecord "call_builder_delegate::CallBuilderDelegateTest" + [] + [] [ ("value", M.call_closure (| @@ -84,6 +86,8 @@ Module Impl_call_builder_delegate_CallBuilderDelegateTest. (let value := M.alloc (| value |) in Value.StructRecord "call_builder_delegate::CallBuilderDelegateTest" + [] + [] [ ("value", M.read (| value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -118,7 +122,11 @@ Module Impl_call_builder_delegate_CallBuilderDelegateTest. (let self := M.alloc (| self |) in let code_hash := M.alloc (| code_hash |) in let selector := M.alloc (| selector |) in - Value.StructTuple "core::option::Option::None" [])) + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "call_builder_delegate::LangError" ] + [])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/constructors_return_value.v b/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/constructors_return_value.v index 92d397d8f..86809bcda 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/constructors_return_value.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/constructors_return_value.v @@ -19,6 +19,8 @@ Module Impl_core_default_Default_for_constructors_return_value_AccountId. ltac:(M.monadic (Value.StructTuple "constructors_return_value::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -269,6 +271,8 @@ Module Impl_constructors_return_value_ConstructorsReturnValue. (let init_value := M.alloc (| init_value |) in Value.StructRecord "constructors_return_value::ConstructorsReturnValue" + [] + [] [ ("value", M.read (| init_value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -314,6 +318,11 @@ Module Impl_constructors_return_value_ConstructorsReturnValue. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "constructors_return_value::ConstructorsReturnValue"; + Ty.path "constructors_return_value::ConstructorError" + ] [ M.call_closure (| Ty.path "constructors_return_value::ConstructorsReturnValue", @@ -332,7 +341,12 @@ Module Impl_constructors_return_value_ConstructorsReturnValue. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "constructors_return_value::ConstructorError" [] ] + [] + [ + Ty.path "constructors_return_value::ConstructorsReturnValue"; + Ty.path "constructors_return_value::ConstructorError" + ] + [ Value.StructTuple "constructors_return_value::ConstructorError" [] [] [] ] |))) ] |) @@ -392,6 +406,11 @@ Module Impl_constructors_return_value_ConstructorsReturnValue. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "constructors_return_value::AccountId"; + Ty.path "constructors_return_value::LangError" + ] [ M.call_closure (| Ty.path "constructors_return_value::AccountId", @@ -500,9 +519,25 @@ Module Impl_constructors_return_value_ConstructorsReturnValue. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "core::result::Result") + [] + [ + Ty.path "constructors_return_value::AccountId"; + Ty.path "constructors_return_value::ConstructorError" + ]; + Ty.path "constructors_return_value::LangError" + ] [ Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "constructors_return_value::AccountId"; + Ty.path "constructors_return_value::ConstructorError" + ] [ M.call_closure (| Ty.path "constructors_return_value::AccountId", @@ -535,10 +570,23 @@ Module Impl_constructors_return_value_ConstructorsReturnValue. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "core::result::Result") + [] + [ + Ty.path "constructors_return_value::AccountId"; + Ty.path "constructors_return_value::ConstructorError" + ]; + Ty.path "constructors_return_value::LangError" + ] [ Value.StructTuple "constructors_return_value::LangError::CouldNotReadInput" [] + [] + [] ] |))) ] diff --git a/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/contract_ref.v b/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/contract_ref.v index 6538d043e..4dc76fd63 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/contract_ref.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/contract_ref.v @@ -19,6 +19,8 @@ Module Impl_core_default_Default_for_contract_ref_AccountId. ltac:(M.monadic (Value.StructTuple "contract_ref::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -204,7 +206,7 @@ Module Impl_contract_ref_FlipperRef. | [], [], [ init_value ] => ltac:(M.monadic (let init_value := M.alloc (| init_value |) in - Value.StructRecord "contract_ref::FlipperRef" [ ("value", M.read (| init_value |)) ])) + Value.StructRecord "contract_ref::FlipperRef" [] [] [ ("value", M.read (| init_value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -282,6 +284,8 @@ Module Impl_contract_ref_FlipperRef. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "contract_ref::FlipperRef"; Ty.path "contract_ref::FlipperError" ] [ M.call_closure (| Ty.path "contract_ref::FlipperRef", @@ -300,7 +304,9 @@ Module Impl_contract_ref_FlipperRef. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "contract_ref::FlipperError" [] ] + [] + [ Ty.path "contract_ref::FlipperRef"; Ty.path "contract_ref::FlipperError" ] + [ Value.StructTuple "contract_ref::FlipperError" [] [] [] ] |))) ] |) @@ -433,7 +439,11 @@ Module Impl_contract_ref_ContractRef. |) |) in M.alloc (| - Value.StructRecord "contract_ref::ContractRef" [ ("flipper", M.read (| flipper |)) ] + Value.StructRecord + "contract_ref::ContractRef" + [] + [] + [ ("flipper", M.read (| flipper |)) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -513,7 +523,11 @@ Module Impl_contract_ref_ContractRef. |) |) in M.alloc (| - Value.StructRecord "contract_ref::ContractRef" [ ("flipper", M.read (| flipper |)) ] + Value.StructRecord + "contract_ref::ContractRef" + [] + [] + [ ("flipper", M.read (| flipper |)) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/integration_flipper.v b/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/integration_flipper.v index 0ab95fa73..dab89dd47 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/integration_flipper.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/lang_err_integration_tests/integration_flipper.v @@ -60,7 +60,11 @@ Module Impl_integration_flipper_Flipper. | [], [], [ init_value ] => ltac:(M.monadic (let init_value := M.alloc (| init_value |) in - Value.StructRecord "integration_flipper::Flipper" [ ("value", M.read (| init_value |)) ])) + Value.StructRecord + "integration_flipper::Flipper" + [] + [] + [ ("value", M.read (| init_value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -141,6 +145,11 @@ Module Impl_integration_flipper_Flipper. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "integration_flipper::Flipper"; + Ty.path "integration_flipper::FlipperError" + ] [ M.call_closure (| Ty.path "integration_flipper::Flipper", @@ -159,7 +168,12 @@ Module Impl_integration_flipper_Flipper. (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "integration_flipper::FlipperError" [] ] + [] + [ + Ty.path "integration_flipper::Flipper"; + Ty.path "integration_flipper::FlipperError" + ] + [ Value.StructTuple "integration_flipper::FlipperError" [] [] [] ] |))) ] |) @@ -259,7 +273,13 @@ Module Impl_integration_flipper_Flipper. [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |) ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.tuple [] ] + [ Value.Tuple [] ] + |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/examples/default/examples/ink_contracts/mapping_integration_tests.v b/CoqOfRust/examples/default/examples/ink_contracts/mapping_integration_tests.v index 357cf377a..a294095a7 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/mapping_integration_tests.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/mapping_integration_tests.v @@ -25,6 +25,8 @@ Module Impl_core_default_Default_where_core_default_Default_K_where_core_default ltac:(M.monadic (Value.StructRecord "mapping_integration_tests::Mapping" + [] + [ K; V ] [ ("_key", M.call_closure (| @@ -286,6 +288,8 @@ Module Impl_core_default_Default_for_mapping_integration_tests_AccountId. ltac:(M.monadic (Value.StructTuple "mapping_integration_tests::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -416,6 +420,8 @@ Module Impl_core_default_Default_for_mapping_integration_tests_Mappings. ltac:(M.monadic (Value.StructRecord "mapping_integration_tests::Mappings" + [] + [] [ ("balances", M.call_closure (| @@ -544,6 +550,8 @@ Module Impl_mapping_integration_tests_Mappings. M.alloc (| Value.StructRecord "mapping_integration_tests::Mappings" + [] + [] [ ("balances", M.read (| balances |)) ] |) |))) diff --git a/CoqOfRust/examples/default/examples/ink_contracts/mother.v b/CoqOfRust/examples/default/examples/ink_contracts/mother.v index 6088297b8..e4f74854b 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/mother.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/mother.v @@ -24,6 +24,8 @@ Module Impl_core_default_Default_where_core_default_Default_K_where_core_default ltac:(M.monadic (Value.StructRecord "mother::Mapping" + [] + [ K; V ] [ ("_key", M.call_closure (| @@ -146,6 +148,8 @@ Module Impl_core_default_Default_for_mother_AccountId. ltac:(M.monadic (Value.StructTuple "mother::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -352,6 +356,8 @@ Module Impl_core_default_Default_for_mother_Bids. ltac:(M.monadic (Value.StructTuple "mother::Bids" + [] + [] [ M.call_closure (| Ty.apply @@ -549,6 +555,8 @@ Module Impl_core_clone_Clone_for_mother_Bids. (let self := M.alloc (| self |) in Value.StructTuple "mother::Bids" + [] + [] [ M.call_closure (| Ty.apply @@ -760,17 +768,17 @@ Module Impl_core_clone_Clone_for_mother_Outline. ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "mother::Outline::NoWinner" |) in - M.alloc (| Value.StructTuple "mother::Outline::NoWinner" [] |))); + M.alloc (| Value.StructTuple "mother::Outline::NoWinner" [] [] [] |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "mother::Outline::WinnerDetected" |) in - M.alloc (| Value.StructTuple "mother::Outline::WinnerDetected" [] |))); + M.alloc (| Value.StructTuple "mother::Outline::WinnerDetected" [] [] [] |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "mother::Outline::PayoutCompleted" |) in - M.alloc (| Value.StructTuple "mother::Outline::PayoutCompleted" [] |))) + M.alloc (| Value.StructTuple "mother::Outline::PayoutCompleted" [] [] [] |))) ] |) |))) @@ -1075,12 +1083,12 @@ Module Impl_core_clone_Clone_for_mother_Status. ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "mother::Status::NotStarted" |) in - M.alloc (| Value.StructTuple "mother::Status::NotStarted" [] |))); + M.alloc (| Value.StructTuple "mother::Status::NotStarted" [] [] [] |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "mother::Status::OpeningPeriod" |) in - M.alloc (| Value.StructTuple "mother::Status::OpeningPeriod" [] |))); + M.alloc (| Value.StructTuple "mother::Status::OpeningPeriod" [] [] [] |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in @@ -1094,6 +1102,8 @@ Module Impl_core_clone_Clone_for_mother_Status. M.alloc (| Value.StructTuple "mother::Status::EndingPeriod" + [] + [] [ M.call_closure (| Ty.path "u32", @@ -1119,6 +1129,8 @@ Module Impl_core_clone_Clone_for_mother_Status. M.alloc (| Value.StructTuple "mother::Status::Ended" + [] + [] [ M.call_closure (| Ty.path "mother::Outline", @@ -1144,6 +1156,8 @@ Module Impl_core_clone_Clone_for_mother_Status. M.alloc (| Value.StructTuple "mother::Status::RfDelay" + [] + [] [ M.call_closure (| Ty.path "u32", @@ -1570,6 +1584,8 @@ Module Impl_core_clone_Clone_for_mother_Auction. (let self := M.alloc (| self |) in Value.StructRecord "mother::Auction" + [] + [] [ ("name", M.call_closure (| @@ -1814,6 +1830,8 @@ Module Impl_core_default_Default_for_mother_Auction. ltac:(M.monadic (Value.StructRecord "mother::Auction" + [] + [] [ ("name", M.call_closure (| @@ -1877,7 +1895,7 @@ Module Impl_core_default_Default_for_mother_Auction. |), [] |)); - ("status", Value.StructTuple "mother::Status::OpeningPeriod" []); + ("status", Value.StructTuple "mother::Status::OpeningPeriod" [] [] []); ("finalized", Value.Bool false); ("vector", M.call_closure (| @@ -2186,6 +2204,8 @@ Module Impl_core_default_Default_for_mother_Mother. ltac:(M.monadic (Value.StructRecord "mother::Mother" + [] + [] [ ("auction", M.call_closure (| @@ -2297,6 +2317,8 @@ Module Impl_mother_Mother. (let auction := M.alloc (| auction |) in Value.StructRecord "mother::Mother" + [] + [] [ ("balances", M.call_closure (| @@ -2391,9 +2413,13 @@ Module Impl_mother_Mother. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "mother::Mother"; Ty.path "mother::Failure" ] [ Value.StructTuple "mother::Failure::Revert" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -2421,6 +2447,8 @@ Module Impl_mother_Mother. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "mother::Mother"; Ty.path "mother::Failure" ] [ M.call_closure (| Ty.path "mother::Mother", @@ -2481,9 +2509,13 @@ Module Impl_mother_Mother. |); Value.StructTuple "mother::Event::AuctionEchoed" + [] + [] [ Value.StructRecord "mother::AuctionEchoed" + [] + [] [ ("auction", M.call_closure (| @@ -2555,9 +2587,13 @@ Module Impl_mother_Mother. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "mother::Failure" ] [ Value.StructTuple "mother::Failure::Revert" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -2601,7 +2637,13 @@ Module Impl_mother_Mother. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "mother::Failure" ] + [ Value.Tuple [] ] + |))) ] |) |))) diff --git a/CoqOfRust/examples/default/examples/ink_contracts/multisig.v b/CoqOfRust/examples/default/examples/ink_contracts/multisig.v index e8ea9bd7e..b8494e75b 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/multisig.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/multisig.v @@ -24,6 +24,8 @@ Module Impl_core_default_Default_where_core_default_Default_K_where_core_default ltac:(M.monadic (Value.StructRecord "multisig::Mapping" + [] + [ K; V ] [ ("_key", M.call_closure (| @@ -258,6 +260,8 @@ Module Impl_core_default_Default_for_multisig_AccountId. ltac:(M.monadic (Value.StructTuple "multisig::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -712,6 +716,8 @@ Module Impl_core_default_Default_for_multisig_Transaction. ltac:(M.monadic (Value.StructRecord "multisig::Transaction" + [] + [] [ ("callee", M.call_closure (| @@ -956,6 +962,8 @@ Module Impl_core_default_Default_for_multisig_Transactions. ltac:(M.monadic (Value.StructRecord "multisig::Transactions" + [] + [] [ ("transactions", M.call_closure (| @@ -1290,6 +1298,8 @@ Module Impl_core_default_Default_for_multisig_Multisig. ltac:(M.monadic (Value.StructRecord "multisig::Multisig" + [] + [] [ ("confirmations", M.call_closure (| @@ -2326,7 +2336,7 @@ Module Impl_multisig_Multisig. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -2359,7 +2369,11 @@ Module Impl_multisig_Multisig. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -2626,9 +2640,13 @@ Module Impl_multisig_Multisig. |); Value.StructTuple "multisig::Event::OwnerAddition" + [] + [] [ Value.StructRecord "multisig::OwnerAddition" + [] + [] [ ("owner", M.read (| new_owner |)) ] ] ] @@ -3376,7 +3394,14 @@ Module Impl_multisig_Multisig. |); Value.StructTuple "multisig::Event::OwnerRemoval" - [ Value.StructRecord "multisig::OwnerRemoval" [ ("owner", M.read (| owner |)) ] + [] + [] + [ + Value.StructRecord + "multisig::OwnerRemoval" + [] + [] + [ ("owner", M.read (| owner |)) ] ] ] |) @@ -3608,9 +3633,13 @@ Module Impl_multisig_Multisig. |); Value.StructTuple "multisig::Event::OwnerRemoval" + [] + [] [ Value.StructRecord "multisig::OwnerRemoval" + [] + [] [ ("owner", M.read (| old_owner |)) ] ] ] @@ -3634,9 +3663,13 @@ Module Impl_multisig_Multisig. |); Value.StructTuple "multisig::Event::OwnerAddition" + [] + [] [ Value.StructRecord "multisig::OwnerAddition" + [] + [] [ ("owner", M.read (| new_owner |)) ] ] ] @@ -3746,9 +3779,13 @@ Module Impl_multisig_Multisig. |); Value.StructTuple "multisig::Event::RequirementChange" + [] + [] [ Value.StructRecord "multisig::RequirementChange" + [] + [] [ ("new_requirement", M.read (| new_requirement |)) ] ] ] @@ -3999,13 +4036,15 @@ Module Impl_multisig_Multisig. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "multisig::ConfirmationStatus::Confirmed" [] + Value.StructTuple "multisig::ConfirmationStatus::Confirmed" [] [] [] |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "multisig::ConfirmationStatus::ConfirmationsNeeded" + [] + [] [ M.call_closure (| Ty.path "u32", @@ -4064,9 +4103,13 @@ Module Impl_multisig_Multisig. |); Value.StructTuple "multisig::Event::Confirmation" + [] + [] [ Value.StructRecord "multisig::Confirmation" + [] + [] [ ("transaction", M.read (| transaction |)); ("from", M.read (| confirmer |)); @@ -4259,9 +4302,13 @@ Module Impl_multisig_Multisig. |); Value.StructTuple "multisig::Event::Submission" + [] + [] [ Value.StructRecord "multisig::Submission" + [] + [] [ ("transaction", M.read (| trans_id |)) ] ] ] @@ -4941,9 +4988,13 @@ Module Impl_multisig_Multisig. |); Value.StructTuple "multisig::Event::Cancellation" + [] + [] [ Value.StructRecord "multisig::Cancellation" + [] + [] [ ("transaction", M.read (| trans_id |)) ] ] ] @@ -5302,9 +5353,13 @@ Module Impl_multisig_Multisig. |); Value.StructTuple "multisig::Event::Revocation" + [] + [] [ Value.StructRecord "multisig::Revocation" + [] + [] [ ("transaction", M.read (| trans_id |)); ("from", M.read (| caller |)) @@ -5560,14 +5615,20 @@ Module Impl_multisig_Multisig. 0 |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "multisig::Error" ] + [ Value.Tuple [] ] |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "multisig::Error::TransactionFailed" [] ] + [] + [ Ty.tuple []; Ty.path "multisig::Error" ] + [ Value.StructTuple "multisig::Error::TransactionFailed" [] [] [] ] |))) ] |) @@ -5590,9 +5651,13 @@ Module Impl_multisig_Multisig. |); Value.StructTuple "multisig::Event::Execution" + [] + [] [ Value.StructRecord "multisig::Execution" + [] + [] [ ("transaction", M.read (| trans_id |)); ("result", @@ -5676,6 +5741,16 @@ Module Impl_multisig_Multisig. ltac:(M.monadic (Value.StructTuple "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path "u8"; + Ty.path "alloc::alloc::Global" + ] + ] [])) ] |))) diff --git a/CoqOfRust/examples/default/examples/ink_contracts/payment_channel.v b/CoqOfRust/examples/default/examples/ink_contracts/payment_channel.v index 18abac2d0..fb8afa464 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/payment_channel.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/payment_channel.v @@ -19,6 +19,8 @@ Module Impl_core_default_Default_for_payment_channel_AccountId. ltac:(M.monadic (Value.StructTuple "payment_channel::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -1240,6 +1242,8 @@ Module Impl_payment_channel_PaymentChannel. let close_duration := M.alloc (| close_duration |) in Value.StructRecord "payment_channel::PaymentChannel" + [] + [] [ ("sender", M.call_closure (| @@ -1264,7 +1268,7 @@ Module Impl_payment_channel_PaymentChannel. ] |)); ("recipient", M.read (| recipient |)); - ("expiration", Value.StructTuple "core::option::Option::None" []); + ("expiration", Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] []); ("withdrawn", Value.Integer IntegerKind.U128 0); ("close_duration", M.read (| close_duration |)) ])) @@ -1387,10 +1391,14 @@ Module Impl_payment_channel_PaymentChannel. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "payment_channel::Error" ] [ Value.StructTuple "payment_channel::Error::CallerIsNotRecipient" [] + [] + [] ] |) |) @@ -1431,10 +1439,14 @@ Module Impl_payment_channel_PaymentChannel. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "payment_channel::Error" ] [ Value.StructTuple "payment_channel::Error::AmountIsLessThanWithdrawn" [] + [] + [] ] |) |) @@ -1480,7 +1492,14 @@ Module Impl_payment_channel_PaymentChannel. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "payment_channel::Error::InvalidSignature" [] + [] + [ Ty.tuple []; Ty.path "payment_channel::Error" ] + [ + Value.StructTuple + "payment_channel::Error::InvalidSignature" + [] + [] + [] ] |) |) @@ -1614,6 +1633,8 @@ Module Impl_payment_channel_PaymentChannel. ltac:(M.monadic (Value.StructTuple "payment_channel::Error::TransferFailed" + [] + [] [])) ] |))) @@ -1681,7 +1702,13 @@ Module Impl_payment_channel_PaymentChannel. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "payment_channel::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1856,7 +1883,13 @@ Module Impl_payment_channel_PaymentChannel. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "payment_channel::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1974,7 +2007,14 @@ Module Impl_payment_channel_PaymentChannel. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "payment_channel::Error::CallerIsNotSender" [] + [] + [ Ty.tuple []; Ty.path "payment_channel::Error" ] + [ + Value.StructTuple + "payment_channel::Error::CallerIsNotSender" + [] + [] + [] ] |) |) @@ -2057,9 +2097,13 @@ Module Impl_payment_channel_PaymentChannel. |); Value.StructTuple "payment_channel::Event::SenderCloseStarted" + [] + [] [ Value.StructRecord "payment_channel::SenderCloseStarted" + [] + [] [ ("expiration", M.read (| expiration |)); ("close_duration", @@ -2083,10 +2127,20 @@ Module Impl_payment_channel_PaymentChannel. "payment_channel::PaymentChannel", "expiration" |), - Value.StructTuple "core::option::Option::Some" [ M.read (| expiration |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u64" ] + [ M.read (| expiration |) ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "payment_channel::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2215,10 +2269,14 @@ Module Impl_payment_channel_PaymentChannel. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "payment_channel::Error" ] [ Value.StructTuple "payment_channel::Error::NotYetExpired" [] + [] + [] ] |) |) @@ -2269,7 +2327,11 @@ Module Impl_payment_channel_PaymentChannel. |) |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "payment_channel::Error" ] + [ Value.Tuple [] ] |))); fun γ => ltac:(M.monadic @@ -2277,7 +2339,9 @@ Module Impl_payment_channel_PaymentChannel. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "payment_channel::Error::NotYetExpired" [] ] + [] + [ Ty.tuple []; Ty.path "payment_channel::Error" ] + [ Value.StructTuple "payment_channel::Error::NotYetExpired" [] [] [] ] |))) ] |) @@ -2407,10 +2471,14 @@ Module Impl_payment_channel_PaymentChannel. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "payment_channel::Error" ] [ Value.StructTuple "payment_channel::Error::CallerIsNotRecipient" [] + [] + [] ] |) |) @@ -2456,7 +2524,14 @@ Module Impl_payment_channel_PaymentChannel. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "payment_channel::Error::InvalidSignature" [] + [] + [ Ty.tuple []; Ty.path "payment_channel::Error" ] + [ + Value.StructTuple + "payment_channel::Error::InvalidSignature" + [] + [] + [] ] |) |) @@ -2497,10 +2572,14 @@ Module Impl_payment_channel_PaymentChannel. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "payment_channel::Error" ] [ Value.StructTuple "payment_channel::Error::AmountIsLessThanWithdrawn" [] + [] + [] ] |) |) @@ -2655,6 +2734,8 @@ Module Impl_payment_channel_PaymentChannel. ltac:(M.monadic (Value.StructTuple "payment_channel::Error::TransferFailed" + [] + [] [])) ] |))) @@ -2722,7 +2803,13 @@ Module Impl_payment_channel_PaymentChannel. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "payment_channel::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/examples/default/examples/ink_contracts/set_code_hash.v b/CoqOfRust/examples/default/examples/ink_contracts/set_code_hash.v index 67da484e9..6b1ebba8c 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/set_code_hash.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/set_code_hash.v @@ -54,6 +54,8 @@ Module Impl_core_default_Default_for_set_code_hash_Incrementer. ltac:(M.monadic (Value.StructRecord "set_code_hash::Incrementer" + [] + [] [ ("count", M.call_closure (| diff --git a/CoqOfRust/examples/default/examples/ink_contracts/set_code_hash/updated_incrementer.v b/CoqOfRust/examples/default/examples/ink_contracts/set_code_hash/updated_incrementer.v index 5fde609f8..ce92e37cb 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/set_code_hash/updated_incrementer.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/set_code_hash/updated_incrementer.v @@ -19,6 +19,8 @@ Module Impl_core_default_Default_for_updated_incrementer_AccountId. ltac:(M.monadic (Value.StructTuple "updated_incrementer::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", diff --git a/CoqOfRust/examples/default/examples/ink_contracts/trait_erc20.v b/CoqOfRust/examples/default/examples/ink_contracts/trait_erc20.v index 7aca7fc8a..e19d313c8 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/trait_erc20.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/trait_erc20.v @@ -24,6 +24,8 @@ Module Impl_core_default_Default_where_core_default_Default_K_where_core_default ltac:(M.monadic (Value.StructRecord "trait_erc20::Mapping" + [] + [ K; V ] [ ("_key", M.call_closure (| @@ -146,6 +148,8 @@ Module Impl_core_default_Default_for_trait_erc20_AccountId. ltac:(M.monadic (Value.StructTuple "trait_erc20::AccountId" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -442,6 +446,8 @@ Module Impl_core_default_Default_for_trait_erc20_Erc20. ltac:(M.monadic (Value.StructRecord "trait_erc20::Erc20" + [] + [] [ ("total_supply", M.call_closure (| @@ -788,13 +794,26 @@ Module Impl_trait_erc20_Erc20. |); Value.StructTuple "trait_erc20::Event::Transfer" + [] + [] [ Value.StructRecord "trait_erc20::Transfer" + [] + [] [ - ("from", Value.StructTuple "core::option::Option::None" []); + ("from", + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "trait_erc20::AccountId" ] + []); ("to", - Value.StructTuple "core::option::Option::Some" [ M.read (| caller |) ]); + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "trait_erc20::AccountId" ] + [ M.read (| caller |) ]); ("value", M.read (| total_supply |)) ] ] @@ -804,6 +823,8 @@ Module Impl_trait_erc20_Erc20. M.alloc (| Value.StructRecord "trait_erc20::Erc20" + [] + [] [ ("total_supply", M.read (| total_supply |)); ("balances", M.read (| balances |)); @@ -1041,7 +1062,15 @@ Module Impl_trait_erc20_Erc20. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "trait_erc20::Error::InsufficientBalance" [] ] + [] + [ Ty.tuple []; Ty.path "trait_erc20::Error" ] + [ + Value.StructTuple + "trait_erc20::Error::InsufficientBalance" + [] + [] + [] + ] |) |) |) @@ -1155,17 +1184,25 @@ Module Impl_trait_erc20_Erc20. |); Value.StructTuple "trait_erc20::Event::Transfer" + [] + [] [ Value.StructRecord "trait_erc20::Transfer" + [] + [] [ ("from", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "trait_erc20::AccountId" ] [ M.read (| M.deref (| M.read (| from |) |) |) ]); ("to", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "trait_erc20::AccountId" ] [ M.read (| M.deref (| M.read (| to |) |) |) ]); ("value", M.read (| value |)) ] @@ -1173,7 +1210,13 @@ Module Impl_trait_erc20_Erc20. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "trait_erc20::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1402,9 +1445,13 @@ Module Impl_trait_erc20_BaseErc20_for_trait_erc20_Erc20. |); Value.StructTuple "trait_erc20::Event::Approval" + [] + [] [ Value.StructRecord "trait_erc20::Approval" + [] + [] [ ("owner", M.read (| owner |)); ("spender", M.read (| spender |)); @@ -1414,7 +1461,13 @@ Module Impl_trait_erc20_BaseErc20_for_trait_erc20_Erc20. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "trait_erc20::Error" ] + [ Value.Tuple [] ] + |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1516,7 +1569,14 @@ Module Impl_trait_erc20_BaseErc20_for_trait_erc20_Erc20. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "trait_erc20::Error::InsufficientAllowance" [] + [] + [ Ty.tuple []; Ty.path "trait_erc20::Error" ] + [ + Value.StructTuple + "trait_erc20::Error::InsufficientAllowance" + [] + [] + [] ] |) |) @@ -1672,7 +1732,13 @@ Module Impl_trait_erc20_BaseErc20_for_trait_erc20_Erc20. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "trait_erc20::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/examples/default/examples/ink_contracts/trait_flipper.v b/CoqOfRust/examples/default/examples/ink_contracts/trait_flipper.v index 6a0dbf391..98099af58 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/trait_flipper.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/trait_flipper.v @@ -28,6 +28,8 @@ Module Impl_trait_flipper_Flipper. ltac:(M.monadic (Value.StructRecord "trait_flipper::Flipper" + [] + [] [ ("value", M.call_closure (| diff --git a/CoqOfRust/examples/default/examples/ink_contracts/trait_incrementer.v b/CoqOfRust/examples/default/examples/ink_contracts/trait_incrementer.v index 8c2a92d7e..869250365 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/trait_incrementer.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/trait_incrementer.v @@ -28,7 +28,11 @@ Module Impl_trait_incrementer_Incrementer. | [], [], [ init_value ] => ltac:(M.monadic (let init_value := M.alloc (| init_value |) in - Value.StructRecord "trait_incrementer::Incrementer" [ ("value", M.read (| init_value |)) ])) + Value.StructRecord + "trait_incrementer::Incrementer" + [] + [] + [ ("value", M.read (| init_value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/examples/default/examples/ink_contracts/wildcard_selector.v b/CoqOfRust/examples/default/examples/ink_contracts/wildcard_selector.v index 37e6ceb88..f1b4a9acd 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/wildcard_selector.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/wildcard_selector.v @@ -43,7 +43,8 @@ Module Impl_wildcard_selector_WildcardSelector. *) Definition new (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "wildcard_selector::WildcardSelector" [])) + | [], [], [] => + ltac:(M.monadic (Value.StructTuple "wildcard_selector::WildcardSelector" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/examples/default/examples/monadic_transformation/example05.v b/CoqOfRust/examples/default/examples/monadic_transformation/example05.v index 12bece83f..f44183d5f 100644 --- a/CoqOfRust/examples/default/examples/monadic_transformation/example05.v +++ b/CoqOfRust/examples/default/examples/monadic_transformation/example05.v @@ -50,7 +50,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.read (| let~ foo : Ty.apply (Ty.path "*") [] [ Ty.path "example05::Foo" ] := - M.alloc (| Value.StructTuple "example05::Foo" [ Value.Integer IntegerKind.U32 0 ] |) in + M.alloc (| + Value.StructTuple "example05::Foo" [] [] [ Value.Integer IntegerKind.U32 0 ] + |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.path "u32" ] := M.alloc (| M.call_closure (| diff --git a/CoqOfRust/examples/default/examples/rust_book/cargo/concurrent_tests.v b/CoqOfRust/examples/default/examples/rust_book/cargo/concurrent_tests.v index 2de2692bc..e638b10e2 100644 --- a/CoqOfRust/examples/default/examples/rust_book/cargo/concurrent_tests.v +++ b/CoqOfRust/examples/default/examples/rust_book/cargo/concurrent_tests.v @@ -224,6 +224,8 @@ Module tests. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "i32" ] [ ("start", Value.Integer IntegerKind.I32 0); ("end_", Value.Integer IntegerKind.I32 5) @@ -485,6 +487,8 @@ Module tests. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "i32" ] [ ("start", Value.Integer IntegerKind.I32 0); ("end_", Value.Integer IntegerKind.I32 5) diff --git a/CoqOfRust/examples/default/examples/rust_book/conversion/converting_to_string.v b/CoqOfRust/examples/default/examples/rust_book/conversion/converting_to_string.v index 177be98e3..c42a34d06 100644 --- a/CoqOfRust/examples/default/examples/rust_book/conversion/converting_to_string.v +++ b/CoqOfRust/examples/default/examples/rust_book/conversion/converting_to_string.v @@ -114,6 +114,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "converting_to_string::Circle" + [] + [] [ ("radius", Value.Integer IntegerKind.I32 6) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.path "alloc::string::String" ] := diff --git a/CoqOfRust/examples/default/examples/rust_book/conversion/from.v b/CoqOfRust/examples/default/examples/rust_book/conversion/from.v index b7672eafd..d0880d7df 100644 --- a/CoqOfRust/examples/default/examples/rust_book/conversion/from.v +++ b/CoqOfRust/examples/default/examples/rust_book/conversion/from.v @@ -22,7 +22,7 @@ Module Impl_core_convert_From_i32_for_from_Number. | [], [], [ item ] => ltac:(M.monadic (let item := M.alloc (| item |) in - Value.StructRecord "from::Number" [ ("value", M.read (| item |)) ])) + Value.StructRecord "from::Number" [] [] [ ("value", M.read (| item |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/examples/default/examples/rust_book/conversion/into.v b/CoqOfRust/examples/default/examples/rust_book/conversion/into.v index 1addd1c59..00ec997cc 100644 --- a/CoqOfRust/examples/default/examples/rust_book/conversion/into.v +++ b/CoqOfRust/examples/default/examples/rust_book/conversion/into.v @@ -22,7 +22,7 @@ Module Impl_core_convert_From_i32_for_into_Number. | [], [], [ item ] => ltac:(M.monadic (let item := M.alloc (| item |) in - Value.StructRecord "into::Number" [ ("value", M.read (| item |)) ])) + Value.StructRecord "into::Number" [] [] [ ("value", M.read (| item |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/examples/default/examples/rust_book/conversion/try_from_and_try_into.v b/CoqOfRust/examples/default/examples/rust_book/conversion/try_from_and_try_into.v index cc6ba5ffc..df0b87ac2 100644 --- a/CoqOfRust/examples/default/examples/rust_book/conversion/try_from_and_try_into.v +++ b/CoqOfRust/examples/default/examples/rust_book/conversion/try_from_and_try_into.v @@ -173,12 +173,25 @@ Module Impl_core_convert_TryFrom_i32_for_try_from_and_try_into_EvenNumber. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "try_from_and_try_into::EvenNumber" [ M.read (| value |) ] + [] + [ Ty.path "try_from_and_try_into::EvenNumber"; Ty.tuple [] ] + [ + Value.StructTuple + "try_from_and_try_into::EvenNumber" + [] + [] + [ M.read (| value |) ] ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::result::Result::Err" [ Value.Tuple [] ] |))) + (M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "try_from_and_try_into::EvenNumber"; Ty.tuple [] ] + [ Value.Tuple [] ] + |))) ] |) |))) @@ -247,9 +260,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "try_from_and_try_into::EvenNumber"; Ty.tuple [] ] [ Value.StructTuple "try_from_and_try_into::EvenNumber" + [] + [] [ Value.Integer IntegerKind.I32 8 ] ] |) @@ -318,7 +335,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -359,7 +376,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -400,7 +421,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |); M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::result::Result::Err" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "try_from_and_try_into::EvenNumber"; Ty.tuple [] ] + [ Value.Tuple [] ] + |) |) ] |), @@ -466,7 +493,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -507,7 +534,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -559,9 +590,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "try_from_and_try_into::EvenNumber"; Ty.tuple [] ] [ Value.StructTuple "try_from_and_try_into::EvenNumber" + [] + [] [ Value.Integer IntegerKind.I32 8 ] ] |) @@ -630,7 +665,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -671,7 +706,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -720,7 +759,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, result |); M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::result::Result::Err" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "try_from_and_try_into::EvenNumber"; Ty.tuple [] ] + [ Value.Tuple [] ] + |) |) ] |), @@ -786,7 +831,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -827,7 +872,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/custom_types/enums.v b/CoqOfRust/examples/default/examples/rust_book/custom_types/enums.v index b0e1cd8f2..17f082f1f 100644 --- a/CoqOfRust/examples/default/examples/rust_book/custom_types/enums.v +++ b/CoqOfRust/examples/default/examples/rust_book/custom_types/enums.v @@ -400,11 +400,15 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.read (| let~ pressed : Ty.apply (Ty.path "*") [] [ Ty.path "enums::WebEvent" ] := - M.alloc (| Value.StructTuple "enums::WebEvent::KeyPress" [ Value.UnicodeChar 120 ] |) in + M.alloc (| + Value.StructTuple "enums::WebEvent::KeyPress" [] [] [ Value.UnicodeChar 120 ] + |) in let~ pasted : Ty.apply (Ty.path "*") [] [ Ty.path "enums::WebEvent" ] := M.alloc (| Value.StructTuple "enums::WebEvent::Paste" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -425,12 +429,14 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "enums::WebEvent::Click" + [] + [] [ ("x", Value.Integer IntegerKind.I64 20); ("y", Value.Integer IntegerKind.I64 80) ] |) in let~ load : Ty.apply (Ty.path "*") [] [ Ty.path "enums::WebEvent" ] := - M.alloc (| Value.StructTuple "enums::WebEvent::PageLoad" [] |) in + M.alloc (| Value.StructTuple "enums::WebEvent::PageLoad" [] [] [] |) in let~ unload : Ty.apply (Ty.path "*") [] [ Ty.path "enums::WebEvent" ] := - M.alloc (| Value.StructTuple "enums::WebEvent::PageUnload" [] |) in + M.alloc (| Value.StructTuple "enums::WebEvent::PageUnload" [] [] [] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.alloc (| M.call_closure (| diff --git a/CoqOfRust/examples/default/examples/rust_book/custom_types/enums_c_like.v b/CoqOfRust/examples/default/examples/rust_book/custom_types/enums_c_like.v index 59a291063..b29d44956 100644 --- a/CoqOfRust/examples/default/examples/rust_book/custom_types/enums_c_like.v +++ b/CoqOfRust/examples/default/examples/rust_book/custom_types/enums_c_like.v @@ -310,11 +310,17 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.Integer IntegerKind.Usize 0; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple + "core::fmt::rt::Alignment::Unknown" + [] + [] + []; Value.Integer IntegerKind.U32 8; - Value.StructTuple "core::fmt::rt::Count::Implied" []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize 6 ] ] |) @@ -441,11 +447,17 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.Integer IntegerKind.Usize 0; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple + "core::fmt::rt::Alignment::Unknown" + [] + [] + []; Value.Integer IntegerKind.U32 8; - Value.StructTuple "core::fmt::rt::Count::Implied" []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize 6 ] ] |) diff --git a/CoqOfRust/examples/default/examples/rust_book/custom_types/enums_testcase_linked_list.v b/CoqOfRust/examples/default/examples/rust_book/custom_types/enums_testcase_linked_list.v index eb4fae846..78116bcb5 100644 --- a/CoqOfRust/examples/default/examples/rust_book/custom_types/enums_testcase_linked_list.v +++ b/CoqOfRust/examples/default/examples/rust_book/custom_types/enums_testcase_linked_list.v @@ -42,7 +42,8 @@ Module Impl_enums_testcase_linked_list_List. *) Definition new (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with - | [], [], [] => ltac:(M.monadic (Value.StructTuple "enums_testcase_linked_list::List::Nil" [])) + | [], [], [] => + ltac:(M.monadic (Value.StructTuple "enums_testcase_linked_list::List::Nil" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -64,6 +65,8 @@ Module Impl_enums_testcase_linked_list_List. let elem := M.alloc (| elem |) in Value.StructTuple "enums_testcase_linked_list::List::Cons" + [] + [] [ M.read (| elem |); M.call_closure (| diff --git a/CoqOfRust/examples/default/examples/rust_book/custom_types/enums_type_aliases_v1.v b/CoqOfRust/examples/default/examples/rust_book/custom_types/enums_type_aliases_v1.v index 62100efdf..baef2eb5a 100644 --- a/CoqOfRust/examples/default/examples/rust_book/custom_types/enums_type_aliases_v1.v +++ b/CoqOfRust/examples/default/examples/rust_book/custom_types/enums_type_aliases_v1.v @@ -50,6 +50,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Value.StructTuple "enums_type_aliases_v1::VeryVerboseEnumOfThingsToDoWithNumbers::Add" [] + [] + [] |) in M.alloc (| Value.Tuple [] |) |))) diff --git a/CoqOfRust/examples/default/examples/rust_book/custom_types/enums_use.v b/CoqOfRust/examples/default/examples/rust_book/custom_types/enums_use.v index e82f93df4..62823242b 100644 --- a/CoqOfRust/examples/default/examples/rust_book/custom_types/enums_use.v +++ b/CoqOfRust/examples/default/examples/rust_book/custom_types/enums_use.v @@ -71,9 +71,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.read (| let~ status : Ty.apply (Ty.path "*") [] [ Ty.path "enums_use::Status" ] := - M.alloc (| Value.StructTuple "enums_use::Status::Poor" [] |) in + M.alloc (| Value.StructTuple "enums_use::Status::Poor" [] [] [] |) in let~ work : Ty.apply (Ty.path "*") [] [ Ty.path "enums_use::Work" ] := - M.alloc (| Value.StructTuple "enums_use::Work::Civilian" [] |) in + M.alloc (| Value.StructTuple "enums_use::Work::Civilian" [] [] [] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.match_operator (| Ty.apply (Ty.path "*") [] [ Ty.tuple [] ], diff --git a/CoqOfRust/examples/default/examples/rust_book/custom_types/structures.v b/CoqOfRust/examples/default/examples/rust_book/custom_types/structures.v index 3764167b1..3ef8da37d 100644 --- a/CoqOfRust/examples/default/examples/rust_book/custom_types/structures.v +++ b/CoqOfRust/examples/default/examples/rust_book/custom_types/structures.v @@ -195,6 +195,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "structures::Person" + [] + [] [ ("name", M.read (| name |)); ("age", M.read (| age |)) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -261,6 +263,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "structures::Point" + [] + [] [ ("x", M.read (| UnsupportedLiteral |)); ("y", M.read (| UnsupportedLiteral |)) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -483,20 +487,26 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "structures::Rectangle" + [] + [] [ ("top_left", Value.StructRecord "structures::Point" + [] + [] [ ("x", M.read (| left_edge |)); ("y", M.read (| top_edge |)) ]); ("bottom_right", M.read (| bottom_right |)) ] |) in let~ _unit : Ty.apply (Ty.path "*") [] [ Ty.path "structures::Unit" ] := - M.alloc (| Value.StructTuple "structures::Unit" [] |) in + M.alloc (| Value.StructTuple "structures::Unit" [] [] [] |) in let~ pair_ : Ty.apply (Ty.path "*") [] [ Ty.path "structures::Pair" ] := M.alloc (| Value.StructTuple "structures::Pair" + [] + [] [ Value.Integer IntegerKind.I32 1; M.read (| UnsupportedLiteral |) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/boxing_errors.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/boxing_errors.v index 5634f2253..66200762d 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/boxing_errors.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/boxing_errors.v @@ -62,7 +62,7 @@ Module Impl_core_clone_Clone_for_boxing_errors_EmptyVec. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "boxing_errors::EmptyVec" [])) + Value.StructTuple "boxing_errors::EmptyVec" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -329,7 +329,7 @@ Definition double_first (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) [], [] |), - [ Value.StructTuple "boxing_errors::EmptyVec" [] ] + [ Value.StructTuple "boxing_errors::EmptyVec" [] [] [] ] |))) ] |))) diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/combinators_and_then.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/combinators_and_then.v index cd6548cb7..3c7c20e14 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/combinators_and_then.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/combinators_and_then.v @@ -197,11 +197,21 @@ Definition have_ingredients (ε : list Value.t) (τ : list Ty.t) (α : list Valu fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "combinators_and_then::Food::Sushi" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "combinators_and_then::Food" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| food |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "combinators_and_then::Food" ] + [ M.read (| food |) ] |))) ] |) @@ -239,11 +249,21 @@ Definition have_recipe (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "combinators_and_then::Food::CordonBleu" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "combinators_and_then::Food" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| food |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "combinators_and_then::Food" ] + [ M.read (| food |) ] |))) ] |) @@ -290,7 +310,13 @@ Definition cookable_v1 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "combinators_and_then::Food" ] + [] + |))); fun γ => ltac:(M.monadic (let γ0_0 := @@ -320,7 +346,13 @@ Definition cookable_v1 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "combinators_and_then::Food" ] + [] + |))); fun γ => ltac:(M.monadic (let γ0_0 := @@ -331,7 +363,11 @@ Definition cookable_v1 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) |) in let food := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| food |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "combinators_and_then::Food" ] + [ M.read (| food |) ] |))) ] |))) @@ -599,9 +635,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Tuple [ - Value.StructTuple "combinators_and_then::Food::CordonBleu" []; - Value.StructTuple "combinators_and_then::Food::Steak" []; - Value.StructTuple "combinators_and_then::Food::Sushi" [] + Value.StructTuple "combinators_and_then::Food::CordonBleu" [] [] []; + Value.StructTuple "combinators_and_then::Food::Steak" [] [] []; + Value.StructTuple "combinators_and_then::Food::Sushi" [] [] [] ] |), [ @@ -620,7 +656,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.get_function (| "combinators_and_then::eat", [], [] |), [ M.read (| cordon_bleu |); - Value.StructTuple "combinators_and_then::Day::Monday" [] + Value.StructTuple "combinators_and_then::Day::Monday" [] [] [] ] |) |) in @@ -631,7 +667,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.get_function (| "combinators_and_then::eat", [], [] |), [ M.read (| steak |); - Value.StructTuple "combinators_and_then::Day::Tuesday" [] + Value.StructTuple "combinators_and_then::Day::Tuesday" [] [] [] ] |) |) in @@ -642,7 +678,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.get_function (| "combinators_and_then::eat", [], [] |), [ M.read (| sushi |); - Value.StructTuple "combinators_and_then::Day::Wednesday" [] + Value.StructTuple "combinators_and_then::Day::Wednesday" [] [] [] ] |) |) in diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/combinators_map.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/combinators_map.v index cd07507ee..c9498696e 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/combinators_map.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/combinators_map.v @@ -304,12 +304,20 @@ Definition peel (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "combinators_map::Peeled" [ M.read (| food |) ] ] + [] + [ Ty.path "combinators_map::Peeled" ] + [ Value.StructTuple "combinators_map::Peeled" [] [] [ M.read (| food |) ] ] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "combinators_map::Peeled" ] + [] + |))) ] |) |))) @@ -351,12 +359,20 @@ Definition chop (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "combinators_map::Chopped" [ M.read (| food |) ] ] + [] + [ Ty.path "combinators_map::Chopped" ] + [ Value.StructTuple "combinators_map::Chopped" [] [] [ M.read (| food |) ] ] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "combinators_map::Chopped" ] + [] + |))) ] |) |))) @@ -418,7 +434,11 @@ Definition cook (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := 0 |) in let food := M.copy (| γ0_0 |) in - Value.StructTuple "combinators_map::Cooked" [ M.read (| food |) ])) + Value.StructTuple + "combinators_map::Cooked" + [] + [] + [ M.read (| food |) ])) ] |))) | _ => M.impossible "wrong number of arguments" @@ -507,7 +527,11 @@ Definition process (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M fun γ => ltac:(M.monadic (let f := M.copy (| γ |) in - Value.StructTuple "combinators_map::Peeled" [ M.read (| f |) ])) + Value.StructTuple + "combinators_map::Peeled" + [] + [] + [ M.read (| f |) ])) ] |))) | _ => M.impossible "wrong number of arguments" @@ -540,7 +564,11 @@ Definition process (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M 0 |) in let f := M.copy (| γ0_0 |) in - Value.StructTuple "combinators_map::Chopped" [ M.read (| f |) ])) + Value.StructTuple + "combinators_map::Chopped" + [] + [] + [ M.read (| f |) ])) ] |))) | _ => M.impossible "wrong number of arguments" @@ -573,7 +601,7 @@ Definition process (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M 0 |) in let f := M.copy (| γ0_0 |) in - Value.StructTuple "combinators_map::Cooked" [ M.read (| f |) ])) + Value.StructTuple "combinators_map::Cooked" [] [] [ M.read (| f |) ])) ] |))) | _ => M.impossible "wrong number of arguments" @@ -748,7 +776,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "combinators_map::Food::Apple" [] ] + [] + [ Ty.path "combinators_map::Food" ] + [ Value.StructTuple "combinators_map::Food::Apple" [] [] [] ] |) in let~ carrot : Ty.apply @@ -759,7 +789,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "combinators_map::Food::Carrot" [] ] + [] + [ Ty.path "combinators_map::Food" ] + [ Value.StructTuple "combinators_map::Food::Carrot" [] [] [] ] |) in let~ potato : Ty.apply @@ -767,7 +799,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.apply (Ty.path "core::option::Option") [] [ Ty.path "combinators_map::Food" ] ] := - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) in + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "combinators_map::Food" ] [] + |) in let~ cooked_apple : Ty.apply (Ty.path "*") diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/defining_an_error_type.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/defining_an_error_type.v index 33d3b4b30..62e225494 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/defining_an_error_type.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/defining_an_error_type.v @@ -48,7 +48,7 @@ Module Impl_core_clone_Clone_for_defining_an_error_type_DoubleError. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "defining_an_error_type::DoubleError" [])) + Value.StructTuple "defining_an_error_type::DoubleError" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -233,7 +233,7 @@ Definition double_first (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) |) ] |); - Value.StructTuple "defining_an_error_type::DoubleError" [] + Value.StructTuple "defining_an_error_type::DoubleError" [] [] [] ] |); M.closure @@ -353,6 +353,8 @@ Definition double_first (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) ltac:(M.monadic (Value.StructTuple "defining_an_error_type::DoubleError" + [] + [] [])) ] |))) diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/early_returns.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/early_returns.v index 1e075a93e..58f0863d6 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/early_returns.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/early_returns.v @@ -68,7 +68,11 @@ Definition multiply (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ] + [ M.read (| e |) ] |) |) |) @@ -119,7 +123,11 @@ Definition multiply (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ] + [ M.read (| e |) ] |) |) |) @@ -130,6 +138,8 @@ Definition multiply (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ] [ M.call_closure (| Ty.path "i32", diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/introducing_question_mark.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/introducing_question_mark.v index 0771ca236..c569c3301 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/introducing_question_mark.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/introducing_question_mark.v @@ -247,6 +247,8 @@ Definition multiply (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ] [ M.call_closure (| Ty.path "i32", diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/introducing_question_mark_is_an_replacement_for_deprecated_try.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/introducing_question_mark_is_an_replacement_for_deprecated_try.v index 56a9d1c5d..4c80c65e5 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/introducing_question_mark_is_an_replacement_for_deprecated_try.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/introducing_question_mark_is_an_replacement_for_deprecated_try.v @@ -63,6 +63,8 @@ Definition multiply (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ] [ M.call_closure (| Ty.path "core::num::error::ParseIntError", @@ -130,6 +132,8 @@ Definition multiply (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ] [ M.call_closure (| Ty.path "core::num::error::ParseIntError", @@ -155,6 +159,8 @@ Definition multiply (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ] [ M.call_closure (| Ty.path "i32", diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/map_in_result_via_match.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/map_in_result_via_match.v index 7a2688e8a..45047ecc1 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/map_in_result_via_match.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/map_in_result_via_match.v @@ -83,6 +83,8 @@ Definition multiply (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ] [ M.call_closure (| Ty.path "i32", @@ -101,7 +103,11 @@ Definition multiply (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M |) in let e := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ] + [ M.read (| e |) ] |))) ] |))); @@ -110,7 +116,13 @@ Definition multiply (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Err", 0 |) in let e := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ] + [ M.read (| e |) ] + |))) ] |) |))) diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/option_and_unwrap.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/option_and_unwrap.v index 9e185b05a..99b972f5f 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/option_and_unwrap.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/option_and_unwrap.v @@ -350,7 +350,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] ] := - M.alloc (| Value.StructTuple "core::option::Option::Some" [ mk_str (| "water" |) ] |) in + M.alloc (| + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [ mk_str (| "water" |) ] + |) in let~ lemonade : Ty.apply (Ty.path "*") @@ -362,7 +368,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] ] := M.alloc (| - Value.StructTuple "core::option::Option::Some" [ mk_str (| "lemonade" |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [ mk_str (| "lemonade" |) ] |) in let~ void : Ty.apply @@ -374,7 +384,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] ] := - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) in + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.alloc (| M.call_closure (| @@ -409,7 +425,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] ] := - M.alloc (| Value.StructTuple "core::option::Option::Some" [ mk_str (| "coffee" |) ] |) in + M.alloc (| + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [ mk_str (| "coffee" |) ] + |) in let~ nothing : Ty.apply (Ty.path "*") @@ -420,7 +442,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] ] := - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) in + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] + [] + |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.alloc (| M.call_closure (| diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/other_uses_of_question_mark.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/other_uses_of_question_mark.v index 9c095c20c..4e6aa879a 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/other_uses_of_question_mark.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/other_uses_of_question_mark.v @@ -268,7 +268,7 @@ Definition double_first (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) |) ] |); - Value.StructTuple "other_uses_of_question_mark::EmptyVec" [] + Value.StructTuple "other_uses_of_question_mark::EmptyVec" [] [] [] ] |) ] @@ -482,6 +482,14 @@ Definition double_first (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "i32"; + Ty.apply + (Ty.path "alloc::boxed::Box") + [] + [ Ty.dyn [ ("core::error::Error::Trait", []) ]; Ty.path "alloc::alloc::Global" ] + ] [ M.call_closure (| Ty.path "i32", diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/pulling_results_out_of_options_with_stop_error_processing.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/pulling_results_out_of_options_with_stop_error_processing.v index de50ebb2b..bd80b310e 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/pulling_results_out_of_options_with_stop_error_processing.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/pulling_results_out_of_options_with_stop_error_processing.v @@ -275,7 +275,12 @@ Definition double_first (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) M.read (| opt |); Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "core::option::Option::None" [] ]; + [] + [ + Ty.apply (Ty.path "core::option::Option") [] [ Ty.path "i32" ]; + Ty.path "core::num::error::ParseIntError" + ] + [ Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] ]; M.closure (fun γ => ltac:(M.monadic @@ -343,7 +348,10 @@ Definition double_first (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) |), [ M.read (| r |); - M.constructor_as_closure "core::option::Option::Some" + M.constructor_as_closure + "core::option::Option::Some" + [] + [ Ty.path "i32" ] ] |))) ] diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/result_use_in_main.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/result_use_in_main.v index 14334a518..b3213fe05 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/result_use_in_main.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/result_use_in_main.v @@ -64,7 +64,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "core::num::error::ParseIntError" ] + [ M.read (| e |) ] |) |) |) @@ -132,7 +136,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) in M.alloc (| Value.Tuple [] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::num::error::ParseIntError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_and_defaults_via_get_or_insert.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_and_defaults_via_get_or_insert.v index 6db2301b0..17fdafb33 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_and_defaults_via_get_or_insert.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_and_defaults_via_get_or_insert.v @@ -163,14 +163,24 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "unpacking_options_and_defaults_via_get_or_insert::Fruit" ] ] := - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) in + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "unpacking_options_and_defaults_via_get_or_insert::Fruit" ] + [] + |) in let~ apple : Ty.apply (Ty.path "*") [] [ Ty.path "unpacking_options_and_defaults_via_get_or_insert::Fruit" ] := M.alloc (| - Value.StructTuple "unpacking_options_and_defaults_via_get_or_insert::Fruit::Apple" [] + Value.StructTuple + "unpacking_options_and_defaults_via_get_or_insert::Fruit::Apple" + [] + [] + [] |) in let~ first_available_fruit : Ty.apply diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_and_defaults_via_get_or_insert_with.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_and_defaults_via_get_or_insert_with.v index 73edeea9d..228d55dfd 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_and_defaults_via_get_or_insert_with.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_and_defaults_via_get_or_insert_with.v @@ -174,7 +174,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "unpacking_options_and_defaults_via_get_or_insert_with::Fruit" ] ] := - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) in + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "unpacking_options_and_defaults_via_get_or_insert_with::Fruit" ] + [] + |) in let~ get_lemon_as_fallback : Ty.apply (Ty.path "*") @@ -249,6 +255,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Value.StructTuple "unpacking_options_and_defaults_via_get_or_insert_with::Fruit::Lemon" [] + [] + [] |) |))) ] @@ -446,10 +454,14 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "unpacking_options_and_defaults_via_get_or_insert_with::Fruit" ] [ Value.StructTuple "unpacking_options_and_defaults_via_get_or_insert_with::Fruit::Apple" [] + [] + [] ] |) in let~ should_be_apple : diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_and_defaults_via_or.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_and_defaults_via_or.v index 4a3bf51e4..cdbb83404 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_and_defaults_via_or.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_and_defaults_via_or.v @@ -170,7 +170,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "unpacking_options_and_defaults_via_or::Fruit::Apple" [] ] + [] + [ Ty.path "unpacking_options_and_defaults_via_or::Fruit" ] + [ Value.StructTuple "unpacking_options_and_defaults_via_or::Fruit::Apple" [] [] [] ] |) in let~ orange : Ty.apply @@ -185,7 +187,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "unpacking_options_and_defaults_via_or::Fruit::Orange" [] ] + [] + [ Ty.path "unpacking_options_and_defaults_via_or::Fruit" ] + [ Value.StructTuple "unpacking_options_and_defaults_via_or::Fruit::Orange" [] [] [] ] |) in let~ no_fruit : Ty.apply @@ -197,7 +201,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "unpacking_options_and_defaults_via_or::Fruit" ] ] := - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) in + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "unpacking_options_and_defaults_via_or::Fruit" ] + [] + |) in let~ first_available_fruit : Ty.apply (Ty.path "*") diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_and_defaults_via_or_else.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_and_defaults_via_or_else.v index 17db58f02..a07ddd622 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_and_defaults_via_or_else.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_and_defaults_via_or_else.v @@ -174,7 +174,15 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "unpacking_options_and_defaults_via_or_else::Fruit::Apple" [] ] + [] + [ Ty.path "unpacking_options_and_defaults_via_or_else::Fruit" ] + [ + Value.StructTuple + "unpacking_options_and_defaults_via_or_else::Fruit::Apple" + [] + [] + [] + ] |) in let~ no_fruit : Ty.apply @@ -186,7 +194,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "unpacking_options_and_defaults_via_or_else::Fruit" ] ] := - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) in + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "unpacking_options_and_defaults_via_or_else::Fruit" ] + [] + |) in let~ get_kiwi_as_fallback : Ty.apply (Ty.path "*") @@ -262,10 +276,14 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "unpacking_options_and_defaults_via_or_else::Fruit" ] [ Value.StructTuple "unpacking_options_and_defaults_via_or_else::Fruit::Kiwi" [] + [] + [] ] |) |))) @@ -352,10 +370,14 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "unpacking_options_and_defaults_via_or_else::Fruit" ] [ Value.StructTuple "unpacking_options_and_defaults_via_or_else::Fruit::Lemon" [] + [] + [] ] |) |))) diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_via_question_mark.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_via_question_mark.v index 4733a723f..a3e14f263 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_via_question_mark.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/unpacking_options_via_question_mark.v @@ -376,24 +376,36 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "unpacking_options_via_question_mark::Person" + [] + [] [ ("job", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "unpacking_options_via_question_mark::Job" ] [ Value.StructRecord "unpacking_options_via_question_mark::Job" + [] + [] [ ("phone_number", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "unpacking_options_via_question_mark::PhoneNumber" ] [ Value.StructRecord "unpacking_options_via_question_mark::PhoneNumber" + [] + [] [ ("area_code", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ Value.Integer IntegerKind.U8 61 ]); ("number", Value.Integer IntegerKind.U32 439222222) ] @@ -428,6 +440,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u8" ] [ Value.Integer IntegerKind.U8 61 ] |) |) @@ -490,7 +504,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -529,7 +543,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/wrapping_errors.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/wrapping_errors.v index 445150248..128216110 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/wrapping_errors.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/wrapping_errors.v @@ -296,7 +296,13 @@ Module Impl_core_error_Error_for_wrapping_errors_DoubleError. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "wrapping_errors::DoubleError::EmptyVec" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] ] + [] + |))); fun γ => ltac:(M.monadic (let γ0_0 := @@ -309,6 +315,8 @@ Module Impl_core_error_Error_for_wrapping_errors_DoubleError. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] ] [ (* Unsize *) M.pointer_coercion @@ -343,7 +351,7 @@ Module Impl_core_convert_From_core_num_error_ParseIntError_for_wrapping_errors_D | [], [], [ err ] => ltac:(M.monadic (let err := M.alloc (| err |) in - Value.StructTuple "wrapping_errors::DoubleError::Parse" [ M.read (| err |) ])) + Value.StructTuple "wrapping_errors::DoubleError::Parse" [] [] [ M.read (| err |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -503,7 +511,7 @@ Definition double_first (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) |) ] |); - Value.StructTuple "wrapping_errors::DoubleError::EmptyVec" [] + Value.StructTuple "wrapping_errors::DoubleError::EmptyVec" [] [] [] ] |) ] @@ -681,6 +689,8 @@ Definition double_first (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "i32"; Ty.path "wrapping_errors::DoubleError" ] [ M.call_closure (| Ty.path "i32", diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_range_inclusive_to_exclusive.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_range_inclusive_to_exclusive.v index 50630d07a..9d2c13f7e 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_range_inclusive_to_exclusive.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_range_inclusive_to_exclusive.v @@ -40,6 +40,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "i32" ] [ ("start", Value.Integer IntegerKind.I32 1); ("end_", Value.Integer IntegerKind.I32 101) diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_let.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_let.v index ce7e8c7fb..829cb4241 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_let.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_let.v @@ -48,20 +48,24 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.apply (Ty.path "core::option::Option") [] [ Ty.path "i32" ] ] := M.alloc (| - Value.StructTuple "core::option::Option::Some" [ Value.Integer IntegerKind.I32 7 ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i32" ] + [ Value.Integer IntegerKind.I32 7 ] |) in let~ letter : Ty.apply (Ty.path "*") [] [ Ty.apply (Ty.path "core::option::Option") [] [ Ty.path "i32" ] ] := - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) in + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] |) in let~ emoticon : Ty.apply (Ty.path "*") [] [ Ty.apply (Ty.path "core::option::Option") [] [ Ty.path "i32" ] ] := - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) in + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.match_operator (| Ty.apply (Ty.path "*") [] [ Ty.tuple [] ], diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_let_challenge.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_let_challenge.v index 79df759e3..fdf801cfa 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_let_challenge.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_let_challenge.v @@ -35,7 +35,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.read (| let~ a : Ty.apply (Ty.path "*") [] [ Ty.path "if_let_challenge::Foo" ] := - M.alloc (| Value.StructTuple "if_let_challenge::Foo::Bar" [] |) in + M.alloc (| Value.StructTuple "if_let_challenge::Foo::Bar" [] [] [] |) in M.match_operator (| Ty.apply (Ty.path "*") [] [ Ty.tuple [] ], M.alloc (| Value.Tuple [] |), diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_let_dont_use_match.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_let_dont_use_match.v index f27e2a8cc..8515281ca 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_let_dont_use_match.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_let_dont_use_match.v @@ -29,7 +29,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.apply (Ty.path "core::option::Option") [] [ Ty.path "i32" ] ] := M.alloc (| - Value.StructTuple "core::option::Option::Some" [ Value.Integer IntegerKind.I32 7 ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i32" ] + [ Value.Integer IntegerKind.I32 7 ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.match_operator (| diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_let_match_enum_values.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_let_match_enum_values.v index e06e8d6eb..d34d1ff7b 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_let_match_enum_values.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_let_match_enum_values.v @@ -64,13 +64,15 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.read (| let~ a : Ty.apply (Ty.path "*") [] [ Ty.path "if_let_match_enum_values::Foo" ] := - M.alloc (| Value.StructTuple "if_let_match_enum_values::Foo::Bar" [] |) in + M.alloc (| Value.StructTuple "if_let_match_enum_values::Foo::Bar" [] [] [] |) in let~ b : Ty.apply (Ty.path "*") [] [ Ty.path "if_let_match_enum_values::Foo" ] := - M.alloc (| Value.StructTuple "if_let_match_enum_values::Foo::Baz" [] |) in + M.alloc (| Value.StructTuple "if_let_match_enum_values::Foo::Baz" [] [] [] |) in let~ c : Ty.apply (Ty.path "*") [] [ Ty.path "if_let_match_enum_values::Foo" ] := M.alloc (| Value.StructTuple "if_let_match_enum_values::Foo::Qux" + [] + [] [ Value.Integer IntegerKind.U32 100 ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/loop_returning_from_loops.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/loop_returning_from_loops.v index ecddd1558..bbfd4dc36 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/loop_returning_from_loops.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/loop_returning_from_loops.v @@ -110,7 +110,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -140,7 +140,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_binding_destructure_enum_variants.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_binding_destructure_enum_variants.v index fb3b9d23b..da422885b 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_binding_destructure_enum_variants.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_binding_destructure_enum_variants.v @@ -10,7 +10,11 @@ Definition some_number (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) match ε, τ, α with | [], [], [] => ltac:(M.monadic - (Value.StructTuple "core::option::Option::Some" [ Value.Integer IntegerKind.U32 42 ])) + (Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ Value.Integer IntegerKind.U32 42 ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_enums.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_enums.v index 6d9dfdbe8..f0c35d7d0 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_enums.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_enums.v @@ -85,6 +85,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "match_destructuring_enums::Color::RGB" + [] + [] [ Value.Integer IntegerKind.U32 122; Value.Integer IntegerKind.U32 17; diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_structs.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_structs.v index 05a557713..f7921ddcc 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_structs.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_structs.v @@ -37,6 +37,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "match_destructuring_structs::Foo" + [] + [] [ ("x", Value.Tuple [ Value.Integer IntegerKind.U32 1; Value.Integer IntegerKind.U32 2 ]); diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_guards.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_guards.v index 8ca2c94dd..00626a39a 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_guards.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_guards.v @@ -48,6 +48,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "match_guards::Temperature::Celsius" + [] + [] [ Value.Integer IntegerKind.I32 35 ] |) in M.match_operator (| diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/while_let.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/while_let.v index 9ac687d8d..adb333d4f 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/while_let.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/while_let.v @@ -34,7 +34,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.apply (Ty.path "core::option::Option") [] [ Ty.path "i32" ] ] := M.alloc (| - Value.StructTuple "core::option::Option::Some" [ Value.Integer IntegerKind.I32 0 ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i32" ] + [ Value.Integer IntegerKind.I32 0 ] |) in M.loop (| Ty.apply (Ty.path "*") [] [ Ty.tuple [] ], @@ -109,7 +113,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| M.write (| optional, - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i32" ] + [] |) |) in M.alloc (| Value.Tuple [] |))); @@ -192,6 +200,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := optional, Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/while_let_match_is_weird.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/while_let_match_is_weird.v index 76b0846b5..b97a81018 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/while_let_match_is_weird.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/while_let_match_is_weird.v @@ -39,7 +39,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.apply (Ty.path "core::option::Option") [] [ Ty.path "i32" ] ] := M.alloc (| - Value.StructTuple "core::option::Option::Some" [ Value.Integer IntegerKind.I32 0 ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "i32" ] + [ Value.Integer IntegerKind.I32 0 ] |) in M.loop (| Ty.apply (Ty.path "*") [] [ Ty.tuple [] ], @@ -113,7 +117,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| M.write (| optional, - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "i32" ] + [] |) |) in M.alloc (| Value.Tuple [] |))); @@ -196,6 +204,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := optional, Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", diff --git a/CoqOfRust/examples/default/examples/rust_book/functions/associated_functions_and_methods.v b/CoqOfRust/examples/default/examples/rust_book/functions/associated_functions_and_methods.v index 2df272979..00f7f03fb 100644 --- a/CoqOfRust/examples/default/examples/rust_book/functions/associated_functions_and_methods.v +++ b/CoqOfRust/examples/default/examples/rust_book/functions/associated_functions_and_methods.v @@ -23,6 +23,8 @@ Module Impl_associated_functions_and_methods_Point. ltac:(M.monadic (Value.StructRecord "associated_functions_and_methods::Point" + [] + [] [ ("y", M.read (| UnsupportedLiteral |)); ("x", M.read (| UnsupportedLiteral |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -44,6 +46,8 @@ Module Impl_associated_functions_and_methods_Point. let y := M.alloc (| y |) in Value.StructRecord "associated_functions_and_methods::Point" + [] + [] [ ("x", M.read (| x |)); ("y", M.read (| y |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -627,6 +631,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "associated_functions_and_methods::Rectangle" + [] + [] [ ("p1", M.call_closure (| @@ -815,6 +821,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "associated_functions_and_methods::Rectangle" + [] + [] [ ("p1", M.call_closure (| @@ -862,6 +870,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "associated_functions_and_methods::Pair" + [] + [] [ M.call_closure (| Ty.apply diff --git a/CoqOfRust/examples/default/examples/rust_book/functions/diverging_functions_example_sum_odd_numbers.v b/CoqOfRust/examples/default/examples/rust_book/functions/diverging_functions_example_sum_odd_numbers.v index 912f4870a..118f41492 100644 --- a/CoqOfRust/examples/default/examples/rust_book/functions/diverging_functions_example_sum_odd_numbers.v +++ b/CoqOfRust/examples/default/examples/rust_book/functions/diverging_functions_example_sum_odd_numbers.v @@ -169,6 +169,8 @@ Module main. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "u32" ] [ ("start", Value.Integer IntegerKind.U32 0); ("end_", M.read (| up_to |)) ] ] |) diff --git a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_example_searching_through_iterators_Iterator_position.v b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_example_searching_through_iterators_Iterator_position.v index 2cb90de54..dd8462a8f 100644 --- a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_example_searching_through_iterators_Iterator_position.v +++ b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_example_searching_through_iterators_Iterator_position.v @@ -205,6 +205,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 5 ] |) |) @@ -270,7 +272,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -309,7 +311,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -403,7 +409,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, index_of_first_negative_number |); M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "usize" ] [] + |) |) ] |), @@ -467,7 +475,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -506,7 +514,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/functions/functions_order.v b/CoqOfRust/examples/default/examples/rust_book/functions/functions_order.v index df578a3de..ca55b92b0 100644 --- a/CoqOfRust/examples/default/examples/rust_book/functions/functions_order.v +++ b/CoqOfRust/examples/default/examples/rust_book/functions/functions_order.v @@ -97,7 +97,9 @@ Definition depends_on_trait_impl (ε : list Value.t) (τ : list Ty.t) (α : list [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "functions_order::OtherType" [ M.read (| b |) ] |) + M.alloc (| + Value.StructTuple "functions_order::OtherType" [] [] [ M.read (| b |) ] + |) |) ] |) @@ -118,7 +120,9 @@ Definition depends_on_trait_impl (ε : list Value.t) (τ : list Ty.t) (α : list [ M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.StructTuple "functions_order::SomeType" [ M.read (| u |) ] |) + M.alloc (| + Value.StructTuple "functions_order::SomeType" [] [] [ M.read (| u |) ] + |) |) ] |) @@ -341,7 +345,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.call_closure (| Ty.tuple [], M.get_associated_function (| Ty.path "functions_order::SomeType", "meth1", [], [] |), - [ Value.StructTuple "functions_order::SomeType" [ Value.Integer IntegerKind.U32 0 ] ] + [ + Value.StructTuple + "functions_order::SomeType" + [] + [] + [ Value.Integer IntegerKind.U32 0 ] + ] |) |) in M.alloc (| Value.Tuple [] |) diff --git a/CoqOfRust/examples/default/examples/rust_book/functions/higher_order_functions.v b/CoqOfRust/examples/default/examples/rust_book/functions/higher_order_functions.v index bb34212d1..4071c9769 100644 --- a/CoqOfRust/examples/default/examples/rust_book/functions/higher_order_functions.v +++ b/CoqOfRust/examples/default/examples/rust_book/functions/higher_order_functions.v @@ -129,6 +129,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "u32" ] [ ("start", Value.Integer IntegerKind.U32 0) ] ] |) @@ -473,6 +475,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "u32" ] [ ("start", Value.Integer IntegerKind.U32 0) ]; M.closure (fun γ => diff --git a/CoqOfRust/examples/default/examples/rust_book/generics/generics.v b/CoqOfRust/examples/default/examples/rust_book/generics/generics.v index ae5aa292c..e32edcc8c 100644 --- a/CoqOfRust/examples/default/examples/rust_book/generics/generics.v +++ b/CoqOfRust/examples/default/examples/rust_book/generics/generics.v @@ -48,21 +48,27 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := (M.read (| let~ _s : Ty.apply (Ty.path "*") [] [ Ty.path "generics::Single" ] := M.alloc (| - Value.StructTuple "generics::Single" [ Value.StructTuple "generics::A" [] ] + Value.StructTuple "generics::Single" [] [] [ Value.StructTuple "generics::A" [] [] [] ] |) in let~ _char : Ty.apply (Ty.path "*") [] [ Ty.apply (Ty.path "generics::SingleGen") [] [ Ty.path "char" ] ] := - M.alloc (| Value.StructTuple "generics::SingleGen" [ Value.UnicodeChar 97 ] |) in + M.alloc (| + Value.StructTuple "generics::SingleGen" [] [ Ty.path "char" ] [ Value.UnicodeChar 97 ] + |) in let~ _t : Ty.apply (Ty.path "*") [] [ Ty.apply (Ty.path "generics::SingleGen") [] [ Ty.path "generics::A" ] ] := M.alloc (| - Value.StructTuple "generics::SingleGen" [ Value.StructTuple "generics::A" [] ] + Value.StructTuple + "generics::SingleGen" + [] + [ Ty.path "generics::A" ] + [ Value.StructTuple "generics::A" [] [] [] ] |) in let~ _i32 : Ty.apply @@ -70,14 +76,20 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.apply (Ty.path "generics::SingleGen") [] [ Ty.path "i32" ] ] := M.alloc (| - Value.StructTuple "generics::SingleGen" [ Value.Integer IntegerKind.I32 6 ] + Value.StructTuple + "generics::SingleGen" + [] + [ Ty.path "i32" ] + [ Value.Integer IntegerKind.I32 6 ] |) in let~ _char : Ty.apply (Ty.path "*") [] [ Ty.apply (Ty.path "generics::SingleGen") [] [ Ty.path "char" ] ] := - M.alloc (| Value.StructTuple "generics::SingleGen" [ Value.UnicodeChar 97 ] |) in + M.alloc (| + Value.StructTuple "generics::SingleGen" [] [ Ty.path "char" ] [ Value.UnicodeChar 97 ] + |) in M.alloc (| Value.Tuple [] |) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/examples/default/examples/rust_book/generics/generics_associated_types_problem.v b/CoqOfRust/examples/default/examples/rust_book/generics/generics_associated_types_problem.v index 2cb492811..e79bceaf4 100644 --- a/CoqOfRust/examples/default/examples/rust_book/generics/generics_associated_types_problem.v +++ b/CoqOfRust/examples/default/examples/rust_book/generics/generics_associated_types_problem.v @@ -229,6 +229,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "generics_associated_types_problem::Container" + [] + [] [ M.read (| number_1 |); M.read (| number_2 |) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := diff --git a/CoqOfRust/examples/default/examples/rust_book/generics/generics_associated_types_solution.v b/CoqOfRust/examples/default/examples/rust_book/generics/generics_associated_types_solution.v index 7fda3e074..1951077ec 100644 --- a/CoqOfRust/examples/default/examples/rust_book/generics/generics_associated_types_solution.v +++ b/CoqOfRust/examples/default/examples/rust_book/generics/generics_associated_types_solution.v @@ -378,6 +378,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "generics_associated_types_solution::Container" + [] + [] [ M.read (| number_1 |); M.read (| number_2 |) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := diff --git a/CoqOfRust/examples/default/examples/rust_book/generics/generics_bounds.v b/CoqOfRust/examples/default/examples/rust_book/generics/generics_bounds.v index 26953509e..032f0cc13 100644 --- a/CoqOfRust/examples/default/examples/rust_book/generics/generics_bounds.v +++ b/CoqOfRust/examples/default/examples/rust_book/generics/generics_bounds.v @@ -269,6 +269,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "generics_bounds::Rectangle" + [] + [] [ ("length", M.read (| UnsupportedLiteral |)); ("height", M.read (| UnsupportedLiteral |)) @@ -278,6 +280,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "generics_bounds::Triangle" + [] + [] [ ("length", M.read (| UnsupportedLiteral |)); ("height", M.read (| UnsupportedLiteral |)) diff --git a/CoqOfRust/examples/default/examples/rust_book/generics/generics_bounds_test_case_empty_bounds.v b/CoqOfRust/examples/default/examples/rust_book/generics/generics_bounds_test_case_empty_bounds.v index 3f4f7a753..fa1314520 100644 --- a/CoqOfRust/examples/default/examples/rust_book/generics/generics_bounds_test_case_empty_bounds.v +++ b/CoqOfRust/examples/default/examples/rust_book/generics/generics_bounds_test_case_empty_bounds.v @@ -125,19 +125,25 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := (Ty.path "*") [] [ Ty.path "generics_bounds_test_case_empty_bounds::Cardinal" ] := - M.alloc (| Value.StructTuple "generics_bounds_test_case_empty_bounds::Cardinal" [] |) in + M.alloc (| + Value.StructTuple "generics_bounds_test_case_empty_bounds::Cardinal" [] [] [] + |) in let~ blue_jay : Ty.apply (Ty.path "*") [] [ Ty.path "generics_bounds_test_case_empty_bounds::BlueJay" ] := - M.alloc (| Value.StructTuple "generics_bounds_test_case_empty_bounds::BlueJay" [] |) in + M.alloc (| + Value.StructTuple "generics_bounds_test_case_empty_bounds::BlueJay" [] [] [] + |) in let~ _turkey : Ty.apply (Ty.path "*") [] [ Ty.path "generics_bounds_test_case_empty_bounds::Turkey" ] := - M.alloc (| Value.StructTuple "generics_bounds_test_case_empty_bounds::Turkey" [] |) in + M.alloc (| + Value.StructTuple "generics_bounds_test_case_empty_bounds::Turkey" [] [] [] + |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.alloc (| diff --git a/CoqOfRust/examples/default/examples/rust_book/generics/generics_functions.v b/CoqOfRust/examples/default/examples/rust_book/generics/generics_functions.v index 812882399..ddc1c426d 100644 --- a/CoqOfRust/examples/default/examples/rust_book/generics/generics_functions.v +++ b/CoqOfRust/examples/default/examples/rust_book/generics/generics_functions.v @@ -110,7 +110,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.StructTuple "generics_functions::S" - [ Value.StructTuple "generics_functions::A" [] ] + [] + [] + [ Value.StructTuple "generics_functions::A" [] [] [] ] ] |) |) in @@ -122,7 +124,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.StructTuple "generics_functions::SGen" - [ Value.StructTuple "generics_functions::A" [] ] + [] + [ Ty.path "generics_functions::A" ] + [ Value.StructTuple "generics_functions::A" [] [] [] ] ] |) |) in @@ -131,7 +135,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.call_closure (| Ty.tuple [], M.get_function (| "generics_functions::gen_spec_i32", [], [] |), - [ Value.StructTuple "generics_functions::SGen" [ Value.Integer IntegerKind.I32 6 ] ] + [ + Value.StructTuple + "generics_functions::SGen" + [] + [ Ty.path "i32" ] + [ Value.Integer IntegerKind.I32 6 ] + ] |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -139,7 +149,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.call_closure (| Ty.tuple [], M.get_function (| "generics_functions::generic", [], [ Ty.path "char" ] |), - [ Value.StructTuple "generics_functions::SGen" [ Value.UnicodeChar 97 ] ] + [ + Value.StructTuple + "generics_functions::SGen" + [] + [ Ty.path "char" ] + [ Value.UnicodeChar 97 ] + ] |) |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -147,7 +163,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.call_closure (| Ty.tuple [], M.get_function (| "generics_functions::generic", [], [ Ty.path "char" ] |), - [ Value.StructTuple "generics_functions::SGen" [ Value.UnicodeChar 99 ] ] + [ + Value.StructTuple + "generics_functions::SGen" + [] + [ Ty.path "char" ] + [ Value.UnicodeChar 99 ] + ] |) |) in M.alloc (| Value.Tuple [] |) diff --git a/CoqOfRust/examples/default/examples/rust_book/generics/generics_implementation.v b/CoqOfRust/examples/default/examples/rust_book/generics/generics_implementation.v index 1623a5bcf..1f8107f2c 100644 --- a/CoqOfRust/examples/default/examples/rust_book/generics/generics_implementation.v +++ b/CoqOfRust/examples/default/examples/rust_book/generics/generics_implementation.v @@ -106,6 +106,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "generics_implementation::Val" + [] + [] [ ("val", M.read (| UnsupportedLiteral |)) ] |) in let~ y : @@ -116,6 +118,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "generics_implementation::GenVal" + [] + [ Ty.path "i32" ] [ ("gen_val", Value.Integer IntegerKind.I32 3) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := diff --git a/CoqOfRust/examples/default/examples/rust_book/generics/generics_new_type_idiom.v b/CoqOfRust/examples/default/examples/rust_book/generics/generics_new_type_idiom.v index f3071aec8..319f4e135 100644 --- a/CoqOfRust/examples/default/examples/rust_book/generics/generics_new_type_idiom.v +++ b/CoqOfRust/examples/default/examples/rust_book/generics/generics_new_type_idiom.v @@ -32,6 +32,8 @@ Module Impl_generics_new_type_idiom_Years. (let self := M.alloc (| self |) in Value.StructTuple "generics_new_type_idiom::Days" + [] + [] [ M.call_closure (| Ty.path "i64", @@ -71,6 +73,8 @@ Module Impl_generics_new_type_idiom_Days. (let self := M.alloc (| self |) in Value.StructTuple "generics_new_type_idiom::Years" + [] + [] [ M.call_closure (| Ty.path "i64", @@ -143,7 +147,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := (M.read (| let~ age : Ty.apply (Ty.path "*") [] [ Ty.path "generics_new_type_idiom::Years" ] := M.alloc (| - Value.StructTuple "generics_new_type_idiom::Years" [ Value.Integer IntegerKind.I64 5 ] + Value.StructTuple + "generics_new_type_idiom::Years" + [] + [] + [ Value.Integer IntegerKind.I64 5 ] |) in let~ age_days : Ty.apply (Ty.path "*") [] [ Ty.path "generics_new_type_idiom::Days" ] := M.alloc (| diff --git a/CoqOfRust/examples/default/examples/rust_book/generics/generics_new_type_idiom_as_base_type.v b/CoqOfRust/examples/default/examples/rust_book/generics/generics_new_type_idiom_as_base_type.v index fff926831..506b57cec 100644 --- a/CoqOfRust/examples/default/examples/rust_book/generics/generics_new_type_idiom_as_base_type.v +++ b/CoqOfRust/examples/default/examples/rust_book/generics/generics_new_type_idiom_as_base_type.v @@ -26,6 +26,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "generics_new_type_idiom_as_base_type::Years" + [] + [] [ Value.Integer IntegerKind.I64 42 ] |) in let~ years_as_primitive_1 : Ty.apply (Ty.path "*") [] [ Ty.path "i64" ] := diff --git a/CoqOfRust/examples/default/examples/rust_book/generics/generics_phantom_type.v b/CoqOfRust/examples/default/examples/rust_book/generics/generics_phantom_type.v index 7f176a733..f788660fb 100644 --- a/CoqOfRust/examples/default/examples/rust_book/generics/generics_phantom_type.v +++ b/CoqOfRust/examples/default/examples/rust_book/generics/generics_phantom_type.v @@ -254,7 +254,12 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "generics_phantom_type::PhantomTuple" - [ Value.UnicodeChar 81; Value.StructTuple "core::marker::PhantomData" [] ] + [] + [ Ty.path "char"; Ty.path "f32" ] + [ + Value.UnicodeChar 81; + Value.StructTuple "core::marker::PhantomData" [] [ Ty.path "f32" ] [] + ] |) in let~ _tuple2 : Ty.apply @@ -269,7 +274,12 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "generics_phantom_type::PhantomTuple" - [ Value.UnicodeChar 81; Value.StructTuple "core::marker::PhantomData" [] ] + [] + [ Ty.path "char"; Ty.path "f64" ] + [ + Value.UnicodeChar 81; + Value.StructTuple "core::marker::PhantomData" [] [ Ty.path "f64" ] [] + ] |) in let~ _struct1 : Ty.apply @@ -284,9 +294,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "generics_phantom_type::PhantomStruct" + [] + [ Ty.path "char"; Ty.path "f32" ] [ ("first", Value.UnicodeChar 81); - ("phantom", Value.StructTuple "core::marker::PhantomData" []) + ("phantom", Value.StructTuple "core::marker::PhantomData" [] [ Ty.path "f32" ] []) ] |) in let~ _struct2 : @@ -302,9 +314,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "generics_phantom_type::PhantomStruct" + [] + [ Ty.path "char"; Ty.path "f64" ] [ ("first", Value.UnicodeChar 81); - ("phantom", Value.StructTuple "core::marker::PhantomData" []) + ("phantom", Value.StructTuple "core::marker::PhantomData" [] [ Ty.path "f64" ] []) ] |) in M.alloc (| Value.Tuple [] |) diff --git a/CoqOfRust/examples/default/examples/rust_book/generics/generics_phantom_type_test_case_unit_clarification.v b/CoqOfRust/examples/default/examples/rust_book/generics/generics_phantom_type_test_case_unit_clarification.v index 4e7459101..d8e87ecb3 100644 --- a/CoqOfRust/examples/default/examples/rust_book/generics/generics_phantom_type_test_case_unit_clarification.v +++ b/CoqOfRust/examples/default/examples/rust_book/generics/generics_phantom_type_test_case_unit_clarification.v @@ -245,6 +245,8 @@ Module Impl_core_clone_Clone_where_core_clone_Clone_Unit_for_generics_phantom_ty (let self := M.alloc (| self |) in Value.StructTuple "generics_phantom_type_test_case_unit_clarification::Length" + [] + [ Unit ] [ M.call_closure (| Ty.path "f64", @@ -343,6 +345,8 @@ Module Impl_core_ops_arith_Add_generics_phantom_type_test_case_unit_clarificatio let rhs := M.alloc (| rhs |) in Value.StructTuple "generics_phantom_type_test_case_unit_clarification::Length" + [] + [ Unit ] [ M.call_closure (| Ty.path "f64", @@ -364,7 +368,7 @@ Module Impl_core_ops_arith_Add_generics_phantom_type_test_case_unit_clarificatio |) ] |); - Value.StructTuple "core::marker::PhantomData" [] + Value.StructTuple "core::marker::PhantomData" [] [ Unit ] [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -423,7 +427,16 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "generics_phantom_type_test_case_unit_clarification::Length" - [ M.read (| UnsupportedLiteral |); Value.StructTuple "core::marker::PhantomData" [] ] + [] + [ Ty.path "generics_phantom_type_test_case_unit_clarification::Inch" ] + [ + M.read (| UnsupportedLiteral |); + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "generics_phantom_type_test_case_unit_clarification::Inch" ] + [] + ] |) in let~ one_meter : Ty.apply @@ -438,7 +451,16 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "generics_phantom_type_test_case_unit_clarification::Length" - [ M.read (| UnsupportedLiteral |); Value.StructTuple "core::marker::PhantomData" [] ] + [] + [ Ty.path "generics_phantom_type_test_case_unit_clarification::Mm" ] + [ + M.read (| UnsupportedLiteral |); + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "generics_phantom_type_test_case_unit_clarification::Mm" ] + [] + ] |) in let~ two_feet : Ty.apply diff --git a/CoqOfRust/examples/default/examples/rust_book/generics/generics_traits.v b/CoqOfRust/examples/default/examples/rust_book/generics/generics_traits.v index 5057c4764..759dc964c 100644 --- a/CoqOfRust/examples/default/examples/rust_book/generics/generics_traits.v +++ b/CoqOfRust/examples/default/examples/rust_book/generics/generics_traits.v @@ -68,9 +68,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.read (| let~ empty : Ty.apply (Ty.path "*") [] [ Ty.path "generics_traits::Empty" ] := - M.alloc (| Value.StructTuple "generics_traits::Empty" [] |) in + M.alloc (| Value.StructTuple "generics_traits::Empty" [] [] [] |) in let~ null : Ty.apply (Ty.path "*") [] [ Ty.path "generics_traits::Null" ] := - M.alloc (| Value.StructTuple "generics_traits::Null" [] |) in + M.alloc (| Value.StructTuple "generics_traits::Null" [] [] [] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.alloc (| M.call_closure (| diff --git a/CoqOfRust/examples/default/examples/rust_book/generics/generics_where_clauses.v b/CoqOfRust/examples/default/examples/rust_book/generics/generics_where_clauses.v index 77de60dd6..abf3ede9b 100644 --- a/CoqOfRust/examples/default/examples/rust_book/generics/generics_where_clauses.v +++ b/CoqOfRust/examples/default/examples/rust_book/generics/generics_where_clauses.v @@ -70,6 +70,8 @@ Module Impl_generics_where_clauses_PrintInOption_where_core_fmt_Debug_core_optio M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.read (| self |) ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/hello_world/formatted_print.v b/CoqOfRust/examples/default/examples/rust_book/hello_world/formatted_print.v index 75045c64e..ec12e66d7 100644 --- a/CoqOfRust/examples/default/examples/rust_book/hello_world/formatted_print.v +++ b/CoqOfRust/examples/default/examples/rust_book/hello_world/formatted_print.v @@ -651,11 +651,17 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.Integer IntegerKind.Usize 0; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Right" []; + Value.StructTuple + "core::fmt::rt::Alignment::Right" + [] + [] + []; Value.Integer IntegerKind.U32 0; - Value.StructTuple "core::fmt::rt::Count::Implied" []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize 5 ] ] |) @@ -764,11 +770,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.Integer IntegerKind.Usize 0; Value.UnicodeChar 48; - Value.StructTuple "core::fmt::rt::Alignment::Left" []; + Value.StructTuple "core::fmt::rt::Alignment::Left" [] [] []; Value.Integer IntegerKind.U32 0; - Value.StructTuple "core::fmt::rt::Count::Implied" []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize 5 ] ] |) @@ -897,11 +905,17 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.Integer IntegerKind.Usize 0; Value.UnicodeChar 48; - Value.StructTuple "core::fmt::rt::Alignment::Right" []; + Value.StructTuple + "core::fmt::rt::Alignment::Right" + [] + [] + []; Value.Integer IntegerKind.U32 0; - Value.StructTuple "core::fmt::rt::Count::Implied" []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; Value.StructTuple "core::fmt::rt::Count::Param" + [] + [] [ Value.Integer IntegerKind.Usize 1 ] ] |) @@ -1081,11 +1095,17 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.Integer IntegerKind.Usize 0; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Right" []; + Value.StructTuple + "core::fmt::rt::Alignment::Right" + [] + [] + []; Value.Integer IntegerKind.U32 0; - Value.StructTuple "core::fmt::rt::Count::Implied" []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; Value.StructTuple "core::fmt::rt::Count::Param" + [] + [] [ Value.Integer IntegerKind.Usize 1 ] ] |) diff --git a/CoqOfRust/examples/default/examples/rust_book/modules/struct_visibility.v b/CoqOfRust/examples/default/examples/rust_book/modules/struct_visibility.v index fe709599f..590f3d961 100644 --- a/CoqOfRust/examples/default/examples/rust_book/modules/struct_visibility.v +++ b/CoqOfRust/examples/default/examples/rust_book/modules/struct_visibility.v @@ -35,6 +35,8 @@ Module my. (let contents := M.alloc (| contents |) in Value.StructRecord "struct_visibility::my::ClosedBox" + [] + [ T ] [ ("contents", M.read (| contents |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -90,6 +92,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "struct_visibility::my::OpenBox" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] [ ("contents", mk_str (| "public information" |)) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := diff --git a/CoqOfRust/examples/default/examples/rust_book/primitives/arrays_and_slices.v b/CoqOfRust/examples/default/examples/rust_book/primitives/arrays_and_slices.v index 5c38574c7..350f6d67b 100644 --- a/CoqOfRust/examples/default/examples/rust_book/primitives/arrays_and_slices.v +++ b/CoqOfRust/examples/default/examples/rust_book/primitives/arrays_and_slices.v @@ -688,6 +688,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, ys |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1); ("end_", Value.Integer IntegerKind.Usize 4) @@ -794,7 +796,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -843,7 +845,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -890,7 +896,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |), [ M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [] |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -964,7 +970,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -1008,7 +1014,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -1038,6 +1048,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", diff --git a/CoqOfRust/examples/default/examples/rust_book/primitives/literals_operators.v b/CoqOfRust/examples/default/examples/rust_book/primitives/literals_operators.v index 3324c8c97..1d2ed95d0 100644 --- a/CoqOfRust/examples/default/examples/rust_book/primitives/literals_operators.v +++ b/CoqOfRust/examples/default/examples/rust_book/primitives/literals_operators.v @@ -485,11 +485,17 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.Integer IntegerKind.Usize 0; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple + "core::fmt::rt::Alignment::Unknown" + [] + [] + []; Value.Integer IntegerKind.U32 8; - Value.StructTuple "core::fmt::rt::Count::Implied" []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize 4 ] ] |) @@ -609,11 +615,17 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.Integer IntegerKind.Usize 0; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple + "core::fmt::rt::Alignment::Unknown" + [] + [] + []; Value.Integer IntegerKind.U32 8; - Value.StructTuple "core::fmt::rt::Count::Implied" []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize 4 ] ] |) @@ -733,11 +745,17 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.Integer IntegerKind.Usize 0; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple + "core::fmt::rt::Alignment::Unknown" + [] + [] + []; Value.Integer IntegerKind.U32 8; - Value.StructTuple "core::fmt::rt::Count::Implied" []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] []; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize 4 ] ] |) diff --git a/CoqOfRust/examples/default/examples/rust_book/primitives/tuples.v b/CoqOfRust/examples/default/examples/rust_book/primitives/tuples.v index bdacba09c..e5e30223a 100644 --- a/CoqOfRust/examples/default/examples/rust_book/primitives/tuples.v +++ b/CoqOfRust/examples/default/examples/rust_book/primitives/tuples.v @@ -889,6 +889,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "tuples::Matrix" + [] + [] [ M.read (| UnsupportedLiteral |); M.read (| UnsupportedLiteral |); diff --git a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_borrowing_aliasing.v b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_borrowing_aliasing.v index dc3a61812..f311ef0eb 100644 --- a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_borrowing_aliasing.v +++ b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_borrowing_aliasing.v @@ -76,6 +76,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "scoping_rules_borrowing_aliasing::Point" + [] + [] [ ("x", Value.Integer IntegerKind.I32 0); ("y", Value.Integer IntegerKind.I32 0); diff --git a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_borrowing_mutablity.v b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_borrowing_mutablity.v index 3efb26660..202bf9662 100644 --- a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_borrowing_mutablity.v +++ b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_borrowing_mutablity.v @@ -367,6 +367,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "scoping_rules_borrowing_mutablity::Book" + [] + [] [ ("author", mk_str (| "Douglas Hofstadter" |)); ("title", mk_str (| String.append "G" (String.String "246" "del, Escher, Bach") |)); diff --git a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_borrowing_the_ref_pattern.v b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_borrowing_the_ref_pattern.v index 13c11364a..8d776d59a 100644 --- a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_borrowing_the_ref_pattern.v +++ b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_borrowing_the_ref_pattern.v @@ -213,6 +213,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "scoping_rules_borrowing_the_ref_pattern::Point" + [] + [] [ ("x", Value.Integer IntegerKind.I32 0); ("y", Value.Integer IntegerKind.I32 0) diff --git a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_bounds.v b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_bounds.v index 4c244549b..7b45a3434 100644 --- a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_bounds.v +++ b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_bounds.v @@ -263,6 +263,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "scoping_rules_lifetimes_bounds::Ref" + [] + [ Ty.path "i32" ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, x |) |) |) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := diff --git a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_methods.v b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_methods.v index a1798baea..1e876c7cb 100644 --- a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_methods.v +++ b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_methods.v @@ -159,6 +159,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "scoping_rules_lifetimes_methods::Owner" + [] + [] [ Value.Integer IntegerKind.I32 18 ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := diff --git a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_structs.v b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_structs.v index 3fc489ab6..aaab82b82 100644 --- a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_structs.v +++ b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_structs.v @@ -306,6 +306,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "scoping_rules_lifetimes_structs::Borrowed" + [] + [] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, x |) |) |) ] |) in let~ double : @@ -316,6 +318,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "scoping_rules_lifetimes_structs::NamedBorrowed" + [] + [] [ ("x", M.borrow (| @@ -331,12 +335,18 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "scoping_rules_lifetimes_structs::Either::Ref" + [] + [] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, x |) |) |) ] |) in let~ number : Ty.apply (Ty.path "*") [] [ Ty.path "scoping_rules_lifetimes_structs::Either" ] := M.alloc (| - Value.StructTuple "scoping_rules_lifetimes_structs::Either::Num" [ M.read (| y |) ] + Value.StructTuple + "scoping_rules_lifetimes_structs::Either::Num" + [] + [] + [ M.read (| y |) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := diff --git a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_traits.v b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_traits.v index f673360e1..fd65d6dcc 100644 --- a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_traits.v +++ b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_traits.v @@ -79,6 +79,8 @@ Module Impl_core_default_Default_for_scoping_rules_lifetimes_traits_Borrowed. ltac:(M.monadic (Value.StructRecord "scoping_rules_lifetimes_traits::Borrowed" + [] + [] [ ("x", M.borrow (| diff --git a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_ownership_and_rules_partial_moves.v b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_ownership_and_rules_partial_moves.v index 310effa57..cb1455cf5 100644 --- a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_ownership_and_rules_partial_moves.v +++ b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_ownership_and_rules_partial_moves.v @@ -41,6 +41,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "scoping_rules_ownership_and_rules_partial_moves::main::Person" + [] + [] [ ("name", M.call_closure (| diff --git a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_raii.v b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_raii.v index 0e45563da..e43cab030 100644 --- a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_raii.v +++ b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_raii.v @@ -155,6 +155,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "u32" ] [ ("start", Value.Integer IntegerKind.U32 0); ("end_", Value.Integer IntegerKind.U32 1000) diff --git a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_raii_desctructor.v b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_raii_desctructor.v index 53c6d3da6..53bdc0e0a 100644 --- a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_raii_desctructor.v +++ b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_raii_desctructor.v @@ -81,7 +81,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.read (| let~ x : Ty.apply (Ty.path "*") [] [ Ty.path "scoping_rules_raii_desctructor::ToDrop" ] := - M.alloc (| Value.StructTuple "scoping_rules_raii_desctructor::ToDrop" [] |) in + M.alloc (| Value.StructTuple "scoping_rules_raii_desctructor::ToDrop" [] [] [] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.alloc (| diff --git a/CoqOfRust/examples/default/examples/rust_book/std_library_types/arc.v b/CoqOfRust/examples/default/examples/rust_book/std_library_types/arc.v index 2eb27501f..9e5e8a60e 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_library_types/arc.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_library_types/arc.v @@ -74,6 +74,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "i32" ] [ ("start", Value.Integer IntegerKind.I32 0); ("end_", Value.Integer IntegerKind.I32 10) diff --git a/CoqOfRust/examples/default/examples/rust_book/std_library_types/box_stack_heap.v b/CoqOfRust/examples/default/examples/rust_book/std_library_types/box_stack_heap.v index 547acf097..6628d29cb 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_library_types/box_stack_heap.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_library_types/box_stack_heap.v @@ -144,6 +144,8 @@ Definition origin (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M : ltac:(M.monadic (Value.StructRecord "box_stack_heap::Point" + [] + [] [ ("x", M.read (| UnsupportedLiteral |)); ("y", M.read (| UnsupportedLiteral |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -179,6 +181,8 @@ Definition boxed_origin (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) [ Value.StructRecord "box_stack_heap::Point" + [] + [] [ ("x", M.read (| UnsupportedLiteral |)); ("y", M.read (| UnsupportedLiteral |)) ] ] |))) @@ -260,6 +264,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "box_stack_heap::Rectangle" + [] + [] [ ("top_left", M.call_closure (| @@ -270,6 +276,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ("bottom_right", Value.StructRecord "box_stack_heap::Point" + [] + [] [ ("x", M.read (| UnsupportedLiteral |)); ("y", M.read (| UnsupportedLiteral |)) ]) ] @@ -302,6 +310,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.StructRecord "box_stack_heap::Rectangle" + [] + [] [ ("top_left", M.call_closure (| @@ -312,6 +322,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ("bottom_right", Value.StructRecord "box_stack_heap::Point" + [] + [] [ ("x", M.read (| UnsupportedLiteral |)); ("y", M.read (| UnsupportedLiteral |)) diff --git a/CoqOfRust/examples/default/examples/rust_book/std_library_types/hash_map_alternate_or_custom_key_types.v b/CoqOfRust/examples/default/examples/rust_book/std_library_types/hash_map_alternate_or_custom_key_types.v index 946e61bc4..333899822 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_library_types/hash_map_alternate_or_custom_key_types.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_library_types/hash_map_alternate_or_custom_key_types.v @@ -449,6 +449,8 @@ Definition try_logon (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M.alloc (| Value.StructRecord "hash_map_alternate_or_custom_key_types::Account" + [] + [] [ ("username", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| username |) |) |)); ("password", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| password |) |) |)) @@ -790,6 +792,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "hash_map_alternate_or_custom_key_types::Account" + [] + [] [ ("username", M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "j.everyman" |) |) |)); @@ -805,6 +809,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "hash_map_alternate_or_custom_key_types::AccountInfo" + [] + [] [ ("name", M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "John Everyman" |) |) |)); diff --git a/CoqOfRust/examples/default/examples/rust_book/std_library_types/option.v b/CoqOfRust/examples/default/examples/rust_book/std_library_types/option.v index cddcbf32f..d6ce2b3b4 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_library_types/option.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_library_types/option.v @@ -38,12 +38,16 @@ Definition checked_division (ε : list Value.t) (τ : list Ty.t) (α : list Valu |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i32" ] [ M.call_closure (| Ty.path "i32", @@ -344,20 +348,24 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := (Ty.path "*") [] [ Ty.apply (Ty.path "core::option::Option") [] [ Ty.path "i32" ] ] := - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) in + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] |) in let~ _equivalent_none : Ty.apply (Ty.path "*") [] [ Ty.apply (Ty.path "core::option::Option") [] [ Ty.path "i32" ] ] := - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) in + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ Ty.path "i32" ] [] |) in let~ optional_float : Ty.apply (Ty.path "*") [] [ Ty.apply (Ty.path "core::option::Option") [] [ Ty.path "f32" ] ] := M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| UnsupportedLiteral |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "f32" ] + [ M.read (| UnsupportedLiteral |) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := diff --git a/CoqOfRust/examples/default/examples/rust_book/std_library_types/result.v b/CoqOfRust/examples/default/examples/rust_book/std_library_types/result.v index 679064fb9..67e40dad2 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_library_types/result.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_library_types/result.v @@ -164,13 +164,17 @@ Module checked. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "result::checked::MathError::DivisionByZero" [] ] + [] + [ Ty.path "f64"; Ty.path "result::checked::MathError" ] + [ Value.StructTuple "result::checked::MathError::DivisionByZero" [] [] [] ] |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "f64"; Ty.path "result::checked::MathError" ] [ M.call_closure (| Ty.path "f64", @@ -231,13 +235,18 @@ Module checked. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "result::checked::MathError::NegativeSquareRoot" [] ] + [] + [ Ty.path "f64"; Ty.path "result::checked::MathError" ] + [ Value.StructTuple "result::checked::MathError::NegativeSquareRoot" [] [] [] + ] |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "f64"; Ty.path "result::checked::MathError" ] [ M.call_closure (| Ty.path "f64", @@ -298,13 +307,23 @@ Module checked. M.alloc (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "result::checked::MathError::NonPositiveLogarithm" [] ] + [] + [ Ty.path "f64"; Ty.path "result::checked::MathError" ] + [ + Value.StructTuple + "result::checked::MathError::NonPositiveLogarithm" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "f64"; Ty.path "result::checked::MathError" ] [ M.call_closure (| Ty.path "f64", diff --git a/CoqOfRust/examples/default/examples/rust_book/std_library_types/result_chaining_with_question_mark.v b/CoqOfRust/examples/default/examples/rust_book/std_library_types/result_chaining_with_question_mark.v index df694b4b0..403ded549 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_library_types/result_chaining_with_question_mark.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_library_types/result_chaining_with_question_mark.v @@ -167,10 +167,17 @@ Module checked. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "f64"; + Ty.path "result_chaining_with_question_mark::checked::MathError" + ] [ Value.StructTuple "result_chaining_with_question_mark::checked::MathError::DivisionByZero" [] + [] + [] ] |))); fun γ => @@ -178,6 +185,11 @@ Module checked. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "f64"; + Ty.path "result_chaining_with_question_mark::checked::MathError" + ] [ M.call_closure (| Ty.path "f64", @@ -240,10 +252,17 @@ Module checked. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "f64"; + Ty.path "result_chaining_with_question_mark::checked::MathError" + ] [ Value.StructTuple "result_chaining_with_question_mark::checked::MathError::NegativeSquareRoot" [] + [] + [] ] |))); fun γ => @@ -251,6 +270,11 @@ Module checked. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "f64"; + Ty.path "result_chaining_with_question_mark::checked::MathError" + ] [ M.call_closure (| Ty.path "f64", @@ -313,10 +337,17 @@ Module checked. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "f64"; + Ty.path "result_chaining_with_question_mark::checked::MathError" + ] [ Value.StructTuple "result_chaining_with_question_mark::checked::MathError::NonPositiveLogarithm" [] + [] + [] ] |))); fun γ => @@ -324,6 +355,11 @@ Module checked. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "f64"; + Ty.path "result_chaining_with_question_mark::checked::MathError" + ] [ M.call_closure (| Ty.path "f64", diff --git a/CoqOfRust/examples/default/examples/rust_book/std_library_types/vectors.v b/CoqOfRust/examples/default/examples/rust_book/std_library_types/vectors.v index 7bd3c9c5c..66db75728 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_library_types/vectors.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_library_types/vectors.v @@ -91,6 +91,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "i32" ] [ ("start", Value.Integer IntegerKind.I32 0); ("end_", Value.Integer IntegerKind.I32 10) diff --git a/CoqOfRust/examples/default/examples/rust_book/std_misc/channels.v b/CoqOfRust/examples/default/examples/rust_book/std_misc/channels.v index 8111c6dc5..9cf01469a 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_misc/channels.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_misc/channels.v @@ -133,6 +133,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "i32" ] [ ("start", Value.Integer IntegerKind.I32 0); ("end_", @@ -570,6 +572,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "i32" ] [ ("start", Value.Integer IntegerKind.I32 0); ("end_", diff --git a/CoqOfRust/examples/default/examples/rust_book/std_misc/file_io_read_lines_efficient_method.v b/CoqOfRust/examples/default/examples/rust_book/std_misc/file_io_read_lines_efficient_method.v index a0e8f339f..588a15c9f 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_misc/file_io_read_lines_efficient_method.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_misc/file_io_read_lines_efficient_method.v @@ -162,6 +162,19 @@ Definition read_lines (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "std::io::Lines") + [] + [ + Ty.apply + (Ty.path "std::io::buffered::bufreader::BufReader") + [] + [ Ty.path "std::fs::File" ] + ]; + Ty.path "std::io::error::Error" + ] [ M.call_closure (| Ty.apply diff --git a/CoqOfRust/examples/default/examples/rust_book/std_misc/filesystem_operations.v b/CoqOfRust/examples/default/examples/rust_book/std_misc/filesystem_operations.v index 19132a9bd..c113e375e 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_misc/filesystem_operations.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_misc/filesystem_operations.v @@ -180,13 +180,25 @@ Definition cat (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Ok", 0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| s |) ] |))); + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "alloc::string::String"; Ty.path "std::io::error::Error" ] + [ M.read (| s |) ] + |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Err", 0 |) in let e := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "alloc::string::String"; Ty.path "std::io::error::Error" ] + [ M.read (| e |) ] + |))) ] |) |))) @@ -459,13 +471,25 @@ Definition touch (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Ok", 0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))); + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "std::io::error::Error" ] + [ Value.Tuple [] ] + |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Err", 0 |) in let e := M.copy (| γ0_0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| e |) ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "std::io::error::Error" ] + [ M.read (| e |) ] + |))) ] |) |))) diff --git a/CoqOfRust/examples/default/examples/rust_book/std_misc/foreign_function_interface.v b/CoqOfRust/examples/default/examples/rust_book/std_misc/foreign_function_interface.v index dc5c8c7ca..26651605f 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_misc/foreign_function_interface.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_misc/foreign_function_interface.v @@ -58,6 +58,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "foreign_function_interface::Complex" + [] + [] [ ("re", M.read (| UnsupportedLiteral |)); ("im", M.read (| UnsupportedLiteral |)) ] |) in let~ z_sqrt : Ty.apply (Ty.path "*") [] [ Ty.path "foreign_function_interface::Complex" ] := diff --git a/CoqOfRust/examples/default/examples/rust_book/std_misc/program_arguments.v b/CoqOfRust/examples/default/examples/rust_book/std_misc/program_arguments.v index d10358f7a..7ecd506e2 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_misc/program_arguments.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_misc/program_arguments.v @@ -298,6 +298,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, args |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1) diff --git a/CoqOfRust/examples/default/examples/rust_book/std_misc/program_arguments_parsing.v b/CoqOfRust/examples/default/examples/rust_book/std_misc/program_arguments_parsing.v index a74f31bc3..4cf6eeadb 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_misc/program_arguments_parsing.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_misc/program_arguments_parsing.v @@ -791,7 +791,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| cmd |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/std_misc/threads.v b/CoqOfRust/examples/default/examples/rust_book/std_misc/threads.v index ed6c59b5b..638903e54 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_misc/threads.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_misc/threads.v @@ -88,6 +88,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "u32" ] [ ("start", Value.Integer IntegerKind.U32 0); ("end_", M.read (| get_constant (| "threads::NTHREADS", Ty.path "u32" |) |)) diff --git a/CoqOfRust/examples/default/examples/rust_book/testing/unit_testing.v b/CoqOfRust/examples/default/examples/rust_book/testing/unit_testing.v index a679f210d..9aa461401 100644 --- a/CoqOfRust/examples/default/examples/rust_book/testing/unit_testing.v +++ b/CoqOfRust/examples/default/examples/rust_book/testing/unit_testing.v @@ -107,7 +107,7 @@ Module tests. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -137,7 +137,11 @@ Module tests. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -228,7 +232,7 @@ Module tests. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -258,7 +262,11 @@ Module tests. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/traits/clone.v b/CoqOfRust/examples/default/examples/rust_book/traits/clone.v index dd7b2f2a2..fdef07b98 100644 --- a/CoqOfRust/examples/default/examples/rust_book/traits/clone.v +++ b/CoqOfRust/examples/default/examples/rust_book/traits/clone.v @@ -96,6 +96,8 @@ Module Impl_core_clone_Clone_for_clone_Pair. (let self := M.alloc (| self |) in Value.StructTuple "clone::Pair" + [] + [] [ M.call_closure (| Ty.apply @@ -288,7 +290,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.read (| let~ unit_ : Ty.apply (Ty.path "*") [] [ Ty.path "clone::Unit" ] := - M.alloc (| Value.StructTuple "clone::Unit" [] |) in + M.alloc (| Value.StructTuple "clone::Unit" [] [] [] |) in let~ copied_unit : Ty.apply (Ty.path "*") [] [ Ty.path "clone::Unit" ] := M.copy (| unit_ |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -417,6 +419,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "clone::Pair" + [] + [] [ M.call_closure (| Ty.apply diff --git a/CoqOfRust/examples/default/examples/rust_book/traits/derive.v b/CoqOfRust/examples/default/examples/rust_book/traits/derive.v index 494167f51..0f6b84980 100644 --- a/CoqOfRust/examples/default/examples/rust_book/traits/derive.v +++ b/CoqOfRust/examples/default/examples/rust_book/traits/derive.v @@ -216,6 +216,8 @@ Module Impl_derive_Inches. M.alloc (| Value.StructTuple "derive::Centimeters" + [] + [] [ M.call_closure (| Ty.path "f64", @@ -280,9 +282,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.read (| let~ _one_second : Ty.apply (Ty.path "*") [] [ Ty.path "derive::Seconds" ] := - M.alloc (| Value.StructTuple "derive::Seconds" [ Value.Integer IntegerKind.I32 1 ] |) in + M.alloc (| + Value.StructTuple "derive::Seconds" [] [] [ Value.Integer IntegerKind.I32 1 ] + |) in let~ foot : Ty.apply (Ty.path "*") [] [ Ty.path "derive::Inches" ] := - M.alloc (| Value.StructTuple "derive::Inches" [ Value.Integer IntegerKind.I32 12 ] |) in + M.alloc (| + Value.StructTuple "derive::Inches" [] [] [ Value.Integer IntegerKind.I32 12 ] + |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.alloc (| @@ -347,7 +353,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Tuple [] |) in let~ meter : Ty.apply (Ty.path "*") [] [ Ty.path "derive::Centimeters" ] := M.alloc (| - Value.StructTuple "derive::Centimeters" [ M.read (| UnsupportedLiteral |) ] + Value.StructTuple "derive::Centimeters" [] [] [ M.read (| UnsupportedLiteral |) ] |) in let~ cmp : Ty.apply (Ty.path "*") [] [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] := M.copy (| diff --git a/CoqOfRust/examples/default/examples/rust_book/traits/disambiguating_overlapping_traits.v b/CoqOfRust/examples/default/examples/rust_book/traits/disambiguating_overlapping_traits.v index 00c157b80..00205c7e1 100644 --- a/CoqOfRust/examples/default/examples/rust_book/traits/disambiguating_overlapping_traits.v +++ b/CoqOfRust/examples/default/examples/rust_book/traits/disambiguating_overlapping_traits.v @@ -122,6 +122,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "disambiguating_overlapping_traits::Form" + [] + [] [ ("username", M.call_closure (| @@ -236,7 +238,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -269,7 +271,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -346,7 +352,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -376,7 +382,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/traits/drop.v b/CoqOfRust/examples/default/examples/rust_book/traits/drop.v index 6106f7edf..b3eefe95e 100644 --- a/CoqOfRust/examples/default/examples/rust_book/traits/drop.v +++ b/CoqOfRust/examples/default/examples/rust_book/traits/drop.v @@ -145,15 +145,21 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.read (| let~ _a : Ty.apply (Ty.path "*") [] [ Ty.path "drop::Droppable" ] := - M.alloc (| Value.StructRecord "drop::Droppable" [ ("name", mk_str (| "a" |)) ] |) in + M.alloc (| Value.StructRecord "drop::Droppable" [] [] [ ("name", mk_str (| "a" |)) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := let~ _b : Ty.apply (Ty.path "*") [] [ Ty.path "drop::Droppable" ] := - M.alloc (| Value.StructRecord "drop::Droppable" [ ("name", mk_str (| "b" |)) ] |) in + M.alloc (| + Value.StructRecord "drop::Droppable" [] [] [ ("name", mk_str (| "b" |)) ] + |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := let~ _c : Ty.apply (Ty.path "*") [] [ Ty.path "drop::Droppable" ] := - M.alloc (| Value.StructRecord "drop::Droppable" [ ("name", mk_str (| "c" |)) ] |) in + M.alloc (| + Value.StructRecord "drop::Droppable" [] [] [ ("name", mk_str (| "c" |)) ] + |) in let~ _d : Ty.apply (Ty.path "*") [] [ Ty.path "drop::Droppable" ] := - M.alloc (| Value.StructRecord "drop::Droppable" [ ("name", mk_str (| "d" |)) ] |) in + M.alloc (| + Value.StructRecord "drop::Droppable" [] [] [ ("name", mk_str (| "d" |)) ] + |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := M.alloc (| diff --git a/CoqOfRust/examples/default/examples/rust_book/traits/hash.v b/CoqOfRust/examples/default/examples/rust_book/traits/hash.v index de904ce4f..d863efd1b 100644 --- a/CoqOfRust/examples/default/examples/rust_book/traits/hash.v +++ b/CoqOfRust/examples/default/examples/rust_book/traits/hash.v @@ -224,6 +224,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "hash::Person" + [] + [] [ ("id", Value.Integer IntegerKind.U32 5); ("name", @@ -247,6 +249,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "hash::Person" + [] + [] [ ("id", Value.Integer IntegerKind.U32 5); ("name", diff --git a/CoqOfRust/examples/default/examples/rust_book/traits/impl_trait_as_return_type.v b/CoqOfRust/examples/default/examples/rust_book/traits/impl_trait_as_return_type.v index 57ba759fc..108669289 100644 --- a/CoqOfRust/examples/default/examples/rust_book/traits/impl_trait_as_return_type.v +++ b/CoqOfRust/examples/default/examples/rust_book/traits/impl_trait_as_return_type.v @@ -445,6 +445,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i32" ] [ Value.Integer IntegerKind.I32 1 ] |) |); @@ -528,7 +530,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -567,7 +569,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -590,6 +596,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i32" ] [ Value.Integer IntegerKind.I32 2 ] |) |); @@ -673,7 +681,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -712,7 +720,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -735,6 +747,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i32" ] [ Value.Integer IntegerKind.I32 3 ] |) |); @@ -818,7 +832,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -857,7 +871,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -880,6 +898,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i32" ] [ Value.Integer IntegerKind.I32 4 ] |) |); @@ -963,7 +983,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -1002,7 +1022,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -1025,6 +1049,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "i32" ] [ Value.Integer IntegerKind.I32 5 ] |) |); @@ -1108,7 +1134,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -1147,7 +1173,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/traits/iterators.v b/CoqOfRust/examples/default/examples/rust_book/traits/iterators.v index eaeebf238..ca798f26b 100644 --- a/CoqOfRust/examples/default/examples/rust_book/traits/iterators.v +++ b/CoqOfRust/examples/default/examples/rust_book/traits/iterators.v @@ -82,7 +82,13 @@ Module Impl_core_iter_traits_iterator_Iterator_for_iterators_Fibonacci. |) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::Some" [ M.read (| current |) ] |) + M.alloc (| + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u32" ] + [ M.read (| current |) ] + |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -107,6 +113,8 @@ Definition fibonacci (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : ltac:(M.monadic (Value.StructRecord "iterators::Fibonacci" + [] + [] [ ("curr", Value.Integer IntegerKind.U32 0); ("next", Value.Integer IntegerKind.U32 1) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -167,6 +175,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "i32" ] [ ("start", Value.Integer IntegerKind.I32 0); ("end_", Value.Integer IntegerKind.I32 3) @@ -619,6 +629,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "i32" ] [ ("start", Value.Integer IntegerKind.I32 0); ("end_", Value.Integer IntegerKind.I32 3) diff --git a/CoqOfRust/examples/default/examples/rust_book/traits/operator_overloading.v b/CoqOfRust/examples/default/examples/rust_book/traits/operator_overloading.v index 77ce27329..3444d36a0 100644 --- a/CoqOfRust/examples/default/examples/rust_book/traits/operator_overloading.v +++ b/CoqOfRust/examples/default/examples/rust_book/traits/operator_overloading.v @@ -147,7 +147,7 @@ Module Impl_core_ops_arith_Add_operator_overloading_Bar_for_operator_overloading |) |) in M.alloc (| Value.Tuple [] |) in - M.alloc (| Value.StructTuple "operator_overloading::FooBar" [] |) + M.alloc (| Value.StructTuple "operator_overloading::FooBar" [] [] [] |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -215,7 +215,7 @@ Module Impl_core_ops_arith_Add_operator_overloading_Foo_for_operator_overloading |) |) in M.alloc (| Value.Tuple [] |) in - M.alloc (| Value.StructTuple "operator_overloading::BarFoo" [] |) + M.alloc (| Value.StructTuple "operator_overloading::BarFoo" [] [] [] |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -303,8 +303,16 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] |), [ - Value.StructTuple "operator_overloading::Foo" []; - Value.StructTuple "operator_overloading::Bar" [] + Value.StructTuple + "operator_overloading::Foo" + [] + [] + []; + Value.StructTuple + "operator_overloading::Bar" + [] + [] + [] ] |) |) @@ -387,8 +395,16 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] |), [ - Value.StructTuple "operator_overloading::Bar" []; - Value.StructTuple "operator_overloading::Foo" [] + Value.StructTuple + "operator_overloading::Bar" + [] + [] + []; + Value.StructTuple + "operator_overloading::Foo" + [] + [] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/traits/returning_traits_with_dyn.v b/CoqOfRust/examples/default/examples/rust_book/traits/returning_traits_with_dyn.v index f0242c89a..56b06fdc5 100644 --- a/CoqOfRust/examples/default/examples/rust_book/traits/returning_traits_with_dyn.v +++ b/CoqOfRust/examples/default/examples/rust_book/traits/returning_traits_with_dyn.v @@ -143,7 +143,7 @@ Definition random_animal (ε : list Value.t) (τ : list Ty.t) (α : list Value.t [], [] |), - [ Value.StructTuple "returning_traits_with_dyn::Sheep" [] ] + [ Value.StructTuple "returning_traits_with_dyn::Sheep" [] [] [] ] |))) |))); fun γ => @@ -171,7 +171,7 @@ Definition random_animal (ε : list Value.t) (τ : list Ty.t) (α : list Value.t [], [] |), - [ Value.StructTuple "returning_traits_with_dyn::Cow" [] ] + [ Value.StructTuple "returning_traits_with_dyn::Cow" [] [] [] ] |)) |))) ] diff --git a/CoqOfRust/examples/default/examples/rust_book/traits/traits.v b/CoqOfRust/examples/default/examples/rust_book/traits/traits.v index 23f820e64..15ed61025 100644 --- a/CoqOfRust/examples/default/examples/rust_book/traits/traits.v +++ b/CoqOfRust/examples/default/examples/rust_book/traits/traits.v @@ -428,6 +428,8 @@ Module Impl_traits_Animal_for_traits_Sheep. (let name := M.alloc (| name |) in Value.StructRecord "traits::Sheep" + [] + [] [ ("name", M.read (| name |)); ("naked", Value.Bool false) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/calling_unsafe_functions.v b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/calling_unsafe_functions.v index 7eb138e32..61fbe5ea5 100644 --- a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/calling_unsafe_functions.v +++ b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/calling_unsafe_functions.v @@ -228,7 +228,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -267,7 +267,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inlateout_case_implemented.v b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inlateout_case_implemented.v index a61fbe20e..9388d378a 100644 --- a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inlateout_case_implemented.v +++ b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inlateout_case_implemented.v @@ -73,7 +73,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -103,7 +103,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inlateout_case_non_used.v b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inlateout_case_non_used.v index 41843b761..9876a03c0 100644 --- a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inlateout_case_non_used.v +++ b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inlateout_case_non_used.v @@ -82,7 +82,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -112,7 +112,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inout.v b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inout.v index c6cf4e0e6..7c7c12f35 100644 --- a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inout.v +++ b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inout.v @@ -72,7 +72,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -102,7 +102,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inputs_and_outputs.v b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inputs_and_outputs.v index 52aa4e46a..639ae7bbe 100644 --- a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inputs_and_outputs.v +++ b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inputs_and_outputs.v @@ -69,7 +69,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -99,7 +99,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inputs_and_outputs_another_example.v b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inputs_and_outputs_another_example.v index 365c22939..739dd7f82 100644 --- a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inputs_and_outputs_another_example.v +++ b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inputs_and_outputs_another_example.v @@ -77,7 +77,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -107,7 +107,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inputs_and_outputs_another_example_without_mov.v b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inputs_and_outputs_another_example_without_mov.v index 09e7cf384..ffcd33a04 100644 --- a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inputs_and_outputs_another_example_without_mov.v +++ b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_inputs_and_outputs_another_example_without_mov.v @@ -70,7 +70,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -100,7 +100,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_labels.v b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_labels.v index 17c398ada..4bf77f12b 100644 --- a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_labels.v +++ b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_labels.v @@ -80,7 +80,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -110,7 +110,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_options.v b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_options.v index 9c02ea739..221407098 100644 --- a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_options.v +++ b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_options.v @@ -77,7 +77,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -107,7 +107,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_register_template_modifiers.v b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_register_template_modifiers.v index 95c6f4571..151450819 100644 --- a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_register_template_modifiers.v +++ b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_register_template_modifiers.v @@ -72,7 +72,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -102,7 +102,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_scratch_register.v b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_scratch_register.v index 41896726a..8808aaca7 100644 --- a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_scratch_register.v +++ b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_scratch_register.v @@ -87,7 +87,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -117,7 +117,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/examples/default/examples/subtle.v b/CoqOfRust/examples/default/examples/subtle.v index e65b9dd85..4b3b4eec1 100644 --- a/CoqOfRust/examples/default/examples/subtle.v +++ b/CoqOfRust/examples/default/examples/subtle.v @@ -723,6 +723,8 @@ Module Impl_core_convert_From_u8_for_subtle_Choice. (let input := M.alloc (| input |) in Value.StructTuple "subtle::Choice" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -4001,6 +4003,8 @@ Module Impl_subtle_ConditionallySelectable_for_subtle_Choice. let choice := M.alloc (| choice |) in Value.StructTuple "subtle::Choice" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -4163,6 +4167,8 @@ Module Impl_core_clone_Clone_where_core_clone_Clone_T_for_subtle_CtOption_T. (let self := M.alloc (| self |) in Value.StructRecord "subtle::CtOption" + [] + [ T ] [ ("value", M.call_closure (| @@ -4379,6 +4385,8 @@ Module Impl_core_convert_From_subtle_CtOption_T_for_core_option_Option_T. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ T ] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -4390,7 +4398,8 @@ Module Impl_core_convert_From_subtle_CtOption_T_for_core_option_Option_T. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))) ] |) |))) @@ -4427,6 +4436,8 @@ Module Impl_subtle_CtOption_T. let is_some := M.alloc (| is_some |) in Value.StructRecord "subtle::CtOption" + [] + [ T ] [ ("value", M.read (| value |)); ("is_some", M.read (| is_some |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4523,7 +4534,7 @@ Module Impl_subtle_CtOption_T. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -4555,6 +4566,8 @@ Module Impl_subtle_CtOption_T. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::fmt::Arguments" ] [ M.call_closure (| Ty.path "core::fmt::Arguments", @@ -4725,7 +4738,7 @@ Module Impl_subtle_CtOption_T. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -4755,7 +4768,11 @@ Module Impl_subtle_CtOption_T. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/links/M.v b/CoqOfRust/links/M.v index 091d4cf4f..25d2b670a 100644 --- a/CoqOfRust/links/M.v +++ b/CoqOfRust/links/M.v @@ -1140,16 +1140,16 @@ Defined. Ltac run_symbolic_pure := ( eapply Run.PureSuccess; - repeat smpl of_value + repeat (smpl of_value || reflexivity) ) || ( eapply Run.PureException; repeat smpl of_output; - repeat smpl of_value + repeat (smpl of_value || reflexivity) ). Ltac run_symbolic_state_alloc_immediate := - unshelve eapply Run.CallPrimitiveStateAllocImmediate; [now repeat smpl of_value |]. + unshelve eapply Run.CallPrimitiveStateAllocImmediate; [now repeat (smpl of_value || smpl of_ty) |]. Ltac run_symbolic_state_read := eapply Run.CallPrimitiveStateRead; @@ -1185,7 +1185,7 @@ Ltac as_of_values elements := | ?element :: ?elements => let elements := as_of_values elements in constr:( - (let value := OfValue.get_value (value' := element) ltac:(repeat smpl of_value) in + (let value := OfValue.get_value (value' := element) ltac:(repeat (smpl of_value || reflexivity)) in φ value) :: elements ) @@ -1208,7 +1208,7 @@ Ltac prepare_call_f f := let e' := prepare_call_f e in let x := fresh "x" in let const' := constr:( - let x := OfValue.get_value (value' := const) ltac:(repeat smpl of_value) in + let x := OfValue.get_value (value' := const) ltac:(repeat (smpl of_value || reflexivity)) in φ x ) in let const' := eval cbn in const' in @@ -1427,19 +1427,19 @@ Ltac run_symbolic := Axiom is_discriminant_tuple_eq : forall (kind : IntegerKind.t) - (variant_name : string) (fields : list Value.t) + (variant_name : string) (consts : list Value.t) (tys : list Ty.t) (fields : list Value.t) (discriminant : Z), M.IsDiscriminant variant_name discriminant -> - M.cast (Φ (Integer.t kind)) (Value.StructTuple variant_name fields) = + M.cast (Φ (Integer.t kind)) (Value.StructTuple variant_name consts tys fields) = Value.Integer kind (Integer.normalize_wrap kind discriminant). Axiom is_discriminant_record_eq : forall (kind : IntegerKind.t) - (variant_name : string) (fields : list (string * Value.t)) + (variant_name : string) (consts : list Value.t) (tys : list Ty.t) (fields : list (string * Value.t)) (discriminant : Z), M.IsDiscriminant variant_name discriminant -> - M.cast (Φ (Integer.t kind)) (Value.StructRecord variant_name fields) = + M.cast (Φ (Integer.t kind)) (Value.StructRecord variant_name consts tys fields) = Value.Integer kind (Integer.normalize_wrap kind discriminant). Module Function1. diff --git a/CoqOfRust/move_sui/translations/move_abstract_stack/lib.v b/CoqOfRust/move_sui/translations/move_abstract_stack/lib.v index 1e236c6a1..050481577 100644 --- a/CoqOfRust/move_sui/translations/move_abstract_stack/lib.v +++ b/CoqOfRust/move_sui/translations/move_abstract_stack/lib.v @@ -29,6 +29,8 @@ Module Impl_core_default_Default_where_core_default_Default_T_for_move_abstract_ ltac:(M.monadic (Value.StructRecord "move_abstract_stack::AbstractStack" + [] + [ T ] [ ("values", M.call_closure (| @@ -172,6 +174,8 @@ Module Impl_move_abstract_stack_AbstractStack_T. ltac:(M.monadic (Value.StructRecord "move_abstract_stack::AbstractStack" + [] + [ T ] [ ("values", M.call_closure (| @@ -942,7 +946,11 @@ Module Impl_move_abstract_stack_AbstractStack_T. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_abstract_stack::AbsStackError" ] + [ Value.Tuple [] ] |) |) |) @@ -1208,7 +1216,11 @@ Module Impl_move_abstract_stack_AbstractStack_T. ] |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_abstract_stack::AbsStackError" ] + [ Value.Tuple [] ] |))) ] |) @@ -1384,10 +1396,14 @@ Module Impl_move_abstract_stack_AbstractStack_T. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ T; Ty.path "move_abstract_stack::AbsStackError" ] [ Value.StructTuple "move_abstract_stack::AbsStackError::Underflow" [] + [] + [] ] |) |) @@ -1574,10 +1590,14 @@ Module Impl_move_abstract_stack_AbstractStack_T. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ T; Ty.path "move_abstract_stack::AbsStackError" ] [ Value.StructTuple "move_abstract_stack::AbsStackError::ElementNotEqual" [] + [] + [] ] |) |) @@ -1699,7 +1719,11 @@ Module Impl_move_abstract_stack_AbstractStack_T. |) |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| ret |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ T; Ty.path "move_abstract_stack::AbsStackError" ] + [ M.read (| ret |) ] |))) ] |) @@ -1815,10 +1839,14 @@ Module Impl_move_abstract_stack_AbstractStack_T. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_abstract_stack::AbsStackError" ] [ Value.StructTuple "move_abstract_stack::AbsStackError::Underflow" [] + [] + [] ] |) |) @@ -2204,7 +2232,13 @@ Module Impl_move_abstract_stack_AbstractStack_T. |) |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_abstract_stack::AbsStackError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_binary_format/binary_config.v b/CoqOfRust/move_sui/translations/move_binary_format/binary_config.v index 4e3a2366e..557abd71f 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/binary_config.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/binary_config.v @@ -37,6 +37,8 @@ Module binary_config. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::binary_config::TableConfig" + [] + [] [ ("module_handles", M.call_closure (| @@ -849,6 +851,8 @@ Module binary_config. ltac:(M.monadic (Value.StructRecord "move_binary_format::binary_config::TableConfig" + [] + [] [ ("module_handles", M.read (| get_associated_constant (| Ty.path "u16", "MAX", Ty.path "u16" |) |)); @@ -911,6 +915,8 @@ Module binary_config. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::binary_config::BinaryConfig" + [] + [] [ ("max_binary_format_version", M.call_closure (| @@ -1131,6 +1137,8 @@ Module binary_config. let table_config := M.alloc (| table_config |) in Value.StructRecord "move_binary_format::binary_config::BinaryConfig" + [] + [] [ ("max_binary_format_version", M.read (| max_binary_format_version |)); ("check_no_extraneous_bytes", M.read (| check_no_extraneous_bytes |)); @@ -1160,6 +1168,8 @@ Module binary_config. let check_no_extraneous_bytes := M.alloc (| check_no_extraneous_bytes |) in Value.StructRecord "move_binary_format::binary_config::BinaryConfig" + [] + [] [ ("max_binary_format_version", M.read (| max_binary_format_version |)); ("check_no_extraneous_bytes", M.read (| check_no_extraneous_bytes |)); @@ -1202,6 +1212,8 @@ Module binary_config. (let check_no_extraneous_bytes := M.alloc (| check_no_extraneous_bytes |) in Value.StructRecord "move_binary_format::binary_config::BinaryConfig" + [] + [] [ ("max_binary_format_version", M.read (| @@ -1246,6 +1258,8 @@ Module binary_config. ltac:(M.monadic (Value.StructRecord "move_binary_format::binary_config::BinaryConfig" + [] + [] [ ("max_binary_format_version", M.read (| diff --git a/CoqOfRust/move_sui/translations/move_binary_format/check_bounds.v b/CoqOfRust/move_sui/translations/move_binary_format/check_bounds.v index ec5cd7a7f..3c9fa7bcd 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/check_bounds.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/check_bounds.v @@ -80,11 +80,15 @@ Module check_bounds. M.alloc (| Value.StructRecord "move_binary_format::check_bounds::BoundsChecker" + [] + [] [ ("module", M.read (| module |)); ("context", Value.StructTuple "move_binary_format::check_bounds::BoundsCheckingContext::Module" + [] + [] []) ] |) in @@ -174,9 +178,13 @@ Module check_bounds. [ Value.StructTuple "move_core_types::vm_status::StatusCode::NO_MODULE_HANDLES" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::ModuleHandle" + [] + [] []; Value.Integer IntegerKind.U16 0 ] @@ -185,6 +193,11 @@ Module check_bounds. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| status |) ] |) |) @@ -1875,7 +1888,13 @@ Module check_bounds. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2168,7 +2187,13 @@ Module check_bounds. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2466,7 +2491,13 @@ Module check_bounds. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2764,7 +2795,13 @@ Module check_bounds. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3062,7 +3099,13 @@ Module check_bounds. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3358,7 +3401,13 @@ Module check_bounds. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3656,7 +3705,13 @@ Module check_bounds. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3966,7 +4021,13 @@ Module check_bounds. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4274,7 +4335,13 @@ Module check_bounds. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4579,7 +4646,13 @@ Module check_bounds. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4877,7 +4950,13 @@ Module check_bounds. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5249,7 +5328,13 @@ Module check_bounds. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7252,7 +7337,13 @@ Module check_bounds. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7673,6 +7764,11 @@ Module check_bounds. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -7685,9 +7781,13 @@ Module check_bounds. [ Value.StructTuple "move_core_types::vm_status::StatusCode::INDEX_OUT_OF_BOUNDS" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::MemberCount" + [] + [] []; M.read (| M.SubPointer.get_struct_record_field (| @@ -7710,7 +7810,13 @@ Module check_bounds. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -8766,7 +8872,13 @@ Module check_bounds. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -9831,7 +9943,13 @@ Module check_bounds. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -9910,9 +10028,13 @@ Module check_bounds. |), Value.StructTuple "move_binary_format::check_bounds::BoundsCheckingContext::ModuleFunction" + [] + [] [ Value.StructTuple "move_binary_format::file_format::FunctionDefinitionIndex" + [] + [] [ M.cast (Ty.path "u16") (M.read (| function_def_idx |)) ] ] |) @@ -10415,7 +10537,14 @@ Module check_bounds. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ Value.Tuple [] ] |) |) |) @@ -10527,6 +10656,11 @@ Module check_bounds. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -10538,9 +10672,13 @@ Module check_bounds. [ Value.StructTuple "move_core_types::vm_status::StatusCode::INDEX_OUT_OF_BOUNDS" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::FunctionDefinition" + [] + [] []; M.cast (Ty.path "u16") (M.read (| function_def_idx |)) ] @@ -10724,6 +10862,11 @@ Module check_bounds. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -10735,9 +10878,13 @@ Module check_bounds. [ Value.StructTuple "move_core_types::vm_status::StatusCode::INDEX_OUT_OF_BOUNDS" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::FunctionDefinition" + [] + [] []; M.cast (Ty.path "u16") (M.read (| function_def_idx |)) ] @@ -11502,6 +11649,11 @@ Module check_bounds. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -11513,9 +11665,13 @@ Module check_bounds. [ Value.StructTuple "move_core_types::vm_status::StatusCode::TOO_MANY_LOCALS" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::FunctionDefinition" + [] + [] []; M.cast (Ty.path "u16") (M.read (| index |)) ] @@ -15602,6 +15758,12 @@ Module check_bounds. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -15624,9 +15786,13 @@ Module check_bounds. |); Value.StructTuple "move_core_types::vm_status::StatusCode::INDEX_OUT_OF_BOUNDS" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::CodeDefinition" + [] + [] []; M.read (| offset @@ -15771,6 +15937,12 @@ Module check_bounds. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -15793,9 +15965,13 @@ Module check_bounds. |); Value.StructTuple "move_core_types::vm_status::StatusCode::INDEX_OUT_OF_BOUNDS" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::LocalPool" + [] + [] []; M.read (| idx @@ -17025,7 +17201,13 @@ Module check_bounds. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -17681,6 +17863,12 @@ Module check_bounds. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -17707,6 +17895,8 @@ Module check_bounds. Value.StructTuple "move_core_types::vm_status::StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH" [] + [] + [] ] |); M.call_closure (| @@ -18317,6 +18507,12 @@ Module check_bounds. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -18343,6 +18539,8 @@ Module check_bounds. Value.StructTuple "move_core_types::vm_status::StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH" [] + [] + [] ] |); M.call_closure (| @@ -18580,7 +18778,13 @@ Module check_bounds. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -18789,6 +18993,12 @@ Module check_bounds. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -18801,9 +19011,13 @@ Module check_bounds. [ Value.StructTuple "move_core_types::vm_status::StatusCode::INDEX_OUT_OF_BOUNDS" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::TypeParameter" + [] + [] []; M.read (| M.deref (| @@ -18980,7 +19194,13 @@ Module check_bounds. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -19085,6 +19305,8 @@ Module check_bounds. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -19098,6 +19320,8 @@ Module check_bounds. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); Value.StructTuple "move_core_types::vm_status::StatusCode::INDEX_OUT_OF_BOUNDS" + [] + [] []; M.read (| get_constant (| @@ -19114,7 +19338,13 @@ Module check_bounds. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))) + (M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))) ] |) |))) @@ -19261,6 +19491,19 @@ Module check_bounds. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] + ]; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.borrow (| Pointer.Kind.Ref, @@ -19316,6 +19559,19 @@ Module check_bounds. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] + ]; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -19323,8 +19579,10 @@ Module check_bounds. [ Value.StructTuple "move_core_types::vm_status::StatusCode::INDEX_OUT_OF_BOUNDS" + [] + [] []; - Value.StructTuple "move_binary_format::IndexKind::Signature" []; + Value.StructTuple "move_binary_format::IndexKind::Signature" [] [] []; M.cast (Ty.path "u16") (M.call_closure (| @@ -19579,6 +19837,8 @@ Module check_bounds. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.read (| msg |) @@ -19701,6 +19961,8 @@ Module check_bounds. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -19708,6 +19970,8 @@ Module check_bounds. [ Value.StructTuple "move_core_types::vm_status::StatusCode::INDEX_OUT_OF_BOUNDS" + [] + [] []; M.read (| get_constant (| @@ -19723,7 +19987,13 @@ Module check_bounds. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))) + (M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))) ] |) |))) diff --git a/CoqOfRust/move_sui/translations/move_binary_format/compatibility.v b/CoqOfRust/move_sui/translations/move_binary_format/compatibility.v index 1215bc0dc..7e5f8e68a 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/compatibility.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/compatibility.v @@ -538,6 +538,8 @@ Module compatibility. ltac:(M.monadic (Value.StructRecord "move_binary_format::compatibility::Compatibility" + [] + [] [ ("check_struct_and_pub_function_linking", Value.Bool true); ("check_struct_layout", Value.Bool true); @@ -616,6 +618,8 @@ Module compatibility. ltac:(M.monadic (Value.StructRecord "move_binary_format::compatibility::Compatibility" + [] + [] [ ("check_struct_and_pub_function_linking", Value.Bool false); ("check_struct_layout", Value.Bool false); @@ -1834,6 +1838,8 @@ Module compatibility. Value.StructTuple "move_binary_format::file_format::Visibility::Private" [] + [] + [] |) |) ] @@ -2656,6 +2662,11 @@ Module compatibility. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -2669,6 +2680,8 @@ Module compatibility. Value.StructTuple "move_core_types::vm_status::StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE" [] + [] + [] ] |) ] @@ -2708,6 +2721,11 @@ Module compatibility. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -2721,6 +2739,8 @@ Module compatibility. Value.StructTuple "move_core_types::vm_status::StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE" [] + [] + [] ] |) ] @@ -2760,6 +2780,11 @@ Module compatibility. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -2773,6 +2798,8 @@ Module compatibility. Value.StructTuple "move_core_types::vm_status::StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE" [] + [] + [] ] |) ] @@ -2812,6 +2839,11 @@ Module compatibility. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -2825,6 +2857,8 @@ Module compatibility. Value.StructTuple "move_core_types::vm_status::StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE" [] + [] + [] ] |) ] @@ -2835,7 +2869,13 @@ Module compatibility. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3738,6 +3778,8 @@ Module compatibility. Value.StructTuple "move_binary_format::compatibility::InclusionCheck::Subset" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -3751,6 +3793,8 @@ Module compatibility. Value.StructTuple "move_binary_format::compatibility::InclusionCheck::Equal" [] + [] + [] |))) ] |) @@ -4142,6 +4186,8 @@ Module compatibility. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -4155,6 +4201,8 @@ Module compatibility. Value.StructTuple "move_core_types::vm_status::StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE" [] + [] + [] ] |) ] @@ -4312,6 +4360,8 @@ Module compatibility. Value.StructTuple "move_binary_format::compatibility::InclusionCheck::Equal" [] + [] + [] |) |) |) @@ -5150,7 +5200,13 @@ Module compatibility. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_binary_format/constant.v b/CoqOfRust/move_sui/translations/move_binary_format/constant.v index dab802a4c..b41ab4035 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/constant.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/constant.v @@ -58,10 +58,14 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_core_types::runtime_value::MoveTypeLayout" ] [ Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::Signer" [] + [] + [] ] |))); fun γ => @@ -75,10 +79,14 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_core_types::runtime_value::MoveTypeLayout" ] [ Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::Address" [] + [] + [] ] |))); fun γ => @@ -92,10 +100,14 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_core_types::runtime_value::MoveTypeLayout" ] [ Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::Bool" [] + [] + [] ] |))); fun γ => @@ -109,10 +121,14 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_core_types::runtime_value::MoveTypeLayout" ] [ Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::U8" [] + [] + [] ] |))); fun γ => @@ -126,10 +142,14 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_core_types::runtime_value::MoveTypeLayout" ] [ Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::U16" [] + [] + [] ] |))); fun γ => @@ -143,10 +163,14 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_core_types::runtime_value::MoveTypeLayout" ] [ Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::U32" [] + [] + [] ] |))); fun γ => @@ -160,10 +184,14 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_core_types::runtime_value::MoveTypeLayout" ] [ Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::U64" [] + [] + [] ] |))); fun γ => @@ -177,10 +205,14 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_core_types::runtime_value::MoveTypeLayout" ] [ Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::U128" [] + [] + [] ] |))); fun γ => @@ -194,10 +226,14 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_core_types::runtime_value::MoveTypeLayout" ] [ Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::U256" [] + [] + [] ] |))); fun γ => @@ -213,9 +249,13 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_core_types::runtime_value::MoveTypeLayout" ] [ Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -460,7 +500,13 @@ Module constant. match γ with | [] => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_core_types::runtime_value::MoveTypeLayout" ] + [] + |))) | _ => M.impossible "wrong number of arguments" end) |))) @@ -528,10 +574,14 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::Address" [] + [] + [] ] |))); fun γ => @@ -545,10 +595,14 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::Signer" [] + [] + [] ] |))); fun γ => @@ -562,10 +616,14 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::U8" [] + [] + [] ] |))); fun γ => @@ -579,10 +637,14 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::U16" [] + [] + [] ] |))); fun γ => @@ -596,10 +658,14 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::U32" [] + [] + [] ] |))); fun γ => @@ -613,10 +679,14 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::U64" [] + [] + [] ] |))); fun γ => @@ -630,10 +700,14 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::U128" [] + [] + [] ] |))); fun γ => @@ -647,10 +721,14 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::U256" [] + [] + [] ] |))); fun γ => @@ -666,9 +744,13 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -863,7 +945,13 @@ Module constant. "move_core_types::runtime_value::MoveTypeLayout::Struct", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] + [] + |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in @@ -875,10 +963,14 @@ Module constant. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::Bool" [] + [] + [] ] |))) ] @@ -918,9 +1010,13 @@ Module constant. ltac:(M.monadic (Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_binary_format::file_format::Constant" ] [ Value.StructRecord "move_binary_format::file_format::Constant" + [] + [] [ ("type_", M.read (| diff --git a/CoqOfRust/move_sui/translations/move_binary_format/control_flow_graph.v b/CoqOfRust/move_sui/translations/move_binary_format/control_flow_graph.v index 89392f58b..f1f602f16 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/control_flow_graph.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/control_flow_graph.v @@ -703,6 +703,8 @@ Module control_flow_graph. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -898,6 +900,8 @@ Module control_flow_graph. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -1106,6 +1110,8 @@ Module control_flow_graph. M.alloc (| Value.StructRecord "move_binary_format::control_flow_graph::BasicBlock" + [] + [] [ ("exit", M.read (| exit |)); ("successors", M.read (| successors |)) @@ -1242,7 +1248,7 @@ Module control_flow_graph. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -1272,7 +1278,11 @@ Module control_flow_graph. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -1607,6 +1617,8 @@ Module control_flow_graph. Value.StructTuple "move_binary_format::control_flow_graph::new::Exploration::InProgress" [] + [] + [] ] |) |) in @@ -2151,6 +2163,8 @@ Module control_flow_graph. Value.StructTuple "move_binary_format::control_flow_graph::new::Exploration::Done" [] + [] + [] ] |) |) in @@ -2502,6 +2516,8 @@ Module control_flow_graph. M.alloc (| Value.StructRecord "move_binary_format::control_flow_graph::VMControlFlowGraph" + [] + [] [ ("blocks", M.read (| blocks |)); ("traversal_successors", M.read (| traversal_successors |)); @@ -2776,10 +2792,20 @@ Module control_flow_graph. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; - Value.StructTuple "core::fmt::rt::Count::Implied" []; - Value.StructTuple "core::fmt::rt::Count::Implied" [] + Value.StructTuple + "core::fmt::rt::Count::Implied" + [] + [] + []; + Value.StructTuple + "core::fmt::rt::Count::Implied" + [] + [] + [] ] |) ] diff --git a/CoqOfRust/move_sui/translations/move_binary_format/deserializer.v b/CoqOfRust/move_sui/translations/move_binary_format/deserializer.v index dcbf5c32c..69a37f25a 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/deserializer.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/deserializer.v @@ -337,7 +337,16 @@ Module deserializer. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| module |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::CompiledModule"; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ M.read (| module |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -432,6 +441,8 @@ Module deserializer. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::deserializer::Table" + [] + [] [ ("kind", M.call_closure (| @@ -642,6 +653,8 @@ Module deserializer. let count := M.alloc (| count |) in Value.StructRecord "move_binary_format::deserializer::Table" + [] + [] [ ("kind", M.read (| kind |)); ("offset", M.read (| offset |)); @@ -800,6 +813,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::BAD_U16" [] + [] + [] ] |))) ] @@ -877,6 +892,8 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u16"; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "u16", @@ -1040,6 +1057,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::BAD_U32" [] + [] + [] ] |))) ] @@ -1117,6 +1136,8 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u32"; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "u32", @@ -1280,6 +1301,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::BAD_U64" [] + [] + [] ] |))) ] @@ -1357,6 +1380,8 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u64"; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "u64", @@ -1520,6 +1545,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::BAD_U128" [] + [] + [] ] |))) ] @@ -1597,6 +1624,8 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u128"; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "u128", @@ -1765,6 +1794,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::BAD_U256" [] + [] + [] ] |))) ] @@ -1842,6 +1873,11 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::u256::U256"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_core_types::u256::U256", @@ -2019,6 +2055,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -2131,6 +2169,8 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ T; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -2153,6 +2193,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -2331,6 +2373,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.read (| msg |) @@ -2379,9 +2423,16 @@ Module deserializer. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::SignatureIndex"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format::SignatureIndex" + [] + [] [ M.read (| M.match_operator (| @@ -2547,9 +2598,16 @@ Module deserializer. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::ModuleHandleIndex"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format::ModuleHandleIndex" + [] + [] [ M.read (| M.match_operator (| @@ -2717,9 +2775,16 @@ Module deserializer. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::IdentifierIndex"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format::IdentifierIndex" + [] + [] [ M.read (| M.match_operator (| @@ -2885,9 +2950,16 @@ Module deserializer. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::StructHandleIndex"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format::StructHandleIndex" + [] + [] [ M.read (| M.match_operator (| @@ -3061,9 +3133,16 @@ Module deserializer. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::AddressIdentifierIndex"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format::AddressIdentifierIndex" + [] + [] [ M.read (| M.match_operator (| @@ -3233,9 +3312,16 @@ Module deserializer. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::StructDefinitionIndex"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format::StructDefinitionIndex" + [] + [] [ M.read (| M.match_operator (| @@ -3403,9 +3489,16 @@ Module deserializer. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::FunctionHandleIndex"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format::FunctionHandleIndex" + [] + [] [ M.read (| M.match_operator (| @@ -3573,9 +3666,16 @@ Module deserializer. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::FieldHandleIndex"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format::FieldHandleIndex" + [] + [] [ M.read (| M.match_operator (| @@ -3745,9 +3845,16 @@ Module deserializer. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::FieldInstantiationIndex"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format::FieldInstantiationIndex" + [] + [] [ M.read (| M.match_operator (| @@ -3915,9 +4022,16 @@ Module deserializer. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::FunctionInstantiationIndex"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format::FunctionInstantiationIndex" + [] + [] [ M.read (| M.match_operator (| @@ -4087,9 +4201,16 @@ Module deserializer. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::StructDefInstantiationIndex"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format::StructDefInstantiationIndex" + [] + [] [ M.read (| M.match_operator (| @@ -4257,9 +4378,16 @@ Module deserializer. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::ConstantPoolIndex"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format::ConstantPoolIndex" + [] + [] [ M.read (| M.match_operator (| @@ -5475,6 +5603,11 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_binary_format::file_format::CompiledModule"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -5488,6 +5621,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::TRAILING_BYTES" [] + [] + [] ] |) ] @@ -5498,7 +5633,16 @@ Module deserializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| module |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::CompiledModule"; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ M.read (| module |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5556,6 +5700,8 @@ Module deserializer. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "u8" ] [ ("start", Value.Integer IntegerKind.U8 0); ("end_", M.read (| table_count |)) @@ -5786,7 +5932,13 @@ Module deserializer. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5870,6 +6022,11 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_binary_format::deserializer::Table"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -5892,6 +6049,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -6151,6 +6310,11 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::deserializer::Table"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::deserializer::Table", @@ -6679,6 +6843,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u32"; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -6694,6 +6864,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::BAD_HEADER_TABLE" [] + [] + [] ] |) ] @@ -6741,6 +6913,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u32"; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -6756,6 +6934,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::BAD_HEADER_TABLE" [] + [] + [] ] |) ] @@ -6823,6 +7003,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u32"; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -6838,6 +7024,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::BAD_HEADER_TABLE" [] + [] + [] ] |) ] @@ -6902,6 +7090,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u32"; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -6917,6 +7111,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_TABLE" [] + [] + [] ] |) ] @@ -6959,6 +7155,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u32"; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -6974,6 +7176,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::BAD_HEADER_TABLE" [] + [] + [] ] |) ] @@ -6991,7 +7195,11 @@ Module deserializer. ] |)) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| current_offset |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "u32"; Ty.path "move_binary_format::errors::PartialVMError" ] + [ M.read (| current_offset |) ] |) |))) |))) @@ -7563,7 +7771,13 @@ Module deserializer. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -8221,6 +8435,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -8247,6 +8467,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -8763,6 +8985,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -8789,6 +9017,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -9305,6 +9535,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -9331,6 +9567,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -9847,6 +10085,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -9873,6 +10117,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -10387,6 +10633,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -10413,6 +10665,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -10927,6 +11181,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -10953,6 +11213,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -11270,6 +11532,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -11296,6 +11564,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -11926,6 +12196,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -11952,6 +12228,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -12468,6 +12746,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -12494,6 +12778,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -12837,6 +13123,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -12863,6 +13155,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -12909,7 +13203,11 @@ Module deserializer. ] |)) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] |))) ] |) @@ -13503,6 +13801,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -13529,6 +13833,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -14018,6 +14324,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -14044,6 +14356,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -14533,6 +14847,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -14559,6 +14879,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -15048,6 +15370,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -15074,6 +15402,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -15563,6 +15893,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -15589,6 +15925,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -16078,6 +16416,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -16104,6 +16448,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -16437,7 +16783,11 @@ Module deserializer. ] |)) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] |))) ] |) @@ -16878,6 +17228,8 @@ Module deserializer. |); Value.StructRecord "move_binary_format::file_format::ModuleHandle" + [] + [] [ ("address", M.read (| address |)); ("name", M.read (| name |)) @@ -16900,7 +17252,13 @@ Module deserializer. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -17383,6 +17741,8 @@ Module deserializer. Value.StructTuple "move_binary_format::deserializer::AbilitySetPosition::StructHandle" [] + [] + [] ] |) ] @@ -17651,6 +18011,8 @@ Module deserializer. |); Value.StructRecord "move_binary_format::file_format::StructHandle" + [] + [] [ ("module", M.read (| module |)); ("name", M.read (| name |)); @@ -17675,7 +18037,13 @@ Module deserializer. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -18470,6 +18838,8 @@ Module deserializer. Value.StructTuple "move_binary_format::deserializer::AbilitySetPosition::FunctionTypeParameters" [] + [] + [] ] |) ] @@ -18565,6 +18935,8 @@ Module deserializer. |); Value.StructRecord "move_binary_format::file_format::FunctionHandle" + [] + [] [ ("module", M.read (| module |)); ("name", M.read (| name |)); @@ -18590,7 +18962,13 @@ Module deserializer. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -19031,6 +19409,8 @@ Module deserializer. |); Value.StructRecord "move_binary_format::file_format::StructDefInstantiation" + [] + [] [ ("def", M.read (| def |)); ("type_parameters", M.read (| type_parameters |)) @@ -19053,7 +19433,13 @@ Module deserializer. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -19497,6 +19883,8 @@ Module deserializer. |); Value.StructRecord "move_binary_format::file_format::FunctionInstantiation" + [] + [] [ ("handle", M.read (| handle |)); ("type_parameters", M.read (| type_parameters |)) @@ -19519,7 +19907,13 @@ Module deserializer. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -19925,6 +20319,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -19951,6 +20351,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -20128,6 +20530,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -20276,7 +20680,13 @@ Module deserializer. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -20386,6 +20796,11 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -20408,6 +20823,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -20459,6 +20876,8 @@ Module deserializer. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -20678,6 +21097,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -20704,6 +21129,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -20794,7 +21221,13 @@ Module deserializer. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -21111,7 +21544,13 @@ Module deserializer. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -21438,9 +21877,16 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::Constant"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructRecord "move_binary_format::file_format::Constant" + [] + [] [ ("type_", M.read (| type_ |)); ("data", M.read (| data |)) ] ] |) @@ -21757,7 +22203,13 @@ Module deserializer. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -22125,9 +22577,16 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::metadata::Metadata"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructRecord "move_core_types::metadata::Metadata" + [] + [] [ ("key", M.read (| key |)); ("value", M.read (| value |)) ] ] |) @@ -22494,6 +22953,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -22620,6 +23081,14 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ Ty.path "u8"; Ty.path "alloc::alloc::Global" ]; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -22642,6 +23111,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -22672,7 +23143,19 @@ Module deserializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| data |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ Ty.path "u8"; Ty.path "alloc::alloc::Global" ]; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ M.read (| data |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -22841,6 +23324,8 @@ Module deserializer. |); Value.StructTuple "move_binary_format::file_format::Signature" + [] + [] [ M.read (| M.match_operator (| @@ -23024,7 +23509,13 @@ Module deserializer. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -23249,6 +23740,8 @@ Module deserializer. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "u64" ] [ ("start", Value.Integer IntegerKind.U64 0); ("end_", M.read (| len |)) ] ] @@ -23494,7 +23987,22 @@ Module deserializer. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| tokens |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path "move_binary_format::file_format::SignatureToken"; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ M.read (| tokens |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -23994,6 +24502,13 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_binary_format::deserializer::load_signature_token::TypeBuilder"; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -24020,6 +24535,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -24177,6 +24694,13 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "move_binary_format::deserializer::load_signature_token::TypeBuilder"; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| M.match_operator (| @@ -24337,10 +24861,14 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::deserializer::load_signature_token::TypeBuilder::Saturated" + [] + [] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::Bool" [] + [] + [] ] |))); fun γ => @@ -24353,10 +24881,14 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::deserializer::load_signature_token::TypeBuilder::Saturated" + [] + [] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::U8" [] + [] + [] ] |))); fun γ => @@ -24369,10 +24901,14 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::deserializer::load_signature_token::TypeBuilder::Saturated" + [] + [] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::U16" [] + [] + [] ] |))); fun γ => @@ -24385,10 +24921,14 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::deserializer::load_signature_token::TypeBuilder::Saturated" + [] + [] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::U32" [] + [] + [] ] |))); fun γ => @@ -24401,10 +24941,14 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::deserializer::load_signature_token::TypeBuilder::Saturated" + [] + [] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::U64" [] + [] + [] ] |))); fun γ => @@ -24417,10 +24961,14 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::deserializer::load_signature_token::TypeBuilder::Saturated" + [] + [] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::U128" [] + [] + [] ] |))); fun γ => @@ -24433,10 +24981,14 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::deserializer::load_signature_token::TypeBuilder::Saturated" + [] + [] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::U256" [] + [] + [] ] |))); fun γ => @@ -24449,10 +25001,14 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::deserializer::load_signature_token::TypeBuilder::Saturated" + [] + [] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::Address" [] + [] + [] ] |))); fun γ => @@ -24465,10 +25021,14 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::deserializer::load_signature_token::TypeBuilder::Saturated" + [] + [] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::Signer" [] + [] + [] ] |))); fun γ => @@ -24482,6 +25042,8 @@ Module deserializer. Value.StructTuple "move_binary_format::deserializer::load_signature_token::TypeBuilder::Vector" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -24494,6 +25056,8 @@ Module deserializer. Value.StructTuple "move_binary_format::deserializer::load_signature_token::TypeBuilder::Reference" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -24506,6 +25070,8 @@ Module deserializer. Value.StructTuple "move_binary_format::deserializer::load_signature_token::TypeBuilder::MutableReference" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -24682,9 +25248,13 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::deserializer::load_signature_token::TypeBuilder::Saturated" + [] + [] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::Struct" + [] + [] [ M.read (| sh_idx |) ] ] |))); @@ -25057,6 +25627,13 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_binary_format::deserializer::load_signature_token::TypeBuilder"; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -25083,6 +25660,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -25126,6 +25705,8 @@ Module deserializer. M.alloc (| Value.StructRecord "move_binary_format::deserializer::load_signature_token::TypeBuilder::StructInst" + [] + [] [ ("sh_idx", M.read (| sh_idx |)); ("arity", M.read (| arity |)); @@ -25326,9 +25907,13 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::deserializer::load_signature_token::TypeBuilder::Saturated" + [] + [] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::TypeParameter" + [] + [] [ M.read (| idx |) ] ] |))) @@ -25342,6 +25927,13 @@ Module deserializer. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_binary_format::deserializer::load_signature_token::TypeBuilder"; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -25368,6 +25960,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -25582,7 +26176,14 @@ Module deserializer. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| tok |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::SignatureToken"; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ M.read (| tok |) ] |) |) |) @@ -25714,6 +26315,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_binary_format::file_format::SignatureToken"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -25740,6 +26347,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -26040,6 +26649,13 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "move_binary_format::file_format::SignatureToken"; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| tok |) ] |) |) @@ -26361,9 +26977,13 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::deserializer::load_signature_token::TypeBuilder::Saturated" + [] + [] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -26400,9 +27020,13 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::deserializer::load_signature_token::TypeBuilder::Saturated" + [] + [] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::Reference" + [] + [] [ M.call_closure (| Ty.apply @@ -26439,9 +27063,13 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::deserializer::load_signature_token::TypeBuilder::Saturated" + [] + [] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::MutableReference" + [] + [] [ M.call_closure (| Ty.apply @@ -26555,9 +27183,13 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::deserializer::load_signature_token::TypeBuilder::Saturated" + [] + [] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::StructInstantiation" + [] + [] [ M.call_closure (| Ty.apply @@ -26616,6 +27248,8 @@ Module deserializer. (M.alloc (| Value.StructRecord "move_binary_format::deserializer::load_signature_token::TypeBuilder::StructInst" + [] + [] [ ("sh_idx", M.read (| sh_idx |)); ("arity", M.read (| arity |)); @@ -27085,6 +27719,11 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_binary_format::file_format::AbilitySet"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -27111,6 +27750,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -27166,6 +27807,11 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::AbilitySet"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| M.match_operator (| @@ -27362,11 +28008,15 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Ability::Store" [] + [] + [] ] |); Value.StructTuple "move_binary_format::file_format::Ability::Key" [] + [] + [] ] |) |))); @@ -27441,16 +28091,22 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Ability::Store" [] + [] + [] ] |); Value.StructTuple "move_binary_format::file_format::Ability::Copy" [] + [] + [] ] |); Value.StructTuple "move_binary_format::file_format::Ability::Drop" [] + [] + [] ] |) |))) @@ -27708,11 +28364,15 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Ability::Copy" [] + [] + [] ] |); Value.StructTuple "move_binary_format::file_format::Ability::Drop" [] + [] + [] ] |) |))); @@ -27753,6 +28413,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Ability::Key" [] + [] + [] ] |) |))) @@ -27762,6 +28424,11 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::AbilitySet"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| M.match_operator (| @@ -27827,6 +28494,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Ability::Store" [] + [] + [] ] |) |))); @@ -28039,6 +28708,11 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::AbilitySet"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| abilities |) ] |))); fun γ => @@ -28047,6 +28721,11 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_binary_format::file_format::AbilitySet"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -28060,6 +28739,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_ABILITY" [] + [] + [] ] |) ] @@ -28297,6 +28978,8 @@ Module deserializer. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| len |)) @@ -28545,7 +29228,22 @@ Module deserializer. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| kinds |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path "move_binary_format::file_format::AbilitySet"; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ M.read (| kinds |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -28779,6 +29477,8 @@ Module deserializer. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| len |)) @@ -29027,7 +29727,20 @@ Module deserializer. ] |)) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| type_params |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path "move_binary_format::file_format::StructTypeParameter"; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ M.read (| type_params |) ] |) |))) |))) @@ -29133,6 +29846,8 @@ Module deserializer. Value.StructTuple "move_binary_format::deserializer::AbilitySetPosition::StructTypeParameters" [] + [] + [] ] |) ] @@ -29389,9 +30104,16 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::StructTypeParameter"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructRecord "move_binary_format::file_format::StructTypeParameter" + [] + [] [ ("constraints", M.read (| constraints |)); ("is_phantom", M.read (| is_phantom |)) @@ -29890,6 +30612,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -29916,6 +30644,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -29980,6 +30710,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::StructFieldInformation::Native" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -30171,6 +30903,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::StructFieldInformation::Declared" + [] + [] [ M.read (| fields |) ] |))) ] @@ -30199,6 +30933,8 @@ Module deserializer. |); Value.StructRecord "move_binary_format::file_format::StructDefinition" + [] + [] [ ("struct_handle", M.read (| struct_handle |)); ("field_information", M.read (| field_information |)) @@ -30221,7 +30957,13 @@ Module deserializer. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -30446,6 +31188,8 @@ Module deserializer. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "u64" ] [ ("start", Value.Integer IntegerKind.U64 0); ("end_", M.read (| field_count |)) @@ -30693,7 +31437,22 @@ Module deserializer. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| fields |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path "move_binary_format::file_format::FieldDefinition"; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ M.read (| fields |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -30984,14 +31743,23 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::FieldDefinition"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructRecord "move_binary_format::file_format::FieldDefinition" + [] + [] [ ("name", M.read (| name |)); ("signature", Value.StructTuple "move_binary_format::file_format::TypeSignature" + [] + [] [ M.read (| signature |) ]) ] ] @@ -31322,7 +32090,13 @@ Module deserializer. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -31759,13 +32533,21 @@ Module deserializer. |); Value.StructRecord "move_binary_format::file_format::FieldHandle" + [] + [] [ ("owner", M.read (| struct_idx |)); ("field", M.read (| offset |)) ] ] |) |) in M.alloc (| Value.Tuple [] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -32207,6 +32989,8 @@ Module deserializer. |); Value.StructRecord "move_binary_format::file_format::FieldInstantiation" + [] + [] [ ("handle", M.read (| handle |)); ("type_parameters", M.read (| type_parameters |)) @@ -32216,7 +33000,13 @@ Module deserializer. |) in M.alloc (| Value.Tuple [] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -32562,6 +33352,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -32794,6 +33586,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Visibility::Public" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -32801,6 +33595,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Visibility::Private" [] + [] + [] |))) ] |) @@ -32919,6 +33715,8 @@ Module deserializer. [ Value.StructTuple "move_binary_format::file_format::Visibility::Public" + [] + [] []; Value.Bool true ] @@ -33080,6 +33878,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -33336,6 +34136,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -33599,6 +34401,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -33834,6 +34638,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -34274,12 +35080,20 @@ Module deserializer. |) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_binary_format::file_format::CodeUnit" ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_binary_format::file_format::CodeUnit" ] [ M.read (| M.match_operator (| @@ -34450,6 +35264,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_binary_format::file_format::FunctionDefinition"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -34464,6 +35284,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_FLAG_BITS" [] + [] + [] ] |) ] @@ -34477,9 +35299,16 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::FunctionDefinition"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructRecord "move_binary_format::file_format::FunctionDefinition" + [] + [] [ ("function", M.read (| function |)); ("visibility", M.read (| visibility |)); @@ -34722,6 +35551,8 @@ Module deserializer. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "u64" ] [ ("start", Value.Integer IntegerKind.U64 0); ("end_", M.read (| len |)) ] ] @@ -34967,7 +35798,22 @@ Module deserializer. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| indices |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path "move_binary_format::file_format::StructDefinitionIndex"; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ M.read (| indices |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -35141,6 +35987,8 @@ Module deserializer. M.alloc (| Value.StructRecord "move_binary_format::file_format::CodeUnit" + [] + [] [ ("locals", M.read (| locals |)); ("code", @@ -35292,7 +36140,16 @@ Module deserializer. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| code_unit |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::CodeUnit"; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ M.read (| code_unit |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -35785,6 +36642,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -36149,6 +37008,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -36175,6 +37040,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -36417,6 +37284,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -36443,6 +37316,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -36615,6 +37490,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Pop" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -36627,6 +37504,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Ret" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -36638,6 +37517,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::BrTrue" + [] + [] [ M.read (| M.match_operator (| @@ -36782,6 +37663,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::BrFalse" + [] + [] [ M.read (| M.match_operator (| @@ -36926,6 +37809,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::Branch" + [] + [] [ M.read (| M.match_operator (| @@ -37201,6 +38086,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -37310,6 +38197,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::LdU8" + [] + [] [ M.read (| value |) ] |))); fun γ => @@ -37451,6 +38340,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::LdU64" + [] + [] [ M.read (| value |) ] |))); fun γ => @@ -37592,6 +38483,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::LdU128" + [] + [] [ M.call_closure (| Ty.apply @@ -37624,6 +38517,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::CastU8" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -37636,6 +38531,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::CastU64" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -37648,6 +38545,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::CastU128" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -37659,6 +38558,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::LdConst" + [] + [] [ M.read (| M.match_operator (| @@ -37813,6 +38714,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::LdTrue" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -37825,6 +38728,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::LdFalse" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -37836,6 +38741,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::CopyLoc" + [] + [] [ M.read (| M.match_operator (| @@ -37980,6 +38887,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MoveLoc" + [] + [] [ M.read (| M.match_operator (| @@ -38124,6 +39033,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::StLoc" + [] + [] [ M.read (| M.match_operator (| @@ -38268,6 +39179,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MutBorrowLoc" + [] + [] [ M.read (| M.match_operator (| @@ -38412,6 +39325,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::ImmBorrowLoc" + [] + [] [ M.read (| M.match_operator (| @@ -38556,6 +39471,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MutBorrowField" + [] + [] [ M.read (| M.match_operator (| @@ -38709,6 +39626,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MutBorrowFieldGeneric" + [] + [] [ M.read (| M.match_operator (| @@ -38862,6 +39781,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::ImmBorrowField" + [] + [] [ M.read (| M.match_operator (| @@ -39015,6 +39936,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::ImmBorrowFieldGeneric" + [] + [] [ M.read (| M.match_operator (| @@ -39168,6 +40091,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::Call" + [] + [] [ M.read (| M.match_operator (| @@ -39321,6 +40246,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::CallGeneric" + [] + [] [ M.read (| M.match_operator (| @@ -39474,6 +40401,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::Pack" + [] + [] [ M.read (| M.match_operator (| @@ -39627,6 +40556,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::PackGeneric" + [] + [] [ M.read (| M.match_operator (| @@ -39780,6 +40711,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::Unpack" + [] + [] [ M.read (| M.match_operator (| @@ -39933,6 +40866,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::UnpackGeneric" + [] + [] [ M.read (| M.match_operator (| @@ -40087,6 +41022,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::ReadRef" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40099,6 +41036,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::WriteRef" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40111,6 +41050,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Add" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40123,6 +41064,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Sub" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40135,6 +41078,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Mul" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40147,6 +41092,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Mod" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40159,6 +41106,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Div" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40171,6 +41120,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::BitOr" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40183,6 +41134,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::BitAnd" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40195,6 +41148,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Xor" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40207,6 +41162,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Shl" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40219,6 +41176,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Shr" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40231,6 +41190,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Or" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40243,6 +41204,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::And" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40255,6 +41218,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Not" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40267,6 +41232,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Eq" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40279,6 +41246,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Neq" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40291,6 +41260,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Lt" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40303,6 +41274,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Gt" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40315,6 +41288,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Le" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40327,6 +41302,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Ge" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40339,6 +41316,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Abort" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40351,6 +41330,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::Nop" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40363,6 +41344,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::FreezeRef" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -40374,6 +41357,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::VecPack" + [] + [] [ M.read (| M.match_operator (| @@ -40658,6 +41643,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::VecLen" + [] + [] [ M.read (| M.match_operator (| @@ -40811,6 +41798,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::VecImmBorrow" + [] + [] [ M.read (| M.match_operator (| @@ -40964,6 +41953,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::VecMutBorrow" + [] + [] [ M.read (| M.match_operator (| @@ -41117,6 +42108,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::VecPushBack" + [] + [] [ M.read (| M.match_operator (| @@ -41270,6 +42263,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::VecPopBack" + [] + [] [ M.read (| M.match_operator (| @@ -41423,6 +42418,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::VecUnpack" + [] + [] [ M.read (| M.match_operator (| @@ -41707,6 +42704,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::VecSwap" + [] + [] [ M.read (| M.match_operator (| @@ -41989,6 +42988,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::LdU16" + [] + [] [ M.read (| value |) ] |))); fun γ => @@ -42130,6 +43131,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::LdU32" + [] + [] [ M.read (| value |) ] |))); fun γ => @@ -42278,6 +43281,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::LdU256" + [] + [] [ M.call_closure (| Ty.apply @@ -42314,6 +43319,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::CastU16" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -42326,6 +43333,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::CastU32" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -42338,6 +43347,8 @@ Module deserializer. Value.StructTuple "move_binary_format::file_format::Bytecode::CastU256" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -42349,6 +43360,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::ExistsDeprecated" + [] + [] [ M.read (| M.match_operator (| @@ -42502,6 +43515,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::ExistsGenericDeprecated" + [] + [] [ M.read (| M.match_operator (| @@ -42655,6 +43670,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MutBorrowGlobalDeprecated" + [] + [] [ M.read (| M.match_operator (| @@ -42808,6 +43825,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MutBorrowGlobalGenericDeprecated" + [] + [] [ M.read (| M.match_operator (| @@ -42961,6 +43980,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::ImmBorrowGlobalDeprecated" + [] + [] [ M.read (| M.match_operator (| @@ -43114,6 +44135,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::ImmBorrowGlobalGenericDeprecated" + [] + [] [ M.read (| M.match_operator (| @@ -43267,6 +44290,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MoveFromDeprecated" + [] + [] [ M.read (| M.match_operator (| @@ -43420,6 +44445,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MoveFromGenericDeprecated" + [] + [] [ M.read (| M.match_operator (| @@ -43573,6 +44600,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MoveToDeprecated" + [] + [] [ M.read (| M.match_operator (| @@ -43726,6 +44755,8 @@ Module deserializer. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MoveToGenericDeprecated" + [] + [] [ M.read (| M.match_operator (| @@ -43912,7 +44943,13 @@ Module deserializer. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -43979,10 +45016,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::TableType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::TableType::MODULE_HANDLES" [] + [] + [] ] |))); fun γ => @@ -43995,10 +45039,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::TableType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::TableType::STRUCT_HANDLES" [] + [] + [] ] |))); fun γ => @@ -44011,10 +45062,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::TableType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::TableType::FUNCTION_HANDLES" [] + [] + [] ] |))); fun γ => @@ -44027,10 +45085,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::TableType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::TableType::FUNCTION_INST" [] + [] + [] ] |))); fun γ => @@ -44043,10 +45108,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::TableType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::TableType::SIGNATURES" [] + [] + [] ] |))); fun γ => @@ -44059,10 +45131,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::TableType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::TableType::CONSTANT_POOL" [] + [] + [] ] |))); fun γ => @@ -44075,10 +45154,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::TableType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::TableType::IDENTIFIERS" [] + [] + [] ] |))); fun γ => @@ -44091,10 +45177,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::TableType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::TableType::ADDRESS_IDENTIFIERS" [] + [] + [] ] |))); fun γ => @@ -44107,10 +45200,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::TableType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::TableType::STRUCT_DEFS" [] + [] + [] ] |))); fun γ => @@ -44123,10 +45223,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::TableType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::TableType::STRUCT_DEF_INST" [] + [] + [] ] |))); fun γ => @@ -44139,10 +45246,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::TableType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::TableType::FUNCTION_DEFS" [] + [] + [] ] |))); fun γ => @@ -44155,10 +45269,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::TableType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::TableType::FIELD_HANDLE" [] + [] + [] ] |))); fun γ => @@ -44171,10 +45292,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::TableType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::TableType::FIELD_INST" [] + [] + [] ] |))); fun γ => @@ -44187,10 +45315,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::TableType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::TableType::FRIEND_DECLS" [] + [] + [] ] |))); fun γ => @@ -44203,10 +45338,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::TableType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::TableType::METADATA" [] + [] + [] ] |))); fun γ => @@ -44214,6 +45356,11 @@ Module deserializer. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_binary_format::file_format_common::TableType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -44227,6 +45374,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_TABLE_TYPE" [] + [] + [] ] |) ] @@ -44298,10 +45447,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::SerializedType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::SerializedType::BOOL" [] + [] + [] ] |))); fun γ => @@ -44314,10 +45470,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::SerializedType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::SerializedType::U8" [] + [] + [] ] |))); fun γ => @@ -44330,10 +45493,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::SerializedType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::SerializedType::U64" [] + [] + [] ] |))); fun γ => @@ -44346,10 +45516,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::SerializedType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::SerializedType::U128" [] + [] + [] ] |))); fun γ => @@ -44362,10 +45539,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::SerializedType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::SerializedType::ADDRESS" [] + [] + [] ] |))); fun γ => @@ -44378,10 +45562,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::SerializedType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::SerializedType::REFERENCE" [] + [] + [] ] |))); fun γ => @@ -44394,10 +45585,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::SerializedType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::SerializedType::MUTABLE_REFERENCE" [] + [] + [] ] |))); fun γ => @@ -44410,10 +45608,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::SerializedType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::SerializedType::STRUCT" [] + [] + [] ] |))); fun γ => @@ -44426,10 +45631,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::SerializedType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::SerializedType::TYPE_PARAMETER" [] + [] + [] ] |))); fun γ => @@ -44442,10 +45654,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::SerializedType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::SerializedType::VECTOR" [] + [] + [] ] |))); fun γ => @@ -44458,10 +45677,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::SerializedType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::SerializedType::STRUCT_INST" [] + [] + [] ] |))); fun γ => @@ -44474,10 +45700,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::SerializedType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::SerializedType::SIGNER" [] + [] + [] ] |))); fun γ => @@ -44490,10 +45723,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::SerializedType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::SerializedType::U16" [] + [] + [] ] |))); fun γ => @@ -44506,10 +45746,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::SerializedType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::SerializedType::U32" [] + [] + [] ] |))); fun γ => @@ -44522,10 +45769,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::SerializedType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::SerializedType::U256" [] + [] + [] ] |))); fun γ => @@ -44533,6 +45787,11 @@ Module deserializer. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_binary_format::file_format_common::SerializedType"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -44546,6 +45805,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_SERIALIZED_TYPE" [] + [] + [] ] |) ] @@ -44738,10 +45999,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::deserializer::DeprecatedNominalResourceFlag"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::deserializer::DeprecatedNominalResourceFlag::NOMINAL_RESOURCE" [] + [] + [] ] |))); fun γ => @@ -44754,10 +46022,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::deserializer::DeprecatedNominalResourceFlag"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::deserializer::DeprecatedNominalResourceFlag::NORMAL_STRUCT" [] + [] + [] ] |))); fun γ => @@ -44765,6 +46040,11 @@ Module deserializer. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_binary_format::deserializer::DeprecatedNominalResourceFlag"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -44778,6 +46058,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_ABILITY" [] + [] + [] ] |) ] @@ -44867,10 +46149,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::deserializer::DeprecatedKind"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::deserializer::DeprecatedKind::ALL" [] + [] + [] ] |))); fun γ => @@ -44883,10 +46172,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::deserializer::DeprecatedKind"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::deserializer::DeprecatedKind::COPYABLE" [] + [] + [] ] |))); fun γ => @@ -44899,10 +46195,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::deserializer::DeprecatedKind"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::deserializer::DeprecatedKind::RESOURCE" [] + [] + [] ] |))); fun γ => @@ -44910,6 +46213,11 @@ Module deserializer. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_binary_format::deserializer::DeprecatedKind"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -44923,6 +46231,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_ABILITY" [] + [] + [] ] |) ] @@ -44982,10 +46292,18 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "move_binary_format::file_format_common::SerializedNativeStructFlag"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::SerializedNativeStructFlag::NATIVE" [] + [] + [] ] |))); fun γ => @@ -44998,10 +46316,18 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "move_binary_format::file_format_common::SerializedNativeStructFlag"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::SerializedNativeStructFlag::DECLARED" [] + [] + [] ] |))); fun γ => @@ -45009,6 +46335,12 @@ Module deserializer. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_binary_format::file_format_common::SerializedNativeStructFlag"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -45022,6 +46354,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_NATIVE_STRUCT_FLAG" [] + [] + [] ] |) ] @@ -45155,10 +46489,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::POP" [] + [] + [] ] |))); fun γ => @@ -45171,10 +46512,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::RET" [] + [] + [] ] |))); fun γ => @@ -45187,10 +46535,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::BR_TRUE" [] + [] + [] ] |))); fun γ => @@ -45203,10 +46558,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::BR_FALSE" [] + [] + [] ] |))); fun γ => @@ -45219,10 +46581,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::BRANCH" [] + [] + [] ] |))); fun γ => @@ -45235,10 +46604,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::LD_U64" [] + [] + [] ] |))); fun γ => @@ -45251,10 +46627,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::LD_CONST" [] + [] + [] ] |))); fun γ => @@ -45267,10 +46650,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::LD_TRUE" [] + [] + [] ] |))); fun γ => @@ -45283,10 +46673,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::LD_FALSE" [] + [] + [] ] |))); fun γ => @@ -45299,10 +46696,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::COPY_LOC" [] + [] + [] ] |))); fun γ => @@ -45315,10 +46719,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::MOVE_LOC" [] + [] + [] ] |))); fun γ => @@ -45331,10 +46742,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::ST_LOC" [] + [] + [] ] |))); fun γ => @@ -45347,10 +46765,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::MUT_BORROW_LOC" [] + [] + [] ] |))); fun γ => @@ -45363,10 +46788,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::IMM_BORROW_LOC" [] + [] + [] ] |))); fun γ => @@ -45379,10 +46811,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::MUT_BORROW_FIELD" [] + [] + [] ] |))); fun γ => @@ -45395,10 +46834,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::IMM_BORROW_FIELD" [] + [] + [] ] |))); fun γ => @@ -45411,10 +46857,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::CALL" [] + [] + [] ] |))); fun γ => @@ -45427,10 +46880,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::PACK" [] + [] + [] ] |))); fun γ => @@ -45443,10 +46903,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::UNPACK" [] + [] + [] ] |))); fun γ => @@ -45459,10 +46926,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::READ_REF" [] + [] + [] ] |))); fun γ => @@ -45475,10 +46949,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::WRITE_REF" [] + [] + [] ] |))); fun γ => @@ -45491,10 +46972,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::ADD" [] + [] + [] ] |))); fun γ => @@ -45507,10 +46995,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::SUB" [] + [] + [] ] |))); fun γ => @@ -45523,10 +47018,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::MUL" [] + [] + [] ] |))); fun γ => @@ -45539,10 +47041,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::MOD" [] + [] + [] ] |))); fun γ => @@ -45555,10 +47064,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::DIV" [] + [] + [] ] |))); fun γ => @@ -45571,10 +47087,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::BIT_OR" [] + [] + [] ] |))); fun γ => @@ -45587,10 +47110,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::BIT_AND" [] + [] + [] ] |))); fun γ => @@ -45603,10 +47133,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::XOR" [] + [] + [] ] |))); fun γ => @@ -45619,7 +47156,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::OR" [] + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::OR" + [] + [] + [] ] |))); fun γ => @@ -45632,10 +47179,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::AND" [] + [] + [] ] |))); fun γ => @@ -45648,10 +47202,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::NOT" [] + [] + [] ] |))); fun γ => @@ -45664,7 +47225,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::EQ" [] + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::EQ" + [] + [] + [] ] |))); fun γ => @@ -45677,10 +47248,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::NEQ" [] + [] + [] ] |))); fun γ => @@ -45693,7 +47271,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::LT" [] + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::LT" + [] + [] + [] ] |))); fun γ => @@ -45706,7 +47294,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::GT" [] + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::GT" + [] + [] + [] ] |))); fun γ => @@ -45719,7 +47317,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::LE" [] + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::LE" + [] + [] + [] ] |))); fun γ => @@ -45732,7 +47340,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::GE" [] + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::GE" + [] + [] + [] ] |))); fun γ => @@ -45745,10 +47363,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::ABORT" [] + [] + [] ] |))); fun γ => @@ -45761,10 +47386,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::NOP" [] + [] + [] ] |))); fun γ => @@ -45777,10 +47409,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::EXISTS_DEPRECATED" [] + [] + [] ] |))); fun γ => @@ -45793,10 +47432,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::MUT_BORROW_GLOBAL_DEPRECATED" [] + [] + [] ] |))); fun γ => @@ -45809,10 +47455,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::IMM_BORROW_GLOBAL_DEPRECATED" [] + [] + [] ] |))); fun γ => @@ -45825,10 +47478,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::MOVE_FROM_DEPRECATED" [] + [] + [] ] |))); fun γ => @@ -45841,10 +47501,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::MOVE_TO_DEPRECATED" [] + [] + [] ] |))); fun γ => @@ -45857,10 +47524,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::FREEZE_REF" [] + [] + [] ] |))); fun γ => @@ -45873,10 +47547,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::SHL" [] + [] + [] ] |))); fun γ => @@ -45889,10 +47570,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::SHR" [] + [] + [] ] |))); fun γ => @@ -45905,10 +47593,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::LD_U8" [] + [] + [] ] |))); fun γ => @@ -45921,10 +47616,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::LD_U128" [] + [] + [] ] |))); fun γ => @@ -45937,10 +47639,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::CAST_U8" [] + [] + [] ] |))); fun γ => @@ -45953,10 +47662,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::CAST_U64" [] + [] + [] ] |))); fun γ => @@ -45969,10 +47685,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::CAST_U128" [] + [] + [] ] |))); fun γ => @@ -45985,10 +47708,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::MUT_BORROW_FIELD_GENERIC" [] + [] + [] ] |))); fun γ => @@ -46001,10 +47731,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::IMM_BORROW_FIELD_GENERIC" [] + [] + [] ] |))); fun γ => @@ -46017,10 +47754,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::CALL_GENERIC" [] + [] + [] ] |))); fun γ => @@ -46033,10 +47777,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::PACK_GENERIC" [] + [] + [] ] |))); fun γ => @@ -46049,10 +47800,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::UNPACK_GENERIC" [] + [] + [] ] |))); fun γ => @@ -46065,10 +47823,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::EXISTS_GENERIC_DEPRECATED" [] + [] + [] ] |))); fun γ => @@ -46081,10 +47846,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::MUT_BORROW_GLOBAL_GENERIC_DEPRECATED" [] + [] + [] ] |))); fun γ => @@ -46097,10 +47869,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::IMM_BORROW_GLOBAL_GENERIC_DEPRECATED" [] + [] + [] ] |))); fun γ => @@ -46113,10 +47892,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::MOVE_FROM_GENERIC_DEPRECATED" [] + [] + [] ] |))); fun γ => @@ -46129,10 +47915,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::MOVE_TO_GENERIC_DEPRECATED" [] + [] + [] ] |))); fun γ => @@ -46145,10 +47938,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::VEC_PACK" [] + [] + [] ] |))); fun γ => @@ -46161,10 +47961,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::VEC_LEN" [] + [] + [] ] |))); fun γ => @@ -46177,10 +47984,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::VEC_IMM_BORROW" [] + [] + [] ] |))); fun γ => @@ -46193,10 +48007,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::VEC_MUT_BORROW" [] + [] + [] ] |))); fun γ => @@ -46209,10 +48030,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::VEC_PUSH_BACK" [] + [] + [] ] |))); fun γ => @@ -46225,10 +48053,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::VEC_POP_BACK" [] + [] + [] ] |))); fun γ => @@ -46241,10 +48076,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::VEC_UNPACK" [] + [] + [] ] |))); fun γ => @@ -46257,10 +48099,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::VEC_SWAP" [] + [] + [] ] |))); fun γ => @@ -46273,10 +48122,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::LD_U16" [] + [] + [] ] |))); fun γ => @@ -46289,10 +48145,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::LD_U32" [] + [] + [] ] |))); fun γ => @@ -46305,10 +48168,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::LD_U256" [] + [] + [] ] |))); fun γ => @@ -46321,10 +48191,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::CAST_U16" [] + [] + [] ] |))); fun γ => @@ -46337,10 +48214,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::CAST_U32" [] + [] + [] ] |))); fun γ => @@ -46353,10 +48237,17 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format_common::Opcodes::CAST_U256" [] + [] + [] ] |))); fun γ => @@ -46364,6 +48255,11 @@ Module deserializer. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_binary_format::file_format_common::Opcodes"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -46377,6 +48273,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_OPCODE" [] + [] + [] ] |) ] @@ -47021,6 +48919,12 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_binary_format::deserializer::VersionedBinary"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -47036,6 +48940,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::BAD_MAGIC" [] + [] + [] ] |) ] @@ -47054,6 +48960,11 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_binary_format::deserializer::VersionedBinary"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -47076,6 +48987,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -47153,6 +49066,11 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_binary_format::deserializer::VersionedBinary"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -47176,6 +49094,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -47267,6 +49187,11 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_binary_format::deserializer::VersionedBinary"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -47280,6 +49205,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_VERSION" [] + [] + [] ] |) ] @@ -47298,6 +49225,8 @@ Module deserializer. M.alloc (| Value.StructRecord "move_binary_format::deserializer::VersionedCursor" + [] + [] [ ("version", M.read (| version |)); ("cursor", M.read (| cursor |)) ] |) in let~ table_count : Ty.apply (Ty.path "*") [] [ Ty.path "u8" ] := @@ -47744,6 +49673,11 @@ Module deserializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_binary_format::deserializer::VersionedBinary"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -47766,6 +49700,8 @@ Module deserializer. Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] + [] + [] ] |); M.call_closure (| @@ -47990,6 +49926,8 @@ Module deserializer. (M.alloc (| Value.StructTuple "move_binary_format::file_format::ModuleHandleIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ] |))) ] @@ -48013,9 +49951,16 @@ Module deserializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::deserializer::VersionedBinary"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructRecord "move_binary_format::deserializer::VersionedBinary" + [] + [] [ ("binary_config", M.read (| binary_config |)); ("binary", M.read (| binary |)); @@ -48128,6 +50073,8 @@ Module deserializer. let end_ := M.alloc (| end_ |) in Value.StructRecord "move_binary_format::deserializer::VersionedCursor" + [] + [] [ ("cursor", M.call_closure (| @@ -48187,6 +50134,8 @@ Module deserializer. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -48291,6 +50240,8 @@ Module deserializer. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| diff --git a/CoqOfRust/move_sui/translations/move_binary_format/errors.v b/CoqOfRust/move_sui/translations/move_binary_format/errors.v index 8103fa305..e6b5a07b8 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/errors.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/errors.v @@ -73,7 +73,7 @@ Module errors. "move_binary_format::errors::Location::Undefined" |) in M.alloc (| - Value.StructTuple "move_binary_format::errors::Location::Undefined" [] + Value.StructTuple "move_binary_format::errors::Location::Undefined" [] [] [] |))); fun γ => ltac:(M.monadic @@ -88,6 +88,8 @@ Module errors. M.alloc (| Value.StructTuple "move_binary_format::errors::Location::Module" + [] + [] [ M.call_closure (| Ty.path "move_core_types::language_storage::ModuleId", @@ -357,7 +359,7 @@ Module errors. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] |))) + (M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] |))) ] |))); fun γ => @@ -665,6 +667,8 @@ Module errors. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::errors::ExecutionState" + [] + [] [ ("stack_trace", M.call_closure (| @@ -1083,6 +1087,8 @@ Module errors. (let stack_trace := M.alloc (| stack_trace |) in Value.StructRecord "move_binary_format::errors::ExecutionState" + [] + [] [ ("stack_trace", M.read (| stack_trace |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1148,6 +1154,8 @@ Module errors. (let self := M.alloc (| self |) in Value.StructTuple "move_binary_format::errors::VMError" + [] + [] [ M.call_closure (| Ty.apply @@ -1488,6 +1496,8 @@ Module errors. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::errors::VMError_" + [] + [] [ ("major_status", M.call_closure (| @@ -3356,7 +3366,11 @@ Module errors. "move_binary_format::errors::VMError_", "exec_state" |), - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_binary_format::errors::ExecutionState" ] + [] |) |) in M.alloc (| Value.Tuple [] |) @@ -3772,6 +3786,8 @@ Module errors. M.alloc (| Value.StructTuple "move_binary_format::errors::PartialVMError" + [] + [] [ M.call_closure (| Ty.apply @@ -3796,6 +3812,8 @@ Module errors. [ Value.StructRecord "move_binary_format::errors::PartialVMError_" + [] + [] [ ("major_status", M.read (| major_status |)); ("sub_status", M.read (| sub_status |)); @@ -4318,6 +4336,8 @@ Module errors. (let self := M.alloc (| self |) in Value.StructTuple "move_binary_format::errors::PartialVMError" + [] + [] [ M.call_closure (| Ty.apply @@ -4421,6 +4441,8 @@ Module errors. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::errors::PartialVMError_" + [] + [] [ ("major_status", M.call_closure (| @@ -4881,6 +4903,8 @@ Module errors. M.alloc (| Value.StructTuple "move_binary_format::errors::VMError" + [] + [] [ M.call_closure (| Ty.apply @@ -4905,6 +4929,8 @@ Module errors. [ Value.StructRecord "move_binary_format::errors::VMError_" + [] + [] [ ("major_status", M.read (| major_status |)); ("sub_status", M.read (| sub_status |)); @@ -4947,6 +4973,8 @@ Module errors. (let major_status := M.alloc (| major_status |) in Value.StructTuple "move_binary_format::errors::PartialVMError" + [] + [] [ M.call_closure (| Ty.apply @@ -4971,11 +4999,24 @@ Module errors. [ Value.StructRecord "move_binary_format::errors::PartialVMError_" + [] + [] [ ("major_status", M.read (| major_status |)); - ("sub_status", Value.StructTuple "core::option::Option::None" []); - ("message", Value.StructTuple "core::option::Option::None" []); - ("exec_state", Value.StructTuple "core::option::Option::None" []); + ("sub_status", + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] []); + ("message", + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "alloc::string::String" ] + []); + ("exec_state", + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_binary_format::errors::ExecutionState" ] + []); ("indices", M.call_closure (| Ty.apply @@ -5180,7 +5221,11 @@ Module errors. "move_binary_format::errors::PartialVMError_", "sub_status" |), - Value.StructTuple "core::option::Option::Some" [ M.read (| sub_status |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u64" ] + [ M.read (| sub_status |) ] |) |) in self @@ -5296,7 +5341,11 @@ Module errors. "move_binary_format::errors::PartialVMError_", "message" |), - Value.StructTuple "core::option::Option::Some" [ M.read (| message |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "alloc::string::String" ] + [ M.read (| message |) ] |) |) in self @@ -5414,7 +5463,11 @@ Module errors. "move_binary_format::errors::PartialVMError_", "exec_state" |), - Value.StructTuple "core::option::Option::Some" [ M.read (| exec_state |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "move_binary_format::errors::ExecutionState" ] + [ M.read (| exec_state |) ] |) |) in self @@ -5906,6 +5959,8 @@ Module errors. |), Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "alloc::string::String" ] [ M.read (| additional_message |) ] |) |))) @@ -6244,14 +6299,20 @@ Module errors. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -7404,14 +7465,20 @@ Module errors. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -9421,7 +9488,11 @@ Module errors. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::option::Option::None" [])) + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] ] + [])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/move_sui/translations/move_binary_format/file_format.v b/CoqOfRust/move_sui/translations/move_binary_format/file_format.v index 2135ccbfa..4bb8b90d2 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/file_format.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/file_format.v @@ -65,6 +65,8 @@ Module file_format. ltac:(M.monadic (Value.StructTuple "move_binary_format::file_format::ModuleHandleIndex" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -354,6 +356,8 @@ Module file_format. (let idx := M.alloc (| idx |) in Value.StructTuple "move_binary_format::file_format::ModuleHandleIndex" + [] + [] [ M.read (| idx |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -555,7 +559,7 @@ Module file_format. (* Ty.path "move_binary_format::IndexKind" *) Definition value_KIND (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic - (M.alloc (| Value.StructTuple "move_binary_format::IndexKind::ModuleHandle" [] |))). + (M.alloc (| Value.StructTuple "move_binary_format::IndexKind::ModuleHandle" [] [] [] |))). (* fn into_index(self) -> usize { @@ -653,6 +657,8 @@ Module file_format. ltac:(M.monadic (Value.StructTuple "move_binary_format::file_format::StructHandleIndex" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -942,6 +948,8 @@ Module file_format. (let idx := M.alloc (| idx |) in Value.StructTuple "move_binary_format::file_format::StructHandleIndex" + [] + [] [ M.read (| idx |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1143,7 +1151,7 @@ Module file_format. (* Ty.path "move_binary_format::IndexKind" *) Definition value_KIND (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic - (M.alloc (| Value.StructTuple "move_binary_format::IndexKind::StructHandle" [] |))). + (M.alloc (| Value.StructTuple "move_binary_format::IndexKind::StructHandle" [] [] [] |))). (* fn into_index(self) -> usize { @@ -1241,6 +1249,8 @@ Module file_format. ltac:(M.monadic (Value.StructTuple "move_binary_format::file_format::FunctionHandleIndex" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -1530,6 +1540,8 @@ Module file_format. (let idx := M.alloc (| idx |) in Value.StructTuple "move_binary_format::file_format::FunctionHandleIndex" + [] + [] [ M.read (| idx |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1731,7 +1743,7 @@ Module file_format. (* Ty.path "move_binary_format::IndexKind" *) Definition value_KIND (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic - (M.alloc (| Value.StructTuple "move_binary_format::IndexKind::FunctionHandle" [] |))). + (M.alloc (| Value.StructTuple "move_binary_format::IndexKind::FunctionHandle" [] [] [] |))). (* fn into_index(self) -> usize { @@ -1829,6 +1841,8 @@ Module file_format. ltac:(M.monadic (Value.StructTuple "move_binary_format::file_format::FieldHandleIndex" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -2118,6 +2132,8 @@ Module file_format. (let idx := M.alloc (| idx |) in Value.StructTuple "move_binary_format::file_format::FieldHandleIndex" + [] + [] [ M.read (| idx |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2319,7 +2335,7 @@ Module file_format. (* Ty.path "move_binary_format::IndexKind" *) Definition value_KIND (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic - (M.alloc (| Value.StructTuple "move_binary_format::IndexKind::FieldHandle" [] |))). + (M.alloc (| Value.StructTuple "move_binary_format::IndexKind::FieldHandle" [] [] [] |))). (* fn into_index(self) -> usize { @@ -2420,6 +2436,8 @@ Module file_format. ltac:(M.monadic (Value.StructTuple "move_binary_format::file_format::StructDefInstantiationIndex" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -2716,6 +2734,8 @@ Module file_format. (let idx := M.alloc (| idx |) in Value.StructTuple "move_binary_format::file_format::StructDefInstantiationIndex" + [] + [] [ M.read (| idx |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2922,7 +2942,7 @@ Module file_format. Definition value_KIND (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.alloc (| - Value.StructTuple "move_binary_format::IndexKind::StructDefInstantiation" [] + Value.StructTuple "move_binary_format::IndexKind::StructDefInstantiation" [] [] [] |))). (* @@ -3021,6 +3041,8 @@ Module file_format. ltac:(M.monadic (Value.StructTuple "move_binary_format::file_format::FunctionInstantiationIndex" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -3310,6 +3332,8 @@ Module file_format. (let idx := M.alloc (| idx |) in Value.StructTuple "move_binary_format::file_format::FunctionInstantiationIndex" + [] + [] [ M.read (| idx |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3513,7 +3537,7 @@ Module file_format. Definition value_KIND (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.alloc (| - Value.StructTuple "move_binary_format::IndexKind::FunctionInstantiation" [] + Value.StructTuple "move_binary_format::IndexKind::FunctionInstantiation" [] [] [] |))). (* @@ -3612,6 +3636,8 @@ Module file_format. ltac:(M.monadic (Value.StructTuple "move_binary_format::file_format::FieldInstantiationIndex" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -3901,6 +3927,8 @@ Module file_format. (let idx := M.alloc (| idx |) in Value.StructTuple "move_binary_format::file_format::FieldInstantiationIndex" + [] + [] [ M.read (| idx |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4102,7 +4130,9 @@ Module file_format. (* Ty.path "move_binary_format::IndexKind" *) Definition value_KIND (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic - (M.alloc (| Value.StructTuple "move_binary_format::IndexKind::FieldInstantiation" [] |))). + (M.alloc (| + Value.StructTuple "move_binary_format::IndexKind::FieldInstantiation" [] [] [] + |))). (* fn into_index(self) -> usize { @@ -4200,6 +4230,8 @@ Module file_format. ltac:(M.monadic (Value.StructTuple "move_binary_format::file_format::IdentifierIndex" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -4487,6 +4519,8 @@ Module file_format. (let idx := M.alloc (| idx |) in Value.StructTuple "move_binary_format::file_format::IdentifierIndex" + [] + [] [ M.read (| idx |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4688,7 +4722,7 @@ Module file_format. (* Ty.path "move_binary_format::IndexKind" *) Definition value_KIND (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic - (M.alloc (| Value.StructTuple "move_binary_format::IndexKind::Identifier" [] |))). + (M.alloc (| Value.StructTuple "move_binary_format::IndexKind::Identifier" [] [] [] |))). (* fn into_index(self) -> usize { @@ -4786,6 +4820,8 @@ Module file_format. ltac:(M.monadic (Value.StructTuple "move_binary_format::file_format::AddressIdentifierIndex" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -5075,6 +5111,8 @@ Module file_format. (let idx := M.alloc (| idx |) in Value.StructTuple "move_binary_format::file_format::AddressIdentifierIndex" + [] + [] [ M.read (| idx |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5276,7 +5314,9 @@ Module file_format. (* Ty.path "move_binary_format::IndexKind" *) Definition value_KIND (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic - (M.alloc (| Value.StructTuple "move_binary_format::IndexKind::AddressIdentifier" [] |))). + (M.alloc (| + Value.StructTuple "move_binary_format::IndexKind::AddressIdentifier" [] [] [] + |))). (* fn into_index(self) -> usize { @@ -5374,6 +5414,8 @@ Module file_format. ltac:(M.monadic (Value.StructTuple "move_binary_format::file_format::ConstantPoolIndex" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -5663,6 +5705,8 @@ Module file_format. (let idx := M.alloc (| idx |) in Value.StructTuple "move_binary_format::file_format::ConstantPoolIndex" + [] + [] [ M.read (| idx |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5864,7 +5908,7 @@ Module file_format. (* Ty.path "move_binary_format::IndexKind" *) Definition value_KIND (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic - (M.alloc (| Value.StructTuple "move_binary_format::IndexKind::ConstantPool" [] |))). + (M.alloc (| Value.StructTuple "move_binary_format::IndexKind::ConstantPool" [] [] [] |))). (* fn into_index(self) -> usize { @@ -5962,6 +6006,8 @@ Module file_format. ltac:(M.monadic (Value.StructTuple "move_binary_format::file_format::SignatureIndex" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -6247,7 +6293,11 @@ Module file_format. | [], [], [ idx ] => ltac:(M.monadic (let idx := M.alloc (| idx |) in - Value.StructTuple "move_binary_format::file_format::SignatureIndex" [ M.read (| idx |) ])) + Value.StructTuple + "move_binary_format::file_format::SignatureIndex" + [] + [] + [ M.read (| idx |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6448,7 +6498,7 @@ Module file_format. (* Ty.path "move_binary_format::IndexKind" *) Definition value_KIND (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic - (M.alloc (| Value.StructTuple "move_binary_format::IndexKind::Signature" [] |))). + (M.alloc (| Value.StructTuple "move_binary_format::IndexKind::Signature" [] [] [] |))). (* fn into_index(self) -> usize { @@ -6546,6 +6596,8 @@ Module file_format. ltac:(M.monadic (Value.StructTuple "move_binary_format::file_format::StructDefinitionIndex" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -6835,6 +6887,8 @@ Module file_format. (let idx := M.alloc (| idx |) in Value.StructTuple "move_binary_format::file_format::StructDefinitionIndex" + [] + [] [ M.read (| idx |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -7036,7 +7090,9 @@ Module file_format. (* Ty.path "move_binary_format::IndexKind" *) Definition value_KIND (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic - (M.alloc (| Value.StructTuple "move_binary_format::IndexKind::StructDefinition" [] |))). + (M.alloc (| + Value.StructTuple "move_binary_format::IndexKind::StructDefinition" [] [] [] + |))). (* fn into_index(self) -> usize { @@ -7134,6 +7190,8 @@ Module file_format. ltac:(M.monadic (Value.StructTuple "move_binary_format::file_format::FunctionDefinitionIndex" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -7423,6 +7481,8 @@ Module file_format. (let idx := M.alloc (| idx |) in Value.StructTuple "move_binary_format::file_format::FunctionDefinitionIndex" + [] + [] [ M.read (| idx |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -7624,7 +7684,9 @@ Module file_format. (* Ty.path "move_binary_format::IndexKind" *) Definition value_KIND (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic - (M.alloc (| Value.StructTuple "move_binary_format::IndexKind::FunctionDefinition" [] |))). + (M.alloc (| + Value.StructTuple "move_binary_format::IndexKind::FunctionDefinition" [] [] [] + |))). (* fn into_index(self) -> usize { @@ -7744,6 +7806,8 @@ Module file_format. (M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ] |))). @@ -7775,6 +7839,8 @@ Module file_format. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::file_format::ModuleHandle" + [] + [] [ ("address", M.call_closure (| @@ -8427,6 +8493,8 @@ Module file_format. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::file_format::StructHandle" + [] + [] [ ("module", M.call_closure (| @@ -10481,6 +10549,21 @@ Module file_format. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -10563,6 +10646,21 @@ Module file_format. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -10644,6 +10742,21 @@ Module file_format. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -10730,9 +10843,21 @@ Module file_format. |); Value.StructRecord "move_binary_format::file_format::_'1::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_binary_format::file_format::StructTypeParameter" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -10931,9 +11056,21 @@ Module file_format. |); Value.StructRecord "move_binary_format::file_format::_'3::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_binary_format::file_format::Visibility" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -11035,9 +11172,21 @@ Module file_format. mk_str (| "AbilitySet" |); Value.StructRecord "move_binary_format::file_format::_'5::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_binary_format::file_format::AbilitySet" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -11088,6 +11237,8 @@ Module file_format. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::file_format::FunctionHandle" + [] + [] [ ("module", M.call_closure (| @@ -11851,6 +12002,8 @@ Module file_format. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::file_format::FieldHandle" + [] + [] [ ("owner", M.call_closure (| @@ -12272,6 +12425,8 @@ Module file_format. Value.StructTuple "move_binary_format::file_format::StructFieldInformation::Native" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -12286,6 +12441,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::StructFieldInformation::Declared" + [] + [] [ M.call_closure (| Ty.apply @@ -12627,6 +12784,8 @@ Module file_format. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::file_format::StructDefInstantiation" + [] + [] [ ("def", M.call_closure (| @@ -13019,6 +13178,8 @@ Module file_format. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::file_format::FunctionInstantiation" + [] + [] [ ("handle", M.call_closure (| @@ -13411,6 +13572,8 @@ Module file_format. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::file_format::FieldInstantiation" + [] + [] [ ("handle", M.call_closure (| @@ -13803,6 +13966,8 @@ Module file_format. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::file_format::StructDefinition" + [] + [] [ ("struct_handle", M.call_closure (| @@ -14138,6 +14303,8 @@ Module file_format. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u16"; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -14160,6 +14327,8 @@ Module file_format. Value.StructTuple "move_core_types::vm_status::StatusCode::LINKER_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -14199,6 +14368,8 @@ Module file_format. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u16"; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.cast (Ty.path "u16") @@ -14280,7 +14451,18 @@ Module file_format. γ, "move_binary_format::file_format::StructFieldInformation::Native" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.path "move_binary_format::file_format::FieldDefinition" ] + ] + [] + |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in @@ -14412,7 +14594,23 @@ Module file_format. γ, "move_binary_format::file_format::StructFieldInformation::Native" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ Ty.path "move_binary_format::file_format::FieldDefinition" ] + ] + ] + [] + |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in @@ -14426,6 +14624,18 @@ Module file_format. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ Ty.path "move_binary_format::file_format::FieldDefinition" ] + ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -14496,6 +14706,8 @@ Module file_format. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::file_format::FieldDefinition" + [] + [] [ ("name", M.call_closure (| @@ -14817,7 +15029,7 @@ Module file_format. match ε, τ, α with | [], [], [] => ltac:(M.monadic - (Value.StructTuple "move_binary_format::file_format::Visibility::Private" [])) + (Value.StructTuple "move_binary_format::file_format::Visibility::Private" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -15249,10 +15461,14 @@ Module file_format. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "move_binary_format::file_format::Visibility"; Ty.tuple [] ] [ Value.StructTuple "move_binary_format::file_format::Visibility::Private" [] + [] + [] ] |))); fun γ => @@ -15287,7 +15503,14 @@ Module file_format. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_binary_format::file_format::Visibility::Public" [] + [] + [ Ty.path "move_binary_format::file_format::Visibility"; Ty.tuple [] ] + [ + Value.StructTuple + "move_binary_format::file_format::Visibility::Public" + [] + [] + [] ] |))); fun γ => @@ -15322,13 +15545,24 @@ Module file_format. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_binary_format::file_format::Visibility::Friend" [] + [] + [ Ty.path "move_binary_format::file_format::Visibility"; Ty.tuple [] ] + [ + Value.StructTuple + "move_binary_format::file_format::Visibility::Friend" + [] + [] + [] ] |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Err" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.path "move_binary_format::file_format::Visibility"; Ty.tuple [] ] + [ Value.Tuple [] ] |))) ] |) @@ -15383,6 +15617,8 @@ Module file_format. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::file_format::FunctionDefinition" + [] + [] [ ("function", M.call_closure (| @@ -15691,6 +15927,8 @@ Module file_format. ltac:(M.monadic (Value.StructRecord "move_binary_format::file_format::FunctionDefinition" + [] + [] [ ("function", M.call_closure (| @@ -16167,6 +16405,8 @@ Module file_format. (let self := M.alloc (| self |) in Value.StructTuple "move_binary_format::file_format::TypeSignature" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::SignatureToken", @@ -16458,6 +16698,8 @@ Module file_format. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::file_format::FunctionSignature" + [] + [] [ ("return_", M.call_closure (| @@ -17067,6 +17309,8 @@ Module file_format. (let self := M.alloc (| self |) in Value.StructTuple "move_binary_format::file_format::Signature" + [] + [] [ M.call_closure (| Ty.apply @@ -17188,6 +17432,8 @@ Module file_format. ltac:(M.monadic (Value.StructTuple "move_binary_format::file_format::Signature" + [] + [] [ M.call_closure (| Ty.apply @@ -18112,7 +18358,15 @@ Module file_format. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "move_binary_format::file_format::Ability::Copy" [] ] + [] + [ Ty.path "move_binary_format::file_format::Ability" ] + [ + Value.StructTuple + "move_binary_format::file_format::Ability::Copy" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -18124,7 +18378,15 @@ Module file_format. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "move_binary_format::file_format::Ability::Drop" [] ] + [] + [ Ty.path "move_binary_format::file_format::Ability" ] + [ + Value.StructTuple + "move_binary_format::file_format::Ability::Drop" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -18136,7 +18398,15 @@ Module file_format. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "move_binary_format::file_format::Ability::Store" [] ] + [] + [ Ty.path "move_binary_format::file_format::Ability" ] + [ + Value.StructTuple + "move_binary_format::file_format::Ability::Store" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -18148,10 +18418,20 @@ Module file_format. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "move_binary_format::file_format::Ability::Key" [] ] + [] + [ Ty.path "move_binary_format::file_format::Ability" ] + [ Value.StructTuple "move_binary_format::file_format::Ability::Key" [] [] [] + ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_binary_format::file_format::Ability" ] + [] + |))) ] |) |))) @@ -18187,14 +18467,14 @@ Module file_format. (let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Ability::Copy" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Ability::Copy" [] + Value.StructTuple "move_binary_format::file_format::Ability::Copy" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Ability::Drop" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Ability::Drop" [] + Value.StructTuple "move_binary_format::file_format::Ability::Drop" [] [] [] |))); fun γ => ltac:(M.monadic @@ -18204,14 +18484,14 @@ Module file_format. "move_binary_format::file_format::Ability::Store" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Ability::Store" [] + Value.StructTuple "move_binary_format::file_format::Ability::Store" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Ability::Key" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Ability::Store" [] + Value.StructTuple "move_binary_format::file_format::Ability::Store" [] [] [] |))) ] |) @@ -18267,7 +18547,11 @@ Module file_format. Ty.path "move_binary_format::file_format::AbilitySet" |) |); - Value.StructTuple "move_binary_format::file_format::Ability::Copy" [] + Value.StructTuple + "move_binary_format::file_format::Ability::Copy" + [] + [] + [] ] |) |))); @@ -18295,7 +18579,11 @@ Module file_format. Ty.path "move_binary_format::file_format::AbilitySet" |) |); - Value.StructTuple "move_binary_format::file_format::Ability::Drop" [] + Value.StructTuple + "move_binary_format::file_format::Ability::Drop" + [] + [] + [] ] |) |))); @@ -18338,10 +18626,14 @@ Module file_format. Ty.path "move_binary_format::file_format::AbilitySet" |) |); - Value.StructTuple "move_binary_format::file_format::Ability::Store" [] + Value.StructTuple + "move_binary_format::file_format::Ability::Store" + [] + [] + [] ] |); - Value.StructTuple "move_binary_format::file_format::Ability::Key" [] + Value.StructTuple "move_binary_format::file_format::Ability::Key" [] [] [] ] |) |))); @@ -18671,6 +18963,8 @@ Module file_format. (M.alloc (| Value.StructTuple "move_binary_format::file_format::AbilitySet" + [] + [] [ Value.Integer IntegerKind.U8 0 ] |))). @@ -18689,6 +18983,8 @@ Module file_format. (M.alloc (| Value.StructTuple "move_binary_format::file_format::AbilitySet" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -18762,6 +19058,8 @@ Module file_format. (M.alloc (| Value.StructTuple "move_binary_format::file_format::AbilitySet" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -18814,6 +19112,8 @@ Module file_format. (M.alloc (| Value.StructTuple "move_binary_format::file_format::AbilitySet" + [] + [] [ M.cast (Ty.path "u8") @@ -18848,6 +19148,8 @@ Module file_format. (M.alloc (| Value.StructTuple "move_binary_format::file_format::AbilitySet" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -18929,6 +19231,8 @@ Module file_format. (M.alloc (| Value.StructTuple "move_binary_format::file_format::AbilitySet" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -19027,6 +19331,8 @@ Module file_format. (let ability := M.alloc (| ability |) in Value.StructTuple "move_binary_format::file_format::AbilitySet" + [] + [] [ M.cast (Ty.path "u8") (M.read (| ability |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -19103,7 +19409,7 @@ Module file_format. |), [ M.read (| self |); - Value.StructTuple "move_binary_format::file_format::Ability::Copy" [] + Value.StructTuple "move_binary_format::file_format::Ability::Copy" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -19133,7 +19439,7 @@ Module file_format. |), [ M.read (| self |); - Value.StructTuple "move_binary_format::file_format::Ability::Drop" [] + Value.StructTuple "move_binary_format::file_format::Ability::Drop" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -19163,7 +19469,7 @@ Module file_format. |), [ M.read (| self |); - Value.StructTuple "move_binary_format::file_format::Ability::Store" [] + Value.StructTuple "move_binary_format::file_format::Ability::Store" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -19194,7 +19500,7 @@ Module file_format. |), [ M.read (| self |); - Value.StructTuple "move_binary_format::file_format::Ability::Key" [] + Value.StructTuple "move_binary_format::file_format::Ability::Key" [] [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -19217,6 +19523,8 @@ Module file_format. let ability := M.alloc (| ability |) in Value.StructTuple "move_binary_format::file_format::AbilitySet" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -19253,6 +19561,8 @@ Module file_format. let other := M.alloc (| other |) in Value.StructTuple "move_binary_format::file_format::AbilitySet" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -19296,6 +19606,8 @@ Module file_format. let other := M.alloc (| other |) in Value.StructTuple "move_binary_format::file_format::AbilitySet" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -19589,6 +19901,11 @@ Module file_format. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_binary_format::file_format::AbilitySet"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -19611,6 +19928,8 @@ Module file_format. Value.StructTuple "move_core_types::vm_status::StatusCode::VERIFIER_INVARIANT_VIOLATION" [] + [] + [] ] |); M.call_closure (| @@ -20319,7 +20638,16 @@ Module file_format. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| abs |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::AbilitySet"; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ M.read (| abs |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -20394,14 +20722,25 @@ Module file_format. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_binary_format::file_format::AbilitySet" ] [ Value.StructTuple "move_binary_format::file_format::AbilitySet" + [] + [] [ M.read (| byte |) ] ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_binary_format::file_format::AbilitySet" ] + [] + |))) ] |) |))) @@ -20456,6 +20795,8 @@ Module file_format. let rhs := M.alloc (| rhs |) in Value.StructTuple "move_binary_format::file_format::AbilitySet" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -20504,6 +20845,8 @@ Module file_format. let rhs := M.alloc (| rhs |) in Value.StructTuple "move_binary_format::file_format::AbilitySet" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -20737,7 +21080,13 @@ Module file_format. ] |))) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_binary_format::file_format::Ability" ] + [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -20776,6 +21125,8 @@ Module file_format. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::file_format::AbilitySetIterator" + [] + [] [ ("idx", Value.Integer IntegerKind.U8 1); ("set", M.read (| self |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -21434,7 +21785,11 @@ Module file_format. "move_binary_format::file_format::SignatureToken::Bool" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::SignatureToken::Bool" [] + Value.StructTuple + "move_binary_format::file_format::SignatureToken::Bool" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -21445,7 +21800,11 @@ Module file_format. "move_binary_format::file_format::SignatureToken::U8" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::SignatureToken::U8" [] + Value.StructTuple + "move_binary_format::file_format::SignatureToken::U8" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -21456,7 +21815,11 @@ Module file_format. "move_binary_format::file_format::SignatureToken::U64" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::SignatureToken::U64" [] + Value.StructTuple + "move_binary_format::file_format::SignatureToken::U64" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -21467,7 +21830,11 @@ Module file_format. "move_binary_format::file_format::SignatureToken::U128" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::SignatureToken::U128" [] + Value.StructTuple + "move_binary_format::file_format::SignatureToken::U128" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -21481,6 +21848,8 @@ Module file_format. Value.StructTuple "move_binary_format::file_format::SignatureToken::Address" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -21491,7 +21860,11 @@ Module file_format. "move_binary_format::file_format::SignatureToken::Signer" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::SignatureToken::Signer" [] + Value.StructTuple + "move_binary_format::file_format::SignatureToken::Signer" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -21506,6 +21879,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -21547,6 +21922,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::Struct" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::StructHandleIndex", @@ -21576,6 +21953,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::StructInstantiation" + [] + [] [ M.call_closure (| Ty.apply @@ -21637,6 +22016,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::Reference" + [] + [] [ M.call_closure (| Ty.apply @@ -21678,6 +22059,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::MutableReference" + [] + [] [ M.call_closure (| Ty.apply @@ -21719,6 +22102,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::TypeParameter" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -21744,7 +22129,11 @@ Module file_format. "move_binary_format::file_format::SignatureToken::U16" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::SignatureToken::U16" [] + Value.StructTuple + "move_binary_format::file_format::SignatureToken::U16" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -21755,7 +22144,11 @@ Module file_format. "move_binary_format::file_format::SignatureToken::U32" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::SignatureToken::U32" [] + Value.StructTuple + "move_binary_format::file_format::SignatureToken::U32" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -21766,7 +22159,11 @@ Module file_format. "move_binary_format::file_format::SignatureToken::U256" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::SignatureToken::U256" [] + Value.StructTuple + "move_binary_format::file_format::SignatureToken::U256" + [] + [] + [] |))) ] |) @@ -22490,7 +22887,7 @@ Module file_format. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] |))) + (M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] |))) ] |))); fun γ => @@ -23890,12 +24287,30 @@ Module file_format. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] + ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| tok |) |) |) ] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] + ] + [] + |))) ] |) |))) @@ -24730,6 +25145,17 @@ Module file_format. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ]; + Ty.path "usize" + ] + ] [ Value.Tuple [ @@ -24741,7 +25167,22 @@ Module file_format. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ]; + Ty.path "usize" + ] + ] + [] + |))) ] |) |))) @@ -25867,7 +26308,7 @@ Module file_format. 0 |) in M.alloc (| - Value.StructTuple "move_binary_format::SignatureTokenKind::Reference" [] + Value.StructTuple "move_binary_format::SignatureTokenKind::Reference" [] [] [] |))); fun γ => ltac:(M.monadic @@ -25882,6 +26323,8 @@ Module file_format. Value.StructTuple "move_binary_format::SignatureTokenKind::MutableReference" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -26006,7 +26449,11 @@ Module file_format. | [] => ltac:(M.monadic (M.alloc (| - Value.StructTuple "move_binary_format::SignatureTokenKind::Value" [] + Value.StructTuple + "move_binary_format::SignatureTokenKind::Value" + [] + [] + [] |))) | _ => M.impossible "wrong number of arguments" end) @@ -26021,7 +26468,7 @@ Module file_format. 0 |) in M.alloc (| - Value.StructTuple "move_binary_format::SignatureTokenKind::Value" [] + Value.StructTuple "move_binary_format::SignatureTokenKind::Value" [] [] [] |))) ] |) @@ -26914,6 +27361,8 @@ Module file_format. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::file_format::SignatureTokenPreorderTraversalIter" + [] + [] [ ("stack", M.call_closure (| @@ -27020,6 +27469,8 @@ Module file_format. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::file_format::SignatureTokenPreorderTraversalIterWithDepth" + [] + [] [ ("stack", M.call_closure (| @@ -27163,6 +27614,8 @@ Module file_format. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::file_format::Constant" + [] + [] [ ("type_", M.call_closure (| @@ -27576,6 +28029,8 @@ Module file_format. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::file_format::CodeUnit" + [] + [] [ ("locals", M.call_closure (| @@ -27743,6 +28198,8 @@ Module file_format. ltac:(M.monadic (Value.StructRecord "move_binary_format::file_format::CodeUnit" + [] + [] [ ("locals", M.call_closure (| @@ -28475,7 +28932,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Pop" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Pop" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Pop" [] [] [] |))); fun γ => ltac:(M.monadic @@ -28483,7 +28940,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Ret" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Ret" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Ret" [] [] [] |))); fun γ => ltac:(M.monadic @@ -28498,6 +28955,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::BrTrue" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -28527,6 +28986,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::BrFalse" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -28556,6 +29017,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::Branch" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -28585,6 +29048,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::LdU8" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -28614,6 +29079,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::LdU64" + [] + [] [ M.call_closure (| Ty.path "u64", @@ -28643,6 +29110,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::LdU128" + [] + [] [ M.call_closure (| Ty.apply @@ -28674,7 +29143,7 @@ Module file_format. "move_binary_format::file_format::Bytecode::CastU8" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::CastU8" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::CastU8" [] [] [] |))); fun γ => ltac:(M.monadic @@ -28685,7 +29154,11 @@ Module file_format. "move_binary_format::file_format::Bytecode::CastU64" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::CastU64" [] + Value.StructTuple + "move_binary_format::file_format::Bytecode::CastU64" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -28696,7 +29169,11 @@ Module file_format. "move_binary_format::file_format::Bytecode::CastU128" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::CastU128" [] + Value.StructTuple + "move_binary_format::file_format::Bytecode::CastU128" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -28711,6 +29188,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::LdConst" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::ConstantPoolIndex", @@ -28736,7 +29215,7 @@ Module file_format. "move_binary_format::file_format::Bytecode::LdTrue" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::LdTrue" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::LdTrue" [] [] [] |))); fun γ => ltac:(M.monadic @@ -28747,7 +29226,11 @@ Module file_format. "move_binary_format::file_format::Bytecode::LdFalse" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::LdFalse" [] + Value.StructTuple + "move_binary_format::file_format::Bytecode::LdFalse" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -28762,6 +29245,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::CopyLoc" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -28791,6 +29276,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MoveLoc" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -28820,6 +29307,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::StLoc" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -28849,6 +29338,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::Call" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::FunctionHandleIndex", @@ -28878,6 +29369,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::CallGeneric" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::FunctionInstantiationIndex", @@ -28907,6 +29400,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::Pack" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::StructDefinitionIndex", @@ -28936,6 +29431,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::PackGeneric" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::StructDefInstantiationIndex", @@ -28966,6 +29463,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::Unpack" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::StructDefinitionIndex", @@ -28995,6 +29494,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::UnpackGeneric" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::StructDefInstantiationIndex", @@ -29021,7 +29522,11 @@ Module file_format. "move_binary_format::file_format::Bytecode::ReadRef" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::ReadRef" [] + Value.StructTuple + "move_binary_format::file_format::Bytecode::ReadRef" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -29032,7 +29537,11 @@ Module file_format. "move_binary_format::file_format::Bytecode::WriteRef" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::WriteRef" [] + Value.StructTuple + "move_binary_format::file_format::Bytecode::WriteRef" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -29043,7 +29552,11 @@ Module file_format. "move_binary_format::file_format::Bytecode::FreezeRef" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::FreezeRef" [] + Value.StructTuple + "move_binary_format::file_format::Bytecode::FreezeRef" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -29058,6 +29571,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MutBorrowLoc" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -29087,6 +29602,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::ImmBorrowLoc" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -29116,6 +29633,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MutBorrowField" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::FieldHandleIndex", @@ -29145,6 +29664,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MutBorrowFieldGeneric" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::FieldInstantiationIndex", @@ -29174,6 +29695,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::ImmBorrowField" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::FieldHandleIndex", @@ -29203,6 +29726,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::ImmBorrowFieldGeneric" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::FieldInstantiationIndex", @@ -29225,7 +29750,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Add" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Add" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Add" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29233,7 +29758,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Sub" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Sub" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Sub" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29241,7 +29766,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Mul" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Mul" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Mul" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29249,7 +29774,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Mod" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Mod" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Mod" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29257,7 +29782,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Div" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Div" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Div" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29268,7 +29793,7 @@ Module file_format. "move_binary_format::file_format::Bytecode::BitOr" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::BitOr" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::BitOr" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29279,7 +29804,7 @@ Module file_format. "move_binary_format::file_format::Bytecode::BitAnd" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::BitAnd" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::BitAnd" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29287,7 +29812,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Xor" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Xor" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Xor" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29295,7 +29820,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Or" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Or" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Or" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29303,7 +29828,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::And" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::And" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::And" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29311,7 +29836,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Not" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Not" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Not" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29319,7 +29844,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Eq" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Eq" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Eq" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29327,7 +29852,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Neq" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Neq" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Neq" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29335,7 +29860,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Lt" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Lt" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Lt" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29343,7 +29868,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Gt" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Gt" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Gt" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29351,7 +29876,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Le" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Le" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Le" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29359,7 +29884,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Ge" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Ge" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Ge" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29370,7 +29895,7 @@ Module file_format. "move_binary_format::file_format::Bytecode::Abort" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Abort" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Abort" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29378,7 +29903,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Nop" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Nop" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Nop" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29386,7 +29911,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Shl" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Shl" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Shl" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29394,7 +29919,7 @@ Module file_format. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Shr" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::Shr" [] + Value.StructTuple "move_binary_format::file_format::Bytecode::Shr" [] [] [] |))); fun γ => ltac:(M.monadic @@ -29416,6 +29941,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::VecPack" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::SignatureIndex", @@ -29458,6 +29985,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::VecLen" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::SignatureIndex", @@ -29487,6 +30016,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::VecImmBorrow" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::SignatureIndex", @@ -29516,6 +30047,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::VecMutBorrow" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::SignatureIndex", @@ -29545,6 +30078,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::VecPushBack" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::SignatureIndex", @@ -29574,6 +30109,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::VecPopBack" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::SignatureIndex", @@ -29610,6 +30147,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::VecUnpack" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::SignatureIndex", @@ -29652,6 +30191,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::VecSwap" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::SignatureIndex", @@ -29681,6 +30222,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::LdU16" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -29710,6 +30253,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::LdU32" + [] + [] [ M.call_closure (| Ty.path "u32", @@ -29739,6 +30284,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::LdU256" + [] + [] [ M.call_closure (| Ty.apply @@ -29776,7 +30323,11 @@ Module file_format. "move_binary_format::file_format::Bytecode::CastU16" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::CastU16" [] + Value.StructTuple + "move_binary_format::file_format::Bytecode::CastU16" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -29787,7 +30338,11 @@ Module file_format. "move_binary_format::file_format::Bytecode::CastU32" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::CastU32" [] + Value.StructTuple + "move_binary_format::file_format::Bytecode::CastU32" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -29798,7 +30353,11 @@ Module file_format. "move_binary_format::file_format::Bytecode::CastU256" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::Bytecode::CastU256" [] + Value.StructTuple + "move_binary_format::file_format::Bytecode::CastU256" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -29813,6 +30372,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::ExistsDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::StructDefinitionIndex", @@ -29842,6 +30403,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::ExistsGenericDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::StructDefInstantiationIndex", @@ -29872,6 +30435,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MoveFromDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::StructDefinitionIndex", @@ -29901,6 +30466,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MoveFromGenericDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::StructDefInstantiationIndex", @@ -29931,6 +30498,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MoveToDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::StructDefinitionIndex", @@ -29960,6 +30529,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MoveToGenericDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::StructDefInstantiationIndex", @@ -29990,6 +30561,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MutBorrowGlobalDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::StructDefinitionIndex", @@ -30019,6 +30592,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::MutBorrowGlobalGenericDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::StructDefInstantiationIndex", @@ -30049,6 +30624,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::ImmBorrowGlobalDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::StructDefinitionIndex", @@ -30078,6 +30655,8 @@ Module file_format. M.alloc (| Value.StructTuple "move_binary_format::file_format::Bytecode::ImmBorrowGlobalGenericDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::StructDefInstantiationIndex", @@ -31918,6 +32497,8 @@ Module file_format. (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "u16" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -31929,7 +32510,14 @@ Module file_format. end) |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "u16" ] ] + [] + |))) ] |) |))) @@ -40060,6 +40648,8 @@ Module file_format. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::file_format::CompiledModule" + [] + [] [ ("version", M.call_closure (| @@ -41169,6 +41759,8 @@ Module file_format. ltac:(M.monadic (Value.StructRecord "move_binary_format::file_format::CompiledModule" + [] + [] [ ("version", M.call_closure (| @@ -48013,6 +48605,11 @@ Module file_format. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::AbilitySet"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| get_associated_constant (| @@ -48060,6 +48657,11 @@ Module file_format. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::AbilitySet"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| get_associated_constant (| @@ -48084,6 +48686,11 @@ Module file_format. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::AbilitySet"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| get_associated_constant (| @@ -48107,6 +48714,11 @@ Module file_format. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::AbilitySet"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| M.SubPointer.get_array_field (| @@ -48476,6 +49088,11 @@ Module file_format. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::AbilitySet"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -49446,6 +50063,8 @@ Module file_format. ltac:(M.monadic (Value.StructRecord "move_binary_format::file_format::CompiledModule" + [] + [] [ ("version", M.read (| @@ -49508,14 +50127,20 @@ Module file_format. [ Value.StructRecord "move_binary_format::file_format::ModuleHandle" + [] + [] [ ("address", Value.StructTuple "move_binary_format::file_format::AddressIdentifierIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ]); ("name", Value.StructTuple "move_binary_format::file_format::IdentifierIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ]) ] ] @@ -49528,6 +50153,8 @@ Module file_format. ("self_module_handle_idx", Value.StructTuple "move_binary_format::file_format::ModuleHandleIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ]); ("identifiers", M.call_closure (| @@ -49987,6 +50614,8 @@ Module file_format. [ Value.StructTuple "move_binary_format::file_format::Signature" + [] + [] [ M.call_closure (| Ty.apply @@ -50119,14 +50748,20 @@ Module file_format. |); Value.StructRecord "move_binary_format::file_format::FunctionHandle" + [] + [] [ ("module", Value.StructTuple "move_binary_format::file_format::ModuleHandleIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ]); ("name", Value.StructTuple "move_binary_format::file_format::IdentifierIndex" + [] + [] [ M.cast (Ty.path "u16") @@ -50159,10 +50794,14 @@ Module file_format. ("parameters", Value.StructTuple "move_binary_format::file_format::SignatureIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ]); ("return_", Value.StructTuple "move_binary_format::file_format::SignatureIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ]); ("type_parameters", M.call_closure (| @@ -50291,14 +50930,20 @@ Module file_format. |); Value.StructRecord "move_binary_format::file_format::FunctionDefinition" + [] + [] [ ("function", Value.StructTuple "move_binary_format::file_format::FunctionHandleIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ]); ("visibility", Value.StructTuple "move_binary_format::file_format::Visibility::Private" + [] + [] []); ("is_entry", Value.Bool false); ("acquires_global_resources", @@ -50327,13 +50972,19 @@ Module file_format. ("code", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_binary_format::file_format::CodeUnit" ] [ Value.StructRecord "move_binary_format::file_format::CodeUnit" + [] + [] [ ("locals", Value.StructTuple "move_binary_format::file_format::SignatureIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ]); ("code", M.call_closure (| @@ -50396,6 +51047,8 @@ Module file_format. Value.StructTuple "move_binary_format::file_format::Bytecode::Ret" [] + [] + [] ] |) ] @@ -50436,14 +51089,20 @@ Module file_format. |); Value.StructRecord "move_binary_format::file_format::StructHandle" + [] + [] [ ("module", Value.StructTuple "move_binary_format::file_format::ModuleHandleIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ]); ("name", Value.StructTuple "move_binary_format::file_format::IdentifierIndex" + [] + [] [ M.cast (Ty.path "u16") @@ -50608,14 +51267,20 @@ Module file_format. |); Value.StructRecord "move_binary_format::file_format::StructDefinition" + [] + [] [ ("struct_handle", Value.StructTuple "move_binary_format::file_format::StructHandleIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ]); ("field_information", Value.StructTuple "move_binary_format::file_format::StructFieldInformation::Declared" + [] + [] [ M.call_closure (| Ty.apply @@ -50676,10 +51341,14 @@ Module file_format. [ Value.StructRecord "move_binary_format::file_format::FieldDefinition" + [] + [] [ ("name", Value.StructTuple "move_binary_format::file_format::IdentifierIndex" + [] + [] [ M.cast (Ty.path "u16") @@ -50713,10 +51382,14 @@ Module file_format. ("signature", Value.StructTuple "move_binary_format::file_format::TypeSignature" + [] + [] [ Value.StructTuple "move_binary_format::file_format::SignatureToken::U64" [] + [] + [] ]) ] ] diff --git a/CoqOfRust/move_sui/translations/move_binary_format/file_format_common.v b/CoqOfRust/move_sui/translations/move_binary_format/file_format_common.v index e361d7bc3..ca4540995 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/file_format_common.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/file_format_common.v @@ -3006,6 +3006,8 @@ Module file_format_common. ltac:(M.monadic (Value.StructRecord "move_binary_format::file_format_common::BinaryData" + [] + [] [ ("_binary", M.call_closure (| @@ -3115,6 +3117,8 @@ Module file_format_common. ltac:(M.monadic (Value.StructRecord "move_binary_format::file_format_common::BinaryData" + [] + [] [ ("_binary", M.call_closure (| @@ -3343,6 +3347,8 @@ Module file_format_common. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -3508,7 +3514,13 @@ Module file_format_common. |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3666,6 +3678,8 @@ Module file_format_common. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -3882,7 +3896,13 @@ Module file_format_common. |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4031,6 +4051,8 @@ Module file_format_common. (let vec := M.alloc (| vec |) in Value.StructRecord "move_binary_format::file_format_common::BinaryData" + [] + [] [ ("_binary", M.read (| vec |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4353,7 +4375,13 @@ Module file_format_common. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4785,6 +4813,8 @@ Module file_format_common. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u8"; Ty.path "anyhow::Error" ] [ M.read (| M.SubPointer.get_array_field (| buf, Value.Integer IntegerKind.Usize 0 |) @@ -4957,6 +4987,8 @@ Module file_format_common. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u32"; Ty.path "anyhow::Error" ] [ M.call_closure (| Ty.path "u32", @@ -5106,6 +5138,8 @@ Module file_format_common. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u64"; Ty.path "anyhow::Error" ] [ M.read (| let~ error : @@ -5262,6 +5296,11 @@ Module file_format_common. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u64"; + Ty.path "anyhow::Error" + ] [ M.read (| let~ error : @@ -5332,6 +5371,8 @@ Module file_format_common. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u64"; Ty.path "anyhow::Error" ] [ M.read (| value |) ] |) |) @@ -5406,6 +5447,8 @@ Module file_format_common. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u64"; Ty.path "anyhow::Error" ] [ M.read (| let~ error : Ty.apply (Ty.path "*") [] [ Ty.path "anyhow::Error" ] := @@ -5637,7 +5680,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::Pop" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::POP" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::POP" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5648,7 +5695,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::Ret" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::RET" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::RET" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5663,6 +5714,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::BR_TRUE" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5677,6 +5730,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::BR_FALSE" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5691,6 +5746,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::BRANCH" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5705,6 +5762,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::LD_U8" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5719,6 +5778,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::LD_U64" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5733,6 +5794,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::LD_U128" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5746,6 +5809,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::CAST_U8" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5759,6 +5824,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::CAST_U64" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5772,6 +5839,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::CAST_U128" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5786,6 +5855,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::LD_CONST" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5799,6 +5870,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::LD_TRUE" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5812,6 +5885,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::LD_FALSE" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5826,6 +5901,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::COPY_LOC" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5840,6 +5917,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::MOVE_LOC" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5854,6 +5933,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::ST_LOC" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5865,7 +5946,11 @@ Module file_format_common. 0 |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::CALL" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::CALL" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5880,6 +5965,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::CALL_GENERIC" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5891,7 +5978,11 @@ Module file_format_common. 0 |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::PACK" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::PACK" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5906,6 +5997,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::PACK_GENERIC" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5920,6 +6013,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::UNPACK" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5934,6 +6029,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::UNPACK_GENERIC" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5947,6 +6044,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::READ_REF" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5960,6 +6059,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::WRITE_REF" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5973,6 +6074,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::FREEZE_REF" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -5987,6 +6090,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::MUT_BORROW_LOC" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6001,6 +6106,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::IMM_BORROW_LOC" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6015,6 +6122,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::MUT_BORROW_FIELD" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6029,6 +6138,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::MUT_BORROW_FIELD_GENERIC" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6043,6 +6154,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::IMM_BORROW_FIELD" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6057,6 +6170,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::IMM_BORROW_FIELD_GENERIC" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6067,7 +6182,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::Add" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::ADD" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::ADD" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6078,7 +6197,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::Sub" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::SUB" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::SUB" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6089,7 +6212,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::Mul" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::MUL" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::MUL" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6100,7 +6227,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::Mod" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::MOD" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::MOD" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6111,7 +6242,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::Div" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::DIV" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::DIV" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6125,6 +6260,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::BIT_OR" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6138,6 +6275,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::BIT_AND" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6148,7 +6287,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::Xor" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::XOR" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::XOR" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6159,7 +6302,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::Shl" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::SHL" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::SHL" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6170,7 +6317,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::Shr" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::SHR" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::SHR" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6181,7 +6332,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::Or" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::OR" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::OR" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6192,7 +6347,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::And" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::AND" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::AND" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6203,7 +6362,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::Not" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::NOT" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::NOT" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6214,7 +6377,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::Eq" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::EQ" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::EQ" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6225,7 +6392,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::Neq" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::NEQ" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::NEQ" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6236,7 +6407,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::Lt" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::LT" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::LT" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6247,7 +6422,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::Gt" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::GT" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::GT" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6258,7 +6437,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::Le" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::LE" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::LE" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6269,7 +6452,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::Ge" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::GE" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::GE" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6283,6 +6470,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::ABORT" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6293,7 +6482,11 @@ Module file_format_common. "move_binary_format::file_format::Bytecode::Nop" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format_common::Opcodes::NOP" [] + Value.StructTuple + "move_binary_format::file_format_common::Opcodes::NOP" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6307,6 +6500,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::VEC_PACK" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6321,6 +6516,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::VEC_LEN" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6335,6 +6532,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::VEC_IMM_BORROW" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6349,6 +6548,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::VEC_MUT_BORROW" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6363,6 +6564,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::VEC_PUSH_BACK" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6377,6 +6580,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::VEC_POP_BACK" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6390,6 +6595,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::VEC_UNPACK" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6404,6 +6611,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::VEC_SWAP" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6418,6 +6627,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::LD_U16" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6432,6 +6643,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::LD_U32" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6446,6 +6659,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::LD_U256" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6459,6 +6674,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::CAST_U16" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6472,6 +6689,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::CAST_U32" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6485,6 +6704,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::CAST_U256" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6499,6 +6720,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::EXISTS_DEPRECATED" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6513,6 +6736,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::EXISTS_GENERIC_DEPRECATED" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6527,6 +6752,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::MOVE_FROM_DEPRECATED" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6541,6 +6768,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::MOVE_FROM_GENERIC_DEPRECATED" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6555,6 +6784,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::MOVE_TO_DEPRECATED" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6569,6 +6800,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::MOVE_TO_GENERIC_DEPRECATED" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6583,6 +6816,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::MUT_BORROW_GLOBAL_DEPRECATED" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6597,6 +6832,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::MUT_BORROW_GLOBAL_GENERIC_DEPRECATED" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6611,6 +6848,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::IMM_BORROW_GLOBAL_DEPRECATED" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6625,6 +6864,8 @@ Module file_format_common. Value.StructTuple "move_binary_format::file_format_common::Opcodes::IMM_BORROW_GLOBAL_GENERIC_DEPRECATED" [] + [] + [] |))) ] |) diff --git a/CoqOfRust/move_sui/translations/move_binary_format/lib.v b/CoqOfRust/move_sui/translations/move_binary_format/lib.v index e05d3ef5e..facc3d1eb 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/lib.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/lib.v @@ -735,24 +735,40 @@ Module Impl_move_binary_format_IndexKind. M.alloc (| Value.Array [ - Value.StructTuple "move_binary_format::IndexKind::ModuleHandle" []; - Value.StructTuple "move_binary_format::IndexKind::StructHandle" []; - Value.StructTuple "move_binary_format::IndexKind::FunctionHandle" []; - Value.StructTuple "move_binary_format::IndexKind::FieldHandle" []; - Value.StructTuple "move_binary_format::IndexKind::FriendDeclaration" []; - Value.StructTuple "move_binary_format::IndexKind::StructDefInstantiation" []; - Value.StructTuple "move_binary_format::IndexKind::FunctionInstantiation" []; - Value.StructTuple "move_binary_format::IndexKind::FieldInstantiation" []; - Value.StructTuple "move_binary_format::IndexKind::StructDefinition" []; - Value.StructTuple "move_binary_format::IndexKind::FunctionDefinition" []; - Value.StructTuple "move_binary_format::IndexKind::FieldDefinition" []; - Value.StructTuple "move_binary_format::IndexKind::Signature" []; - Value.StructTuple "move_binary_format::IndexKind::Identifier" []; - Value.StructTuple "move_binary_format::IndexKind::ConstantPool" []; - Value.StructTuple "move_binary_format::IndexKind::LocalPool" []; - Value.StructTuple "move_binary_format::IndexKind::CodeDefinition" []; - Value.StructTuple "move_binary_format::IndexKind::TypeParameter" []; - Value.StructTuple "move_binary_format::IndexKind::MemberCount" [] + Value.StructTuple "move_binary_format::IndexKind::ModuleHandle" [] [] []; + Value.StructTuple "move_binary_format::IndexKind::StructHandle" [] [] []; + Value.StructTuple "move_binary_format::IndexKind::FunctionHandle" [] [] []; + Value.StructTuple "move_binary_format::IndexKind::FieldHandle" [] [] []; + Value.StructTuple "move_binary_format::IndexKind::FriendDeclaration" [] [] []; + Value.StructTuple + "move_binary_format::IndexKind::StructDefInstantiation" + [] + [] + []; + Value.StructTuple + "move_binary_format::IndexKind::FunctionInstantiation" + [] + [] + []; + Value.StructTuple + "move_binary_format::IndexKind::FieldInstantiation" + [] + [] + []; + Value.StructTuple "move_binary_format::IndexKind::StructDefinition" [] [] []; + Value.StructTuple + "move_binary_format::IndexKind::FunctionDefinition" + [] + [] + []; + Value.StructTuple "move_binary_format::IndexKind::FieldDefinition" [] [] []; + Value.StructTuple "move_binary_format::IndexKind::Signature" [] [] []; + Value.StructTuple "move_binary_format::IndexKind::Identifier" [] [] []; + Value.StructTuple "move_binary_format::IndexKind::ConstantPool" [] [] []; + Value.StructTuple "move_binary_format::IndexKind::LocalPool" [] [] []; + Value.StructTuple "move_binary_format::IndexKind::CodeDefinition" [] [] []; + Value.StructTuple "move_binary_format::IndexKind::TypeParameter" [] [] []; + Value.StructTuple "move_binary_format::IndexKind::MemberCount" [] [] [] ] |) |) diff --git a/CoqOfRust/move_sui/translations/move_binary_format/normalized.v b/CoqOfRust/move_sui/translations/move_binary_format/normalized.v index 39247da73..9944209fe 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/normalized.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/normalized.v @@ -145,21 +145,23 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Type::Bool" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::Bool" [] + Value.StructTuple "move_binary_format::normalized::Type::Bool" [] [] [] |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Type::U8" |) in - M.alloc (| Value.StructTuple "move_binary_format::normalized::Type::U8" [] |))); + M.alloc (| + Value.StructTuple "move_binary_format::normalized::Type::U8" [] [] [] + |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Type::U64" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::U64" [] + Value.StructTuple "move_binary_format::normalized::Type::U64" [] [] [] |))); fun γ => ltac:(M.monadic @@ -167,7 +169,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Type::U128" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::U128" [] + Value.StructTuple "move_binary_format::normalized::Type::U128" [] [] [] |))); fun γ => ltac:(M.monadic @@ -175,7 +177,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Type::Address" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::Address" [] + Value.StructTuple "move_binary_format::normalized::Type::Address" [] [] [] |))); fun γ => ltac:(M.monadic @@ -183,7 +185,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Type::Signer" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::Signer" [] + Value.StructTuple "move_binary_format::normalized::Type::Signer" [] [] [] |))); fun γ => ltac:(M.monadic @@ -219,6 +221,8 @@ Module normalized. M.alloc (| Value.StructRecord "move_binary_format::normalized::Type::Struct" + [] + [] [ ("address", M.call_closure (| @@ -307,6 +311,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Type::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -348,6 +354,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Type::TypeParameter" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -377,6 +385,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Type::Reference" + [] + [] [ M.call_closure (| Ty.apply @@ -418,6 +428,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Type::MutableReference" + [] + [] [ M.call_closure (| Ty.apply @@ -452,7 +464,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Type::U16" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::U16" [] + Value.StructTuple "move_binary_format::normalized::Type::U16" [] [] [] |))); fun γ => ltac:(M.monadic @@ -460,7 +472,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Type::U32" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::U32" [] + Value.StructTuple "move_binary_format::normalized::Type::U32" [] [] [] |))); fun γ => ltac:(M.monadic @@ -468,7 +480,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Type::U256" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::U256" [] + Value.StructTuple "move_binary_format::normalized::Type::U256" [] [] [] |))) ] |) @@ -1414,7 +1426,7 @@ Module normalized. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] |))) + (M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] |))) ] |))); fun γ => @@ -2950,6 +2962,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -3030,6 +3057,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -3109,6 +3151,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -3185,6 +3242,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -3272,6 +3344,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -3632,9 +3719,21 @@ Module normalized. |); Value.StructRecord "move_binary_format::normalized::_'1::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_binary_format::normalized::Type" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -3764,6 +3863,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -3846,6 +3960,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -3927,6 +4056,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -4013,9 +4157,21 @@ Module normalized. |); Value.StructRecord "move_binary_format::normalized::_'3::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_binary_format::normalized::Field" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -4145,6 +4301,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -4227,6 +4398,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -4313,6 +4499,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -4399,9 +4600,21 @@ Module normalized. |); Value.StructRecord "move_binary_format::normalized::_'5::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_binary_format::normalized::Constant" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -4538,6 +4751,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -4620,6 +4848,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -4709,6 +4952,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -4798,6 +5056,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -4884,9 +5157,21 @@ Module normalized. |); Value.StructRecord "move_binary_format::normalized::_'7::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_binary_format::normalized::Struct" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -5044,6 +5329,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -5126,6 +5426,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -5207,6 +5522,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -5296,6 +5626,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -5385,6 +5730,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -5474,6 +5834,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -5563,6 +5938,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -5649,9 +6039,21 @@ Module normalized. |); Value.StructRecord "move_binary_format::normalized::_'9::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_binary_format::normalized::Function" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -5781,6 +6183,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -5863,6 +6280,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -5944,6 +6376,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -6030,9 +6477,21 @@ Module normalized. |); Value.StructRecord "move_binary_format::normalized::_'11::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_binary_format::normalized::FieldRef" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -6162,6 +6621,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -6244,6 +6718,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -6325,6 +6814,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -6411,9 +6915,21 @@ Module normalized. |); Value.StructRecord "move_binary_format::normalized::_'13::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_binary_format::normalized::FunctionRef" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -8456,6 +8972,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -8535,6 +9066,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -8613,6 +9159,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -8944,6 +9505,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -9023,6 +9599,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -9101,6 +9692,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -9857,9 +10463,21 @@ Module normalized. |); Value.StructRecord "move_binary_format::normalized::_'15::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_binary_format::normalized::Bytecode" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -10033,6 +10651,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -10115,6 +10748,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -10196,6 +10844,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -10277,6 +10940,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -10366,6 +11044,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -10455,6 +11148,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -10545,6 +11253,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -10635,6 +11358,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -10724,6 +11462,21 @@ Module normalized. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -10810,9 +11563,21 @@ Module normalized. |); Value.StructRecord "move_binary_format::normalized::_'17::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_binary_format::normalized::Module" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -10853,6 +11618,8 @@ Module normalized. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::normalized::Field" + [] + [] [ ("name", M.call_closure (| @@ -11417,6 +12184,8 @@ Module normalized. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::normalized::Constant" + [] + [] [ ("type_", M.call_closure (| @@ -12014,6 +12783,8 @@ Module normalized. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::normalized::Struct" + [] + [] [ ("abilities", M.call_closure (| @@ -12900,6 +13671,8 @@ Module normalized. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::normalized::Function" + [] + [] [ ("visibility", M.call_closure (| @@ -14578,6 +15351,8 @@ Module normalized. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::normalized::FieldRef" + [] + [] [ ("struct_name", M.call_closure (| @@ -15128,6 +15903,8 @@ Module normalized. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::normalized::FunctionRef" + [] + [] [ ("module_id", M.call_closure (| @@ -16303,7 +17080,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::Pop" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Pop" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Pop" [] [] [] |))); fun γ => ltac:(M.monadic @@ -16311,7 +17088,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::Ret" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Ret" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Ret" [] [] [] |))); fun γ => ltac:(M.monadic @@ -16326,6 +17103,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::BrTrue" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -16355,6 +17134,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::BrFalse" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -16384,6 +17165,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::Branch" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -16413,6 +17196,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::LdU8" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -16442,6 +17227,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::LdU64" + [] + [] [ M.call_closure (| Ty.path "u64", @@ -16471,6 +17258,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::LdU128" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -16496,7 +17285,7 @@ Module normalized. "move_binary_format::normalized::Bytecode::CastU8" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::CastU8" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::CastU8" [] [] [] |))); fun γ => ltac:(M.monadic @@ -16507,7 +17296,7 @@ Module normalized. "move_binary_format::normalized::Bytecode::CastU64" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::CastU64" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::CastU64" [] [] [] |))); fun γ => ltac:(M.monadic @@ -16518,7 +17307,11 @@ Module normalized. "move_binary_format::normalized::Bytecode::CastU128" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::CastU128" [] + Value.StructTuple + "move_binary_format::normalized::Bytecode::CastU128" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -16533,6 +17326,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::LdConst" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::Constant", @@ -16558,7 +17353,7 @@ Module normalized. "move_binary_format::normalized::Bytecode::LdTrue" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::LdTrue" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::LdTrue" [] [] [] |))); fun γ => ltac:(M.monadic @@ -16569,7 +17364,7 @@ Module normalized. "move_binary_format::normalized::Bytecode::LdFalse" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::LdFalse" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::LdFalse" [] [] [] |))); fun γ => ltac:(M.monadic @@ -16584,6 +17379,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::CopyLoc" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -16613,6 +17410,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MoveLoc" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -16642,6 +17441,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::StLoc" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -16671,6 +17472,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::Call" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::FunctionRef", @@ -16700,6 +17503,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::CallGeneric" + [] + [] [ M.call_closure (| Ty.tuple @@ -16749,6 +17554,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::Pack" + [] + [] [ M.call_closure (| Ty.path "move_core_types::identifier::Identifier", @@ -16778,6 +17585,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::PackGeneric" + [] + [] [ M.call_closure (| Ty.tuple @@ -16827,6 +17636,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::Unpack" + [] + [] [ M.call_closure (| Ty.path "move_core_types::identifier::Identifier", @@ -16856,6 +17667,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::UnpackGeneric" + [] + [] [ M.call_closure (| Ty.tuple @@ -16901,7 +17714,7 @@ Module normalized. "move_binary_format::normalized::Bytecode::ReadRef" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::ReadRef" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::ReadRef" [] [] [] |))); fun γ => ltac:(M.monadic @@ -16912,7 +17725,11 @@ Module normalized. "move_binary_format::normalized::Bytecode::WriteRef" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::WriteRef" [] + Value.StructTuple + "move_binary_format::normalized::Bytecode::WriteRef" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -16923,7 +17740,11 @@ Module normalized. "move_binary_format::normalized::Bytecode::FreezeRef" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::FreezeRef" [] + Value.StructTuple + "move_binary_format::normalized::Bytecode::FreezeRef" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -16938,6 +17759,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MutBorrowLoc" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -16967,6 +17790,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::ImmBorrowLoc" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -16996,6 +17821,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MutBorrowField" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::FieldRef", @@ -17025,6 +17852,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MutBorrowFieldGeneric" + [] + [] [ M.call_closure (| Ty.tuple @@ -17074,6 +17903,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::ImmBorrowField" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::FieldRef", @@ -17103,6 +17934,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::ImmBorrowFieldGeneric" + [] + [] [ M.call_closure (| Ty.tuple @@ -17145,7 +17978,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::Add" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Add" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Add" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17153,7 +17986,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::Sub" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Sub" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Sub" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17161,7 +17994,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::Mul" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Mul" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Mul" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17169,7 +18002,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::Mod" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Mod" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Mod" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17177,7 +18010,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::Div" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Div" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Div" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17188,7 +18021,7 @@ Module normalized. "move_binary_format::normalized::Bytecode::BitOr" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::BitOr" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::BitOr" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17199,7 +18032,7 @@ Module normalized. "move_binary_format::normalized::Bytecode::BitAnd" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::BitAnd" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::BitAnd" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17207,7 +18040,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::Xor" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Xor" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Xor" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17215,7 +18048,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::Or" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Or" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Or" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17223,7 +18056,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::And" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::And" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::And" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17231,7 +18064,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::Not" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Not" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Not" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17239,7 +18072,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::Eq" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Eq" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Eq" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17247,7 +18080,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::Neq" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Neq" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Neq" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17255,7 +18088,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::Lt" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Lt" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Lt" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17263,7 +18096,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::Gt" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Gt" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Gt" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17271,7 +18104,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::Le" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Le" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Le" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17279,7 +18112,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::Ge" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Ge" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Ge" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17290,7 +18123,7 @@ Module normalized. "move_binary_format::normalized::Bytecode::Abort" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Abort" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Abort" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17298,7 +18131,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::Nop" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Nop" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Nop" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17306,7 +18139,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::Shl" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Shl" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Shl" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17314,7 +18147,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::normalized::Bytecode::Shr" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Shr" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Shr" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17336,6 +18169,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::VecPack" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::Type", @@ -17378,6 +18213,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::VecLen" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::Type", @@ -17407,6 +18244,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::VecImmBorrow" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::Type", @@ -17436,6 +18275,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::VecMutBorrow" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::Type", @@ -17465,6 +18306,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::VecPushBack" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::Type", @@ -17494,6 +18337,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::VecPopBack" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::Type", @@ -17530,6 +18375,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::VecUnpack" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::Type", @@ -17572,6 +18419,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::VecSwap" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::Type", @@ -17601,6 +18450,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::LdU16" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -17630,6 +18481,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::LdU32" + [] + [] [ M.call_closure (| Ty.path "u32", @@ -17659,6 +18512,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::LdU256" + [] + [] [ M.call_closure (| Ty.path "move_core_types::u256::U256", @@ -17684,7 +18539,7 @@ Module normalized. "move_binary_format::normalized::Bytecode::CastU16" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::CastU16" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::CastU16" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17695,7 +18550,7 @@ Module normalized. "move_binary_format::normalized::Bytecode::CastU32" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::CastU32" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::CastU32" [] [] [] |))); fun γ => ltac:(M.monadic @@ -17706,7 +18561,11 @@ Module normalized. "move_binary_format::normalized::Bytecode::CastU256" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::CastU256" [] + Value.StructTuple + "move_binary_format::normalized::Bytecode::CastU256" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -17721,6 +18580,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MutBorrowGlobalDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_core_types::identifier::Identifier", @@ -17750,6 +18611,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MutBorrowGlobalGenericDeprecated" + [] + [] [ M.call_closure (| Ty.tuple @@ -17799,6 +18662,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::ImmBorrowGlobalDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_core_types::identifier::Identifier", @@ -17828,6 +18693,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::ImmBorrowGlobalGenericDeprecated" + [] + [] [ M.call_closure (| Ty.tuple @@ -17877,6 +18744,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::ExistsDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_core_types::identifier::Identifier", @@ -17906,6 +18775,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::ExistsGenericDeprecated" + [] + [] [ M.call_closure (| Ty.tuple @@ -17955,6 +18826,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MoveFromDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_core_types::identifier::Identifier", @@ -17984,6 +18857,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MoveFromGenericDeprecated" + [] + [] [ M.call_closure (| Ty.tuple @@ -18033,6 +18908,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MoveToDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_core_types::identifier::Identifier", @@ -18062,6 +18939,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MoveToGenericDeprecated" + [] + [] [ M.call_closure (| Ty.tuple @@ -22671,7 +23550,7 @@ Module normalized. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] |))) + (M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] |))) ] |))); fun γ => @@ -25161,7 +26040,9 @@ Module normalized. (M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "core::cmp::Ordering::Equal" [] ] + [] + [ Ty.path "core::cmp::Ordering" ] + [ Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] ] |))) ] |))); @@ -27800,6 +28681,8 @@ Module normalized. let constant := M.alloc (| constant |) in Value.StructRecord "move_binary_format::normalized::Constant" + [] + [] [ ("type_", M.call_closure (| @@ -27929,6 +28812,8 @@ Module normalized. (let self := M.alloc (| self |) in Value.StructRecord "move_binary_format::normalized::Module" + [] + [] [ ("file_format_version", M.call_closure (| @@ -29716,6 +30601,8 @@ Module normalized. M.alloc (| Value.StructRecord "move_binary_format::normalized::Module" + [] + [] [ ("file_format_version", M.call_closure (| @@ -30065,6 +30952,8 @@ Module normalized. M.alloc (| Value.StructRecord "move_binary_format::normalized::Type::Struct" + [] + [] [ ("address", M.read (| @@ -30299,6 +31188,8 @@ Module normalized. M.alloc (| Value.StructRecord "move_binary_format::normalized::Type::Struct" + [] + [] [ ("address", M.read (| @@ -30675,7 +31566,7 @@ Module normalized. "move_binary_format::file_format::SignatureToken::Bool" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::Bool" [] + Value.StructTuple "move_binary_format::normalized::Type::Bool" [] [] [] |))); fun γ => ltac:(M.monadic @@ -30685,7 +31576,9 @@ Module normalized. γ, "move_binary_format::file_format::SignatureToken::U8" |) in - M.alloc (| Value.StructTuple "move_binary_format::normalized::Type::U8" [] |))); + M.alloc (| + Value.StructTuple "move_binary_format::normalized::Type::U8" [] [] [] + |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in @@ -30695,7 +31588,7 @@ Module normalized. "move_binary_format::file_format::SignatureToken::U16" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::U16" [] + Value.StructTuple "move_binary_format::normalized::Type::U16" [] [] [] |))); fun γ => ltac:(M.monadic @@ -30706,7 +31599,7 @@ Module normalized. "move_binary_format::file_format::SignatureToken::U32" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::U32" [] + Value.StructTuple "move_binary_format::normalized::Type::U32" [] [] [] |))); fun γ => ltac:(M.monadic @@ -30717,7 +31610,7 @@ Module normalized. "move_binary_format::file_format::SignatureToken::U64" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::U64" [] + Value.StructTuple "move_binary_format::normalized::Type::U64" [] [] [] |))); fun γ => ltac:(M.monadic @@ -30728,7 +31621,7 @@ Module normalized. "move_binary_format::file_format::SignatureToken::U128" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::U128" [] + Value.StructTuple "move_binary_format::normalized::Type::U128" [] [] [] |))); fun γ => ltac:(M.monadic @@ -30739,7 +31632,7 @@ Module normalized. "move_binary_format::file_format::SignatureToken::U256" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::U256" [] + Value.StructTuple "move_binary_format::normalized::Type::U256" [] [] [] |))); fun γ => ltac:(M.monadic @@ -30750,7 +31643,7 @@ Module normalized. "move_binary_format::file_format::SignatureToken::Address" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::Address" [] + Value.StructTuple "move_binary_format::normalized::Type::Address" [] [] [] |))); fun γ => ltac:(M.monadic @@ -30761,7 +31654,7 @@ Module normalized. "move_binary_format::file_format::SignatureToken::Signer" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::Signer" [] + Value.StructTuple "move_binary_format::normalized::Type::Signer" [] [] [] |))); fun γ => ltac:(M.monadic @@ -30776,6 +31669,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Type::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -30831,6 +31726,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Type::TypeParameter" + [] + [] [ M.read (| M.deref (| M.read (| i |) |) |) ] |))); fun γ => @@ -30846,6 +31743,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Type::Reference" + [] + [] [ M.call_closure (| Ty.apply @@ -30901,6 +31800,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Type::MutableReference" + [] + [] [ M.call_closure (| Ty.apply @@ -31341,6 +32242,8 @@ Module normalized. ltac:(M.monadic (Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_core_types::language_storage::TypeTag" ] [ M.read (| M.match_operator (| @@ -31411,6 +32314,11 @@ Module normalized. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "move_core_types::language_storage::TypeTag" + ] + [] |) |) |) @@ -31429,6 +32337,8 @@ Module normalized. Value.StructTuple "move_core_types::language_storage::TypeTag::Bool" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -31441,6 +32351,8 @@ Module normalized. Value.StructTuple "move_core_types::language_storage::TypeTag::U8" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -31453,6 +32365,8 @@ Module normalized. Value.StructTuple "move_core_types::language_storage::TypeTag::U16" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -31465,6 +32379,8 @@ Module normalized. Value.StructTuple "move_core_types::language_storage::TypeTag::U32" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -31477,6 +32393,8 @@ Module normalized. Value.StructTuple "move_core_types::language_storage::TypeTag::U64" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -31489,6 +32407,8 @@ Module normalized. Value.StructTuple "move_core_types::language_storage::TypeTag::U128" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -31501,6 +32421,8 @@ Module normalized. Value.StructTuple "move_core_types::language_storage::TypeTag::U256" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -31513,6 +32435,8 @@ Module normalized. Value.StructTuple "move_core_types::language_storage::TypeTag::Address" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -31525,6 +32449,8 @@ Module normalized. Value.StructTuple "move_core_types::language_storage::TypeTag::Signer" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -31538,6 +32464,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_core_types::language_storage::TypeTag::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -31642,6 +32570,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_core_types::language_storage::TypeTag::Struct" + [] + [] [ M.call_closure (| Ty.apply @@ -31668,6 +32598,8 @@ Module normalized. [ Value.StructRecord "move_core_types::language_storage::StructTag" + [] + [] [ ("address", M.read (| address |)); ("module", M.read (| module |)); @@ -31923,7 +32855,13 @@ Module normalized. (M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_core_types::language_storage::TypeTag" ] + [] + |) |) |) |))) @@ -32083,11 +33021,19 @@ Module normalized. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_core_types::language_storage::StructTag" ] [ M.read (| M.deref (| M.read (| s |) |) |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_core_types::language_storage::StructTag" ] + [] + |))) ] |) |))) @@ -32264,6 +33210,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Type::Reference" + [] + [] [ M.call_closure (| Ty.apply @@ -32322,6 +33270,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Type::MutableReference" + [] + [] [ M.call_closure (| Ty.apply @@ -32380,6 +33330,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Type::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -32459,6 +33411,8 @@ Module normalized. M.alloc (| Value.StructRecord "move_binary_format::normalized::Type::Struct" + [] + [] [ ("address", M.read (| M.deref (| M.read (| address |) |) |)); ("module", @@ -32816,6 +33770,8 @@ Module normalized. let f := M.alloc (| f |) in Value.StructRecord "move_binary_format::normalized::Field" + [] + [] [ ("name", M.call_closure (| @@ -33321,6 +34277,8 @@ Module normalized. M.alloc (| Value.StructRecord "move_binary_format::normalized::Struct" + [] + [] [ ("abilities", M.read (| @@ -34159,6 +35117,8 @@ Module normalized. M.alloc (| Value.StructRecord "move_binary_format::normalized::Function" + [] + [] [ ("visibility", M.read (| @@ -34978,6 +35938,11 @@ Module normalized. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "move_binary_format::normalized::Function" + ] [ M.read (| M.SubPointer.get_tuple_field (| @@ -35031,7 +35996,13 @@ Module normalized. |))) ] |)) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_binary_format::normalized::Function" ] + [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -35087,13 +36058,15 @@ Module normalized. "move_core_types::language_storage::TypeTag::Bool" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::Bool" [] + Value.StructTuple "move_binary_format::normalized::Type::Bool" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "move_core_types::language_storage::TypeTag::U8" |) in - M.alloc (| Value.StructTuple "move_binary_format::normalized::Type::U8" [] |))); + M.alloc (| + Value.StructTuple "move_binary_format::normalized::Type::U8" [] [] [] + |))); fun γ => ltac:(M.monadic (let _ := @@ -35102,7 +36075,7 @@ Module normalized. "move_core_types::language_storage::TypeTag::U16" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::U16" [] + Value.StructTuple "move_binary_format::normalized::Type::U16" [] [] [] |))); fun γ => ltac:(M.monadic @@ -35112,7 +36085,7 @@ Module normalized. "move_core_types::language_storage::TypeTag::U32" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::U32" [] + Value.StructTuple "move_binary_format::normalized::Type::U32" [] [] [] |))); fun γ => ltac:(M.monadic @@ -35122,7 +36095,7 @@ Module normalized. "move_core_types::language_storage::TypeTag::U64" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::U64" [] + Value.StructTuple "move_binary_format::normalized::Type::U64" [] [] [] |))); fun γ => ltac:(M.monadic @@ -35132,7 +36105,7 @@ Module normalized. "move_core_types::language_storage::TypeTag::U128" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::U128" [] + Value.StructTuple "move_binary_format::normalized::Type::U128" [] [] [] |))); fun γ => ltac:(M.monadic @@ -35142,7 +36115,7 @@ Module normalized. "move_core_types::language_storage::TypeTag::U256" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::U256" [] + Value.StructTuple "move_binary_format::normalized::Type::U256" [] [] [] |))); fun γ => ltac:(M.monadic @@ -35152,7 +36125,7 @@ Module normalized. "move_core_types::language_storage::TypeTag::Address" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::Address" [] + Value.StructTuple "move_binary_format::normalized::Type::Address" [] [] [] |))); fun γ => ltac:(M.monadic @@ -35162,7 +36135,7 @@ Module normalized. "move_core_types::language_storage::TypeTag::Signer" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Type::Signer" [] + Value.StructTuple "move_binary_format::normalized::Type::Signer" [] [] [] |))); fun γ => ltac:(M.monadic @@ -35176,6 +36149,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Type::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -35227,6 +36202,8 @@ Module normalized. M.alloc (| Value.StructRecord "move_binary_format::normalized::Type::Struct" + [] + [] [ ("address", M.read (| @@ -35461,6 +36438,8 @@ Module normalized. let field_handle := M.alloc (| field_handle |) in Value.StructRecord "move_binary_format::normalized::FieldRef" + [] + [] [ ("struct_name", M.call_closure (| @@ -35591,6 +36570,8 @@ Module normalized. let function_handle := M.alloc (| function_handle |) in Value.StructRecord "move_binary_format::normalized::FunctionRef" + [] + [] [ ("module_id", M.call_closure (| @@ -35869,7 +36850,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Pop" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Pop" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Pop" [] [] [] |))); fun γ => ltac:(M.monadic @@ -35877,7 +36858,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Ret" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Ret" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Ret" [] [] [] |))); fun γ => ltac:(M.monadic @@ -35888,7 +36869,7 @@ Module normalized. "move_binary_format::file_format::Bytecode::CastU8" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::CastU8" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::CastU8" [] [] [] |))); fun γ => ltac:(M.monadic @@ -35899,7 +36880,7 @@ Module normalized. "move_binary_format::file_format::Bytecode::CastU64" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::CastU64" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::CastU64" [] [] [] |))); fun γ => ltac:(M.monadic @@ -35910,7 +36891,11 @@ Module normalized. "move_binary_format::file_format::Bytecode::CastU128" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::CastU128" [] + Value.StructTuple + "move_binary_format::normalized::Bytecode::CastU128" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -35921,7 +36906,7 @@ Module normalized. "move_binary_format::file_format::Bytecode::LdTrue" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::LdTrue" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::LdTrue" [] [] [] |))); fun γ => ltac:(M.monadic @@ -35932,7 +36917,7 @@ Module normalized. "move_binary_format::file_format::Bytecode::LdFalse" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::LdFalse" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::LdFalse" [] [] [] |))); fun γ => ltac:(M.monadic @@ -35943,7 +36928,7 @@ Module normalized. "move_binary_format::file_format::Bytecode::ReadRef" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::ReadRef" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::ReadRef" [] [] [] |))); fun γ => ltac:(M.monadic @@ -35954,7 +36939,11 @@ Module normalized. "move_binary_format::file_format::Bytecode::WriteRef" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::WriteRef" [] + Value.StructTuple + "move_binary_format::normalized::Bytecode::WriteRef" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -35965,7 +36954,11 @@ Module normalized. "move_binary_format::file_format::Bytecode::FreezeRef" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::FreezeRef" [] + Value.StructTuple + "move_binary_format::normalized::Bytecode::FreezeRef" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -35973,7 +36966,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Add" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Add" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Add" [] [] [] |))); fun γ => ltac:(M.monadic @@ -35981,7 +36974,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Sub" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Sub" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Sub" [] [] [] |))); fun γ => ltac:(M.monadic @@ -35989,7 +36982,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Mul" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Mul" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Mul" [] [] [] |))); fun γ => ltac:(M.monadic @@ -35997,7 +36990,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Mod" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Mod" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Mod" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36005,7 +36998,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Div" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Div" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Div" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36016,7 +37009,7 @@ Module normalized. "move_binary_format::file_format::Bytecode::BitOr" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::BitOr" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::BitOr" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36027,7 +37020,7 @@ Module normalized. "move_binary_format::file_format::Bytecode::BitAnd" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::BitAnd" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::BitAnd" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36035,7 +37028,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Xor" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Xor" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Xor" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36043,7 +37036,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Or" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Or" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Or" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36051,7 +37044,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::And" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::And" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::And" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36059,7 +37052,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Not" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Not" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Not" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36067,7 +37060,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Eq" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Eq" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Eq" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36075,7 +37068,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Neq" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Neq" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Neq" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36083,7 +37076,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Lt" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Lt" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Lt" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36091,7 +37084,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Gt" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Gt" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Gt" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36099,7 +37092,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Le" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Le" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Le" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36107,7 +37100,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Ge" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Ge" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Ge" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36118,7 +37111,7 @@ Module normalized. "move_binary_format::file_format::Bytecode::Abort" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Abort" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Abort" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36126,7 +37119,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Nop" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Nop" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Nop" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36134,7 +37127,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Shl" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Shl" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Shl" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36142,7 +37135,7 @@ Module normalized. let _ := M.is_struct_tuple (| γ, "move_binary_format::file_format::Bytecode::Shr" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::Shr" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::Shr" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36153,7 +37146,7 @@ Module normalized. "move_binary_format::file_format::Bytecode::CastU16" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::CastU16" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::CastU16" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36164,7 +37157,7 @@ Module normalized. "move_binary_format::file_format::Bytecode::CastU32" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::CastU32" [] + Value.StructTuple "move_binary_format::normalized::Bytecode::CastU32" [] [] [] |))); fun γ => ltac:(M.monadic @@ -36175,7 +37168,11 @@ Module normalized. "move_binary_format::file_format::Bytecode::CastU256" |) in M.alloc (| - Value.StructTuple "move_binary_format::normalized::Bytecode::CastU256" [] + Value.StructTuple + "move_binary_format::normalized::Bytecode::CastU256" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -36190,6 +37187,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::BrTrue" + [] + [] [ M.read (| M.deref (| M.read (| x |) |) |) ] |))); fun γ => @@ -36205,6 +37204,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::BrFalse" + [] + [] [ M.read (| M.deref (| M.read (| x |) |) |) ] |))); fun γ => @@ -36220,6 +37221,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::Branch" + [] + [] [ M.read (| M.deref (| M.read (| x |) |) |) ] |))); fun γ => @@ -36235,6 +37238,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::LdU8" + [] + [] [ M.read (| M.deref (| M.read (| x |) |) |) ] |))); fun γ => @@ -36250,6 +37255,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::LdU64" + [] + [] [ M.read (| M.deref (| M.read (| x |) |) |) ] |))); fun γ => @@ -36265,6 +37272,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::LdU128" + [] + [] [ M.read (| M.deref (| M.read (| M.deref (| M.read (| x |) |) |) |) |) ] |))); fun γ => @@ -36280,6 +37289,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::CopyLoc" + [] + [] [ M.read (| M.deref (| M.read (| x |) |) |) ] |))); fun γ => @@ -36295,6 +37306,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MoveLoc" + [] + [] [ M.read (| M.deref (| M.read (| x |) |) |) ] |))); fun γ => @@ -36310,6 +37323,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::StLoc" + [] + [] [ M.read (| M.deref (| M.read (| x |) |) |) ] |))); fun γ => @@ -36325,6 +37340,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::LdU16" + [] + [] [ M.read (| M.deref (| M.read (| x |) |) |) ] |))); fun γ => @@ -36340,6 +37357,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::LdU32" + [] + [] [ M.read (| M.deref (| M.read (| x |) |) |) ] |))); fun γ => @@ -36355,6 +37374,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::LdU256" + [] + [] [ M.read (| M.deref (| M.read (| M.deref (| M.read (| x |) |) |) |) |) ] |))); fun γ => @@ -36370,6 +37391,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::LdConst" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::Constant", @@ -36419,6 +37442,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::Call" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::FunctionRef", @@ -36517,6 +37542,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::CallGeneric" + [] + [] [ Value.Tuple [ @@ -36798,6 +37825,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::Pack" + [] + [] [ M.call_closure (| Ty.path "move_core_types::identifier::Identifier", @@ -36849,6 +37878,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::PackGeneric" + [] + [] [ M.call_closure (| Ty.tuple @@ -36887,6 +37918,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::Unpack" + [] + [] [ M.call_closure (| Ty.path "move_core_types::identifier::Identifier", @@ -36938,6 +37971,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::UnpackGeneric" + [] + [] [ M.call_closure (| Ty.tuple @@ -36976,6 +38011,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MutBorrowLoc" + [] + [] [ M.read (| M.deref (| M.read (| x |) |) |) ] |))); fun γ => @@ -36991,6 +38028,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::ImmBorrowLoc" + [] + [] [ M.read (| M.deref (| M.read (| x |) |) |) ] |))); fun γ => @@ -37006,6 +38045,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MutBorrowField" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::FieldRef", @@ -37035,6 +38076,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MutBorrowFieldGeneric" + [] + [] [ M.call_closure (| Ty.tuple @@ -37073,6 +38116,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::ImmBorrowField" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::FieldRef", @@ -37102,6 +38147,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::ImmBorrowFieldGeneric" + [] + [] [ M.call_closure (| Ty.tuple @@ -37140,6 +38187,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MutBorrowGlobalDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_core_types::identifier::Identifier", @@ -37191,6 +38240,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MutBorrowGlobalGenericDeprecated" + [] + [] [ M.call_closure (| Ty.tuple @@ -37229,6 +38280,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::ImmBorrowGlobalDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_core_types::identifier::Identifier", @@ -37280,6 +38333,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::ImmBorrowGlobalGenericDeprecated" + [] + [] [ M.call_closure (| Ty.tuple @@ -37318,6 +38373,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::ExistsDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_core_types::identifier::Identifier", @@ -37369,6 +38426,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::ExistsGenericDeprecated" + [] + [] [ M.call_closure (| Ty.tuple @@ -37407,6 +38466,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MoveFromDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_core_types::identifier::Identifier", @@ -37458,6 +38519,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MoveFromGenericDeprecated" + [] + [] [ M.call_closure (| Ty.tuple @@ -37496,6 +38559,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MoveToDeprecated" + [] + [] [ M.call_closure (| Ty.path "move_core_types::identifier::Identifier", @@ -37547,6 +38612,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::MoveToGenericDeprecated" + [] + [] [ M.call_closure (| Ty.tuple @@ -37592,6 +38659,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::VecPack" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::Type", @@ -37621,6 +38690,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::VecLen" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::Type", @@ -37649,6 +38720,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::VecImmBorrow" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::Type", @@ -37677,6 +38750,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::VecMutBorrow" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::Type", @@ -37705,6 +38780,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::VecPushBack" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::Type", @@ -37733,6 +38810,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::VecPopBack" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::Type", @@ -37768,6 +38847,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::VecUnpack" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::Type", @@ -37797,6 +38878,8 @@ Module normalized. M.alloc (| Value.StructTuple "move_binary_format::normalized::Bytecode::VecSwap" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::normalized::Type", @@ -39147,7 +40230,11 @@ Module normalized. ] |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] |))); fun γ => ltac:(M.monadic diff --git a/CoqOfRust/move_sui/translations/move_binary_format/serializer.v b/CoqOfRust/move_sui/translations/move_binary_format/serializer.v index 870d1b6ca..f19143733 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/serializer.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/serializer.v @@ -82,6 +82,8 @@ Module serializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -1565,6 +1567,8 @@ Module serializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -1731,7 +1735,11 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] |))) ] |) @@ -1769,7 +1777,7 @@ Module serializer. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::option::Option::None" []; + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u32" ] []; M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| binary |) |) |) ] |))) @@ -2181,6 +2189,8 @@ Module serializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -2831,7 +2841,13 @@ Module serializer. |) |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3503,6 +3519,8 @@ Module serializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u32"; Ty.path "anyhow::Error" ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -3657,6 +3675,8 @@ Module serializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u32"; Ty.path "anyhow::Error" ] [ M.cast (Ty.path "u32") (M.read (| index |)) ] |) |))) @@ -4039,7 +4059,13 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4282,7 +4308,13 @@ Module serializer. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5095,7 +5127,13 @@ Module serializer. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5900,7 +5938,13 @@ Module serializer. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6889,7 +6933,13 @@ Module serializer. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7245,7 +7295,13 @@ Module serializer. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7489,7 +7545,13 @@ Module serializer. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -8328,7 +8390,13 @@ Module serializer. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -8998,7 +9066,13 @@ Module serializer. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -9367,7 +9441,13 @@ Module serializer. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -9800,7 +9880,13 @@ Module serializer. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -10065,7 +10151,13 @@ Module serializer. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -10432,7 +10524,13 @@ Module serializer. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -10867,7 +10965,13 @@ Module serializer. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -13379,7 +13483,13 @@ Module serializer. M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -13551,6 +13661,8 @@ Module serializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] [ M.read (| let~ error : @@ -13738,7 +13850,13 @@ Module serializer. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -13897,7 +14015,13 @@ Module serializer. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -14252,7 +14376,13 @@ Module serializer. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -14816,6 +14946,8 @@ Module serializer. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -23485,7 +23617,13 @@ Module serializer. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -23846,7 +23984,13 @@ Module serializer. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -24053,6 +24197,8 @@ Module serializer. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u32"; Ty.path "anyhow::Error" ] [ M.call_closure (| Ty.path "u32", @@ -24100,6 +24246,8 @@ Module serializer. (let major_version := M.alloc (| major_version |) in Value.StructRecord "move_binary_format::serializer::CommonSerializer" + [] + [] [ ("major_version", M.read (| major_version |)); ("table_count", Value.Integer IntegerKind.U8 0); @@ -24359,7 +24507,13 @@ Module serializer. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -24598,6 +24752,8 @@ Module serializer. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| binary |) |) |); Value.StructTuple "move_binary_format::file_format_common::TableType::MODULE_HANDLES" + [] + [] []; M.read (| M.SubPointer.get_tuple_field (| @@ -24723,6 +24879,8 @@ Module serializer. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| binary |) |) |); Value.StructTuple "move_binary_format::file_format_common::TableType::STRUCT_HANDLES" + [] + [] []; M.read (| M.SubPointer.get_tuple_field (| @@ -24848,6 +25006,8 @@ Module serializer. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| binary |) |) |); Value.StructTuple "move_binary_format::file_format_common::TableType::FUNCTION_HANDLES" + [] + [] []; M.read (| M.SubPointer.get_tuple_field (| @@ -24973,6 +25133,8 @@ Module serializer. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| binary |) |) |); Value.StructTuple "move_binary_format::file_format_common::TableType::FUNCTION_INST" + [] + [] []; M.read (| M.SubPointer.get_tuple_field (| @@ -25098,6 +25260,8 @@ Module serializer. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| binary |) |) |); Value.StructTuple "move_binary_format::file_format_common::TableType::SIGNATURES" + [] + [] []; M.read (| M.SubPointer.get_tuple_field (| @@ -25223,6 +25387,8 @@ Module serializer. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| binary |) |) |); Value.StructTuple "move_binary_format::file_format_common::TableType::IDENTIFIERS" + [] + [] []; M.read (| M.SubPointer.get_tuple_field (| @@ -25348,6 +25514,8 @@ Module serializer. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| binary |) |) |); Value.StructTuple "move_binary_format::file_format_common::TableType::ADDRESS_IDENTIFIERS" + [] + [] []; M.read (| M.SubPointer.get_tuple_field (| @@ -25473,6 +25641,8 @@ Module serializer. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| binary |) |) |); Value.StructTuple "move_binary_format::file_format_common::TableType::CONSTANT_POOL" + [] + [] []; M.read (| M.SubPointer.get_tuple_field (| @@ -25636,6 +25806,8 @@ Module serializer. |); Value.StructTuple "move_binary_format::file_format_common::TableType::METADATA" + [] + [] []; M.read (| M.SubPointer.get_tuple_field (| @@ -25723,7 +25895,13 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -27158,7 +27336,13 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -27766,7 +27950,13 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -28374,7 +28564,13 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -28988,7 +29184,13 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -29610,7 +29812,13 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -30267,7 +30475,13 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -30882,7 +31096,13 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -31487,7 +31707,13 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -32086,7 +32312,13 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -32691,7 +32923,13 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -32751,6 +32989,8 @@ Module serializer. (let major_version := M.alloc (| major_version |) in Value.StructRecord "move_binary_format::serializer::ModuleSerializer" + [] + [] [ ("common", M.call_closure (| @@ -33968,6 +34208,8 @@ Module serializer. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| binary |) |) |); Value.StructTuple "move_binary_format::file_format_common::TableType::STRUCT_DEFS" + [] + [] []; M.read (| M.SubPointer.get_tuple_field (| @@ -34093,6 +34335,8 @@ Module serializer. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| binary |) |) |); Value.StructTuple "move_binary_format::file_format_common::TableType::STRUCT_DEF_INST" + [] + [] []; M.read (| M.SubPointer.get_tuple_field (| @@ -34218,6 +34462,8 @@ Module serializer. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| binary |) |) |); Value.StructTuple "move_binary_format::file_format_common::TableType::FUNCTION_DEFS" + [] + [] []; M.read (| M.SubPointer.get_tuple_field (| @@ -34343,6 +34589,8 @@ Module serializer. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| binary |) |) |); Value.StructTuple "move_binary_format::file_format_common::TableType::FIELD_HANDLE" + [] + [] []; M.read (| M.SubPointer.get_tuple_field (| @@ -34468,6 +34716,8 @@ Module serializer. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| binary |) |) |); Value.StructTuple "move_binary_format::file_format_common::TableType::FIELD_INST" + [] + [] []; M.read (| M.SubPointer.get_tuple_field (| @@ -34593,6 +34843,8 @@ Module serializer. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| binary |) |) |); Value.StructTuple "move_binary_format::file_format_common::TableType::FRIEND_DECLS" + [] + [] []; M.read (| M.SubPointer.get_tuple_field (| @@ -34676,7 +34928,13 @@ Module serializer. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -35312,7 +35570,13 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -35953,7 +36217,13 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -36566,7 +36836,13 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -37191,7 +37467,13 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -37837,7 +38119,13 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -38099,6 +38387,8 @@ Module serializer. Value.StructTuple "move_binary_format::file_format::Visibility::Public" [] + [] + [] |) |) ] @@ -38887,7 +39177,13 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -39519,7 +39815,13 @@ Module serializer. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/ability_field_requirements.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/ability_field_requirements.v index 99f38dd0b..f696bf642 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/ability_field_requirements.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/ability_field_requirements.v @@ -76,6 +76,8 @@ Module ability_field_requirements. M.read (| e |); Value.StructTuple "move_binary_format::errors::Location::Module" + [] + [] [ M.call_closure (| Ty.path "move_core_types::language_storage::ModuleId", @@ -1366,6 +1368,12 @@ Module ability_field_requirements. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -1378,9 +1386,13 @@ Module ability_field_requirements. [ Value.StructTuple "move_core_types::vm_status::StatusCode::FIELD_MISSING_TYPE_ABILITY" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::StructDefinition" + [] + [] []; M.cast (Ty.path @@ -1414,7 +1426,13 @@ Module ability_field_requirements. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/absint.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/absint.v index 34f769cb6..1c295fe74 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/absint.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/absint.v @@ -146,6 +146,8 @@ Module absint. (let self := M.alloc (| self |) in Value.StructRecord "move_bytecode_verifier::absint::BlockInvariant" + [] + [ State ] [ ("pre", M.call_closure (| @@ -309,7 +311,11 @@ Module absint. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| meter |) |) |); - Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" []; + Value.StructTuple + "move_bytecode_verifier_meter::Scope::Function" + [] + [] + []; M.read (| get_constant (| "move_bytecode_verifier::absint::ANALYZE_FUNCTION_BASE_COST", @@ -503,7 +509,11 @@ Module absint. [] [ Ty.apply (Ty.path "core::option::Option") [] [ Ty.path "u16" ] ] := M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| entry_block_id |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u16" ] + [ M.read (| entry_block_id |) ] |) in let~ _ : Ty.apply @@ -573,6 +583,15 @@ Module absint. M.read (| entry_block_id |); Value.StructRecord "move_bytecode_verifier::absint::BlockInvariant" + [] + [ + Ty.associated_in_trait + "move_bytecode_verifier::absint::TransferFunctions" + [] + [] + Self + "State" + ] [ ("pre", M.read (| initial_state |)) ] ] |) @@ -1260,6 +1279,8 @@ Module absint. |); Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" + [] + [] []; M.read (| get_constant (| @@ -1842,6 +1863,8 @@ Module absint. |); Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" + [] + [] []; M.read (| get_constant (| @@ -1955,6 +1978,11 @@ Module absint. next_block_candidate, Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "u16" + ] [ M.read (| M.deref (| @@ -2070,6 +2098,15 @@ Module absint. |); Value.StructRecord "move_bytecode_verifier::absint::BlockInvariant" + [] + [ + Ty.associated_in_trait + "move_bytecode_verifier::absint::TransferFunctions" + [] + [] + Self + "State" + ] [ ("pre", M.call_closure (| @@ -2134,7 +2171,13 @@ Module absint. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2221,7 +2264,11 @@ Module absint. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| meter |) |) |); - Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" []; + Value.StructTuple + "move_bytecode_verifier_meter::Scope::Function" + [] + [] + []; M.read (| get_constant (| "move_bytecode_verifier::absint::EXECUTE_BLOCK_BASE_COST", @@ -2777,7 +2824,19 @@ Module absint. ] |)) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| state_acc |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.associated_in_trait + "move_bytecode_verifier::absint::TransferFunctions" + [] + [] + Self + "State"; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ M.read (| state_acc |) ] |) |))) |))) @@ -2822,8 +2881,15 @@ Module absint. let function_handle := M.alloc (| function_handle |) in Value.StructRecord "move_bytecode_verifier::absint::FunctionContext" + [] + [] [ - ("index", Value.StructTuple "core::option::Option::Some" [ M.read (| index |) ]); + ("index", + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "move_binary_format::file_format::FunctionDefinitionIndex" ] + [ M.read (| index |) ]); ("code", M.read (| code |)); ("parameters", M.borrow (| diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/acquires_list_verifier.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/acquires_list_verifier.v index 2b5f3ed46..1ad69f98f 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/acquires_list_verifier.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/acquires_list_verifier.v @@ -501,6 +501,8 @@ Module acquires_list_verifier. M.alloc (| Value.StructRecord "move_bytecode_verifier::acquires_list_verifier::AcquiresVerifier" + [] + [] [ ("module", M.read (| module |)); ("current_function", M.read (| index |)); @@ -744,6 +746,8 @@ Module acquires_list_verifier. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -978,6 +982,12 @@ Module acquires_list_verifier. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -1384,6 +1394,12 @@ Module acquires_list_verifier. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -1399,6 +1415,8 @@ Module acquires_list_verifier. Value.StructTuple "move_core_types::vm_status::StatusCode::EXTRANEOUS_ACQUIRES_ANNOTATION" [] + [] + [] ] |) ] @@ -1560,6 +1578,8 @@ Module acquires_list_verifier. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -1789,6 +1809,12 @@ Module acquires_list_verifier. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -1887,6 +1913,12 @@ Module acquires_list_verifier. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -1902,6 +1934,8 @@ Module acquires_list_verifier. Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_ACQUIRES_ANNOTATION" [] + [] + [] ] |) ] @@ -1919,7 +1953,13 @@ Module acquires_list_verifier. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3026,7 +3066,14 @@ Module acquires_list_verifier. | [] => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ Value.Tuple [] ] |))) | _ => M.impossible "wrong number of arguments" end) @@ -3309,6 +3356,12 @@ Module acquires_list_verifier. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -3327,6 +3380,8 @@ Module acquires_list_verifier. |); Value.StructTuple "move_core_types::vm_status::StatusCode::MISSING_ACQUIRES_ANNOTATION" + [] + [] []; M.read (| offset |) ] @@ -3380,7 +3435,13 @@ Module acquires_list_verifier. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3490,12 +3551,20 @@ Module acquires_list_verifier. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))); + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -3510,6 +3579,8 @@ Module acquires_list_verifier. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); Value.StructTuple "move_core_types::vm_status::StatusCode::MISSING_ACQUIRES_ANNOTATION" + [] + [] []; M.read (| offset |) ] diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/check_duplication.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/check_duplication.v index f44199f07..6f4bf09db 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/check_duplication.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/check_duplication.v @@ -94,6 +94,8 @@ Module check_duplication. M.read (| e |); Value.StructTuple "move_binary_format::errors::Location::Module" + [] + [] [ M.call_closure (| Ty.path "move_core_types::language_storage::ModuleId", @@ -1440,6 +1442,8 @@ Module check_duplication. M.alloc (| Value.StructRecord "move_bytecode_verifier::check_duplication::DuplicationChecker" + [] + [] [ ("module", M.read (| module |)) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -1974,6 +1978,8 @@ Module check_duplication. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -1985,8 +1991,14 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_ELEMENT" + [] + [] + []; + Value.StructTuple + "move_binary_format::IndexKind::Identifier" + [] + [] []; - Value.StructTuple "move_binary_format::IndexKind::Identifier" []; M.read (| idx |) ] |) @@ -1995,7 +2007,13 @@ Module check_duplication. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))) ] |) |))) @@ -2074,6 +2092,8 @@ Module check_duplication. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -2085,9 +2105,13 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_ELEMENT" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::AddressIdentifier" + [] + [] []; M.read (| idx |) ] @@ -2097,7 +2121,13 @@ Module check_duplication. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))) ] |) |))) @@ -2172,6 +2202,8 @@ Module check_duplication. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -2183,8 +2215,14 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_ELEMENT" + [] + [] + []; + Value.StructTuple + "move_binary_format::IndexKind::ConstantPool" + [] + [] []; - Value.StructTuple "move_binary_format::IndexKind::ConstantPool" []; M.read (| idx |) ] |) @@ -2193,7 +2231,13 @@ Module check_duplication. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))) ] |) |))) @@ -2268,6 +2312,8 @@ Module check_duplication. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -2279,8 +2325,10 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_ELEMENT" + [] + [] []; - Value.StructTuple "move_binary_format::IndexKind::Signature" []; + Value.StructTuple "move_binary_format::IndexKind::Signature" [] [] []; M.read (| idx |) ] |) @@ -2289,7 +2337,13 @@ Module check_duplication. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))) ] |) |))) @@ -2364,6 +2418,8 @@ Module check_duplication. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -2375,8 +2431,14 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_ELEMENT" + [] + [] + []; + Value.StructTuple + "move_binary_format::IndexKind::ModuleHandle" + [] + [] []; - Value.StructTuple "move_binary_format::IndexKind::ModuleHandle" []; M.read (| idx |) ] |) @@ -2385,7 +2447,13 @@ Module check_duplication. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))) ] |) |))) @@ -2616,6 +2684,8 @@ Module check_duplication. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -2627,8 +2697,14 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_ELEMENT" + [] + [] + []; + Value.StructTuple + "move_binary_format::IndexKind::StructHandle" + [] + [] []; - Value.StructTuple "move_binary_format::IndexKind::StructHandle" []; M.read (| idx |) ] |) @@ -2637,7 +2713,13 @@ Module check_duplication. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))) ] |) |))) @@ -2718,6 +2800,8 @@ Module check_duplication. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -2729,9 +2813,13 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_ELEMENT" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::FunctionInstantiation" + [] + [] []; M.read (| idx |) ] @@ -2741,7 +2829,13 @@ Module check_duplication. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))) ] |) |))) @@ -2972,6 +3066,8 @@ Module check_duplication. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -2983,8 +3079,14 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_ELEMENT" + [] + [] + []; + Value.StructTuple + "move_binary_format::IndexKind::FunctionHandle" + [] + [] []; - Value.StructTuple "move_binary_format::IndexKind::FunctionHandle" []; M.read (| idx |) ] |) @@ -2993,7 +3095,13 @@ Module check_duplication. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))) ] |) |))) @@ -3100,6 +3208,8 @@ Module check_duplication. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -3111,8 +3221,14 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_ELEMENT" + [] + [] + []; + Value.StructTuple + "move_binary_format::IndexKind::FieldHandle" + [] + [] []; - Value.StructTuple "move_binary_format::IndexKind::FieldHandle" []; M.read (| idx |) ] |) @@ -3121,7 +3237,13 @@ Module check_duplication. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))) ] |) |))) @@ -3232,6 +3354,8 @@ Module check_duplication. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -3243,9 +3367,13 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_ELEMENT" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::StructDefInstantiation" + [] + [] []; M.read (| idx |) ] @@ -3255,7 +3383,13 @@ Module check_duplication. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))) ] |) |))) @@ -3377,6 +3511,11 @@ Module check_duplication. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -3388,9 +3527,13 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_ELEMENT" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::FieldInstantiation" + [] + [] []; M.read (| idx |) ] @@ -3403,7 +3546,13 @@ Module check_duplication. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3723,6 +3872,11 @@ Module check_duplication. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -3734,9 +3888,13 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_ELEMENT" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::StructDefinition" + [] + [] []; M.read (| idx |) ] @@ -4068,6 +4226,12 @@ Module check_duplication. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -4080,9 +4244,13 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::ZERO_SIZED_STRUCT" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::StructDefinition" + [] + [] []; M.cast (Ty.path "u16") @@ -4349,6 +4517,12 @@ Module check_duplication. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -4361,9 +4535,13 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_ELEMENT" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::FieldDefinition" + [] + [] []; M.read (| idx |) ] @@ -4639,6 +4817,11 @@ Module check_duplication. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -4650,9 +4833,13 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_MODULE_HANDLE" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::StructDefinition" + [] + [] []; M.cast (Ty.path "u16") (M.read (| idx |)) ] @@ -4911,6 +5098,8 @@ Module check_duplication. M.alloc (| Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -5177,6 +5366,11 @@ Module check_duplication. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -5188,9 +5382,13 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNIMPLEMENTED_HANDLE" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::StructHandle" + [] + [] []; M.cast (Ty.path "u16") (M.read (| idx |)) ] @@ -5203,7 +5401,13 @@ Module check_duplication. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5517,6 +5721,11 @@ Module check_duplication. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -5528,9 +5737,13 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_ELEMENT" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::FunctionDefinition" + [] + [] []; M.read (| idx |) ] @@ -5893,6 +6106,12 @@ Module check_duplication. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -5905,9 +6124,13 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_ACQUIRES_ANNOTATION" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::FunctionDefinition" + [] + [] []; M.cast (Ty.path "u16") @@ -6186,6 +6409,11 @@ Module check_duplication. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -6197,9 +6425,13 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_MODULE_HANDLE" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::FunctionDefinition" + [] + [] []; M.cast (Ty.path "u16") (M.read (| idx |)) ] @@ -6460,6 +6692,8 @@ Module check_duplication. M.alloc (| Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -6726,6 +6960,11 @@ Module check_duplication. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -6737,9 +6976,13 @@ Module check_duplication. [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNIMPLEMENTED_HANDLE" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::FunctionHandle" + [] + [] []; M.cast (Ty.path "u16") (M.read (| idx |)) ] @@ -6752,7 +6995,13 @@ Module check_duplication. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7054,6 +7303,8 @@ Module check_duplication. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u16" ] [ M.cast (Ty.path "u16") @@ -7073,7 +7324,7 @@ Module check_duplication. |))) ] |)) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ Ty.path "u16" ] [] |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/code_unit_verifier.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/code_unit_verifier.v index f6fee5e0b..14c531daf 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/code_unit_verifier.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/code_unit_verifier.v @@ -123,6 +123,8 @@ Module code_unit_verifier. M.read (| e |); Value.StructTuple "move_binary_format::errors::Location::Module" + [] + [] [ M.call_closure (| Ty.path "move_core_types::language_storage::ModuleId", @@ -530,6 +532,8 @@ Module code_unit_verifier. |); Value.StructTuple "move_binary_format::file_format::FunctionDefinitionIndex" + [] + [] [ M.cast (Ty.path "u16") (M.read (| idx |)) ] ] |) @@ -748,6 +752,8 @@ Module code_unit_verifier. M.alloc (| Value.StructTuple "move_binary_format::file_format::FunctionDefinitionIndex" + [] + [] [ M.cast (Ty.path "u16") (M.read (| idx |)) ] |) in let~ num_back_edges : @@ -916,6 +922,8 @@ Module code_unit_verifier. M.read (| err |); Value.StructTuple "move_binary_format::IndexKind::FunctionDefinition" + [] + [] []; M.read (| M.SubPointer.get_struct_tuple_field (| @@ -1071,6 +1079,11 @@ Module code_unit_verifier. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -1086,6 +1099,8 @@ Module code_unit_verifier. Value.StructTuple "move_core_types::vm_status::StatusCode::TOO_MANY_BACK_EDGES" [] + [] + [] ] |) ] @@ -1099,7 +1114,13 @@ Module code_unit_verifier. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1284,7 +1305,7 @@ Module code_unit_verifier. |) |) |); - Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" [] + Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" [] [] [] ] |) |) in @@ -1341,6 +1362,11 @@ Module code_unit_verifier. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "usize"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.Integer IntegerKind.Usize 0 ] |) |) @@ -1601,6 +1627,11 @@ Module code_unit_verifier. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "usize"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -1627,6 +1658,8 @@ Module code_unit_verifier. Value.StructTuple "move_core_types::vm_status::StatusCode::TOO_MANY_BASIC_BLOCKS" [] + [] + [] ] |); M.read (| index |); @@ -1728,6 +1761,11 @@ Module code_unit_verifier. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "usize"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -1754,6 +1792,8 @@ Module code_unit_verifier. Value.StructTuple "move_core_types::vm_status::StatusCode::TOO_MANY_BACK_EDGES" [] + [] + [] ] |); M.read (| index |); @@ -1779,6 +1819,8 @@ Module code_unit_verifier. M.alloc (| Value.StructRecord "move_bytecode_verifier::code_unit_verifier::CodeUnitVerifier" + [] + [] [ ("module", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| module |) |) |)); @@ -2071,8 +2113,16 @@ Module code_unit_verifier. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| meter |) |) |); - Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" []; - Value.StructTuple "move_bytecode_verifier_meter::Scope::Module" []; + Value.StructTuple + "move_bytecode_verifier_meter::Scope::Function" + [] + [] + []; + Value.StructTuple + "move_bytecode_verifier_meter::Scope::Module" + [] + [] + []; M.read (| UnsupportedLiteral |) ] |) @@ -2143,7 +2193,11 @@ Module code_unit_verifier. ] |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| num_back_edges |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "usize"; Ty.path "move_binary_format::errors::PartialVMError" ] + [ M.read (| num_back_edges |) ] |) |))) |))) diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/constants.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/constants.v index eaeeb9de5..e40a681f2 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/constants.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/constants.v @@ -72,6 +72,8 @@ Module constants. M.read (| e |); Value.StructTuple "move_binary_format::errors::Location::Module" + [] + [] [ M.call_closure (| Ty.path "move_core_types::language_storage::ModuleId", @@ -439,7 +441,13 @@ Module constants. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -669,12 +677,20 @@ Module constants. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))); + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -686,8 +702,14 @@ Module constants. [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_CONSTANT_TYPE" + [] + [] + []; + Value.StructTuple + "move_binary_format::IndexKind::ConstantPool" + [] + [] []; - Value.StructTuple "move_binary_format::IndexKind::ConstantPool" []; M.cast (Ty.path "u16") (M.read (| idx |)) ] |) @@ -753,13 +775,21 @@ Module constants. ltac:(M.monadic (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::option::Option::Some", 0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))); + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -771,8 +801,14 @@ Module constants. [ Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED_CONSTANT_DATA" + [] + [] + []; + Value.StructTuple + "move_binary_format::IndexKind::ConstantPool" + [] + [] []; - Value.StructTuple "move_binary_format::IndexKind::ConstantPool" []; M.cast (Ty.path "u16") (M.read (| idx |)) ] |) diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/control_flow.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/control_flow.v index e942e238e..2e01009e2 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/control_flow.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/control_flow.v @@ -178,6 +178,11 @@ Module control_flow. |); Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "move_binary_format::file_format::FunctionDefinitionIndex" + ] [ M.read (| index |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| code |) |) |) ] @@ -254,6 +259,11 @@ Module control_flow. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_bytecode_verifier::absint::FunctionContext"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_bytecode_verifier::absint::FunctionContext", @@ -327,6 +337,11 @@ Module control_flow. [ Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "move_binary_format::file_format::FunctionDefinitionIndex" + ] [ M.read (| index |) ]; M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| code |) |) |) ] @@ -557,6 +572,11 @@ Module control_flow. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_bytecode_verifier::absint::FunctionContext"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| function_context |) ] |))) ] @@ -615,6 +635,8 @@ Module control_flow. M.read (| current_function_opt |); Value.StructTuple "move_binary_format::file_format::FunctionDefinitionIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ] ] |) @@ -701,6 +723,8 @@ Module control_flow. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -714,6 +738,8 @@ Module control_flow. Value.StructTuple "move_core_types::vm_status::StatusCode::EMPTY_CODE_UNIT" [] + [] + [] ] |) ] @@ -742,6 +768,8 @@ Module control_flow. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -764,6 +792,8 @@ Module control_flow. Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_FALL_THROUGH" [] + [] + [] ] |); M.read (| current_function |); @@ -809,7 +839,13 @@ Module control_flow. ltac:(M.monadic (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::option::Option::Some", 0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))) ] |) |))) @@ -942,6 +978,8 @@ Module control_flow. |); Value.StructTuple "move_binary_format::file_format::FunctionDefinitionIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ] ] |) @@ -1022,6 +1060,11 @@ Module control_flow. (let offset := M.copy (| γ |) in Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -2080,6 +2123,8 @@ Module control_flow. [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_LOOP_SPLIT" + [] + [] []; M.call_closure (| Ty.path @@ -2405,6 +2450,8 @@ Module control_flow. [ Value.StructTuple "move_core_types::vm_status::StatusCode::LOOP_MAX_DEPTH_REACHED" + [] + [] []; M.call_closure (| Ty.path "u16", @@ -2444,7 +2491,13 @@ Module control_flow. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/control_flow_v5.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/control_flow_v5.v index 11a9c8a77..da8d1a925 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/control_flow_v5.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/control_flow_v5.v @@ -57,6 +57,8 @@ Module control_flow_v5. M.read (| current_function_opt |); Value.StructTuple "move_binary_format::file_format::FunctionDefinitionIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ] ] |) @@ -201,6 +203,8 @@ Module control_flow_v5. M.alloc (| Value.StructRecord "move_bytecode_verifier::control_flow_v5::ControlFlowVerifier" + [] + [] [ ("current_function", M.read (| current_function |)); ("code", @@ -375,6 +379,8 @@ Module control_flow_v5. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -388,6 +394,8 @@ Module control_flow_v5. Value.StructTuple "move_core_types::vm_status::StatusCode::EMPTY_CODE_UNIT" [] + [] + [] ] |) ] @@ -416,6 +424,8 @@ Module control_flow_v5. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -438,6 +448,8 @@ Module control_flow_v5. Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_FALL_THROUGH" [] + [] + [] ] |); M.read (| current_function |); @@ -479,7 +491,13 @@ Module control_flow_v5. ltac:(M.monadic (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::option::Option::Some", 0 |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))) ] |) |))) @@ -1269,6 +1287,8 @@ Module control_flow_v5. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -1323,6 +1343,8 @@ Module control_flow_v5. ltac:(M.monadic (Value.StructTuple "move_bytecode_verifier::control_flow_v5::Label::Code" + [] + [] [])) ] |))) @@ -1407,6 +1429,8 @@ Module control_flow_v5. |), Value.StructRecord "move_bytecode_verifier::control_flow_v5::Label::Loop" + [] + [] [ ("last_continue", M.read (| last_continue |)) ] |))) ] @@ -2942,6 +2966,8 @@ Module control_flow_v5. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -3180,6 +3206,12 @@ Module control_flow_v5. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err @@ -3332,7 +3364,13 @@ Module control_flow_v5. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3839,6 +3877,8 @@ Module control_flow_v5. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -4086,6 +4126,13 @@ Module control_flow_v5. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err @@ -4193,6 +4240,12 @@ Module control_flow_v5. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -4215,6 +4268,8 @@ Module control_flow_v5. |); Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_LOOP_CONTINUE" + [] + [] []; M.read (| cur_instr @@ -4228,6 +4283,12 @@ Module control_flow_v5. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ Value.Tuple [] @@ -4247,6 +4308,12 @@ Module control_flow_v5. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ Value.Tuple [] ] |))) ] @@ -4808,6 +4875,12 @@ Module control_flow_v5. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -4830,6 +4903,8 @@ Module control_flow_v5. |); Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_LOOP_BREAK" + [] + [] []; M.read (| cur_instr @@ -4843,6 +4918,12 @@ Module control_flow_v5. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ Value.Tuple [] ] |))) ] @@ -4857,6 +4938,12 @@ Module control_flow_v5. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ Value.Tuple [] ] |))) ] @@ -5667,6 +5754,12 @@ Module control_flow_v5. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -5689,6 +5782,8 @@ Module control_flow_v5. |); Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_LOOP_SPLIT" + [] + [] []; M.read (| i @@ -5702,6 +5797,12 @@ Module control_flow_v5. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ Value.Tuple [] ] |))) ] @@ -5716,6 +5817,12 @@ Module control_flow_v5. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ Value.Tuple [] ] |))) ] @@ -5804,7 +5911,14 @@ Module control_flow_v5. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ Value.Tuple [] ] |) |) |) @@ -6044,6 +6158,12 @@ Module control_flow_v5. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -6066,6 +6186,8 @@ Module control_flow_v5. |); Value.StructTuple "move_core_types::vm_status::StatusCode::LOOP_MAX_DEPTH_REACHED" + [] + [] []; M.read (| i |) ] @@ -6083,6 +6205,12 @@ Module control_flow_v5. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ Value.Tuple [] ] |) |))) @@ -6309,6 +6437,8 @@ Module control_flow_v5. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u16" ] [ M.read (| M.deref (| M.read (| last_continue |) |) @@ -6327,6 +6457,8 @@ Module control_flow_v5. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "u16" ] + [] |))) ] |) diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/cyclic_dependencies.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/cyclic_dependencies.v index d302adcb8..533b72306 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/cyclic_dependencies.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/cyclic_dependencies.v @@ -83,6 +83,8 @@ Module cyclic_dependencies. M.read (| e |); Value.StructTuple "move_binary_format::errors::Location::Module" + [] + [] [ M.call_closure (| Ty.path "move_core_types::language_storage::ModuleId", @@ -509,6 +511,12 @@ Module cyclic_dependencies. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -524,6 +532,8 @@ Module cyclic_dependencies. Value.StructTuple "move_core_types::vm_status::StatusCode::CYCLIC_MODULE_DEPENDENCY" [] + [] + [] ] |) ] @@ -540,7 +550,13 @@ Module cyclic_dependencies. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -635,7 +651,14 @@ Module cyclic_dependencies. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::result::Result::Ok" [ Value.Bool true ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.path "bool"; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ Value.Bool true ] |) |) |) @@ -1161,6 +1184,12 @@ Module cyclic_dependencies. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "bool"; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ Value.Bool true ] |) |) @@ -1180,7 +1209,13 @@ Module cyclic_dependencies. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Bool false ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "bool"; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Bool false ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/dependencies.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/dependencies.v index 7b02b7ce4..492b3301e 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/dependencies.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/dependencies.v @@ -837,6 +837,16 @@ Module dependencies. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::set::BTreeSet") + [] + [ + Ty.path "move_binary_format::file_format::FunctionHandleIndex"; + Ty.path "alloc::alloc::Global" + ] + ] [ M.call_closure (| Ty.apply @@ -865,7 +875,21 @@ Module dependencies. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "alloc::collections::btree::set::BTreeSet") + [] + [ + Ty.path "move_binary_format::file_format::FunctionHandleIndex"; + Ty.path "alloc::alloc::Global" + ] + ] + [] + |))) ] |) |) in @@ -877,6 +901,8 @@ Module dependencies. M.alloc (| Value.StructRecord "move_bytecode_verifier::dependencies::Context" + [] + [] [ ("module", M.read (| module |)); ("dependency_map", M.read (| dependency_map |)); @@ -3319,6 +3345,8 @@ Module dependencies. M.alloc (| Value.StructTuple "move_binary_format::file_format::FunctionHandleIndex" + [] + [] [ M.cast (Ty.path "u16") (M.read (| idx |)) ] |) in let~ _ : @@ -3711,6 +3739,8 @@ Module dependencies. M.read (| e |); Value.StructTuple "move_binary_format::errors::Location::Module" + [] + [] [ M.call_closure (| Ty.path "move_core_types::language_storage::ModuleId", @@ -4473,6 +4503,8 @@ Module dependencies. M.alloc (| Value.StructTuple "move_binary_format::file_format::ModuleHandleIndex" + [] + [] [ M.cast (Ty.path "u16") @@ -4550,6 +4582,12 @@ Module dependencies. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -4562,9 +4600,13 @@ Module dependencies. [ Value.StructTuple "move_core_types::vm_status::StatusCode::MISSING_DEPENDENCY" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::ModuleHandle" + [] + [] []; M.cast (Ty.path "u16") @@ -4585,7 +4627,13 @@ Module dependencies. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5165,6 +5213,8 @@ Module dependencies. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -5395,6 +5445,12 @@ Module dependencies. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -5783,6 +5839,12 @@ Module dependencies. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -5795,9 +5857,13 @@ Module dependencies. [ Value.StructTuple "move_core_types::vm_status::StatusCode::TYPE_MISMATCH" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::StructHandle" + [] + [] []; M.cast (Ty.path "u16") @@ -5827,6 +5893,12 @@ Module dependencies. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -5839,9 +5911,13 @@ Module dependencies. [ Value.StructTuple "move_core_types::vm_status::StatusCode::LOOKUP_FAILED" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::StructHandle" + [] + [] []; M.cast (Ty.path "u16") @@ -5861,7 +5937,13 @@ Module dependencies. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6527,6 +6609,8 @@ Module dependencies. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -6757,6 +6841,12 @@ Module dependencies. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -7082,6 +7172,12 @@ Module dependencies. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -7094,9 +7190,13 @@ Module dependencies. [ Value.StructTuple "move_core_types::vm_status::StatusCode::TYPE_MISMATCH" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::FunctionHandle" + [] + [] []; M.cast (Ty.path "u16") @@ -7320,6 +7420,12 @@ Module dependencies. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -7332,9 +7438,13 @@ Module dependencies. [ Value.StructTuple "move_core_types::vm_status::StatusCode::LOOKUP_FAILED" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::FunctionHandle" + [] + [] []; M.cast (Ty.path "u16") @@ -7610,6 +7720,8 @@ Module dependencies. M.read (| e |); Value.StructTuple "move_binary_format::IndexKind::FunctionHandle" + [] + [] []; M.cast (Ty.path @@ -7907,6 +8019,12 @@ Module dependencies. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -7919,9 +8037,13 @@ Module dependencies. [ Value.StructTuple "move_core_types::vm_status::StatusCode::LOOKUP_FAILED" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::FunctionHandle" + [] + [] []; M.cast (Ty.path "u16") @@ -8197,6 +8319,8 @@ Module dependencies. M.read (| e |); Value.StructTuple "move_binary_format::IndexKind::FunctionHandle" + [] + [] []; M.cast (Ty.path @@ -8301,6 +8425,12 @@ Module dependencies. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -8313,9 +8443,13 @@ Module dependencies. [ Value.StructTuple "move_core_types::vm_status::StatusCode::LOOKUP_FAILED" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::FunctionHandle" + [] + [] []; M.cast (Ty.path "u16") @@ -8335,7 +8469,13 @@ Module dependencies. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -9139,6 +9279,11 @@ Module dependencies. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -9152,6 +9297,8 @@ Module dependencies. Value.StructTuple "move_core_types::vm_status::StatusCode::TYPE_MISMATCH" [] + [] + [] ] |) ] @@ -9502,7 +9649,13 @@ Module dependencies. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -9768,7 +9921,14 @@ Module dependencies. | [] => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ Value.Tuple [] ] |))) | _ => M.impossible "wrong number of arguments" end) @@ -10351,6 +10511,11 @@ Module dependencies. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -10364,6 +10529,8 @@ Module dependencies. Value.StructTuple "move_core_types::vm_status::StatusCode::TYPE_MISMATCH" [] + [] + [] ] |) ] @@ -10371,7 +10538,14 @@ Module dependencies. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ Value.Tuple [] ] |))) ] |))); @@ -10560,6 +10734,11 @@ Module dependencies. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -10573,6 +10752,8 @@ Module dependencies. Value.StructTuple "move_core_types::vm_status::StatusCode::TYPE_MISMATCH" [] + [] + [] ] |) ] @@ -10946,6 +11127,8 @@ Module dependencies. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -10959,13 +11142,21 @@ Module dependencies. Value.StructTuple "move_core_types::vm_status::StatusCode::TYPE_MISMATCH" [] + [] + [] ] |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))) + (M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))) ] |) |))) @@ -11078,7 +11269,14 @@ Module dependencies. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ Value.Tuple [] ] |) |) |) @@ -11544,6 +11742,8 @@ Module dependencies. |); Value.StructTuple "move_binary_format::file_format::FunctionDefinitionIndex" + [] + [] [ M.cast (Ty.path "u16") (M.read (| idx |)) ]; M.borrow (| Pointer.Kind.Ref, @@ -11664,7 +11864,13 @@ Module dependencies. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -12064,6 +12270,12 @@ Module dependencies. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -12101,6 +12313,8 @@ Module dependencies. Value.StructTuple "move_core_types::vm_status::StatusCode::CALLED_SCRIPT_VISIBLE_FROM_NON_SCRIPT_VISIBLE" [] + [] + [] ] |); M.read (| fdef_idx |); @@ -12145,7 +12359,13 @@ Module dependencies. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/friends.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/friends.v index 1ab917ce3..2efdf687e 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/friends.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/friends.v @@ -72,6 +72,8 @@ Module friends. M.read (| e |); Value.StructTuple "move_binary_format::errors::Location::Module" + [] + [] [ M.call_closure (| Ty.path "move_core_types::language_storage::ModuleId", @@ -243,6 +245,11 @@ Module friends. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -256,6 +263,8 @@ Module friends. Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_FRIEND_DECL_WITH_SELF" [] + [] + [] ] |) ] @@ -527,6 +536,11 @@ Module friends. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -540,6 +554,8 @@ Module friends. Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_FRIEND_DECL_WITH_MODULES_OUTSIDE_ACCOUNT_ADDRESS" [] + [] + [] ] |) ] @@ -550,7 +566,13 @@ Module friends. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/instantiation_loops.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/instantiation_loops.v index 9e3f09e52..3b44c438d 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/instantiation_loops.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/instantiation_loops.v @@ -379,6 +379,8 @@ Module instantiation_loops. (let module := M.alloc (| module |) in Value.StructRecord "move_bytecode_verifier::instantiation_loops::InstantiationLoopChecker" + [] + [] [ ("module", M.read (| module |)); ("graph", @@ -811,6 +813,8 @@ Module instantiation_loops. M.read (| e |); Value.StructTuple "move_binary_format::errors::Location::Module" + [] + [] [ M.call_closure (| Ty.path "move_core_types::language_storage::ModuleId", @@ -1071,7 +1075,13 @@ Module instantiation_loops. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))); + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))); fun γ => ltac:(M.monadic (let γ0_0 := @@ -1425,6 +1435,11 @@ Module instantiation_loops. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "alloc::string::String" + ] [ M.call_closure (| Ty.path @@ -1454,6 +1469,11 @@ Module instantiation_loops. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "alloc::string::String" + ] + [] |))) ] |) @@ -1843,6 +1863,8 @@ Module instantiation_loops. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -1865,6 +1887,8 @@ Module instantiation_loops. Value.StructTuple "move_core_types::vm_status::StatusCode::LOOP_IN_INSTANTIATION_GRAPH" [] + [] + [] ] |); M.read (| msg |) @@ -2595,6 +2619,8 @@ Module instantiation_loops. |); Value.StructTuple "move_bytecode_verifier::instantiation_loops::Node" + [] + [] [ M.read (| caller_idx |); M.read (| @@ -2603,6 +2629,8 @@ Module instantiation_loops. ]; Value.StructTuple "move_bytecode_verifier::instantiation_loops::Node" + [] + [] [ M.read (| callee_idx |); M.read (| formal_idx |) @@ -2610,6 +2638,8 @@ Module instantiation_loops. Value.StructTuple "move_bytecode_verifier::instantiation_loops::Edge::Identity" [] + [] + [] ] |) |))); @@ -2768,6 +2798,8 @@ Module instantiation_loops. |); Value.StructTuple "move_bytecode_verifier::instantiation_loops::Node" + [] + [] [ M.read (| caller_idx @@ -2778,6 +2810,8 @@ Module instantiation_loops. ]; Value.StructTuple "move_bytecode_verifier::instantiation_loops::Node" + [] + [] [ M.read (| callee_idx @@ -2788,6 +2822,8 @@ Module instantiation_loops. ]; Value.StructTuple "move_bytecode_verifier::instantiation_loops::Edge::TyConApp" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -5207,6 +5243,17 @@ Module instantiation_loops. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "petgraph::graph_impl::EdgeIndex") + [] + [ + Ty.path + "u32" + ] + ] [ M.call_closure (| Ty.apply @@ -5251,6 +5298,17 @@ Module instantiation_loops. Value.StructTuple "core::option::Option::None" [] + [ + Ty.apply + (Ty.path + "petgraph::graph_impl::EdgeIndex") + [] + [ + Ty.path + "u32" + ] + ] + [] |))) ] |) @@ -5622,6 +5680,34 @@ Module instantiation_loops. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.apply + (Ty.path + "petgraph::graph_impl::NodeIndex") + [] + [ Ty.path "u32" ]; + Ty.path "alloc::alloc::Global" + ]; + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.apply + (Ty.path + "petgraph::graph_impl::EdgeIndex") + [] + [ Ty.path "u32" ]; + Ty.path "alloc::alloc::Global" + ] + ] + ] [ Value.Tuple [ M.read (| nodes |); M.read (| edges |) ] @@ -5630,7 +5716,37 @@ Module instantiation_loops. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.apply + (Ty.path + "petgraph::graph_impl::NodeIndex") + [] + [ Ty.path "u32" ]; + Ty.path "alloc::alloc::Global" + ]; + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.apply + (Ty.path + "petgraph::graph_impl::EdgeIndex") + [] + [ Ty.path "u32" ]; + Ty.path "alloc::alloc::Global" + ] + ] + ] + [] |))) ] |) diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/instruction_consistency.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/instruction_consistency.v index 8dfbb6da1..43b6f142d 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/instruction_consistency.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/instruction_consistency.v @@ -102,6 +102,8 @@ Module instruction_consistency. M.read (| e |); Value.StructTuple "move_binary_format::errors::Location::Module" + [] + [] [ M.call_closure (| Ty.path "move_core_types::language_storage::ModuleId", @@ -402,14 +404,23 @@ Module instruction_consistency. M.alloc (| Value.StructRecord "move_bytecode_verifier::instruction_consistency::InstructionConsistency" + [] + [] [ ("module", M.read (| module |)); ("current_function", Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "move_binary_format::file_format::FunctionDefinitionIndex" + ] [ Value.StructTuple "move_binary_format::file_format::FunctionDefinitionIndex" + [] + [] [ M.cast (Ty.path "u16") @@ -562,7 +573,13 @@ Module instruction_consistency. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4549,6 +4566,12 @@ Module instruction_consistency. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -4586,6 +4609,8 @@ Module instruction_consistency. Value.StructTuple "move_core_types::vm_status::StatusCode::CONSTRAINT_NOT_SATISFIED" [] + [] + [] ] |); M.call_closure (| @@ -5197,7 +5222,13 @@ Module instruction_consistency. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5333,6 +5364,8 @@ Module instruction_consistency. |); Value.StructTuple "move_binary_format::file_format::FunctionDefinitionIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ] ] |))) @@ -5513,6 +5546,11 @@ Module instruction_consistency. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -5535,6 +5573,8 @@ Module instruction_consistency. Value.StructTuple "move_core_types::vm_status::StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH" [] + [] + [] ] |); M.call_closure (| @@ -5565,7 +5605,13 @@ Module instruction_consistency. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5698,6 +5744,11 @@ Module instruction_consistency. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -5720,6 +5771,8 @@ Module instruction_consistency. Value.StructTuple "move_core_types::vm_status::StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH" [] + [] + [] ] |); M.call_closure (| @@ -5750,7 +5803,13 @@ Module instruction_consistency. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/limits.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/limits.v index 77b80b3fb..c28e71c1c 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/limits.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/limits.v @@ -98,6 +98,8 @@ Module limits. M.read (| e |); Value.StructTuple "move_binary_format::errors::Location::Module" + [] + [] [ M.call_closure (| Ty.path "move_core_types::language_storage::ModuleId", @@ -167,6 +169,8 @@ Module limits. M.alloc (| Value.StructRecord "move_bytecode_verifier::limits::LimitsVerifier" + [] + [] [ ("module", M.read (| module |)) ] |) in let~ _ : Ty.apply (Ty.path "*") [] [ Ty.tuple [] ] := @@ -1080,6 +1084,12 @@ Module limits. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -1106,10 +1116,14 @@ Module limits. Value.StructTuple "move_core_types::vm_status::StatusCode::TOO_MANY_TYPE_PARAMETERS" [] + [] + [] ] |); Value.StructTuple "move_binary_format::IndexKind::StructHandle" + [] + [] []; M.cast (Ty.path "u16") @@ -1135,7 +1149,13 @@ Module limits. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1455,6 +1475,12 @@ Module limits. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -1481,10 +1507,14 @@ Module limits. Value.StructTuple "move_core_types::vm_status::StatusCode::TOO_MANY_TYPE_PARAMETERS" [] + [] + [] ] |); Value.StructTuple "move_binary_format::IndexKind::FunctionHandle" + [] + [] []; M.cast (Ty.path "u16") @@ -1627,6 +1657,12 @@ Module limits. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -1653,10 +1689,14 @@ Module limits. Value.StructTuple "move_core_types::vm_status::StatusCode::TOO_MANY_PARAMETERS" [] + [] + [] ] |); Value.StructTuple "move_binary_format::IndexKind::FunctionHandle" + [] + [] []; M.cast (Ty.path "u16") @@ -1684,7 +1724,13 @@ Module limits. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2927,7 +2973,13 @@ Module limits. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3251,6 +3303,11 @@ Module limits. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -3266,6 +3323,8 @@ Module limits. Value.StructTuple "move_core_types::vm_status::StatusCode::TOO_MANY_TYPE_NODES" [] + [] + [] ] |) ] @@ -3279,7 +3338,13 @@ Module limits. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3456,6 +3521,11 @@ Module limits. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -3471,6 +3541,8 @@ Module limits. Value.StructTuple "move_core_types::vm_status::StatusCode::MAX_FUNCTION_DEFINITIONS_REACHED" [] + [] + [] ] |) ] @@ -3601,6 +3673,11 @@ Module limits. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -3616,6 +3693,8 @@ Module limits. Value.StructTuple "move_core_types::vm_status::StatusCode::MAX_STRUCT_DEFINITIONS_REACHED" [] + [] + [] ] |) ] @@ -3843,6 +3922,12 @@ Module limits. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -3858,6 +3943,8 @@ Module limits. Value.StructTuple "move_core_types::vm_status::StatusCode::MAX_FIELD_DEFINITIONS_REACHED" [] + [] + [] ] |) ] @@ -3881,7 +3968,13 @@ Module limits. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4300,9 +4393,13 @@ Module limits. [ Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED_CONSTANT_DATA" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::ConstantPool" + [] + [] []; M.cast (Ty.path @@ -4490,6 +4587,12 @@ Module limits. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -4516,6 +4619,8 @@ Module limits. Value.StructTuple "move_core_types::vm_status::StatusCode::TOO_MANY_VECTOR_ELEMENTS" [] + [] + [] ] |); M.call_closure (| @@ -4659,6 +4764,12 @@ Module limits. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -4671,9 +4782,13 @@ Module limits. [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_CONSTANT_TYPE" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::ConstantPool" + [] + [] []; M.cast (Ty.path "u16") @@ -4697,7 +4812,13 @@ Module limits. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5036,6 +5157,12 @@ Module limits. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -5048,9 +5175,13 @@ Module limits. [ Value.StructTuple "move_core_types::vm_status::StatusCode::IDENTIFIER_TOO_LONG" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::Identifier" + [] + [] []; M.cast (Ty.path "u16") @@ -5076,7 +5207,13 @@ Module limits. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/locals_safety/abstract_state.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/locals_safety/abstract_state.v index fd4e5b4c1..7d7d68fbe 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/locals_safety/abstract_state.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/locals_safety/abstract_state.v @@ -342,6 +342,8 @@ Module locals_safety. (let self := M.alloc (| self |) in Value.StructRecord "move_bytecode_verifier::locals_safety::abstract_state::AbstractState" + [] + [] [ ("current_function", M.call_closure (| @@ -992,6 +994,8 @@ Module locals_safety. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| num_locals |)) @@ -1051,6 +1055,8 @@ Module locals_safety. Value.StructTuple "move_bytecode_verifier::locals_safety::abstract_state::LocalState::Available" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1058,6 +1064,8 @@ Module locals_safety. Value.StructTuple "move_bytecode_verifier::locals_safety::abstract_state::LocalState::Unavailable" [] + [] + [] |))) ] |) @@ -1738,9 +1746,17 @@ Module locals_safety. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "move_bytecode_verifier::locals_safety::abstract_state::AbstractState"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructRecord "move_bytecode_verifier::locals_safety::abstract_state::AbstractState" + [] + [] [ ("current_function", M.call_closure (| @@ -1999,6 +2015,8 @@ Module locals_safety. Value.StructTuple "move_bytecode_verifier::locals_safety::abstract_state::LocalState::Available" [] + [] + [] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2095,6 +2113,8 @@ Module locals_safety. Value.StructTuple "move_bytecode_verifier::locals_safety::abstract_state::LocalState::Available" [] + [] + [] |) |) ] @@ -2161,6 +2181,8 @@ Module locals_safety. Value.StructTuple "move_bytecode_verifier::locals_safety::abstract_state::LocalState::Unavailable" [] + [] + [] |) |) |))) @@ -2227,6 +2249,8 @@ Module locals_safety. |); Value.StructTuple "move_binary_format::file_format::FunctionDefinitionIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ] ] |); @@ -3006,6 +3030,8 @@ Module locals_safety. Value.StructTuple "move_bytecode_verifier::locals_safety::abstract_state::LocalState::Unavailable" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -3197,6 +3223,8 @@ Module locals_safety. Value.StructTuple "move_bytecode_verifier::locals_safety::abstract_state::LocalState::MaybeAvailable" [] + [] + [] |))) | _ => M.impossible @@ -3225,6 +3253,8 @@ Module locals_safety. Value.StructTuple "move_bytecode_verifier::locals_safety::abstract_state::LocalState::Available" [] + [] + [] |))) ] |) @@ -3241,6 +3271,8 @@ Module locals_safety. M.alloc (| Value.StructRecord "move_bytecode_verifier::locals_safety::abstract_state::AbstractState" + [] + [] [ ("current_function", M.read (| current_function |)); ("all_local_abilities", M.read (| all_local_abilities |)); @@ -3357,6 +3389,8 @@ Module locals_safety. |); Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" + [] + [] []; M.read (| get_constant (| @@ -3485,6 +3519,8 @@ Module locals_safety. |); Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" + [] + [] []; M.read (| get_constant (| @@ -3994,10 +4030,17 @@ Module locals_safety. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_bytecode_verifier::absint::JoinResult"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_bytecode_verifier::absint::JoinResult::Unchanged" [] + [] + [] ] |))); fun γ => @@ -4009,10 +4052,17 @@ Module locals_safety. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_bytecode_verifier::absint::JoinResult"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_bytecode_verifier::absint::JoinResult::Changed" [] + [] + [] ] |))) ] diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/locals_safety/mod.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/locals_safety/mod.v index d4b7d134b..87589693c 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/locals_safety/mod.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/locals_safety/mod.v @@ -187,6 +187,8 @@ Module locals_safety. Value.StructTuple "move_bytecode_verifier::locals_safety::LocalsSafetyAnalysis" [] + [] + [] |) |); M.read (| initial_state |); @@ -402,7 +404,11 @@ Module locals_safety. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| meter |) |) |); - Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" []; + Value.StructTuple + "move_bytecode_verifier_meter::Scope::Function" + [] + [] + []; M.read (| get_constant (| "move_bytecode_verifier::locals_safety::abstract_state::STEP_BASE_COST", @@ -585,6 +591,12 @@ Module locals_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -603,6 +615,8 @@ Module locals_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::STLOC_UNSAFE_TO_DESTROY_ERROR" + [] + [] []; M.read (| offset |) ] @@ -701,6 +715,12 @@ Module locals_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -719,6 +739,8 @@ Module locals_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::MOVELOC_UNAVAILABLE_ERROR" + [] + [] []; M.read (| offset |) ] @@ -822,6 +844,12 @@ Module locals_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -840,6 +868,8 @@ Module locals_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::COPYLOC_UNAVAILABLE_ERROR" + [] + [] []; M.read (| offset |) ] @@ -952,6 +982,12 @@ Module locals_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -972,6 +1008,8 @@ Module locals_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::BORROWLOC_UNAVAILABLE_ERROR" + [] + [] []; M.read (| offset |) ] @@ -1107,6 +1145,8 @@ Module locals_safety. |); Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" + [] + [] []; M.read (| get_constant (| @@ -1659,6 +1699,12 @@ Module locals_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -1681,6 +1727,8 @@ Module locals_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP" + [] + [] []; M.read (| offset @@ -2398,7 +2446,13 @@ Module locals_safety. |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/loop_summary.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/loop_summary.v index cd0e8604a..889e7456f 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/loop_summary.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/loop_summary.v @@ -714,6 +714,8 @@ Module loop_summary. M.alloc (| Value.StructTuple "move_bytecode_verifier::loop_summary::NodeId" + [] + [] [ Value.Integer IntegerKind.U16 0 ] |) in let~ root_block : Ty.apply (Ty.path "*") [] [ Ty.path "u16" ] := @@ -862,6 +864,8 @@ Module loop_summary. M.read (| root_block |); Value.StructTuple "move_bytecode_verifier::loop_summary::new::Exploration::InProgress" + [] + [] [ M.read (| root_node |) ] ] |) @@ -1032,6 +1036,8 @@ Module loop_summary. (let succ := M.copy (| γ |) in Value.StructRecord "move_bytecode_verifier::loop_summary::new::Frontier::Visit" + [] + [] [ ("from_node", M.read (| root_node |)); ("to_block", @@ -1283,6 +1289,8 @@ Module loop_summary. |), Value.StructTuple "move_bytecode_verifier::loop_summary::new::Exploration::Done" + [] + [] [ M.read (| node_id |) ] |) |) in @@ -1654,6 +1662,8 @@ Module loop_summary. M.read (| entry |); Value.StructTuple "move_bytecode_verifier::loop_summary::new::Exploration::InProgress" + [] + [] [ M.read (| to_node |) ] ] |) @@ -1807,6 +1817,8 @@ Module loop_summary. M.borrow (| Pointer.Kind.MutRef, stack |); Value.StructRecord "move_bytecode_verifier::loop_summary::new::Frontier::Finish" + [] + [] [ ("block", M.read (| to_block |)); ("node_id", M.read (| to_node |)); @@ -2034,6 +2046,8 @@ Module loop_summary. M.copy (| γ |) in Value.StructRecord "move_bytecode_verifier::loop_summary::new::Frontier::Visit" + [] + [] [ ("from_node", M.read (| to_node |)); @@ -2077,6 +2091,8 @@ Module loop_summary. M.alloc (| Value.StructRecord "move_bytecode_verifier::loop_summary::LoopSummary" + [] + [] [ ("blocks", M.read (| blocks |)); ("descs", M.read (| descs |)); @@ -2236,6 +2252,8 @@ Module loop_summary. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -2284,6 +2302,8 @@ Module loop_summary. (let id := M.copy (| γ |) in Value.StructTuple "move_bytecode_verifier::loop_summary::NodeId" + [] + [] [ M.cast (Ty.path "u16") (M.read (| id |)) ])) ] |))) @@ -2579,6 +2599,8 @@ Module loop_summary. M.alloc (| Value.StructRecord "move_bytecode_verifier::loop_summary::LoopPartition" + [] + [] [ ("parents", M.call_closure (| @@ -2642,6 +2664,8 @@ Module loop_summary. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| num_blocks |)) @@ -2669,6 +2693,8 @@ Module loop_summary. (let id := M.copy (| γ |) in Value.StructTuple "move_bytecode_verifier::loop_summary::NodeId" + [] + [] [ M.cast (Ty.path "u16") (M.read (| id |)) ])) ] |))) @@ -3239,6 +3265,8 @@ Module loop_summary. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -3276,6 +3304,8 @@ Module loop_summary. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -3535,6 +3565,8 @@ Module loop_summary. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -3580,6 +3612,11 @@ Module loop_summary. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/reference_safety/abstract_state.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/reference_safety/abstract_state.v index 12ca93056..e83710106 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/reference_safety/abstract_state.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/reference_safety/abstract_state.v @@ -478,6 +478,8 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_borrow_graph::references::RefID" ] [ M.read (| M.deref (| M.read (| id |) |) |) ] |))); fun γ => @@ -488,7 +490,13 @@ Module reference_safety. γ, "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::NonReference" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_borrow_graph::references::RefID" ] + [] + |))) ] |) |))) @@ -562,6 +570,8 @@ Module reference_safety. M.alloc (| Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::Label::Local" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -592,6 +602,8 @@ Module reference_safety. M.alloc (| Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::Label::Global" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::StructDefinitionIndex", @@ -622,6 +634,8 @@ Module reference_safety. M.alloc (| Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::Label::Field" + [] + [] [ M.call_closure (| Ty.path "move_binary_format::file_format::FieldHandleIndex", @@ -1983,6 +1997,8 @@ Module reference_safety. (let self := M.alloc (| self |) in Value.StructRecord "move_bytecode_verifier::reference_safety::abstract_state::AbstractState" + [] + [] [ ("current_function", M.call_closure (| @@ -2636,6 +2652,8 @@ Module reference_safety. M.alloc (| Value.StructRecord "move_bytecode_verifier::reference_safety::abstract_state::AbstractState" + [] + [] [ ("current_function", M.call_closure (| @@ -2677,6 +2695,8 @@ Module reference_safety. [ Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::NonReference" + [] + [] []; M.read (| num_locals |) ] @@ -3074,6 +3094,8 @@ Module reference_safety. |), Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::Reference" + [] + [] [ M.read (| id |) ] |) |))); @@ -3369,6 +3391,8 @@ Module reference_safety. |); Value.StructTuple "move_binary_format::file_format::FunctionDefinitionIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ] ] |); @@ -3420,6 +3444,8 @@ Module reference_safety. M.alloc (| Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::Reference" + [] + [] [ M.call_closure (| Ty.path "move_borrow_graph::references::RefID", @@ -3449,6 +3475,8 @@ Module reference_safety. M.alloc (| Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::Reference" + [] + [] [ M.call_closure (| Ty.path "move_borrow_graph::references::RefID", @@ -3472,6 +3500,8 @@ Module reference_safety. Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::NonReference" [] + [] + [] |))) ] |) @@ -3714,6 +3744,8 @@ Module reference_safety. M.read (| parent |); Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::Label::Field" + [] + [] [ M.read (| field |) ]; M.read (| child |) ] @@ -3776,6 +3808,8 @@ Module reference_safety. |); Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::Label::Local" + [] + [] [ M.read (| local |) ]; M.read (| id |) ] @@ -3838,6 +3872,8 @@ Module reference_safety. |); Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::Label::Global" + [] + [] [ M.read (| resource |) ]; M.read (| id |) ] @@ -5139,7 +5175,12 @@ Module reference_safety. [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); M.read (| id |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_bytecode_verifier::reference_safety::abstract_state::Label" + ] + [] ] |) |) @@ -5262,6 +5303,8 @@ Module reference_safety. M.read (| at_field_opt |); M.constructor_as_closure "move_bytecode_verifier::reference_safety::abstract_state::Label::Field" + [] + [] ] |) ] @@ -5384,9 +5427,13 @@ Module reference_safety. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_bytecode_verifier::reference_safety::abstract_state::Label" ] [ Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::Label::Local" + [] + [] [ M.read (| idx |) ] ] ] @@ -5437,9 +5484,13 @@ Module reference_safety. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_bytecode_verifier::reference_safety::abstract_state::Label" ] [ Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::Label::Local" + [] + [] [ M.read (| idx |) ] ] ] @@ -5486,9 +5537,13 @@ Module reference_safety. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_bytecode_verifier::reference_safety::abstract_state::Label" ] [ Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::Label::Global" + [] + [] [ M.read (| resource |) ] ] ] @@ -5539,9 +5594,13 @@ Module reference_safety. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_bytecode_verifier::reference_safety::abstract_state::Label" ] [ Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::Label::Global" + [] + [] [ M.read (| resource |) ] ] ] @@ -5590,7 +5649,11 @@ Module reference_safety. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |) ] |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_bytecode_verifier::reference_safety::abstract_state::Label" ] + [] ] |) |))) @@ -5846,6 +5909,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -6037,6 +6102,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -6137,9 +6208,17 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::Reference" + [] + [] [ M.read (| new_id |) ] ] |))); @@ -6173,6 +6252,12 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -6190,6 +6275,8 @@ Module reference_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::COPYLOC_EXISTS_BORROW_ERROR" + [] + [] []; M.read (| offset |) ] @@ -6207,10 +6294,18 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::NonReference" [] + [] + [] ] |))) ] @@ -6435,6 +6530,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -6660,6 +6757,13 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -6681,6 +6785,8 @@ Module reference_safety. Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::NonReference" [] + [] + [] ] |) |) in @@ -6712,9 +6818,17 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::Reference" + [] + [] [ M.read (| id |) ] ] |))); @@ -6747,6 +6861,12 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -6764,6 +6884,8 @@ Module reference_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::MOVELOC_EXISTS_BORROW_ERROR" + [] + [] []; M.read (| offset |) ] @@ -6780,10 +6902,18 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::NonReference" [] + [] + [] ] |))) ] @@ -7008,6 +7138,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -7233,6 +7365,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -7297,7 +7435,11 @@ Module reference_safety. |) |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] |))); fun γ => ltac:(M.monadic @@ -7328,6 +7470,8 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -7345,6 +7489,8 @@ Module reference_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::STLOC_UNSAFE_TO_DESTROY_ERROR" + [] + [] []; M.read (| offset |) ] @@ -7359,7 +7505,11 @@ Module reference_safety. "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::NonReference" |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] |))) ] |) @@ -7427,7 +7577,14 @@ Module reference_safety. M.deref (| M.read (| self |) |) |); M.read (| id |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.path + "move_binary_format::file_format::FieldHandleIndex" + ] + [] ] |) |) @@ -7440,6 +7597,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -7457,6 +7620,8 @@ Module reference_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::FREEZEREF_EXISTS_MUTABLE_BORROW_ERROR" + [] + [] []; M.read (| offset |) ] @@ -7528,9 +7693,17 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::Reference" + [] + [] [ M.read (| frozen_id |) ] ] |) @@ -7630,7 +7803,14 @@ Module reference_safety. M.deref (| M.read (| self |) |) |); M.read (| id1 |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.path + "move_binary_format::file_format::FieldHandleIndex" + ] + [] ] |) |), @@ -7651,7 +7831,14 @@ Module reference_safety. M.deref (| M.read (| self |) |) |); M.read (| id2 |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.path + "move_binary_format::file_format::FieldHandleIndex" + ] + [] ] |) |))) @@ -7665,6 +7852,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -7682,6 +7875,8 @@ Module reference_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::READREF_EXISTS_MUTABLE_BORROW_ERROR" + [] + [] []; M.read (| offset |) ] @@ -7842,10 +8037,18 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::NonReference" [] + [] + [] ] |) |))) @@ -7911,7 +8114,14 @@ Module reference_safety. M.deref (| M.read (| self |) |) |); M.read (| id |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.path + "move_binary_format::file_format::FieldHandleIndex" + ] + [] ] |) |) @@ -7924,6 +8134,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -7941,6 +8157,8 @@ Module reference_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::READREF_EXISTS_MUTABLE_BORROW_ERROR" + [] + [] []; M.read (| offset |) ] @@ -7973,10 +8191,18 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::NonReference" [] + [] + [] ] |) |))) @@ -8051,6 +8277,11 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -8068,6 +8299,8 @@ Module reference_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::WRITEREF_EXISTS_BORROW_ERROR" + [] + [] []; M.read (| offset |) ] @@ -8097,7 +8330,13 @@ Module reference_safety. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -8184,6 +8423,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -8201,6 +8446,8 @@ Module reference_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::BORROWLOC_EXISTS_BORROW_ERROR" + [] + [] []; M.read (| offset |) ] @@ -8255,9 +8502,17 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::Reference" + [] + [] [ M.read (| new_id |) ] ] |) @@ -8398,6 +8653,11 @@ Module reference_safety. M.read (| id |); Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "move_binary_format::file_format::FieldHandleIndex" + ] [ M.read (| field |) ] ] |) @@ -8468,6 +8728,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -8485,6 +8751,8 @@ Module reference_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::BORROWFIELD_EXISTS_MUTABLE_BORROW_ERROR" + [] + [] []; M.read (| offset |) ] @@ -8557,9 +8825,17 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::Reference" + [] + [] [ M.read (| field_borrow_id |) ] ] |) @@ -8668,6 +8944,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -8685,6 +8967,8 @@ Module reference_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::GLOBAL_REFERENCE_ERROR" + [] + [] []; M.read (| offset |) ] @@ -8739,9 +9023,17 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::Reference" + [] + [] [ M.read (| new_id |) ] ] |) @@ -8816,6 +9108,12 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -8830,6 +9128,8 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); Value.StructTuple "move_core_types::vm_status::StatusCode::GLOBAL_REFERENCE_ERROR" + [] + [] []; M.read (| offset |) ] @@ -8841,10 +9141,18 @@ Module reference_safety. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::NonReference" [] + [] + [] ] |))) ] @@ -8956,6 +9264,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -9146,6 +9456,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -9198,6 +9514,11 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -9215,6 +9536,8 @@ Module reference_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR" + [] + [] []; M.read (| offset |) ] @@ -9244,7 +9567,13 @@ Module reference_safety. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -9363,6 +9692,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -9553,6 +9884,13 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -9605,6 +9943,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -9622,6 +9966,8 @@ Module reference_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::VEC_BORROW_ELEMENT_EXISTS_MUTABLE_BORROW_ERROR" + [] + [] []; M.read (| offset |) ] @@ -9693,9 +10039,17 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::Reference" + [] + [] [ M.read (| elem_id |) ] ] |) @@ -9870,6 +10224,8 @@ Module reference_safety. |); Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" + [] + [] []; M.read (| get_constant (| @@ -10124,6 +10480,19 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "alloc::alloc::Global" + ]; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -10144,6 +10513,8 @@ Module reference_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::GLOBAL_REFERENCE_ERROR" + [] + [] []; M.read (| offset |) ] @@ -10676,6 +11047,21 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path + "alloc::vec::Vec") + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path + "alloc::alloc::Global" + ]; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -10698,6 +11084,8 @@ Module reference_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::CALL_BORROWED_MUTABLE_REFERENCE_ERROR" + [] + [] []; M.read (| offset |) ] @@ -11267,6 +11655,8 @@ Module reference_safety. M.alloc (| Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::Reference" + [] + [] [ M.read (| id |) ] |))); fun γ => @@ -11527,6 +11917,8 @@ Module reference_safety. M.alloc (| Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::Reference" + [] + [] [ M.read (| id |) ] |))); fun γ => @@ -11535,6 +11927,8 @@ Module reference_safety. Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::NonReference" [] + [] + [] |))) ] |) @@ -11601,6 +11995,8 @@ Module reference_safety. |); Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" + [] + [] []; M.read (| get_constant (| @@ -11845,7 +12241,21 @@ Module reference_safety. ] |)) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| return_values |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path + "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue"; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ M.read (| return_values |) ] |) |))) |))) @@ -12294,6 +12704,11 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -12311,6 +12726,8 @@ Module reference_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED" + [] + [] []; M.read (| offset |) ] @@ -12682,6 +13099,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -12702,6 +13125,8 @@ Module reference_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::RET_BORROWED_MUTABLE_REFERENCE_ERROR" + [] + [] []; M.read (| offset |) ] @@ -12721,7 +13146,13 @@ Module reference_safety. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -13259,6 +13690,8 @@ Module reference_safety. M.alloc (| Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::Reference" + [] + [] [ M.read (| new_id |) ] |))); fun γ => @@ -13273,6 +13706,8 @@ Module reference_safety. Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::NonReference" [] + [] + [] |))) ] |) @@ -13446,6 +13881,8 @@ Module reference_safety. M.alloc (| Value.StructRecord "move_bytecode_verifier::reference_safety::abstract_state::AbstractState" + [] + [] [ ("locals", M.read (| locals |)); ("borrow_graph", M.read (| borrow_graph |)); @@ -14934,6 +15371,8 @@ Module reference_safety. Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::NonReference" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -14992,6 +15431,8 @@ Module reference_safety. Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::NonReference" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -15165,6 +15606,8 @@ Module reference_safety. M.alloc (| Value.StructRecord "move_bytecode_verifier::reference_safety::abstract_state::AbstractState" + [] + [] [ ("current_function", M.read (| current_function |)); ("locals", M.read (| locals |)); @@ -15438,6 +15881,8 @@ Module reference_safety. |); Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" + [] + [] []; M.read (| get_constant (| @@ -15566,6 +16011,8 @@ Module reference_safety. |); Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" + [] + [] []; M.read (| get_constant (| @@ -15720,6 +16167,8 @@ Module reference_safety. |); Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" + [] + [] []; M.read (| get_constant (| @@ -16161,10 +16610,17 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_bytecode_verifier::absint::JoinResult"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_bytecode_verifier::absint::JoinResult::Unchanged" [] + [] + [] ] |))); fun γ => @@ -16176,10 +16632,17 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_bytecode_verifier::absint::JoinResult"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_bytecode_verifier::absint::JoinResult::Changed" [] + [] + [] ] |))) ] diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/reference_safety/mod.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/reference_safety/mod.v index f7f245777..5a8996692 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/reference_safety/mod.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/reference_safety/mod.v @@ -68,6 +68,8 @@ Module reference_safety. let name_def_map := M.alloc (| name_def_map |) in Value.StructRecord "move_bytecode_verifier::reference_safety::ReferenceSafetyAnalysis" + [] + [] [ ("module", M.read (| module |)); ("function_context", M.read (| function_context |)); @@ -203,6 +205,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -318,16 +322,22 @@ Module reference_safety. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -446,6 +456,11 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -455,7 +470,13 @@ Module reference_safety. |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -567,6 +588,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -682,16 +705,22 @@ Module reference_safety. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -810,6 +839,11 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -819,7 +853,13 @@ Module reference_safety. |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2249,7 +2289,13 @@ Module reference_safety. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2380,6 +2426,8 @@ Module reference_safety. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -2576,6 +2624,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -2707,16 +2757,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -2868,6 +2924,13 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err @@ -2925,6 +2988,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -3134,6 +3199,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -3198,6 +3269,8 @@ Module reference_safety. Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::NonReference" [] + [] + [] ] |) ] @@ -3266,7 +3339,13 @@ Module reference_safety. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3420,6 +3499,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -3543,16 +3624,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -3693,6 +3780,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -3735,6 +3828,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -3905,6 +4000,11 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -3962,6 +4062,8 @@ Module reference_safety. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| verifier |) |) |); Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::NonReference" + [] + [] []; M.cast (Ty.path "u64") @@ -4047,7 +4149,13 @@ Module reference_safety. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4193,6 +4301,11 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::SignatureToken"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::file_format::SignatureToken", @@ -4215,6 +4328,11 @@ Module reference_safety. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_binary_format::file_format::SignatureToken"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -4228,6 +4346,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::VERIFIER_INVARIANT_VIOLATION" [] + [] + [] ] |) ] @@ -4583,7 +4703,11 @@ Module reference_safety. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| meter |) |) |); - Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" []; + Value.StructTuple + "move_bytecode_verifier_meter::Scope::Function" + [] + [] + []; M.read (| get_constant (| "move_bytecode_verifier::reference_safety::abstract_state::STEP_BASE_COST", @@ -4705,7 +4829,11 @@ Module reference_safety. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| meter |) |) |); - Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" []; + Value.StructTuple + "move_bytecode_verifier_meter::Scope::Function" + [] + [] + []; M.read (| get_constant (| "move_bytecode_verifier::reference_safety::abstract_state::STEP_PER_LOCAL_COST", @@ -4838,7 +4966,11 @@ Module reference_safety. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| meter |) |) |); - Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" []; + Value.StructTuple + "move_bytecode_verifier_meter::Scope::Function" + [] + [] + []; M.read (| get_constant (| "move_bytecode_verifier::reference_safety::abstract_state::STEP_PER_GRAPH_ITEM_COST", @@ -5043,6 +5175,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -5163,16 +5297,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -5307,6 +5447,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -6038,6 +6184,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -6161,16 +6309,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -6311,6 +6465,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -6521,6 +6681,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -6644,16 +6806,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -6794,6 +6962,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -6851,6 +7025,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -7047,6 +7223,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -7459,6 +7641,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -7582,16 +7766,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -7732,6 +7922,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -7847,6 +8043,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -7970,16 +8168,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -8120,6 +8324,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -8538,6 +8748,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -8661,16 +8873,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -8811,6 +9029,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -8868,6 +9092,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -9064,6 +9290,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -9473,6 +9705,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -9596,16 +9830,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -9746,6 +9986,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -9803,6 +10049,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -9999,6 +10247,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -10109,6 +10363,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -10229,16 +10485,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -10372,6 +10634,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -10438,6 +10706,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -10631,6 +10901,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -11456,6 +11732,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -11579,16 +11857,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -11729,6 +12013,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -11786,6 +12076,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -11982,6 +12274,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -12434,6 +12732,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -12557,16 +12857,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -12707,6 +13013,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -12764,6 +13076,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -12960,6 +13274,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -13379,6 +13699,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -13502,16 +13824,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -13652,6 +13980,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -13709,6 +14043,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -13905,6 +14241,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -14357,6 +14699,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -14480,16 +14824,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -14630,6 +14980,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -14687,6 +15043,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -14883,6 +15241,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -15300,6 +15664,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -15429,16 +15795,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -15588,6 +15960,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -15634,6 +16012,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -15827,6 +16207,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -16237,6 +16623,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -16366,16 +16754,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -16525,6 +16919,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -16571,6 +16971,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -16764,6 +17166,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -17223,6 +17631,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -17352,16 +17762,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -17511,6 +17927,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -17557,6 +17979,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -17750,6 +18174,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -18160,6 +18590,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -18289,16 +18721,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -18448,6 +18886,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -18494,6 +18938,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -18687,6 +19133,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -19146,6 +19598,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -19275,16 +19729,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -19434,6 +19894,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -19480,6 +19946,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -19673,6 +20141,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -20082,6 +20556,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -20211,16 +20687,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -20370,6 +20852,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -20416,6 +20904,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -20609,6 +21099,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -21420,6 +21916,8 @@ Module reference_safety. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -21654,6 +22152,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -21785,16 +22285,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -21944,6 +22450,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err @@ -22426,6 +22938,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -22556,16 +23070,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -22715,6 +23235,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err @@ -22772,6 +23298,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -22973,6 +23501,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -23141,6 +23675,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -23271,16 +23807,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -23430,6 +23972,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err @@ -23487,6 +24035,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -23688,6 +24238,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -23811,6 +24367,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -23937,16 +24495,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -24091,6 +24655,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -24214,6 +24784,8 @@ Module reference_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::Bool" [] + [] + [] |) |) |) @@ -24380,6 +24952,8 @@ Module reference_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U8" [] + [] + [] |) |) |) @@ -24541,6 +25115,8 @@ Module reference_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U16" [] + [] + [] |) |) |) @@ -24702,6 +25278,8 @@ Module reference_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U32" [] + [] + [] |) |) |) @@ -24863,6 +25441,8 @@ Module reference_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U64" [] + [] + [] |) |) |) @@ -25024,6 +25604,8 @@ Module reference_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U128" [] + [] + [] |) |) |) @@ -25185,6 +25767,8 @@ Module reference_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U256" [] + [] + [] |) |) |) @@ -25739,6 +26323,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -25869,16 +26455,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -26028,6 +26620,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err @@ -26085,6 +26683,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -26286,6 +26886,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -26419,6 +27025,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -26549,16 +27157,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -26708,6 +27322,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err @@ -26765,6 +27385,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -26966,6 +27588,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -27032,6 +27660,8 @@ Module reference_safety. Value.StructTuple "move_bytecode_verifier::reference_safety::abstract_state::AbstractValue::NonReference" [] + [] + [] ] |) ] @@ -28072,6 +28702,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -28195,16 +28827,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -28345,6 +28983,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -28418,6 +29062,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -28619,6 +29265,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -28842,6 +29494,8 @@ Module reference_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -29052,6 +29706,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -29172,16 +29828,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -29315,6 +29977,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -29529,6 +30197,8 @@ Module reference_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U64" [] + [] + [] |) |) |) @@ -29734,6 +30404,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -29863,16 +30535,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -30022,6 +30700,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -30068,6 +30752,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -30261,6 +30947,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -30371,6 +31063,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -30491,16 +31185,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -30634,6 +31334,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -31043,6 +31749,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -31172,16 +31880,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -31331,6 +32045,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -31377,6 +32097,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -31570,6 +32292,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -31680,6 +32408,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -31800,16 +32530,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -31943,6 +32679,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -32352,6 +33094,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -32481,16 +33225,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -32640,6 +33390,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -32686,6 +33442,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -32879,6 +33637,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -32989,6 +33753,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -33109,16 +33875,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -33252,6 +34024,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -33500,6 +34278,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -33620,16 +34400,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -33763,6 +34549,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -34316,6 +35108,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -34445,16 +35239,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -34604,6 +35404,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -34650,6 +35456,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -34843,6 +35651,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -35262,6 +36076,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -35391,16 +36207,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -35550,6 +36372,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -35596,6 +36424,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -35789,6 +36619,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -35920,6 +36756,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -36049,16 +36887,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -36208,6 +37052,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -36254,6 +37104,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -36447,6 +37299,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -36557,6 +37415,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -36677,16 +37537,22 @@ Module reference_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -36820,6 +37686,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -36960,7 +37832,13 @@ Module reference_safety. M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -37221,6 +38099,8 @@ Module reference_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -37414,6 +38294,12 @@ Module reference_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -37445,7 +38331,13 @@ Module reference_safety. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/script_signature.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/script_signature.v index 38b093af1..92e48acd0 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/script_signature.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/script_signature.v @@ -92,7 +92,11 @@ Module script_signature. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::VMError" ] + [ Value.Tuple [] ] |) |) |) @@ -579,6 +583,8 @@ Module script_signature. |); Value.StructTuple "move_binary_format::file_format::FunctionDefinitionIndex" + [] + [] [ M.cast (Ty.path "u16") (M.read (| idx |)) ]; M.read (| check_signature |) ] @@ -659,7 +665,13 @@ Module script_signature. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::VMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1174,6 +1186,8 @@ Module script_signature. Value.StructTuple "move_core_types::vm_status::StatusCode::VERIFICATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -1202,6 +1216,8 @@ Module script_signature. |); Value.StructTuple "move_binary_format::errors::Location::Module" + [] + [] [ M.call_closure (| Ty.path @@ -1312,6 +1328,8 @@ Module script_signature. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| module |) |) |); Value.StructTuple "move_binary_format::file_format::FunctionDefinitionIndex" + [] + [] [ M.cast (Ty.path "u16") (M.read (| idx |)) ]; M.read (| check_signature |) ] @@ -1494,7 +1512,11 @@ Module script_signature. |) |); M.read (| parameters |); - Value.StructTuple "core::option::Option::Some" [ M.read (| return_ |) ]; + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "move_binary_format::file_format::SignatureIndex" ] + [ M.read (| return_ |) ]; M.read (| check_signature |) ] |); @@ -1542,6 +1564,8 @@ Module script_signature. M.read (| e |); Value.StructTuple "move_binary_format::IndexKind::FunctionDefinition" + [] + [] []; M.read (| M.SubPointer.get_struct_tuple_field (| @@ -1554,6 +1578,8 @@ Module script_signature. |); Value.StructTuple "move_binary_format::errors::Location::Module" + [] + [] [ M.call_closure (| Ty.path "move_core_types::language_storage::ModuleId", @@ -1839,7 +1865,11 @@ Module script_signature. let _is_entry := M.alloc (| _is_entry |) in let _parameters := M.alloc (| _parameters |) in let _return_type := M.alloc (| _return_type |) in - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ])) + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2924,6 +2954,8 @@ Module script_signature. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -2937,13 +2969,21 @@ Module script_signature. Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_MAIN_FUNCTION_SIGNATURE" [] + [] + [] ] |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |))) + (M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |))) ] |) |))) diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/signature.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/signature.v index 8ce5a7cad..a29de4556 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/signature.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/signature.v @@ -117,6 +117,8 @@ Module signature. M.read (| e |); Value.StructTuple "move_binary_format::errors::Location::Module" + [] + [] [ M.call_closure (| Ty.path "move_core_types::language_storage::ModuleId", @@ -183,6 +185,8 @@ Module signature. M.alloc (| Value.StructRecord "move_bytecode_verifier::signature::SignatureChecker" + [] + [] [ ("module", M.read (| module |)); ("abilities_cache", @@ -775,6 +779,8 @@ Module signature. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -1002,7 +1008,13 @@ Module signature. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1138,12 +1150,16 @@ Module signature. M.read (| err |); Value.StructTuple "move_binary_format::IndexKind::Signature" + [] + [] []; M.cast (Ty.path "u16") (M.read (| idx |)) ] |); Value.StructTuple "move_binary_format::IndexKind::FunctionHandle" + [] + [] []; M.cast (Ty.path "u16") (M.read (| idx |)) ] @@ -1976,7 +1992,13 @@ Module signature. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2416,6 +2438,8 @@ Module signature. M.read (| err |); Value.StructTuple "move_binary_format::IndexKind::FieldDefinition" + [] + [] []; M.cast (Ty.path "u16") @@ -2424,6 +2448,8 @@ Module signature. |); Value.StructTuple "move_binary_format::IndexKind::StructDefinition" + [] + [] []; M.cast (Ty.path "u16") @@ -3796,7 +3822,13 @@ Module signature. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4311,6 +4343,8 @@ Module signature. M.read (| err |); Value.StructTuple "move_binary_format::IndexKind::Signature" + [] + [] []; M.read (| M.SubPointer.get_struct_tuple_field (| @@ -4331,6 +4365,8 @@ Module signature. |); Value.StructTuple "move_binary_format::IndexKind::FunctionDefinition" + [] + [] []; M.cast (Ty.path "u16") @@ -4423,7 +4459,13 @@ Module signature. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7089,6 +7131,12 @@ Module signature. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -7115,6 +7163,8 @@ Module signature. Value.StructTuple "move_core_types::vm_status::StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH" [] + [] + [] ] |); M.call_closure (| @@ -7925,6 +7975,12 @@ Module signature. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ Value.Tuple [] ] |))) | _ => @@ -8250,7 +8306,13 @@ Module signature. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -9045,6 +9107,11 @@ Module signature. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -9071,6 +9138,8 @@ Module signature. Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_PHANTOM_TYPE_PARAM_POSITION" [] + [] + [] ] |); M.call_closure (| @@ -9231,7 +9300,13 @@ Module signature. |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -9764,7 +9839,13 @@ Module signature. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -10031,7 +10112,13 @@ Module signature. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -10194,7 +10281,14 @@ Module signature. | [] => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ Value.Tuple [] ] |))) | _ => M.impossible "wrong number of arguments" end) @@ -10233,6 +10327,11 @@ Module signature. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -10255,6 +10354,8 @@ Module signature. Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_SIGNATURE_TOKEN" [] + [] + [] ] |); M.call_closure (| @@ -10596,6 +10697,11 @@ Module signature. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.Tuple [] ] |) |) @@ -11069,7 +11175,13 @@ Module signature. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -11416,7 +11528,11 @@ Module signature. ] |)) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] |))); fun γ => ltac:(M.monadic @@ -11809,7 +11925,14 @@ Module signature. | [] => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ Value.Tuple [] ] |))) | _ => M.impossible "wrong number of arguments" end) @@ -11934,6 +12057,11 @@ Module signature. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -11956,6 +12084,8 @@ Module signature. Value.StructTuple "move_core_types::vm_status::StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH" [] + [] + [] ] |); M.call_closure (| @@ -12505,6 +12635,12 @@ Module signature. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -12531,6 +12667,8 @@ Module signature. Value.StructTuple "move_core_types::vm_status::StatusCode::CONSTRAINT_NOT_SATISFIED" [] + [] + [] ] |); M.call_closure (| @@ -12723,7 +12861,13 @@ Module signature. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/stack_usage_verifier.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/stack_usage_verifier.v index 213d50414..5913a02dd 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/stack_usage_verifier.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/stack_usage_verifier.v @@ -74,6 +74,8 @@ Module stack_usage_verifier. M.alloc (| Value.StructRecord "move_bytecode_verifier::stack_usage_verifier::StackUsageVerifier" + [] + [] [ ("module", M.read (| module |)); ("current_function", @@ -439,7 +441,13 @@ Module stack_usage_verifier. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1005,6 +1013,12 @@ Module stack_usage_verifier. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -1031,6 +1045,8 @@ Module stack_usage_verifier. Value.StructTuple "move_core_types::vm_status::StatusCode::VALUE_STACK_PUSH_OVERFLOW" [] + [] + [] ] |); M.call_closure (| @@ -1107,6 +1123,12 @@ Module stack_usage_verifier. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -1133,6 +1155,8 @@ Module stack_usage_verifier. Value.StructTuple "move_core_types::vm_status::StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK" [] + [] + [] ] |); M.call_closure (| @@ -1219,6 +1243,12 @@ Module stack_usage_verifier. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -1245,6 +1275,8 @@ Module stack_usage_verifier. Value.StructTuple "move_core_types::vm_status::StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK" [] + [] + [] ] |); M.call_closure (| @@ -1328,6 +1360,12 @@ Module stack_usage_verifier. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -1354,6 +1392,8 @@ Module stack_usage_verifier. Value.StructTuple "move_core_types::vm_status::StatusCode::POSITIVE_STACK_SIZE_AT_BLOCK_END" [] + [] + [] ] |); M.call_closure (| @@ -1428,6 +1468,12 @@ Module stack_usage_verifier. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -1454,6 +1500,8 @@ Module stack_usage_verifier. Value.StructTuple "move_core_types::vm_status::StatusCode::VALUE_STACK_OVERFLOW" [] + [] + [] ] |); M.call_closure (| @@ -1522,13 +1570,19 @@ Module stack_usage_verifier. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -1551,6 +1605,8 @@ Module stack_usage_verifier. Value.StructTuple "move_core_types::vm_status::StatusCode::POSITIVE_STACK_SIZE_AT_BLOCK_END" [] + [] + [] ] |); M.call_closure (| @@ -1749,6 +1805,11 @@ Module stack_usage_verifier. let instruction := M.alloc (| instruction |) in Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple [ Ty.path "u64"; Ty.path "u64" ]; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| M.match_operator (| @@ -3615,6 +3676,8 @@ Module stack_usage_verifier. |); Value.StructTuple "move_binary_format::file_format::FunctionDefinitionIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ] ] |))) diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/struct_defs.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/struct_defs.v index 4c08ef4c9..2be90770a 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/struct_defs.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/struct_defs.v @@ -94,6 +94,8 @@ Module struct_defs. M.read (| e |); Value.StructTuple "move_binary_format::errors::Location::Module" + [] + [] [ M.call_closure (| Ty.path "move_core_types::language_storage::ModuleId", @@ -166,6 +168,8 @@ Module struct_defs. M.alloc (| Value.StructRecord "move_bytecode_verifier::struct_defs::RecursiveStructDefChecker" + [] + [] [ ("module", M.read (| module |)) ] |) in let~ graph : @@ -410,7 +414,32 @@ Module struct_defs. |), [ M.borrow (| Pointer.Kind.Ref, graph |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&mut") + [] + [ + Ty.apply + (Ty.path "petgraph::algo::DfsSpace") + [] + [ + Ty.path + "move_binary_format::file_format::StructDefinitionIndex"; + Ty.apply + (Ty.path "std::collections::hash::set::HashSet") + [] + [ + Ty.path + "move_binary_format::file_format::StructDefinitionIndex"; + Ty.path "std::hash::random::RandomState" + ] + ] + ] + ] + [] ] |) |), @@ -424,7 +453,11 @@ Module struct_defs. 0 |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] |))); fun γ => ltac:(M.monadic @@ -438,6 +471,8 @@ Module struct_defs. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -449,9 +484,13 @@ Module struct_defs. [ Value.StructTuple "move_core_types::vm_status::StatusCode::RECURSIVE_STRUCT_DEFINITION" + [] + [] []; Value.StructTuple "move_binary_format::IndexKind::StructDefinition" + [] + [] []; M.cast (Ty.path "u16") @@ -835,6 +874,8 @@ Module struct_defs. M.read (| sh_idx |); Value.StructTuple "move_binary_format::file_format::StructDefinitionIndex" + [] + [] [ M.cast (Ty.path "u16") (M.read (| idx |)) ] ] |) @@ -849,6 +890,8 @@ Module struct_defs. M.alloc (| Value.StructRecord "move_bytecode_verifier::struct_defs::StructDefGraphBuilder" + [] + [] [ ("module", M.read (| module |)); ("handle_to_def", M.read (| handle_to_def |)) ] |) |))) @@ -972,6 +1015,8 @@ Module struct_defs. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -1825,6 +1870,18 @@ Module struct_defs. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "petgraph::graphmap::GraphMap") + [] + [ + Ty.path "move_binary_format::file_format::StructDefinitionIndex"; + Ty.tuple []; + Ty.path "petgraph::Directed" + ]; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.apply @@ -2452,7 +2509,13 @@ Module struct_defs. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2674,6 +2737,11 @@ Module struct_defs. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -2700,6 +2768,8 @@ Module struct_defs. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -3562,7 +3632,13 @@ Module struct_defs. |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/type_safety.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/type_safety.v index 4dd2afdd0..0159930a3 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/type_safety.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/type_safety.v @@ -45,6 +45,8 @@ Module type_safety. let locals := M.alloc (| locals |) in Value.StructRecord "move_bytecode_verifier::type_safety::Locals" + [] + [] [ ("param_count", M.call_closure (| @@ -363,6 +365,8 @@ Module type_safety. M.alloc (| Value.StructRecord "move_bytecode_verifier::type_safety::TypeSafetyChecker" + [] + [] [ ("module", M.read (| module |)); ("function_context", M.read (| function_context |)); @@ -602,6 +606,8 @@ Module type_safety. |); Value.StructTuple "move_binary_format::file_format::FunctionDefinitionIndex" + [] + [] [ Value.Integer IntegerKind.U16 0 ] ] |); @@ -835,6 +841,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -950,16 +958,22 @@ Module type_safety. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -1078,6 +1092,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -1087,7 +1106,13 @@ Module type_safety. |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1320,6 +1345,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -1435,16 +1462,22 @@ Module type_safety. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -1563,6 +1596,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -1572,7 +1610,13 @@ Module type_safety. |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1662,7 +1706,7 @@ Module type_safety. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| meter |) |) |); - Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" []; + Value.StructTuple "move_bytecode_verifier_meter::Scope::Function" [] [] []; M.read (| get_constant (| "move_bytecode_verifier::type_safety::TYPE_NODE_COST", @@ -1977,7 +2021,13 @@ Module type_safety. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2613,7 +2663,13 @@ Module type_safety. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2780,6 +2836,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -2895,16 +2953,22 @@ Module type_safety. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -3026,6 +3090,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -3070,6 +3139,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -3087,6 +3161,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::BORROWFIELD_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -3296,6 +3372,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -3313,6 +3394,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::BORROWFIELD_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -3370,6 +3453,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -3387,6 +3475,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::BORROWFIELD_BAD_FIELD_ERROR" + [] + [] []; M.read (| offset |) ] @@ -3582,6 +3672,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::MutableReference" + [] + [] [ M.read (| field_type |) ] |))); fun γ => @@ -3589,6 +3681,8 @@ Module type_safety. (M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::Reference" + [] + [] [ M.read (| field_type |) ] |))) ] @@ -3662,7 +3756,13 @@ Module type_safety. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3784,6 +3884,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -3801,6 +3906,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::BORROWLOC_REFERENCE_ERROR" + [] + [] []; M.read (| offset |) ] @@ -3877,6 +3984,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::MutableReference" + [] + [] [ M.call_closure (| Ty.apply @@ -3909,6 +4018,8 @@ Module type_safety. (M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::Reference" + [] + [] [ M.call_closure (| Ty.apply @@ -4007,7 +4118,13 @@ Module type_safety. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4156,6 +4273,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -4271,16 +4390,22 @@ Module type_safety. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -4402,6 +4527,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -4441,6 +4571,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::Address" [] + [] + [] |) |) ] @@ -4453,6 +4585,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -4470,6 +4607,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::BORROWGLOBAL_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -4718,6 +4857,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -4735,6 +4879,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::BORROWGLOBAL_WITHOUT_KEY_ABILITY" + [] + [] []; M.read (| offset |) ] @@ -4836,6 +4982,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::MutableReference" + [] + [] [ M.call_closure (| Ty.apply @@ -4868,6 +5016,8 @@ Module type_safety. (M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::Reference" + [] + [] [ M.call_closure (| Ty.apply @@ -4966,7 +5116,13 @@ Module type_safety. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5360,6 +5516,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -5486,16 +5644,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -5640,6 +5804,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -5811,6 +5981,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -5831,6 +6007,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::CALL_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -6146,7 +6324,13 @@ Module type_safety. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6225,6 +6409,11 @@ Module type_safety. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_binary_format::file_format::Signature"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -6238,6 +6427,8 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| verifier |) |) |); Value.StructTuple "move_core_types::vm_status::StatusCode::PACK_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -6508,9 +6699,16 @@ Module type_safety. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_binary_format::file_format::Signature"; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ Value.StructTuple "move_binary_format::file_format::Signature" + [] + [] [ M.read (| field_sig |) ] ] |))) @@ -7022,6 +7220,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -7148,16 +7348,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -7302,6 +7508,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -7368,6 +7580,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -7388,6 +7606,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::PACK_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -7520,7 +7740,13 @@ Module type_safety. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7684,6 +7910,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -7799,16 +8027,22 @@ Module type_safety. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -7930,6 +8164,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -7974,6 +8213,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -7991,6 +8235,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::UNPACK_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -8375,7 +8621,13 @@ Module type_safety. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -8628,6 +8880,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -8645,6 +8902,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::EXISTS_WITHOUT_KEY_ABILITY_OR_BAD_ARGUMENT" + [] + [] []; M.read (| offset |) ] @@ -8745,6 +9004,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -8860,16 +9121,22 @@ Module type_safety. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -8991,6 +9258,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -9030,6 +9302,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::Address" [] + [] + [] |) |) ] @@ -9042,6 +9316,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -9059,6 +9338,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::EXISTS_WITHOUT_KEY_ABILITY_OR_BAD_ARGUMENT" + [] + [] []; M.read (| offset |) ] @@ -9119,6 +9400,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::Bool" [] + [] + [] ] |) ] @@ -9187,7 +9470,13 @@ Module type_safety. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -9434,6 +9723,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -9451,6 +9745,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::MOVEFROM_WITHOUT_KEY_ABILITY" + [] + [] []; M.read (| offset |) ] @@ -9576,6 +9872,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -9691,16 +9989,22 @@ Module type_safety. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -9822,6 +10126,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -9861,6 +10170,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::Address" [] + [] + [] |) |) ] @@ -9873,6 +10184,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -9890,6 +10206,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::MOVEFROM_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -10016,7 +10334,13 @@ Module type_safety. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -10266,6 +10590,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -10283,6 +10612,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::MOVETO_WITHOUT_KEY_ABILITY" + [] + [] []; M.read (| offset |) ] @@ -10408,6 +10739,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -10523,16 +10856,22 @@ Module type_safety. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -10654,6 +10993,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -10752,6 +11096,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -10867,16 +11213,22 @@ Module type_safety. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -10998,6 +11350,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -11042,6 +11399,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -11059,6 +11421,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::MOVETO_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -11112,13 +11476,25 @@ Module type_safety. "move_binary_format::file_format::SignatureToken::Signer" |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ Value.Tuple [] ] |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -11136,6 +11512,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::MOVETO_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -11149,6 +11527,8 @@ Module type_safety. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -11165,6 +11545,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::MOVETO_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -11320,6 +11702,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -11435,16 +11819,22 @@ Module type_safety. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -11566,6 +11956,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -11664,6 +12059,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -11779,16 +12176,22 @@ Module type_safety. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -11910,6 +12313,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -11949,6 +12357,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U64" [] + [] + [] |) |) ] @@ -11961,6 +12371,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -11978,6 +12393,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::TYPE_MISMATCH" + [] + [] []; M.read (| offset |) ] @@ -12066,6 +12483,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -12083,6 +12505,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::TYPE_MISMATCH" + [] + [] []; M.read (| offset |) ] @@ -12116,6 +12540,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::MutableReference" + [] + [] [ M.call_closure (| Ty.apply @@ -12146,6 +12572,8 @@ Module type_safety. (M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::Reference" + [] + [] [ M.call_closure (| Ty.apply @@ -12288,7 +12716,13 @@ Module type_safety. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -12908,6 +13342,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -13028,16 +13464,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -13169,6 +13611,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -13414,6 +13862,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -13431,6 +13884,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::POP_WITHOUT_DROP_ABILITY" + [] + [] []; M.read (| offset |) ] @@ -13577,6 +14032,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -13700,16 +14157,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -13850,6 +14313,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -13892,6 +14361,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::Bool" [] + [] + [] |) |) ] @@ -13908,6 +14379,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -13926,6 +14403,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::BR_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -14041,6 +14520,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -14161,16 +14642,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -14302,6 +14789,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -14393,6 +14886,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -14410,6 +14908,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::STLOC_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -14520,6 +15020,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -14640,16 +15142,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -14781,6 +15289,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -14822,6 +15336,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U64" [] + [] + [] |) |) ] @@ -14838,6 +15354,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -14855,6 +15376,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::ABORT_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -15240,6 +15763,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -15370,16 +15895,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -15529,6 +16060,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -15601,6 +16138,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -15621,6 +16164,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::RET_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -15771,6 +16316,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -15891,16 +16438,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -16032,6 +16585,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -16114,6 +16673,8 @@ Module type_safety. |); Value.StructTuple "move_binary_format::file_format::SignatureToken::Reference" + [] + [] [ M.read (| inner |) ] ] |) @@ -16194,6 +16755,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -16211,6 +16777,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::FREEZEREF_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -16298,6 +16866,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::Signature" + [] + [] [ M.call_closure (| Ty.apply @@ -16882,6 +17452,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::Signature" + [] + [] [ M.call_closure (| Ty.apply @@ -17460,6 +18032,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U8" [] + [] + [] ] |) ] @@ -17601,6 +18175,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U16" [] + [] + [] ] |) ] @@ -17742,6 +18318,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U32" [] + [] + [] ] |) ] @@ -17883,6 +18461,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U64" [] + [] + [] ] |) ] @@ -18024,6 +18604,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U128" [] + [] + [] ] |) ] @@ -18165,6 +18747,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U256" [] + [] + [] ] |) ] @@ -18525,6 +19109,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::Bool" [] + [] + [] ] |) ] @@ -18895,6 +19481,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -18913,6 +19504,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::COPYLOC_WITHOUT_COPY_ABILITY" + [] + [] []; M.read (| offset |) ] @@ -19627,6 +20220,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::Signature" + [] + [] [ M.call_closure (| Ty.apply @@ -20311,6 +20906,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::Signature" + [] + [] [ M.call_closure (| Ty.apply @@ -20981,6 +21578,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::Signature" + [] + [] [ M.call_closure (| Ty.apply @@ -21632,6 +22231,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -21752,16 +22353,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -21893,6 +22500,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -22155,6 +22768,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -22175,6 +22794,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::READREF_WITHOUT_COPY_ABILITY" + [] + [] []; M.read (| offset |) ] @@ -22336,6 +22957,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -22353,6 +22979,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::READREF_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -22462,6 +23090,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -22582,16 +23212,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -22723,6 +23359,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -22823,6 +23465,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -22943,16 +23587,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -23084,6 +23734,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -23125,6 +23781,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -23143,6 +23804,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::WRITEREF_NO_MUTABLE_REFERENCE_ERROR" + [] + [] []; M.read (| offset |) ] @@ -23341,6 +24004,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -23359,6 +24027,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::WRITEREF_WITHOUT_DROP_ABILITY" + [] + [] []; M.read (| offset |) ] @@ -23411,6 +24081,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -23428,6 +24103,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::WRITEREF_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -23538,6 +24215,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -23658,16 +24337,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -23799,6 +24484,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -23844,6 +24535,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -23862,6 +24558,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -23935,6 +24633,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U8" [] + [] + [] ] |) ] @@ -24104,6 +24804,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -24224,16 +24926,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -24365,6 +25073,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -24410,6 +25124,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -24428,6 +25147,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -24501,6 +25222,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U64" [] + [] + [] ] |) ] @@ -24670,6 +25393,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -24790,16 +25515,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -24931,6 +25662,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -24976,6 +25713,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -24994,6 +25736,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -25067,6 +25811,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U128" [] + [] + [] ] |) ] @@ -25324,6 +26070,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -25447,16 +26195,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -25597,6 +26351,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -25710,6 +26470,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -25833,16 +26595,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -25983,6 +26751,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -26185,6 +26959,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -26203,6 +26983,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -26349,6 +27131,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -26472,16 +27256,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -26622,6 +27412,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -26735,6 +27531,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -26858,16 +27656,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -27008,6 +27812,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -27063,6 +27873,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U8" [] + [] + [] |) |) ] @@ -27217,6 +28029,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -27235,6 +28053,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -27381,6 +28201,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -27504,16 +28326,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -27654,6 +28482,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -27767,6 +28601,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -27890,16 +28726,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -28040,6 +28882,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -28083,6 +28931,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::Bool" [] + [] + [] |) |) ] @@ -28111,6 +28961,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::Bool" [] + [] + [] |) |) ] @@ -28186,6 +29038,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::Bool" [] + [] + [] ] |) ] @@ -28267,6 +29121,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -28285,6 +29145,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::BOOLEAN_OP_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -28397,6 +29259,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -28517,16 +29381,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -28658,6 +29528,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -28699,6 +29575,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::Bool" [] + [] + [] |) |) ] @@ -28770,6 +29648,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::Bool" [] + [] + [] ] |) ] @@ -28850,6 +29730,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path "move_binary_format::errors::PartialVMError", @@ -28867,6 +29752,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::BOOLEAN_OP_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -29010,6 +29897,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -29133,16 +30022,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -29283,6 +30178,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -29396,6 +30297,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -29519,16 +30422,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -29669,6 +30578,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -29948,6 +30863,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::Bool" [] + [] + [] ] |) ] @@ -30029,6 +30946,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -30047,6 +30970,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::EQUALITY_OP_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -30211,6 +31136,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -30334,16 +31261,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -30484,6 +31417,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -30597,6 +31536,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -30720,16 +31661,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -30870,6 +31817,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -30992,6 +31945,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::Bool" [] + [] + [] ] |) ] @@ -31072,6 +32027,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -31090,6 +32051,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -31180,6 +32143,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::Signature" + [] + [] [ M.call_closure (| Ty.apply @@ -31768,6 +32733,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::Signature" + [] + [] [ M.call_closure (| Ty.apply @@ -32397,6 +33364,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::Signature" + [] + [] [ M.call_closure (| Ty.apply @@ -33067,6 +34036,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::Signature" + [] + [] [ M.call_closure (| Ty.apply @@ -33733,6 +34704,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::Signature" + [] + [] [ M.call_closure (| Ty.apply @@ -34595,6 +35568,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -34613,6 +35592,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::TYPE_MISMATCH" + [] + [] []; M.read (| offset |) ] @@ -34688,6 +35669,8 @@ Module type_safety. |); Value.StructTuple "move_binary_format::file_format::SignatureToken::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -34906,6 +35889,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -35026,16 +36011,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -35167,6 +36158,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -35389,6 +36386,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U64" [] + [] + [] ] |) ] @@ -35469,6 +36468,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -35487,6 +36491,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::TYPE_MISMATCH" + [] + [] []; M.read (| offset |) ] @@ -36037,6 +37043,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -36157,16 +37165,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -36298,6 +37312,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -36398,6 +37418,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -36518,16 +37540,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -36659,6 +37687,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -36805,6 +37839,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -36823,6 +37862,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::TYPE_MISMATCH" + [] + [] []; M.read (| offset |) ] @@ -36914,6 +37955,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -36932,6 +37978,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::TYPE_MISMATCH" + [] + [] []; M.read (| offset |) ] @@ -37044,6 +38092,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -37164,16 +38214,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -37305,6 +38361,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -37605,6 +38667,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -37623,6 +38690,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::TYPE_MISMATCH" + [] + [] []; M.read (| offset |) ] @@ -37742,6 +38811,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -37862,16 +38933,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -38003,6 +39080,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -38124,6 +39207,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -38189,6 +39274,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -38207,6 +39297,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::TYPE_MISMATCH" + [] + [] []; M.read (| offset |) ] @@ -38467,6 +39559,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -38587,16 +39681,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -38728,6 +39828,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -38828,6 +39934,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -38948,16 +40056,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -39089,6 +40203,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -39189,6 +40309,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -39309,16 +40431,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -39450,6 +40578,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -39494,6 +40628,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U64" [] + [] + [] |) |) ] @@ -39522,6 +40658,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U64" [] + [] + [] |) |) ] @@ -39539,6 +40677,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -39557,6 +40700,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::TYPE_MISMATCH" + [] + [] []; M.read (| offset |) ] @@ -39727,6 +40872,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -39745,6 +40895,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::TYPE_MISMATCH" + [] + [] []; M.read (| offset |) ] @@ -39855,6 +41007,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -39975,16 +41129,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -40116,6 +41276,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -40161,6 +41327,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -40179,6 +41350,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -40252,6 +41425,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U16" [] + [] + [] ] |) ] @@ -40421,6 +41596,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -40541,16 +41718,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -40682,6 +41865,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -40727,6 +41916,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -40745,6 +41939,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -40818,6 +42014,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U32" [] + [] + [] ] |) ] @@ -40987,6 +42185,8 @@ Module type_safety. Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |); M.call_closure (| @@ -41107,16 +42307,22 @@ Module type_safety. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -41248,6 +42454,12 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "move_binary_format::errors::PartialVMError" + ] [ M.read (| err |) ] |) |) @@ -41293,6 +42505,11 @@ Module type_safety. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -41311,6 +42528,8 @@ Module type_safety. |); Value.StructTuple "move_core_types::vm_status::StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR" + [] + [] []; M.read (| offset |) ] @@ -41384,6 +42603,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::U256" [] + [] + [] ] |) ] @@ -41457,7 +42678,13 @@ Module type_safety. M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -41508,6 +42735,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::Struct" + [] + [] [ M.read (| struct_handle |) ] |))); fun γ => @@ -41515,6 +42744,8 @@ Module type_safety. (M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::StructInstantiation" + [] + [] [ M.call_closure (| Ty.apply @@ -41742,7 +42973,11 @@ Module type_safety. "move_binary_format::file_format::SignatureToken::Bool" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::SignatureToken::Bool" [] + Value.StructTuple + "move_binary_format::file_format::SignatureToken::Bool" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -41753,7 +42988,11 @@ Module type_safety. "move_binary_format::file_format::SignatureToken::U8" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::SignatureToken::U8" [] + Value.StructTuple + "move_binary_format::file_format::SignatureToken::U8" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -41764,7 +43003,11 @@ Module type_safety. "move_binary_format::file_format::SignatureToken::U16" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::SignatureToken::U16" [] + Value.StructTuple + "move_binary_format::file_format::SignatureToken::U16" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -41775,7 +43018,11 @@ Module type_safety. "move_binary_format::file_format::SignatureToken::U32" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::SignatureToken::U32" [] + Value.StructTuple + "move_binary_format::file_format::SignatureToken::U32" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -41786,7 +43033,11 @@ Module type_safety. "move_binary_format::file_format::SignatureToken::U64" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::SignatureToken::U64" [] + Value.StructTuple + "move_binary_format::file_format::SignatureToken::U64" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -41797,7 +43048,11 @@ Module type_safety. "move_binary_format::file_format::SignatureToken::U128" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::SignatureToken::U128" [] + Value.StructTuple + "move_binary_format::file_format::SignatureToken::U128" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -41808,7 +43063,11 @@ Module type_safety. "move_binary_format::file_format::SignatureToken::U256" |) in M.alloc (| - Value.StructTuple "move_binary_format::file_format::SignatureToken::U256" [] + Value.StructTuple + "move_binary_format::file_format::SignatureToken::U256" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -41822,6 +43081,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::Address" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -41835,6 +43096,8 @@ Module type_safety. Value.StructTuple "move_binary_format::file_format::SignatureToken::Signer" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -41849,6 +43112,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -41906,6 +43171,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::Struct" + [] + [] [ M.read (| M.deref (| M.read (| idx |) |) |) ] |))); fun γ => @@ -41940,6 +43207,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::StructInstantiation" + [] + [] [ M.call_closure (| Ty.apply @@ -42255,6 +43524,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::Reference" + [] + [] [ M.call_closure (| Ty.apply @@ -42312,6 +43583,8 @@ Module type_safety. M.alloc (| Value.StructTuple "move_binary_format::file_format::SignatureToken::MutableReference" + [] + [] [ M.call_closure (| Ty.apply @@ -42587,7 +43860,13 @@ Module type_safety. (let γ := M.use mut_ref_only in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] + [] + |))); fun γ => ltac:(M.monadic (M.match_operator (| @@ -42615,11 +43894,19 @@ Module type_safety. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] [ M.read (| M.deref (| M.read (| element_type |) |) |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] + [] + |))) ] |))) ] @@ -42658,15 +43945,30 @@ Module type_safety. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] [ M.read (| M.deref (| M.read (| element_type |) |) |) ] |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] + [] + |))) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_binary_format::file_format::SignatureToken" ] + [] + |))) ] |) |))) diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/verifier.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/verifier.v index 03312ecb2..2f0abd601 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/verifier.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/verifier.v @@ -594,10 +594,18 @@ Module verifier. [ Value.Integer IntegerKind.Usize 0; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple + "core::fmt::rt::Alignment::Unknown" + [] + [] + []; Value.Integer IntegerKind.U32 0; - Value.StructTuple "core::fmt::rt::Count::Implied" []; - Value.StructTuple "core::fmt::rt::Count::Implied" [] + Value.StructTuple + "core::fmt::rt::Count::Implied" + [] + [] + []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] [] ] |); M.call_closure (| @@ -611,12 +619,18 @@ Module verifier. [ Value.Integer IntegerKind.Usize 1; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple + "core::fmt::rt::Alignment::Unknown" + [] + [] + []; Value.Integer IntegerKind.U32 0; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize 3 ]; - Value.StructTuple "core::fmt::rt::Count::Implied" [] + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] [] ] |); M.call_closure (| @@ -630,10 +644,18 @@ Module verifier. [ Value.Integer IntegerKind.Usize 2; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple + "core::fmt::rt::Alignment::Unknown" + [] + [] + []; Value.Integer IntegerKind.U32 0; - Value.StructTuple "core::fmt::rt::Count::Implied" []; - Value.StructTuple "core::fmt::rt::Count::Implied" [] + Value.StructTuple + "core::fmt::rt::Count::Implied" + [] + [] + []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] [] ] |); M.call_closure (| @@ -647,10 +669,18 @@ Module verifier. [ Value.Integer IntegerKind.Usize 3; Value.UnicodeChar 32; - Value.StructTuple "core::fmt::rt::Alignment::Unknown" []; + Value.StructTuple + "core::fmt::rt::Alignment::Unknown" + [] + [] + []; Value.Integer IntegerKind.U32 0; - Value.StructTuple "core::fmt::rt::Count::Implied" []; - Value.StructTuple "core::fmt::rt::Count::Implied" [] + Value.StructTuple + "core::fmt::rt::Count::Implied" + [] + [] + []; + Value.StructTuple "core::fmt::rt::Count::Implied" [] [] [] ] |) ] @@ -1002,6 +1032,8 @@ Module verifier. Value.StructTuple "move_binary_format::errors::Location::Undefined" [] + [] + [] ] |))) ] @@ -2200,7 +2232,7 @@ Module verifier. M.borrow (| Pointer.Kind.MutRef, M.alloc (| - Value.StructTuple "move_bytecode_verifier_meter::dummy::DummyMeter" [] + Value.StructTuple "move_bytecode_verifier_meter::dummy::DummyMeter" [] [] [] |) |) |) diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier_meter/bound.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier_meter/bound.v index a746b6803..c07af9c76 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier_meter/bound.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier_meter/bound.v @@ -363,6 +363,11 @@ Module bound. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] [ M.call_closure (| Ty.path @@ -389,6 +394,8 @@ Module bound. Value.StructTuple "move_core_types::vm_status::StatusCode::CONSTRAINT_NOT_SATISFIED" [] + [] + [] ] |); M.call_closure (| @@ -623,7 +630,13 @@ Module bound. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -665,10 +678,14 @@ Module bound. (let config := M.alloc (| config |) in Value.StructRecord "move_bytecode_verifier_meter::bound::BoundMeter" + [] + [] [ ("pkg_bounds", Value.StructRecord "move_bytecode_verifier_meter::bound::Bounds" + [] + [] [ ("name", M.call_closure (| @@ -697,6 +714,8 @@ Module bound. ("mod_bounds", Value.StructRecord "move_bytecode_verifier_meter::bound::Bounds" + [] + [] [ ("name", M.call_closure (| @@ -725,6 +744,8 @@ Module bound. ("fun_bounds", Value.StructRecord "move_bytecode_verifier_meter::bound::Bounds" + [] + [] [ ("name", M.call_closure (| diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier_meter/dummy.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier_meter/dummy.v index 0dd84d02d..750f71766 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier_meter/dummy.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier_meter/dummy.v @@ -38,7 +38,11 @@ Module dummy. let _from := M.alloc (| _from |) in let _to := M.alloc (| _to |) in let _factor := M.alloc (| _factor |) in - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ])) + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -54,7 +58,11 @@ Module dummy. (let self := M.alloc (| self |) in let _scope := M.alloc (| _scope |) in let _units := M.alloc (| _units |) in - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ])) + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier_meter/lib.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier_meter/lib.v index 0a2e579c0..64bace5ce 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier_meter/lib.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier_meter/lib.v @@ -414,7 +414,14 @@ Module Meter. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ Value.Tuple [] ] |) |) |) @@ -497,7 +504,14 @@ Module Meter. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path "move_binary_format::errors::PartialVMError" + ] + [ Value.Tuple [] ] |) |) |) @@ -524,6 +538,8 @@ Module Meter. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| items |)) @@ -749,7 +765,13 @@ Module Meter. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "move_binary_format::errors::PartialVMError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_core_types/abi.v b/CoqOfRust/move_sui/translations/move_core_types/abi.v index ac017fdaf..8271635b5 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/abi.v +++ b/CoqOfRust/move_sui/translations/move_core_types/abi.v @@ -53,6 +53,8 @@ Module abi. M.alloc (| Value.StructTuple "move_core_types::abi::ScriptABI::TransactionScript" + [] + [] [ M.call_closure (| Ty.path "move_core_types::abi::TransactionScriptABI", @@ -82,6 +84,8 @@ Module abi. M.alloc (| Value.StructTuple "move_core_types::abi::ScriptABI::ScriptFunction" + [] + [] [ M.call_closure (| Ty.path "move_core_types::abi::ScriptFunctionABI", @@ -725,9 +729,21 @@ Module abi. |); Value.StructRecord "move_core_types::abi::_'1::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::abi::ScriptABI" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -878,6 +894,21 @@ Module abi. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -960,6 +991,21 @@ Module abi. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -1041,6 +1087,21 @@ Module abi. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -1122,6 +1183,21 @@ Module abi. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -1211,6 +1287,21 @@ Module abi. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -1300,6 +1391,21 @@ Module abi. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -1386,9 +1492,21 @@ Module abi. |); Value.StructRecord "move_core_types::abi::_'3::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::abi::ScriptFunctionABI" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -1539,6 +1657,21 @@ Module abi. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -1621,6 +1754,21 @@ Module abi. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -1702,6 +1850,21 @@ Module abi. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -1749,6 +1912,8 @@ Module abi. M.alloc (| Value.StructRecord "move_core_types::abi::_'4::serialize::__SerializeWith" + [] + [] [ ("values", Value.Tuple @@ -1768,7 +1933,11 @@ Module abi. |) ]); ("phantom", - Value.StructTuple "core::marker::PhantomData" []) + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::abi::TransactionScriptABI" ] + []) ] |) |) @@ -1803,6 +1972,21 @@ Module abi. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -1892,6 +2076,21 @@ Module abi. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -1981,6 +2180,21 @@ Module abi. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -2067,9 +2281,21 @@ Module abi. |); Value.StructRecord "move_core_types::abi::_'5::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::abi::TransactionScriptABI" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -2199,6 +2425,21 @@ Module abi. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -2281,6 +2522,21 @@ Module abi. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -2362,6 +2618,21 @@ Module abi. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -2448,9 +2719,21 @@ Module abi. |); Value.StructRecord "move_core_types::abi::_'7::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::abi::ArgumentABI" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -2573,6 +2856,21 @@ Module abi. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -2655,6 +2953,21 @@ Module abi. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -2741,9 +3054,21 @@ Module abi. |); Value.StructRecord "move_core_types::abi::_'9::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::abi::TypeArgumentABI" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -2795,6 +3120,8 @@ Module abi. (let self := M.alloc (| self |) in Value.StructRecord "move_core_types::abi::ScriptFunctionABI" + [] + [] [ ("name", M.call_closure (| @@ -3594,6 +3921,8 @@ Module abi. (let self := M.alloc (| self |) in Value.StructRecord "move_core_types::abi::TransactionScriptABI" + [] + [] [ ("name", M.call_closure (| @@ -4395,6 +4724,8 @@ Module abi. (let self := M.alloc (| self |) in Value.StructRecord "move_core_types::abi::ArgumentABI" + [] + [] [ ("name", M.call_closure (| @@ -4784,6 +5115,8 @@ Module abi. (let self := M.alloc (| self |) in Value.StructRecord "move_core_types::abi::TypeArgumentABI" + [] + [] [ ("name", M.call_closure (| @@ -5065,6 +5398,8 @@ Module abi. let args := M.alloc (| args |) in Value.StructRecord "move_core_types::abi::TransactionScriptABI" + [] + [] [ ("name", M.read (| name |)); ("doc", M.read (| doc |)); @@ -5379,6 +5714,8 @@ Module abi. let args := M.alloc (| args |) in Value.StructRecord "move_core_types::abi::ScriptFunctionABI" + [] + [] [ ("name", M.read (| name |)); ("module_name", M.read (| module_name |)); @@ -6145,6 +6482,8 @@ Module abi. let type_tag := M.alloc (| type_tag |) in Value.StructRecord "move_core_types::abi::ArgumentABI" + [] + [] [ ("name", M.read (| name |)); ("type_tag", M.read (| type_tag |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6248,6 +6587,8 @@ Module abi. (let name := M.alloc (| name |) in Value.StructRecord "move_core_types::abi::TypeArgumentABI" + [] + [] [ ("name", M.read (| name |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/move_sui/translations/move_core_types/account_address.v b/CoqOfRust/move_sui/translations/move_core_types/account_address.v index c9316e19d..ea1de0f47 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/account_address.v +++ b/CoqOfRust/move_sui/translations/move_core_types/account_address.v @@ -350,6 +350,8 @@ Module account_address. (let address := M.alloc (| address |) in Value.StructTuple "move_core_types::account_address::AccountAddress" + [] + [] [ M.read (| address |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -375,6 +377,8 @@ Module account_address. (M.alloc (| Value.StructTuple "move_core_types::account_address::AccountAddress" + [] + [] [ repeat (| Value.Integer IntegerKind.U8 0, Value.Integer IntegerKind.Usize 32 |) ] |))). @@ -475,6 +479,8 @@ Module account_address. M.alloc (| Value.StructTuple "move_core_types::account_address::AccountAddress" + [] + [] [ M.read (| addr |) ] |) |))) @@ -537,6 +543,8 @@ Module account_address. M.alloc (| Value.StructTuple "move_core_types::account_address::AccountAddress" + [] + [] [ M.read (| addr |) ] |) |))) @@ -561,7 +569,7 @@ Module account_address. ltac:(M.monadic (M.read (| let~ rng : Ty.apply (Ty.path "*") [] [ Ty.path "rand_core::os::OsRng" ] := - M.alloc (| Value.StructTuple "rand_core::os::OsRng" [] |) in + M.alloc (| Value.StructTuple "rand_core::os::OsRng" [] [] [] |) in let~ buf : Ty.apply (Ty.path "*") @@ -598,6 +606,8 @@ Module account_address. M.alloc (| Value.StructTuple "move_core_types::account_address::AccountAddress" + [] + [] [ M.read (| buf |) ] |) |))) @@ -689,6 +699,8 @@ Module account_address. let with_prefix := M.alloc (| with_prefix |) in Value.StructRecord "move_core_types::account_address::to_canonical_display::HexDisplay" + [] + [] [ ("data", (* Unsize *) @@ -999,10 +1011,18 @@ Module account_address. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_core_types::account_address::AccountAddress"; + Ty.path + "move_core_types::account_address::AccountAddressParseError" + ] [ Value.StructTuple "move_core_types::account_address::AccountAddressParseError" [] + [] + [] ] |) |) @@ -1124,6 +1144,8 @@ Module account_address. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -1278,6 +1300,8 @@ Module account_address. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 2) ] ] |) @@ -1350,6 +1374,8 @@ Module account_address. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 2) ] ] |) @@ -1607,6 +1633,8 @@ Module account_address. ltac:(M.monadic (Value.StructTuple "move_core_types::account_address::AccountAddressParseError" + [] + [] [])) ] |))) @@ -1614,7 +1642,7 @@ Module account_address. end)) ] |); - M.constructor_as_closure "move_core_types::account_address::AccountAddress" + M.constructor_as_closure "move_core_types::account_address::AccountAddress" [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1864,6 +1892,8 @@ Module account_address. ltac:(M.monadic (Value.StructTuple "move_core_types::account_address::AccountAddressParseError" + [] + [] [])) ] |))) @@ -1871,7 +1901,7 @@ Module account_address. end)) ] |); - M.constructor_as_closure "move_core_types::account_address::AccountAddress" + M.constructor_as_closure "move_core_types::account_address::AccountAddress" [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2605,15 +2635,21 @@ Module account_address. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 8; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize @@ -2714,7 +2750,13 @@ Module account_address. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3145,15 +3187,21 @@ Module account_address. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 8; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize @@ -3254,7 +3302,13 @@ Module account_address. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3740,7 +3794,14 @@ Module account_address. M.SubPointer.get_struct_tuple_field (| γ, "core::result::Result::Ok", 0 |) in let address := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| address |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::account_address::AccountAddress"; + Ty.path "move_core_types::account_address::AccountAddressParseError" + ] + [ M.read (| address |) ] |))); fun γ => ltac:(M.monadic @@ -4263,6 +4324,11 @@ Module account_address. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::account_address::AccountAddress"; + Ty.associated_in_trait "serde::de::Deserializer" [] [] D "Error" + ] [ M.call_closure (| Ty.path "move_core_types::account_address::AccountAddress", diff --git a/CoqOfRust/move_sui/translations/move_core_types/annotated_value.v b/CoqOfRust/move_sui/translations/move_core_types/annotated_value.v index fbde6bb46..fb1aa652e 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/annotated_value.v +++ b/CoqOfRust/move_sui/translations/move_core_types/annotated_value.v @@ -295,6 +295,8 @@ Module annotated_value. (let self := M.alloc (| self |) in Value.StructRecord "move_core_types::annotated_value::MoveStruct" + [] + [] [ ("type_", M.call_closure (| @@ -1603,6 +1605,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::U8" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -1632,6 +1636,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::U64" + [] + [] [ M.call_closure (| Ty.path "u64", @@ -1661,6 +1667,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::U128" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -1690,6 +1698,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::Bool" + [] + [] [ M.call_closure (| Ty.path "bool", @@ -1719,6 +1729,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::Address" + [] + [] [ M.call_closure (| Ty.path "move_core_types::account_address::AccountAddress", @@ -1748,6 +1760,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -1789,6 +1803,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::Struct" + [] + [] [ M.call_closure (| Ty.path "move_core_types::annotated_value::MoveStruct", @@ -1818,6 +1834,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::Signer" + [] + [] [ M.call_closure (| Ty.path "move_core_types::account_address::AccountAddress", @@ -1847,6 +1865,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::U16" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -1876,6 +1896,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::U32" + [] + [] [ M.call_closure (| Ty.path "u32", @@ -1905,6 +1927,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::U256" + [] + [] [ M.call_closure (| Ty.path "move_core_types::u256::U256", @@ -2034,6 +2058,8 @@ Module annotated_value. (let self := M.alloc (| self |) in Value.StructRecord "move_core_types::annotated_value::MoveFieldLayout" + [] + [] [ ("name", M.call_closure (| @@ -2220,6 +2246,21 @@ Module annotated_value. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -2302,6 +2343,21 @@ Module annotated_value. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -2383,6 +2439,21 @@ Module annotated_value. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -2469,9 +2540,21 @@ Module annotated_value. |); Value.StructRecord "move_core_types::annotated_value::_'1::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::annotated_value::MoveFieldLayout" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -2601,6 +2684,21 @@ Module annotated_value. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -2683,6 +2781,21 @@ Module annotated_value. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -2772,6 +2885,21 @@ Module annotated_value. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -2858,9 +2986,21 @@ Module annotated_value. |); Value.StructRecord "move_core_types::annotated_value::_'3::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::annotated_value::MoveStructLayout" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -3337,9 +3477,21 @@ Module annotated_value. |); Value.StructRecord "move_core_types::annotated_value::_'5::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::annotated_value::MoveTypeLayout" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -3373,6 +3525,8 @@ Module annotated_value. let layout := M.alloc (| layout |) in Value.StructRecord "move_core_types::annotated_value::MoveFieldLayout" + [] + [] [ ("name", M.read (| name |)); ("layout", M.read (| layout |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3487,6 +3641,8 @@ Module annotated_value. (let self := M.alloc (| self |) in Value.StructRecord "move_core_types::annotated_value::MoveStructLayout" + [] + [] [ ("type_", M.call_closure (| @@ -4025,7 +4181,11 @@ Module annotated_value. "move_core_types::annotated_value::MoveTypeLayout::Bool" |) in M.alloc (| - Value.StructTuple "move_core_types::annotated_value::MoveTypeLayout::Bool" [] + Value.StructTuple + "move_core_types::annotated_value::MoveTypeLayout::Bool" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -4036,7 +4196,11 @@ Module annotated_value. "move_core_types::annotated_value::MoveTypeLayout::U8" |) in M.alloc (| - Value.StructTuple "move_core_types::annotated_value::MoveTypeLayout::U8" [] + Value.StructTuple + "move_core_types::annotated_value::MoveTypeLayout::U8" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -4047,7 +4211,11 @@ Module annotated_value. "move_core_types::annotated_value::MoveTypeLayout::U64" |) in M.alloc (| - Value.StructTuple "move_core_types::annotated_value::MoveTypeLayout::U64" [] + Value.StructTuple + "move_core_types::annotated_value::MoveTypeLayout::U64" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -4058,7 +4226,11 @@ Module annotated_value. "move_core_types::annotated_value::MoveTypeLayout::U128" |) in M.alloc (| - Value.StructTuple "move_core_types::annotated_value::MoveTypeLayout::U128" [] + Value.StructTuple + "move_core_types::annotated_value::MoveTypeLayout::U128" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -4072,6 +4244,8 @@ Module annotated_value. Value.StructTuple "move_core_types::annotated_value::MoveTypeLayout::Address" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -4086,6 +4260,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveTypeLayout::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -4127,6 +4303,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveTypeLayout::Struct" + [] + [] [ M.call_closure (| Ty.path "move_core_types::annotated_value::MoveStructLayout", @@ -4155,6 +4333,8 @@ Module annotated_value. Value.StructTuple "move_core_types::annotated_value::MoveTypeLayout::Signer" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -4165,7 +4345,11 @@ Module annotated_value. "move_core_types::annotated_value::MoveTypeLayout::U16" |) in M.alloc (| - Value.StructTuple "move_core_types::annotated_value::MoveTypeLayout::U16" [] + Value.StructTuple + "move_core_types::annotated_value::MoveTypeLayout::U16" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -4176,7 +4360,11 @@ Module annotated_value. "move_core_types::annotated_value::MoveTypeLayout::U32" |) in M.alloc (| - Value.StructTuple "move_core_types::annotated_value::MoveTypeLayout::U32" [] + Value.StructTuple + "move_core_types::annotated_value::MoveTypeLayout::U32" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -4187,7 +4375,11 @@ Module annotated_value. "move_core_types::annotated_value::MoveTypeLayout::U256" |) in M.alloc (| - Value.StructTuple "move_core_types::annotated_value::MoveTypeLayout::U256" [] + Value.StructTuple + "move_core_types::annotated_value::MoveTypeLayout::U256" + [] + [] + [] |))) ] |) @@ -4228,6 +4420,8 @@ Module annotated_value. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "move_core_types::annotated_value::MoveValue"; Ty.path "anyhow::Error" ] [ M.read (| M.match_operator (| @@ -4634,13 +4828,35 @@ Module annotated_value. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| res |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.associated_in_trait + "move_core_types::annotated_visitor::Visitor" + [] + [] + V + "Value"; + Ty.path "anyhow::Error" + ] + [ M.read (| res |) ] |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "move_core_types::annotated_visitor::Visitor" + [] + [] + V + "Value"; + Ty.path "anyhow::Error" + ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -4656,6 +4872,8 @@ Module annotated_value. [ Value.StructTuple "move_core_types::annotated_visitor::Error::TrailingBytes" + [] + [] [ M.call_closure (| Ty.path "usize", @@ -4794,6 +5012,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::Struct" + [] + [] [ M.call_closure (| Ty.path "move_core_types::runtime_value::MoveStruct", @@ -4819,6 +5039,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -4946,6 +5168,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::U8" + [] + [] [ M.read (| u |) ] |))); fun γ => @@ -4960,6 +5184,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::U64" + [] + [] [ M.read (| u |) ] |))); fun γ => @@ -4974,6 +5200,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::U128" + [] + [] [ M.read (| u |) ] |))); fun γ => @@ -4988,6 +5216,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::Bool" + [] + [] [ M.read (| b |) ] |))); fun γ => @@ -5002,6 +5232,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::Address" + [] + [] [ M.read (| a |) ] |))); fun γ => @@ -5016,6 +5248,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::Signer" + [] + [] [ M.read (| s |) ] |))); fun γ => @@ -5030,6 +5264,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::U16" + [] + [] [ M.read (| u |) ] |))); fun γ => @@ -5044,6 +5280,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::U32" + [] + [] [ M.read (| u |) ] |))); fun γ => @@ -5058,6 +5296,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::U256" + [] + [] [ M.read (| u |) ] |))) ] @@ -5336,6 +5576,8 @@ Module annotated_value. let fields := M.alloc (| fields |) in Value.StructRecord "move_core_types::annotated_value::MoveStruct" + [] + [] [ ("type_", M.read (| type_ |)); ("fields", M.read (| fields |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5364,6 +5606,8 @@ Module annotated_value. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "move_core_types::annotated_value::MoveStruct"; Ty.path "anyhow::Error" ] [ M.read (| M.match_operator (| @@ -5770,13 +6014,35 @@ Module annotated_value. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| res |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.associated_in_trait + "move_core_types::annotated_visitor::Visitor" + [] + [] + V + "Value"; + Ty.path "anyhow::Error" + ] + [ M.read (| res |) ] |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "move_core_types::annotated_visitor::Visitor" + [] + [] + V + "Value"; + Ty.path "anyhow::Error" + ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -5792,6 +6058,8 @@ Module annotated_value. [ Value.StructTuple "move_core_types::annotated_visitor::Error::TrailingBytes" + [] + [] [ M.call_closure (| Ty.path "usize", @@ -6057,6 +6325,8 @@ Module annotated_value. (let self := M.alloc (| self |) in Value.StructTuple "move_core_types::runtime_value::MoveStruct" + [] + [] [ M.call_closure (| Ty.apply @@ -6213,6 +6483,8 @@ Module annotated_value. let fields := M.alloc (| fields |) in Value.StructRecord "move_core_types::annotated_value::MoveStructLayout" + [] + [] [ ("type_", M.read (| type_ |)); ("fields", M.read (| fields |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6519,6 +6791,8 @@ Module annotated_value. |); M.constructor_as_closure "move_core_types::annotated_value::MoveValue::Bool" + [] + [] ] |) |))); @@ -6578,6 +6852,8 @@ Module annotated_value. |); M.constructor_as_closure "move_core_types::annotated_value::MoveValue::U8" + [] + [] ] |) |))); @@ -6637,6 +6913,8 @@ Module annotated_value. |); M.constructor_as_closure "move_core_types::annotated_value::MoveValue::U16" + [] + [] ] |) |))); @@ -6696,6 +6974,8 @@ Module annotated_value. |); M.constructor_as_closure "move_core_types::annotated_value::MoveValue::U32" + [] + [] ] |) |))); @@ -6755,6 +7035,8 @@ Module annotated_value. |); M.constructor_as_closure "move_core_types::annotated_value::MoveValue::U64" + [] + [] ] |) |))); @@ -6814,6 +7096,8 @@ Module annotated_value. |); M.constructor_as_closure "move_core_types::annotated_value::MoveValue::U128" + [] + [] ] |) |))); @@ -6873,6 +7157,8 @@ Module annotated_value. |); M.constructor_as_closure "move_core_types::annotated_value::MoveValue::U256" + [] + [] ] |) |))); @@ -6932,6 +7218,8 @@ Module annotated_value. |); M.constructor_as_closure "move_core_types::annotated_value::MoveValue::Address" + [] + [] ] |) |))); @@ -6991,6 +7279,8 @@ Module annotated_value. |); M.constructor_as_closure "move_core_types::annotated_value::MoveValue::Signer" + [] + [] ] |) |))); @@ -7007,9 +7297,16 @@ Module annotated_value. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::annotated_value::MoveValue"; + Ty.associated_in_trait "serde::de::Deserializer" [] [] D "Error" + ] [ Value.StructTuple "move_core_types::annotated_value::MoveValue::Struct" + [] + [] [ M.read (| M.match_operator (| @@ -7196,9 +7493,16 @@ Module annotated_value. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::annotated_value::MoveValue"; + Ty.associated_in_trait "serde::de::Deserializer" [] [] D "Error" + ] [ Value.StructTuple "move_core_types::annotated_value::MoveValue::Vector" + [] + [] [ M.read (| M.match_operator (| @@ -7305,6 +7609,8 @@ Module annotated_value. M.read (| deserializer |); Value.StructTuple "move_core_types::annotated_value::VectorElementVisitor" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -7791,7 +8097,22 @@ Module annotated_value. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| vals |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path "move_core_types::annotated_value::MoveValue"; + Ty.path "alloc::alloc::Global" + ]; + Ty.associated_in_trait "serde::de::SeqAccess" [] [] A "Error" + ] + [ M.read (| vals |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -8414,6 +8735,28 @@ Module annotated_value. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.tuple + [ + Ty.path + "move_core_types::identifier::Identifier"; + Ty.path + "move_core_types::annotated_value::MoveValue" + ]; + Ty.path "alloc::alloc::Global" + ]; + Ty.associated_in_trait + "serde::de::SeqAccess" + [] + [] + A + "Error" + ] [ M.call_closure (| Ty.associated_in_trait @@ -8464,7 +8807,26 @@ Module annotated_value. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| vals |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.tuple + [ + Ty.path "move_core_types::identifier::Identifier"; + Ty.path "move_core_types::annotated_value::MoveValue" + ]; + Ty.path "alloc::alloc::Global" + ]; + Ty.associated_in_trait "serde::de::SeqAccess" [] [] A "Error" + ] + [ M.read (| vals |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -8529,6 +8891,15 @@ Module annotated_value. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple + [ + Ty.path "move_core_types::identifier::Identifier"; + Ty.path "move_core_types::annotated_value::MoveValue" + ]; + Ty.associated_in_trait "serde::de::Deserializer" [] [] D "Error" + ] [ Value.Tuple [ @@ -8932,6 +9303,8 @@ Module annotated_value. |); Value.StructTuple "move_core_types::annotated_value::DecoratedStructFieldVisitor" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -9071,9 +9444,16 @@ Module annotated_value. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::annotated_value::MoveStruct"; + Ty.associated_in_trait "serde::de::Deserializer" [] [] D "Error" + ] [ Value.StructRecord "move_core_types::annotated_value::MoveStruct" + [] + [] [ ("type_", M.call_closure (| @@ -9613,6 +9993,8 @@ Module annotated_value. M.read (| serializer |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -10191,6 +10573,8 @@ Module annotated_value. M.read (| serializer |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -11174,6 +11558,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveFields" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -11942,12 +12328,20 @@ Module annotated_value. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; - Value.StructTuple "core::fmt::rt::Count::Implied" [] + Value.StructTuple + "core::fmt::rt::Count::Implied" + [] + [] + [] ] |) ] @@ -12181,12 +12575,20 @@ Module annotated_value. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; - Value.StructTuple "core::fmt::rt::Count::Implied" [] + Value.StructTuple + "core::fmt::rt::Count::Implied" + [] + [] + [] ] |) ] @@ -12462,12 +12864,20 @@ Module annotated_value. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; - Value.StructTuple "core::fmt::rt::Count::Implied" [] + Value.StructTuple + "core::fmt::rt::Count::Implied" + [] + [] + [] ] |) ] @@ -13058,6 +13468,11 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::DebugAsDisplay" + [] + [ + Ty.path + "move_core_types::identifier::Identifier" + ] [ M.borrow (| Pointer.Kind.Ref, @@ -13089,6 +13504,11 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::DebugAsDisplay" + [] + [ + Ty.path + "move_core_types::annotated_value::MoveTypeLayout" + ] [ M.borrow (| Pointer.Kind.Ref, @@ -13191,7 +13611,11 @@ Module annotated_value. "move_core_types::annotated_value::MoveTypeLayout::Address" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::Address" [] + Value.StructTuple + "move_core_types::language_storage::TypeTag::Address" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -13202,7 +13626,7 @@ Module annotated_value. "move_core_types::annotated_value::MoveTypeLayout::Bool" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::Bool" [] + Value.StructTuple "move_core_types::language_storage::TypeTag::Bool" [] [] [] |))); fun γ => ltac:(M.monadic @@ -13213,7 +13637,7 @@ Module annotated_value. "move_core_types::annotated_value::MoveTypeLayout::U8" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::U8" [] + Value.StructTuple "move_core_types::language_storage::TypeTag::U8" [] [] [] |))); fun γ => ltac:(M.monadic @@ -13224,7 +13648,7 @@ Module annotated_value. "move_core_types::annotated_value::MoveTypeLayout::U16" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::U16" [] + Value.StructTuple "move_core_types::language_storage::TypeTag::U16" [] [] [] |))); fun γ => ltac:(M.monadic @@ -13235,7 +13659,7 @@ Module annotated_value. "move_core_types::annotated_value::MoveTypeLayout::U32" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::U32" [] + Value.StructTuple "move_core_types::language_storage::TypeTag::U32" [] [] [] |))); fun γ => ltac:(M.monadic @@ -13246,7 +13670,7 @@ Module annotated_value. "move_core_types::annotated_value::MoveTypeLayout::U64" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::U64" [] + Value.StructTuple "move_core_types::language_storage::TypeTag::U64" [] [] [] |))); fun γ => ltac:(M.monadic @@ -13257,7 +13681,7 @@ Module annotated_value. "move_core_types::annotated_value::MoveTypeLayout::U128" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::U128" [] + Value.StructTuple "move_core_types::language_storage::TypeTag::U128" [] [] [] |))); fun γ => ltac:(M.monadic @@ -13268,7 +13692,7 @@ Module annotated_value. "move_core_types::annotated_value::MoveTypeLayout::U256" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::U256" [] + Value.StructTuple "move_core_types::language_storage::TypeTag::U256" [] [] [] |))); fun γ => ltac:(M.monadic @@ -13279,7 +13703,11 @@ Module annotated_value. "move_core_types::annotated_value::MoveTypeLayout::Signer" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::Signer" [] + Value.StructTuple + "move_core_types::language_storage::TypeTag::Signer" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -13310,6 +13738,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::language_storage::TypeTag::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -13370,6 +13800,8 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::language_storage::TypeTag::Struct" + [] + [] [ M.call_closure (| Ty.apply @@ -14611,6 +15043,11 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::DebugAsDisplay" + [] + [ + Ty.path + "move_core_types::annotated_value::MoveValue" + ] [ M.borrow (| Pointer.Kind.Ref, @@ -15144,6 +15581,11 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::DebugAsDisplay" + [] + [ + Ty.path + "move_core_types::identifier::Identifier" + ] [ M.borrow (| Pointer.Kind.Ref, @@ -15164,6 +15606,11 @@ Module annotated_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::DebugAsDisplay" + [] + [ + Ty.path + "move_core_types::annotated_value::MoveValue" + ] [ M.borrow (| Pointer.Kind.Ref, diff --git a/CoqOfRust/move_sui/translations/move_core_types/annotated_visitor.v b/CoqOfRust/move_sui/translations/move_core_types/annotated_visitor.v index 315a6f486..95888d75b 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/annotated_visitor.v +++ b/CoqOfRust/move_sui/translations/move_core_types/annotated_visitor.v @@ -18,7 +18,19 @@ Module annotated_visitor. ltac:(M.monadic (let self := M.alloc (| self |) in let _value := M.alloc (| _value |) in - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ])) + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.associated_in_trait + "move_core_types::annotated_visitor::Traversal" + [] + [] + Self + "Error" + ] + [ Value.Tuple [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -35,7 +47,19 @@ Module annotated_visitor. ltac:(M.monadic (let self := M.alloc (| self |) in let _value := M.alloc (| _value |) in - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ])) + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.associated_in_trait + "move_core_types::annotated_visitor::Traversal" + [] + [] + Self + "Error" + ] + [ Value.Tuple [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -55,7 +79,19 @@ Module annotated_visitor. ltac:(M.monadic (let self := M.alloc (| self |) in let _value := M.alloc (| _value |) in - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ])) + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.associated_in_trait + "move_core_types::annotated_visitor::Traversal" + [] + [] + Self + "Error" + ] + [ Value.Tuple [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -75,7 +111,19 @@ Module annotated_visitor. ltac:(M.monadic (let self := M.alloc (| self |) in let _value := M.alloc (| _value |) in - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ])) + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.associated_in_trait + "move_core_types::annotated_visitor::Traversal" + [] + [] + Self + "Error" + ] + [ Value.Tuple [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -95,7 +143,19 @@ Module annotated_visitor. ltac:(M.monadic (let self := M.alloc (| self |) in let _value := M.alloc (| _value |) in - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ])) + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.associated_in_trait + "move_core_types::annotated_visitor::Traversal" + [] + [] + Self + "Error" + ] + [ Value.Tuple [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -115,7 +175,19 @@ Module annotated_visitor. ltac:(M.monadic (let self := M.alloc (| self |) in let _value := M.alloc (| _value |) in - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ])) + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.associated_in_trait + "move_core_types::annotated_visitor::Traversal" + [] + [] + Self + "Error" + ] + [ Value.Tuple [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -135,7 +207,19 @@ Module annotated_visitor. ltac:(M.monadic (let self := M.alloc (| self |) in let _value := M.alloc (| _value |) in - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ])) + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.associated_in_trait + "move_core_types::annotated_visitor::Traversal" + [] + [] + Self + "Error" + ] + [ Value.Tuple [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -155,7 +239,19 @@ Module annotated_visitor. ltac:(M.monadic (let self := M.alloc (| self |) in let _value := M.alloc (| _value |) in - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ])) + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.associated_in_trait + "move_core_types::annotated_visitor::Traversal" + [] + [] + Self + "Error" + ] + [ Value.Tuple [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -175,7 +271,19 @@ Module annotated_visitor. ltac:(M.monadic (let self := M.alloc (| self |) in let _value := M.alloc (| _value |) in - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ])) + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.associated_in_trait + "move_core_types::annotated_visitor::Traversal" + [] + [] + Self + "Error" + ] + [ Value.Tuple [] ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -433,7 +541,21 @@ Module annotated_visitor. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.associated_in_trait + "move_core_types::annotated_visitor::Traversal" + [] + [] + Self + "Error" + ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -753,7 +875,21 @@ Module annotated_visitor. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.associated_in_trait + "move_core_types::annotated_visitor::Traversal" + [] + [] + Self + "Error" + ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1839,6 +1975,8 @@ Module annotated_visitor. let len := M.alloc (| len |) in Value.StructRecord "move_core_types::annotated_visitor::VecDriver" + [] + [] [ ("bytes", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| bytes |) |) |)); ("layout", M.read (| layout |)); @@ -1980,6 +2118,26 @@ Module annotated_visitor. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ + Ty.associated_in_trait + "move_core_types::annotated_visitor::Visitor" + [] + [] + V + "Value" + ]; + Ty.associated_in_trait + "move_core_types::annotated_visitor::Visitor" + [] + [] + V + "Error" + ] [ M.read (| M.match_operator (| @@ -2029,7 +2187,20 @@ Module annotated_visitor. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.associated_in_trait + "move_core_types::annotated_visitor::Visitor" + [] + [] + V + "Value" + ] + [] + |))); fun γ => ltac:(M.monadic (let~ res : @@ -2282,7 +2453,18 @@ Module annotated_visitor. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| res |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.associated_in_trait + "move_core_types::annotated_visitor::Visitor" + [] + [] + V + "Value" + ] + [ M.read (| res |) ] |))) ] |) @@ -2352,7 +2534,11 @@ Module annotated_visitor. M.borrow (| Pointer.Kind.MutRef, M.alloc (| - Value.StructTuple "move_core_types::annotated_visitor::NullTraversal" [] + Value.StructTuple + "move_core_types::annotated_visitor::NullTraversal" + [] + [] + [] |) |) |) @@ -2427,6 +2613,8 @@ Module annotated_visitor. let layout := M.alloc (| layout |) in Value.StructRecord "move_core_types::annotated_visitor::StructDriver" + [] + [] [ ("bytes", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| bytes |) |) |)); ("layout", M.read (| layout |)); @@ -2945,9 +3133,58 @@ Module annotated_visitor. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.path + "move_core_types::annotated_value::MoveFieldLayout" + ]; + Ty.associated_in_trait + "move_core_types::annotated_visitor::Visitor" + [] + [] + V + "Value" + ] + ]; + Ty.associated_in_trait + "move_core_types::annotated_visitor::Visitor" + [] + [] + V + "Error" + ] [ Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.path + "move_core_types::annotated_value::MoveFieldLayout" + ]; + Ty.associated_in_trait + "move_core_types::annotated_visitor::Visitor" + [] + [] + V + "Value" + ] + ] [ Value.Tuple [ @@ -3096,7 +3333,11 @@ Module annotated_visitor. M.borrow (| Pointer.Kind.MutRef, M.alloc (| - Value.StructTuple "move_core_types::annotated_visitor::NullTraversal" [] + Value.StructTuple + "move_core_types::annotated_visitor::NullTraversal" + [] + [] + [] |) |) |) @@ -3651,6 +3892,21 @@ Module annotated_visitor. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "move_core_types::annotated_visitor::Visitor" + [] + [] + V + "Value"; + Ty.associated_in_trait + "move_core_types::annotated_visitor::Visitor" + [] + [] + V + "Error" + ] [ M.call_closure (| Ty.associated_in_trait @@ -3678,6 +3934,8 @@ Module annotated_visitor. [ Value.StructTuple "move_core_types::annotated_visitor::Error::UnexpectedByte" + [] + [] [ M.read (| b |) ] ] |) @@ -5490,6 +5748,8 @@ Module annotated_visitor. ltac:(M.monadic (Value.StructTuple "move_core_types::annotated_visitor::Error::UnexpectedEof" + [] + [] [])) ] |))) @@ -6018,7 +6278,24 @@ Module annotated_visitor. |))) |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| res |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.associated_in_trait + "move_core_types::annotated_visitor::Visitor" + [] + [] + V + "Value"; + Ty.associated_in_trait + "move_core_types::annotated_visitor::Visitor" + [] + [] + V + "Error" + ] + [ M.read (| res |) ] |))); fun γ => ltac:(M.monadic @@ -6574,7 +6851,26 @@ Module annotated_visitor. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| res |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.associated_in_trait + "move_core_types::annotated_visitor::Visitor" + [] + [] + V + "Value"; + Ty.associated_in_trait + "move_core_types::annotated_visitor::Visitor" + [] + [] + V + "Error" + ] + [ M.read (| res |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6714,6 +7010,8 @@ Module annotated_visitor. ltac:(M.monadic (Value.StructTuple "move_core_types::annotated_visitor::Error::UnexpectedEof" + [] + [] [])) ] |))) @@ -6787,7 +7085,16 @@ Module annotated_visitor. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| buf |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "array") [ N ] [ Ty.path "u8" ]; + Ty.path "move_core_types::annotated_visitor::Error" + ] + [ M.read (| buf |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_core_types/effects.v b/CoqOfRust/move_sui/translations/move_core_types/effects.v index 5842feb74..52fd0ff28 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/effects.v +++ b/CoqOfRust/move_sui/translations/move_core_types/effects.v @@ -190,6 +190,8 @@ Module effects. M.alloc (| Value.StructTuple "move_core_types::effects::Op::New" + [] + [ T ] [ M.call_closure (| T, @@ -219,6 +221,8 @@ Module effects. M.alloc (| Value.StructTuple "move_core_types::effects::Op::Modify" + [] + [ T ] [ M.call_closure (| T, @@ -239,7 +243,9 @@ Module effects. ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "move_core_types::effects::Op::Delete" |) in - M.alloc (| Value.StructTuple "move_core_types::effects::Op::Delete" [] |))) + M.alloc (| + Value.StructTuple "move_core_types::effects::Op::Delete" [] [ T ] [] + |))) ] |) |))) @@ -586,7 +592,7 @@ Module effects. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] |))) + (M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] |))) ] |))); fun γ => @@ -825,6 +831,8 @@ Module effects. M.alloc (| Value.StructTuple "move_core_types::effects::Op::New" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |) ] |))); fun γ => @@ -840,13 +848,21 @@ Module effects. M.alloc (| Value.StructTuple "move_core_types::effects::Op::Modify" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |) ] |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "move_core_types::effects::Op::Delete" |) in - M.alloc (| Value.StructTuple "move_core_types::effects::Op::Delete" [] |))) + M.alloc (| + Value.StructTuple + "move_core_types::effects::Op::Delete" + [] + [ Ty.apply (Ty.path "&") [] [ T ] ] + [] + |))) ] |) |))) @@ -900,6 +916,8 @@ Module effects. M.alloc (| Value.StructTuple "move_core_types::effects::Op::New" + [] + [ U ] [ M.call_closure (| U, @@ -928,6 +946,8 @@ Module effects. M.alloc (| Value.StructTuple "move_core_types::effects::Op::Modify" + [] + [ U ] [ M.call_closure (| U, @@ -947,7 +967,9 @@ Module effects. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "move_core_types::effects::Op::Delete" |) in - M.alloc (| Value.StructTuple "move_core_types::effects::Op::Delete" [] |))) + M.alloc (| + Value.StructTuple "move_core_types::effects::Op::Delete" [] [ U ] [] + |))) ] |) |))) @@ -1013,7 +1035,11 @@ Module effects. | [ data ] => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| data |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ T ] + [ M.read (| data |) ] |))) | _ => M.impossible "wrong number of arguments" end) @@ -1021,7 +1047,7 @@ Module effects. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "move_core_types::effects::Op::Delete" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ T ] [] |))) ] |) |))) @@ -1165,6 +1191,8 @@ Module effects. (let self := M.alloc (| self |) in Value.StructRecord "move_core_types::effects::AccountChangeSet" + [] + [] [ ("modules", M.call_closure (| @@ -2268,6 +2296,12 @@ Module effects. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "anyhow::Error" + ] [ M.read (| let~ error : @@ -2360,6 +2394,8 @@ Module effects. M.deref (| M.read (| r |) |), Value.StructTuple "move_core_types::effects::Op::Modify" + [] + [ V ] [ M.read (| data |) ] |) |))); @@ -2387,6 +2423,8 @@ Module effects. M.deref (| M.read (| r |) |), Value.StructTuple "move_core_types::effects::Op::New" + [] + [ V ] [ M.read (| data |) ] |) |))); @@ -2413,6 +2451,8 @@ Module effects. Value.StructTuple "move_core_types::effects::Op::Delete" [] + [ V ] + [] |) |))); fun γ => @@ -2438,6 +2478,8 @@ Module effects. M.deref (| M.read (| r |) |), Value.StructTuple "move_core_types::effects::Op::Modify" + [] + [ V ] [ M.read (| data |) ] |) |))); @@ -2566,7 +2608,13 @@ Module effects. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2596,6 +2644,8 @@ Module effects. let resources := M.alloc (| resources |) in Value.StructRecord "move_core_types::effects::AccountChangeSet" + [] + [] [ ("modules", M.read (| modules |)); ("resources", M.read (| resources |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2619,6 +2669,8 @@ Module effects. ltac:(M.monadic (Value.StructRecord "move_core_types::effects::AccountChangeSet" + [] + [] [ ("modules", M.call_closure (| @@ -2809,6 +2861,8 @@ Module effects. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -3050,7 +3104,13 @@ Module effects. M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3160,6 +3220,8 @@ Module effects. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -3401,7 +3463,13 @@ Module effects. M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3937,6 +4005,8 @@ Module effects. (let self := M.alloc (| self |) in Value.StructRecord "move_core_types::effects::ChangeSet" + [] + [] [ ("accounts", M.call_closure (| @@ -4303,6 +4373,8 @@ Module effects. ltac:(M.monadic (Value.StructRecord "move_core_types::effects::ChangeSet" + [] + [] [ ("accounts", M.call_closure (| @@ -4424,6 +4496,8 @@ Module effects. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -4586,7 +4660,13 @@ Module effects. M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5442,7 +5522,13 @@ Module effects. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_core_types/errmap.v b/CoqOfRust/move_sui/translations/move_core_types/errmap.v index 796ab0c05..16bf4673f 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/errmap.v +++ b/CoqOfRust/move_sui/translations/move_core_types/errmap.v @@ -100,6 +100,8 @@ Module errmap. (let self := M.alloc (| self |) in Value.StructRecord "move_core_types::errmap::ErrorDescription" + [] + [] [ ("code_name", M.call_closure (| @@ -286,6 +288,21 @@ Module errmap. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -368,6 +385,21 @@ Module errmap. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -449,6 +481,21 @@ Module errmap. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -535,9 +582,21 @@ Module errmap. |); Value.StructRecord "move_core_types::errmap::_'1::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::errmap::ErrorDescription" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -667,6 +726,21 @@ Module errmap. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -758,6 +832,21 @@ Module errmap. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -855,6 +944,21 @@ Module errmap. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -941,9 +1045,21 @@ Module errmap. |); Value.StructRecord "move_core_types::errmap::_'3::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::errmap::ErrorMapping" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -1082,6 +1198,8 @@ Module errmap. (let self := M.alloc (| self |) in Value.StructRecord "move_core_types::errmap::ErrorMapping" + [] + [] [ ("error_categories", M.call_closure (| @@ -1206,6 +1324,8 @@ Module errmap. ltac:(M.monadic (Value.StructRecord "move_core_types::errmap::ErrorMapping" + [] + [] [ ("error_categories", M.call_closure (| @@ -1376,6 +1496,8 @@ Module errmap. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] [ M.read (| let~ error : @@ -1528,16 +1650,22 @@ Module errmap. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 0; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |); M.call_closure (| @@ -1558,16 +1686,22 @@ Module errmap. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -1654,7 +1788,13 @@ Module errmap. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1865,6 +2005,8 @@ Module errmap. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] [ M.read (| let~ error : @@ -2045,16 +2187,22 @@ Module errmap. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 0; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |); M.call_closure (| @@ -2075,16 +2223,22 @@ Module errmap. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 0; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |); M.call_closure (| @@ -2105,16 +2259,22 @@ Module errmap. 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Implied" [] + [] + [] ] |) ] @@ -2201,7 +2361,13 @@ Module errmap. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_core_types/gas_algebra.v b/CoqOfRust/move_sui/translations/move_core_types/gas_algebra.v index 5b272ab3d..b85d05dbc 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/gas_algebra.v +++ b/CoqOfRust/move_sui/translations/move_core_types/gas_algebra.v @@ -211,6 +211,21 @@ Module gas_algebra. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -293,6 +308,21 @@ Module gas_algebra. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -374,6 +404,21 @@ Module gas_algebra. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -468,9 +513,21 @@ Module gas_algebra. |); Value.StructRecord "move_core_types::gas_algebra::_'1::deserialize::__Visitor" + [] + [ U ] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "move_core_types::gas_algebra::GasQuantity") [] [ U ] ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -640,9 +697,11 @@ Module gas_algebra. (let val := M.alloc (| val |) in Value.StructRecord "move_core_types::gas_algebra::GasQuantity" + [] + [ U ] [ ("val", M.read (| val |)); - ("phantom", Value.StructTuple "core::marker::PhantomData" []) + ("phantom", Value.StructTuple "core::marker::PhantomData" [] [ U ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -985,7 +1044,7 @@ Module gas_algebra. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Ne" [] + Value.StructTuple "core::panicking::AssertKind::Ne" [] [] [] |) in M.alloc (| M.call_closure (| @@ -1015,7 +1074,11 @@ Module gas_algebra. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -1288,7 +1351,7 @@ Module gas_algebra. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Ne" [] + Value.StructTuple "core::panicking::AssertKind::Ne" [] [] [] |) in M.alloc (| M.call_closure (| @@ -1318,7 +1381,11 @@ Module gas_algebra. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -2006,6 +2073,8 @@ Module gas_algebra. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", @@ -2398,7 +2467,7 @@ Module gas_algebra. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Ne" [] + Value.StructTuple "core::panicking::AssertKind::Ne" [] [] [] |) in M.alloc (| M.call_closure (| @@ -2428,7 +2497,11 @@ Module gas_algebra. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -2486,7 +2559,7 @@ Module gas_algebra. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Ne" [] + Value.StructTuple "core::panicking::AssertKind::Ne" [] [] [] |) in M.alloc (| M.call_closure (| @@ -2516,7 +2589,11 @@ Module gas_algebra. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -2652,7 +2729,7 @@ Module gas_algebra. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Ne" [] + Value.StructTuple "core::panicking::AssertKind::Ne" [] [] [] |) in M.alloc (| M.call_closure (| @@ -2682,7 +2759,11 @@ Module gas_algebra. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -2740,7 +2821,7 @@ Module gas_algebra. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Ne" [] + Value.StructTuple "core::panicking::AssertKind::Ne" [] [] [] |) in M.alloc (| M.call_closure (| @@ -2770,7 +2851,11 @@ Module gas_algebra. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/move_sui/translations/move_core_types/identifier.v b/CoqOfRust/move_sui/translations/move_core_types/identifier.v index 4bf87b026..8a26c1238 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/identifier.v +++ b/CoqOfRust/move_sui/translations/move_core_types/identifier.v @@ -387,6 +387,8 @@ Module identifier. (let self := M.alloc (| self |) in Value.StructTuple "move_core_types::identifier::Identifier" + [] + [] [ M.call_closure (| Ty.apply @@ -878,9 +880,21 @@ Module identifier. mk_str (| "Identifier" |); Value.StructRecord "move_core_types::identifier::_'2::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::identifier::Identifier" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -999,9 +1013,16 @@ Module identifier. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::identifier::Identifier"; + Ty.path "anyhow::Error" + ] [ Value.StructTuple "move_core_types::identifier::Identifier" + [] + [] [ M.read (| s |) ] ] |))); @@ -1013,6 +1034,11 @@ Module identifier. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_core_types::identifier::Identifier"; + Ty.path "anyhow::Error" + ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -2369,6 +2395,14 @@ Module identifier. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.path "move_core_types::identifier::IdentStr" ]; + Ty.path "anyhow::Error" + ] [ M.borrow (| Pointer.Kind.Ref, @@ -2402,6 +2436,14 @@ Module identifier. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.path "move_core_types::identifier::IdentStr" ]; + Ty.path "anyhow::Error" + ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -2813,6 +2855,8 @@ Module identifier. (let self := M.alloc (| self |) in Value.StructTuple "move_core_types::identifier::Identifier" + [] + [] [ M.call_closure (| Ty.apply diff --git a/CoqOfRust/move_sui/translations/move_core_types/language_storage.v b/CoqOfRust/move_sui/translations/move_core_types/language_storage.v index a28872b0a..27309b293 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/language_storage.v +++ b/CoqOfRust/move_sui/translations/move_core_types/language_storage.v @@ -739,9 +739,21 @@ Module language_storage. |); Value.StructRecord "move_core_types::language_storage::_'1::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::language_storage::TypeTag" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -885,6 +897,21 @@ Module language_storage. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -967,6 +994,21 @@ Module language_storage. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -1048,6 +1090,21 @@ Module language_storage. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -1129,6 +1186,21 @@ Module language_storage. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -1218,6 +1290,21 @@ Module language_storage. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -1304,9 +1391,21 @@ Module language_storage. |); Value.StructRecord "move_core_types::language_storage::_'3::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::language_storage::StructTag" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -1436,6 +1535,21 @@ Module language_storage. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -1518,6 +1632,21 @@ Module language_storage. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -1599,6 +1728,21 @@ Module language_storage. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -1685,9 +1829,21 @@ Module language_storage. |); Value.StructRecord "move_core_types::language_storage::_'5::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::language_storage::ResourceKey" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -1817,6 +1973,21 @@ Module language_storage. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -1899,6 +2070,21 @@ Module language_storage. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -1980,6 +2166,21 @@ Module language_storage. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -2066,9 +2267,21 @@ Module language_storage. |); Value.StructRecord "move_core_types::language_storage::_'7::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::language_storage::ModuleId" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -2823,7 +3036,7 @@ Module language_storage. "move_core_types::language_storage::TypeTag::Bool" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::Bool" [] + Value.StructTuple "move_core_types::language_storage::TypeTag::Bool" [] [] [] |))); fun γ => ltac:(M.monadic @@ -2831,7 +3044,7 @@ Module language_storage. let _ := M.is_struct_tuple (| γ, "move_core_types::language_storage::TypeTag::U8" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::U8" [] + Value.StructTuple "move_core_types::language_storage::TypeTag::U8" [] [] [] |))); fun γ => ltac:(M.monadic @@ -2842,7 +3055,7 @@ Module language_storage. "move_core_types::language_storage::TypeTag::U64" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::U64" [] + Value.StructTuple "move_core_types::language_storage::TypeTag::U64" [] [] [] |))); fun γ => ltac:(M.monadic @@ -2853,7 +3066,7 @@ Module language_storage. "move_core_types::language_storage::TypeTag::U128" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::U128" [] + Value.StructTuple "move_core_types::language_storage::TypeTag::U128" [] [] [] |))); fun γ => ltac:(M.monadic @@ -2864,7 +3077,11 @@ Module language_storage. "move_core_types::language_storage::TypeTag::Address" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::Address" [] + Value.StructTuple + "move_core_types::language_storage::TypeTag::Address" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2875,7 +3092,11 @@ Module language_storage. "move_core_types::language_storage::TypeTag::Signer" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::Signer" [] + Value.StructTuple + "move_core_types::language_storage::TypeTag::Signer" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2890,6 +3111,8 @@ Module language_storage. M.alloc (| Value.StructTuple "move_core_types::language_storage::TypeTag::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -2931,6 +3154,8 @@ Module language_storage. M.alloc (| Value.StructTuple "move_core_types::language_storage::TypeTag::Struct" + [] + [] [ M.call_closure (| Ty.apply @@ -2968,7 +3193,7 @@ Module language_storage. "move_core_types::language_storage::TypeTag::U16" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::U16" [] + Value.StructTuple "move_core_types::language_storage::TypeTag::U16" [] [] [] |))); fun γ => ltac:(M.monadic @@ -2979,7 +3204,7 @@ Module language_storage. "move_core_types::language_storage::TypeTag::U32" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::U32" [] + Value.StructTuple "move_core_types::language_storage::TypeTag::U32" [] [] [] |))); fun γ => ltac:(M.monadic @@ -2990,7 +3215,7 @@ Module language_storage. "move_core_types::language_storage::TypeTag::U256" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::U256" [] + Value.StructTuple "move_core_types::language_storage::TypeTag::U256" [] [] [] |))) ] |) @@ -3366,7 +3591,7 @@ Module language_storage. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] |))) + (M.alloc (| Value.StructTuple "core::cmp::Ordering::Equal" [] [] [] |))) ] |))); fun γ => @@ -3483,6 +3708,8 @@ Module language_storage. let with_prefix := M.alloc (| with_prefix |) in Value.StructRecord "move_core_types::language_storage::to_canonical_display::CanonicalDisplay" + [] + [] [ ("data", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |)); ("with_prefix", M.read (| with_prefix |)) @@ -4378,6 +4605,8 @@ Module language_storage. (let self := M.alloc (| self |) in Value.StructRecord "move_core_types::language_storage::StructTag" + [] + [] [ ("address", M.call_closure (| @@ -5705,6 +5934,8 @@ Module language_storage. let with_prefix := M.alloc (| with_prefix |) in Value.StructRecord "move_core_types::language_storage::to_canonical_display::CanonicalDisplay" + [] + [] [ ("data", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |)); ("with_prefix", M.read (| with_prefix |)) @@ -6556,6 +6787,8 @@ Module language_storage. (let self := M.alloc (| self |) in Value.StructRecord "move_core_types::language_storage::ResourceKey" + [] + [] [ ("address", M.call_closure (| @@ -6947,6 +7180,8 @@ Module language_storage. let type_ := M.alloc (| type_ |) in Value.StructRecord "move_core_types::language_storage::ResourceKey" + [] + [] [ ("address", M.read (| address |)); ("type_", M.read (| type_ |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -7280,6 +7515,8 @@ Module language_storage. (let self := M.alloc (| self |) in Value.StructRecord "move_core_types::language_storage::ModuleId" + [] + [] [ ("address", M.call_closure (| @@ -7665,6 +7902,8 @@ Module language_storage. let name := M.alloc (| name |) in Value.StructRecord "move_core_types::language_storage::ModuleId" + [] + [] [ ("address", M.read (| address |)); ("name", M.read (| name |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -7998,6 +8237,8 @@ Module language_storage. let with_prefix := M.alloc (| with_prefix |) in Value.StructRecord "move_core_types::language_storage::to_canonical_display::IdDisplay" + [] + [] [ ("id", M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |)); ("with_prefix", M.read (| with_prefix |)) @@ -9460,7 +9701,13 @@ Module language_storage. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -10262,6 +10509,8 @@ Module language_storage. (let t := M.alloc (| t |) in Value.StructTuple "move_core_types::language_storage::TypeTag::Struct" + [] + [] [ M.call_closure (| Ty.apply diff --git a/CoqOfRust/move_sui/translations/move_core_types/lib.v b/CoqOfRust/move_sui/translations/move_core_types/lib.v index 310b2611e..6e157d730 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/lib.v +++ b/CoqOfRust/move_sui/translations/move_core_types/lib.v @@ -847,7 +847,13 @@ Definition fmt_list (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_core_types/metadata.v b/CoqOfRust/move_sui/translations/move_core_types/metadata.v index b3358d8bf..b6f6c169e 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/metadata.v +++ b/CoqOfRust/move_sui/translations/move_core_types/metadata.v @@ -33,6 +33,8 @@ Module metadata. (let self := M.alloc (| self |) in Value.StructRecord "move_core_types::metadata::Metadata" + [] + [] [ ("key", M.call_closure (| @@ -460,6 +462,21 @@ Module metadata. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -547,6 +564,21 @@ Module metadata. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -633,6 +665,21 @@ Module metadata. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Ok"; + Ty.associated_in_trait + "serde::ser::Serializer" + [] + [] + __S + "Error" + ] [ M.read (| __err |) ] |) |) @@ -719,9 +766,21 @@ Module metadata. |); Value.StructRecord "move_core_types::metadata::_'1::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::metadata::Metadata" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) diff --git a/CoqOfRust/move_sui/translations/move_core_types/move_resource.v b/CoqOfRust/move_sui/translations/move_core_types/move_resource.v index fb9a2c14f..90a9a9f1f 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/move_resource.v +++ b/CoqOfRust/move_sui/translations/move_core_types/move_resource.v @@ -128,6 +128,8 @@ Module move_resource. ltac:(M.monadic (Value.StructRecord "move_core_types::language_storage::StructTag" + [] + [] [ ("address", M.read (| diff --git a/CoqOfRust/move_sui/translations/move_core_types/parser.v b/CoqOfRust/move_sui/translations/move_core_types/parser.v index 1d0d367be..9760a5902 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/parser.v +++ b/CoqOfRust/move_sui/translations/move_core_types/parser.v @@ -1487,6 +1487,8 @@ Module parser. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "alloc::string::String"; Ty.path "anyhow::Error" ] [ M.read (| M.match_operator (| @@ -1886,6 +1888,11 @@ Module parser. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "alloc::string::String"; + Ty.path "anyhow::Error" + ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -2061,60 +2068,84 @@ Module parser. fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "u8" |) |) in - M.alloc (| Value.StructTuple "move_core_types::parser::Token::U8Type" [] |))); + M.alloc (| + Value.StructTuple "move_core_types::parser::Token::U8Type" [] [] [] + |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "u16" |) |) in - M.alloc (| Value.StructTuple "move_core_types::parser::Token::U16Type" [] |))); + M.alloc (| + Value.StructTuple "move_core_types::parser::Token::U16Type" [] [] [] + |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "u32" |) |) in - M.alloc (| Value.StructTuple "move_core_types::parser::Token::U32Type" [] |))); + M.alloc (| + Value.StructTuple "move_core_types::parser::Token::U32Type" [] [] [] + |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "u64" |) |) in - M.alloc (| Value.StructTuple "move_core_types::parser::Token::U64Type" [] |))); + M.alloc (| + Value.StructTuple "move_core_types::parser::Token::U64Type" [] [] [] + |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "u128" |) |) in - M.alloc (| Value.StructTuple "move_core_types::parser::Token::U128Type" [] |))); + M.alloc (| + Value.StructTuple "move_core_types::parser::Token::U128Type" [] [] [] + |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "u256" |) |) in - M.alloc (| Value.StructTuple "move_core_types::parser::Token::U256Type" [] |))); + M.alloc (| + Value.StructTuple "move_core_types::parser::Token::U256Type" [] [] [] + |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "bool" |) |) in - M.alloc (| Value.StructTuple "move_core_types::parser::Token::BoolType" [] |))); + M.alloc (| + Value.StructTuple "move_core_types::parser::Token::BoolType" [] [] [] + |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "address" |) |) in M.alloc (| - Value.StructTuple "move_core_types::parser::Token::AddressType" [] + Value.StructTuple "move_core_types::parser::Token::AddressType" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "vector" |) |) in - M.alloc (| Value.StructTuple "move_core_types::parser::Token::VectorType" [] |))); + M.alloc (| + Value.StructTuple "move_core_types::parser::Token::VectorType" [] [] [] + |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "true" |) |) in - M.alloc (| Value.StructTuple "move_core_types::parser::Token::True" [] |))); + M.alloc (| Value.StructTuple "move_core_types::parser::Token::True" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "false" |) |) in - M.alloc (| Value.StructTuple "move_core_types::parser::Token::False" [] |))); + M.alloc (| + Value.StructTuple "move_core_types::parser::Token::False" [] [] [] + |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "signer" |) |) in - M.alloc (| Value.StructTuple "move_core_types::parser::Token::SignerType" [] |))); + M.alloc (| + Value.StructTuple "move_core_types::parser::Token::SignerType" [] [] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "move_core_types::parser::Token::Name" [ M.read (| s |) ] + Value.StructTuple + "move_core_types::parser::Token::Name" + [] + [] + [ M.read (| s |) ] |))) ] |) @@ -2486,6 +2517,8 @@ Module parser. M.alloc (| Value.StructTuple "move_core_types::parser::Token::U8" + [] + [] [ M.read (| num |) ] |))); fun γ => @@ -2498,6 +2531,8 @@ Module parser. M.alloc (| Value.StructTuple "move_core_types::parser::Token::U16" + [] + [] [ M.read (| num |) ] |))); fun γ => @@ -2510,6 +2545,8 @@ Module parser. M.alloc (| Value.StructTuple "move_core_types::parser::Token::U32" + [] + [] [ M.read (| num |) ] |))); fun γ => @@ -2522,6 +2559,8 @@ Module parser. M.alloc (| Value.StructTuple "move_core_types::parser::Token::U64" + [] + [] [ M.read (| num |) ] |))); fun γ => @@ -2534,6 +2573,8 @@ Module parser. M.alloc (| Value.StructTuple "move_core_types::parser::Token::U128" + [] + [] [ M.read (| num |) ] |))); fun γ => @@ -2546,6 +2587,8 @@ Module parser. M.alloc (| Value.StructTuple "move_core_types::parser::Token::U256" + [] + [] [ M.read (| num |) ] |))); fun γ => @@ -2556,6 +2599,17 @@ Module parser. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.path + "move_core_types::parser::Token"; + Ty.path "usize" + ]; + Ty.path + "anyhow::Error" + ] [ M.read (| let~ error : @@ -2626,6 +2680,16 @@ Module parser. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple + [ + Ty.path + "move_core_types::parser::Token"; + Ty.path "usize" + ]; + Ty.path "anyhow::Error" + ] [ Value.Tuple [ M.read (| tok |); M.read (| len |) @@ -2662,11 +2726,22 @@ Module parser. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple + [ + Ty.path "move_core_types::parser::Token"; + Ty.path "usize" + ]; + Ty.path "anyhow::Error" + ] [ Value.Tuple [ Value.StructTuple "move_core_types::parser::Token::U64" + [] + [] [ M.read (| num |) ]; M.read (| len |) ] @@ -2877,7 +2952,27 @@ Module parser. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "core::option::Option::None" [] ] + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ + Ty.tuple + [ Ty.path "move_core_types::parser::Token"; Ty.path "usize" ] + ]; + Ty.path "anyhow::Error" + ] + [ + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ Ty.path "move_core_types::parser::Token"; Ty.path "usize" ] + ] + [] + ] |))); fun γ => ltac:(M.monadic @@ -2891,9 +2986,25 @@ Module parser. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ + Ty.tuple + [ Ty.path "move_core_types::parser::Token"; Ty.path "usize" ] + ]; + Ty.path "anyhow::Error" + ] [ Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ Ty.path "move_core_types::parser::Token"; Ty.path "usize" ] + ] [ M.read (| M.match_operator (| @@ -2921,6 +3032,8 @@ Module parser. [ Value.StructTuple "move_core_types::parser::Token::Lt" + [] + [] []; Value.Integer IntegerKind.Usize 1 ] @@ -2937,6 +3050,8 @@ Module parser. [ Value.StructTuple "move_core_types::parser::Token::Gt" + [] + [] []; Value.Integer IntegerKind.Usize 1 ] @@ -2953,6 +3068,8 @@ Module parser. [ Value.StructTuple "move_core_types::parser::Token::Comma" + [] + [] []; Value.Integer IntegerKind.Usize 1 ] @@ -3016,6 +3133,8 @@ Module parser. [ Value.StructTuple "move_core_types::parser::Token::ColonColon" + [] + [] []; Value.Integer IntegerKind.Usize 2 ] @@ -3028,6 +3147,21 @@ Module parser. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ + Ty.tuple + [ + Ty.path + "move_core_types::parser::Token"; + Ty.path "usize" + ] + ]; + Ty.path "anyhow::Error" + ] [ M.read (| let~ error : @@ -3157,6 +3291,13 @@ Module parser. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.path "char" ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -3239,6 +3380,13 @@ Module parser. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.path "char" ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -3652,6 +3800,8 @@ Module parser. [ Value.StructTuple "move_core_types::parser::Token::Address" + [] + [] [ M.read (| r |) ]; M.read (| len |) ] @@ -3664,6 +3814,21 @@ Module parser. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ + Ty.tuple + [ + Ty.path + "move_core_types::parser::Token"; + Ty.path "usize" + ] + ]; + Ty.path "anyhow::Error" + ] [ M.read (| let~ error : @@ -3972,6 +4137,13 @@ Module parser. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.path "char" ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -4144,6 +4316,22 @@ Module parser. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path + "core::option::Option") + [] + [ + Ty.tuple + [ + Ty.path + "move_core_types::parser::Token"; + Ty.path "usize" + ] + ]; + Ty.path "anyhow::Error" + ] [ M.read (| let~ error : @@ -4235,6 +4423,8 @@ Module parser. [ Value.StructTuple "move_core_types::parser::Token::Bytes" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -4312,6 +4502,13 @@ Module parser. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.path "char" ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -4484,6 +4681,22 @@ Module parser. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path + "core::option::Option") + [] + [ + Ty.tuple + [ + Ty.path + "move_core_types::parser::Token"; + Ty.path "usize" + ] + ]; + Ty.path "anyhow::Error" + ] [ M.read (| let~ error : @@ -4575,6 +4788,8 @@ Module parser. [ Value.StructTuple "move_core_types::parser::Token::Bytes" + [] + [] [ M.read (| r |) ]; M.read (| len |) ] @@ -4831,6 +5046,8 @@ Module parser. [ Value.StructTuple "move_core_types::parser::Token::Whitespace" + [] + [] [ M.read (| r |) ]; M.read (| len |) ] @@ -5099,6 +5316,21 @@ Module parser. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "core::option::Option") + [] + [ + Ty.tuple + [ + Ty.path + "move_core_types::parser::Token"; + Ty.path "usize" + ] + ]; + Ty.path "anyhow::Error" + ] [ M.read (| let~ error : @@ -5476,6 +5708,8 @@ Module parser. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| n |)) ] ] |) @@ -5500,7 +5734,19 @@ Module parser. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| v |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ Ty.path "move_core_types::parser::Token"; Ty.path "alloc::alloc::Global" ]; + Ty.path "anyhow::Error" + ] + [ M.read (| v |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5538,6 +5784,8 @@ Module parser. (let v := M.alloc (| v |) in Value.StructRecord "move_core_types::parser::Parser" + [] + [ I ] [ ("it", M.call_closure (| @@ -5646,7 +5894,11 @@ Module parser. |) in let tok := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| tok |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "move_core_types::parser::Token"; Ty.path "anyhow::Error" ] + [ M.read (| tok |) ] |))); fun γ => ltac:(M.monadic @@ -5657,6 +5909,11 @@ Module parser. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_core_types::parser::Token"; + Ty.path "anyhow::Error" + ] [ M.read (| let~ error : @@ -5925,6 +6182,8 @@ Module parser. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -6069,7 +6328,13 @@ Module parser. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "anyhow::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6234,6 +6499,13 @@ Module parser. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.path "move_core_types::parser::Token" ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -6503,6 +6775,16 @@ Module parser. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.path + "move_core_types::parser::Token" + ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -6583,6 +6865,8 @@ Module parser. Value.StructTuple "move_core_types::parser::Token::Comma" [] + [] + [] ] |) ] @@ -6738,6 +7022,16 @@ Module parser. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.path + "move_core_types::parser::Token" + ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -6771,7 +7065,16 @@ Module parser. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| v |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "alloc::vec::Vec") [] [ R; Ty.path "alloc::alloc::Global" ]; + Ty.path "anyhow::Error" + ] + [ M.read (| v |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6805,6 +7108,8 @@ Module parser. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "alloc::string::String"; Ty.path "anyhow::Error" ] [ M.read (| M.match_operator (| @@ -6942,6 +7247,8 @@ Module parser. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "alloc::string::String"; Ty.path "anyhow::Error" ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -7136,6 +7443,8 @@ Module parser. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "move_core_types::language_storage::TypeTag"; Ty.path "anyhow::Error" ] [ M.read (| M.match_operator (| @@ -7264,7 +7573,11 @@ Module parser. (let _ := M.is_struct_tuple (| γ, "move_core_types::parser::Token::U8Type" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::U8" [] + Value.StructTuple + "move_core_types::language_storage::TypeTag::U8" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -7274,7 +7587,11 @@ Module parser. "move_core_types::parser::Token::U16Type" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::U16" [] + Value.StructTuple + "move_core_types::language_storage::TypeTag::U16" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -7284,7 +7601,11 @@ Module parser. "move_core_types::parser::Token::U32Type" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::U32" [] + Value.StructTuple + "move_core_types::language_storage::TypeTag::U32" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -7294,7 +7615,11 @@ Module parser. "move_core_types::parser::Token::U64Type" |) in M.alloc (| - Value.StructTuple "move_core_types::language_storage::TypeTag::U64" [] + Value.StructTuple + "move_core_types::language_storage::TypeTag::U64" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -7307,6 +7632,8 @@ Module parser. Value.StructTuple "move_core_types::language_storage::TypeTag::U128" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -7319,6 +7646,8 @@ Module parser. Value.StructTuple "move_core_types::language_storage::TypeTag::U256" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -7331,6 +7660,8 @@ Module parser. Value.StructTuple "move_core_types::language_storage::TypeTag::Bool" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -7343,6 +7674,8 @@ Module parser. Value.StructTuple "move_core_types::language_storage::TypeTag::Address" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -7355,6 +7688,8 @@ Module parser. Value.StructTuple "move_core_types::language_storage::TypeTag::Signer" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -7413,7 +7748,11 @@ Module parser. Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |); - Value.StructTuple "move_core_types::parser::Token::Lt" [] + Value.StructTuple + "move_core_types::parser::Token::Lt" + [] + [] + [] ] |) ] @@ -7669,7 +8008,11 @@ Module parser. Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |); - Value.StructTuple "move_core_types::parser::Token::Gt" [] + Value.StructTuple + "move_core_types::parser::Token::Gt" + [] + [] + [] ] |) ] @@ -7743,6 +8086,8 @@ Module parser. M.alloc (| Value.StructTuple "move_core_types::language_storage::TypeTag::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -7830,6 +8175,8 @@ Module parser. Value.StructTuple "move_core_types::parser::Token::ColonColon" [] + [] + [] ] |) ] @@ -8119,6 +8466,8 @@ Module parser. Value.StructTuple "move_core_types::parser::Token::ColonColon" [] + [] + [] ] |) ] @@ -8460,6 +8809,16 @@ Module parser. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.path + "move_core_types::parser::Token" + ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -8470,6 +8829,8 @@ Module parser. Value.StructTuple "move_core_types::parser::Token::Lt" [] + [] + [] |) |) |) @@ -8834,6 +9195,8 @@ Module parser. end)); Value.StructTuple "move_core_types::parser::Token::Gt" + [] + [] []; Value.Bool true ] @@ -8961,6 +9324,8 @@ Module parser. Value.StructTuple "move_core_types::parser::Token::Gt" [] + [] + [] ] |) ] @@ -9067,6 +9432,8 @@ Module parser. M.alloc (| Value.StructTuple "move_core_types::language_storage::TypeTag::Struct" + [] + [] [ M.call_closure (| Ty.apply @@ -9091,6 +9458,8 @@ Module parser. [ Value.StructRecord "move_core_types::language_storage::StructTag" + [] + [] [ ("address", M.read (| @@ -9542,6 +9911,11 @@ Module parser. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_core_types::language_storage::TypeTag"; + Ty.path "anyhow::Error" + ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -9715,6 +10089,11 @@ Module parser. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::transaction_argument::TransactionArgument"; + Ty.path "anyhow::Error" + ] [ M.read (| M.match_operator (| @@ -9852,6 +10231,8 @@ Module parser. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U8" + [] + [] [ M.read (| M.match_operator (| @@ -10055,6 +10436,8 @@ Module parser. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U16" + [] + [] [ M.read (| M.match_operator (| @@ -10258,6 +10641,8 @@ Module parser. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U32" + [] + [] [ M.read (| M.match_operator (| @@ -10461,6 +10846,8 @@ Module parser. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U64" + [] + [] [ M.read (| M.match_operator (| @@ -10664,6 +11051,8 @@ Module parser. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U128" + [] + [] [ M.read (| M.match_operator (| @@ -10867,6 +11256,8 @@ Module parser. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U256" + [] + [] [ M.read (| M.match_operator (| @@ -11068,6 +11459,8 @@ Module parser. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::Bool" + [] + [] [ Value.Bool true ] |))); fun γ => @@ -11077,6 +11470,8 @@ Module parser. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::Bool" + [] + [] [ Value.Bool false ] |))); fun γ => @@ -11091,6 +11486,8 @@ Module parser. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::Address" + [] + [] [ M.read (| M.match_operator (| @@ -11263,6 +11660,8 @@ Module parser. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U8Vector" + [] + [] [ M.read (| M.match_operator (| @@ -11411,6 +11810,12 @@ Module parser. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_core_types::transaction_argument::TransactionArgument"; + Ty.path "anyhow::Error" + ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -11916,7 +12321,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, tokens |); - Value.StructTuple "move_core_types::parser::Token::EOF" [] + Value.StructTuple "move_core_types::parser::Token::EOF" [] [] [] ] |) |) in @@ -12164,7 +12569,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, parser |); - Value.StructTuple "move_core_types::parser::Token::EOF" [] + Value.StructTuple "move_core_types::parser::Token::EOF" [] [] [] ] |) ] @@ -12227,7 +12632,13 @@ Module parser. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| res |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ T; Ty.path "anyhow::Error" ] + [ M.read (| res |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -12513,7 +12924,7 @@ Module parser. |))) | _ => M.impossible "wrong number of arguments" end)); - Value.StructTuple "move_core_types::parser::Token::EOF" []; + Value.StructTuple "move_core_types::parser::Token::EOF" [] [] []; Value.Bool true ] |))) @@ -12820,7 +13231,7 @@ Module parser. |))) | _ => M.impossible "wrong number of arguments" end)); - Value.StructTuple "move_core_types::parser::Token::EOF" []; + Value.StructTuple "move_core_types::parser::Token::EOF" [] [] []; Value.Bool true ] |))) @@ -13284,7 +13695,7 @@ Module parser. |))) | _ => M.impossible "wrong number of arguments" end)); - Value.StructTuple "move_core_types::parser::Token::EOF" []; + Value.StructTuple "move_core_types::parser::Token::EOF" [] [] []; Value.Bool true ] |))) @@ -13952,6 +14363,11 @@ Module parser. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::language_storage::StructTag"; + Ty.path "anyhow::Error" + ] [ M.read (| M.deref (| M.read (| struct_tag |) |) |) ] |))); fun γ => @@ -13962,6 +14378,11 @@ Module parser. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_core_types::language_storage::StructTag"; + Ty.path "anyhow::Error" + ] [ M.call_closure (| Ty.path "anyhow::Error", diff --git a/CoqOfRust/move_sui/translations/move_core_types/resolver.v b/CoqOfRust/move_sui/translations/move_core_types/resolver.v index fe41d302e..4c260a43b 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/resolver.v +++ b/CoqOfRust/move_sui/translations/move_core_types/resolver.v @@ -34,6 +34,11 @@ Module resolver. let module_id := M.alloc (| module_id |) in Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::language_storage::ModuleId"; + Ty.associated_in_trait "move_core_types::resolver::LinkageResolver" [] [] Self "Error" + ] [ M.call_closure (| Ty.path "move_core_types::language_storage::ModuleId", @@ -68,6 +73,11 @@ Module resolver. let _struct := M.alloc (| _struct |) in Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::language_storage::ModuleId"; + Ty.associated_in_trait "move_core_types::resolver::LinkageResolver" [] [] Self "Error" + ] [ M.call_closure (| Ty.path "move_core_types::language_storage::ModuleId", diff --git a/CoqOfRust/move_sui/translations/move_core_types/runtime_value.v b/CoqOfRust/move_sui/translations/move_core_types/runtime_value.v index 3822010d1..7d9c421b9 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/runtime_value.v +++ b/CoqOfRust/move_sui/translations/move_core_types/runtime_value.v @@ -220,6 +220,8 @@ Module runtime_value. (let self := M.alloc (| self |) in Value.StructTuple "move_core_types::runtime_value::MoveStruct" + [] + [] [ M.call_closure (| Ty.apply @@ -1491,6 +1493,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::U8" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -1520,6 +1524,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::U64" + [] + [] [ M.call_closure (| Ty.path "u64", @@ -1549,6 +1555,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::U128" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -1578,6 +1586,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::Bool" + [] + [] [ M.call_closure (| Ty.path "bool", @@ -1607,6 +1617,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::Address" + [] + [] [ M.call_closure (| Ty.path "move_core_types::account_address::AccountAddress", @@ -1636,6 +1648,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -1677,6 +1691,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::Struct" + [] + [] [ M.call_closure (| Ty.path "move_core_types::runtime_value::MoveStruct", @@ -1706,6 +1722,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::Signer" + [] + [] [ M.call_closure (| Ty.path "move_core_types::account_address::AccountAddress", @@ -1735,6 +1753,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::U16" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -1764,6 +1784,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::U32" + [] + [] [ M.call_closure (| Ty.path "u32", @@ -1793,6 +1815,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::U256" + [] + [] [ M.call_closure (| Ty.path "move_core_types::u256::U256", @@ -1910,6 +1934,8 @@ Module runtime_value. (let self := M.alloc (| self |) in Value.StructTuple "move_core_types::runtime_value::MoveStructLayout" + [] + [] [ M.call_closure (| Ty.apply @@ -2059,9 +2085,21 @@ Module runtime_value. mk_str (| "MoveStructLayout" |); Value.StructRecord "move_core_types::runtime_value::_'1::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::runtime_value::MoveStructLayout" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -2538,9 +2576,21 @@ Module runtime_value. |); Value.StructRecord "move_core_types::runtime_value::_'3::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::runtime_value::MoveTypeLayout" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -3012,7 +3062,11 @@ Module runtime_value. "move_core_types::runtime_value::MoveTypeLayout::Bool" |) in M.alloc (| - Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::Bool" [] + Value.StructTuple + "move_core_types::runtime_value::MoveTypeLayout::Bool" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -3023,7 +3077,11 @@ Module runtime_value. "move_core_types::runtime_value::MoveTypeLayout::U8" |) in M.alloc (| - Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::U8" [] + Value.StructTuple + "move_core_types::runtime_value::MoveTypeLayout::U8" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -3034,7 +3092,11 @@ Module runtime_value. "move_core_types::runtime_value::MoveTypeLayout::U64" |) in M.alloc (| - Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::U64" [] + Value.StructTuple + "move_core_types::runtime_value::MoveTypeLayout::U64" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -3045,7 +3107,11 @@ Module runtime_value. "move_core_types::runtime_value::MoveTypeLayout::U128" |) in M.alloc (| - Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::U128" [] + Value.StructTuple + "move_core_types::runtime_value::MoveTypeLayout::U128" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -3056,7 +3122,11 @@ Module runtime_value. "move_core_types::runtime_value::MoveTypeLayout::Address" |) in M.alloc (| - Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::Address" [] + Value.StructTuple + "move_core_types::runtime_value::MoveTypeLayout::Address" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -3071,6 +3141,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -3112,6 +3184,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::Struct" + [] + [] [ M.call_closure (| Ty.path "move_core_types::runtime_value::MoveStructLayout", @@ -3137,7 +3211,11 @@ Module runtime_value. "move_core_types::runtime_value::MoveTypeLayout::Signer" |) in M.alloc (| - Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::Signer" [] + Value.StructTuple + "move_core_types::runtime_value::MoveTypeLayout::Signer" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -3148,7 +3226,11 @@ Module runtime_value. "move_core_types::runtime_value::MoveTypeLayout::U16" |) in M.alloc (| - Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::U16" [] + Value.StructTuple + "move_core_types::runtime_value::MoveTypeLayout::U16" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -3159,7 +3241,11 @@ Module runtime_value. "move_core_types::runtime_value::MoveTypeLayout::U32" |) in M.alloc (| - Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::U32" [] + Value.StructTuple + "move_core_types::runtime_value::MoveTypeLayout::U32" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -3170,7 +3256,11 @@ Module runtime_value. "move_core_types::runtime_value::MoveTypeLayout::U256" |) in M.alloc (| - Value.StructTuple "move_core_types::runtime_value::MoveTypeLayout::U256" [] + Value.StructTuple + "move_core_types::runtime_value::MoveTypeLayout::U256" + [] + [] + [] |))) ] |) @@ -3211,6 +3301,8 @@ Module runtime_value. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "move_core_types::runtime_value::MoveValue"; Ty.path "anyhow::Error" ] [ M.read (| M.match_operator (| @@ -3423,6 +3515,8 @@ Module runtime_value. (let v := M.alloc (| v |) in Value.StructTuple "move_core_types::runtime_value::MoveValue::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -3511,7 +3605,7 @@ Module runtime_value. |), [ M.read (| v |) ] |); - M.constructor_as_closure "move_core_types::runtime_value::MoveValue::U8" + M.constructor_as_closure "move_core_types::runtime_value::MoveValue::U8" [] [] ] |) ] @@ -3746,6 +3840,17 @@ Module runtime_value. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path "u8"; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "anyhow::Error" + ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -3873,7 +3978,19 @@ Module runtime_value. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| vec_u8 |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ Ty.path "u8"; Ty.path "alloc::alloc::Global" ]; + Ty.path "anyhow::Error" + ] + [ M.read (| vec_u8 |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3896,6 +4013,8 @@ Module runtime_value. (let v := M.alloc (| v |) in Value.StructTuple "move_core_types::runtime_value::MoveValue::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -3999,7 +4118,10 @@ Module runtime_value. |), [ M.read (| v |) ] |); - M.constructor_as_closure "move_core_types::runtime_value::MoveValue::Address" + M.constructor_as_closure + "move_core_types::runtime_value::MoveValue::Address" + [] + [] ] |) ] @@ -4068,6 +4190,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::Struct" + [] + [] [ M.call_closure (| Ty.path "move_core_types::annotated_value::MoveStruct", @@ -4106,6 +4230,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -4291,6 +4417,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::U8" + [] + [] [ M.read (| a |) ] |))); fun γ => @@ -4307,6 +4435,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::U64" + [] + [] [ M.read (| u |) ] |))); fun γ => @@ -4323,6 +4453,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::U128" + [] + [] [ M.read (| u |) ] |))); fun γ => @@ -4339,6 +4471,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::Bool" + [] + [] [ M.read (| b |) ] |))); fun γ => @@ -4355,6 +4489,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::Address" + [] + [] [ M.read (| a |) ] |))); fun γ => @@ -4371,6 +4507,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::Signer" + [] + [] [ M.read (| a |) ] |))); fun γ => @@ -4387,6 +4525,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::U16" + [] + [] [ M.read (| u |) ] |))); fun γ => @@ -4403,6 +4543,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::U32" + [] + [] [ M.read (| u |) ] |))); fun γ => @@ -4419,6 +4561,8 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::annotated_value::MoveValue::U256" + [] + [] [ M.read (| u |) ] |))); fun γ => @@ -4727,7 +4871,11 @@ Module runtime_value. | [], [], [ value ] => ltac:(M.monadic (let value := M.alloc (| value |) in - Value.StructTuple "move_core_types::runtime_value::MoveStruct" [ M.read (| value |) ])) + Value.StructTuple + "move_core_types::runtime_value::MoveStruct" + [] + [] + [ M.read (| value |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4754,6 +4902,8 @@ Module runtime_value. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "move_core_types::runtime_value::MoveStruct"; Ty.path "anyhow::Error" ] [ M.read (| M.match_operator (| @@ -4951,6 +5101,8 @@ Module runtime_value. M.alloc (| Value.StructRecord "move_core_types::annotated_value::MoveStruct" + [] + [] [ ("type_", M.call_closure (| @@ -5486,6 +5638,8 @@ Module runtime_value. (let types := M.alloc (| types |) in Value.StructTuple "move_core_types::runtime_value::MoveStructLayout" + [] + [] [ M.read (| types |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5711,6 +5865,8 @@ Module runtime_value. |); M.constructor_as_closure "move_core_types::runtime_value::MoveValue::Bool" + [] + [] ] |) |))); @@ -5770,6 +5926,8 @@ Module runtime_value. |); M.constructor_as_closure "move_core_types::runtime_value::MoveValue::U8" + [] + [] ] |) |))); @@ -5829,6 +5987,8 @@ Module runtime_value. |); M.constructor_as_closure "move_core_types::runtime_value::MoveValue::U16" + [] + [] ] |) |))); @@ -5888,6 +6048,8 @@ Module runtime_value. |); M.constructor_as_closure "move_core_types::runtime_value::MoveValue::U32" + [] + [] ] |) |))); @@ -5947,6 +6109,8 @@ Module runtime_value. |); M.constructor_as_closure "move_core_types::runtime_value::MoveValue::U64" + [] + [] ] |) |))); @@ -6006,6 +6170,8 @@ Module runtime_value. |); M.constructor_as_closure "move_core_types::runtime_value::MoveValue::U128" + [] + [] ] |) |))); @@ -6065,6 +6231,8 @@ Module runtime_value. |); M.constructor_as_closure "move_core_types::runtime_value::MoveValue::U256" + [] + [] ] |) |))); @@ -6124,6 +6292,8 @@ Module runtime_value. |); M.constructor_as_closure "move_core_types::runtime_value::MoveValue::Address" + [] + [] ] |) |))); @@ -6183,6 +6353,8 @@ Module runtime_value. |); M.constructor_as_closure "move_core_types::runtime_value::MoveValue::Signer" + [] + [] ] |) |))); @@ -6199,9 +6371,16 @@ Module runtime_value. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::runtime_value::MoveValue"; + Ty.associated_in_trait "serde::de::Deserializer" [] [] D "Error" + ] [ Value.StructTuple "move_core_types::runtime_value::MoveValue::Struct" + [] + [] [ M.read (| M.match_operator (| @@ -6388,9 +6567,16 @@ Module runtime_value. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::runtime_value::MoveValue"; + Ty.associated_in_trait "serde::de::Deserializer" [] [] D "Error" + ] [ Value.StructTuple "move_core_types::runtime_value::MoveValue::Vector" + [] + [] [ M.read (| M.match_operator (| @@ -6497,6 +6683,8 @@ Module runtime_value. M.read (| deserializer |); Value.StructTuple "move_core_types::runtime_value::VectorElementVisitor" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -6979,7 +7167,22 @@ Module runtime_value. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| vals |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path "move_core_types::runtime_value::MoveValue"; + Ty.path "alloc::alloc::Global" + ]; + Ty.associated_in_trait "serde::de::SeqAccess" [] [] A "Error" + ] + [ M.read (| vals |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7546,6 +7749,23 @@ Module runtime_value. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path + "move_core_types::runtime_value::MoveValue"; + Ty.path "alloc::alloc::Global" + ]; + Ty.associated_in_trait + "serde::de::SeqAccess" + [] + [] + A + "Error" + ] [ M.call_closure (| Ty.associated_in_trait @@ -7596,7 +7816,22 @@ Module runtime_value. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| val |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path "move_core_types::runtime_value::MoveValue"; + Ty.path "alloc::alloc::Global" + ]; + Ty.associated_in_trait "serde::de::SeqAccess" [] [] A "Error" + ] + [ M.read (| val |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7659,9 +7894,16 @@ Module runtime_value. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::runtime_value::MoveStruct"; + Ty.associated_in_trait "serde::de::Deserializer" [] [] D "Error" + ] [ Value.StructTuple "move_core_types::runtime_value::MoveStruct" + [] + [] [ M.read (| M.match_operator (| @@ -7783,6 +8025,8 @@ Module runtime_value. |); Value.StructTuple "move_core_types::runtime_value::StructFieldVisitor" + [] + [] [ M.borrow (| Pointer.Kind.Ref, @@ -8432,6 +8676,8 @@ Module runtime_value. M.read (| serializer |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", @@ -10045,12 +10291,20 @@ Module runtime_value. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; - Value.StructTuple "core::fmt::rt::Count::Implied" [] + Value.StructTuple + "core::fmt::rt::Count::Implied" + [] + [] + [] ] |) ] @@ -10284,12 +10538,20 @@ Module runtime_value. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; - Value.StructTuple "core::fmt::rt::Count::Implied" [] + Value.StructTuple + "core::fmt::rt::Count::Implied" + [] + [] + [] ] |) ] @@ -10565,12 +10827,20 @@ Module runtime_value. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 4; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; - Value.StructTuple "core::fmt::rt::Count::Implied" [] + Value.StructTuple + "core::fmt::rt::Count::Implied" + [] + [] + [] ] |) ] @@ -11095,6 +11365,16 @@ Module runtime_value. M.alloc (| Value.StructTuple "move_core_types::runtime_value::DebugAsDisplay" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.path + "move_core_types::runtime_value::MoveTypeLayout" + ] + ] [ M.borrow (| Pointer.Kind.Ref, diff --git a/CoqOfRust/move_sui/translations/move_core_types/transaction_argument.v b/CoqOfRust/move_sui/translations/move_core_types/transaction_argument.v index e50e83249..8d87e8f1c 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/transaction_argument.v +++ b/CoqOfRust/move_sui/translations/move_core_types/transaction_argument.v @@ -105,6 +105,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U8" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -134,6 +136,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U64" + [] + [] [ M.call_closure (| Ty.path "u64", @@ -163,6 +167,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U128" + [] + [] [ M.call_closure (| Ty.path "u128", @@ -192,6 +198,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::Address" + [] + [] [ M.call_closure (| Ty.path "move_core_types::account_address::AccountAddress", @@ -221,6 +229,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U8Vector" + [] + [] [ M.call_closure (| Ty.apply @@ -256,6 +266,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::Bool" + [] + [] [ M.call_closure (| Ty.path "bool", @@ -285,6 +297,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U16" + [] + [] [ M.call_closure (| Ty.path "u16", @@ -314,6 +328,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U32" + [] + [] [ M.call_closure (| Ty.path "u32", @@ -343,6 +359,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U256" + [] + [] [ M.call_closure (| Ty.path "move_core_types::u256::U256", @@ -1486,6 +1504,8 @@ Module transaction_argument. M.alloc (| Value.StructRecord "move_core_types::transaction_argument::_::serialize::__SerializeWith" + [] + [] [ ("values", Value.Tuple @@ -1496,7 +1516,14 @@ Module transaction_argument. |) ]); ("phantom", - Value.StructTuple "core::marker::PhantomData" []) + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.path + "move_core_types::transaction_argument::TransactionArgument" + ] + []) ] |) |) @@ -1709,9 +1736,21 @@ Module transaction_argument. |); Value.StructRecord "move_core_types::transaction_argument::_'1::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::transaction_argument::TransactionArgument" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -1757,9 +1796,21 @@ Module transaction_argument. mk_str (| "VecBytes" |); Value.StructRecord "move_core_types::transaction_argument::_'2::deserialize::__Visitor" + [] + [] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.path "move_core_types::transaction_argument::VecBytes" ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -2618,6 +2669,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::U8" + [] + [] [ M.read (| i |) ] |))); fun γ => @@ -2632,6 +2685,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::U64" + [] + [] [ M.read (| i |) ] |))); fun γ => @@ -2646,6 +2701,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::U128" + [] + [] [ M.read (| i |) ] |))); fun γ => @@ -2660,6 +2717,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::Address" + [] + [] [ M.read (| a |) ] |))); fun γ => @@ -2674,6 +2733,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::Bool" + [] + [] [ M.read (| b |) ] |))); fun γ => @@ -2709,6 +2770,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::U16" + [] + [] [ M.read (| i |) ] |))); fun γ => @@ -2723,6 +2786,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::U32" + [] + [] [ M.read (| i |) ] |))); fun γ => @@ -2737,6 +2802,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::runtime_value::MoveValue::U256" + [] + [] [ M.read (| i |) ] |))) ] @@ -2805,6 +2872,11 @@ Module transaction_argument. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::transaction_argument::TransactionArgument"; + Ty.path "anyhow::Error" + ] [ M.read (| M.match_operator (| @@ -2826,6 +2898,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U8" + [] + [] [ M.read (| i |) ] |))); fun γ => @@ -2840,6 +2914,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U64" + [] + [] [ M.read (| i |) ] |))); fun γ => @@ -2854,6 +2930,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U128" + [] + [] [ M.read (| i |) ] |))); fun γ => @@ -2868,6 +2946,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::Address" + [] + [] [ M.read (| a |) ] |))); fun γ => @@ -2882,6 +2962,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::Bool" + [] + [] [ M.read (| b |) ] |))); fun γ => @@ -2896,6 +2978,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U8Vector" + [] + [] [ M.read (| M.match_operator (| @@ -3161,6 +3245,12 @@ Module transaction_argument. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "u8"; + Ty.path + "anyhow::Error" + ] [ M.read (| byte @@ -3172,6 +3262,12 @@ Module transaction_argument. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u8"; + Ty.path + "anyhow::Error" + ] [ M.call_closure (| Ty.path @@ -3423,6 +3519,12 @@ Module transaction_argument. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "move_core_types::transaction_argument::TransactionArgument"; + Ty.path "anyhow::Error" + ] [ M.call_closure (| Ty.path "anyhow::Error", @@ -3560,6 +3662,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U16" + [] + [] [ M.read (| i |) ] |))); fun γ => @@ -3574,6 +3678,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U32" + [] + [] [ M.read (| i |) ] |))); fun γ => @@ -3588,6 +3694,8 @@ Module transaction_argument. M.alloc (| Value.StructTuple "move_core_types::transaction_argument::TransactionArgument::U256" + [] + [] [ M.read (| i |) ] |))) ] @@ -3915,6 +4023,8 @@ Module transaction_argument. (let self := M.alloc (| self |) in Value.StructTuple "move_core_types::transaction_argument::VecBytes" + [] + [] [ M.call_closure (| Ty.apply @@ -4141,6 +4251,8 @@ Module transaction_argument. (let vec_bytes := M.alloc (| vec_bytes |) in Value.StructTuple "move_core_types::transaction_argument::VecBytes" + [] + [] [ M.call_closure (| Ty.apply diff --git a/CoqOfRust/move_sui/translations/move_core_types/u256.v b/CoqOfRust/move_sui/translations/move_core_types/u256.v index 6c292bdc6..d7debc2a7 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/u256.v +++ b/CoqOfRust/move_sui/translations/move_core_types/u256.v @@ -547,6 +547,8 @@ Module u256. let kind := M.alloc (| kind |) in Value.StructRecord "move_core_types::u256::U256CastError" + [] + [] [ ("kind", M.read (| kind |)); ("val", @@ -1378,6 +1380,8 @@ Module u256. ltac:(M.monadic (Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -1648,6 +1652,11 @@ Module u256. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::u256::U256"; + Ty.associated_in_trait "serde::de::Deserializer" [] [] D "Error" + ] [ M.call_closure (| Ty.path "move_core_types::u256::U256", @@ -1953,6 +1962,8 @@ Module u256. M.alloc (| Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -2019,6 +2030,8 @@ Module u256. M.alloc (| Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -2085,6 +2098,8 @@ Module u256. M.alloc (| Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -2165,6 +2180,8 @@ Module u256. M.alloc (| Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -2248,6 +2265,8 @@ Module u256. M.alloc (| Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -2331,6 +2350,8 @@ Module u256. M.alloc (| Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -2693,6 +2714,8 @@ Module u256. let rhs := M.alloc (| rhs |) in Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -2794,6 +2817,8 @@ Module u256. let rhs := M.alloc (| rhs |) in Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -2849,6 +2874,8 @@ Module u256. M.deref (| M.read (| self |) |), Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -2909,6 +2936,8 @@ Module u256. ltac:(M.monadic (Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -2934,6 +2963,8 @@ Module u256. ltac:(M.monadic (Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -2959,6 +2990,8 @@ Module u256. ltac:(M.monadic (Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -3068,10 +3101,10 @@ Module u256. M.read (| radix |) ] |); - M.constructor_as_closure "move_core_types::u256::U256" + M.constructor_as_closure "move_core_types::u256::U256" [] [] ] |); - M.constructor_as_closure "move_core_types::u256::U256FromStrError" + M.constructor_as_closure "move_core_types::u256::U256FromStrError" [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3094,6 +3127,8 @@ Module u256. (let slice := M.alloc (| slice |) in Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -3429,7 +3464,7 @@ Module u256. |) ] |); - M.constructor_as_closure "move_core_types::u256::U256" + M.constructor_as_closure "move_core_types::u256::U256" [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3482,7 +3517,7 @@ Module u256. |) ] |); - M.constructor_as_closure "move_core_types::u256::U256" + M.constructor_as_closure "move_core_types::u256::U256" [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3535,7 +3570,7 @@ Module u256. |) ] |); - M.constructor_as_closure "move_core_types::u256::U256" + M.constructor_as_closure "move_core_types::u256::U256" [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3588,7 +3623,7 @@ Module u256. |) ] |); - M.constructor_as_closure "move_core_types::u256::U256" + M.constructor_as_closure "move_core_types::u256::U256" [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3641,7 +3676,7 @@ Module u256. |) ] |); - M.constructor_as_closure "move_core_types::u256::U256" + M.constructor_as_closure "move_core_types::u256::U256" [] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3704,7 +3739,13 @@ Module u256. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_core_types::u256::U256" ] + [] + |) |) |) |))); @@ -3714,9 +3755,13 @@ Module u256. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_core_types::u256::U256" ] [ Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -3805,7 +3850,13 @@ Module u256. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "move_core_types::u256::U256" ] + [] + |) |) |) |))); @@ -3815,9 +3866,13 @@ Module u256. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "move_core_types::u256::U256" ] [ Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -4060,6 +4115,8 @@ Module u256. let rhs := M.alloc (| rhs |) in Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.read (| M.SubPointer.get_tuple_field (| @@ -4115,6 +4172,8 @@ Module u256. let rhs := M.alloc (| rhs |) in Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.read (| M.SubPointer.get_tuple_field (| @@ -4170,6 +4229,8 @@ Module u256. let rhs := M.alloc (| rhs |) in Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.read (| M.SubPointer.get_tuple_field (| @@ -4708,6 +4769,8 @@ Module u256. (let n := M.alloc (| n |) in Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -4750,6 +4813,8 @@ Module u256. (let n := M.alloc (| n |) in Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -4792,6 +4857,8 @@ Module u256. (let n := M.alloc (| n |) in Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -4834,6 +4901,8 @@ Module u256. (let n := M.alloc (| n |) in Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -4876,6 +4945,8 @@ Module u256. (let n := M.alloc (| n |) in Value.StructTuple "move_core_types::u256::U256" + [] + [] [ M.call_closure (| Ty.path "primitive_types::U256", @@ -4925,7 +4996,7 @@ Module u256. [] |), [ - Value.StructTuple "num_bigint::bigint::Sign::Plus" []; + Value.StructTuple "num_bigint::bigint::Sign::Plus" [] [] []; (* Unsize *) M.pointer_coercion (M.borrow (| @@ -5215,6 +5286,8 @@ Module u256. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u8"; Ty.path "move_core_types::u256::U256CastError" ] [ M.call_closure (| Ty.path "move_core_types::u256::U256CastError", @@ -5229,6 +5302,8 @@ Module u256. Value.StructTuple "move_core_types::u256::U256CastErrorKind::TooLargeForU8" [] + [] + [] ] |) ] @@ -5238,6 +5313,8 @@ Module u256. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u8"; Ty.path "move_core_types::u256::U256CastError" ] [ M.cast (Ty.path "u8") (M.read (| n |)) ] |))) ] @@ -5330,6 +5407,8 @@ Module u256. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u16"; Ty.path "move_core_types::u256::U256CastError" ] [ M.call_closure (| Ty.path "move_core_types::u256::U256CastError", @@ -5344,6 +5423,8 @@ Module u256. Value.StructTuple "move_core_types::u256::U256CastErrorKind::TooLargeForU16" [] + [] + [] ] |) ] @@ -5353,6 +5434,8 @@ Module u256. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u16"; Ty.path "move_core_types::u256::U256CastError" ] [ M.cast (Ty.path "u16") (M.read (| n |)) ] |))) ] @@ -5445,6 +5528,8 @@ Module u256. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u32"; Ty.path "move_core_types::u256::U256CastError" ] [ M.call_closure (| Ty.path "move_core_types::u256::U256CastError", @@ -5459,6 +5544,8 @@ Module u256. Value.StructTuple "move_core_types::u256::U256CastErrorKind::TooLargeForU32" [] + [] + [] ] |) ] @@ -5468,6 +5555,8 @@ Module u256. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u32"; Ty.path "move_core_types::u256::U256CastError" ] [ M.cast (Ty.path "u32") (M.read (| n |)) ] |))) ] @@ -5560,6 +5649,8 @@ Module u256. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u64"; Ty.path "move_core_types::u256::U256CastError" ] [ M.call_closure (| Ty.path "move_core_types::u256::U256CastError", @@ -5574,6 +5665,8 @@ Module u256. Value.StructTuple "move_core_types::u256::U256CastErrorKind::TooLargeForU64" [] + [] + [] ] |) ] @@ -5583,6 +5676,8 @@ Module u256. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u64"; Ty.path "move_core_types::u256::U256CastError" ] [ M.cast (Ty.path "u64") (M.read (| n |)) ] |))) ] @@ -5685,6 +5780,8 @@ Module u256. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.path "u128"; Ty.path "move_core_types::u256::U256CastError" ] [ M.call_closure (| Ty.path "move_core_types::u256::U256CastError", @@ -5699,6 +5796,8 @@ Module u256. Value.StructTuple "move_core_types::u256::U256CastErrorKind::TooLargeForU128" [] + [] + [] ] |) ] @@ -5708,6 +5807,8 @@ Module u256. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.path "u128"; Ty.path "move_core_types::u256::U256CastError" ] [ M.call_closure (| Ty.path "u128", @@ -6626,6 +6727,8 @@ Module u256. M.alloc (| Value.StructRecord "move_core_types::u256::UniformU256" + [] + [] [ ("low", M.read (| low |)); ("range", M.read (| range |)); diff --git a/CoqOfRust/move_sui/translations/move_core_types/vm_status.v b/CoqOfRust/move_sui/translations/move_core_types/vm_status.v index dca184243..c279250fd 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/vm_status.v +++ b/CoqOfRust/move_sui/translations/move_core_types/vm_status.v @@ -213,7 +213,11 @@ Module vm_status. "move_core_types::vm_status::StatusType::Validation" |) in M.alloc (| - Value.StructTuple "move_core_types::vm_status::StatusType::Validation" [] + Value.StructTuple + "move_core_types::vm_status::StatusType::Validation" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -224,7 +228,11 @@ Module vm_status. "move_core_types::vm_status::StatusType::Verification" |) in M.alloc (| - Value.StructTuple "move_core_types::vm_status::StatusType::Verification" [] + Value.StructTuple + "move_core_types::vm_status::StatusType::Verification" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -238,6 +246,8 @@ Module vm_status. Value.StructTuple "move_core_types::vm_status::StatusType::InvariantViolation" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -248,7 +258,11 @@ Module vm_status. "move_core_types::vm_status::StatusType::Deserialization" |) in M.alloc (| - Value.StructTuple "move_core_types::vm_status::StatusType::Deserialization" [] + Value.StructTuple + "move_core_types::vm_status::StatusType::Deserialization" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -259,7 +273,7 @@ Module vm_status. "move_core_types::vm_status::StatusType::Execution" |) in M.alloc (| - Value.StructTuple "move_core_types::vm_status::StatusType::Execution" [] + Value.StructTuple "move_core_types::vm_status::StatusType::Execution" [] [] [] |))); fun γ => ltac:(M.monadic @@ -270,7 +284,7 @@ Module vm_status. "move_core_types::vm_status::StatusType::Unknown" |) in M.alloc (| - Value.StructTuple "move_core_types::vm_status::StatusType::Unknown" [] + Value.StructTuple "move_core_types::vm_status::StatusType::Unknown" [] [] [] |))) ] |) @@ -5147,10 +5161,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_VALIDATION_STATUS" [] + [] + [] ] |))); fun γ => @@ -5163,10 +5184,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_SIGNATURE" [] + [] + [] ] |))); fun γ => @@ -5179,10 +5207,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_AUTH_KEY" [] + [] + [] ] |))); fun γ => @@ -5195,10 +5230,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::SEQUENCE_NUMBER_TOO_OLD" [] + [] + [] ] |))); fun γ => @@ -5211,10 +5253,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::SEQUENCE_NUMBER_TOO_NEW" [] + [] + [] ] |))); fun γ => @@ -5227,10 +5276,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INSUFFICIENT_BALANCE_FOR_TRANSACTION_FEE" [] + [] + [] ] |))); fun γ => @@ -5243,10 +5299,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::TRANSACTION_EXPIRED" [] + [] + [] ] |))); fun γ => @@ -5259,10 +5322,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::SENDING_ACCOUNT_DOES_NOT_EXIST" [] + [] + [] ] |))); fun γ => @@ -5275,10 +5345,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::REJECTED_WRITE_SET" [] + [] + [] ] |))); fun γ => @@ -5291,10 +5368,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_WRITE_SET" [] + [] + [] ] |))); fun γ => @@ -5307,10 +5391,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::EXCEEDED_MAX_TRANSACTION_SIZE" [] + [] + [] ] |))); fun γ => @@ -5323,10 +5414,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_SCRIPT" [] + [] + [] ] |))); fun γ => @@ -5339,10 +5437,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_MODULE" [] + [] + [] ] |))); fun γ => @@ -5355,10 +5460,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::MAX_GAS_UNITS_EXCEEDS_MAX_GAS_UNITS_BOUND" [] + [] + [] ] |))); fun γ => @@ -5371,10 +5483,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::MAX_GAS_UNITS_BELOW_MIN_TRANSACTION_GAS_UNITS" [] + [] + [] ] |))); fun γ => @@ -5387,10 +5506,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::GAS_UNIT_PRICE_BELOW_MIN_BOUND" [] + [] + [] ] |))); fun γ => @@ -5403,10 +5529,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::GAS_UNIT_PRICE_ABOVE_MAX_BOUND" [] + [] + [] ] |))); fun γ => @@ -5419,10 +5552,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_GAS_SPECIFIER" [] + [] + [] ] |))); fun γ => @@ -5435,10 +5575,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::SENDING_ACCOUNT_FROZEN" [] + [] + [] ] |))); fun γ => @@ -5451,10 +5598,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNABLE_TO_DESERIALIZE_ACCOUNT" [] + [] + [] ] |))); fun γ => @@ -5467,10 +5621,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::CURRENCY_INFO_DOES_NOT_EXIST" [] + [] + [] ] |))); fun γ => @@ -5483,10 +5644,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_MODULE_PUBLISHER" [] + [] + [] ] |))); fun γ => @@ -5499,10 +5667,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::NO_ACCOUNT_ROLE" [] + [] + [] ] |))); fun γ => @@ -5515,10 +5690,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::BAD_CHAIN_ID" [] + [] + [] ] |))); fun γ => @@ -5531,10 +5713,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::SEQUENCE_NUMBER_TOO_BIG" [] + [] + [] ] |))); fun γ => @@ -5547,10 +5736,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::BAD_TRANSACTION_FEE_CURRENCY" [] + [] + [] ] |))); fun γ => @@ -5563,10 +5759,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::FEATURE_UNDER_GATING" [] + [] + [] ] |))); fun γ => @@ -5579,10 +5782,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::SECONDARY_KEYS_ADDRESSES_COUNT_MISMATCH" [] + [] + [] ] |))); fun γ => @@ -5595,10 +5805,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::SIGNERS_CONTAIN_DUPLICATES" [] + [] + [] ] |))); fun γ => @@ -5611,10 +5828,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::SEQUENCE_NONCE_INVALID" [] + [] + [] ] |))); fun γ => @@ -5627,10 +5851,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::CHAIN_ACCOUNT_INFO_DOES_NOT_EXIST" [] + [] + [] ] |))); fun γ => @@ -5643,10 +5874,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_VERIFICATION_ERROR" [] + [] + [] ] |))); fun γ => @@ -5659,10 +5897,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INDEX_OUT_OF_BOUNDS" [] + [] + [] ] |))); fun γ => @@ -5675,10 +5920,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_SIGNATURE_TOKEN" [] + [] + [] ] |))); fun γ => @@ -5691,10 +5943,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::RECURSIVE_STRUCT_DEFINITION" [] + [] + [] ] |))); fun γ => @@ -5707,10 +5966,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::FIELD_MISSING_TYPE_ABILITY" [] + [] + [] ] |))); fun γ => @@ -5723,10 +5989,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_FALL_THROUGH" [] + [] + [] ] |))); fun γ => @@ -5739,10 +6012,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK" [] + [] + [] ] |))); fun γ => @@ -5755,10 +6035,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_MAIN_FUNCTION_SIGNATURE" [] + [] + [] ] |))); fun γ => @@ -5771,10 +6058,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_ELEMENT" [] + [] + [] ] |))); fun γ => @@ -5787,10 +6081,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_MODULE_HANDLE" [] + [] + [] ] |))); fun γ => @@ -5803,10 +6104,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNIMPLEMENTED_HANDLE" [] + [] + [] ] |))); fun γ => @@ -5819,10 +6127,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::LOOKUP_FAILED" [] + [] + [] ] |))); fun γ => @@ -5835,10 +6150,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::TYPE_MISMATCH" [] + [] + [] ] |))); fun γ => @@ -5851,10 +6173,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::MISSING_DEPENDENCY" [] + [] + [] ] |))); fun γ => @@ -5867,10 +6196,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::POP_WITHOUT_DROP_ABILITY" [] + [] + [] ] |))); fun γ => @@ -5883,10 +6219,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::BR_TYPE_MISMATCH_ERROR" [] + [] + [] ] |))); fun γ => @@ -5899,11 +6242,18 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::ABORT_TYPE_MISMATCH_ERROR" [] - ] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -5915,10 +6265,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::STLOC_TYPE_MISMATCH_ERROR" [] + [] + [] ] |))); fun γ => @@ -5931,10 +6288,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::STLOC_UNSAFE_TO_DESTROY_ERROR" [] + [] + [] ] |))); fun γ => @@ -5947,10 +6311,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED" [] + [] + [] ] |))); fun γ => @@ -5963,10 +6334,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::RET_TYPE_MISMATCH_ERROR" [] + [] + [] ] |))); fun γ => @@ -5979,10 +6357,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::RET_BORROWED_MUTABLE_REFERENCE_ERROR" [] + [] + [] ] |))); fun γ => @@ -5995,10 +6380,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::FREEZEREF_TYPE_MISMATCH_ERROR" [] + [] + [] ] |))); fun γ => @@ -6011,10 +6403,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::FREEZEREF_EXISTS_MUTABLE_BORROW_ERROR" [] + [] + [] ] |))); fun γ => @@ -6027,10 +6426,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::BORROWFIELD_TYPE_MISMATCH_ERROR" [] + [] + [] ] |))); fun γ => @@ -6043,10 +6449,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::BORROWFIELD_BAD_FIELD_ERROR" [] + [] + [] ] |))); fun γ => @@ -6059,10 +6472,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::BORROWFIELD_EXISTS_MUTABLE_BORROW_ERROR" [] + [] + [] ] |))); fun γ => @@ -6075,10 +6495,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::COPYLOC_UNAVAILABLE_ERROR" [] + [] + [] ] |))); fun γ => @@ -6091,10 +6518,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::COPYLOC_WITHOUT_COPY_ABILITY" [] + [] + [] ] |))); fun γ => @@ -6107,10 +6541,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::COPYLOC_EXISTS_BORROW_ERROR" [] + [] + [] ] |))); fun γ => @@ -6123,10 +6564,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::MOVELOC_UNAVAILABLE_ERROR" [] + [] + [] ] |))); fun γ => @@ -6139,10 +6587,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::MOVELOC_EXISTS_BORROW_ERROR" [] + [] + [] ] |))); fun γ => @@ -6155,10 +6610,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::BORROWLOC_REFERENCE_ERROR" [] + [] + [] ] |))); fun γ => @@ -6171,10 +6633,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::BORROWLOC_UNAVAILABLE_ERROR" [] + [] + [] ] |))); fun γ => @@ -6187,10 +6656,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::BORROWLOC_EXISTS_BORROW_ERROR" [] + [] + [] ] |))); fun γ => @@ -6203,10 +6679,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::CALL_TYPE_MISMATCH_ERROR" [] + [] + [] ] |))); fun γ => @@ -6219,10 +6702,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::CALL_BORROWED_MUTABLE_REFERENCE_ERROR" [] + [] + [] ] |))); fun γ => @@ -6235,10 +6725,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::PACK_TYPE_MISMATCH_ERROR" [] + [] + [] ] |))); fun γ => @@ -6251,10 +6748,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNPACK_TYPE_MISMATCH_ERROR" [] + [] + [] ] |))); fun γ => @@ -6267,10 +6771,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::READREF_TYPE_MISMATCH_ERROR" [] + [] + [] ] |))); fun γ => @@ -6283,10 +6794,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::READREF_WITHOUT_COPY_ABILITY" [] + [] + [] ] |))); fun γ => @@ -6299,10 +6817,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::READREF_EXISTS_MUTABLE_BORROW_ERROR" [] + [] + [] ] |))); fun γ => @@ -6315,10 +6840,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::WRITEREF_TYPE_MISMATCH_ERROR" [] + [] + [] ] |))); fun γ => @@ -6331,10 +6863,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::WRITEREF_WITHOUT_DROP_ABILITY" [] + [] + [] ] |))); fun γ => @@ -6347,10 +6886,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::WRITEREF_EXISTS_BORROW_ERROR" [] + [] + [] ] |))); fun γ => @@ -6363,10 +6909,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::WRITEREF_NO_MUTABLE_REFERENCE_ERROR" [] + [] + [] ] |))); fun γ => @@ -6379,10 +6932,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR" [] + [] + [] ] |))); fun γ => @@ -6395,10 +6955,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::BOOLEAN_OP_TYPE_MISMATCH_ERROR" [] + [] + [] ] |))); fun γ => @@ -6411,10 +6978,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::EQUALITY_OP_TYPE_MISMATCH_ERROR" [] + [] + [] ] |))); fun γ => @@ -6427,10 +7001,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::EXISTS_WITHOUT_KEY_ABILITY_OR_BAD_ARGUMENT" [] + [] + [] ] |))); fun γ => @@ -6443,10 +7024,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::BORROWGLOBAL_TYPE_MISMATCH_ERROR" [] + [] + [] ] |))); fun γ => @@ -6459,10 +7047,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::BORROWGLOBAL_WITHOUT_KEY_ABILITY" [] + [] + [] ] |))); fun γ => @@ -6475,10 +7070,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::MOVEFROM_TYPE_MISMATCH_ERROR" [] + [] + [] ] |))); fun γ => @@ -6491,10 +7093,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::MOVEFROM_WITHOUT_KEY_ABILITY" [] + [] + [] ] |))); fun γ => @@ -6507,10 +7116,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::MOVETO_TYPE_MISMATCH_ERROR" [] + [] + [] ] |))); fun γ => @@ -6523,10 +7139,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::MOVETO_WITHOUT_KEY_ABILITY" [] + [] + [] ] |))); fun γ => @@ -6539,10 +7162,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::MODULE_ADDRESS_DOES_NOT_MATCH_SENDER" [] + [] + [] ] |))); fun γ => @@ -6555,10 +7185,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::NO_MODULE_HANDLES" [] + [] + [] ] |))); fun γ => @@ -6571,10 +7208,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::POSITIVE_STACK_SIZE_AT_BLOCK_END" [] + [] + [] ] |))); fun γ => @@ -6587,10 +7231,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::MISSING_ACQUIRES_ANNOTATION" [] + [] + [] ] |))); fun γ => @@ -6603,10 +7254,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::EXTRANEOUS_ACQUIRES_ANNOTATION" [] + [] + [] ] |))); fun γ => @@ -6619,10 +7277,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_ACQUIRES_ANNOTATION" [] + [] + [] ] |))); fun γ => @@ -6635,10 +7300,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_ACQUIRES_ANNOTATION" [] + [] + [] ] |))); fun γ => @@ -6651,10 +7323,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::GLOBAL_REFERENCE_ERROR" [] + [] + [] ] |))); fun γ => @@ -6667,10 +7346,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::CONSTRAINT_NOT_SATISFIED" [] + [] + [] ] |))); fun γ => @@ -6683,10 +7369,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::NUMBER_OF_TYPE_ARGUMENTS_MISMATCH" [] + [] + [] ] |))); fun γ => @@ -6699,10 +7392,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::LOOP_IN_INSTANTIATION_GRAPH" [] + [] + [] ] |))); fun γ => @@ -6715,10 +7415,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::ZERO_SIZED_STRUCT" [] + [] + [] ] |))); fun γ => @@ -6731,10 +7438,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::LINKER_ERROR" [] + [] + [] ] |))); fun γ => @@ -6747,10 +7461,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_CONSTANT_TYPE" [] + [] + [] ] |))); fun γ => @@ -6763,10 +7484,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED_CONSTANT_DATA" [] + [] + [] ] |))); fun γ => @@ -6779,10 +7507,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::EMPTY_CODE_UNIT" [] + [] + [] ] |))); fun γ => @@ -6795,10 +7530,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_LOOP_SPLIT" [] + [] + [] ] |))); fun γ => @@ -6811,10 +7553,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_LOOP_BREAK" [] + [] + [] ] |))); fun γ => @@ -6827,10 +7576,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_LOOP_CONTINUE" [] + [] + [] ] |))); fun γ => @@ -6843,10 +7599,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP" [] + [] + [] ] |))); fun γ => @@ -6859,10 +7622,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::TOO_MANY_LOCALS" [] + [] + [] ] |))); fun γ => @@ -6875,10 +7645,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::GENERIC_MEMBER_OPCODE_MISMATCH" [] + [] + [] ] |))); fun γ => @@ -6891,10 +7668,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::FUNCTION_RESOLUTION_FAILURE" [] + [] + [] ] |))); fun γ => @@ -6907,10 +7691,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_OPERATION_IN_SCRIPT" [] + [] + [] ] |))); fun γ => @@ -6923,10 +7714,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_MODULE_NAME" [] + [] + [] ] |))); fun γ => @@ -6939,10 +7737,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE" [] + [] + [] ] |))); fun γ => @@ -6955,10 +7760,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::CYCLIC_MODULE_DEPENDENCY" [] + [] + [] ] |))); fun γ => @@ -6971,10 +7783,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::NUMBER_OF_ARGUMENTS_MISMATCH" [] + [] + [] ] |))); fun γ => @@ -6987,10 +7806,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_PARAM_TYPE_FOR_DESERIALIZATION" [] + [] + [] ] |))); fun γ => @@ -7003,10 +7829,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::FAILED_TO_DESERIALIZE_ARGUMENT" [] + [] + [] ] |))); fun γ => @@ -7019,10 +7852,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::NUMBER_OF_SIGNER_ARGUMENTS_MISMATCH" [] + [] + [] ] |))); fun γ => @@ -7035,10 +7875,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::CALLED_SCRIPT_VISIBLE_FROM_NON_SCRIPT_VISIBLE" [] + [] + [] ] |))); fun γ => @@ -7051,10 +7898,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::EXECUTE_ENTRY_FUNCTION_CALLED_ON_NON_ENTRY_FUNCTION" [] + [] + [] ] |))); fun γ => @@ -7067,10 +7921,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_FRIEND_DECL_WITH_SELF" [] + [] + [] ] |))); fun γ => @@ -7083,10 +7944,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_FRIEND_DECL_WITH_MODULES_OUTSIDE_ACCOUNT_ADDRESS" [] + [] + [] ] |))); fun γ => @@ -7099,10 +7967,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_FRIEND_DECL_WITH_MODULES_IN_DEPENDENCIES" [] + [] + [] ] |))); fun γ => @@ -7115,10 +7990,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::CYCLIC_MODULE_FRIENDSHIP" [] + [] + [] ] |))); fun γ => @@ -7131,10 +8013,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_PHANTOM_TYPE_PARAM_POSITION" [] + [] + [] ] |))); fun γ => @@ -7147,10 +8036,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR" [] + [] + [] ] |))); fun γ => @@ -7163,10 +8059,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::VEC_BORROW_ELEMENT_EXISTS_MUTABLE_BORROW_ERROR" [] + [] + [] ] |))); fun γ => @@ -7179,10 +8082,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::LOOP_MAX_DEPTH_REACHED" [] + [] + [] ] |))); fun γ => @@ -7195,10 +8105,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::TOO_MANY_TYPE_PARAMETERS" [] + [] + [] ] |))); fun γ => @@ -7211,10 +8128,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::TOO_MANY_PARAMETERS" [] + [] + [] ] |))); fun γ => @@ -7227,10 +8151,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::TOO_MANY_BASIC_BLOCKS" [] + [] + [] ] |))); fun γ => @@ -7243,10 +8174,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::VALUE_STACK_OVERFLOW" [] + [] + [] ] |))); fun γ => @@ -7259,10 +8197,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::TOO_MANY_TYPE_NODES" [] + [] + [] ] |))); fun γ => @@ -7275,10 +8220,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::VALUE_STACK_PUSH_OVERFLOW" [] + [] + [] ] |))); fun γ => @@ -7291,10 +8243,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::MAX_DEPENDENCY_DEPTH_REACHED" [] + [] + [] ] |))); fun γ => @@ -7307,10 +8266,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::MAX_FUNCTION_DEFINITIONS_REACHED" [] + [] + [] ] |))); fun γ => @@ -7323,10 +8289,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::MAX_STRUCT_DEFINITIONS_REACHED" [] + [] + [] ] |))); fun γ => @@ -7339,10 +8312,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::MAX_FIELD_DEFINITIONS_REACHED" [] + [] + [] ] |))); fun γ => @@ -7355,10 +8335,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::TOO_MANY_BACK_EDGES" [] + [] + [] ] |))); fun γ => @@ -7371,10 +8358,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::RESERVED_VERIFICATION_ERROR_1" [] + [] + [] ] |))); fun γ => @@ -7387,10 +8381,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::RESERVED_VERIFICATION_ERROR_2" [] + [] + [] ] |))); fun γ => @@ -7403,10 +8404,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::RESERVED_VERIFICATION_ERROR_3" [] + [] + [] ] |))); fun γ => @@ -7419,10 +8427,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::RESERVED_VERIFICATION_ERROR_4" [] + [] + [] ] |))); fun γ => @@ -7435,10 +8450,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::RESERVED_VERIFICATION_ERROR_5" [] + [] + [] ] |))); fun γ => @@ -7451,10 +8473,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::TOO_MANY_VECTOR_ELEMENTS" [] + [] + [] ] |))); fun γ => @@ -7467,10 +8496,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::IDENTIFIER_TOO_LONG" [] + [] + [] ] |))); fun γ => @@ -7483,10 +8519,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::PROGRAM_TOO_COMPLEX" [] + [] + [] ] |))); fun γ => @@ -7499,10 +8542,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR" [] + [] + [] ] |))); fun γ => @@ -7515,10 +8565,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::EMPTY_VALUE_STACK" [] + [] + [] ] |))); fun γ => @@ -7531,7 +8588,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_core_types::vm_status::StatusCode::PC_OVERFLOW" [] + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] + [ + Value.StructTuple + "move_core_types::vm_status::StatusCode::PC_OVERFLOW" + [] + [] + [] ] |))); fun γ => @@ -7544,10 +8611,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::VERIFICATION_ERROR" [] + [] + [] ] |))); fun γ => @@ -7560,10 +8634,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::STORAGE_ERROR" [] + [] + [] ] |))); fun γ => @@ -7576,10 +8657,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INTERNAL_TYPE_ERROR" [] + [] + [] ] |))); fun γ => @@ -7592,10 +8680,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::EVENT_KEY_MISMATCH" [] + [] + [] ] |))); fun γ => @@ -7608,7 +8703,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNREACHABLE" [] + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] + [ + Value.StructTuple + "move_core_types::vm_status::StatusCode::UNREACHABLE" + [] + [] + [] ] |))); fun γ => @@ -7621,10 +8726,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::VM_STARTUP_FAILURE" [] + [] + [] ] |))); fun γ => @@ -7637,10 +8749,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION" [] + [] + [] ] |))); fun γ => @@ -7653,10 +8772,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::VERIFIER_INVARIANT_VIOLATION" [] + [] + [] ] |))); fun γ => @@ -7669,10 +8795,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNEXPECTED_VERIFIER_ERROR" [] + [] + [] ] |))); fun γ => @@ -7685,10 +8818,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNEXPECTED_DESERIALIZATION_ERROR" [] + [] + [] ] |))); fun γ => @@ -7701,10 +8841,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::FAILED_TO_SERIALIZE_WRITE_SET_CHANGES" [] + [] + [] ] |))); fun γ => @@ -7717,10 +8864,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::FAILED_TO_DESERIALIZE_RESOURCE" [] + [] + [] ] |))); fun γ => @@ -7733,10 +8887,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::TYPE_RESOLUTION_FAILURE" [] + [] + [] ] |))); fun γ => @@ -7749,10 +8910,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_NATIVE_FUNCTION" [] + [] + [] ] |))); fun γ => @@ -7765,10 +8933,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::ARITHMETIC_OVERFLOW" [] + [] + [] ] |))); fun γ => @@ -7781,10 +8956,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_BINARY_ERROR" [] + [] + [] ] |))); fun γ => @@ -7797,7 +8979,18 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_core_types::vm_status::StatusCode::MALFORMED" [] ] + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] + [ + Value.StructTuple + "move_core_types::vm_status::StatusCode::MALFORMED" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -7809,7 +9002,18 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_core_types::vm_status::StatusCode::BAD_MAGIC" [] ] + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] + [ + Value.StructTuple + "move_core_types::vm_status::StatusCode::BAD_MAGIC" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -7821,10 +9025,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_VERSION" [] + [] + [] ] |))); fun γ => @@ -7837,10 +9048,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_TABLE_TYPE" [] + [] + [] ] |))); fun γ => @@ -7853,10 +9071,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_SIGNATURE_TYPE" [] + [] + [] ] |))); fun γ => @@ -7869,10 +9094,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_SERIALIZED_TYPE" [] + [] + [] ] |))); fun γ => @@ -7885,10 +9117,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_OPCODE" [] + [] + [] ] |))); fun γ => @@ -7901,10 +9140,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::BAD_HEADER_TABLE" [] + [] + [] ] |))); fun γ => @@ -7917,10 +9163,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNEXPECTED_SIGNATURE_TYPE" [] + [] + [] ] |))); fun γ => @@ -7933,10 +9186,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::DUPLICATE_TABLE" [] + [] + [] ] |))); fun γ => @@ -7949,10 +9209,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_ABILITY" [] + [] + [] ] |))); fun γ => @@ -7965,10 +9232,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_NATIVE_STRUCT_FLAG" [] + [] + [] ] |))); fun γ => @@ -7981,7 +9255,18 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_core_types::vm_status::StatusCode::BAD_U16" [] ] + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] + [ + Value.StructTuple + "move_core_types::vm_status::StatusCode::BAD_U16" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -7993,7 +9278,18 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_core_types::vm_status::StatusCode::BAD_U32" [] ] + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] + [ + Value.StructTuple + "move_core_types::vm_status::StatusCode::BAD_U32" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -8005,7 +9301,18 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_core_types::vm_status::StatusCode::BAD_U64" [] ] + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] + [ + Value.StructTuple + "move_core_types::vm_status::StatusCode::BAD_U64" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -8017,7 +9324,18 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_core_types::vm_status::StatusCode::BAD_U128" [] ] + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] + [ + Value.StructTuple + "move_core_types::vm_status::StatusCode::BAD_U128" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -8029,7 +9347,18 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_core_types::vm_status::StatusCode::BAD_U256" [] ] + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] + [ + Value.StructTuple + "move_core_types::vm_status::StatusCode::BAD_U256" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -8041,10 +9370,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::VALUE_SERIALIZATION_ERROR" [] + [] + [] ] |))); fun γ => @@ -8057,10 +9393,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::VALUE_DESERIALIZATION_ERROR" [] + [] + [] ] |))); fun γ => @@ -8073,10 +9416,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::CODE_DESERIALIZATION_ERROR" [] + [] + [] ] |))); fun γ => @@ -8089,10 +9439,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::INVALID_FLAG_BITS" [] + [] + [] ] |))); fun γ => @@ -8105,10 +9462,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::TRAILING_BYTES" [] + [] + [] ] |))); fun γ => @@ -8121,10 +9485,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_RUNTIME_STATUS" [] + [] + [] ] |))); fun γ => @@ -8137,7 +9508,18 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_core_types::vm_status::StatusCode::EXECUTED" [] ] + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] + [ + Value.StructTuple + "move_core_types::vm_status::StatusCode::EXECUTED" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -8149,7 +9531,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_core_types::vm_status::StatusCode::OUT_OF_GAS" [] + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] + [ + Value.StructTuple + "move_core_types::vm_status::StatusCode::OUT_OF_GAS" + [] + [] + [] ] |))); fun γ => @@ -8162,10 +9554,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::RESOURCE_DOES_NOT_EXIST" [] + [] + [] ] |))); fun γ => @@ -8178,10 +9577,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::RESOURCE_ALREADY_EXISTS" [] + [] + [] ] |))); fun γ => @@ -8194,10 +9600,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::MISSING_DATA" [] + [] + [] ] |))); fun γ => @@ -8210,10 +9623,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::DATA_FORMAT_ERROR" [] + [] + [] ] |))); fun γ => @@ -8226,7 +9646,18 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" - [ Value.StructTuple "move_core_types::vm_status::StatusCode::ABORTED" [] ] + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] + [ + Value.StructTuple + "move_core_types::vm_status::StatusCode::ABORTED" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -8238,10 +9669,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::ARITHMETIC_ERROR" [] + [] + [] ] |))); fun γ => @@ -8254,10 +9692,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::VECTOR_OPERATION_ERROR" [] + [] + [] ] |))); fun γ => @@ -8270,10 +9715,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::EXECUTION_STACK_OVERFLOW" [] + [] + [] ] |))); fun γ => @@ -8286,10 +9738,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::CALL_STACK_OVERFLOW" [] + [] + [] ] |))); fun γ => @@ -8302,10 +9761,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::VM_MAX_TYPE_DEPTH_REACHED" [] + [] + [] ] |))); fun γ => @@ -8318,10 +9784,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::VM_MAX_VALUE_DEPTH_REACHED" [] + [] + [] ] |))); fun γ => @@ -8334,10 +9807,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::VM_EXTENSION_ERROR" [] + [] + [] ] |))); fun γ => @@ -8350,10 +9830,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::STORAGE_WRITE_LIMIT_REACHED" [] + [] + [] ] |))); fun γ => @@ -8366,10 +9853,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::MEMORY_LIMIT_EXCEEDED" [] + [] + [] ] |))); fun γ => @@ -8382,10 +9876,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::VM_MAX_TYPE_NODES_REACHED" [] + [] + [] ] |))); fun γ => @@ -8398,10 +9899,17 @@ Module vm_status. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ Value.StructTuple "move_core_types::vm_status::StatusCode::UNKNOWN_STATUS" [] + [] + [] ] |))); fun γ => @@ -8409,6 +9917,11 @@ Module vm_status. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "move_core_types::vm_status::StatusCode"; + Ty.apply (Ty.path "&") [] [ Ty.path "str" ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -8552,6 +10065,8 @@ Module vm_status. Value.StructTuple "move_core_types::vm_status::StatusType::Validation" [] + [] + [] |) |) |) @@ -8616,6 +10131,8 @@ Module vm_status. Value.StructTuple "move_core_types::vm_status::StatusType::Verification" [] + [] + [] |) |) |) @@ -8680,6 +10197,8 @@ Module vm_status. Value.StructTuple "move_core_types::vm_status::StatusType::InvariantViolation" [] + [] + [] |) |) |) @@ -8744,6 +10263,8 @@ Module vm_status. Value.StructTuple "move_core_types::vm_status::StatusType::Deserialization" [] + [] + [] |) |) |) @@ -8808,6 +10329,8 @@ Module vm_status. Value.StructTuple "move_core_types::vm_status::StatusType::Execution" [] + [] + [] |) |) |) @@ -8815,7 +10338,9 @@ Module vm_status. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "move_core_types::vm_status::StatusType::Unknown" [] |) + M.alloc (| + Value.StructTuple "move_core_types::vm_status::StatusType::Unknown" [] [] [] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -8933,7 +10458,11 @@ Module vm_status. |), [ M.read (| deserializer |); - Value.StructTuple "move_core_types::vm_status::deserialize::StatusCodeVisitor" [] + Value.StructTuple + "move_core_types::vm_status::deserialize::StatusCodeVisitor" + [] + [] + [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/plonky3/air/air.v b/CoqOfRust/plonky3/air/air.v index 5db98ae94..991cff526 100644 --- a/CoqOfRust/plonky3/air/air.v +++ b/CoqOfRust/plonky3/air/air.v @@ -14,7 +14,16 @@ Module air. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - Value.StructTuple "core::option::Option::None" [])) + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "p3_matrix::dense::DenseMatrix") + [] + [ F; Ty.apply (Ty.path "alloc::vec::Vec") [] [ F; Ty.path "alloc::alloc::Global" ] ] + ] + [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -91,6 +100,8 @@ Module air. let condition := M.alloc (| condition |) in Value.StructRecord "p3_air::air::FilteredAirBuilder" + [] + [ Self ] [ ("inner", M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| self |) |) |)); ("condition", diff --git a/CoqOfRust/plonky3/air/utils.v b/CoqOfRust/plonky3/air/utils.v index 495e7be03..bf087a23a 100644 --- a/CoqOfRust/plonky3/air/utils.v +++ b/CoqOfRust/plonky3/air/utils.v @@ -2304,6 +2304,8 @@ Module utils. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| b |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 16) ] ] |) @@ -2747,6 +2749,8 @@ Module utils. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| b |) |) |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 16) ] ] |) diff --git a/CoqOfRust/plonky3/air/virtual_column.v b/CoqOfRust/plonky3/air/virtual_column.v index bef8d43d1..402913da3 100644 --- a/CoqOfRust/plonky3/air/virtual_column.v +++ b/CoqOfRust/plonky3/air/virtual_column.v @@ -34,6 +34,8 @@ Module virtual_column. (let self := M.alloc (| self |) in Value.StructRecord "p3_air::virtual_column::VirtualPairCol" + [] + [ F ] [ ("column_weights", M.call_closure (| @@ -442,6 +444,8 @@ Module virtual_column. let constant := M.alloc (| constant |) in Value.StructRecord "p3_air::virtual_column::VirtualPairCol" + [] + [ F ] [ ("column_weights", M.read (| column_weights |)); ("constant", M.read (| constant |)) ])) | _, _, _ => M.impossible "wrong number of arguments" @@ -599,6 +603,8 @@ Module virtual_column. [ Value.StructTuple "p3_air::virtual_column::PairCol::Preprocessed" + [] + [] [ M.read (| i |) ]; M.read (| w |) ])) @@ -763,6 +769,8 @@ Module virtual_column. [ Value.StructTuple "p3_air::virtual_column::PairCol::Main" + [] + [] [ M.read (| i |) ]; M.read (| w |) ])) @@ -826,6 +834,8 @@ Module virtual_column. (let x := M.alloc (| x |) in Value.StructRecord "p3_air::virtual_column::VirtualPairCol" + [] + [ F ] [ ("column_weights", M.call_closure (| @@ -877,6 +887,8 @@ Module virtual_column. (let column := M.alloc (| column |) in Value.StructRecord "p3_air::virtual_column::VirtualPairCol" + [] + [ F ] [ ("column_weights", M.call_closure (| @@ -986,6 +998,8 @@ Module virtual_column. [ Value.StructTuple "p3_air::virtual_column::PairCol::Preprocessed" + [] + [] [ M.read (| column |) ] ] |))) @@ -1017,7 +1031,13 @@ Module virtual_column. [], [] |), - [ Value.StructTuple "p3_air::virtual_column::PairCol::Main" [ M.read (| column |) ] ] + [ + Value.StructTuple + "p3_air::virtual_column::PairCol::Main" + [] + [] + [ M.read (| column |) ] + ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/plonky3/blake3-air/air.v b/CoqOfRust/plonky3/blake3-air/air.v index 21532d8ec..1719e6bc7 100644 --- a/CoqOfRust/plonky3/blake3-air/air.v +++ b/CoqOfRust/plonky3/blake3-air/air.v @@ -177,6 +177,8 @@ Module air. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| num_hashes |)) @@ -455,6 +457,8 @@ Module air. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -598,6 +602,8 @@ Module air. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -843,6 +849,8 @@ Module air. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -986,6 +994,8 @@ Module air. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -1221,6 +1231,8 @@ Module air. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -1364,6 +1376,8 @@ Module air. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -1611,6 +1625,8 @@ Module air. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -1754,6 +1770,8 @@ Module air. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -1921,6 +1939,8 @@ Module air. let index := M.alloc (| index |) in Value.StructRecord "p3_blake3_air::columns::QuarterRound" + [] + [ T; U ] [ ("a", M.borrow (| @@ -2254,6 +2274,8 @@ Module air. let index := M.alloc (| index |) in Value.StructRecord "p3_blake3_air::columns::QuarterRound" + [] + [ T; U ] [ ("a", M.borrow (| @@ -4910,6 +4932,8 @@ Module air. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -5114,6 +5138,8 @@ Module air. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -5877,6 +5903,8 @@ Module air. M.borrow (| Pointer.Kind.Ref, bits |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -6061,6 +6089,8 @@ Module air. M.borrow (| Pointer.Kind.Ref, bits |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -6101,6 +6131,8 @@ Module air. M.alloc (| Value.StructRecord "p3_blake3_air::columns::Blake3State" + [] + [ Ty.associated_in_trait "p3_air::air::AirBuilder" [] [] AB "Var" ] [ ("row0", M.read (| @@ -7066,6 +7098,8 @@ Module air. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -7270,6 +7304,8 @@ Module air. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| diff --git a/CoqOfRust/plonky3/blake3-air/columns.v b/CoqOfRust/plonky3/blake3-air/columns.v index 4390e19e4..e1aff4d72 100644 --- a/CoqOfRust/plonky3/blake3-air/columns.v +++ b/CoqOfRust/plonky3/blake3-air/columns.v @@ -414,6 +414,8 @@ Module columns. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -446,6 +448,8 @@ Module columns. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -786,6 +790,8 @@ Module columns. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -822,6 +828,8 @@ Module columns. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -984,6 +992,8 @@ Module columns. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1016,6 +1026,8 @@ Module columns. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -1372,6 +1384,8 @@ Module columns. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1408,6 +1422,8 @@ Module columns. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/plonky3/blake3-air/constants.v b/CoqOfRust/plonky3/blake3-air/constants.v index 56e7a219a..a0cc9c697 100644 --- a/CoqOfRust/plonky3/blake3-air/constants.v +++ b/CoqOfRust/plonky3/blake3-air/constants.v @@ -140,6 +140,8 @@ Module constants. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", Value.Integer IntegerKind.Usize 16) diff --git a/CoqOfRust/plonky3/blake3-air/generation.v b/CoqOfRust/plonky3/blake3-air/generation.v index db560f806..b95abb6e9 100644 --- a/CoqOfRust/plonky3/blake3-air/generation.v +++ b/CoqOfRust/plonky3/blake3-air/generation.v @@ -1127,6 +1127,8 @@ Module generation. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1159,6 +1161,8 @@ Module generation. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -3463,6 +3467,8 @@ Module generation. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", Value.Integer IntegerKind.Usize 4) @@ -3668,6 +3674,8 @@ Module generation. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", Value.Integer IntegerKind.Usize 4) @@ -3880,6 +3888,8 @@ Module generation. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", Value.Integer IntegerKind.Usize 4) @@ -4176,6 +4186,8 @@ Module generation. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", Value.Integer IntegerKind.Usize 4) diff --git a/CoqOfRust/plonky3/field/array.v b/CoqOfRust/plonky3/field/array.v index bee484157..fa68bee97 100644 --- a/CoqOfRust/plonky3/field/array.v +++ b/CoqOfRust/plonky3/field/array.v @@ -29,6 +29,8 @@ Module array. (let self := M.alloc (| self |) in Value.StructTuple "p3_field::array::FieldArray" + [ N ] + [ F ] [ M.call_closure (| Ty.apply (Ty.path "array") [ N ] [ F ], @@ -502,7 +504,7 @@ Module array. | [], [], [ arr ] => ltac:(M.monadic (let arr := M.alloc (| arr |) in - Value.StructTuple "p3_field::array::FieldArray" [ M.read (| arr |) ])) + Value.StructTuple "p3_field::array::FieldArray" [ N ] [ F ] [ M.read (| arr |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -538,6 +540,8 @@ Module array. (M.alloc (| Value.StructTuple "p3_field::array::FieldArray" + [ N ] + [ F ] [ repeat (| M.read (| get_constant (| "p3_field::field::PrimeCharacteristicRing::ZERO", F |) |), @@ -560,6 +564,8 @@ Module array. (M.alloc (| Value.StructTuple "p3_field::array::FieldArray" + [ N ] + [ F ] [ repeat (| M.read (| get_constant (| "p3_field::field::PrimeCharacteristicRing::ONE", F |) |), @@ -582,6 +588,8 @@ Module array. (M.alloc (| Value.StructTuple "p3_field::array::FieldArray" + [ N ] + [ F ] [ repeat (| M.read (| get_constant (| "p3_field::field::PrimeCharacteristicRing::TWO", F |) |), @@ -604,6 +612,8 @@ Module array. (M.alloc (| Value.StructTuple "p3_field::array::FieldArray" + [ N ] + [ F ] [ repeat (| M.read (| @@ -796,7 +806,7 @@ Module array. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -826,7 +836,11 @@ Module array. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -972,7 +986,11 @@ Module array. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple + "core::panicking::AssertKind::Eq" + [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1002,7 +1020,11 @@ Module array. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -1088,6 +1110,8 @@ Module array. (let f := M.alloc (| f |) in Value.StructTuple "p3_field::array::FieldArray" + [ N ] + [ F ] [ M.call_closure (| Ty.apply (Ty.path "array") [ N ] [ F ], diff --git a/CoqOfRust/plonky3/field/batch_inverse.v b/CoqOfRust/plonky3/field/batch_inverse.v index 633c4c04d..a0f809a14 100644 --- a/CoqOfRust/plonky3/field/batch_inverse.v +++ b/CoqOfRust/plonky3/field/batch_inverse.v @@ -985,7 +985,11 @@ Module batch_inverse. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple + "core::panicking::AssertKind::Eq" + [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1015,7 +1019,11 @@ Module batch_inverse. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -1448,7 +1456,11 @@ Module batch_inverse. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple + "core::panicking::AssertKind::Eq" + [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1478,7 +1490,11 @@ Module batch_inverse. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -1544,6 +1560,8 @@ Module batch_inverse. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1); ("end_", M.read (| n |)) ] ] @@ -1742,6 +1760,8 @@ Module batch_inverse. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| n |)) diff --git a/CoqOfRust/plonky3/field/coset.v b/CoqOfRust/plonky3/field/coset.v index 974223528..d6289c3f5 100644 --- a/CoqOfRust/plonky3/field/coset.v +++ b/CoqOfRust/plonky3/field/coset.v @@ -23,6 +23,8 @@ Module coset. (let self := M.alloc (| self |) in Value.StructRecord "p3_field::coset::TwoAdicMultiplicativeCoset" + [] + [ F ] [ ("shift", M.call_closure (| @@ -237,14 +239,27 @@ Module coset. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "p3_field::coset::TwoAdicMultiplicativeCoset") [] [ F ] + ] [ Value.StructRecord "p3_field::coset::TwoAdicMultiplicativeCoset" + [] + [ F ] [ ("shift", M.read (| shift |)); ("log_size", M.read (| log_size |)) ] ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "p3_field::coset::TwoAdicMultiplicativeCoset") [] [ F ] + ] + [] + |))) ] |) |))) @@ -464,6 +479,8 @@ Module coset. (let new_log_size := M.copy (| γ |) in Value.StructRecord "p3_field::coset::TwoAdicMultiplicativeCoset" + [] + [ F ] [ ("shift", M.read (| @@ -648,6 +665,8 @@ Module coset. let scale := M.alloc (| scale |) in Value.StructRecord "p3_field::coset::TwoAdicMultiplicativeCoset" + [] + [ F ] [ ("shift", M.call_closure (| @@ -699,6 +718,8 @@ Module coset. let shift := M.alloc (| shift |) in Value.StructRecord "p3_field::coset::TwoAdicMultiplicativeCoset" + [] + [ F ] [ ("shift", M.read (| shift |)); ("log_size", @@ -800,6 +821,8 @@ Module coset. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", diff --git a/CoqOfRust/plonky3/field/extension/binomial_extension.v b/CoqOfRust/plonky3/field/extension/binomial_extension.v index 6686d2fa6..09a314cab 100644 --- a/CoqOfRust/plonky3/field/extension/binomial_extension.v +++ b/CoqOfRust/plonky3/field/extension/binomial_extension.v @@ -54,6 +54,8 @@ Module extension. (let self := M.alloc (| self |) in Value.StructRecord "p3_field::extension::binomial_extension::BinomialExtensionField" + [ D ] + [ F; A ] [ ("value", M.call_closure (| @@ -817,6 +819,8 @@ Module extension. M.alloc (| Value.StructRecord "p3_field::extension::binomial_extension::_::serialize::__SerializeWith" + [ D ] + [ F; A ] [ ("values", Value.Tuple @@ -836,7 +840,17 @@ Module extension. |) ]); ("phantom", - Value.StructTuple "core::marker::PhantomData" []) + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path + "p3_field::extension::binomial_extension::BinomialExtensionField") + [ D ] + [ F; A ] + ] + []) ] |) |) @@ -1218,9 +1232,27 @@ Module extension. |); Value.StructRecord "p3_field::extension::binomial_extension::_'1::deserialize::__Visitor" + [ D ] + [ F; A ] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path + "p3_field::extension::binomial_extension::BinomialExtensionField") + [ D ] + [ F; A ] + ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -1551,9 +1583,11 @@ Module extension. (let value := M.alloc (| value |) in Value.StructRecord "p3_field::extension::binomial_extension::BinomialExtensionField" + [ D ] + [ F; A ] [ ("value", M.read (| value |)); - ("_phantom", Value.StructTuple "core::marker::PhantomData" []) + ("_phantom", Value.StructTuple "core::marker::PhantomData" [] [ F ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2201,6 +2235,8 @@ Module extension. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1) ] ] |) @@ -2820,6 +2856,8 @@ Module extension. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1); ("end_", D) ] ] |) @@ -2987,6 +3025,8 @@ Module extension. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1); ("end_", D) ] ] |) @@ -3304,6 +3344,8 @@ Module extension. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -3347,6 +3389,8 @@ Module extension. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -4414,7 +4458,19 @@ Module extension. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path + "p3_field::extension::binomial_extension::BinomialExtensionField") + [ D ] + [ F; F ] + ] + [] + |) |) |) |))); @@ -4593,7 +4649,19 @@ Module extension. |))) ] |) in - M.alloc (| Value.StructTuple "core::option::Option::Some" [ M.read (| res |) ] |) + M.alloc (| + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path + "p3_field::extension::binomial_extension::BinomialExtensionField") + [ D ] + [ F; F ] + ] + [ M.read (| res |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6397,6 +6465,8 @@ Module extension. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", D) ] ] |) @@ -7084,6 +7154,8 @@ Module extension. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", D) ] ] |) @@ -8957,6 +9029,8 @@ Module extension. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", D) ] ] |) @@ -9041,6 +9115,8 @@ Module extension. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); @@ -9507,7 +9583,7 @@ Module extension. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -9537,7 +9613,11 @@ Module extension. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -9772,7 +9852,7 @@ Module extension. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -9802,7 +9882,11 @@ Module extension. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -10362,7 +10446,7 @@ Module extension. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -10392,7 +10476,11 @@ Module extension. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -11201,7 +11289,7 @@ Module extension. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -11231,7 +11319,11 @@ Module extension. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/plonky3/field/extension/mod.v b/CoqOfRust/plonky3/field/extension/mod.v index 1ee625198..0d38af449 100644 --- a/CoqOfRust/plonky3/field/extension/mod.v +++ b/CoqOfRust/plonky3/field/extension/mod.v @@ -96,7 +96,11 @@ Module extension. ] |), [ - Value.StructTuple "core::option::Option::Some" [ M.read (| self |) ]; + Value.StructTuple + "core::option::Option::Some" + [] + [ Self ] + [ M.read (| self |) ]; M.closure (fun γ => ltac:(M.monadic @@ -119,6 +123,8 @@ Module extension. (let x := M.copy (| γ |) in Value.StructTuple "core::option::Option::Some" + [] + [ Self ] [ M.call_closure (| Self, diff --git a/CoqOfRust/plonky3/field/extension/packed_binomial_extension.v b/CoqOfRust/plonky3/field/extension/packed_binomial_extension.v index 4df1af638..4e0b96aba 100644 --- a/CoqOfRust/plonky3/field/extension/packed_binomial_extension.v +++ b/CoqOfRust/plonky3/field/extension/packed_binomial_extension.v @@ -50,6 +50,8 @@ Module extension. (let self := M.alloc (| self |) in Value.StructRecord "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField" + [ D ] + [ F; PF ] [ ("value", M.call_closure (| @@ -687,6 +689,8 @@ Module extension. M.alloc (| Value.StructRecord "p3_field::extension::packed_binomial_extension::_::serialize::__SerializeWith" + [ D ] + [ F; PF ] [ ("values", Value.Tuple @@ -706,7 +710,17 @@ Module extension. |) ]); ("phantom", - Value.StructTuple "core::marker::PhantomData" []) + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path + "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField") + [ D ] + [ F; PF ] + ] + []) ] |) |) @@ -911,9 +925,27 @@ Module extension. |); Value.StructRecord "p3_field::extension::packed_binomial_extension::_'1::deserialize::__Visitor" + [ D ] + [ F; PF ] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ + Ty.apply + (Ty.path + "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField") + [ D ] + [ F; PF ] + ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -1113,6 +1145,8 @@ Module extension. (let value := M.alloc (| value |) in Value.StructRecord "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField" + [ D ] + [ F; PF ] [ ("value", M.read (| value |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1151,6 +1185,8 @@ Module extension. ltac:(M.monadic (Value.StructRecord "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField" + [ D ] + [ F; PF ] [ ("value", M.call_closure (| @@ -1230,6 +1266,8 @@ Module extension. (let x := M.alloc (| x |) in Value.StructRecord "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField" + [ D ] + [ F; PF ] [ ("value", M.call_closure (| @@ -1299,6 +1337,8 @@ Module extension. (let x := M.alloc (| x |) in Value.StructRecord "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField" + [ D ] + [ F; PF ] [ ("value", M.call_closure (| @@ -1392,6 +1432,8 @@ Module extension. (M.alloc (| Value.StructRecord "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField" + [ D ] + [ F; PF ] [ ("value", repeat (| @@ -1424,6 +1466,8 @@ Module extension. (M.alloc (| Value.StructRecord "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField" + [ D ] + [ F; PF ] [ ("value", M.call_closure (| @@ -1459,6 +1503,8 @@ Module extension. (M.alloc (| Value.StructRecord "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField" + [ D ] + [ F; PF ] [ ("value", M.call_closure (| @@ -1494,6 +1540,8 @@ Module extension. (M.alloc (| Value.StructRecord "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField" + [ D ] + [ F; PF ] [ ("value", M.call_closure (| @@ -2139,6 +2187,8 @@ Module extension. (let f := M.alloc (| f |) in Value.StructRecord "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField" + [ D ] + [ F; PF ] [ ("value", M.call_closure (| @@ -2560,7 +2610,11 @@ Module extension. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple + "core::panicking::AssertKind::Eq" + [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -2590,7 +2644,11 @@ Module extension. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -3002,6 +3060,8 @@ Module extension. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| width |)) @@ -3437,6 +3497,8 @@ Module extension. M.borrow (| Pointer.Kind.Ref, powers |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| width |)) ] ] |) @@ -3526,6 +3588,14 @@ Module extension. M.alloc (| Value.StructRecord "p3_field::field::Powers" + [] + [ + Ty.apply + (Ty.path + "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField") + [ D ] + [ F; Ty.associated_in_trait "p3_field::field::Field" [] [] F "Packing" ] + ] [ ("base", M.read (| multiplier |)); ("current", M.read (| current |)) ] |) |))) @@ -3589,6 +3659,8 @@ Module extension. (let self := M.alloc (| self |) in Value.StructRecord "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField" + [ D ] + [ F; PF ] [ ("value", M.call_closure (| @@ -3709,6 +3781,8 @@ Module extension. M.alloc (| Value.StructRecord "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField" + [ D ] + [ F; PF ] [ ("value", M.read (| value |)) ] |) |))) @@ -3812,6 +3886,8 @@ Module extension. M.alloc (| Value.StructRecord "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField" + [ D ] + [ F; PF ] [ ("value", M.read (| value |)) ] |) |))) @@ -3966,6 +4042,8 @@ Module extension. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", D) ] ] |) @@ -4135,6 +4213,8 @@ Module extension. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", D) ] ] |) @@ -4630,6 +4710,8 @@ Module extension. M.alloc (| Value.StructRecord "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField" + [ D ] + [ F; PF ] [ ("value", M.read (| value |)) ] |) |))) @@ -4733,6 +4815,8 @@ Module extension. M.alloc (| Value.StructRecord "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField" + [ D ] + [ F; PF ] [ ("value", M.read (| value |)) ] |) |))) @@ -4827,6 +4911,8 @@ Module extension. M.alloc (| Value.StructRecord "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField" + [ D ] + [ F; PF ] [ ("value", M.read (| res |)) ] |) |))) @@ -5417,6 +5503,8 @@ Module extension. let rhs := M.alloc (| rhs |) in Value.StructRecord "p3_field::extension::packed_binomial_extension::PackedBinomialExtensionField" + [ D ] + [ F; PF ] [ ("value", M.call_closure (| diff --git a/CoqOfRust/plonky3/field/field.v b/CoqOfRust/plonky3/field/field.v index 7e9f4049c..426f374f8 100644 --- a/CoqOfRust/plonky3/field/field.v +++ b/CoqOfRust/plonky3/field/field.v @@ -904,6 +904,8 @@ Module field. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -1480,6 +1482,8 @@ Module field. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| power_log |)) @@ -1657,6 +1661,8 @@ Module field. let start := M.alloc (| start |) in Value.StructRecord "p3_field::field::Powers" + [] + [ Self ] [ ("base", M.call_closure (| @@ -1968,7 +1974,7 @@ Module field. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -1998,7 +2004,11 @@ Module field. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -2416,6 +2426,8 @@ Module field. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 4) ] ] |) @@ -2469,6 +2481,8 @@ Module field. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 4) ] ] |) @@ -2545,6 +2559,8 @@ Module field. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 4) ] ] |) @@ -2598,6 +2614,8 @@ Module field. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 4) ] ] |) @@ -2674,6 +2692,8 @@ Module field. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 4) ] ] |) @@ -2727,6 +2747,8 @@ Module field. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 4) ] ] |) @@ -2803,6 +2825,8 @@ Module field. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 4) ] ] |) @@ -2856,6 +2880,8 @@ Module field. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 4) ] ] |) @@ -2916,6 +2942,8 @@ Module field. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 8) ] ] |) @@ -3136,6 +3164,8 @@ Module field. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -3250,6 +3280,8 @@ Module field. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -3342,6 +3374,8 @@ Module field. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -3434,6 +3468,8 @@ Module field. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -3526,6 +3562,8 @@ Module field. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -3618,6 +3656,8 @@ Module field. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -3710,6 +3750,8 @@ Module field. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -3802,6 +3844,8 @@ Module field. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -4306,7 +4350,7 @@ Module field. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -4336,7 +4380,11 @@ Module field. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -5265,6 +5313,8 @@ Module field. (let self := M.alloc (| self |) in Value.StructTuple "core::option::Option::Some" + [] + [ F ] [ M.read (| M.deref (| M.read (| self |) |) |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5307,6 +5357,8 @@ Module field. (let self := M.alloc (| self |) in Value.StructRecord "p3_field::field::Powers" + [] + [ F ] [ ("base", M.call_closure (| @@ -5515,7 +5567,9 @@ Module field. ] |) |) in - M.alloc (| Value.StructTuple "core::option::Option::Some" [ M.read (| result |) ] |) + M.alloc (| + Value.StructTuple "core::option::Option::Some" [] [ R ] [ M.read (| result |) ] + |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/plonky3/field/packed.v b/CoqOfRust/plonky3/field/packed.v index c6f4b71e6..f86d2a1fe 100644 --- a/CoqOfRust/plonky3/field/packed.v +++ b/CoqOfRust/plonky3/field/packed.v @@ -2065,7 +2065,7 @@ Module packed. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -2095,7 +2095,11 @@ Module packed. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -2243,7 +2247,11 @@ Module packed. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple + "core::panicking::AssertKind::Eq" + [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -2273,7 +2281,11 @@ Module packed. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -2568,6 +2580,8 @@ Module packed. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1); ("end_", @@ -2698,6 +2712,8 @@ Module packed. M.alloc (| Value.StructRecord "p3_field::field::Powers" + [] + [ Self ] [ ("base", M.call_closure (| @@ -2843,7 +2859,7 @@ Module packed. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -2873,7 +2889,11 @@ Module packed. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -2947,7 +2967,7 @@ Module packed. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -2977,7 +2997,11 @@ Module packed. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -3312,6 +3336,8 @@ Module packed. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", diff --git a/CoqOfRust/plonky3/matrix/bitrev.v b/CoqOfRust/plonky3/matrix/bitrev.v index 908f9afc8..8ac13a273 100644 --- a/CoqOfRust/plonky3/matrix/bitrev.v +++ b/CoqOfRust/plonky3/matrix/bitrev.v @@ -94,10 +94,14 @@ Module bitrev. (let inner := M.alloc (| inner |) in Value.StructRecord "p3_matrix::row_index_mapped::RowIndexMappedView" + [] + [ Ty.path "p3_matrix::bitrev::BitReversalPerm"; Inner ] [ ("index_map", Value.StructRecord "p3_matrix::bitrev::BitReversalPerm" + [] + [] [ ("log_height", M.call_closure (| diff --git a/CoqOfRust/plonky3/matrix/dense.v b/CoqOfRust/plonky3/matrix/dense.v index 56092ca81..904585c09 100644 --- a/CoqOfRust/plonky3/matrix/dense.v +++ b/CoqOfRust/plonky3/matrix/dense.v @@ -42,6 +42,8 @@ Module dense. (let self := M.alloc (| self |) in Value.StructRecord "p3_matrix::dense::DenseMatrix" + [] + [ T; V ] [ ("values", M.call_closure (| @@ -1229,9 +1231,21 @@ Module dense. |); Value.StructRecord "p3_matrix::dense::_'1::deserialize::__Visitor" + [] + [ T; V ] [ - ("marker", Value.StructTuple "core::marker::PhantomData" []); - ("lifetime", Value.StructTuple "core::marker::PhantomData" []) + ("marker", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "p3_matrix::dense::DenseMatrix") [] [ T; V ] ] + []); + ("lifetime", + Value.StructTuple + "core::marker::PhantomData" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.tuple [] ] ] + []) ] ] |))) @@ -1514,6 +1528,8 @@ Module dense. [ Value.StructTuple "alloc::borrow::Cow::Owned" + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] [ M.read (| M.SubPointer.get_struct_record_field (| @@ -1642,7 +1658,7 @@ Module dense. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| rng |) |) |); - Value.StructTuple "rand::distr::StandardUniform" [] + Value.StructTuple "rand::distr::StandardUniform" [] [] [] ] |); M.call_closure (| @@ -1855,7 +1871,7 @@ Module dense. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| rng |) |) |); - Value.StructTuple "rand::distr::StandardUniform" [] + Value.StructTuple "rand::distr::StandardUniform" [] [] [] ] |); M.closure @@ -2454,7 +2470,7 @@ Module dense. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -2484,7 +2500,11 @@ Module dense. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -2596,7 +2616,7 @@ Module dense. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -2626,7 +2646,11 @@ Module dense. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -2915,10 +2939,12 @@ Module dense. M.alloc (| Value.StructRecord "p3_matrix::dense::DenseMatrix" + [] + [ T; S ] [ ("values", M.read (| values |)); ("width", M.read (| width |)); - ("_phantom", Value.StructTuple "core::marker::PhantomData" []) + ("_phantom", Value.StructTuple "core::marker::PhantomData" [] [ T ] []) ] |) |))) @@ -3294,7 +3320,7 @@ Module dense. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -3327,7 +3353,11 @@ Module dense. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -3986,6 +4016,8 @@ Module dense. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -5884,6 +5916,8 @@ Module dense. Value.StructTuple "core::panicking::AssertKind::Ne" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -5916,6 +5950,8 @@ Module dense. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -6086,6 +6122,8 @@ Module dense. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start_1 |)) ] ] |) @@ -6093,6 +6131,8 @@ Module dense. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -6141,6 +6181,8 @@ Module dense. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -7620,6 +7662,8 @@ Module dense. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -7723,6 +7767,8 @@ Module dense. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -7915,6 +7961,8 @@ Module dense. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -8144,6 +8192,8 @@ Module dense. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -8444,6 +8494,8 @@ Module dense. [ Value.StructTuple "alloc::borrow::Cow::Borrowed" + [] + [ Ty.apply (Ty.path "slice") [] [ T ] ] [ M.borrow (| Pointer.Kind.Ref, diff --git a/CoqOfRust/plonky3/matrix/extension.v b/CoqOfRust/plonky3/matrix/extension.v index 0858d8400..85c88acf5 100644 --- a/CoqOfRust/plonky3/matrix/extension.v +++ b/CoqOfRust/plonky3/matrix/extension.v @@ -103,7 +103,12 @@ Module extension. (let inner := M.alloc (| inner |) in Value.StructTuple "p3_matrix::extension::FlatMatrixView" - [ M.read (| inner |); Value.StructTuple "core::marker::PhantomData" [] ])) + [] + [ F; EF; Inner ] + [ + M.read (| inner |); + Value.StructTuple "core::marker::PhantomData" [] [ Ty.tuple [ F; EF ] ] [] + ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -276,6 +281,8 @@ Module extension. let r := M.alloc (| r |) in Value.StructRecord "p3_matrix::extension::FlatIter" + [] + [ F; Ty.associated_in_trait "p3_matrix::Matrix" [] [ EF ] Inner "Row" ] [ ("inner", M.call_closure (| @@ -319,7 +326,7 @@ Module extension. ] |)); ("idx", Value.Integer IntegerKind.Usize 0); - ("_phantom", Value.StructTuple "core::marker::PhantomData" []) + ("_phantom", Value.StructTuple "core::marker::PhantomData" [] [ F ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -866,7 +873,9 @@ Module extension. |) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::Some" [ M.read (| value |) ] |) + M.alloc (| + Value.StructTuple "core::option::Option::Some" [] [ F ] [ M.read (| value |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/plonky3/matrix/horizontally_truncated.v b/CoqOfRust/plonky3/matrix/horizontally_truncated.v index 41776595b..3801ccc83 100644 --- a/CoqOfRust/plonky3/matrix/horizontally_truncated.v +++ b/CoqOfRust/plonky3/matrix/horizontally_truncated.v @@ -86,10 +86,12 @@ Module horizontally_truncated. M.alloc (| Value.StructRecord "p3_matrix::horizontally_truncated::HorizontallyTruncated" + [] + [ T; Inner ] [ ("inner", M.read (| inner |)); ("truncated_width", M.read (| truncated_width |)); - ("_phantom", Value.StructTuple "core::marker::PhantomData" []) + ("_phantom", Value.StructTuple "core::marker::PhantomData" [] [ T ] []) ] |) |))) diff --git a/CoqOfRust/plonky3/matrix/lib.v b/CoqOfRust/plonky3/matrix/lib.v index 57dc3e632..e9abe4313 100644 --- a/CoqOfRust/plonky3/matrix/lib.v +++ b/CoqOfRust/plonky3/matrix/lib.v @@ -396,6 +396,8 @@ Module Matrix. (let self := M.alloc (| self |) in Value.StructRecord "p3_matrix::Dimensions" + [] + [] [ ("width", M.call_closure (| @@ -500,6 +502,8 @@ Module Matrix. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -601,6 +605,8 @@ Module Matrix. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -822,6 +828,8 @@ Module Matrix. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -966,6 +974,8 @@ Module Matrix. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| num_packed |)) @@ -1104,6 +1114,8 @@ Module Matrix. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -1247,6 +1259,8 @@ Module Matrix. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| num_elems |)) ]; M.closure @@ -1416,6 +1430,8 @@ Module Matrix. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -1563,6 +1579,8 @@ Module Matrix. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -1732,6 +1750,8 @@ Module Matrix. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -1849,6 +1869,8 @@ Module Matrix. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -2102,6 +2124,8 @@ Module Matrix. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -2275,6 +2299,8 @@ Module Matrix. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -2473,6 +2499,8 @@ Module Matrix. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -2652,6 +2680,8 @@ Module Matrix. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -3454,6 +3484,19 @@ Module Matrix. |); Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.dyn + [ + ("tracing_core::field::Value::Trait", + []) + ] + ] + ] [ M.read (| M.use @@ -5392,6 +5435,8 @@ Module Matrix. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", diff --git a/CoqOfRust/plonky3/matrix/mul.v b/CoqOfRust/plonky3/matrix/mul.v index cea4fb092..1f521c475 100644 --- a/CoqOfRust/plonky3/matrix/mul.v +++ b/CoqOfRust/plonky3/matrix/mul.v @@ -114,7 +114,7 @@ Module mul. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -146,6 +146,8 @@ Module mul. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::fmt::Arguments" ] [ M.call_closure (| Ty.path "core::fmt::Arguments", @@ -276,6 +278,8 @@ Module mul. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", diff --git a/CoqOfRust/plonky3/matrix/row_index_mapped.v b/CoqOfRust/plonky3/matrix/row_index_mapped.v index b2e55d472..580ff520a 100644 --- a/CoqOfRust/plonky3/matrix/row_index_mapped.v +++ b/CoqOfRust/plonky3/matrix/row_index_mapped.v @@ -80,6 +80,8 @@ Module row_index_mapped. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -226,6 +228,8 @@ Module row_index_mapped. (let self := M.alloc (| self |) in Value.StructRecord "p3_matrix::row_index_mapped::RowIndexMappedView" + [] + [ IndexMap; Inner ] [ ("index_map", M.call_closure (| diff --git a/CoqOfRust/plonky3/matrix/sparse.v b/CoqOfRust/plonky3/matrix/sparse.v index a9c6dbd40..3c2d2b252 100644 --- a/CoqOfRust/plonky3/matrix/sparse.v +++ b/CoqOfRust/plonky3/matrix/sparse.v @@ -212,6 +212,8 @@ Module sparse. M.alloc (| Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -617,6 +619,8 @@ Module sparse. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); @@ -779,6 +783,8 @@ Module sparse. M.alloc (| Value.StructRecord "p3_matrix::sparse::CsrMatrix" + [] + [ T ] [ ("width", M.read (| cols |)); ("nonzero_values", M.read (| nonzero_values |)); diff --git a/CoqOfRust/plonky3/matrix/stack.v b/CoqOfRust/plonky3/matrix/stack.v index 5947b39c6..ca9656ca3 100644 --- a/CoqOfRust/plonky3/matrix/stack.v +++ b/CoqOfRust/plonky3/matrix/stack.v @@ -42,6 +42,8 @@ Module stack. (let self := M.alloc (| self |) in Value.StructRecord "p3_matrix::stack::VerticalPair" + [] + [ First; Second ] [ ("first", M.call_closure (| @@ -220,6 +222,8 @@ Module stack. (let self := M.alloc (| self |) in Value.StructRecord "p3_matrix::stack::HorizontalPair" + [] + [ First; Second ] [ ("first", M.call_closure (| @@ -468,7 +472,7 @@ Module stack. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -498,7 +502,11 @@ Module stack. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -513,6 +521,8 @@ Module stack. M.alloc (| Value.StructRecord "p3_matrix::stack::VerticalPair" + [] + [ First; Second ] [ ("first", M.read (| first |)); ("second", M.read (| second |)) ] |) |))) @@ -636,7 +646,7 @@ Module stack. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -666,7 +676,11 @@ Module stack. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -681,6 +695,8 @@ Module stack. M.alloc (| Value.StructRecord "p3_matrix::stack::HorizontalPair" + [] + [ First; Second ] [ ("first", M.read (| first |)); ("second", M.read (| second |)) ] |) |))) @@ -1026,6 +1042,11 @@ Module stack. M.alloc (| Value.StructTuple "p3_matrix::stack::EitherRow::Left" + [] + [ + Ty.associated_in_trait "p3_matrix::Matrix" [] [ T ] First "Row"; + Ty.associated_in_trait "p3_matrix::Matrix" [] [ T ] Second "Row" + ] [ M.call_closure (| Ty.associated_in_trait "p3_matrix::Matrix" [] [ T ] First "Row", @@ -1057,6 +1078,11 @@ Module stack. (M.alloc (| Value.StructTuple "p3_matrix::stack::EitherRow::Right" + [] + [ + Ty.associated_in_trait "p3_matrix::Matrix" [] [ T ] First "Row"; + Ty.associated_in_trait "p3_matrix::Matrix" [] [ T ] Second "Row" + ] [ M.call_closure (| Ty.associated_in_trait "p3_matrix::Matrix" [] [ T ] Second "Row", @@ -1193,6 +1219,21 @@ Module stack. M.alloc (| Value.StructTuple "p3_matrix::stack::EitherRow::Left" + [] + [ + Ty.associated_in_trait + "p3_matrix::Matrix" + [] + [ T ] + First + "{{synthetic}}'2"; + Ty.associated_in_trait + "p3_matrix::Matrix" + [] + [ T ] + Second + "{{synthetic}}'2" + ] [ M.call_closure (| Ty.associated_in_trait @@ -1229,6 +1270,21 @@ Module stack. (M.alloc (| Value.StructTuple "p3_matrix::stack::EitherRow::Right" + [] + [ + Ty.associated_in_trait + "p3_matrix::Matrix" + [] + [ T ] + First + "{{synthetic}}'2"; + Ty.associated_in_trait + "p3_matrix::Matrix" + [] + [ T ] + Second + "{{synthetic}}'2" + ] [ M.call_closure (| Ty.associated_in_trait diff --git a/CoqOfRust/plonky3/matrix/strided.v b/CoqOfRust/plonky3/matrix/strided.v index 13848bce5..93662ec0d 100644 --- a/CoqOfRust/plonky3/matrix/strided.v +++ b/CoqOfRust/plonky3/matrix/strided.v @@ -189,10 +189,14 @@ Module strided. M.alloc (| Value.StructRecord "p3_matrix::row_index_mapped::RowIndexMappedView" + [] + [ Ty.path "p3_matrix::strided::VerticallyStridedRowIndexMap"; Inner ] [ ("index_map", Value.StructRecord "p3_matrix::strided::VerticallyStridedRowIndexMap" + [] + [] [ ("height", M.read (| height |)); ("stride", M.read (| stride |)); diff --git a/CoqOfRust/plonky3/matrix/util.v b/CoqOfRust/plonky3/matrix/util.v index 304f98fae..7bb177469 100644 --- a/CoqOfRust/plonky3/matrix/util.v +++ b/CoqOfRust/plonky3/matrix/util.v @@ -719,6 +719,8 @@ Module util. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| h |)) ] ] @@ -949,6 +951,8 @@ Module util. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| upper |) |) |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -1004,6 +1008,8 @@ Module util. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| lower |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| w |)) ] ] |) diff --git a/CoqOfRust/plonky3/util/array_serialization.v b/CoqOfRust/plonky3/util/array_serialization.v index f0f6c58a4..c9cbd4545 100644 --- a/CoqOfRust/plonky3/util/array_serialization.v +++ b/CoqOfRust/plonky3/util/array_serialization.v @@ -655,6 +655,8 @@ Module array_serialization. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", N) ] ] |) @@ -925,6 +927,19 @@ Module array_serialization. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "array") + [ N ] + [ T ]; + Ty.associated_in_trait + "serde::de::SeqAccess" + [] + [] + A + "Error" + ] [ M.call_closure (| Ty.associated_in_trait @@ -1026,7 +1041,14 @@ Module array_serialization. |) in let arr := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| arr |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "array") [ N ] [ T ]; + Ty.associated_in_trait "serde::de::SeqAccess" [] [] A "Error" + ] + [ M.read (| arr |) ] |))); fun γ => ltac:(M.monadic @@ -1103,7 +1125,9 @@ Module array_serialization. N; Value.StructTuple "p3_util::array_serialization::ArrayVisitor" - [ Value.StructTuple "core::marker::PhantomData" [] ] + [ N ] + [ T ] + [ Value.StructTuple "core::marker::PhantomData" [] [ T ] [] ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/plonky3/util/lib.v b/CoqOfRust/plonky3/util/lib.v index 0a0dd0da9..7d8c254d9 100644 --- a/CoqOfRust/plonky3/util/lib.v +++ b/CoqOfRust/plonky3/util/lib.v @@ -170,7 +170,7 @@ Definition log2_strict_usize (ε : list Value.t) (τ : list Ty.t) (α : list Val [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -202,6 +202,8 @@ Definition log2_strict_usize (ε : list Value.t) (τ : list Ty.t) (α : list Val |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::fmt::Arguments" ] [ M.call_closure (| Ty.path "core::fmt::Arguments", @@ -973,6 +975,8 @@ Definition reverse_slice_index_bits (ε : list Value.t) (τ : list Ty.t) (α : l |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -1130,6 +1134,8 @@ Definition reverse_slice_index_bits_small [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -1337,6 +1343,8 @@ Definition reverse_slice_index_bits_small [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -1481,6 +1489,8 @@ Definition reverse_slice_index_bits_small [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -1778,6 +1788,8 @@ Definition reverse_slice_index_bits_chunks [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -2857,6 +2869,8 @@ Definition apply_to_chunks (ε : list Value.t) (τ : list Ty.t) (α : list Value M.pointer_coercion (M.borrow (| Pointer.Kind.Ref, buf |)); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| n |)) ] ] |) @@ -2998,7 +3012,11 @@ Definition flatten_to_base (ε : list Value.t) (τ : list Ty.t) (α : list Value [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple + "core::panicking::AssertKind::Eq" + [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -3028,7 +3046,11 @@ Definition flatten_to_base (ε : list Value.t) (τ : list Ty.t) (α : list Value |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/plonky3/util/linear_map.v b/CoqOfRust/plonky3/util/linear_map.v index d77a983e9..88652ff38 100644 --- a/CoqOfRust/plonky3/util/linear_map.v +++ b/CoqOfRust/plonky3/util/linear_map.v @@ -93,6 +93,8 @@ Module linear_map. ltac:(M.monadic (Value.StructTuple "p3_util::linear_map::LinearMap" + [] + [ K; V ] [ M.call_closure (| Ty.apply @@ -629,7 +631,7 @@ Module linear_map. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| v |) ] + Value.StructTuple "core::option::Option::Some" [] [ V ] [ M.read (| v |) ] |))); fun γ => ltac:(M.monadic @@ -659,7 +661,7 @@ Module linear_map. ] |) |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| Value.StructTuple "core::option::Option::None" [] [ V ] [] |))) ] |) |))) diff --git a/CoqOfRust/plonky3/util/transpose.v b/CoqOfRust/plonky3/util/transpose.v index cc253fd5f..d9da308c3 100644 --- a/CoqOfRust/plonky3/util/transpose.v +++ b/CoqOfRust/plonky3/util/transpose.v @@ -60,6 +60,8 @@ Module transpose. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -156,6 +158,8 @@ Module transpose. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| x |)); ("end_", M.read (| i |)) ] ] @@ -408,6 +412,8 @@ Module transpose. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| x |)); ("end_", @@ -499,6 +505,8 @@ Module transpose. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| y |)); ("end_", diff --git a/CoqOfRust/plonky3/util/zip_eq.v b/CoqOfRust/plonky3/util/zip_eq.v index 2bfe6df40..449573503 100644 --- a/CoqOfRust/plonky3/util/zip_eq.v +++ b/CoqOfRust/plonky3/util/zip_eq.v @@ -124,16 +124,26 @@ Module zip_eq. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ Ty.apply (Ty.path "p3_util::zip_eq::ZipEq") [] [ AIter; BIter ]; Error ] [ Value.StructRecord "p3_util::zip_eq::ZipEq" + [] + [ AIter; BIter ] [ ("a", M.read (| a_iter |)); ("b", M.read (| b_iter |)) ] ] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool false |) in - M.alloc (| Value.StructTuple "core::result::Result::Err" [ M.read (| err |) ] |))) + M.alloc (| + Value.StructTuple + "core::result::Result::Err" + [] + [ Ty.apply (Ty.path "p3_util::zip_eq::ZipEq") [] [ AIter; BIter ]; Error ] + [ M.read (| err |) ] + |))) ] |) |))) @@ -288,6 +298,24 @@ Module zip_eq. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + A + "Item"; + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + B + "Item" + ] + ] [ Value.Tuple [ M.read (| a |); M.read (| b |) ] ] |))); fun γ => @@ -296,7 +324,29 @@ Module zip_eq. let γ0_1 := M.SubPointer.get_tuple_field (| γ, 1 |) in let _ := M.is_struct_tuple (| γ0_0, "core::option::Option::None" |) in let _ := M.is_struct_tuple (| γ0_1, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + A + "Item"; + Ty.associated_in_trait + "core::iter::traits::iterator::Iterator" + [] + [] + B + "Item" + ] + ] + [] + |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -542,6 +592,8 @@ Module zip_eq. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -591,6 +643,8 @@ Module zip_eq. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/revm/revm_bytecode/bytecode.v b/CoqOfRust/revm/revm_bytecode/bytecode.v index aaa04660a..08079af7b 100644 --- a/CoqOfRust/revm/revm_bytecode/bytecode.v +++ b/CoqOfRust/revm/revm_bytecode/bytecode.v @@ -65,6 +65,8 @@ Module bytecode. M.alloc (| Value.StructTuple "revm_bytecode::bytecode::Bytecode::LegacyAnalyzed" + [] + [] [ M.call_closure (| Ty.path "revm_bytecode::legacy::analyzed::LegacyAnalyzedBytecode", @@ -94,6 +96,8 @@ Module bytecode. M.alloc (| Value.StructTuple "revm_bytecode::bytecode::Bytecode::Eof" + [] + [] [ M.call_closure (| Ty.apply @@ -130,6 +134,8 @@ Module bytecode. M.alloc (| Value.StructTuple "revm_bytecode::bytecode::Bytecode::Eip7702" + [] + [] [ M.call_closure (| Ty.path "revm_bytecode::eip7702::Eip7702Bytecode", @@ -1249,6 +1255,8 @@ Module bytecode. ltac:(M.monadic (Value.StructTuple "revm_bytecode::bytecode::Bytecode::LegacyAnalyzed" + [] + [] [ M.call_closure (| Ty.path "revm_bytecode::legacy::analyzed::LegacyAnalyzedBytecode", @@ -1316,6 +1324,13 @@ Module bytecode. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.path "revm_bytecode::legacy::jump_map::JumpTable" ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -1343,7 +1358,19 @@ Module bytecode. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.path "revm_bytecode::legacy::jump_map::JumpTable" ] + ] + [] + |))) ] |) |))) @@ -1501,10 +1528,41 @@ Module bytecode. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "alloc::sync::Arc") + [] + [ Ty.path "revm_bytecode::eof::Eof"; Ty.path "alloc::alloc::Global" + ] + ] + ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| eof |) |) |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "alloc::sync::Arc") + [] + [ Ty.path "revm_bytecode::eof::Eof"; Ty.path "alloc::alloc::Global" + ] + ] + ] + [] + |))) ] |) |))) @@ -1600,6 +1658,8 @@ Module bytecode. (let raw := M.alloc (| raw |) in Value.StructTuple "revm_bytecode::bytecode::Bytecode::LegacyAnalyzed" + [] + [] [ M.call_closure (| Ty.path "revm_bytecode::legacy::analyzed::LegacyAnalyzedBytecode", @@ -1612,6 +1672,8 @@ Module bytecode. [ Value.StructTuple "revm_bytecode::legacy::raw::LegacyRawBytecode" + [] + [] [ M.read (| raw |) ] ] |) @@ -1690,6 +1752,8 @@ Module bytecode. (let address := M.alloc (| address |) in Value.StructTuple "revm_bytecode::bytecode::Bytecode::Eip7702" + [] + [] [ M.call_closure (| Ty.path "revm_bytecode::eip7702::Eip7702Bytecode", @@ -1816,6 +1880,8 @@ Module bytecode. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 2) ] ] |) @@ -2014,9 +2080,16 @@ Module bytecode. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_bytecode::bytecode::Bytecode"; + Ty.path "revm_bytecode::decode_errors::BytecodeDecodeError" + ] [ Value.StructTuple "revm_bytecode::bytecode::Bytecode::Eof" + [] + [] [ M.call_closure (| Ty.apply @@ -2229,9 +2302,16 @@ Module bytecode. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_bytecode::bytecode::Bytecode"; + Ty.path "revm_bytecode::decode_errors::BytecodeDecodeError" + ] [ Value.StructTuple "revm_bytecode::bytecode::Bytecode::Eip7702" + [] + [] [ M.read (| eip7702 |) ] ] |))); @@ -2240,6 +2320,11 @@ Module bytecode. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_bytecode::bytecode::Bytecode"; + Ty.path "revm_bytecode::decode_errors::BytecodeDecodeError" + ] [ M.call_closure (| Ty.path "revm_bytecode::bytecode::Bytecode", @@ -2287,6 +2372,8 @@ Module bytecode. let jump_table := M.alloc (| jump_table |) in Value.StructTuple "revm_bytecode::bytecode::Bytecode::LegacyAnalyzed" + [] + [] [ M.call_closure (| Ty.path "revm_bytecode::legacy::analyzed::LegacyAnalyzedBytecode", diff --git a/CoqOfRust/revm/revm_bytecode/decode_errors.v b/CoqOfRust/revm/revm_bytecode/decode_errors.v index 90e8cc6bd..d3a471656 100644 --- a/CoqOfRust/revm/revm_bytecode/decode_errors.v +++ b/CoqOfRust/revm/revm_bytecode/decode_errors.v @@ -894,6 +894,8 @@ Module decode_errors. (let error := M.alloc (| error |) in Value.StructTuple "revm_bytecode::decode_errors::BytecodeDecodeError::Eof" + [] + [] [ M.read (| error |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -922,6 +924,8 @@ Module decode_errors. (let error := M.alloc (| error |) in Value.StructTuple "revm_bytecode::decode_errors::BytecodeDecodeError::Eip7702" + [] + [] [ M.read (| error |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/revm/revm_bytecode/eip7702.v b/CoqOfRust/revm/revm_bytecode/eip7702.v index 10432ea86..d9f802a1b 100644 --- a/CoqOfRust/revm/revm_bytecode/eip7702.v +++ b/CoqOfRust/revm/revm_bytecode/eip7702.v @@ -71,6 +71,8 @@ Module eip7702. (let self := M.alloc (| self |) in Value.StructRecord "revm_bytecode::eip7702::Eip7702Bytecode" + [] + [] [ ("delegated_address", M.call_closure (| @@ -1019,10 +1021,17 @@ Module eip7702. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_bytecode::eip7702::Eip7702Bytecode"; + Ty.path "revm_bytecode::eip7702::Eip7702DecodeError" + ] [ Value.StructTuple "revm_bytecode::eip7702::Eip7702DecodeError::InvalidLength" [] + [] + [] ] |) |) @@ -1172,10 +1181,17 @@ Module eip7702. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_bytecode::eip7702::Eip7702Bytecode"; + Ty.path "revm_bytecode::eip7702::Eip7702DecodeError" + ] [ Value.StructTuple "revm_bytecode::eip7702::Eip7702DecodeError::InvalidMagic" [] + [] + [] ] |) |) @@ -1260,10 +1276,17 @@ Module eip7702. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_bytecode::eip7702::Eip7702Bytecode"; + Ty.path "revm_bytecode::eip7702::Eip7702DecodeError" + ] [ Value.StructTuple "revm_bytecode::eip7702::Eip7702DecodeError::UnsupportedVersion" [] + [] + [] ] |) |) @@ -1275,9 +1298,16 @@ Module eip7702. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_bytecode::eip7702::Eip7702Bytecode"; + Ty.path "revm_bytecode::eip7702::Eip7702DecodeError" + ] [ Value.StructRecord "revm_bytecode::eip7702::Eip7702Bytecode" + [] + [] [ ("delegated_address", M.call_closure (| @@ -1414,6 +1444,8 @@ Module eip7702. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 3) ] ] |) @@ -1595,6 +1627,8 @@ Module eip7702. M.alloc (| Value.StructRecord "revm_bytecode::eip7702::Eip7702Bytecode" + [] + [] [ ("delegated_address", M.read (| address |)); ("version", diff --git a/CoqOfRust/revm/revm_bytecode/eof.v b/CoqOfRust/revm/revm_bytecode/eof.v index a60263f66..c38c91276 100644 --- a/CoqOfRust/revm/revm_bytecode/eof.v +++ b/CoqOfRust/revm/revm_bytecode/eof.v @@ -96,6 +96,8 @@ Module eof. (let self := M.alloc (| self |) in Value.StructRecord "revm_bytecode::eof::Eof" + [] + [] [ ("header", M.call_closure (| @@ -984,6 +986,8 @@ Module eof. M.alloc (| Value.StructRecord "revm_bytecode::eof::body::EofBody" + [] + [] [ ("types_section", M.call_closure (| @@ -1267,7 +1271,11 @@ Module eof. M.get_function (| "revm_bytecode::eof::verification::validate_eof_inner", [], [] |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); - Value.StructTuple "core::option::Option::Some" [ M.read (| mode |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "revm_bytecode::eof::verification::CodeType" ] + [ M.read (| mode |) ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1546,6 +1554,8 @@ Module eof. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| offset |)) ] ] |); @@ -1613,6 +1623,8 @@ Module eof. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -2221,10 +2233,21 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.path "revm_bytecode::eof::Eof"; + Ty.path "alloy_primitives::bytes_::Bytes" + ]; + Ty.path "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::MissingInput" [] + [] + [] ] |) |) @@ -2395,11 +2418,22 @@ Module eof. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple + [ + Ty.path "revm_bytecode::eof::Eof"; + Ty.path "alloy_primitives::bytes_::Bytes" + ]; + Ty.path "revm_bytecode::eof::EofDecodeError" + ] [ Value.Tuple [ Value.StructRecord "revm_bytecode::eof::Eof" + [] + [] [ ("header", M.read (| header |)); ("body", M.read (| body |)); @@ -2794,9 +2828,16 @@ Module eof. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_bytecode::eof::Eof"; + Ty.path "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructRecord "revm_bytecode::eof::Eof" + [] + [] [ ("header", M.read (| header |)); ("body", M.read (| body |)); diff --git a/CoqOfRust/revm/revm_bytecode/eof/body.v b/CoqOfRust/revm/revm_bytecode/eof/body.v index d48a37e9f..7faa842db 100644 --- a/CoqOfRust/revm/revm_bytecode/eof/body.v +++ b/CoqOfRust/revm/revm_bytecode/eof/body.v @@ -45,6 +45,8 @@ Module eof. (let self := M.alloc (| self |) in Value.StructRecord "revm_bytecode::eof::body::EofBody" + [] + [] [ ("types_section", M.call_closure (| @@ -488,6 +490,8 @@ Module eof. ltac:(M.monadic (Value.StructRecord "revm_bytecode::eof::body::EofBody" + [] + [] [ ("types_section", M.call_closure (| @@ -2039,6 +2043,8 @@ Module eof. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "alloy_primitives::bytes_::Bytes" ] [ M.call_closure (| Ty.path "alloy_primitives::bytes_::Bytes", @@ -2064,6 +2070,8 @@ Module eof. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -2229,6 +2237,8 @@ Module eof. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -2342,6 +2352,8 @@ Module eof. M.alloc (| Value.StructRecord "revm_bytecode::eof::header::EofHeader" + [] + [] [ ("types_size", M.call_closure (| @@ -3146,6 +3158,8 @@ Module eof. M.alloc (| Value.StructRecord "revm_bytecode::eof::Eof" + [] + [] [ ("header", M.read (| header |)); ("body", M.read (| self |)); @@ -3219,6 +3233,8 @@ Module eof. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ Value.Integer IntegerKind.Usize 0 ] |) |) @@ -4000,10 +4016,17 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_bytecode::eof::body::EofBody"; + Ty.path "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::MissingBodyWithoutData" [] + [] + [] ] |) |) @@ -4079,10 +4102,17 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_bytecode::eof::body::EofBody"; + Ty.path "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::DanglingData" [] + [] + [] ] |) |) @@ -4192,6 +4222,8 @@ Module eof. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| header_len |)) ] ] |) @@ -4217,6 +4249,8 @@ Module eof. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -4850,6 +4884,8 @@ Module eof. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| input |) |) |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", @@ -5150,6 +5186,8 @@ Module eof. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)); ("end_", @@ -5211,6 +5249,8 @@ Module eof. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| input |) |) |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| start |)) ] ] |) @@ -5279,7 +5319,16 @@ Module eof. |) |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| body |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.path "revm_bytecode::eof::body::EofBody"; + Ty.path "revm_bytecode::eof::EofDecodeError" + ] + [ M.read (| body |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/revm/revm_bytecode/eof/decode_helpers.v b/CoqOfRust/revm/revm_bytecode/eof/decode_helpers.v index dd451f3d5..ff9b0bba6 100644 --- a/CoqOfRust/revm/revm_bytecode/eof/decode_helpers.v +++ b/CoqOfRust/revm/revm_bytecode/eof/decode_helpers.v @@ -64,10 +64,24 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.path "u8" + ]; + Ty.path "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::MissingInput" [] + [] + [] ] |) |) @@ -79,6 +93,18 @@ Module eof. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.path "u8" + ]; + Ty.path "revm_bytecode::eof::EofDecodeError" + ] [ Value.Tuple [ @@ -114,6 +140,8 @@ Module eof. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1) ] ] |) @@ -209,10 +237,24 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.path "u16" + ]; + Ty.path "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::MissingInput" [] + [] + [] ] |) |) @@ -276,6 +318,18 @@ Module eof. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.path "u16" + ]; + Ty.path "revm_bytecode::eof::EofDecodeError" + ] [ Value.Tuple [ diff --git a/CoqOfRust/revm/revm_bytecode/eof/header.v b/CoqOfRust/revm/revm_bytecode/eof/header.v index 44ea6e3d6..8e91c765a 100644 --- a/CoqOfRust/revm/revm_bytecode/eof/header.v +++ b/CoqOfRust/revm/revm_bytecode/eof/header.v @@ -38,6 +38,8 @@ Module eof. (let self := M.alloc (| self |) in Value.StructRecord "revm_bytecode::eof::header::EofHeader" + [] + [] [ ("types_size", M.call_closure (| @@ -471,6 +473,8 @@ Module eof. ltac:(M.monadic (Value.StructRecord "revm_bytecode::eof::header::EofHeader" + [] + [] [ ("types_size", M.call_closure (| @@ -2179,10 +2183,30 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] + ]; + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ Ty.path "u16"; Ty.path "alloc::alloc::Global" + ]; + Ty.path "usize" + ]; + Ty.path "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::NonSizes" [] + [] + [] ] |) |) @@ -2245,10 +2269,30 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] + ]; + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ Ty.path "u16"; Ty.path "alloc::alloc::Global" + ]; + Ty.path "usize" + ]; + Ty.path "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::ShortInputForSizes" [] + [] + [] ] |) |) @@ -2312,6 +2356,8 @@ Module eof. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| num_sections |)) @@ -2467,10 +2513,39 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ Ty.path "u8" ] + ]; + Ty.apply + (Ty.path + "alloc::vec::Vec") + [] + [ + Ty.path "u16"; + Ty.path + "alloc::alloc::Global" + ]; + Ty.path "usize" + ]; + Ty.path + "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::ZeroSize" [] + [] + [] ] |) |) @@ -2532,6 +2607,22 @@ Module eof. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ]; + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ Ty.path "u16"; Ty.path "alloc::alloc::Global" ]; + Ty.path "usize" + ]; + Ty.path "revm_bytecode::eof::EofDecodeError" + ] [ Value.Tuple [ @@ -2567,6 +2658,8 @@ Module eof. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| byte_size |)) ] ] |) @@ -4162,10 +4255,29 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.path "revm_bytecode::eof::header::EofHeader"; + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ Ty.path "u8" ] + ] + ]; + Ty.path "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidEOFMagicNumber" [] + [] + [] ] |) |) @@ -4409,10 +4521,30 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.path + "revm_bytecode::eof::header::EofHeader"; + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ Ty.path "u8" ] + ] + ]; + Ty.path "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidEOFVersion" [] + [] + [] ] |) |) @@ -4675,10 +4807,31 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.path + "revm_bytecode::eof::header::EofHeader"; + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ Ty.path "u8" ] + ] + ]; + Ty.path + "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidTypesKind" [] + [] + [] ] |) |) @@ -4987,10 +5140,31 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.path + "revm_bytecode::eof::header::EofHeader"; + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ Ty.path "u8" ] + ] + ]; + Ty.path + "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidTypesSection" [] + [] + [] ] |) |) @@ -5300,10 +5474,35 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.path + "revm_bytecode::eof::header::EofHeader"; + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path + "slice") + [] + [ + Ty.path + "u8" + ] + ] + ]; + Ty.path + "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidCodeKind" [] + [] + [] ] |) |) @@ -5691,10 +5890,36 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.path + "revm_bytecode::eof::header::EofHeader"; + Ty.apply + (Ty.path + "&") + [] + [ + Ty.apply + (Ty.path + "slice") + [] + [ + Ty.path + "u8" + ] + ] + ]; + Ty.path + "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::TooManyCodeSections" [] + [] + [] ] |) |) @@ -5760,10 +5985,36 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.path + "revm_bytecode::eof::header::EofHeader"; + Ty.apply + (Ty.path + "&") + [] + [ + Ty.apply + (Ty.path + "slice") + [] + [ + Ty.path + "u8" + ] + ] + ]; + Ty.path + "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::ZeroCodeSections" [] + [] + [] ] |) |) @@ -5852,10 +6103,36 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.path + "revm_bytecode::eof::header::EofHeader"; + Ty.apply + (Ty.path + "&") + [] + [ + Ty.apply + (Ty.path + "slice") + [] + [ + Ty.path + "u8" + ] + ] + ]; + Ty.path + "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::MismatchCodeAndTypesSize" [] + [] + [] ] |) |) @@ -6690,10 +6967,36 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.path + "revm_bytecode::eof::header::EofHeader"; + Ty.apply + (Ty.path + "&") + [] + [ + Ty.apply + (Ty.path + "slice") + [] + [ + Ty.path + "u8" + ] + ] + ]; + Ty.path + "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::TooManyContainerSections" [] + [] + [] ] |) |) @@ -7131,10 +7434,36 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.path + "revm_bytecode::eof::header::EofHeader"; + Ty.apply + (Ty.path + "&") + [] + [ + Ty.apply + (Ty.path + "slice") + [] + [ + Ty.path + "u8" + ] + ] + ]; + Ty.path + "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidDataKind" [] + [] + [] ] |) |) @@ -7183,10 +7512,36 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.path + "revm_bytecode::eof::header::EofHeader"; + Ty.apply + (Ty.path + "&") + [] + [ + Ty.apply + (Ty.path + "slice") + [] + [ + Ty.path + "u8" + ] + ] + ]; + Ty.path + "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidKindAfterCode" [] + [] + [] ] |) |) @@ -7917,10 +8272,36 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + [ + Ty.path + "revm_bytecode::eof::header::EofHeader"; + Ty.apply + (Ty.path + "&") + [] + [ + Ty.apply + (Ty.path + "slice") + [] + [ + Ty.path + "u8" + ] + ] + ]; + Ty.path + "revm_bytecode::eof::EofDecodeError" + ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidTerminalByte" [] + [] + [] ] |) |) @@ -7938,6 +8319,30 @@ Module eof. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple + [ + Ty.path + "revm_bytecode::eof::header::EofHeader"; + Ty.apply + (Ty.path + "&") + [] + [ + Ty.apply + (Ty.path + "slice") + [] + [ + Ty.path + "u8" + ] + ] + ]; + Ty.path + "revm_bytecode::eof::EofDecodeError" + ] [ Value.Tuple [ diff --git a/CoqOfRust/revm/revm_bytecode/eof/links/body.v b/CoqOfRust/revm/revm_bytecode/eof/links/body.v index 65fd5c333..4ab53c3ae 100644 --- a/CoqOfRust/revm/revm_bytecode/eof/links/body.v +++ b/CoqOfRust/revm/revm_bytecode/eof/links/body.v @@ -27,7 +27,7 @@ Module EofBody. Global Instance IsLink : Link t := { Φ := Ty.path "revm_bytecode::eof::body::EofBody"; φ '(Build_t types_section code_section code container_section data_section is_data_filled) := - Value.StructRecord "revm_bytecode::eof::body::EofBody" [ + Value.StructRecord "revm_bytecode::eof::body::EofBody" [] [] [ ("types_section", φ types_section); ("code_section", φ code_section); ("code", φ code); @@ -54,7 +54,7 @@ Module EofBody. container_section' = φ container_section -> data_section' = φ data_section -> is_data_filled' = φ is_data_filled -> - Value.StructRecord "revm_bytecode::eof::body::EofBody" [ + Value.StructRecord "revm_bytecode::eof::body::EofBody" [] [] [ ("types_section", types_section'); ("code_section", code_section'); ("code", code'); @@ -73,7 +73,7 @@ Module EofBody. (data_section : Bytes.t) (is_data_filled : bool) : OfValue.t ( - Value.StructRecord "revm_bytecode::eof::body::EofBody" [ + Value.StructRecord "revm_bytecode::eof::body::EofBody" [] [] [ ("types_section", φ types_section); ("code_section", φ code_section); ("code", φ code); diff --git a/CoqOfRust/revm/revm_bytecode/eof/links/body_EofBody.v b/CoqOfRust/revm/revm_bytecode/eof/links/body_EofBody.v index 4aafeb5ca..f702b5a93 100644 --- a/CoqOfRust/revm/revm_bytecode/eof/links/body_EofBody.v +++ b/CoqOfRust/revm/revm_bytecode/eof/links/body_EofBody.v @@ -24,7 +24,7 @@ Module EofBody. Global Instance IsLink : Link t := { Φ := Ty.path "revm_bytecode::eof::body::EofBody"; φ '(Build_t types_section code_section code container_section data_section is_data_filled) := - Value.StructRecord "revm_bytecode::eof::body::EofBody" [ + Value.StructRecord "revm_bytecode::eof::body::EofBody" [] [] [ ("types_section", φ types_section); ("code_section", φ code_section); ("code", φ code); @@ -51,7 +51,7 @@ Module EofBody. container_section' = φ container_section -> data_section' = φ data_section -> is_data_filled' = φ is_data_filled -> - Value.StructRecord "revm_bytecode::eof::body::EofBody" [ + Value.StructRecord "revm_bytecode::eof::body::EofBody" [] [] [ ("types_section", types_section'); ("code_section", code_section'); ("code", code'); @@ -70,7 +70,7 @@ Module EofBody. (data_section : Bytes.t) (is_data_filled : bool) : OfValue.t ( - Value.StructRecord "revm_bytecode::eof::body::EofBody" [ + Value.StructRecord "revm_bytecode::eof::body::EofBody" [] [] [ ("types_section", φ types_section); ("code_section", φ code_section); ("code", φ code); diff --git a/CoqOfRust/revm/revm_bytecode/eof/links/header.v b/CoqOfRust/revm/revm_bytecode/eof/links/header.v index 1c6a94e82..59df1affe 100644 --- a/CoqOfRust/revm/revm_bytecode/eof/links/header.v +++ b/CoqOfRust/revm/revm_bytecode/eof/links/header.v @@ -18,7 +18,7 @@ Module EofHeader. Global Instance IsLink : Link t := { Φ := Ty.path "revm_bytecode::eof::header::EofHeader"; φ '(Build_t types_size code_sizes container_sizes data_size sum_code_sizes sum_container_sizes) := - Value.StructRecord "revm_bytecode::eof::header::EofHeader" [ + Value.StructRecord "revm_bytecode::eof::header::EofHeader" [] [] [ ("types_size", φ types_size); ("code_sizes", φ code_sizes); ("container_sizes", φ container_sizes); diff --git a/CoqOfRust/revm/revm_bytecode/eof/links/types_section.v b/CoqOfRust/revm/revm_bytecode/eof/links/types_section.v index ecccf385b..700b280e2 100644 --- a/CoqOfRust/revm/revm_bytecode/eof/links/types_section.v +++ b/CoqOfRust/revm/revm_bytecode/eof/links/types_section.v @@ -13,7 +13,7 @@ Module TypesSection. Global Instance IsLink : Link t := { Φ := Ty.path "revm_bytecode::eof::types_section::TypesSection"; φ '(Build_t inputs outputs max_stack_size) := - Value.StructRecord "revm_bytecode::eof::types_section::TypesSection" [ + Value.StructRecord "revm_bytecode::eof::types_section::TypesSection" [] [] [ ("inputs", φ inputs); ("outputs", φ outputs); ("max_stack_size", φ max_stack_size) @@ -28,7 +28,7 @@ Module TypesSection. inputs' = φ inputs -> outputs' = φ outputs -> max_stack_size' = φ max_stack_size -> - Value.StructRecord "revm_bytecode::eof::types_section::TypesSection" [ + Value.StructRecord "revm_bytecode::eof::types_section::TypesSection" [] [] [ ("inputs", inputs'); ("outputs", outputs'); ("max_stack_size", max_stack_size') @@ -43,7 +43,7 @@ Module TypesSection. inputs' = φ inputs -> outputs' = φ outputs -> max_stack_size' = φ max_stack_size -> - OfValue.t (Value.StructRecord "revm_bytecode::eof::types_section::TypesSection" [ + OfValue.t (Value.StructRecord "revm_bytecode::eof::types_section::TypesSection" [] [] [ ("inputs", inputs'); ("outputs", outputs'); ("max_stack_size", max_stack_size') diff --git a/CoqOfRust/revm/revm_bytecode/eof/printer.v b/CoqOfRust/revm/revm_bytecode/eof/printer.v index f8f1cb4a7..104db1346 100644 --- a/CoqOfRust/revm/revm_bytecode/eof/printer.v +++ b/CoqOfRust/revm/revm_bytecode/eof/printer.v @@ -499,6 +499,8 @@ Module eof. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| diff --git a/CoqOfRust/revm/revm_bytecode/eof/types_section.v b/CoqOfRust/revm/revm_bytecode/eof/types_section.v index 7bc14802f..d67b578a7 100644 --- a/CoqOfRust/revm/revm_bytecode/eof/types_section.v +++ b/CoqOfRust/revm/revm_bytecode/eof/types_section.v @@ -170,6 +170,8 @@ Module eof. ltac:(M.monadic (Value.StructRecord "revm_bytecode::eof::types_section::TypesSection" + [] + [] [ ("inputs", M.call_closure (| @@ -888,6 +890,8 @@ Module eof. let max_stack_size := M.alloc (| max_stack_size |) in Value.StructRecord "revm_bytecode::eof::types_section::TypesSection" + [] + [] [ ("inputs", M.read (| inputs |)); ("outputs", M.read (| outputs |)); @@ -1761,6 +1765,8 @@ Module eof. M.alloc (| Value.StructRecord "revm_bytecode::eof::types_section::TypesSection" + [] + [] [ ("inputs", M.read (| inputs |)); ("outputs", M.read (| outputs |)); @@ -1919,6 +1925,24 @@ Module eof. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple + [ + Ty.path + "revm_bytecode::eof::types_section::TypesSection"; + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "slice") + [] + [ Ty.path "u8" ] + ] + ]; + Ty.path "revm_bytecode::eof::EofDecodeError" + ] [ Value.Tuple [ @@ -2035,10 +2059,14 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "revm_bytecode::eof::EofDecodeError" ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidTypesSection" [] + [] + [] ] |) |) @@ -2088,10 +2116,14 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ Ty.tuple []; Ty.path "revm_bytecode::eof::EofDecodeError" ] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidTypesSection" [] + [] + [] ] |) |) @@ -2100,7 +2132,13 @@ Module eof. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "revm_bytecode::eof::EofDecodeError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/revm/revm_bytecode/eof/verification.v b/CoqOfRust/revm/revm_bytecode/eof/verification.v index b6b0f7fdc..b6617a2bf 100644 --- a/CoqOfRust/revm/revm_bytecode/eof/verification.v +++ b/CoqOfRust/revm/revm_bytecode/eof/verification.v @@ -26,7 +26,14 @@ Module eof. M.read (| raw |); Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_bytecode::eof::verification::CodeType::ReturnContract" [] + [] + [ Ty.path "revm_bytecode::eof::verification::CodeType" ] + [ + Value.StructTuple + "revm_bytecode::eof::verification::CodeType::ReturnContract" + [] + [] + [] ] ] |))) @@ -130,13 +137,22 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_bytecode::eof::Eof"; + Ty.path "revm_bytecode::eof::verification::EofError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofError::Decode" + [] + [] [ Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidEOFSize" [] + [] + [] ] ] |) @@ -379,7 +395,16 @@ Module eof. val)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| eof |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.path "revm_bytecode::eof::Eof"; + Ty.path "revm_bytecode::eof::verification::EofError" + ] + [ M.read (| eof |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -412,7 +437,14 @@ Module eof. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| eof |) |) |); Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_bytecode::eof::verification::CodeType::ReturnContract" [] + [] + [ Ty.path "revm_bytecode::eof::verification::CodeType" ] + [ + Value.StructTuple + "revm_bytecode::eof::verification::CodeType::ReturnContract" + [] + [] + [] ] ] |))) @@ -500,13 +532,22 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "revm_bytecode::eof::verification::EofError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofError::Validation" + [] + [] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::DataNotFilled" [] + [] + [] ] ] |) @@ -733,7 +774,14 @@ Module eof. ] |) in M.return_ (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path "revm_bytecode::eof::verification::EofError" + ] + [ Value.Tuple [] ] |) |) |) @@ -840,6 +888,8 @@ Module eof. [ Value.StructTuple "alloc::borrow::Cow::Borrowed" + [] + [ Ty.path "revm_bytecode::eof::Eof" ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| eof |) |) |) ]; M.read (| first_code_type |) ] @@ -1478,6 +1528,11 @@ Module eof. [ Value.StructTuple "alloc::borrow::Cow::Owned" + [] + [ + Ty.path + "revm_bytecode::eof::Eof" + ] [ M.read (| M.match_operator (| @@ -1661,6 +1716,11 @@ Module eof. ]; Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "revm_bytecode::eof::verification::CodeType" + ] [ M.read (| code_type |) ] ] ] @@ -1689,7 +1749,13 @@ Module eof. ] |))) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "revm_bytecode::eof::verification::EofError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1866,10 +1932,23 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path "revm_bytecode::eof::verification::CodeType"; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::InvalidTypesSection" [] + [] + [] ] |) |) @@ -1923,10 +2002,23 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path "revm_bytecode::eof::verification::CodeType"; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::NoCodeSections" [] + [] + [] ] |) |) @@ -2041,10 +2133,23 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path "revm_bytecode::eof::verification::CodeType"; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::InvalidTypesSection" [] + [] + [] ] |) |) @@ -2602,10 +2707,23 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path "revm_bytecode::eof::verification::CodeType"; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::CodeSectionNotAccessed" [] + [] + [] ] |) |) @@ -2831,10 +2949,23 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path "revm_bytecode::eof::verification::CodeType"; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::SubContainerNotAccessed" [] + [] + [] ] |) |) @@ -2887,10 +3018,14 @@ Module eof. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "revm_bytecode::eof::verification::CodeType" ] [ Value.StructTuple "revm_bytecode::eof::verification::CodeType::ReturnContract" [] + [] + [] ] |) |) @@ -2920,10 +3055,23 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path "revm_bytecode::eof::verification::CodeType"; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::DataNotFilled" [] + [] + [] ] |) |) @@ -2935,6 +3083,17 @@ Module eof. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloc::vec::Vec") + [] + [ + Ty.path "revm_bytecode::eof::verification::CodeType"; + Ty.path "alloc::alloc::Global" + ]; + Ty.path "revm_bytecode::eof::verification::EofValidationError" + ] [ M.call_closure (| Ty.apply @@ -4059,6 +4218,8 @@ Module eof. (let err := M.alloc (| err |) in Value.StructTuple "revm_bytecode::eof::verification::EofError::Decode" + [] + [] [ M.read (| err |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4087,6 +4248,8 @@ Module eof. (let err := M.alloc (| err |) in Value.StructTuple "revm_bytecode::eof::verification::EofError::Validation" + [] + [] [ M.read (| err |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -5477,6 +5640,8 @@ Module eof. (let self := M.alloc (| self |) in Value.StructRecord "revm_bytecode::eof::verification::AccessTracker" + [] + [] [ ("this_container_code_type", M.call_closure (| @@ -6110,6 +6275,8 @@ Module eof. M.alloc (| Value.StructRecord "revm_bytecode::eof::verification::AccessTracker" + [] + [] [ ("this_container_code_type", M.read (| this_container_code_type |)); ("codes", @@ -6161,7 +6328,11 @@ Module eof. ] |), [ - Value.StructTuple "core::option::Option::None" []; + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "revm_bytecode::eof::verification::CodeType" ] + []; M.read (| subcontainers_size |) ] |)) @@ -6556,10 +6727,18 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::SubContainerCalledInTwoModes" [] + [] + [] ] |) |) @@ -6569,7 +6748,15 @@ Module eof. ] |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path + "revm_bytecode::eof::verification::EofValidationError" + ] + [ Value.Tuple [] ] |))) ] |))) @@ -7890,10 +8077,18 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::OpcodeDisabled" [] + [] + [] ] |) |) @@ -8080,10 +8275,18 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::InstructionNotForwardAccessed" [] + [] + [] ] |) |) @@ -8230,10 +8433,18 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::MissingImmediateBytes" [] + [] + [] ] |) |) @@ -8268,6 +8479,8 @@ Module eof. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1); @@ -8711,10 +8924,18 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::StackUnderflow" [] + [] + [] ] |) |) @@ -8905,10 +9126,18 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::JumpUnderflow" [] + [] + [] ] |) |) @@ -8989,10 +9218,18 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::JumpOverflow" [] + [] + [] ] |) |) @@ -9107,10 +9344,18 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::BackwardJumpToImmediateBytes" [] + [] + [] ] |) |) @@ -9223,10 +9468,19 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + []; + Ty.path + "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::BackwardJumpBiggestNumMismatch" [] + [] + [] ] |) |) @@ -9286,10 +9540,19 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple + []; + Ty.path + "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::BackwardJumpSmallestNumMismatch" [] + [] + [] ] |) |) @@ -9505,10 +9768,17 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::NonReturningSectionIsReturning" [] + [] + [] ] |) |) @@ -9535,10 +9805,17 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::LastInstructionNotTerminating" [] + [] + [] ] |) |) @@ -9714,10 +9991,17 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::MaxStackMismatch" [] + [] + [] ] |) |) @@ -9726,7 +10010,13 @@ Module eof. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "revm_bytecode::eof::verification::EofValidationError" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -9969,10 +10259,18 @@ Module eof. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "revm_bytecode::eof::verification::EofValidationError" + ] [ Value.StructTuple "revm_bytecode::eof::verification::EofValidationError::JumpToImmediateBytes" [] + [] + [] ] |) |) @@ -9992,7 +10290,16 @@ Module eof. Value.Bool true |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path "revm_bytecode::eof::verification::EofValidationError" + ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -10024,6 +10331,8 @@ Module eof. ltac:(M.monadic (Value.StructRecord "revm_bytecode::eof::verification::validate_eof_code::InstructionInfo" + [] + [] [ ("is_immediate", Value.Bool false); ("is_jumpdest", Value.Bool false); diff --git a/CoqOfRust/revm/revm_bytecode/legacy/analyzed.v b/CoqOfRust/revm/revm_bytecode/legacy/analyzed.v index 377c50850..8805a8d96 100644 --- a/CoqOfRust/revm/revm_bytecode/legacy/analyzed.v +++ b/CoqOfRust/revm/revm_bytecode/legacy/analyzed.v @@ -27,6 +27,8 @@ Module legacy. (let self := M.alloc (| self |) in Value.StructRecord "revm_bytecode::legacy::analyzed::LegacyAnalyzedBytecode" + [] + [] [ ("bytecode", M.call_closure (| @@ -902,6 +904,8 @@ Module legacy. ltac:(M.monadic (Value.StructRecord "revm_bytecode::legacy::analyzed::LegacyAnalyzedBytecode" + [] + [] [ ("bytecode", M.call_closure (| @@ -930,6 +934,8 @@ Module legacy. ("jump_table", Value.StructTuple "revm_bytecode::legacy::jump_map::JumpTable" + [] + [] [ M.call_closure (| Ty.apply @@ -1084,6 +1090,8 @@ Module legacy. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -1138,6 +1146,8 @@ Module legacy. let jump_table := M.alloc (| jump_table |) in Value.StructRecord "revm_bytecode::legacy::analyzed::LegacyAnalyzedBytecode" + [] + [] [ ("bytecode", M.read (| bytecode |)); ("original_len", M.read (| original_len |)); @@ -1235,6 +1245,8 @@ Module legacy. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -1334,6 +1346,8 @@ Module legacy. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| diff --git a/CoqOfRust/revm/revm_bytecode/legacy/jump_map.v b/CoqOfRust/revm/revm_bytecode/legacy/jump_map.v index 07ba44f9b..194dea010 100644 --- a/CoqOfRust/revm/revm_bytecode/legacy/jump_map.v +++ b/CoqOfRust/revm/revm_bytecode/legacy/jump_map.v @@ -34,6 +34,8 @@ Module legacy. (let self := M.alloc (| self |) in Value.StructTuple "revm_bytecode::legacy::jump_map::JumpTable" + [] + [] [ M.call_closure (| Ty.apply @@ -103,6 +105,8 @@ Module legacy. ltac:(M.monadic (Value.StructTuple "revm_bytecode::legacy::jump_map::JumpTable" + [] + [] [ M.call_closure (| Ty.apply @@ -745,6 +749,8 @@ Module legacy. (let slice := M.alloc (| slice |) in Value.StructTuple "revm_bytecode::legacy::jump_map::JumpTable" + [] + [] [ M.call_closure (| Ty.apply diff --git a/CoqOfRust/revm/revm_bytecode/legacy/raw.v b/CoqOfRust/revm/revm_bytecode/legacy/raw.v index 7373452f4..7c4a40ff5 100644 --- a/CoqOfRust/revm/revm_bytecode/legacy/raw.v +++ b/CoqOfRust/revm/revm_bytecode/legacy/raw.v @@ -22,6 +22,8 @@ Module legacy. (let self := M.alloc (| self |) in Value.StructTuple "revm_bytecode::legacy::raw::LegacyRawBytecode" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bytes_::Bytes", @@ -725,6 +727,8 @@ Module legacy. (let bytes := M.alloc (| bytes |) in Value.StructTuple "revm_bytecode::legacy::raw::LegacyRawBytecode" + [] + [] [ M.read (| bytes |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -755,6 +759,8 @@ Module legacy. (let bytes := M.alloc (| bytes |) in Value.StructTuple "revm_bytecode::legacy::raw::LegacyRawBytecode" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bytes_::Bytes", @@ -885,6 +891,8 @@ Module legacy. M.alloc (| Value.StructTuple "revm_bytecode::legacy::jump_map::JumpTable" + [] + [] [ M.call_closure (| Ty.apply diff --git a/CoqOfRust/revm/revm_bytecode/links/eof.v b/CoqOfRust/revm/revm_bytecode/links/eof.v index 19c1bca35..e479a6f31 100644 --- a/CoqOfRust/revm/revm_bytecode/links/eof.v +++ b/CoqOfRust/revm/revm_bytecode/links/eof.v @@ -17,7 +17,7 @@ Module Eof. Global Instance IsLink : Link t := { Φ := Ty.path "revm_bytecode::eof::Eof"; φ '(Build_t header body raw) := - Value.StructRecord "revm_bytecode::eof::Eof" [ + Value.StructRecord "revm_bytecode::eof::Eof" [] [] [ ("header", φ header); ("body", φ body); ("raw", φ raw) @@ -32,7 +32,7 @@ Module Eof. header' = φ header -> body' = φ body -> raw' = φ raw -> - Value.StructRecord "revm_bytecode::eof::Eof" [ + Value.StructRecord "revm_bytecode::eof::Eof" [] [] [ ("header", header'); ("body", body'); ("raw", raw') @@ -47,7 +47,7 @@ Module Eof. header' = φ header -> body' = φ body -> raw' = φ raw -> - OfValue.t (Value.StructRecord "revm_bytecode::eof::Eof" [ + OfValue.t (Value.StructRecord "revm_bytecode::eof::Eof" [] [] [ ("header", header'); ("body", body'); ("raw", raw') @@ -127,26 +127,26 @@ Module EofDecodeError. Φ := Ty.path "revm_bytecode::eof::EofDecodeError"; φ x := match x with - | MissingInput => Value.StructTuple "revm_bytecode::eof::EofDecodeError::MissingInput" [] - | MissingBodyWithoutData => Value.StructTuple "revm_bytecode::eof::EofDecodeError::MissingBodyWithoutData" [] - | DanglingData => Value.StructTuple "revm_bytecode::eof::EofDecodeError::DanglingData" [] - | InvalidCodeInfo => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidCodeInfo" [] - | InvalidCodeInfoSize => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidCodeInfoSize" [] - | InvalidEOFMagicNumber => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidEOFMagicNumber" [] - | InvalidEOFVersion => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidEOFVersion" [] - | InvalidTypesKind => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidTypesKind" [] - | InvalidCodeKind => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidCodeKind" [] - | InvalidTerminalByte => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidTerminalByte" [] - | InvalidDataKind => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidDataKind" [] - | InvalidKindAfterCode => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidKindAfterCode" [] - | MismatchCodeAndInfoSize => Value.StructTuple "revm_bytecode::eof::EofDecodeError::MismatchCodeAndInfoSize" [] - | NonSizes => Value.StructTuple "revm_bytecode::eof::EofDecodeError::NonSizes" [] - | ShortInputForSizes => Value.StructTuple "revm_bytecode::eof::EofDecodeError::ShortInputForSizes" [] - | ZeroSize => Value.StructTuple "revm_bytecode::eof::EofDecodeError::ZeroSize" [] - | TooManyCodeSections => Value.StructTuple "revm_bytecode::eof::EofDecodeError::TooManyCodeSections" [] - | ZeroCodeSections => Value.StructTuple "revm_bytecode::eof::EofDecodeError::ZeroCodeSections" [] - | TooManyContainerSections => Value.StructTuple "revm_bytecode::eof::EofDecodeError::TooManyContainerSections" [] - | InvalidEOFSize => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidEOFSize" [] + | MissingInput => Value.StructTuple "revm_bytecode::eof::EofDecodeError::MissingInput" [] [] [] + | MissingBodyWithoutData => Value.StructTuple "revm_bytecode::eof::EofDecodeError::MissingBodyWithoutData" [] [] [] + | DanglingData => Value.StructTuple "revm_bytecode::eof::EofDecodeError::DanglingData" [] [] [] + | InvalidCodeInfo => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidCodeInfo" [] [] [] + | InvalidCodeInfoSize => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidCodeInfoSize" [] [] [] + | InvalidEOFMagicNumber => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidEOFMagicNumber" [] [] [] + | InvalidEOFVersion => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidEOFVersion" [] [] [] + | InvalidTypesKind => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidTypesKind" [] [] [] + | InvalidCodeKind => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidCodeKind" [] [] [] + | InvalidTerminalByte => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidTerminalByte" [] [] [] + | InvalidDataKind => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidDataKind" [] [] [] + | InvalidKindAfterCode => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidKindAfterCode" [] [] [] + | MismatchCodeAndInfoSize => Value.StructTuple "revm_bytecode::eof::EofDecodeError::MismatchCodeAndInfoSize" [] [] [] + | NonSizes => Value.StructTuple "revm_bytecode::eof::EofDecodeError::NonSizes" [] [] [] + | ShortInputForSizes => Value.StructTuple "revm_bytecode::eof::EofDecodeError::ShortInputForSizes" [] [] [] + | ZeroSize => Value.StructTuple "revm_bytecode::eof::EofDecodeError::ZeroSize" [] [] [] + | TooManyCodeSections => Value.StructTuple "revm_bytecode::eof::EofDecodeError::TooManyCodeSections" [] [] [] + | ZeroCodeSections => Value.StructTuple "revm_bytecode::eof::EofDecodeError::ZeroCodeSections" [] [] [] + | TooManyContainerSections => Value.StructTuple "revm_bytecode::eof::EofDecodeError::TooManyContainerSections" [] [] [] + | InvalidEOFSize => Value.StructTuple "revm_bytecode::eof::EofDecodeError::InvalidEOFSize" [] [] [] end; }. diff --git a/CoqOfRust/revm/revm_bytecode/links/opcode.v b/CoqOfRust/revm/revm_bytecode/links/opcode.v index 64fd91439..1708ebdef 100644 --- a/CoqOfRust/revm/revm_bytecode/links/opcode.v +++ b/CoqOfRust/revm/revm_bytecode/links/opcode.v @@ -10,7 +10,7 @@ Module OpCode. Global Instance IsLink : Link t := { Φ := Ty.path "revm_bytecode::opcode::OpCode"; - φ x := Value.StructTuple "revm_bytecode::opcode::OpCode" [φ x.(value)]; + φ x := Value.StructTuple "revm_bytecode::opcode::OpCode" [] [] [φ x.(value)]; }. Definition of_ty : OfTy.t (Ty.path "revm_bytecode::opcode::OpCode"). @@ -19,13 +19,13 @@ Module OpCode. Lemma of_value_with value value' : value' = φ value -> - Value.StructTuple "revm_bytecode::opcode::OpCode" [value'] = φ (Build_t value). + Value.StructTuple "revm_bytecode::opcode::OpCode" [] [] [value'] = φ (Build_t value). Proof. now intros; subst. Qed. Smpl Add apply of_value_with : of_value. Definition of_value (value : U8.t) value' : value' = φ value -> - OfValue.t (Value.StructTuple "revm_bytecode::opcode::OpCode" [value']). + OfValue.t (Value.StructTuple "revm_bytecode::opcode::OpCode" [] [] [value']). Proof. econstructor; apply of_value_with; eassumption. Defined. Smpl Add eapply of_value : of_value. diff --git a/CoqOfRust/revm/revm_bytecode/opcode.v b/CoqOfRust/revm/revm_bytecode/opcode.v index 7ca8d8c15..771bbeacc 100644 --- a/CoqOfRust/revm/revm_bytecode/opcode.v +++ b/CoqOfRust/revm/revm_bytecode/opcode.v @@ -118,6 +118,8 @@ Module opcode. ltac:(M.monadic (Value.StructTuple "revm_bytecode::opcode::OpCode" + [] + [] [ M.call_closure (| Ty.path "u8", @@ -583,13 +585,19 @@ Module opcode. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 8; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Is" + [] + [] [ Value.Integer IntegerKind.Usize 2 ] ] |) @@ -682,13 +690,26 @@ Module opcode. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_bytecode::opcode::OpCode" [ M.read (| opcode |) ] + [] + [ Ty.path "revm_bytecode::opcode::OpCode" ] + [ + Value.StructTuple + "revm_bytecode::opcode::OpCode" + [] + [] + [ M.read (| opcode |) ] ] |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::option::Option::None" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "revm_bytecode::opcode::OpCode" ] + [] + |))) ] |) |))) @@ -968,7 +989,7 @@ Module opcode. | [], [], [ opcode ] => ltac:(M.monadic (let opcode := M.alloc (| opcode |) in - Value.StructTuple "revm_bytecode::opcode::OpCode" [ M.read (| opcode |) ])) + Value.StructTuple "revm_bytecode::opcode::OpCode" [] [] [ M.read (| opcode |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1272,6 +1293,8 @@ Module opcode. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "revm_bytecode::opcode::OpCodeInfo" ] [ M.call_closure (| Ty.path "revm_bytecode::opcode::OpCodeInfo", @@ -1286,7 +1309,14 @@ Module opcode. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "revm_bytecode::opcode::OpCodeInfo" ] + [] + |))) ] |) |))) @@ -1515,7 +1545,7 @@ Module opcode. Definition value_STOP (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.alloc (| - Value.StructTuple "revm_bytecode::opcode::OpCode" [ Value.Integer IntegerKind.U8 0 ] + Value.StructTuple "revm_bytecode::opcode::OpCode" [] [] [ Value.Integer IntegerKind.U8 0 ] |))). Global Instance AssociatedConstant_value_STOP : M.IsAssociatedFunction.C Self "STOP" value_STOP. @@ -1527,7 +1557,7 @@ Module opcode. Definition value_ADD (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.alloc (| - Value.StructTuple "revm_bytecode::opcode::OpCode" [ Value.Integer IntegerKind.U8 1 ] + Value.StructTuple "revm_bytecode::opcode::OpCode" [] [] [ Value.Integer IntegerKind.U8 1 ] |))). Global Instance AssociatedConstant_value_ADD : M.IsAssociatedFunction.C Self "ADD" value_ADD. @@ -1539,7 +1569,11 @@ Module opcode. Definition value_BALANCE (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.alloc (| - Value.StructTuple "revm_bytecode::opcode::OpCode" [ Value.Integer IntegerKind.U8 49 ] + Value.StructTuple + "revm_bytecode::opcode::OpCode" + [] + [] + [ Value.Integer IntegerKind.U8 49 ] |))). Global Instance AssociatedConstant_value_BALANCE : @@ -3508,6 +3542,8 @@ Module opcode. M.alloc (| Value.StructRecord "revm_bytecode::opcode::OpCodeInfo" + [] + [] [ ("name_ptr", M.call_closure (| @@ -3995,7 +4031,11 @@ Module opcode. ] := M.alloc (| repeat (| - Value.StructTuple "core::option::Option::None" [], + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "revm_bytecode::opcode::OpCodeInfo" ] + [], Value.Integer IntegerKind.Usize 256 |) |) in @@ -4101,7 +4141,11 @@ Module opcode. M.alloc (| M.write (| M.SubPointer.get_array_field (| map, Value.Integer IntegerKind.Usize 0 |), - Value.StructTuple "core::option::Option::Some" [ M.read (| info |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "revm_bytecode::opcode::OpCodeInfo" ] + [ M.read (| info |) ] |) |) in let~ val : Ty.apply (Ty.path "*") [] [ Ty.path "u8" ] := @@ -4196,7 +4240,11 @@ Module opcode. M.alloc (| M.write (| M.SubPointer.get_array_field (| map, Value.Integer IntegerKind.Usize 1 |), - Value.StructTuple "core::option::Option::Some" [ M.read (| info |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "revm_bytecode::opcode::OpCodeInfo" ] + [ M.read (| info |) ] |) |) in let~ val : Ty.apply (Ty.path "*") [] [ Ty.path "u8" ] := @@ -4291,7 +4339,11 @@ Module opcode. M.alloc (| M.write (| M.SubPointer.get_array_field (| map, Value.Integer IntegerKind.Usize 49 |), - Value.StructTuple "core::option::Option::Some" [ M.read (| info |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "revm_bytecode::opcode::OpCodeInfo" ] + [ M.read (| info |) ] |) |) in M.match_operator (| @@ -4324,6 +4376,8 @@ Module opcode. M.alloc (| Value.StructRecord "phf::map::Map" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ]; Ty.path "revm_bytecode::opcode::OpCode" ] [ ("key", Value.Integer IntegerKind.U64 15467950696543387533); ("disps", diff --git a/CoqOfRust/revm/revm_bytecode/opcode/parse.v b/CoqOfRust/revm/revm_bytecode/opcode/parse.v index 8b825ad81..85fa8a93c 100644 --- a/CoqOfRust/revm/revm_bytecode/opcode/parse.v +++ b/CoqOfRust/revm/revm_bytecode/opcode/parse.v @@ -262,7 +262,11 @@ Module opcode. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| s |) |) |) ] |); - Value.StructTuple "revm_bytecode::opcode::parse::OpCodeError" [ Value.Tuple [] ] + Value.StructTuple + "revm_bytecode::opcode::parse::OpCodeError" + [] + [] + [ Value.Tuple [] ] ] |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/revm/revm_context_interface/block/blob.v b/CoqOfRust/revm/revm_context_interface/block/blob.v index 73249d339..a82e0a630 100644 --- a/CoqOfRust/revm/revm_context_interface/block/blob.v +++ b/CoqOfRust/revm/revm_context_interface/block/blob.v @@ -385,6 +385,8 @@ Module block. M.alloc (| Value.StructRecord "revm_context_interface::block::blob::BlobExcessGasAndPrice" + [] + [] [ ("excess_blob_gas", M.read (| excess_blob_gas |)); ("blob_gasprice", M.read (| blob_gasprice |)) @@ -549,7 +551,7 @@ Module block. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Ne" [] + Value.StructTuple "core::panicking::AssertKind::Ne" [] [] [] |) in M.alloc (| M.call_closure (| @@ -581,6 +583,8 @@ Module block. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::fmt::Arguments" ] [ M.call_closure (| Ty.path "core::fmt::Arguments", diff --git a/CoqOfRust/revm/revm_context_interface/block/links/blob.v b/CoqOfRust/revm/revm_context_interface/block/links/blob.v index 73e9c3ae5..ede08dab1 100644 --- a/CoqOfRust/revm/revm_context_interface/block/links/blob.v +++ b/CoqOfRust/revm/revm_context_interface/block/links/blob.v @@ -16,7 +16,7 @@ Module BlobExcessGasAndPrice. Global Instance IsLink : Link t := { Φ := Ty.path "revm_context_interface::block::BlobExcessGasAndPrice"; φ '(Build_t excess_blob_gas blob_gasprice) := - Value.StructRecord "revm_context_interface::block::BlobExcessGasAndPrice" [ + Value.StructRecord "revm_context_interface::block::BlobExcessGasAndPrice" [] [] [ ("excess_blob_gas", φ excess_blob_gas); ("blob_gasprice", φ blob_gasprice) ] @@ -31,7 +31,7 @@ Module BlobExcessGasAndPrice. blob_gasprice blob_gasprice' : excess_blob_gas' = φ excess_blob_gas -> blob_gasprice' = φ blob_gasprice -> - Value.StructRecord "revm_context_interface::block::BlobExcessGasAndPrice" [ + Value.StructRecord "revm_context_interface::block::BlobExcessGasAndPrice" [] [] [ ("excess_blob_gas", excess_blob_gas'); ("blob_gasprice", blob_gasprice') ] = @@ -45,7 +45,7 @@ Module BlobExcessGasAndPrice. excess_blob_gas' = φ excess_blob_gas -> blob_gasprice' = φ blob_gasprice -> OfValue.t ( - Value.StructRecord "revm_context_interface::block::BlobExcessGasAndPrice" [ + Value.StructRecord "revm_context_interface::block::BlobExcessGasAndPrice" [] [] [ ("excess_blob_gas", excess_blob_gas'); ("blob_gasprice", blob_gasprice') ] diff --git a/CoqOfRust/revm/revm_context_interface/cfg.v b/CoqOfRust/revm/revm_context_interface/cfg.v index 6b5fb7b32..865393edb 100644 --- a/CoqOfRust/revm/revm_context_interface/cfg.v +++ b/CoqOfRust/revm/revm_context_interface/cfg.v @@ -1705,7 +1705,7 @@ Module cfg. let _ := M.is_struct_tuple (| γ, "revm_context_interface::cfg::AnalysisKind::Raw" |) in M.alloc (| - Value.StructTuple "revm_context_interface::cfg::AnalysisKind::Raw" [] + Value.StructTuple "revm_context_interface::cfg::AnalysisKind::Raw" [] [] [] |))); fun γ => ltac:(M.monadic @@ -1716,7 +1716,11 @@ Module cfg. "revm_context_interface::cfg::AnalysisKind::Analyse" |) in M.alloc (| - Value.StructTuple "revm_context_interface::cfg::AnalysisKind::Analyse" [] + Value.StructTuple + "revm_context_interface::cfg::AnalysisKind::Analyse" + [] + [] + [] |))) ] |) @@ -1740,7 +1744,8 @@ Module cfg. Definition default (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with | [], [], [] => - ltac:(M.monadic (Value.StructTuple "revm_context_interface::cfg::AnalysisKind::Analyse" [])) + ltac:(M.monadic + (Value.StructTuple "revm_context_interface::cfg::AnalysisKind::Analyse" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/revm/revm_context_interface/host.v b/CoqOfRust/revm/revm_context_interface/host.v index 0ca687687..329e7220f 100644 --- a/CoqOfRust/revm/revm_context_interface/host.v +++ b/CoqOfRust/revm/revm_context_interface/host.v @@ -958,6 +958,8 @@ Module host. (let self := M.alloc (| self |) in Value.StructRecord "revm_context_interface::host::SStoreResult" + [] + [] [ ("original_value", M.call_closure (| @@ -1175,6 +1177,8 @@ Module host. ltac:(M.monadic (Value.StructRecord "revm_context_interface::host::SStoreResult" + [] + [] [ ("original_value", M.call_closure (| @@ -1752,6 +1756,8 @@ Module host. (let self := M.alloc (| self |) in Value.StructRecord "revm_context_interface::host::SelfDestructResult" + [] + [] [ ("had_value", M.call_closure (| @@ -1951,6 +1957,8 @@ Module host. ltac:(M.monadic (Value.StructRecord "revm_context_interface::host::SelfDestructResult" + [] + [] [ ("had_value", M.call_closure (| diff --git a/CoqOfRust/revm/revm_context_interface/host/dummy.v b/CoqOfRust/revm/revm_context_interface/host/dummy.v index 7dc823878..8126d07a8 100644 --- a/CoqOfRust/revm/revm_context_interface/host/dummy.v +++ b/CoqOfRust/revm/revm_context_interface/host/dummy.v @@ -77,6 +77,8 @@ Module host. (let self := M.alloc (| self |) in Value.StructRecord "revm_context_interface::host::dummy::DummyHost" + [] + [ BLOCK; TX; CFG ] [ ("tx", M.call_closure (| @@ -556,6 +558,8 @@ Module host. ltac:(M.monadic (Value.StructRecord "revm_context_interface::host::dummy::DummyHost" + [] + [ BLOCK; TX; CFG ] [ ("tx", M.call_closure (| @@ -763,6 +767,8 @@ Module host. let block := M.alloc (| block |) in Value.StructRecord "revm_context_interface::host::dummy::DummyHost" + [] + [ BLOCK; TX; CFG ] [ ("tx", M.read (| tx |)); ("block", M.read (| block |)); @@ -1188,6 +1194,8 @@ Module host. let _address := M.alloc (| _address |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "revm_context_interface::journaled_state::AccountLoad" ] [ M.call_closure (| Ty.path "revm_context_interface::journaled_state::AccountLoad", @@ -1225,6 +1233,13 @@ Module host. let _number := M.alloc (| _number |) in Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::bits::fixed::FixedBytes") + [ Value.Integer IntegerKind.Usize 32 ] + [] + ] [ M.read (| get_associated_constant (| @@ -1262,6 +1277,18 @@ Module host. let _address := M.alloc (| _address |) in Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "revm_context_interface::journaled_state::StateLoad") + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ Value.Integer IntegerKind.Usize 256; Value.Integer IntegerKind.Usize 4 ] + [] + ] + ] [ M.call_closure (| Ty.apply @@ -1315,6 +1342,13 @@ Module host. let _address := M.alloc (| _address |) in Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "revm_context_interface::journaled_state::Eip7702CodeLoad") + [] + [ Ty.path "alloy_primitives::bytes_::Bytes" ] + ] [ M.call_closure (| Ty.apply @@ -1358,6 +1392,18 @@ Module host. let _address := M.alloc (| _address |) in Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "revm_context_interface::journaled_state::Eip7702CodeLoad") + [] + [ + Ty.apply + (Ty.path "alloy_primitives::bits::fixed::FixedBytes") + [ Value.Integer IntegerKind.Usize 32 ] + [] + ] + ] [ M.call_closure (| Ty.apply @@ -1513,6 +1559,21 @@ Module host. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "revm_context_interface::journaled_state::StateLoad") + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ + Value.Integer IntegerKind.Usize 256; + Value.Integer IntegerKind.Usize 4 + ] + [] + ] + ] [ M.call_closure (| Ty.apply @@ -1689,6 +1750,21 @@ Module host. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "revm_context_interface::journaled_state::StateLoad") + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ + Value.Integer IntegerKind.Usize 256; + Value.Integer IntegerKind.Usize 4 + ] + [] + ] + ] [ M.call_closure (| Ty.apply @@ -1850,13 +1926,24 @@ Module host. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "revm_context_interface::journaled_state::StateLoad") + [] + [ Ty.path "revm_context_interface::host::SStoreResult" ] + ] [ Value.StructRecord "revm_context_interface::journaled_state::StateLoad" + [] + [ Ty.path "revm_context_interface::host::SStoreResult" ] [ ("data", Value.StructRecord "revm_context_interface::host::SStoreResult" + [] + [] [ ("original_value", M.read (| @@ -2265,6 +2352,13 @@ Module host. let _target := M.alloc (| _target |) in Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "revm_context_interface::journaled_state::StateLoad") + [] + [ Ty.path "revm_context_interface::host::SelfDestructResult" ] + ] [ M.call_closure (| Ty.apply diff --git a/CoqOfRust/revm/revm_context_interface/journaled_state.v b/CoqOfRust/revm/revm_context_interface/journaled_state.v index 6220e5ef8..8634924d0 100644 --- a/CoqOfRust/revm/revm_context_interface/journaled_state.v +++ b/CoqOfRust/revm/revm_context_interface/journaled_state.v @@ -563,6 +563,8 @@ Module journaled_state. (let self := M.alloc (| self |) in Value.StructRecord "revm_context_interface::journaled_state::StateLoad" + [] + [ T ] [ ("data", M.call_closure (| @@ -716,6 +718,8 @@ Module journaled_state. ltac:(M.monadic (Value.StructRecord "revm_context_interface::journaled_state::StateLoad" + [] + [ T ] [ ("data", M.call_closure (| @@ -990,6 +994,8 @@ Module journaled_state. let is_cold := M.alloc (| is_cold |) in Value.StructRecord "revm_context_interface::journaled_state::StateLoad" + [] + [ T ] [ ("data", M.read (| data |)); ("is_cold", M.read (| is_cold |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1095,6 +1101,8 @@ Module journaled_state. (let self := M.alloc (| self |) in Value.StructRecord "revm_context_interface::journaled_state::AccountLoad" + [] + [] [ ("load", M.call_closure (| @@ -1256,6 +1264,8 @@ Module journaled_state. ltac:(M.monadic (Value.StructRecord "revm_context_interface::journaled_state::AccountLoad" + [] + [] [ ("load", M.call_closure (| @@ -1557,6 +1567,8 @@ Module journaled_state. (let self := M.alloc (| self |) in Value.StructRecord "revm_context_interface::journaled_state::Eip7702CodeLoad" + [] + [ T ] [ ("state_load", M.call_closure (| @@ -1724,6 +1736,8 @@ Module journaled_state. ltac:(M.monadic (Value.StructRecord "revm_context_interface::journaled_state::Eip7702CodeLoad" + [] + [ T ] [ ("state_load", M.call_closure (| @@ -2036,9 +2050,12 @@ Module journaled_state. (let state_load := M.alloc (| state_load |) in Value.StructRecord "revm_context_interface::journaled_state::Eip7702CodeLoad" + [] + [ T ] [ ("state_load", M.read (| state_load |)); - ("is_delegate_account_cold", Value.StructTuple "core::option::Option::None" []) + ("is_delegate_account_cold", + Value.StructTuple "core::option::Option::None" [] [ Ty.path "bool" ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2071,6 +2088,8 @@ Module journaled_state. let is_cold := M.alloc (| is_cold |) in Value.StructRecord "revm_context_interface::journaled_state::Eip7702CodeLoad" + [] + [ T ] [ ("state_load", M.call_closure (| @@ -2086,7 +2105,8 @@ Module journaled_state. |), [ M.read (| data |); M.read (| is_cold |) ] |)); - ("is_delegate_account_cold", Value.StructTuple "core::option::Option::None" []) + ("is_delegate_account_cold", + Value.StructTuple "core::option::Option::None" [] [ Ty.path "bool" ] []) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2170,6 +2190,8 @@ Module journaled_state. |); Value.StructRecord "revm_context_interface::journaled_state::Eip7702CodeLoad" + [] + [ Ty.tuple [] ] [ ("state_load", M.call_closure (| @@ -2237,6 +2259,8 @@ Module journaled_state. |), Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "bool" ] [ M.read (| is_delegate_account_cold |) ] |) |) in @@ -2268,11 +2292,15 @@ Module journaled_state. let is_delegate_account_cold := M.alloc (| is_delegate_account_cold |) in Value.StructRecord "revm_context_interface::journaled_state::Eip7702CodeLoad" + [] + [ T ] [ ("state_load", M.read (| state_load |)); ("is_delegate_account_cold", Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "bool" ] [ M.read (| is_delegate_account_cold |) ]) ])) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/revm/revm_context_interface/links/cfg.v b/CoqOfRust/revm/revm_context_interface/links/cfg.v index 21c559e9e..ccb8497da 100644 --- a/CoqOfRust/revm/revm_context_interface/links/cfg.v +++ b/CoqOfRust/revm/revm_context_interface/links/cfg.v @@ -21,9 +21,9 @@ Module CreateScheme. Φ := Ty.path "revm_context_interface::cfg::CreateScheme"; φ x := match x with - | Create => Value.StructTuple "revm_context_interface::cfg::CreateScheme::Create" [] + | Create => Value.StructTuple "revm_context_interface::cfg::CreateScheme::Create" [] [] [] | Create2 x => - Value.StructRecord "revm_context_interface::cfg::CreateScheme::Create2" [ + Value.StructRecord "revm_context_interface::cfg::CreateScheme::Create2" [] [] [ ("salt", φ x) ] end; @@ -34,26 +34,26 @@ Module CreateScheme. Smpl Add apply of_ty : of_ty. Lemma of_value_with_Create : - Value.StructTuple "revm_context_interface::cfg::CreateScheme::Create" [] = φ Create. + Value.StructTuple "revm_context_interface::cfg::CreateScheme::Create" [] [] [] = φ Create. Proof. reflexivity. Qed. Smpl Add apply of_value_with_Create : of_value. Lemma of_value_with_Create2 (x : aliases.U256.t) x' : x' = φ x -> - Value.StructRecord "revm_context_interface::cfg::CreateScheme::Create2" [ + Value.StructRecord "revm_context_interface::cfg::CreateScheme::Create2" [] [] [ ("salt", x') ] = φ (Create2 x). Proof. now intros; subst. Qed. Smpl Add eapply of_value_with_Create2 : of_value. Definition of_value_Create : - OfValue.t (Value.StructTuple "revm_context_interface::cfg::CreateScheme::Create" []). + OfValue.t (Value.StructTuple "revm_context_interface::cfg::CreateScheme::Create" [] [] []). Proof. eapply OfValue.Make; apply of_value_with_Create. Defined. Smpl Add apply of_value_Create : of_value. Definition of_value_Create2 (x : aliases.U256.t) x' : x' = φ x -> - OfValue.t (Value.StructRecord "revm_context_interface::cfg::CreateScheme::Create2" [ + OfValue.t (Value.StructRecord "revm_context_interface::cfg::CreateScheme::Create2" [] [] [ ("salt", x') ]). Proof. intros; eapply OfValue.Make with (A := t); apply of_value_with_Create2; eassumption. Defined. diff --git a/CoqOfRust/revm/revm_context_interface/links/journaled_state.v b/CoqOfRust/revm/revm_context_interface/links/journaled_state.v index aea4c2bff..8b4ba8b9f 100644 --- a/CoqOfRust/revm/revm_context_interface/links/journaled_state.v +++ b/CoqOfRust/revm/revm_context_interface/links/journaled_state.v @@ -19,7 +19,7 @@ Module StateLoad. Global Instance IsLink {T : Set} `{Link T} : Link (t T) := { Φ := Ty.apply (Ty.path "revm_context_interface::journaled_state::StateLoad") [] [Φ T]; φ x := - Value.StructRecord "revm_context_interface::journaled_state::StateLoad" [ + Value.StructRecord "revm_context_interface::journaled_state::StateLoad" [] [] [ ("data", φ x.(data)); ("is_cold", φ x.(is_cold)) ]; @@ -40,7 +40,7 @@ Module StateLoad. (is_cold : bool) is_cold' : data' = φ data -> is_cold' = φ is_cold -> - Value.StructRecord "revm_context_interface::journaled_state::StateLoad" [ + Value.StructRecord "revm_context_interface::journaled_state::StateLoad" [] [] [ ("data", data'); ("is_cold", is_cold') ] = φ (Build_t _ data is_cold). @@ -97,7 +97,7 @@ Module Eip7702CodeLoad. { Φ := Ty.apply (Ty.path "revm_context_interface::journaled_state::Eip7702CodeLoad") [] [Φ T]; φ x := - Value.StructRecord "revm_context_interface::journaled_state::Eip7702CodeLoad" [ + Value.StructRecord "revm_context_interface::journaled_state::Eip7702CodeLoad" [] [] [ ("state_load", φ x.(state_load)); ("is_delegate_account_cold", φ x.(is_delegate_account_cold)) ]; @@ -116,7 +116,7 @@ Module Eip7702CodeLoad. Lemma of_value_with state_load state_load' is_delegate_account_cold is_delegate_account_cold' : state_load' = φ state_load -> is_delegate_account_cold' = φ is_delegate_account_cold -> - Value.StructRecord "revm_context_interface::journaled_state::Eip7702CodeLoad" [ + Value.StructRecord "revm_context_interface::journaled_state::Eip7702CodeLoad" [] [] [ ("state_load", state_load'); ("is_delegate_account_cold", is_delegate_account_cold') ] = φ (Build_t _ state_load is_delegate_account_cold). @@ -188,7 +188,7 @@ Module AccountLoad. { Φ := Ty.path "revm_context_interface::journaled_state::AccountLoad"; φ x := - Value.StructRecord "revm_context_interface::journaled_state::AccountLoad" [ + Value.StructRecord "revm_context_interface::journaled_state::AccountLoad" [] [] [ ("load", φ x.(load)); ("is_empty", φ x.(is_empty)) ]; @@ -204,7 +204,7 @@ Module AccountLoad. Lemma of_value_with load load' is_empty is_empty' : load' = φ load -> is_empty' = φ is_empty -> - Value.StructRecord "revm_context_interface::journaled_state::AccountLoad" [ + Value.StructRecord "revm_context_interface::journaled_state::AccountLoad" [] [] [ ("load", load'); ("is_empty", is_empty') ] = φ (Build_t load is_empty). @@ -217,7 +217,7 @@ Module AccountLoad. load' = φ load -> is_empty' = φ is_empty -> OfValue.t ( - Value.StructRecord "revm_context_interface::journaled_state::AccountLoad" [ + Value.StructRecord "revm_context_interface::journaled_state::AccountLoad" [] [] [ ("load", load'); ("is_empty", is_empty') ] diff --git a/CoqOfRust/revm/revm_context_interface/result.v b/CoqOfRust/revm/revm_context_interface/result.v index ab797376b..3674dbb28 100644 --- a/CoqOfRust/revm/revm_context_interface/result.v +++ b/CoqOfRust/revm/revm_context_interface/result.v @@ -139,6 +139,8 @@ Module result. (let self := M.alloc (| self |) in Value.StructRecord "revm_context_interface::result::ResultAndState" + [] + [ HaltReasonT ] [ ("result", M.call_closure (| @@ -530,6 +532,8 @@ Module result. M.alloc (| Value.StructRecord "revm_context_interface::result::ExecutionResult::Success" + [] + [ HaltReasonT ] [ ("reason", M.call_closure (| @@ -646,6 +650,8 @@ Module result. M.alloc (| Value.StructRecord "revm_context_interface::result::ExecutionResult::Revert" + [] + [ HaltReasonT ] [ ("gas_used", M.call_closure (| @@ -699,6 +705,8 @@ Module result. M.alloc (| Value.StructRecord "revm_context_interface::result::ExecutionResult::Halt" + [] + [ HaltReasonT ] [ ("reason", M.call_closure (| @@ -1982,7 +1990,14 @@ Module result. |) |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "alloy_primitives::bits::address::Address" ] + [] + |))) ] |) |))) @@ -2084,6 +2099,8 @@ Module result. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "alloy_primitives::bytes_::Bytes" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -2119,10 +2136,19 @@ Module result. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "alloy_primitives::bytes_::Bytes" ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| output |) |) |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "alloy_primitives::bytes_::Bytes" ] ] + [] + |))) ] |) |))) @@ -2180,6 +2206,8 @@ Module result. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "alloy_primitives::bytes_::Bytes" ] [ M.call_closure (| Ty.path "alloy_primitives::bytes_::Bytes", @@ -2203,10 +2231,21 @@ Module result. |) in let output := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| output |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "alloy_primitives::bytes_::Bytes" ] + [ M.read (| output |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "alloy_primitives::bytes_::Bytes" ] + [] + |))) ] |) |))) @@ -2687,6 +2726,8 @@ Module result. M.alloc (| Value.StructTuple "revm_context_interface::result::Output::Call" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bytes_::Bytes", @@ -2723,6 +2764,8 @@ Module result. M.alloc (| Value.StructTuple "revm_context_interface::result::Output::Create" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bytes_::Bytes", @@ -3361,7 +3404,18 @@ Module result. "revm_context_interface::result::Output::Call", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.path "alloy_primitives::bits::address::Address" ] + ] + [] + |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in @@ -3718,6 +3772,8 @@ Module result. M.alloc (| Value.StructTuple "revm_context_interface::result::EVMError::Transaction" + [] + [ DBError; TransactionError ] [ M.call_closure (| TransactionError, @@ -3747,6 +3803,8 @@ Module result. M.alloc (| Value.StructTuple "revm_context_interface::result::EVMError::Header" + [] + [ DBError; TransactionError ] [ M.call_closure (| Ty.path "revm_context_interface::result::InvalidHeader", @@ -3776,6 +3834,8 @@ Module result. M.alloc (| Value.StructTuple "revm_context_interface::result::EVMError::Database" + [] + [ DBError; TransactionError ] [ M.call_closure (| DBError, @@ -3805,6 +3865,8 @@ Module result. M.alloc (| Value.StructTuple "revm_context_interface::result::EVMError::Custom" + [] + [ DBError; TransactionError ] [ M.call_closure (| Ty.path "alloc::string::String", @@ -3834,6 +3896,8 @@ Module result. M.alloc (| Value.StructTuple "revm_context_interface::result::EVMError::Precompile" + [] + [ DBError; TransactionError ] [ M.call_closure (| Ty.path "alloc::string::String", @@ -4269,6 +4333,8 @@ Module result. (let value := M.alloc (| value |) in Value.StructTuple "revm_context_interface::result::EVMError::Database" + [] + [ DBError; TX ] [ M.read (| value |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4308,6 +4374,8 @@ Module result. (let value := M.alloc (| value |) in Value.StructTuple "revm_context_interface::result::EVMError::Custom" + [] + [ DB; TX ] [ M.read (| value |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4342,6 +4410,8 @@ Module result. (let value := M.alloc (| value |) in Value.StructTuple "revm_context_interface::result::EVMError::Transaction" + [] + [ DB; Ty.path "revm_context_interface::result::InvalidTransaction" ] [ M.read (| value |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4415,6 +4485,8 @@ Module result. M.alloc (| Value.StructTuple "revm_context_interface::result::EVMError::Transaction" + [] + [ E; TransactionValidationErrorT ] [ M.read (| e |) ] |))); fun γ => @@ -4429,6 +4501,8 @@ Module result. M.alloc (| Value.StructTuple "revm_context_interface::result::EVMError::Header" + [] + [ E; TransactionValidationErrorT ] [ M.read (| e |) ] |))); fun γ => @@ -4443,6 +4517,8 @@ Module result. M.alloc (| Value.StructTuple "revm_context_interface::result::EVMError::Database" + [] + [ E; TransactionValidationErrorT ] [ M.call_closure (| E, @@ -4471,6 +4547,8 @@ Module result. M.alloc (| Value.StructTuple "revm_context_interface::result::EVMError::Precompile" + [] + [ E; TransactionValidationErrorT ] [ M.read (| e |) ] |))); fun γ => @@ -4485,6 +4563,8 @@ Module result. M.alloc (| Value.StructTuple "revm_context_interface::result::EVMError::Custom" + [] + [ E; TransactionValidationErrorT ] [ M.read (| e |) ] |))) ] @@ -4557,6 +4637,9 @@ Module result. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] + ] [ (* Unsize *) M.pointer_coercion @@ -4576,6 +4659,9 @@ Module result. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] + ] [ (* Unsize *) M.pointer_coercion @@ -4595,6 +4681,9 @@ Module result. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] + ] [ (* Unsize *) M.pointer_coercion @@ -4632,7 +4721,18 @@ Module result. match γ with | [] => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] + ] + [] + |))) | _ => M.impossible "wrong number of arguments" end) |))) @@ -5062,6 +5162,8 @@ Module result. (let value := M.alloc (| value |) in Value.StructTuple "revm_context_interface::result::EVMError::Header" + [] + [ DBError; TransactionValidationErrorT ] [ M.read (| value |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6314,6 +6416,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::PriorityFeeGreaterThanMaxFee" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6327,6 +6431,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::GasPriceLessThanBasefee" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6340,6 +6446,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::CallerGasLimitMoreThanBlock" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6353,6 +6461,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::CallGasCostMoreThanGasLimit" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6366,6 +6476,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::RejectCallerWithCode" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6387,6 +6499,8 @@ Module result. M.alloc (| Value.StructRecord "revm_context_interface::result::InvalidTransaction::LackOfFundForMaxFee" + [] + [] [ ("fee", M.call_closure (| @@ -6480,6 +6594,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::OverflowPaymentInTransaction" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6493,6 +6609,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::NonceOverflowInTransaction" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6514,6 +6632,8 @@ Module result. M.alloc (| Value.StructRecord "revm_context_interface::result::InvalidTransaction::NonceTooHigh" + [] + [] [ ("tx", M.call_closure (| @@ -6567,6 +6687,8 @@ Module result. M.alloc (| Value.StructRecord "revm_context_interface::result::InvalidTransaction::NonceTooLow" + [] + [] [ ("tx", M.call_closure (| @@ -6612,6 +6734,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::CreateInitCodeSizeLimit" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6625,6 +6749,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::InvalidChainId" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6638,6 +6764,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::AccessListNotSupported" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6651,6 +6779,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::MaxFeePerBlobGasNotSupported" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6664,6 +6794,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::BlobVersionedHashesNotSupported" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6677,6 +6809,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::BlobGasPriceGreaterThanMax" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6690,6 +6824,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::EmptyBlobs" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6703,6 +6839,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::BlobCreateTransaction" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6724,6 +6862,8 @@ Module result. M.alloc (| Value.StructRecord "revm_context_interface::result::InvalidTransaction::TooManyBlobs" + [] + [] [ ("max", M.call_closure (| @@ -6769,6 +6909,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::BlobVersionNotSupported" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6782,6 +6924,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::EofCrateShouldHaveToAddress" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6795,6 +6939,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::AuthorizationListNotSupported" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6808,6 +6954,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::AuthorizationListInvalidFields" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6821,6 +6969,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::EmptyAuthorizationList" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6835,6 +6985,8 @@ Module result. M.alloc (| Value.StructTuple "revm_context_interface::result::InvalidTransaction::InvalidAuthorizationList" + [] + [] [ M.call_closure (| Ty.path @@ -6865,6 +7017,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::Eip2930NotSupported" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6878,6 +7032,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::Eip1559NotSupported" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6891,6 +7047,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::Eip4844NotSupported" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -6904,6 +7062,8 @@ Module result. Value.StructTuple "revm_context_interface::result::InvalidTransaction::Eip7702NotSupported" [] + [] + [] |))) ] |) @@ -7837,6 +7997,8 @@ Module result. (let value := M.alloc (| value |) in Value.StructTuple "revm_context_interface::result::InvalidTransaction::InvalidAuthorizationList" + [] + [] [ M.read (| value |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/revm/revm_context_interface/transaction.v b/CoqOfRust/revm/revm_context_interface/transaction.v index 7d066dbbe..9b5f5b6e3 100644 --- a/CoqOfRust/revm/revm_context_interface/transaction.v +++ b/CoqOfRust/revm/revm_context_interface/transaction.v @@ -2014,6 +2014,8 @@ Module transaction. M.alloc (| Value.StructTuple "alloy_primitives::common::TxKind::Call" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -2079,6 +2081,8 @@ Module transaction. M.alloc (| Value.StructTuple "alloy_primitives::common::TxKind::Call" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -2299,7 +2303,25 @@ Module transaction. γ, "revm_context_interface::transaction::transaction_type::TransactionType::Legacy" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.associated_in_trait + "revm_context_interface::transaction::Transaction" + [] + [] + Self + "AccessList" + ] + ] + [] + |))); fun γ => ltac:(M.monadic (let _ := @@ -2310,6 +2332,20 @@ Module transaction. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.associated_in_trait + "revm_context_interface::transaction::Transaction" + [] + [] + Self + "AccessList" + ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -2390,6 +2426,20 @@ Module transaction. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.associated_in_trait + "revm_context_interface::transaction::Transaction" + [] + [] + Self + "AccessList" + ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -2470,6 +2520,20 @@ Module transaction. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.associated_in_trait + "revm_context_interface::transaction::Transaction" + [] + [] + Self + "AccessList" + ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -2550,6 +2614,20 @@ Module transaction. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.associated_in_trait + "revm_context_interface::transaction::Transaction" + [] + [] + Self + "AccessList" + ] + ] [ M.borrow (| Pointer.Kind.Ref, diff --git a/CoqOfRust/revm/revm_context_interface/transaction/links/transaction_type.v b/CoqOfRust/revm/revm_context_interface/transaction/links/transaction_type.v index b2d1c8588..81ec54a03 100644 --- a/CoqOfRust/revm/revm_context_interface/transaction/links/transaction_type.v +++ b/CoqOfRust/revm/revm_context_interface/transaction/links/transaction_type.v @@ -25,12 +25,12 @@ Module TransactionType. Φ := Ty.path "revm_context_interface::transaction::transaction_type::TransactionType"; φ x := match x with - | Legacy => Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Legacy" [] - | Eip2930 => Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip2930" [] - | Eip1559 => Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip1559" [] - | Eip4844 => Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip4844" [] - | Eip7702 => Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip7702" [] - | Custom => Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Custom" [] + | Legacy => Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Legacy" [] [] [] + | Eip2930 => Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip2930" [] [] [] + | Eip1559 => Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip1559" [] [] [] + | Eip4844 => Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip4844" [] [] [] + | Eip7702 => Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip7702" [] [] [] + | Custom => Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Custom" [] [] [] end; }. @@ -39,62 +39,68 @@ Module TransactionType. Smpl Add apply of_ty : of_ty. Lemma of_value_with_Legacy : - Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Legacy" [] = φ Legacy. + Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Legacy" [] [] [] = + φ Legacy. Proof. reflexivity. Qed. Smpl Add apply of_value_with_Legacy : of_value. Lemma of_value_with_Eip2930 : - Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip2930" [] = φ Eip2930. + Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip2930" [] [] [] = + φ Eip2930. Proof. reflexivity. Qed. Smpl Add apply of_value_with_Eip2930 : of_value. Lemma of_value_with_Eip1559 : - Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip1559" [] = φ Eip1559. + Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip1559" [] [] [] = + φ Eip1559. Proof. reflexivity. Qed. Smpl Add apply of_value_with_Eip1559 : of_value. Lemma of_value_with_Eip4844 : - Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip4844" [] = φ Eip4844. + Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip4844" [] [] [] = + φ Eip4844. Proof. reflexivity. Qed. Smpl Add apply of_value_with_Eip4844 : of_value. Lemma of_value_with_Eip7702 : - Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip7702" [] = φ Eip7702. + Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip7702" [] [] [] = + φ Eip7702. Proof. reflexivity. Qed. Smpl Add apply of_value_with_Eip7702 : of_value. Lemma of_value_with_Custom : - Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Custom" [] = φ Custom. + Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Custom" [] [] [] = + φ Custom. Proof. reflexivity. Qed. Smpl Add apply of_value_with_Custom : of_value. Definition of_value_Legacy : - OfValue.t (Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Legacy" []). + OfValue.t (Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Legacy" [] [] []). Proof. econstructor; apply of_value_with_Legacy. Defined. Smpl Add apply of_value_Legacy : of_value. Definition of_value_Eip2930 : - OfValue.t (Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip2930" []). + OfValue.t (Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip2930" [] [] []). Proof. econstructor; apply of_value_with_Eip2930. Defined. Smpl Add apply of_value_Eip2930 : of_value. Definition of_value_Eip1559 : - OfValue.t (Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip1559" []). + OfValue.t (Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip1559" [] [] []). Proof. econstructor; apply of_value_with_Eip1559. Defined. Smpl Add apply of_value_Eip1559 : of_value. Definition of_value_Eip4844 : - OfValue.t (Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip4844" []). + OfValue.t (Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip4844" [] [] []). Proof. econstructor; apply of_value_with_Eip4844. Defined. Smpl Add apply of_value_Eip4844 : of_value. Definition of_value_Eip7702 : - OfValue.t (Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip7702" []). + OfValue.t (Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip7702" [] [] []). Proof. econstructor; apply of_value_with_Eip7702. Defined. Smpl Add apply of_value_Eip7702 : of_value. Definition of_value_Custom : - OfValue.t (Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Custom" []). + OfValue.t (Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Custom" [] [] []). Proof. econstructor; apply of_value_with_Custom. Defined. Smpl Add apply of_value_Custom : of_value. End TransactionType. diff --git a/CoqOfRust/revm/revm_interpreter/gas.v b/CoqOfRust/revm/revm_interpreter/gas.v index e6062572c..16cd972c6 100644 --- a/CoqOfRust/revm/revm_interpreter/gas.v +++ b/CoqOfRust/revm/revm_interpreter/gas.v @@ -189,6 +189,8 @@ Module gas. ltac:(M.monadic (Value.StructRecord "revm_interpreter::gas::Gas" + [] + [] [ ("limit", M.call_closure (| @@ -608,6 +610,8 @@ Module gas. (let limit := M.alloc (| limit |) in Value.StructRecord "revm_interpreter::gas::Gas" + [] + [] [ ("limit", M.read (| limit |)); ("remaining", M.read (| limit |)); @@ -648,6 +652,8 @@ Module gas. (let limit := M.alloc (| limit |) in Value.StructRecord "revm_interpreter::gas::Gas" + [] + [] [ ("limit", M.read (| limit |)); ("remaining", Value.Integer IntegerKind.U64 0); @@ -1262,6 +1268,8 @@ Module gas. Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::OutOfGas" [] + [] + [] |) |) |) @@ -1273,6 +1281,8 @@ Module gas. Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::Extended" [] + [] + [] |))) ] |) @@ -1383,6 +1393,8 @@ Module gas. ltac:(M.monadic (Value.StructRecord "revm_interpreter::gas::MemoryGas" + [] + [] [ ("words_num", M.call_closure (| @@ -1720,6 +1732,8 @@ Module gas. ltac:(M.monadic (Value.StructRecord "revm_interpreter::gas::MemoryGas" + [] + [] [ ("words_num", Value.Integer IntegerKind.Usize 0); ("expansion_cost", Value.Integer IntegerKind.U64 0) @@ -1783,7 +1797,13 @@ Module gas. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u64" ] + [] + |) |) |) |))); @@ -1838,6 +1858,8 @@ Module gas. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u64" ] [ M.call_closure (| Ty.path "u64", diff --git a/CoqOfRust/revm/revm_interpreter/gas/calc.v b/CoqOfRust/revm/revm_interpreter/gas/calc.v index 6588f4f31..d0fe4a8a0 100644 --- a/CoqOfRust/revm/revm_interpreter/gas/calc.v +++ b/CoqOfRust/revm/revm_interpreter/gas/calc.v @@ -79,7 +79,11 @@ Module gas. |), [ M.read (| spec_id |); - Value.StructTuple "revm_specification::hardfork::SpecId::ISTANBUL" [] + Value.StructTuple + "revm_specification::hardfork::SpecId::ISTANBUL" + [] + [] + [] ] |) |)) in @@ -108,6 +112,8 @@ Module gas. Value.StructTuple "revm_specification::hardfork::SpecId::LONDON" [] + [] + [] ] |) |)) in @@ -456,6 +462,8 @@ Module gas. Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] + [] + [] ] |) |)) in @@ -762,7 +770,13 @@ Module gas. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u64" ] + [] + |) |) |) |))) @@ -1101,6 +1115,8 @@ Module gas. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u64" ] [ M.read (| get_constant (| @@ -1170,6 +1186,8 @@ Module gas. Value.StructTuple "revm_specification::hardfork::SpecId::SPURIOUS_DRAGON" [] + [] + [] ] |) |)) in @@ -1698,6 +1716,8 @@ Module gas. Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] + [] + [] ] |) |)) in @@ -1737,6 +1757,8 @@ Module gas. Value.StructTuple "revm_specification::hardfork::SpecId::TANGERINE" [] + [] + [] ] |) |)) in @@ -1822,7 +1844,13 @@ Module gas. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u64" ] + [] + |) |) |) |))) @@ -1913,7 +1941,11 @@ Module gas. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u64" ] + [] |) |) |) @@ -1941,7 +1973,13 @@ Module gas. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u64" ] + [] + |) |) |) |))) @@ -2026,7 +2064,13 @@ Module gas. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u64" ] + [] + |) |) |) |))) @@ -2179,7 +2223,11 @@ Module gas. |), [ M.read (| spec_id |); - Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] + Value.StructTuple + "revm_specification::hardfork::SpecId::BERLIN" + [] + [] + [] ] |) |)) in @@ -2229,6 +2277,8 @@ Module gas. Value.StructTuple "revm_specification::hardfork::SpecId::ISTANBUL" [] + [] + [] ] |) |)) in @@ -2262,6 +2312,8 @@ Module gas. Value.StructTuple "revm_specification::hardfork::SpecId::TANGERINE" [] + [] + [] ] |) |)) in @@ -2334,7 +2386,11 @@ Module gas. |), [ M.read (| spec_id |); - Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] + Value.StructTuple + "revm_specification::hardfork::SpecId::BERLIN" + [] + [] + [] ] |) |)) in @@ -2411,6 +2467,8 @@ Module gas. Value.StructTuple "revm_specification::hardfork::SpecId::ISTANBUL" [] + [] + [] ] |) |)) in @@ -2734,6 +2792,8 @@ Module gas. Value.StructTuple "revm_specification::hardfork::SpecId::SPURIOUS_DRAGON" [] + [] + [] ] |) |)) in @@ -2812,6 +2872,8 @@ Module gas. Value.StructTuple "revm_specification::hardfork::SpecId::TANGERINE" [] + [] + [] ] |), ltac:(M.monadic (M.read (| should_charge_topup |))) @@ -2847,6 +2909,8 @@ Module gas. Value.StructTuple "revm_specification::hardfork::SpecId::TANGERINE" [] + [] + [] ] |) |)) in @@ -2888,6 +2952,8 @@ Module gas. Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] + [] + [] ] |), ltac:(M.monadic @@ -2998,6 +3064,8 @@ Module gas. Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] + [] + [] ] |) |)) in @@ -3045,6 +3113,8 @@ Module gas. Value.StructTuple "revm_specification::hardfork::SpecId::TANGERINE" [] + [] + [] ] |) |)) in @@ -3131,6 +3201,8 @@ Module gas. Value.StructTuple "revm_specification::hardfork::SpecId::SPURIOUS_DRAGON" [] + [] + [] ] |) |)) in @@ -3692,6 +3764,8 @@ Module gas. Value.StructTuple "revm_specification::hardfork::SpecId::ISTANBUL" [] + [] + [] ] |) |)) in @@ -3861,6 +3935,8 @@ Module gas. Value.StructTuple "revm_specification::hardfork::SpecId::HOMESTEAD" [] + [] + [] ] |) |)) in @@ -3908,6 +3984,8 @@ Module gas. Value.StructTuple "revm_specification::hardfork::SpecId::SHANGHAI" [] + [] + [] ] |), ltac:(M.monadic (M.read (| is_create |))) @@ -3975,7 +4053,11 @@ Module gas. |), [ M.read (| spec_id |); - Value.StructTuple "revm_specification::hardfork::SpecId::PRAGUE" [] + Value.StructTuple + "revm_specification::hardfork::SpecId::PRAGUE" + [] + [] + [] ] |) |)) in diff --git a/CoqOfRust/revm/revm_interpreter/instruction_result.v b/CoqOfRust/revm/revm_interpreter/instruction_result.v index 8b6080511..6aa7693c1 100644 --- a/CoqOfRust/revm/revm_interpreter/instruction_result.v +++ b/CoqOfRust/revm/revm_interpreter/instruction_result.v @@ -913,6 +913,8 @@ Module instruction_result. ltac:(M.monadic (Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Continue" + [] + [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1114,6 +1116,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfFunds" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1126,6 +1130,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OverflowPayment" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1138,6 +1144,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateCollision" [] + [] + [] |))) ] |) @@ -1822,6 +1830,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Return" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1834,6 +1844,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Stop" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1846,6 +1858,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::SelfDestruct" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1858,6 +1872,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReturnContract" [] + [] + [] |))) ] |) @@ -1953,6 +1969,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1965,6 +1983,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1977,6 +1997,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1989,6 +2011,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryLimitOOG" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2001,6 +2025,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::PrecompileOOG" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2013,6 +2039,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReentrancySentryOOG" [] + [] + [] |))) ] |))); @@ -2027,6 +2055,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OpcodeNotFound" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2039,6 +2069,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidFEOpcode" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2051,6 +2083,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidJump" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2063,6 +2097,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2075,6 +2111,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2087,6 +2125,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackUnderflow" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2099,6 +2139,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfOffset" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2111,6 +2153,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateCollision" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2123,6 +2167,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::PrecompileError" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2135,6 +2181,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NonceOverflow" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2147,6 +2195,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateContractSizeLimit" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2159,6 +2209,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateContractStartingWithEF" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2171,6 +2223,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateInitCodeSizeLimit" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2183,6 +2237,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OverflowPayment" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2195,6 +2251,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StateChangeDuringStaticCall" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2207,6 +2265,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallNotAllowedInsideStatic" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2219,6 +2279,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfFunds" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2231,6 +2293,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallTooDeep" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2243,6 +2307,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EofAuxDataOverflow" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2255,6 +2321,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EofAuxDataTooSmall" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2267,6 +2335,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::SubRoutineStackOverflow" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -2279,6 +2349,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidEXTCALLTarget" [] + [] + [] |))) ] |) @@ -2716,6 +2788,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Success" + [] + [ HaltReasonT ] [ M.call_closure (| Ty.path "revm_context_interface::result::SuccessReason", @@ -2744,6 +2818,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Revert" [] + [ HaltReasonT ] + [] |))); fun γ => ltac:(M.monadic @@ -2758,6 +2834,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -2786,6 +2864,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::FatalExternalError" [] + [ HaltReasonT ] + [] |))); fun γ => ltac:(M.monadic @@ -2800,6 +2880,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Internal" + [] + [ HaltReasonT ] [ M.call_closure (| Ty.path "revm_interpreter::instruction_result::InternalResult", @@ -3571,10 +3653,21 @@ Module instruction_result. |) in let reason := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| reason |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "revm_context_interface::result::SuccessReason" ] + [ M.read (| reason |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "revm_context_interface::result::SuccessReason" ] + [] + |))) ] |) |))) @@ -3709,10 +3802,17 @@ Module instruction_result. |) in let reason := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| reason |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ HaltReasonT ] + [ M.read (| reason |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ HaltReasonT ] [] + |))) ] |) |))) @@ -3743,6 +3843,8 @@ Module instruction_result. (let reason := M.alloc (| reason |) in Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HALT ] [ M.call_closure (| HALT, @@ -3890,10 +3992,14 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Internal" + [] + [ HaltReasonT ] [ Value.StructTuple "revm_interpreter::instruction_result::InternalResult::InternalContinue" [] + [] + [] ] |))); fun γ => @@ -3906,7 +4012,14 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Success" - [ Value.StructTuple "revm_context_interface::result::SuccessReason::Stop" [] + [] + [ HaltReasonT ] + [ + Value.StructTuple + "revm_context_interface::result::SuccessReason::Stop" + [] + [] + [] ] |))); fun γ => @@ -3919,10 +4032,14 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Success" + [] + [ HaltReasonT ] [ Value.StructTuple "revm_context_interface::result::SuccessReason::Return" [] + [] + [] ] |))); fun γ => @@ -3935,10 +4052,14 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Success" + [] + [ HaltReasonT ] [ Value.StructTuple "revm_context_interface::result::SuccessReason::SelfDestruct" [] + [] + [] ] |))); fun γ => @@ -3952,6 +4073,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Revert" [] + [ HaltReasonT ] + [] |))); fun γ => ltac:(M.monadic @@ -3964,6 +4087,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Revert" [] + [ HaltReasonT ] + [] |))); fun γ => ltac:(M.monadic @@ -3975,10 +4100,14 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Internal" + [] + [ HaltReasonT ] [ Value.StructTuple "revm_interpreter::instruction_result::InternalResult::InternalCallOrCreate" [] + [] + [] ] |))); fun γ => @@ -3991,6 +4120,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4007,6 +4138,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::CallTooDeep" [] + [] + [] ] |) ] @@ -4021,6 +4154,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4037,6 +4172,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::OutOfFunds" [] + [] + [] ] |) ] @@ -4051,6 +4188,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4066,10 +4205,14 @@ Module instruction_result. [ Value.StructTuple "revm_context_interface::result::HaltReason::OutOfGas" + [] + [] [ Value.StructTuple "revm_context_interface::result::OutOfGasError::Basic" [] + [] + [] ] ] |) @@ -4085,6 +4228,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4100,10 +4245,14 @@ Module instruction_result. [ Value.StructTuple "revm_context_interface::result::HaltReason::OutOfGas" + [] + [] [ Value.StructTuple "revm_context_interface::result::OutOfGasError::MemoryLimit" [] + [] + [] ] ] |) @@ -4119,6 +4268,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4134,10 +4285,14 @@ Module instruction_result. [ Value.StructTuple "revm_context_interface::result::HaltReason::OutOfGas" + [] + [] [ Value.StructTuple "revm_context_interface::result::OutOfGasError::Memory" [] + [] + [] ] ] |) @@ -4153,6 +4308,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4168,10 +4325,14 @@ Module instruction_result. [ Value.StructTuple "revm_context_interface::result::HaltReason::OutOfGas" + [] + [] [ Value.StructTuple "revm_context_interface::result::OutOfGasError::Precompile" [] + [] + [] ] ] |) @@ -4187,6 +4348,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4202,10 +4365,14 @@ Module instruction_result. [ Value.StructTuple "revm_context_interface::result::HaltReason::OutOfGas" + [] + [] [ Value.StructTuple "revm_context_interface::result::OutOfGasError::InvalidOperand" [] + [] + [] ] ] |) @@ -4221,6 +4388,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4236,10 +4405,14 @@ Module instruction_result. [ Value.StructTuple "revm_context_interface::result::HaltReason::OutOfGas" + [] + [] [ Value.StructTuple "revm_context_interface::result::OutOfGasError::ReentrancySentry" [] + [] + [] ] ] |) @@ -4275,6 +4448,8 @@ Module instruction_result. (M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4291,6 +4466,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::OpcodeNotFound" [] + [] + [] ] |) ] @@ -4308,6 +4485,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4324,6 +4503,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::CallNotAllowedInsideStatic" [] + [] + [] ] |) ] @@ -4338,6 +4519,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4354,6 +4537,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::StateChangeDuringStaticCall" [] + [] + [] ] |) ] @@ -4368,6 +4553,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4384,6 +4571,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::InvalidFEOpcode" [] + [] + [] ] |) ] @@ -4398,6 +4587,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4414,6 +4605,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::InvalidJump" [] + [] + [] ] |) ] @@ -4428,6 +4621,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4444,6 +4639,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::NotActivated" [] + [] + [] ] |) ] @@ -4458,6 +4655,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4474,6 +4673,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::StackUnderflow" [] + [] + [] ] |) ] @@ -4488,6 +4689,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4504,6 +4707,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::StackOverflow" [] + [] + [] ] |) ] @@ -4518,6 +4723,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4534,6 +4741,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::OutOfOffset" [] + [] + [] ] |) ] @@ -4548,6 +4757,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4564,6 +4775,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::CreateCollision" [] + [] + [] ] |) ] @@ -4578,6 +4791,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4594,6 +4809,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::OverflowPayment" [] + [] + [] ] |) ] @@ -4608,6 +4825,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4624,6 +4843,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::PrecompileError" [] + [] + [] ] |) ] @@ -4638,6 +4859,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4654,6 +4877,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::NonceOverflow" [] + [] + [] ] |) ] @@ -4688,6 +4913,8 @@ Module instruction_result. (M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4704,6 +4931,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::CreateContractSizeLimit" [] + [] + [] ] |) ] @@ -4721,6 +4950,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4737,6 +4968,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::CreateInitCodeSizeLimit" [] + [] + [] ] |) ] @@ -4752,6 +4985,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Revert" [] + [ HaltReasonT ] + [] |))); fun γ => ltac:(M.monadic @@ -4764,6 +4999,8 @@ Module instruction_result. Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::FatalExternalError" [] + [ HaltReasonT ] + [] |))); fun γ => ltac:(M.monadic @@ -4775,6 +5012,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4791,6 +5030,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::OpcodeNotFound" [] + [] + [] ] |) ] @@ -4805,6 +5046,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4821,6 +5064,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::SubRoutineStackOverflow" [] + [] + [] ] |) ] @@ -4835,10 +5080,14 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Success" + [] + [ HaltReasonT ] [ Value.StructTuple "revm_context_interface::result::SuccessReason::EofReturnContract" [] + [] + [] ] |))); fun γ => @@ -4851,6 +5100,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4867,6 +5118,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::EofAuxDataOverflow" [] + [] + [] ] |) ] @@ -4881,6 +5134,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4897,6 +5152,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::EofAuxDataTooSmall" [] + [] + [] ] |) ] @@ -4911,6 +5168,8 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Halt" + [] + [ HaltReasonT ] [ M.call_closure (| HaltReasonT, @@ -4927,6 +5186,8 @@ Module instruction_result. Value.StructTuple "revm_context_interface::result::HaltReason::InvalidEXTCALLTarget" [] + [] + [] ] |) ] @@ -4941,10 +5202,14 @@ Module instruction_result. M.alloc (| Value.StructTuple "revm_interpreter::instruction_result::SuccessOrHalt::Internal" + [] + [ HaltReasonT ] [ Value.StructTuple "revm_interpreter::instruction_result::InternalResult::InvalidExtDelegateCallTarget" [] + [] + [] ] |))) ] diff --git a/CoqOfRust/revm/revm_interpreter/instructions/arithmetic.v b/CoqOfRust/revm/revm_interpreter/instructions/arithmetic.v index 21db3ed41..8d2bf4f3d 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/arithmetic.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/arithmetic.v @@ -122,6 +122,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -368,6 +370,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -614,6 +618,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -862,6 +868,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1152,6 +1160,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1393,6 +1403,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1683,6 +1695,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1920,6 +1934,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2170,6 +2186,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2554,6 +2572,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2601,6 +2621,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2777,6 +2799,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in diff --git a/CoqOfRust/revm/revm_interpreter/instructions/bitwise.v b/CoqOfRust/revm/revm_interpreter/instructions/bitwise.v index 57eed5873..1844b52dc 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/bitwise.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/bitwise.v @@ -122,6 +122,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -403,6 +405,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -684,6 +688,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -833,7 +839,7 @@ Module instructions. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.StructTuple "core::cmp::Ordering::Less" [] + Value.StructTuple "core::cmp::Ordering::Less" [] [] [] |) |) ] @@ -975,6 +981,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1124,7 +1132,7 @@ Module instructions. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.StructTuple "core::cmp::Ordering::Greater" [] + Value.StructTuple "core::cmp::Ordering::Greater" [] [] [] |) |) ] @@ -1266,6 +1274,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1546,6 +1556,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1812,6 +1824,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2070,6 +2084,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2328,6 +2344,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2586,6 +2604,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2840,6 +2860,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -3305,6 +3327,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::CONSTANTINOPLE" [] + [] + [] ] |) |) @@ -3344,6 +3368,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] ] |) |) in @@ -3454,6 +3480,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -3893,6 +3921,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::CONSTANTINOPLE" [] + [] + [] ] |) |) @@ -3932,6 +3962,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] ] |) |) in @@ -4042,6 +4074,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -4483,6 +4517,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::CONSTANTINOPLE" [] + [] + [] ] |) |) @@ -4522,6 +4558,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] ] |) |) in @@ -4632,6 +4670,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in diff --git a/CoqOfRust/revm/revm_interpreter/instructions/block_info.v b/CoqOfRust/revm/revm_interpreter/instructions/block_info.v index 6775428b7..2e212d4cf 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/block_info.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/block_info.v @@ -72,6 +72,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::ISTANBUL" [] + [] + [] ] |) |) @@ -111,6 +113,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] ] |) |) in @@ -221,6 +225,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -381,6 +387,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -520,6 +528,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -708,6 +718,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -847,6 +859,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1007,6 +1021,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -1146,6 +1162,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1306,6 +1324,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -1453,6 +1473,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1508,7 +1530,11 @@ Module instructions. |) ] |); - Value.StructTuple "revm_specification::hardfork::SpecId::MERGE" [] + Value.StructTuple + "revm_specification::hardfork::SpecId::MERGE" + [] + [] + [] ] |) |)) in @@ -1700,6 +1726,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -1849,6 +1877,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -1990,6 +2020,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2150,6 +2182,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -2240,6 +2274,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::LONDON" [] + [] + [] ] |) |) @@ -2279,6 +2315,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] ] |) |) in @@ -2389,6 +2427,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2549,6 +2589,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -2642,6 +2684,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::CANCUN" [] + [] + [] ] |) |) @@ -2681,6 +2725,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] ] |) |) in @@ -2791,6 +2837,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2968,6 +3016,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in diff --git a/CoqOfRust/revm/revm_interpreter/instructions/contract.v b/CoqOfRust/revm/revm_interpreter/instructions/contract.v index 5a51c2a4d..0a4296d01 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/contract.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/contract.v @@ -151,6 +151,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + [] + [] ] |) |) in @@ -234,6 +236,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StateChangeDuringStaticCall" [] + [] + [] ] |) |) in @@ -344,6 +348,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1058,6 +1064,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1110,6 +1118,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1360,6 +1370,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1399,9 +1411,13 @@ Module instructions. |); Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::NewFrame" + [] + [] [ Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::EOFCreate" + [] + [] [ M.call_closure (| Ty.apply @@ -1481,6 +1497,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallOrCreate" [] + [] + [] ] |) |) in @@ -1688,6 +1706,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReturnContractInNotInitEOF" [] + [] + [] ] |) |) in @@ -1962,6 +1982,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -2503,6 +2525,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -2712,6 +2736,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] + [] + [] ] |) |) in @@ -3119,6 +3145,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EofAuxDataOverflow" [] + [] + [] ] |) |) in @@ -3195,6 +3223,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EofAuxDataTooSmall" [] + [] + [] ] |) |) in @@ -3301,6 +3331,8 @@ Module instructions. M.borrow (| Pointer.Kind.MutRef, output |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -3326,6 +3358,8 @@ Module instructions. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 2) ] ] |) @@ -3377,6 +3411,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReturnContract" [] + [] + [] |) in let~ gas : Ty.apply @@ -3446,10 +3482,14 @@ Module instructions. |); Value.StructRecord "revm_interpreter::interpreter_action::InterpreterAction::Return" + [] + [] [ ("result", Value.StructRecord "revm_interpreter::interpreter::InterpreterResult" + [] + [] [ ("output", M.read (| output |)); ("gas", M.read (| gas |)); @@ -3739,6 +3779,8 @@ Module instructions. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "alloy_primitives::bytes_::Bytes" ] [ M.call_closure (| Ty.path "alloy_primitives::bytes_::Bytes", @@ -3761,6 +3803,8 @@ Module instructions. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "alloy_primitives::bytes_::Bytes" ] [ M.call_closure (| Ty.path "alloy_primitives::bytes_::Bytes", @@ -4142,11 +4186,17 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u64" ] + [] |) |) |) @@ -4447,7 +4497,11 @@ Module instructions. |) |) in M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u64" ] + [] |))) ] |) @@ -4555,11 +4609,17 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u64" ] + [] |) |) |) @@ -4568,7 +4628,11 @@ Module instructions. ] |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| gas_limit |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u64" ] + [ M.read (| gas_limit |) ] |))) ] |) @@ -4806,6 +4870,8 @@ Module instructions. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer @@ -4903,11 +4969,17 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidEXTCALLTarget" [] + [] + [] ] |) |) in M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "alloy_primitives::bits::address::Address" ] + [] |) |) |) @@ -4918,6 +4990,8 @@ Module instructions. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "alloy_primitives::bits::address::Address" ] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -5077,6 +5151,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + [] + [] ] |) |) in @@ -5312,6 +5388,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallNotAllowedInsideStatic" [] + [] + [] ] |) |) in @@ -5390,9 +5468,13 @@ Module instructions. |); Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::NewFrame" + [] + [] [ Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Call" + [] + [] [ M.call_closure (| Ty.apply @@ -5420,6 +5502,8 @@ Module instructions. [ Value.StructRecord "revm_interpreter::interpreter_action::call_inputs::CallInputs" + [] + [] [ ("input", M.read (| input |)); @@ -5469,10 +5553,14 @@ Module instructions. ("value", Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Transfer" + [] + [] [ M.read (| value |) ]); ("scheme", Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::ExtCall" + [] + [] []); ("is_static", M.call_closure (| @@ -5510,6 +5598,8 @@ Module instructions. ("return_memory_offset", Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer @@ -5528,6 +5618,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallOrCreate" [] + [] + [] ] |) |) in @@ -5673,6 +5765,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + [] + [] ] |) |) in @@ -5806,9 +5900,13 @@ Module instructions. |); Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::NewFrame" + [] + [] [ Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Call" + [] + [] [ M.call_closure (| Ty.apply @@ -5835,6 +5933,8 @@ Module instructions. [ Value.StructRecord "revm_interpreter::interpreter_action::call_inputs::CallInputs" + [] + [] [ ("input", M.read (| input |)); ("gas_limit", @@ -5906,6 +6006,8 @@ Module instructions. ("value", Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Apparent" + [] + [] [ M.call_closure (| Ty.apply @@ -5952,6 +6054,8 @@ Module instructions. ("scheme", Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::ExtDelegateCall" + [] + [] []); ("is_static", M.call_closure (| @@ -5987,6 +6091,8 @@ Module instructions. ("return_memory_offset", Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer @@ -6005,6 +6111,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallOrCreate" [] + [] + [] ] |) |) in @@ -6148,6 +6256,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + [] + [] ] |) |) in @@ -6281,9 +6391,13 @@ Module instructions. |); Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::NewFrame" + [] + [] [ Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Call" + [] + [] [ M.call_closure (| Ty.apply @@ -6310,6 +6424,8 @@ Module instructions. [ Value.StructRecord "revm_interpreter::interpreter_action::call_inputs::CallInputs" + [] + [] [ ("input", M.read (| input |)); ("gas_limit", @@ -6352,6 +6468,8 @@ Module instructions. ("value", Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Transfer" + [] + [] [ M.read (| get_associated_constant (| @@ -6384,12 +6502,16 @@ Module instructions. ("scheme", Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::ExtStaticCall" + [] + [] []); ("is_static", Value.Bool true); ("is_eof", Value.Bool true); ("return_memory_offset", Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer @@ -6408,6 +6530,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallOrCreate" [] + [] + [] ] |) |) in @@ -6586,6 +6710,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StateChangeDuringStaticCall" [] + [] + [] ] |) |) in @@ -6656,6 +6782,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::PETERSBURG" [] + [] + [] ] |) |) @@ -6698,6 +6826,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] ] |) |) in @@ -6948,6 +7078,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -7062,6 +7194,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::SHANGHAI" [] + [] + [] ] |) |)) in @@ -7201,6 +7335,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateInitCodeSizeLimit" [] + [] + [] ] |) |) in @@ -7332,6 +7468,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -7537,6 +7675,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -7727,6 +7867,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] + [] + [] ] |) |) in @@ -8095,6 +8237,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -8153,6 +8297,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -8165,6 +8311,8 @@ Module instructions. M.alloc (| Value.StructRecord "revm_context_interface::cfg::CreateScheme::Create2" + [] + [] [ ("salt", M.read (| salt |)) ] |))) ] @@ -8282,6 +8430,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -8296,6 +8446,8 @@ Module instructions. Value.StructTuple "revm_context_interface::cfg::CreateScheme::Create" [] + [] + [] |))) ] |) @@ -8398,6 +8550,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::TANGERINE" [] + [] + [] ] |) |)) in @@ -8528,6 +8682,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -8567,9 +8723,13 @@ Module instructions. |); Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::NewFrame" + [] + [] [ Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Create" + [] + [] [ M.call_closure (| Ty.apply @@ -8596,6 +8756,8 @@ Module instructions. [ Value.StructRecord "revm_interpreter::interpreter_action::create_inputs::CreateInputs" + [] + [] [ ("caller", M.call_closure (| @@ -8638,6 +8800,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallOrCreate" [] + [] + [] ] |) |) in @@ -8966,6 +9130,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallNotAllowedInsideStatic" [] + [] + [] ] |) |) in @@ -9207,6 +9373,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -9297,9 +9465,13 @@ Module instructions. |); Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::NewFrame" + [] + [] [ Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Call" + [] + [] [ M.call_closure (| Ty.apply @@ -9327,6 +9499,8 @@ Module instructions. [ Value.StructRecord "revm_interpreter::interpreter_action::call_inputs::CallInputs" + [] + [] [ ("input", M.read (| input |)); @@ -9372,10 +9546,14 @@ Module instructions. ("value", Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Transfer" + [] + [] [ M.read (| value |) ]); ("scheme", Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::Call" + [] + [] []); ("is_static", M.call_closure (| @@ -9423,6 +9601,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallOrCreate" [] + [] + [] ] |) |) in @@ -9929,6 +10109,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -10049,9 +10231,13 @@ Module instructions. |); Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::NewFrame" + [] + [] [ Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Call" + [] + [] [ M.call_closure (| Ty.apply @@ -10079,6 +10265,8 @@ Module instructions. [ Value.StructRecord "revm_interpreter::interpreter_action::call_inputs::CallInputs" + [] + [] [ ("input", M.read (| input |)); @@ -10155,10 +10343,14 @@ Module instructions. ("value", Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Transfer" + [] + [] [ M.read (| value |) ]); ("scheme", Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::CallCode" + [] + [] []); ("is_static", M.call_closure (| @@ -10206,6 +10398,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallOrCreate" [] + [] + [] ] |) |) in @@ -10334,6 +10528,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::HOMESTEAD" [] + [] + [] ] |) |) @@ -10373,6 +10569,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] ] |) |) in @@ -10786,6 +10984,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -10828,9 +11028,13 @@ Module instructions. |); Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::NewFrame" + [] + [] [ Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Call" + [] + [] [ M.call_closure (| Ty.apply @@ -10858,6 +11062,8 @@ Module instructions. [ Value.StructRecord "revm_interpreter::interpreter_action::call_inputs::CallInputs" + [] + [] [ ("input", M.read (| input |)); @@ -10934,6 +11140,8 @@ Module instructions. ("value", Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Apparent" + [] + [] [ M.call_closure (| Ty.apply @@ -10981,6 +11189,8 @@ Module instructions. ("scheme", Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::DelegateCall" + [] + [] []); ("is_static", M.call_closure (| @@ -11028,6 +11238,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallOrCreate" [] + [] + [] ] |) |) in @@ -11155,6 +11367,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::BYZANTIUM" [] + [] + [] ] |) |) @@ -11194,6 +11408,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] ] |) |) in @@ -11607,6 +11823,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -11649,9 +11867,13 @@ Module instructions. |); Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::NewFrame" + [] + [] [ Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Call" + [] + [] [ M.call_closure (| Ty.apply @@ -11679,6 +11901,8 @@ Module instructions. [ Value.StructRecord "revm_interpreter::interpreter_action::call_inputs::CallInputs" + [] + [] [ ("input", M.read (| input |)); @@ -11724,6 +11948,8 @@ Module instructions. ("value", Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Transfer" + [] + [] [ M.read (| get_associated_constant (| @@ -11758,6 +11984,8 @@ Module instructions. ("scheme", Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::StaticCall" + [] + [] []); ("is_static", Value.Bool true); @@ -11775,6 +12003,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallOrCreate" [] + [] + [] ] |) |) in diff --git a/CoqOfRust/revm/revm_interpreter/instructions/contract/call_helpers.v b/CoqOfRust/revm/revm_interpreter/instructions/contract/call_helpers.v index 621342db6..6343b9986 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/contract/call_helpers.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/contract/call_helpers.v @@ -618,6 +618,17 @@ Module instructions. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.path "alloy_primitives::bytes_::Bytes"; + Ty.apply + (Ty.path "core::ops::range::Range") + [] + [ Ty.path "usize" ] + ] + ] [ Value.Tuple [ M.read (| input |); M.read (| ret_range |) ] ] |))) ] @@ -826,11 +837,22 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ops::range::Range") + [] + [ Ty.path "usize" ] + ] + [] |) |) |) @@ -1055,6 +1077,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -1062,6 +1086,14 @@ Module instructions. Value.StructTuple "core::option::Option::None" [] + [ + Ty.apply + (Ty.path + "core::ops::range::Range") + [] + [ Ty.path "usize" ] + ] + [] |) |) |) @@ -1245,11 +1277,22 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] + [] + [] ] |) |) in M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "core::ops::range::Range") + [] + [ Ty.path "usize" ] + ] + [] |) |) |) @@ -1278,9 +1321,13 @@ Module instructions. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "core::ops::range::Range") [] [ Ty.path "usize" ] ] [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| offset |)); ("end_", @@ -1478,10 +1525,18 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "u64" ] + [] + |) |) |) |))); @@ -1538,6 +1593,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::TANGERINE" [] + [] + [] ] |) |)) in @@ -1603,7 +1660,11 @@ Module instructions. |) |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| gas_limit |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "u64" ] + [ M.read (| gas_limit |) ] |) |))) |))) diff --git a/CoqOfRust/revm/revm_interpreter/instructions/control.v b/CoqOfRust/revm/revm_interpreter/instructions/control.v index f671eebcc..0614d2fe2 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/control.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/control.v @@ -100,6 +100,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + [] + [] ] |) |) in @@ -210,6 +212,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -400,6 +404,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + [] + [] ] |) |) in @@ -510,6 +516,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -810,6 +818,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + [] + [] ] |) |) in @@ -920,6 +930,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1461,6 +1473,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1682,6 +1696,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2002,6 +2018,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidJump" [] + [] + [] ] |) |) in @@ -2101,6 +2119,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidJump" [] + [] + [] ] |) |) in @@ -2270,6 +2290,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2417,6 +2439,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + [] + [] ] |) |) in @@ -2527,6 +2551,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2732,6 +2758,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -2855,6 +2883,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::SubRoutineStackOverflow" [] + [] + [] ] |) |) in @@ -3054,6 +3084,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + [] + [] ] |) |) in @@ -3164,6 +3196,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -3375,6 +3409,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + [] + [] ] |) |) in @@ -3485,6 +3521,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -3711,6 +3749,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -3959,6 +3999,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -4101,6 +4143,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -4395,6 +4439,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -4648,6 +4694,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -4838,6 +4886,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] + [] + [] ] |) |) in @@ -5042,10 +5092,14 @@ Module instructions. |); Value.StructRecord "revm_interpreter::interpreter_action::InterpreterAction::Return" + [] + [] [ ("result", Value.StructRecord "revm_interpreter::interpreter::InterpreterResult" + [] + [] [ ("output", M.read (| output |)); ("gas", M.read (| gas |)); @@ -5098,6 +5152,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Return" [] + [] + [] ] |) |) in @@ -5179,6 +5235,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::BYZANTIUM" [] + [] + [] ] |) |) @@ -5218,6 +5276,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] ] |) |) in @@ -5242,6 +5302,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Revert" [] + [] + [] ] |) |) in @@ -5303,6 +5365,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Stop" [] + [] + [] ] |) |) in @@ -5363,6 +5427,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidFEOpcode" [] + [] + [] ] |) |) in @@ -5423,6 +5489,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OpcodeNotFound" [] + [] + [] ] |) |) in diff --git a/CoqOfRust/revm/revm_interpreter/instructions/data.v b/CoqOfRust/revm/revm_interpreter/instructions/data.v index c98e628ce..06a050335 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/data.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/data.v @@ -106,6 +106,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + [] + [] ] |) |) in @@ -216,6 +218,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -578,6 +582,8 @@ Module instructions. M.borrow (| Pointer.Kind.MutRef, word |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -749,6 +755,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + [] + [] ] |) |) in @@ -859,6 +867,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -991,6 +1001,8 @@ Module instructions. M.borrow (| Pointer.Kind.MutRef, word |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -1140,6 +1152,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -1287,6 +1301,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + [] + [] ] |) |) in @@ -1397,6 +1413,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1532,6 +1550,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -1665,6 +1685,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + [] + [] ] |) |) in @@ -1775,6 +1797,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2021,6 +2045,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -2245,6 +2271,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -2430,6 +2458,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] + [] + [] ] |) |) in @@ -2580,6 +2610,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2627,6 +2659,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in diff --git a/CoqOfRust/revm/revm_interpreter/instructions/host.v b/CoqOfRust/revm/revm_interpreter/instructions/host.v index df3682fdc..c85660bfa 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/host.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/host.v @@ -307,6 +307,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] + [] + [] ] |) |)) in @@ -364,6 +366,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::ISTANBUL" [] + [] + [] ] |) |)) in @@ -410,6 +414,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::TANGERINE" [] + [] + [] ] |) |)) in @@ -480,6 +486,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -593,6 +601,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::ISTANBUL" [] + [] + [] ] |) |) @@ -632,6 +642,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] ] |) |) in @@ -742,6 +754,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -909,6 +923,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -1197,6 +1213,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] + [] + [] ] |) |)) in @@ -1328,6 +1346,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1366,6 +1386,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::TANGERINE" [] + [] + [] ] |) |)) in @@ -1498,6 +1520,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1639,6 +1663,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1823,6 +1849,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::CONSTANTINOPLE" [] + [] + [] ] |) |) @@ -1862,6 +1890,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] ] |) |) in @@ -2115,6 +2145,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] + [] + [] ] |) |)) in @@ -2244,6 +2276,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2281,6 +2315,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::ISTANBUL" [] + [] + [] ] |) |)) in @@ -2413,6 +2449,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2554,6 +2592,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2985,6 +3025,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -3212,6 +3254,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -3270,6 +3314,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -3512,6 +3558,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -3973,6 +4021,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] + [] + [] ] |) |) in @@ -4226,6 +4276,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -4843,6 +4895,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -5002,6 +5056,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StateChangeDuringStaticCall" [] + [] + [] ] |) |) in @@ -5192,6 +5248,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::ISTANBUL" [] + [] + [] ] |), ltac:(M.monadic @@ -5299,6 +5357,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReentrancySentryOOG" [] + [] + [] ] |) |) in @@ -5470,6 +5530,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -5667,6 +5729,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::CANCUN" [] + [] + [] ] |) |) @@ -5706,6 +5770,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] ] |) |) in @@ -5789,6 +5855,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StateChangeDuringStaticCall" [] + [] + [] ] |) |) in @@ -5899,6 +5967,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -6101,6 +6171,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::CANCUN" [] + [] + [] ] |) |) @@ -6140,6 +6212,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] ] |) |) in @@ -6250,6 +6324,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -6526,6 +6602,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StateChangeDuringStaticCall" [] + [] + [] ] |) |) in @@ -6770,6 +6848,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -6919,6 +6999,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -6966,6 +7048,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -7212,6 +7296,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -7404,6 +7490,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] + [] + [] ] |) |) in @@ -7627,6 +7715,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackUnderflow" [] + [] + [] ] |) |) in @@ -7707,6 +7797,8 @@ Module instructions. M.alloc (| Value.StructRecord "alloy_primitives::log::Log" + [] + [ Ty.path "alloy_primitives::log::LogData" ] [ ("address", M.call_closure (| @@ -8154,6 +8246,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StateChangeDuringStaticCall" [] + [] + [] ] |) |) in @@ -8368,6 +8462,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::LONDON" [] + [] + [] ] |) |), @@ -8615,6 +8711,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -8655,6 +8753,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::SelfDestruct" [] + [] + [] ] |) |) in diff --git a/CoqOfRust/revm/revm_interpreter/instructions/i256.v b/CoqOfRust/revm/revm_interpreter/instructions/i256.v index fe528e9dc..5a6da8faa 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/i256.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/i256.v @@ -575,7 +575,7 @@ Module instructions. |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - Value.StructTuple "revm_interpreter::instructions::i256::Sign::Minus" [] + Value.StructTuple "revm_interpreter::instructions::i256::Sign::Minus" [] [] [] |))); fun γ => ltac:(M.monadic @@ -676,6 +676,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instructions::i256::Sign::Minus" [] + [] + [] |) |) ] @@ -1047,6 +1049,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instructions::i256::Sign::Zero" [] + [] + [] |) |) ] @@ -1350,6 +1354,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instructions::i256::Sign::Minus" [] + [] + [] |) |) ] @@ -1374,6 +1380,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instructions::i256::Sign::Minus" [] + [] + [] |) |) ] @@ -1400,6 +1408,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instructions::i256::Sign::Minus" [] + [] + [] |) |) ] @@ -1424,6 +1434,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instructions::i256::Sign::Minus" [] + [] + [] |) |) ] @@ -1549,6 +1561,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instructions::i256::Sign::Zero" [] + [] + [] |) |) ] @@ -1636,6 +1650,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instructions::i256::Sign::Zero" [] + [] + [] |) |) ] @@ -1763,6 +1779,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instructions::i256::Sign::Minus" [] + [] + [] |) |) ] diff --git a/CoqOfRust/revm/revm_interpreter/instructions/links/i256.v b/CoqOfRust/revm/revm_interpreter/instructions/links/i256.v index 988d0b4a8..dca6add04 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/links/i256.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/links/i256.v @@ -28,9 +28,9 @@ Module Sign. Φ := Ty.path "revm_interpreter::instructions::i256::Sign"; φ x := match x with - | Minus => Value.StructTuple "revm_interpreter::instructions::i256::Sign::Minus" [] - | Zero => Value.StructTuple "revm_interpreter::instructions::i256::Sign::Zero" [] - | Plus => Value.StructTuple "revm_interpreter::instructions::i256::Sign::Plus" [] + | Minus => Value.StructTuple "revm_interpreter::instructions::i256::Sign::Minus" [] [] [] + | Zero => Value.StructTuple "revm_interpreter::instructions::i256::Sign::Zero" [] [] [] + | Plus => Value.StructTuple "revm_interpreter::instructions::i256::Sign::Plus" [] [] [] end; }. @@ -39,22 +39,22 @@ Module Sign. Smpl Add apply of_ty : of_ty. Lemma of_value_with_Minus : - Value.StructTuple "revm_interpreter::instructions::i256::Sign::Minus" [] = φ Minus. + Value.StructTuple "revm_interpreter::instructions::i256::Sign::Minus" [] [] [] = φ Minus. Proof. reflexivity. Qed. Smpl Add apply of_value_with_Minus : of_value. Lemma of_value_with_Zero : - Value.StructTuple "revm_interpreter::instructions::i256::Sign::Zero" [] = φ Zero. + Value.StructTuple "revm_interpreter::instructions::i256::Sign::Zero" [] [] [] = φ Zero. Proof. reflexivity. Qed. Smpl Add apply of_value_with_Zero : of_value. Lemma of_value_with_Plus : - Value.StructTuple "revm_interpreter::instructions::i256::Sign::Plus" [] = φ Plus. + Value.StructTuple "revm_interpreter::instructions::i256::Sign::Plus" [] [] [] = φ Plus. Proof. reflexivity. Qed. Smpl Add apply of_value_with_Plus : of_value. Definition of_value_Minus : - OfValue.t (Value.StructTuple "revm_interpreter::instructions::i256::Sign::Minus" []). + OfValue.t (Value.StructTuple "revm_interpreter::instructions::i256::Sign::Minus" [] [] []). Proof. econstructor. apply of_value_with_Minus. @@ -62,7 +62,7 @@ Module Sign. Smpl Add apply of_value_Minus : of_value. Definition of_value_Zero : - OfValue.t (Value.StructTuple "revm_interpreter::instructions::i256::Sign::Zero" []). + OfValue.t (Value.StructTuple "revm_interpreter::instructions::i256::Sign::Zero" [] [] []). Proof. econstructor. apply of_value_with_Zero. @@ -70,7 +70,7 @@ Module Sign. Smpl Add apply of_value_Zero : of_value. Definition of_value_Plus : - OfValue.t (Value.StructTuple "revm_interpreter::instructions::i256::Sign::Plus" []). + OfValue.t (Value.StructTuple "revm_interpreter::instructions::i256::Sign::Plus" [] [] []). Proof. econstructor. apply of_value_with_Plus. diff --git a/CoqOfRust/revm/revm_interpreter/instructions/memory.v b/CoqOfRust/revm/revm_interpreter/instructions/memory.v index 8cdc53b9a..e969c6246 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/memory.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/memory.v @@ -124,6 +124,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -383,6 +385,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -568,6 +572,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] + [] + [] ] |) |) in @@ -880,6 +886,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1124,6 +1132,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -1309,6 +1319,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] + [] + [] ] |) |) in @@ -1522,6 +1534,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1766,6 +1780,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -1951,6 +1967,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] + [] + [] ] |) |) in @@ -2164,6 +2182,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2299,6 +2319,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -2403,6 +2425,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::CANCUN" [] + [] + [] ] |) |) @@ -2442,6 +2466,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] ] |) |) in @@ -2688,6 +2714,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -2836,6 +2864,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2883,6 +2913,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -3093,6 +3125,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -3290,6 +3324,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -3486,6 +3522,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] + [] + [] ] |) |) in diff --git a/CoqOfRust/revm/revm_interpreter/instructions/stack.v b/CoqOfRust/revm/revm_interpreter/instructions/stack.v index 1ca259918..67aed8a65 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/stack.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/stack.v @@ -122,6 +122,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -272,6 +274,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::SHANGHAI" [] + [] + [] ] |) |) @@ -311,6 +315,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] ] |) |) in @@ -421,6 +427,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -525,6 +533,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -672,6 +682,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -776,6 +788,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -1084,6 +1098,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1165,6 +1181,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -1305,6 +1323,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1419,6 +1439,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -1536,6 +1558,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + [] + [] ] |) |) in @@ -1646,6 +1670,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1766,6 +1792,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -1915,6 +1943,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + [] + [] ] |) |) in @@ -2025,6 +2055,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2146,6 +2178,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -2297,6 +2331,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + [] + [] ] |) |) in @@ -2407,6 +2443,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -2551,6 +2589,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in diff --git a/CoqOfRust/revm/revm_interpreter/instructions/system.v b/CoqOfRust/revm/revm_interpreter/instructions/system.v index d10395134..93f4a9d10 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/system.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/system.v @@ -281,6 +281,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -429,6 +431,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -476,6 +480,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -727,6 +733,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -919,6 +927,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] + [] + [] ] |) |) in @@ -1229,6 +1239,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1392,6 +1404,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -1534,6 +1548,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1697,6 +1713,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -1836,6 +1854,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1971,6 +1991,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -2258,6 +2280,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -2707,6 +2731,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -3430,6 +3456,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -3589,6 +3617,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -3728,6 +3758,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -3846,6 +3878,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -4130,6 +4164,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -4518,6 +4554,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::BYZANTIUM" [] + [] + [] ] |) |) @@ -4557,6 +4595,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] ] |) |) in @@ -4667,6 +4707,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -4826,6 +4868,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -4940,6 +4984,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::BYZANTIUM" [] + [] + [] ] |) |) @@ -4979,6 +5025,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] ] |) |) in @@ -5225,6 +5273,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in @@ -5575,6 +5625,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfOffset" [] + [] + [] ] |) |) in @@ -5808,6 +5860,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + [] + [] ] |) |) in @@ -5918,6 +5972,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -6337,6 +6393,8 @@ Module instructions. M.borrow (| Pointer.Kind.MutRef, output |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| copy_len |)) ] ] |) @@ -6420,6 +6478,8 @@ Module instructions. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| offset_usize |)); ("end_", @@ -6640,6 +6700,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -6794,6 +6856,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -6963,11 +7027,17 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] |) |) |) @@ -7011,10 +7081,18 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] + |) |) |) |))) @@ -7041,7 +7119,13 @@ Module instructions. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] + |) |) |) |))); @@ -7209,11 +7293,17 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + [] + [] ] |) |) in M.return_ (| - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] |) |) |) @@ -7388,10 +7478,18 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] + [] + [] ] |) |) in - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] + |) |) |) |))); @@ -7406,7 +7504,11 @@ Module instructions. ] |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| memory_offset |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "usize" ] + [ M.read (| memory_offset |) ] |) |))) |))) diff --git a/CoqOfRust/revm/revm_interpreter/instructions/tx_info.v b/CoqOfRust/revm/revm_interpreter/instructions/tx_info.v index 2cf1cc1e1..4168c614d 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/tx_info.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/tx_info.v @@ -125,6 +125,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -336,6 +338,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -478,6 +482,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -700,6 +706,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) in @@ -802,6 +810,8 @@ Module instructions. Value.StructTuple "revm_specification::hardfork::SpecId::CANCUN" [] + [] + [] ] |) |) @@ -841,6 +851,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + [] + [] ] |) |) in @@ -951,6 +963,8 @@ Module instructions. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + [] + [] ] |) |) in @@ -1384,6 +1398,8 @@ Module instructions. Value.StructTuple "revm_context_interface::transaction::transaction_type::TransactionType::Eip4844" [] + [] + [] |) |) ] diff --git a/CoqOfRust/revm/revm_interpreter/instructions/utility.v b/CoqOfRust/revm/revm_interpreter/instructions/utility.v index 1a3750fd4..751ea9f69 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/utility.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/utility.v @@ -1071,6 +1071,8 @@ Module instructions. M.borrow (| Pointer.Kind.MutRef, tmp |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -1246,6 +1248,8 @@ Module instructions. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1277,6 +1281,8 @@ Module instructions. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::fmt::Arguments" ] [ M.call_closure (| Ty.path "core::fmt::Arguments", diff --git a/CoqOfRust/revm/revm_interpreter/interpreter.v b/CoqOfRust/revm/revm_interpreter/interpreter.v index a6298397b..ef1270b61 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter.v @@ -358,6 +358,8 @@ Module interpreter. (let self := M.alloc (| self |) in Value.StructRecord "revm_interpreter::interpreter::Interpreter" + [] + [ WIRE ] [ ("bytecode", M.call_closure (| @@ -772,6 +774,8 @@ Module interpreter. M.alloc (| Value.StructRecord "revm_interpreter::interpreter::runtime_flags::RuntimeFlags" + [] + [] [ ("spec_id", M.read (| spec_id |)); ("is_static", M.read (| is_static |)); @@ -792,6 +796,9 @@ Module interpreter. M.alloc (| Value.StructRecord "revm_interpreter::interpreter::Interpreter" + [] + [ Ty.apply (Ty.path "revm_interpreter::interpreter::EthInterpreter") [] [ EXT; MG ] + ] [ ("bytecode", M.call_closure (| @@ -1020,6 +1027,8 @@ Module interpreter. (let self := M.alloc (| self |) in Value.StructRecord "revm_interpreter::interpreter::EthInstructionProvider" + [] + [ WIRE; HOST ] [ ("instruction_table", M.call_closure (| @@ -1131,6 +1140,8 @@ Module interpreter. (let _context := M.alloc (| _context |) in Value.StructRecord "revm_interpreter::interpreter::EthInstructionProvider" + [] + [ WIRE; HOST ] [ ("instruction_table", M.call_closure (| @@ -1630,10 +1641,14 @@ Module interpreter. |); Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::None" + [] + [] []; Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Continue" [] + [] + [] ] |) |) in @@ -1806,10 +1821,14 @@ Module interpreter. M.alloc (| Value.StructRecord "revm_interpreter::interpreter_action::InterpreterAction::Return" + [] + [] [ ("result", Value.StructRecord "revm_interpreter::interpreter::InterpreterResult" + [] + [] [ ("result", M.call_closure (| @@ -1924,6 +1943,8 @@ Module interpreter. (let self := M.alloc (| self |) in Value.StructRecord "revm_interpreter::interpreter::InterpreterResult" + [] + [] [ ("result", M.call_closure (| @@ -2313,6 +2334,8 @@ Module interpreter. let gas := M.alloc (| gas |) in Value.StructRecord "revm_interpreter::interpreter::InterpreterResult" + [] + [] [ ("result", M.read (| result |)); ("output", M.read (| output |)); diff --git a/CoqOfRust/revm/revm_interpreter/interpreter/ext_bytecode.v b/CoqOfRust/revm/revm_interpreter/interpreter/ext_bytecode.v index 210a261f2..99bbadda5 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter/ext_bytecode.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter/ext_bytecode.v @@ -223,6 +223,8 @@ Module interpreter. M.alloc (| Value.StructRecord "revm_interpreter::interpreter::ext_bytecode::ExtBytecode" + [] + [] [ ("base", M.read (| base |)); ("instruction_pointer", M.read (| instruction_pointer |)) diff --git a/CoqOfRust/revm/revm_interpreter/interpreter/input.v b/CoqOfRust/revm/revm_interpreter/interpreter/input.v index a56f25b57..ae27fe7b9 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter/input.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter/input.v @@ -32,6 +32,8 @@ Module interpreter. (let self := M.alloc (| self |) in Value.StructRecord "revm_interpreter::interpreter::input::InputsImpl" + [] + [] [ ("target_address", M.call_closure (| @@ -281,6 +283,8 @@ Module interpreter. ltac:(M.monadic (Value.StructRecord "revm_interpreter::interpreter::input::InputsImpl" + [] + [] [ ("target_address", M.call_closure (| diff --git a/CoqOfRust/revm/revm_interpreter/interpreter/links/shared_memory.v b/CoqOfRust/revm/revm_interpreter/interpreter/links/shared_memory.v index 2a2f9743c..c6b3030a8 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter/links/shared_memory.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter/links/shared_memory.v @@ -26,7 +26,7 @@ Module SharedMemory. Global Instance IsLink : Link t := { Φ := Ty.path "revm_interpreter::interpreter::shared_memory::SharedMemory"; φ x := - Value.StructRecord "revm_interpreter::interpreter::shared_memory::SharedMemory" [ + Value.StructRecord "revm_interpreter::interpreter::shared_memory::SharedMemory" [] [] [ ("buffer", φ x.(buffer)); ("checkpoints", φ x.(checkpoints)); ("last_checkpoint", φ x.(last_checkpoint)); diff --git a/CoqOfRust/revm/revm_interpreter/interpreter/links/stack.v b/CoqOfRust/revm/revm_interpreter/interpreter/links/stack.v index e90b5e2e5..f68c39e1e 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter/links/stack.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter/links/stack.v @@ -31,7 +31,7 @@ Module Stack. Global Instance IsLink : Link t := { Φ := Ty.path "revm_interpreter::interpreter::stack::Stack"; φ '{| data := data |} := - Value.StructRecord "revm_interpreter::interpreter::stack::Stack" [("data", φ data)]; + Value.StructRecord "revm_interpreter::interpreter::stack::Stack" [] [] [("data", φ data)]; }. Definition of_ty : OfTy.t (Ty.path "revm_interpreter::interpreter::stack::Stack"). @@ -41,7 +41,7 @@ Module Stack. Lemma of_value_with (data : Vec.t aliases.U256.t Global.t) data' : data' = φ data -> - Value.StructRecord "revm_interpreter::interpreter::stack::Stack" [ + Value.StructRecord "revm_interpreter::interpreter::stack::Stack" [] [] [ ("data", data') ] = φ (Build_t data). Proof. now intros; subst. Qed. @@ -49,7 +49,7 @@ Module Stack. Definition of_value (data : Vec.t aliases.U256.t Global.t) data' : data' = φ data -> - OfValue.t (Value.StructRecord "revm_interpreter::interpreter::stack::Stack" [ + OfValue.t (Value.StructRecord "revm_interpreter::interpreter::stack::Stack" [] [] [ ("data", data') ]). Proof. econstructor; apply of_value_with; eassumption. Defined. diff --git a/CoqOfRust/revm/revm_interpreter/interpreter/loop_control.v b/CoqOfRust/revm/revm_interpreter/interpreter/loop_control.v index fca2d1c66..c1f486bbc 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter/loop_control.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter/loop_control.v @@ -36,14 +36,20 @@ Module interpreter. (let gas_limit := M.alloc (| gas_limit |) in Value.StructRecord "revm_interpreter::interpreter::loop_control::LoopControl" + [] + [] [ ("instruction_result", Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Continue" + [] + [] []); ("next_action", Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::None" + [] + [] []); ("gas", M.call_closure (| diff --git a/CoqOfRust/revm/revm_interpreter/interpreter/return_data.v b/CoqOfRust/revm/revm_interpreter/interpreter/return_data.v index 7badad745..fd4effa2e 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter/return_data.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter/return_data.v @@ -23,6 +23,8 @@ Module interpreter. (let self := M.alloc (| self |) in Value.StructTuple "revm_interpreter::interpreter::return_data::ReturnDataImpl" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bytes_::Bytes", @@ -134,6 +136,8 @@ Module interpreter. ltac:(M.monadic (Value.StructTuple "revm_interpreter::interpreter::return_data::ReturnDataImpl" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bytes_::Bytes", diff --git a/CoqOfRust/revm/revm_interpreter/interpreter/shared_memory.v b/CoqOfRust/revm/revm_interpreter/interpreter/shared_memory.v index 2700eb41f..6a988ce9b 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter/shared_memory.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter/shared_memory.v @@ -36,6 +36,8 @@ Module interpreter. (let self := M.alloc (| self |) in Value.StructRecord "revm_interpreter::interpreter::shared_memory::SharedMemory" + [] + [] [ ("buffer", M.call_closure (| @@ -467,6 +469,8 @@ Module interpreter. (M.alloc (| Value.StructRecord "revm_interpreter::interpreter::shared_memory::SharedMemory" + [] + [] [ ("buffer", M.call_closure (| @@ -1669,6 +1673,8 @@ Module interpreter. (let capacity := M.alloc (| capacity |) in Value.StructRecord "revm_interpreter::interpreter::shared_memory::SharedMemory" + [] + [] [ ("buffer", M.call_closure (| @@ -2150,6 +2156,8 @@ Module interpreter. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| offset |)); ("end_", @@ -2618,6 +2626,8 @@ Module interpreter. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| offset |)); ("end_", M.read (| end_ |)) ] ] |) @@ -3100,7 +3110,7 @@ Module interpreter. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| value |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -3574,6 +3584,8 @@ Module interpreter. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| data_offset |)); ("end_", M.read (| data_end |)) ] ] |) @@ -3724,6 +3736,8 @@ Module interpreter. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| src |)); ("end_", @@ -3807,6 +3821,8 @@ Module interpreter. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -3952,6 +3968,8 @@ Module interpreter. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| diff --git a/CoqOfRust/revm/revm_interpreter/interpreter/stack.v b/CoqOfRust/revm/revm_interpreter/interpreter/stack.v index 2e4c41bee..6498eb6a6 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter/stack.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter/stack.v @@ -1348,7 +1348,26 @@ Module interpreter. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "array") + [ N ] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ + Value.Integer IntegerKind.Usize 256; + Value.Integer IntegerKind.Usize 4 + ] + [] + ] + ] + [] + |) |) |) |))); @@ -1358,6 +1377,21 @@ Module interpreter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "array") + [ N ] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ + Value.Integer IntegerKind.Usize 256; + Value.Integer IntegerKind.Usize 4 + ] + [] + ] + ] [ M.call_closure (| Ty.apply @@ -1474,7 +1508,41 @@ Module interpreter. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "array") + [ POPN ] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ + Value.Integer IntegerKind.Usize 256; + Value.Integer IntegerKind.Usize 4 + ] + [] + ]; + Ty.apply + (Ty.path "&mut") + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ + Value.Integer IntegerKind.Usize 256; + Value.Integer IntegerKind.Usize 4 + ] + [] + ] + ] + ] + [] + |) |) |) |))); @@ -1484,6 +1552,36 @@ Module interpreter. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.tuple + [ + Ty.apply + (Ty.path "array") + [ POPN ] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ + Value.Integer IntegerKind.Usize 256; + Value.Integer IntegerKind.Usize 4 + ] + [] + ]; + Ty.apply + (Ty.path "&mut") + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ + Value.Integer IntegerKind.Usize 256; + Value.Integer IntegerKind.Usize 4 + ] + [] + ] + ] + ] [ M.call_closure (| Ty.tuple @@ -1643,6 +1741,8 @@ Module interpreter. ltac:(M.monadic (Value.StructRecord "revm_interpreter::interpreter::stack::Stack" + [] + [] [ ("data", M.call_closure (| @@ -1946,6 +2046,8 @@ Module interpreter. Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackUnderflow" [] + [] + [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3054,6 +3156,17 @@ Module interpreter. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ + Value.Integer IntegerKind.Usize 256; + Value.Integer IntegerKind.Usize 4 + ] + []; + Ty.path "revm_interpreter::instruction_result::InstructionResult" + ] [ M.read (| M.deref (| @@ -3156,10 +3269,23 @@ Module interpreter. (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ + Value.Integer IntegerKind.Usize 256; + Value.Integer IntegerKind.Usize 4 + ] + []; + Ty.path "revm_interpreter::instruction_result::InstructionResult" + ] [ Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackUnderflow" [] + [] + [] ] |))) ] @@ -4188,7 +4314,15 @@ Module interpreter. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path + "revm_interpreter::instruction_result::InstructionResult" + ] + [ Value.Tuple [] ] |) |) |) @@ -4297,10 +4431,18 @@ Module interpreter. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path + "revm_interpreter::instruction_result::InstructionResult" + ] [ Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + [] + [] ] |) |) @@ -4973,6 +5115,12 @@ Module interpreter. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path + "revm_interpreter::instruction_result::InstructionResult" + ] [ Value.Tuple [] ] |) |) @@ -5350,6 +5498,8 @@ Module interpreter. M.borrow (| Pointer.Kind.MutRef, tmp |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -5529,6 +5679,8 @@ Module interpreter. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -5564,6 +5716,8 @@ Module interpreter. |); Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::fmt::Arguments" ] [ M.call_closure (| Ty.path "core::fmt::Arguments", @@ -5671,7 +5825,16 @@ Module interpreter. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path "revm_interpreter::instruction_result::InstructionResult" + ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5861,17 +6024,31 @@ Module interpreter. |) |) in M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.tuple []; + Ty.path "revm_interpreter::instruction_result::InstructionResult" + ] + [ Value.Tuple [] ] |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.tuple []; + Ty.path "revm_interpreter::instruction_result::InstructionResult" + ] [ Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackUnderflow" [] + [] + [] ] |))) ] diff --git a/CoqOfRust/revm/revm_interpreter/interpreter/subroutine_stack.v b/CoqOfRust/revm/revm_interpreter/interpreter/subroutine_stack.v index d5476352d..ac3d38129 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter/subroutine_stack.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter/subroutine_stack.v @@ -98,6 +98,8 @@ Module interpreter. ltac:(M.monadic (Value.StructRecord "revm_interpreter::interpreter::subroutine_stack::SubRoutineReturnFrame" + [] + [] [ ("idx", M.call_closure (| @@ -403,6 +405,8 @@ Module interpreter. let pc := M.alloc (| pc |) in Value.StructRecord "revm_interpreter::interpreter::subroutine_stack::SubRoutineReturnFrame" + [] + [] [ ("idx", M.read (| idx |)); ("pc", M.read (| pc |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -443,6 +447,8 @@ Module interpreter. (let self := M.alloc (| self |) in Value.StructRecord "revm_interpreter::interpreter::subroutine_stack::SubRoutineImpl" + [] + [] [ ("return_stack", M.call_closure (| @@ -614,6 +620,8 @@ Module interpreter. ltac:(M.monadic (Value.StructRecord "revm_interpreter::interpreter::subroutine_stack::SubRoutineImpl" + [] + [] [ ("return_stack", M.call_closure (| @@ -836,6 +844,8 @@ Module interpreter. ltac:(M.monadic (Value.StructRecord "revm_interpreter::interpreter::subroutine_stack::SubRoutineImpl" + [] + [] [ ("return_stack", M.call_closure (| @@ -1202,6 +1212,8 @@ Module interpreter. |); Value.StructRecord "revm_interpreter::interpreter::subroutine_stack::SubRoutineReturnFrame" + [] + [] [ ("idx", M.read (| diff --git a/CoqOfRust/revm/revm_interpreter/interpreter_action.v b/CoqOfRust/revm/revm_interpreter/interpreter_action.v index 20a415281..872138462 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter_action.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter_action.v @@ -93,6 +93,8 @@ Module interpreter_action. M.alloc (| Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Call" + [] + [] [ M.call_closure (| Ty.apply @@ -136,6 +138,8 @@ Module interpreter_action. M.alloc (| Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Create" + [] + [] [ M.call_closure (| Ty.apply @@ -179,6 +183,8 @@ Module interpreter_action. M.alloc (| Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::EOFCreate" + [] + [] [ M.call_closure (| Ty.apply @@ -784,6 +790,8 @@ Module interpreter_action. M.alloc (| Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::NewFrame" + [] + [] [ M.call_closure (| Ty.path "revm_interpreter::interpreter_action::FrameInput", @@ -813,6 +821,8 @@ Module interpreter_action. M.alloc (| Value.StructRecord "revm_interpreter::interpreter_action::InterpreterAction::Return" + [] + [] [ ("result", M.call_closure (| @@ -843,6 +853,8 @@ Module interpreter_action. Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::None" [] + [] + [] |))) ] |) @@ -1000,7 +1012,11 @@ Module interpreter_action. match ε, τ, α with | [], [], [] => ltac:(M.monadic - (Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::None" [])) + (Value.StructTuple + "revm_interpreter::interpreter_action::InterpreterAction::None" + [] + [] + [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1448,10 +1464,21 @@ Module interpreter_action. |) in let result := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| result |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.path "revm_interpreter::interpreter::InterpreterResult" ] + [ M.read (| result |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "revm_interpreter::interpreter::InterpreterResult" ] + [] + |))) ] |) |))) diff --git a/CoqOfRust/revm/revm_interpreter/interpreter_action/call_inputs.v b/CoqOfRust/revm/revm_interpreter/interpreter_action/call_inputs.v index d272b6519..a5b564d89 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter_action/call_inputs.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter_action/call_inputs.v @@ -36,6 +36,8 @@ Module interpreter_action. (let self := M.alloc (| self |) in Value.StructRecord "revm_interpreter::interpreter_action::call_inputs::CallInputs" + [] + [] [ ("input", M.call_closure (| @@ -2298,6 +2300,8 @@ Module interpreter_action. M.alloc (| Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Transfer" + [] + [] [ M.call_closure (| Ty.apply @@ -2340,6 +2344,8 @@ Module interpreter_action. M.alloc (| Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Apparent" + [] + [] [ M.call_closure (| Ty.apply @@ -2889,6 +2895,8 @@ Module interpreter_action. ltac:(M.monadic (Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Transfer" + [] + [] [ M.read (| get_associated_constant (| @@ -3039,7 +3047,19 @@ Module interpreter_action. |) in let transfer := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| transfer |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ + Value.Integer IntegerKind.Usize 256; + Value.Integer IntegerKind.Usize 4 + ] + [] + ] + [ M.read (| transfer |) ] |))); fun γ => ltac:(M.monadic @@ -3049,7 +3069,21 @@ Module interpreter_action. "revm_interpreter::interpreter_action::call_inputs::CallValue::Apparent", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ + Value.Integer IntegerKind.Usize 256; + Value.Integer IntegerKind.Usize 4 + ] + [] + ] + [] + |))) ] |) |))) @@ -3137,7 +3171,21 @@ Module interpreter_action. "revm_interpreter::interpreter_action::call_inputs::CallValue::Transfer", 0 |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ + Value.Integer IntegerKind.Usize 256; + Value.Integer IntegerKind.Usize 4 + ] + [] + ] + [] + |))); fun γ => ltac:(M.monadic (let γ0_0 := @@ -3148,7 +3196,19 @@ Module interpreter_action. |) in let apparent := M.copy (| γ0_0 |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| apparent |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ + Value.Integer IntegerKind.Usize 256; + Value.Integer IntegerKind.Usize 4 + ] + [] + ] + [ M.read (| apparent |) ] |))) ] |) diff --git a/CoqOfRust/revm/revm_interpreter/interpreter_action/call_outcome.v b/CoqOfRust/revm/revm_interpreter/interpreter_action/call_outcome.v index ca71afb16..3ce3535f4 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter_action/call_outcome.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter_action/call_outcome.v @@ -27,6 +27,8 @@ Module interpreter_action. (let self := M.alloc (| self |) in Value.StructRecord "revm_interpreter::interpreter_action::call_outcome::CallOutcome" + [] + [] [ ("result", M.call_closure (| @@ -335,6 +337,8 @@ Module interpreter_action. let memory_offset := M.alloc (| memory_offset |) in Value.StructRecord "revm_interpreter::interpreter_action::call_outcome::CallOutcome" + [] + [] [ ("result", M.read (| result |)); ("memory_offset", M.read (| memory_offset |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/revm/revm_interpreter/interpreter_action/create_inputs.v b/CoqOfRust/revm/revm_interpreter/interpreter_action/create_inputs.v index cd6fc0674..bb292799e 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter_action/create_inputs.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter_action/create_inputs.v @@ -34,6 +34,8 @@ Module interpreter_action. (let self := M.alloc (| self |) in Value.StructRecord "revm_interpreter::interpreter_action::create_inputs::CreateInputs" + [] + [] [ ("caller", M.call_closure (| diff --git a/CoqOfRust/revm/revm_interpreter/interpreter_action/create_outcome.v b/CoqOfRust/revm/revm_interpreter/interpreter_action/create_outcome.v index 41506240f..217d1e30b 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter_action/create_outcome.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter_action/create_outcome.v @@ -107,6 +107,8 @@ Module interpreter_action. (let self := M.alloc (| self |) in Value.StructRecord "revm_interpreter::interpreter_action::create_outcome::CreateOutcome" + [] + [] [ ("result", M.call_closure (| @@ -350,6 +352,8 @@ Module interpreter_action. let address := M.alloc (| address |) in Value.StructRecord "revm_interpreter::interpreter_action::create_outcome::CreateOutcome" + [] + [] [ ("result", M.read (| result |)); ("address", M.read (| address |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/revm/revm_interpreter/interpreter_action/eof_create_inputs.v b/CoqOfRust/revm/revm_interpreter/interpreter_action/eof_create_inputs.v index 2888d22cd..307bcc397 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter_action/eof_create_inputs.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter_action/eof_create_inputs.v @@ -209,6 +209,8 @@ Module interpreter_action. M.alloc (| Value.StructRecord "revm_interpreter::interpreter_action::eof_create_inputs::EOFCreateKind::Tx" + [] + [] [ ("initdata", M.call_closure (| @@ -258,6 +260,8 @@ Module interpreter_action. M.alloc (| Value.StructRecord "revm_interpreter::interpreter_action::eof_create_inputs::EOFCreateKind::Opcode" + [] + [] [ ("initcode", M.call_closure (| @@ -705,6 +709,13 @@ Module interpreter_action. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.path "alloy_primitives::bits::address::Address" ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -720,7 +731,18 @@ Module interpreter_action. γ, "revm_interpreter::interpreter_action::eof_create_inputs::EOFCreateKind::Tx" |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ Ty.path "alloy_primitives::bits::address::Address" ] + ] + [] + |))) ] |) |))) @@ -752,6 +774,8 @@ Module interpreter_action. ltac:(M.monadic (Value.StructRecord "revm_interpreter::interpreter_action::eof_create_inputs::EOFCreateKind::Opcode" + [] + [] [ ("initcode", M.call_closure (| @@ -946,6 +970,8 @@ Module interpreter_action. ltac:(M.monadic (Value.StructRecord "revm_interpreter::interpreter_action::eof_create_inputs::EOFCreateInputs" + [] + [] [ ("caller", M.call_closure (| @@ -1036,6 +1062,8 @@ Module interpreter_action. (let self := M.alloc (| self |) in Value.StructRecord "revm_interpreter::interpreter_action::eof_create_inputs::EOFCreateInputs" + [] + [] [ ("caller", M.call_closure (| @@ -1422,6 +1450,8 @@ Module interpreter_action. let kind := M.alloc (| kind |) in Value.StructRecord "revm_interpreter::interpreter_action::eof_create_inputs::EOFCreateInputs" + [] + [] [ ("caller", M.read (| caller |)); ("value", M.read (| value |)); @@ -1480,6 +1510,8 @@ Module interpreter_action. M.read (| gas_limit |); Value.StructRecord "revm_interpreter::interpreter_action::eof_create_inputs::EOFCreateKind::Opcode" + [] + [] [ ("initcode", M.read (| eof_init_code |)); ("input", M.read (| input |)); diff --git a/CoqOfRust/revm/revm_interpreter/interpreter_action/links/call_inputs.v b/CoqOfRust/revm/revm_interpreter/interpreter_action/links/call_inputs.v index 4f3d48e72..f6c8978f2 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter_action/links/call_inputs.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter_action/links/call_inputs.v @@ -27,8 +27,8 @@ Module CallValue. Φ := Ty.path "revm_interpreter::interpreter_action::call_inputs::CallValue"; φ x := match x with - | Transfer x => Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Transfer" [φ x] - | Apparent x => Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Approval" [φ x] + | Transfer x => Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Transfer" [] [] [φ x] + | Apparent x => Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Approval" [] [] [φ x] end; }. @@ -41,7 +41,7 @@ Module CallValue. Lemma of_value_with_Transfer x x' : x' = φ x -> - Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Transfer" [x'] = + Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Transfer" [] [] [x'] = φ (Transfer x). Proof. now intros; subst. @@ -50,7 +50,7 @@ Module CallValue. Lemma of_value_with_Apparent x x' : x' = φ x -> - Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Approval" [x'] = + Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Approval" [] [] [x'] = φ (Apparent x). Proof. now intros; subst. @@ -59,7 +59,7 @@ Module CallValue. Definition of_value_Transfer (x : aliases.U256.t) x' : x' = φ x -> - OfValue.t (Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Transfer" [x']). + OfValue.t (Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Transfer" [] [] [x']). Proof. econstructor; apply of_value_with_Transfer; eassumption. Defined. @@ -67,7 +67,7 @@ Module CallValue. Definition of_value_Apparent (x : aliases.U256.t) x' : x' = φ x -> - OfValue.t (Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Approval" [x']). + OfValue.t (Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallValue::Approval" [] [] [x']). Proof. econstructor; apply of_value_with_Apparent; eassumption. Defined. @@ -101,10 +101,10 @@ Module CallScheme. Φ := Ty.path "revm_interpreter::interpreter_action::call_inputs::CallScheme"; φ x := match x with - | Call => Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::Call" [] - | CallCode => Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::CallCode" [] - | DelegateCall => Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::DelegateCall" [] - | StaticCall => Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::StaticCall" [] + | Call => Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::Call" [] [] [] + | CallCode => Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::CallCode" [] [] [] + | DelegateCall => Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::DelegateCall" [] [] [] + | StaticCall => Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::StaticCall" [] [] [] end; }. @@ -116,7 +116,7 @@ Module CallScheme. Smpl Add apply of_ty : of_ty. Lemma of_value_with_Call : - Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::Call" [] = + Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::Call" [] [] [] = φ Call. Proof. reflexivity. @@ -124,7 +124,7 @@ Module CallScheme. Smpl Add apply of_value_with_Call : of_value. Lemma of_value_with_CallCode : - Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::CallCode" [] = + Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::CallCode" [] [] [] = φ CallCode. Proof. reflexivity. @@ -132,7 +132,7 @@ Module CallScheme. Smpl Add apply of_value_with_CallCode : of_value. Lemma of_value_with_DelegateCall : - Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::DelegateCall" [] = + Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::DelegateCall" [] [] [] = φ DelegateCall. Proof. reflexivity. @@ -140,7 +140,7 @@ Module CallScheme. Smpl Add apply of_value_with_DelegateCall : of_value. Lemma of_value_with_StaticCall : - Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::StaticCall" [] = + Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::StaticCall" [] [] [] = φ StaticCall. Proof. reflexivity. @@ -148,28 +148,28 @@ Module CallScheme. Smpl Add apply of_value_with_StaticCall : of_value. Definition of_value_Call : - OfValue.t (Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::Call" []). + OfValue.t (Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::Call" [] [] []). Proof. econstructor; apply of_value_with_Call. Defined. Smpl Add apply of_value_Call : of_value. Definition of_value_CallCode : - OfValue.t (Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::CallCode" []). + OfValue.t (Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::CallCode" [] [] []). Proof. econstructor; apply of_value_with_CallCode. Defined. Smpl Add apply of_value_CallCode : of_value. Definition of_value_DelegateCall : - OfValue.t (Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::DelegateCall" []). + OfValue.t (Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::DelegateCall" [] [] []). Proof. econstructor; apply of_value_with_DelegateCall. Defined. Smpl Add apply of_value_DelegateCall : of_value. Definition of_value_StaticCall : - OfValue.t (Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::StaticCall" []). + OfValue.t (Value.StructTuple "revm_interpreter::interpreter_action::call_inputs::CallScheme::StaticCall" [] [] []). Proof. econstructor; apply of_value_with_StaticCall. Defined. @@ -207,7 +207,7 @@ Module CallInputs. Global Instance IsLink : Link t := { Φ := Ty.path "revm_interpreter::interpreter_action::call_inputs::CallInputs"; φ x := - Value.StructRecord "revm_interpreter::interpreter_action::call_inputs::CallInputs" [ + Value.StructRecord "revm_interpreter::interpreter_action::call_inputs::CallInputs" [] [] [ ("input", φ x.(input)); ("return_memory_offset", φ x.(return_memory_offset)); ("gas_limit", φ x.(gas_limit)); @@ -249,7 +249,7 @@ Module CallInputs. scheme' = φ scheme -> is_static' = φ is_static -> is_eof' = φ is_eof -> - Value.StructRecord "revm_interpreter::interpreter_action::call_inputs::CallInputs" [ + Value.StructRecord "revm_interpreter::interpreter_action::call_inputs::CallInputs" [] [] [ ("input", input'); ("return_memory_offset", return_memory_offset'); ("gas_limit", gas_limit'); @@ -288,7 +288,7 @@ Module CallInputs. is_static' = φ is_static -> is_eof' = φ is_eof -> OfValue.t ( - Value.StructRecord "revm_interpreter::interpreter_action::call_inputs::CallInputs" [ + Value.StructRecord "revm_interpreter::interpreter_action::call_inputs::CallInputs" [] [] [ ("input", input'); ("return_memory_offset", return_memory_offset'); ("gas_limit", gas_limit'); diff --git a/CoqOfRust/revm/revm_interpreter/interpreter_action/links/create_inputs.v b/CoqOfRust/revm/revm_interpreter/interpreter_action/links/create_inputs.v index 42454c39b..5b8bad5df 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter_action/links/create_inputs.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter_action/links/create_inputs.v @@ -27,7 +27,7 @@ Module CreateInputs. Global Instance IsLink : Link t := { Φ := Ty.path "revm_interpreter::interpreter_action::create_inputs::CreateInputs"; φ x := - Value.StructRecord "revm_interpreter::interpreter_action::create_inputs::CreateInputs" [ + Value.StructRecord "revm_interpreter::interpreter_action::create_inputs::CreateInputs" [] [] [ ("caller", φ x.(caller)); ("scheme", φ x.(scheme)); ("value", φ x.(value)); @@ -52,7 +52,7 @@ Module CreateInputs. value' = φ value -> init_code' = φ init_code -> gas_limit' = φ gas_limit -> - Value.StructRecord "revm_interpreter::interpreter_action::create_inputs::CreateInputs" [ + Value.StructRecord "revm_interpreter::interpreter_action::create_inputs::CreateInputs" [] [] [ ("caller", caller'); ("scheme", scheme'); ("value", value'); @@ -73,7 +73,7 @@ Module CreateInputs. value' = φ value -> init_code' = φ init_code -> gas_limit' = φ gas_limit -> - OfValue.t (Value.StructRecord "revm_interpreter::interpreter_action::create_inputs::CreateInputs" [ + OfValue.t (Value.StructRecord "revm_interpreter::interpreter_action::create_inputs::CreateInputs" [] [] [ ("caller", caller'); ("scheme", scheme'); ("value", value'); diff --git a/CoqOfRust/revm/revm_interpreter/interpreter_action/links/eof_create_inputs.v b/CoqOfRust/revm/revm_interpreter/interpreter_action/links/eof_create_inputs.v index 873b8c8b5..3d756d824 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter_action/links/eof_create_inputs.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter_action/links/eof_create_inputs.v @@ -21,11 +21,11 @@ Module EOFCreateKind. φ x := match x with | Tx initdata => - Value.StructRecord "eof_create_inputs::EOFCreateKind::Tx" [ + Value.StructRecord "eof_create_inputs::EOFCreateKind::Tx" [] [] [ ("initdata", φ initdata) ] | Opcode initcode input created_address => - Value.StructRecord "eof_create_inputs::EOFCreateKind::Opcode" [ + Value.StructRecord "eof_create_inputs::EOFCreateKind::Opcode" [] [] [ ("initcode", φ initcode); ("input", φ input); ("created_address", φ created_address) @@ -45,7 +45,7 @@ Module EOFCreateInputs. Global Instance IsLink : Link t := { Φ := Ty.path "revm_interpreter::interpreter_action::eof_create_inputs::EOFCreateInputs"; φ '(Build_t caller value gas_limit kind) := - Value.StructRecord "revm_interpreter::interpreter_action::eof_create_inputs::EOFCreateInputs" [ + Value.StructRecord "revm_interpreter::interpreter_action::eof_create_inputs::EOFCreateInputs" [] [] [ ("caller", φ caller); ("value", φ value); ("gas_limit", φ gas_limit); diff --git a/CoqOfRust/revm/revm_interpreter/interpreter_types.v b/CoqOfRust/revm/revm_interpreter/interpreter_types.v index dd1251ca4..fb91e83cd 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter_types.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter_types.v @@ -43,6 +43,8 @@ Module interpreter_types. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| offset |)); ("end_", diff --git a/CoqOfRust/revm/revm_interpreter/links/gas.v b/CoqOfRust/revm/revm_interpreter/links/gas.v index e506f1e20..238edf229 100644 --- a/CoqOfRust/revm/revm_interpreter/links/gas.v +++ b/CoqOfRust/revm/revm_interpreter/links/gas.v @@ -3,7 +3,7 @@ Require Import CoqOfRust.links.M. Require Import core.links.clone. Require core.links.cmp. Require Import core.links.default. -Require core.links.option. +Require Import core.links.option. Require Import core.mem.links.mod. Require core.mem.mod. Require Import core.num.links.mod. @@ -26,7 +26,7 @@ Module MemoryGas. Global Instance IsLink : Link t := { Φ := Ty.path "revm_interpreter::gas::MemoryGas"; φ x := - Value.StructRecord "revm_interpreter::gas::MemoryGas" [ + Value.StructRecord "revm_interpreter::gas::MemoryGas" [] [] [ ("words_num", φ x.(words_num)); ("expansion_cost", φ x.(expansion_cost)) ]; @@ -39,7 +39,7 @@ Module MemoryGas. Lemma of_value_with words_num words_num' expansion_cost expansion_cost' : words_num' = φ words_num -> expansion_cost' = φ expansion_cost -> - Value.StructRecord "revm_interpreter::gas::MemoryGas" [ + Value.StructRecord "revm_interpreter::gas::MemoryGas" [] [] [ ("words_num", words_num'); ("expansion_cost", expansion_cost') ] = φ (Build_t words_num expansion_cost). @@ -50,7 +50,7 @@ Module MemoryGas. words_num' = φ words_num -> expansion_cost' = φ expansion_cost -> OfValue.t ( - Value.StructRecord "revm_interpreter::gas::MemoryGas" [ + Value.StructRecord "revm_interpreter::gas::MemoryGas" [] [] [ ("words_num", words_num'); ("expansion_cost", expansion_cost') ] @@ -172,9 +172,9 @@ Module MemoryExtensionResult. Φ := Ty.path "revm_interpreter::gas::MemoryExtensionResult"; φ x := match x with - | Extended => Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::Extended" [] - | Same => Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::Same" [] - | OutOfGas => Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::OutOfGas" [] + | Extended => Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::Extended" [] [] [] + | Same => Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::Same" [] [] [] + | OutOfGas => Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::OutOfGas" [] [] [] end; }. @@ -183,32 +183,32 @@ Module MemoryExtensionResult. Smpl Add apply of_ty : of_ty. Lemma of_value_with_Extended : - Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::Extended" [] = φ Extended. + Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::Extended" [] [] [] = φ Extended. Proof. reflexivity. Qed. Smpl Add apply of_value_with_Extended : of_value. Lemma of_value_with_Same : - Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::Same" [] = φ Same. + Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::Same" [] [] [] = φ Same. Proof. reflexivity. Qed. Smpl Add apply of_value_with_Same : of_value. Lemma of_value_with_OutOfGas : - Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::OutOfGas" [] = φ OutOfGas. + Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::OutOfGas" [] [] [] = φ OutOfGas. Proof. reflexivity. Qed. Smpl Add apply of_value_with_OutOfGas : of_value. Definition of_value_Extended : - OfValue.t (Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::Extended" []). + OfValue.t (Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::Extended" [] [] []). Proof. econstructor; apply of_value_with_Extended. Defined. Smpl Add apply of_value_Extended : of_value. Definition of_value_Same : - OfValue.t (Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::Same" []). + OfValue.t (Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::Same" [] [] []). Proof. econstructor; apply of_value_with_Same. Defined. Smpl Add apply of_value_Same : of_value. Definition of_value_OutOfGas : - OfValue.t (Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::OutOfGas" []). + OfValue.t (Value.StructTuple "revm_interpreter::gas::MemoryExtensionResult::OutOfGas" [] [] []). Proof. econstructor; apply of_value_with_OutOfGas. Defined. Smpl Add apply of_value_OutOfGas : of_value. End MemoryExtensionResult. @@ -239,7 +239,7 @@ Module Gas. Global Instance IsLink : Link t := { Φ := Ty.path "revm_interpreter::gas::Gas"; φ x := - Value.StructRecord "revm_interpreter::gas::Gas" [ + Value.StructRecord "revm_interpreter::gas::Gas" [] [] [ ("limit", φ x.(limit)); ("remaining", φ x.(remaining)); ("refunded", φ x.(refunded)); @@ -256,7 +256,7 @@ Module Gas. remaining' = φ remaining -> refunded' = φ refunded -> memory' = φ memory -> - Value.StructRecord "revm_interpreter::gas::Gas" [ + Value.StructRecord "revm_interpreter::gas::Gas" [] [] [ ("limit", limit'); ("remaining", remaining'); ("refunded", refunded'); @@ -275,7 +275,7 @@ Module Gas. refunded' = φ refunded -> memory' = φ memory -> OfValue.t ( - Value.StructRecord "revm_interpreter::gas::Gas" [ + Value.StructRecord "revm_interpreter::gas::Gas" [] [] [ ("limit", limit'); ("remaining", remaining'); ("refunded", refunded'); diff --git a/CoqOfRust/revm/revm_interpreter/links/instruction_result.v b/CoqOfRust/revm/revm_interpreter/links/instruction_result.v index 17247848e..cda95e570 100644 --- a/CoqOfRust/revm/revm_interpreter/links/instruction_result.v +++ b/CoqOfRust/revm/revm_interpreter/links/instruction_result.v @@ -52,87 +52,87 @@ Global Instance IsLink : Link t := { φ x := match x with | Continue => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Continue" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Continue" [] [] [] | Stop => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Stop" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Stop" [] [] [] | Return => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Return" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Return" [] [] [] | SelfDestruct => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::SelfDestruct" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::SelfDestruct" [] [] [] | ReturnContract => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReturnContract" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReturnContract" [] [] [] | Revert => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Revert" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Revert" [] [] [] | CallTooDeep => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallTooDeep" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallTooDeep" [] [] [] | OutOfFunds => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfFunds" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfFunds" [] [] [] | CreateInitCodeStartingEF00 => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateInitCodeStartingEF00" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateInitCodeStartingEF00" [] [] [] | InvalidEOFInitCode => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidEOFInitCode" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidEOFInitCode" [] [] [] | InvalidExtDelegateCallTarget => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidExtDelegateCallTarget" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidExtDelegateCallTarget" [] [] [] | CallOrCreate => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallOrCreate" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallOrCreate" [] [] [] | OutOfGas => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] [] [] | MemoryOOG => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] [] [] | MemoryLimitOOG => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryLimitOOG" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryLimitOOG" [] [] [] | PrecompileOOG => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::PrecompileOOG" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::PrecompileOOG" [] [] [] | InvalidOperandOOG => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] [] [] | ReentrancySentryOOG => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReentrancySentryOOG" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReentrancySentryOOG" [] [] [] | OpcodeNotFound => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OpcodeNotFound" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OpcodeNotFound" [] [] [] | CallNotAllowedInsideStatic => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallNotAllowedInsideStatic" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallNotAllowedInsideStatic" [] [] [] | StateChangeDuringStaticCall => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StateChangeDuringStaticCall" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StateChangeDuringStaticCall" [] [] [] | InvalidFEOpcode => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidFEOpcode" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidFEOpcode" [] [] [] | InvalidJump => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidJump" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidJump" [] [] [] | NotActivated => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] [] [] | StackUnderflow => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackUnderflow" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackUnderflow" [] [] [] | StackOverflow => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] [] [] | OutOfOffset => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfOffset" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfOffset" [] [] [] | CreateCollision => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateCollision" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateCollision" [] [] [] | OverflowPayment => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OverflowPayment" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OverflowPayment" [] [] [] | PrecompileError => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::PrecompileError" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::PrecompileError" [] [] [] | NonceOverflow => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NonceOverflow" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NonceOverflow" [] [] [] | CreateContractSizeLimit => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateContractSizeLimit" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateContractSizeLimit" [] [] [] | CreateContractStartingWithEF => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateContractStartingWithEF" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateContractStartingWithEF" [] [] [] | CreateInitCodeSizeLimit => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateInitCodeSizeLimit" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateInitCodeSizeLimit" [] [] [] | FatalExternalError => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::FatalExternalError" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::FatalExternalError" [] [] [] | ReturnContractInNotInitEOF => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReturnContractInNotInitEOF" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReturnContractInNotInitEOF" [] [] [] | EOFOpcodeDisabledInLegacy => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] [] [] | SubRoutineStackOverflow => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::SubRoutineStackOverflow" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::SubRoutineStackOverflow" [] [] [] | EofAuxDataOverflow => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EofAuxDataOverflow" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EofAuxDataOverflow" [] [] [] | EofAuxDataTooSmall => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EofAuxDataTooSmall" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EofAuxDataTooSmall" [] [] [] | InvalidEXTCALLTarget => - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidEXTCALLTarget" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidEXTCALLTarget" [] [] [] end }. @@ -141,534 +141,534 @@ Global Instance IsLink : Link t := { Smpl Add simple apply of_ty : of_ty. Lemma of_value_with_Continue : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Continue" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Continue" [] [] [] = φ Continue. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_Continue : of_value. Lemma of_value_with_Stop : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Stop" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Stop" [] [] [] = φ Stop. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_Stop : of_value. Lemma of_value_with_Return : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Return" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Return" [] [] [] = φ Return. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_Return : of_value. Lemma of_value_with_SelfDestruct : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::SelfDestruct" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::SelfDestruct" [] [] [] = φ SelfDestruct. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_SelfDestruct : of_value. Lemma of_value_with_ReturnContract : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReturnContract" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReturnContract" [] [] [] = φ ReturnContract. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_ReturnContract : of_value. Lemma of_value_with_Revert : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Revert" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Revert" [] [] [] = φ Revert. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_Revert : of_value. Lemma of_value_with_CallTooDeep : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallTooDeep" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallTooDeep" [] [] [] = φ CallTooDeep. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_CallTooDeep : of_value. Lemma of_value_with_OutOfFunds : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfFunds" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfFunds" [] [] [] = φ OutOfFunds. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_OutOfFunds : of_value. Lemma of_value_with_CreateInitCodeStartingEF00 : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateInitCodeStartingEF00" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateInitCodeStartingEF00" [] [] [] = φ CreateInitCodeStartingEF00. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_CreateInitCodeStartingEF00 : of_value. Lemma of_value_with_InvalidEOFInitCode : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidEOFInitCode" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidEOFInitCode" [] [] [] = φ InvalidEOFInitCode. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_InvalidEOFInitCode : of_value. Lemma of_value_with_InvalidExtDelegateCallTarget : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidExtDelegateCallTarget" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidExtDelegateCallTarget" [] [] [] = φ InvalidExtDelegateCallTarget. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_InvalidExtDelegateCallTarget : of_value. Lemma of_value_with_CallOrCreate : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallOrCreate" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallOrCreate" [] [] [] = φ CallOrCreate. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_CallOrCreate : of_value. Lemma of_value_with_OutOfGas : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] [] [] = φ OutOfGas. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_OutOfGas : of_value. Lemma of_value_with_MemoryOOG : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] [] [] = φ MemoryOOG. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_MemoryOOG : of_value. Lemma of_value_with_MemoryLimitOOG : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryLimitOOG" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryLimitOOG" [] [] [] = φ MemoryLimitOOG. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_MemoryLimitOOG : of_value. Lemma of_value_with_PrecompileOOG : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::PrecompileOOG" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::PrecompileOOG" [] [] [] = φ PrecompileOOG. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_PrecompileOOG : of_value. Lemma of_value_with_InvalidOperandOOG : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] [] [] = φ InvalidOperandOOG. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_InvalidOperandOOG : of_value. Lemma of_value_with_ReentrancySentryOOG : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReentrancySentryOOG" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReentrancySentryOOG" [] [] [] = φ ReentrancySentryOOG. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_ReentrancySentryOOG : of_value. Lemma of_value_with_OpcodeNotFound : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OpcodeNotFound" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OpcodeNotFound" [] [] [] = φ OpcodeNotFound. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_OpcodeNotFound : of_value. Lemma of_value_with_CallNotAllowedInsideStatic : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallNotAllowedInsideStatic" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallNotAllowedInsideStatic" [] [] [] = φ CallNotAllowedInsideStatic. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_CallNotAllowedInsideStatic : of_value. Lemma of_value_with_StateChangeDuringStaticCall : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StateChangeDuringStaticCall" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StateChangeDuringStaticCall" [] [] [] = φ StateChangeDuringStaticCall. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_StateChangeDuringStaticCall : of_value. Lemma of_value_with_InvalidFEOpcode : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidFEOpcode" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidFEOpcode" [] [] [] = φ InvalidFEOpcode. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_InvalidFEOpcode : of_value. Lemma of_value_with_InvalidJump : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidJump" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidJump" [] [] [] = φ InvalidJump. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_InvalidJump : of_value. Lemma of_value_with_NotActivated : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] [] [] = φ NotActivated. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_NotActivated : of_value. Lemma of_value_with_StackUnderflow : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackUnderflow" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackUnderflow" [] [] [] = φ StackUnderflow. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_StackUnderflow : of_value. Lemma of_value_with_StackOverflow : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] [] [] = φ StackOverflow. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_StackOverflow : of_value. Lemma of_value_with_OutOfOffset : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfOffset" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfOffset" [] [] [] = φ OutOfOffset. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_OutOfOffset : of_value. Lemma of_value_with_CreateCollision : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateCollision" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateCollision" [] [] [] = φ CreateCollision. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_CreateCollision : of_value. Lemma of_value_with_OverflowPayment : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OverflowPayment" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OverflowPayment" [] [] [] = φ OverflowPayment. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_OverflowPayment : of_value. Lemma of_value_with_PrecompileError : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::PrecompileError" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::PrecompileError" [] [] [] = φ PrecompileError. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_PrecompileError : of_value. Lemma of_value_with_NonceOverflow : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NonceOverflow" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NonceOverflow" [] [] [] = φ NonceOverflow. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_NonceOverflow : of_value. Lemma of_value_with_CreateContractSizeLimit : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateContractSizeLimit" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateContractSizeLimit" [] [] [] = φ CreateContractSizeLimit. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_CreateContractSizeLimit : of_value. Lemma of_value_with_CreateContractStartingWithEF : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateContractStartingWithEF" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateContractStartingWithEF" [] [] [] = φ CreateContractStartingWithEF. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_CreateContractStartingWithEF : of_value. Lemma of_value_with_CreateInitCodeSizeLimit : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateInitCodeSizeLimit" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateInitCodeSizeLimit" [] [] [] = φ CreateInitCodeSizeLimit. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_CreateInitCodeSizeLimit : of_value. Lemma of_value_with_FatalExternalError : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::FatalExternalError" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::FatalExternalError" [] [] [] = φ FatalExternalError. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_FatalExternalError : of_value. Lemma of_value_with_ReturnContractInNotInitEOF : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReturnContractInNotInitEOF" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReturnContractInNotInitEOF" [] [] [] = φ ReturnContractInNotInitEOF. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_ReturnContractInNotInitEOF : of_value. Lemma of_value_with_EOFOpcodeDisabledInLegacy : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] [] [] = φ EOFOpcodeDisabledInLegacy. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_EOFOpcodeDisabledInLegacy : of_value. Lemma of_value_with_SubRoutineStackOverflow : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::SubRoutineStackOverflow" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::SubRoutineStackOverflow" [] [] [] = φ SubRoutineStackOverflow. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_SubRoutineStackOverflow : of_value. Lemma of_value_with_EofAuxDataOverflow : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EofAuxDataOverflow" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EofAuxDataOverflow" [] [] [] = φ EofAuxDataOverflow. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_EofAuxDataOverflow : of_value. Lemma of_value_with_EofAuxDataTooSmall : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EofAuxDataTooSmall" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EofAuxDataTooSmall" [] [] [] = φ EofAuxDataTooSmall. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_EofAuxDataTooSmall : of_value. Lemma of_value_with_InvalidEXTCALLTarget : - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidEXTCALLTarget" [] = + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidEXTCALLTarget" [] [] [] = φ InvalidEXTCALLTarget. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_InvalidEXTCALLTarget : of_value. Definition of_value_Continue : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Continue" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Continue" [] [] [] ). Proof. econstructor; apply of_value_with_Continue; eassumption. Defined. Smpl Add simple apply of_value_Continue : of_value. Definition of_value_Stop : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Stop" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Stop" [] [] [] ). Proof. econstructor; apply of_value_with_Stop; eassumption. Defined. Smpl Add simple apply of_value_Stop : of_value. Definition of_value_Return : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Return" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Return" [] [] [] ). Proof. econstructor; apply of_value_with_Return; eassumption. Defined. Smpl Add simple apply of_value_Return : of_value. Definition of_value_SelfDestruct : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::SelfDestruct" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::SelfDestruct" [] [] [] ). Proof. econstructor; apply of_value_with_SelfDestruct; eassumption. Defined. Smpl Add simple apply of_value_SelfDestruct : of_value. Definition of_value_ReturnContract : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReturnContract" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReturnContract" [] [] [] ). Proof. econstructor; apply of_value_with_ReturnContract; eassumption. Defined. Smpl Add simple apply of_value_ReturnContract : of_value. Definition of_value_Revert : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Revert" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::Revert" [] [] [] ). Proof. econstructor; apply of_value_with_Revert; eassumption. Defined. Smpl Add simple apply of_value_Revert : of_value. Definition of_value_CallTooDeep : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallTooDeep" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallTooDeep" [] [] [] ). Proof. econstructor; apply of_value_with_CallTooDeep; eassumption. Defined. Smpl Add simple apply of_value_CallTooDeep : of_value. Definition of_value_OutOfFunds : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfFunds" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfFunds" [] [] [] ). Proof. econstructor; apply of_value_with_OutOfFunds; eassumption. Defined. Smpl Add simple apply of_value_OutOfFunds : of_value. Definition of_value_CreateInitCodeStartingEF00 : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateInitCodeStartingEF00" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateInitCodeStartingEF00" [] [] [] ). Proof. econstructor; apply of_value_with_CreateInitCodeStartingEF00; eassumption. Defined. Smpl Add simple apply of_value_CreateInitCodeStartingEF00 : of_value. Definition of_value_InvalidEOFInitCode : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidEOFInitCode" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidEOFInitCode" [] [] [] ). Proof. econstructor; apply of_value_with_InvalidEOFInitCode; eassumption. Defined. Smpl Add simple apply of_value_InvalidEOFInitCode : of_value. Definition of_value_InvalidExtDelegateCallTarget : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidExtDelegateCallTarget" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidExtDelegateCallTarget" [] [] [] ). Proof. econstructor; apply of_value_with_InvalidExtDelegateCallTarget; eassumption. Defined. Smpl Add simple apply of_value_InvalidExtDelegateCallTarget : of_value. Definition of_value_CallOrCreate : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallOrCreate" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallOrCreate" [] [] [] ). Proof. econstructor; apply of_value_with_CallOrCreate; eassumption. Defined. Smpl Add simple apply of_value_CallOrCreate : of_value. Definition of_value_OutOfGas : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfGas" [] [] [] ). Proof. econstructor; apply of_value_with_OutOfGas; eassumption. Defined. Smpl Add simple apply of_value_OutOfGas : of_value. Definition of_value_MemoryOOG : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" [] [] [] ). Proof. econstructor; apply of_value_with_MemoryOOG; eassumption. Defined. Smpl Add simple apply of_value_MemoryOOG : of_value. Definition of_value_MemoryLimitOOG : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryLimitOOG" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::MemoryLimitOOG" [] [] [] ). Proof. econstructor; apply of_value_with_MemoryLimitOOG; eassumption. Defined. Smpl Add simple apply of_value_MemoryLimitOOG : of_value. Definition of_value_PrecompileOOG : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::PrecompileOOG" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::PrecompileOOG" [] [] [] ). Proof. econstructor; apply of_value_with_PrecompileOOG; eassumption. Defined. Smpl Add simple apply of_value_PrecompileOOG : of_value. Definition of_value_InvalidOperandOOG : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidOperandOOG" [] [] [] ). Proof. econstructor; apply of_value_with_InvalidOperandOOG; eassumption. Defined. Smpl Add simple apply of_value_InvalidOperandOOG : of_value. Definition of_value_ReentrancySentryOOG : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReentrancySentryOOG" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReentrancySentryOOG" [] [] [] ). Proof. econstructor; apply of_value_with_ReentrancySentryOOG; eassumption. Defined. Smpl Add simple apply of_value_ReentrancySentryOOG : of_value. Definition of_value_OpcodeNotFound : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OpcodeNotFound" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OpcodeNotFound" [] [] [] ). Proof. econstructor; apply of_value_with_OpcodeNotFound; eassumption. Defined. Smpl Add simple apply of_value_OpcodeNotFound : of_value. Definition of_value_CallNotAllowedInsideStatic : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallNotAllowedInsideStatic" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CallNotAllowedInsideStatic" [] [] [] ). Proof. econstructor; apply of_value_with_CallNotAllowedInsideStatic; eassumption. Defined. Smpl Add simple apply of_value_CallNotAllowedInsideStatic : of_value. Definition of_value_StateChangeDuringStaticCall : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StateChangeDuringStaticCall" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StateChangeDuringStaticCall" [] [] [] ). Proof. econstructor; apply of_value_with_StateChangeDuringStaticCall; eassumption. Defined. Smpl Add simple apply of_value_StateChangeDuringStaticCall : of_value. Definition of_value_InvalidFEOpcode : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidFEOpcode" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidFEOpcode" [] [] [] ). Proof. econstructor; apply of_value_with_InvalidFEOpcode; eassumption. Defined. Smpl Add simple apply of_value_InvalidFEOpcode : of_value. Definition of_value_InvalidJump : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidJump" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidJump" [] [] [] ). Proof. econstructor; apply of_value_with_InvalidJump; eassumption. Defined. Smpl Add simple apply of_value_InvalidJump : of_value. Definition of_value_NotActivated : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NotActivated" [] [] [] ). Proof. econstructor; apply of_value_with_NotActivated; eassumption. Defined. Smpl Add simple apply of_value_NotActivated : of_value. Definition of_value_StackUnderflow : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackUnderflow" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackUnderflow" [] [] [] ). Proof. econstructor; apply of_value_with_StackUnderflow; eassumption. Defined. Smpl Add simple apply of_value_StackUnderflow : of_value. Definition of_value_StackOverflow : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::StackOverflow" [] [] [] ). Proof. econstructor; apply of_value_with_StackOverflow; eassumption. Defined. Smpl Add simple apply of_value_StackOverflow : of_value. Definition of_value_OutOfOffset : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfOffset" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OutOfOffset" [] [] [] ). Proof. econstructor; apply of_value_with_OutOfOffset; eassumption. Defined. Smpl Add simple apply of_value_OutOfOffset : of_value. Definition of_value_CreateCollision : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateCollision" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateCollision" [] [] [] ). Proof. econstructor; apply of_value_with_CreateCollision; eassumption. Defined. Smpl Add simple apply of_value_CreateCollision : of_value. Definition of_value_OverflowPayment : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OverflowPayment" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::OverflowPayment" [] [] [] ). Proof. econstructor; apply of_value_with_OverflowPayment; eassumption. Defined. Smpl Add simple apply of_value_OverflowPayment : of_value. Definition of_value_PrecompileError : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::PrecompileError" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::PrecompileError" [] [] [] ). Proof. econstructor; apply of_value_with_PrecompileError; eassumption. Defined. Smpl Add simple apply of_value_PrecompileError : of_value. Definition of_value_NonceOverflow : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NonceOverflow" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::NonceOverflow" [] [] [] ). Proof. econstructor; apply of_value_with_NonceOverflow; eassumption. Defined. Smpl Add simple apply of_value_NonceOverflow : of_value. Definition of_value_CreateContractSizeLimit : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateContractSizeLimit" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateContractSizeLimit" [] [] [] ). Proof. econstructor; apply of_value_with_CreateContractSizeLimit; eassumption. Defined. Smpl Add simple apply of_value_CreateContractSizeLimit : of_value. Definition of_value_CreateContractStartingWithEF : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateContractStartingWithEF" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateContractStartingWithEF" [] [] [] ). Proof. econstructor; apply of_value_with_CreateContractStartingWithEF; eassumption. Defined. Smpl Add simple apply of_value_CreateContractStartingWithEF : of_value. Definition of_value_CreateInitCodeSizeLimit : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateInitCodeSizeLimit" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::CreateInitCodeSizeLimit" [] [] [] ). Proof. econstructor; apply of_value_with_CreateInitCodeSizeLimit; eassumption. Defined. Smpl Add simple apply of_value_CreateInitCodeSizeLimit : of_value. Definition of_value_FatalExternalError : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::FatalExternalError" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::FatalExternalError" [] [] [] ). Proof. econstructor; apply of_value_with_FatalExternalError; eassumption. Defined. Smpl Add simple apply of_value_FatalExternalError : of_value. Definition of_value_ReturnContractInNotInitEOF : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReturnContractInNotInitEOF" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::ReturnContractInNotInitEOF" [] [] [] ). Proof. econstructor; apply of_value_with_ReturnContractInNotInitEOF; eassumption. Defined. Smpl Add simple apply of_value_ReturnContractInNotInitEOF : of_value. Definition of_value_EOFOpcodeDisabledInLegacy : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EOFOpcodeDisabledInLegacy" [] [] [] ). Proof. econstructor; apply of_value_with_EOFOpcodeDisabledInLegacy; eassumption. Defined. Smpl Add simple apply of_value_EOFOpcodeDisabledInLegacy : of_value. Definition of_value_SubRoutineStackOverflow : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::SubRoutineStackOverflow" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::SubRoutineStackOverflow" [] [] [] ). Proof. econstructor; apply of_value_with_SubRoutineStackOverflow; eassumption. Defined. Smpl Add simple apply of_value_SubRoutineStackOverflow : of_value. Definition of_value_EofAuxDataOverflow : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EofAuxDataOverflow" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EofAuxDataOverflow" [] [] [] ). Proof. econstructor; apply of_value_with_EofAuxDataOverflow; eassumption. Defined. Smpl Add simple apply of_value_EofAuxDataOverflow : of_value. Definition of_value_EofAuxDataTooSmall : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EofAuxDataTooSmall" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::EofAuxDataTooSmall" [] [] [] ). Proof. econstructor; apply of_value_with_EofAuxDataTooSmall; eassumption. Defined. Smpl Add simple apply of_value_EofAuxDataTooSmall : of_value. Definition of_value_InvalidEXTCALLTarget : OfValue.t ( - Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidEXTCALLTarget" [] + Value.StructTuple "revm_interpreter::instruction_result::InstructionResult::InvalidEXTCALLTarget" [] [] [] ). Proof. econstructor; apply of_value_with_InvalidEXTCALLTarget; eassumption. Defined. Smpl Add simple apply of_value_InvalidEXTCALLTarget : of_value. diff --git a/CoqOfRust/revm/revm_interpreter/links/interpreter_Interpreter.v b/CoqOfRust/revm/revm_interpreter/links/interpreter_Interpreter.v index e3b609ffa..1c4dfd37d 100644 --- a/CoqOfRust/revm/revm_interpreter/links/interpreter_Interpreter.v +++ b/CoqOfRust/revm/revm_interpreter/links/interpreter_Interpreter.v @@ -44,19 +44,17 @@ Module Interpreter. Link (t WIRE WIRE_types) := { Φ := Ty.apply (Ty.path "revm_interpreter::interpreter::Interpreter") [] [ Φ WIRE ]; φ x := - Value.StructRecord - "revm_interpreter::interpreter::Interpreter" - [ - ("bytecode", φ x.(bytecode)); - ("stack", φ x.(stack)); - ("return_data", φ x.(return_data)); - ("memory", φ x.(memory)); - ("input", φ x.(input)); - ("sub_routine", φ x.(sub_routine)); - ("control", φ x.(control)); - ("runtime_flag", φ x.(runtime_flag)); - ("extend", φ x.(extend)) - ]; + Value.StructRecord "revm_interpreter::interpreter::Interpreter" [] [] [ + ("bytecode", φ x.(bytecode)); + ("stack", φ x.(stack)); + ("return_data", φ x.(return_data)); + ("memory", φ x.(memory)); + ("input", φ x.(input)); + ("sub_routine", φ x.(sub_routine)); + ("control", φ x.(control)); + ("runtime_flag", φ x.(runtime_flag)); + ("extend", φ x.(extend)) + ]; }. (** This requires to have an instance of the trait [InterpreterTypes] in context *) diff --git a/CoqOfRust/revm/revm_interpreter/links/interpreter_InterpreterResult.v b/CoqOfRust/revm/revm_interpreter/links/interpreter_InterpreterResult.v index 39abc2802..5b64bc6e4 100644 --- a/CoqOfRust/revm/revm_interpreter/links/interpreter_InterpreterResult.v +++ b/CoqOfRust/revm/revm_interpreter/links/interpreter_InterpreterResult.v @@ -14,7 +14,7 @@ Module InterpreterResult. Global Instance IsLink : Link t := { Φ := Ty.path "revm_interpreter::interpreter::InterpreterResult"; φ '(Build_t result output gas) := - Value.StructRecord "revm_interpreter::interpreter::InterpreterResult" [ + Value.StructRecord "revm_interpreter::interpreter::InterpreterResult" [] [] [ ("result", φ result); ("output", φ output); ("gas", φ gas) @@ -32,7 +32,7 @@ Module InterpreterResult. result' = φ result -> output' = φ output -> gas' = φ gas -> - Value.StructRecord "revm_interpreter::interpreter::InterpreterResult" [ + Value.StructRecord "revm_interpreter::interpreter::InterpreterResult" [] [] [ ("result", result'); ("output", output'); ("gas", gas') @@ -49,7 +49,7 @@ Module InterpreterResult. output' = φ output -> gas' = φ gas -> OfValue.t ( - Value.StructRecord "revm_interpreter::interpreter::InterpreterResult" [ + Value.StructRecord "revm_interpreter::interpreter::InterpreterResult" [] [] [ ("result", result'); ("output", output'); ("gas", gas') diff --git a/CoqOfRust/revm/revm_interpreter/links/interpreter_action.v b/CoqOfRust/revm/revm_interpreter/links/interpreter_action.v index 3f35d0ef0..3da3ac47a 100644 --- a/CoqOfRust/revm/revm_interpreter/links/interpreter_action.v +++ b/CoqOfRust/revm/revm_interpreter/links/interpreter_action.v @@ -23,15 +23,15 @@ Module FrameInput. φ x := match x with | Call γ0 => - Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Call" [ + Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Call" [] [] [ φ γ0 ] | Create γ0 => - Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Create" [ + Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Create" [] [] [ φ γ0 ] | EOFCreate γ0 => - Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::EOFCreate" [ + Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::EOFCreate" [] [] [ φ γ0 ] end @@ -44,7 +44,7 @@ Module FrameInput. Lemma of_value_with_Call (γ0 : alloc.links.boxed.Box.t revm_interpreter.interpreter_action.links.call_inputs.CallInputs.t alloc.links.alloc.Global.t) (γ0' : Value.t) : γ0' = φ γ0 -> - Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Call" [ + Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Call" [] [] [ γ0' ] = φ (Call γ0). @@ -54,7 +54,7 @@ Module FrameInput. Lemma of_value_with_Create (γ0 : alloc.links.boxed.Box.t revm_interpreter.interpreter_action.links.create_inputs.CreateInputs.t alloc.links.alloc.Global.t) (γ0' : Value.t) : γ0' = φ γ0 -> - Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Create" [ + Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Create" [] [] [ γ0' ] = φ (Create γ0). @@ -64,7 +64,7 @@ Module FrameInput. Lemma of_value_with_EOFCreate (γ0 : alloc.links.boxed.Box.t revm_interpreter.interpreter_action.links.eof_create_inputs.EOFCreateInputs.t alloc.links.alloc.Global.t) (γ0' : Value.t) : γ0' = φ γ0 -> - Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::EOFCreate" [ + Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::EOFCreate" [] [] [ γ0' ] = φ (EOFCreate γ0). @@ -75,7 +75,7 @@ Module FrameInput. (γ0 : alloc.links.boxed.Box.t revm_interpreter.interpreter_action.links.call_inputs.CallInputs.t alloc.links.alloc.Global.t) (γ0' : Value.t) : γ0' = φ γ0 -> OfValue.t ( - Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Call" [ + Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Call" [] [] [ γ0' ] ). @@ -86,7 +86,7 @@ Module FrameInput. (γ0 : alloc.links.boxed.Box.t revm_interpreter.interpreter_action.links.create_inputs.CreateInputs.t alloc.links.alloc.Global.t) (γ0' : Value.t) : γ0' = φ γ0 -> OfValue.t ( - Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Create" [ + Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::Create" [] [] [ γ0' ] ). @@ -97,7 +97,7 @@ Module FrameInput. (γ0 : alloc.links.boxed.Box.t revm_interpreter.interpreter_action.links.eof_create_inputs.EOFCreateInputs.t alloc.links.alloc.Global.t) (γ0' : Value.t) : γ0' = φ γ0 -> OfValue.t ( - Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::EOFCreate" [ + Value.StructTuple "revm_interpreter::interpreter_action::FrameInput::EOFCreate" [] [] [ γ0' ] ). @@ -119,15 +119,15 @@ Module InterpreterAction. φ x := match x with | NewFrame γ0 => - Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::NewFrame" [ + Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::NewFrame" [] [] [ φ γ0 ] | Return result => - Value.StructRecord "revm_interpreter::interpreter_action::InterpreterAction::Return" [ + Value.StructRecord "revm_interpreter::interpreter_action::InterpreterAction::Return" [] [] [ ("result", φ result) ] | None_ => - Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::None" [] + Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::None" [] [] [] end }. @@ -138,7 +138,7 @@ Module InterpreterAction. Lemma of_value_with_NewFrame (γ0 : revm_interpreter.links.interpreter_action.FrameInput.t) (γ0' : Value.t) : γ0' = φ γ0 -> - Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::NewFrame" [ + Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::NewFrame" [] [] [ γ0' ] = φ (NewFrame γ0). @@ -148,7 +148,7 @@ Module InterpreterAction. Lemma of_value_with_Return (result : InterpreterResult.t) (result' : Value.t) : result' = φ result -> - Value.StructRecord "revm_interpreter::interpreter_action::InterpreterAction::Return" [ + Value.StructRecord "revm_interpreter::interpreter_action::InterpreterAction::Return" [] [] [ ("result", result') ] = φ (Return result). @@ -156,7 +156,7 @@ Module InterpreterAction. Smpl Add simple apply of_value_with_Return : of_value. Lemma of_value_with_None : - Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::None" [] = + Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::None" [] [] [] = φ None_. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_None : of_value. @@ -165,7 +165,7 @@ Module InterpreterAction. (γ0 : revm_interpreter.links.interpreter_action.FrameInput.t) (γ0' : Value.t) : γ0' = φ γ0 -> OfValue.t ( - Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::NewFrame" [ + Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::NewFrame" [] [] [ γ0' ] ). @@ -176,7 +176,7 @@ Module InterpreterAction. (result : InterpreterResult.t) (result' : Value.t) : result' = φ result -> OfValue.t ( - Value.StructRecord "revm_interpreter::interpreter_action::InterpreterAction::Return" [ + Value.StructRecord "revm_interpreter::interpreter_action::InterpreterAction::Return" [] [] [ ("result", result') ] ). @@ -185,7 +185,7 @@ Module InterpreterAction. Definition of_value_None : OfValue.t ( - Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::None" [] + Value.StructTuple "revm_interpreter::interpreter_action::InterpreterAction::None" [] [] [] ). Proof. econstructor; apply of_value_with_None; eassumption. Defined. Smpl Add simple apply of_value_None : of_value. diff --git a/CoqOfRust/revm/revm_interpreter/table.v b/CoqOfRust/revm/revm_interpreter/table.v index 334b75e7b..5a4ae8130 100644 --- a/CoqOfRust/revm/revm_interpreter/table.v +++ b/CoqOfRust/revm/revm_interpreter/table.v @@ -515,6 +515,8 @@ Module table. M.deref (| M.read (| self |) |), Value.StructTuple "revm_interpreter::table::InstructionTables::Custom" + [] + [ WIRE; H; CI ] [ M.call_closure (| Ty.apply diff --git a/CoqOfRust/revm/revm_precompile/blake2.v b/CoqOfRust/revm/revm_precompile/blake2.v index 02a474abb..4148c6477 100644 --- a/CoqOfRust/revm/revm_precompile/blake2.v +++ b/CoqOfRust/revm/revm_precompile/blake2.v @@ -23,6 +23,8 @@ Module blake2. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -170,7 +172,7 @@ Module blake2. |) |) |); - Value.StructTuple "core::ops::range::RangeFull" [] + Value.StructTuple "core::ops::range::RangeFull" [] [] [] ] |) |) @@ -221,6 +223,11 @@ Module blake2. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -237,6 +244,8 @@ Module blake2. Value.StructTuple "revm_precompile::interface::PrecompileError::Blake2WrongLength" [] + [] + [] ] |) ] @@ -334,6 +343,8 @@ Module blake2. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 4) ] ] |) @@ -382,6 +393,11 @@ Module blake2. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -398,6 +414,8 @@ Module blake2. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -441,6 +459,11 @@ Module blake2. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -458,6 +481,8 @@ Module blake2. Value.StructTuple "revm_precompile::interface::PrecompileError::Blake2WrongFinalIndicatorFlag" [] + [] + [] ] |) ] @@ -591,6 +616,8 @@ Module blake2. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 4); ("end_", Value.Integer IntegerKind.Usize 68) @@ -775,6 +802,8 @@ Module blake2. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| pos |)); ("end_", @@ -905,6 +934,8 @@ Module blake2. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 68); ("end_", Value.Integer IntegerKind.Usize 196) @@ -1089,6 +1120,8 @@ Module blake2. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| pos |)); ("end_", @@ -1218,6 +1251,8 @@ Module blake2. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 196); ("end_", @@ -1323,6 +1358,8 @@ Module blake2. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 204); ("end_", @@ -1477,6 +1514,8 @@ Module blake2. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", Value.Integer IntegerKind.Usize 64) @@ -1623,6 +1662,8 @@ Module blake2. M.borrow (| Pointer.Kind.MutRef, out |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| i |)); ("end_", @@ -1681,6 +1722,11 @@ Module blake2. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", @@ -2303,6 +2349,8 @@ Module blake2. M.borrow (| Pointer.Kind.MutRef, v |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -2373,6 +2421,8 @@ Module blake2. M.borrow (| Pointer.Kind.MutRef, v |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -2495,6 +2545,8 @@ Module blake2. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| rounds |)) @@ -2996,6 +3048,8 @@ Module blake2. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", Value.Integer IntegerKind.Usize 8) diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/g1.v b/CoqOfRust/revm/revm_precompile/bls12_381/g1.v index 60cb4ffb9..2f1ac85f7 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/g1.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/g1.v @@ -109,6 +109,8 @@ Module bls12_381. M.borrow (| Pointer.Kind.MutRef, out |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -178,6 +180,8 @@ Module bls12_381. M.borrow (| Pointer.Kind.MutRef, out |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -270,6 +274,8 @@ Module bls12_381. M.alloc (| Value.StructRecord "blst::blst_p1_affine" + [] + [] [ ("x", M.read (| @@ -523,7 +529,16 @@ Module bls12_381. |)) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| out |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.path "blst::blst_p1_affine"; + Ty.path "revm_precompile::interface::PrecompileError" + ] + [ M.read (| out |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -651,9 +666,16 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "blst::blst_p1_affine"; + Ty.path "revm_precompile::interface::PrecompileError" + ] [ Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -989,6 +1011,8 @@ Module bls12_381. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -1205,6 +1229,8 @@ Module bls12_381. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -1469,9 +1495,16 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "blst::blst_p1_affine"; + Ty.path "revm_precompile::interface::PrecompileError" + ] [ Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -1541,9 +1574,16 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "blst::blst_p1_affine"; + Ty.path "revm_precompile::interface::PrecompileError" + ] [ Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -1576,7 +1616,16 @@ Module bls12_381. |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| out |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.path "blst::blst_p1_affine"; + Ty.path "revm_precompile::interface::PrecompileError" + ] + [ M.read (| out |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/g1_add.v b/CoqOfRust/revm/revm_precompile/bls12_381/g1_add.v index d2f6b40a3..2cf8facd6 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/g1_add.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/g1_add.v @@ -8,6 +8,8 @@ Module bls12_381. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -137,6 +139,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -154,6 +161,8 @@ Module bls12_381. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -232,6 +241,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -248,6 +262,8 @@ Module bls12_381. [ Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -615,6 +631,8 @@ Module bls12_381. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -840,6 +858,8 @@ Module bls12_381. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -1046,6 +1066,11 @@ Module bls12_381. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/g1_msm.v b/CoqOfRust/revm/revm_precompile/bls12_381/g1_msm.v index 921f98dbe..cfec73c3c 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/g1_msm.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/g1_msm.v @@ -8,6 +8,8 @@ Module bls12_381. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -192,6 +194,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -208,6 +215,8 @@ Module bls12_381. [ Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -402,6 +411,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -419,6 +433,8 @@ Module bls12_381. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -518,6 +534,8 @@ Module bls12_381. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| k |)) @@ -685,6 +703,8 @@ Module bls12_381. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -1282,6 +1302,11 @@ Module bls12_381. |); Value.StructRecord "core::ops::range::Range" + [] + [ + Ty.path + "usize" + ] [ ("start", M.call_closure (| @@ -1498,6 +1523,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", @@ -1677,6 +1707,11 @@ Module bls12_381. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/g1_mul.v b/CoqOfRust/revm/revm_precompile/bls12_381/g1_mul.v index 0c7268b4c..e432407b0 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/g1_mul.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/g1_mul.v @@ -8,6 +8,8 @@ Module bls12_381. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -138,6 +140,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -155,6 +162,8 @@ Module bls12_381. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -233,6 +242,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -249,6 +263,8 @@ Module bls12_381. [ Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -555,6 +571,8 @@ Module bls12_381. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -855,6 +873,8 @@ Module bls12_381. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -1053,6 +1073,11 @@ Module bls12_381. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/g2.v b/CoqOfRust/revm/revm_precompile/bls12_381/g2.v index 000d26400..0cf2b012c 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/g2.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/g2.v @@ -116,6 +116,8 @@ Module bls12_381. M.borrow (| Pointer.Kind.MutRef, out |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -192,6 +194,8 @@ Module bls12_381. M.borrow (| Pointer.Kind.MutRef, out |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -282,6 +286,8 @@ Module bls12_381. M.borrow (| Pointer.Kind.MutRef, out |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -379,6 +385,8 @@ Module bls12_381. M.borrow (| Pointer.Kind.MutRef, out |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -497,9 +505,16 @@ Module bls12_381. ltac:(M.monadic (Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "blst::blst_p2_affine"; + Ty.path "revm_precompile::interface::PrecompileError" + ] [ Value.StructRecord "blst::blst_p2_affine" + [] + [] [ ("x", M.read (| @@ -1031,9 +1046,20 @@ Module bls12_381. M.alloc (| Value.StructRecord "blst::blst_fp2" + [] + [] [ ("fp", Value.Array [ M.read (| fp_1 |); M.read (| fp_2 |) ]) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| fp2 |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.path "blst::blst_fp2"; + Ty.path "revm_precompile::interface::PrecompileError" + ] + [ M.read (| fp2 |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1164,9 +1190,16 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "blst::blst_p2_affine"; + Ty.path "revm_precompile::interface::PrecompileError" + ] [ Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -1423,6 +1456,8 @@ Module bls12_381. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", Value.Integer IntegerKind.Usize 4) @@ -1646,6 +1681,8 @@ Module bls12_381. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -2003,9 +2040,16 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "blst::blst_p2_affine"; + Ty.path "revm_precompile::interface::PrecompileError" + ] [ Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -2075,9 +2119,16 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "blst::blst_p2_affine"; + Ty.path "revm_precompile::interface::PrecompileError" + ] [ Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -2110,7 +2161,16 @@ Module bls12_381. |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| out |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.path "blst::blst_p2_affine"; + Ty.path "revm_precompile::interface::PrecompileError" + ] + [ M.read (| out |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/g2_add.v b/CoqOfRust/revm/revm_precompile/bls12_381/g2_add.v index 233ce6749..95522e7f5 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/g2_add.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/g2_add.v @@ -8,6 +8,8 @@ Module bls12_381. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -137,6 +139,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -154,6 +161,8 @@ Module bls12_381. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -232,6 +241,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -248,6 +262,8 @@ Module bls12_381. [ Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -615,6 +631,8 @@ Module bls12_381. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -840,6 +858,8 @@ Module bls12_381. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -1046,6 +1066,11 @@ Module bls12_381. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/g2_msm.v b/CoqOfRust/revm/revm_precompile/bls12_381/g2_msm.v index 3f85ca756..8bbf63a0c 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/g2_msm.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/g2_msm.v @@ -8,6 +8,8 @@ Module bls12_381. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -192,6 +194,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -208,6 +215,8 @@ Module bls12_381. [ Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -402,6 +411,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -419,6 +433,8 @@ Module bls12_381. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -518,6 +534,8 @@ Module bls12_381. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| k |)) @@ -685,6 +703,8 @@ Module bls12_381. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -1282,6 +1302,11 @@ Module bls12_381. |); Value.StructRecord "core::ops::range::Range" + [] + [ + Ty.path + "usize" + ] [ ("start", M.call_closure (| @@ -1498,6 +1523,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", @@ -1677,6 +1707,11 @@ Module bls12_381. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/g2_mul.v b/CoqOfRust/revm/revm_precompile/bls12_381/g2_mul.v index f447684c1..8c4285379 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/g2_mul.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/g2_mul.v @@ -8,6 +8,8 @@ Module bls12_381. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -135,6 +137,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -152,6 +159,8 @@ Module bls12_381. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -230,6 +239,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -246,6 +260,8 @@ Module bls12_381. [ Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -613,6 +629,8 @@ Module bls12_381. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -858,6 +876,8 @@ Module bls12_381. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -1056,6 +1076,11 @@ Module bls12_381. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/map_fp2_to_g2.v b/CoqOfRust/revm/revm_precompile/bls12_381/map_fp2_to_g2.v index a7cd7d801..3ae4391c1 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/map_fp2_to_g2.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/map_fp2_to_g2.v @@ -8,6 +8,8 @@ Module bls12_381. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -131,6 +133,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -148,6 +155,8 @@ Module bls12_381. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -226,6 +235,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -242,6 +256,8 @@ Module bls12_381. [ Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -650,6 +666,8 @@ Module bls12_381. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -912,6 +930,8 @@ Module bls12_381. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -1221,6 +1241,11 @@ Module bls12_381. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/map_fp_to_g1.v b/CoqOfRust/revm/revm_precompile/bls12_381/map_fp_to_g1.v index 8aee30a97..710f48faf 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/map_fp_to_g1.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/map_fp_to_g1.v @@ -8,6 +8,8 @@ Module bls12_381. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -132,6 +134,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -149,6 +156,8 @@ Module bls12_381. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -227,6 +236,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -243,6 +257,8 @@ Module bls12_381. [ Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -900,6 +916,11 @@ Module bls12_381. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/pairing.v b/CoqOfRust/revm/revm_precompile/bls12_381/pairing.v index 27dcce643..0f6cc76a3 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/pairing.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/pairing.v @@ -8,6 +8,8 @@ Module bls12_381. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -240,6 +242,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -256,6 +263,8 @@ Module bls12_381. [ Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -458,6 +467,11 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -475,6 +489,8 @@ Module bls12_381. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -520,6 +536,8 @@ Module bls12_381. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| k |)) @@ -751,6 +769,8 @@ Module bls12_381. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -1051,6 +1071,8 @@ Module bls12_381. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -1464,6 +1486,11 @@ Module bls12_381. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/utils.v b/CoqOfRust/revm/revm_precompile/bls12_381/utils.v index 40080f02e..787ab708e 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/utils.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/utils.v @@ -365,9 +365,24 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "array") + [ Value.Integer IntegerKind.Usize 48 ] + [ Ty.path "u8" ] + ]; + Ty.path "revm_precompile::interface::PrecompileError" + ] [ Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -744,9 +759,24 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "array") + [ Value.Integer IntegerKind.Usize 48 ] + [ Ty.path "u8" ] + ]; + Ty.path "revm_precompile::interface::PrecompileError" + ] [ Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -867,6 +897,19 @@ Module bls12_381. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "&") + [] + [ + Ty.apply + (Ty.path "array") + [ Value.Integer IntegerKind.Usize 48 ] + [ Ty.path "u8" ] + ]; + Ty.path "revm_precompile::interface::PrecompileError" + ] [ M.call_closure (| Ty.apply @@ -1041,9 +1084,16 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "blst::blst_scalar"; + Ty.path "revm_precompile::interface::PrecompileError" + ] [ Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -1286,7 +1336,16 @@ Module bls12_381. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| out |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.path "blst::blst_scalar"; + Ty.path "revm_precompile::interface::PrecompileError" + ] + [ M.read (| out |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1628,9 +1687,16 @@ Module bls12_381. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "blst::blst_fp"; + Ty.path "revm_precompile::interface::PrecompileError" + ] [ Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -1704,7 +1770,14 @@ Module bls12_381. |) |) in M.alloc (| Value.Tuple [] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| fp |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.path "blst::blst_fp"; Ty.path "revm_precompile::interface::PrecompileError" + ] + [ M.read (| fp |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/revm/revm_precompile/bn128.v b/CoqOfRust/revm/revm_precompile/bn128.v index aa14573ae..ffb241237 100644 --- a/CoqOfRust/revm/revm_precompile/bn128.v +++ b/CoqOfRust/revm/revm_precompile/bn128.v @@ -37,6 +37,8 @@ Module bn128. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.read (| get_constant (| @@ -223,6 +225,8 @@ Module bn128. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.read (| get_constant (| @@ -426,6 +430,8 @@ Module bn128. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.read (| get_constant (| @@ -612,6 +618,8 @@ Module bn128. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.read (| get_constant (| @@ -823,6 +831,8 @@ Module bn128. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.read (| get_constant (| @@ -1027,6 +1037,8 @@ Module bn128. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.read (| get_constant (| @@ -1308,6 +1320,8 @@ Module bn128. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| input |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 32) ] ] |) @@ -1338,6 +1352,8 @@ Module bn128. ltac:(M.monadic (Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128FieldPointNotAMember" + [] + [] [])) ] |))) @@ -1450,6 +1466,8 @@ Module bn128. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", Value.Integer IntegerKind.Usize 32) @@ -1606,6 +1624,8 @@ Module bn128. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 32); ("end_", Value.Integer IntegerKind.Usize 64) @@ -1814,6 +1834,11 @@ Module bn128. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "substrate_bn::G1"; + Ty.path "revm_precompile::interface::PrecompileError" + ] [ M.call_closure (| Ty.path "substrate_bn::G1", @@ -1927,6 +1952,8 @@ Module bn128. ltac:(M.monadic (Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128AffineGFailedToCreate" + [] + [] [])) ] |))) @@ -2005,6 +2032,11 @@ Module bn128. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -2021,6 +2053,8 @@ Module bn128. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -2175,6 +2209,8 @@ Module bn128. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 64) ] ] |) @@ -2361,6 +2397,8 @@ Module bn128. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 64) ] ] |) @@ -2567,6 +2605,8 @@ Module bn128. M.borrow (| Pointer.Kind.MutRef, output |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 32) ] ] |) @@ -2652,6 +2692,8 @@ Module bn128. M.borrow (| Pointer.Kind.MutRef, output |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 32) ] ] |) @@ -2671,6 +2713,11 @@ Module bn128. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", @@ -2773,6 +2820,11 @@ Module bn128. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -2789,6 +2841,8 @@ Module bn128. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -2943,6 +2997,8 @@ Module bn128. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 64) ] ] |) @@ -3110,6 +3166,8 @@ Module bn128. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 64); ("end_", Value.Integer IntegerKind.Usize 96) @@ -3255,6 +3313,8 @@ Module bn128. M.borrow (| Pointer.Kind.MutRef, output |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 32) ] ] |) @@ -3340,6 +3400,8 @@ Module bn128. M.borrow (| Pointer.Kind.MutRef, output |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 32) ] ] |) @@ -3359,6 +3421,11 @@ Module bn128. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", @@ -3552,6 +3619,11 @@ Module bn128. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -3568,6 +3640,8 @@ Module bn128. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -3630,6 +3704,11 @@ Module bn128. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -3646,6 +3725,8 @@ Module bn128. Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128PairLength" [] + [] + [] ] |) ] @@ -3783,6 +3864,8 @@ Module bn128. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| elements |)) @@ -4144,6 +4227,11 @@ Module bn128. |); Value.StructRecord "core::ops::range::Range" + [] + [ + Ty.path + "usize" + ] [ ("start", M.read (| @@ -4269,6 +4357,8 @@ Module bn128. ltac:(M.monadic (Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128FieldPointNotAMember" + [] + [] [])) ] |))) @@ -5697,6 +5787,8 @@ Module bn128. ltac:(M.monadic (Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128AffineGFailedToCreate" + [] + [] [])) ] |))) @@ -5930,6 +6022,11 @@ Module bn128. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", diff --git a/CoqOfRust/revm/revm_precompile/hash.v b/CoqOfRust/revm/revm_precompile/hash.v index 5e5192660..5132e30a1 100644 --- a/CoqOfRust/revm/revm_precompile/hash.v +++ b/CoqOfRust/revm/revm_precompile/hash.v @@ -7,6 +7,8 @@ Module hash. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -28,6 +30,8 @@ Module hash. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -127,6 +131,11 @@ Module hash. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -143,6 +152,8 @@ Module hash. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -307,6 +318,11 @@ Module hash. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", @@ -516,6 +532,11 @@ Module hash. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -532,6 +553,8 @@ Module hash. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -754,6 +777,8 @@ Module hash. M.borrow (| Pointer.Kind.MutRef, output |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 12) ] ] |) @@ -769,6 +794,11 @@ Module hash. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", diff --git a/CoqOfRust/revm/revm_precompile/identity.v b/CoqOfRust/revm/revm_precompile/identity.v index fc389c301..93c54e6cb 100644 --- a/CoqOfRust/revm/revm_precompile/identity.v +++ b/CoqOfRust/revm/revm_precompile/identity.v @@ -7,6 +7,8 @@ Module identity. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -136,6 +138,11 @@ Module identity. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -152,6 +159,8 @@ Module identity. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -165,6 +174,11 @@ Module identity. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", diff --git a/CoqOfRust/revm/revm_precompile/interface.v b/CoqOfRust/revm/revm_precompile/interface.v index 7cef25899..a9b7009fe 100644 --- a/CoqOfRust/revm/revm_precompile/interface.v +++ b/CoqOfRust/revm/revm_precompile/interface.v @@ -32,6 +32,8 @@ Module interface. (let self := M.alloc (| self |) in Value.StructRecord "revm_precompile::interface::PrecompileOutput" + [] + [] [ ("gas_used", M.call_closure (| @@ -406,6 +408,8 @@ Module interface. let bytes := M.alloc (| bytes |) in Value.StructRecord "revm_precompile::interface::PrecompileOutput" + [] + [] [ ("gas_used", M.read (| gas_used |)); ("bytes", M.read (| bytes |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -478,6 +482,8 @@ Module interface. M.alloc (| Value.StructTuple "revm_precompile::interface::PrecompileErrors::Error" + [] + [] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileError", @@ -507,6 +513,8 @@ Module interface. M.alloc (| Value.StructRecord "revm_precompile::interface::PrecompileErrors::Fatal" + [] + [] [ ("msg", M.call_closure (| @@ -998,6 +1006,8 @@ Module interface. (let value := M.alloc (| value |) in Value.StructTuple "revm_context_interface::result::EVMError::Precompile" + [] + [ DB; TXERROR ] [ M.call_closure (| Ty.path "alloc::string::String", @@ -1272,7 +1282,11 @@ Module interface. "revm_precompile::interface::PrecompileError::OutOfGas" |) in M.alloc (| - Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + Value.StructTuple + "revm_precompile::interface::PrecompileError::OutOfGas" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1286,6 +1300,8 @@ Module interface. Value.StructTuple "revm_precompile::interface::PrecompileError::Blake2WrongLength" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1299,6 +1315,8 @@ Module interface. Value.StructTuple "revm_precompile::interface::PrecompileError::Blake2WrongFinalIndicatorFlag" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1312,6 +1330,8 @@ Module interface. Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpExpOverflow" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1325,6 +1345,8 @@ Module interface. Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpBaseOverflow" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1338,6 +1360,8 @@ Module interface. Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpModOverflow" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1351,6 +1375,8 @@ Module interface. Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128FieldPointNotAMember" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1364,6 +1390,8 @@ Module interface. Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128AffineGFailedToCreate" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1377,6 +1405,8 @@ Module interface. Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128PairLength" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1390,6 +1420,8 @@ Module interface. Value.StructTuple "revm_precompile::interface::PrecompileError::BlobInvalidInputLength" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1403,6 +1435,8 @@ Module interface. Value.StructTuple "revm_precompile::interface::PrecompileError::BlobMismatchedVersion" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1416,6 +1450,8 @@ Module interface. Value.StructTuple "revm_precompile::interface::PrecompileError::BlobVerifyKzgProofFailed" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1430,6 +1466,8 @@ Module interface. M.alloc (| Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -2136,6 +2174,8 @@ Module interface. (let err := M.alloc (| err |) in Value.StructTuple "revm_precompile::interface::PrecompileError::Other" + [] + [] [ M.call_closure (| Ty.path "alloc::string::String", @@ -2209,6 +2249,8 @@ Module interface. (let err := M.alloc (| err |) in Value.StructTuple "revm_precompile::interface::PrecompileErrors::Error" + [] + [] [ M.read (| err |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/revm/revm_precompile/kzg_point_evaluation.v b/CoqOfRust/revm/revm_precompile/kzg_point_evaluation.v index c9f6072b0..f5053faf9 100644 --- a/CoqOfRust/revm/revm_precompile/kzg_point_evaluation.v +++ b/CoqOfRust/revm/revm_precompile/kzg_point_evaluation.v @@ -7,6 +7,8 @@ Module kzg_point_evaluation. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.read (| get_constant (| @@ -162,6 +164,11 @@ Module kzg_point_evaluation. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -178,6 +185,8 @@ Module kzg_point_evaluation. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -250,6 +259,11 @@ Module kzg_point_evaluation. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -266,6 +280,8 @@ Module kzg_point_evaluation. Value.StructTuple "revm_precompile::interface::PrecompileError::BlobInvalidInputLength" [] + [] + [] ] |) ] @@ -348,6 +364,8 @@ Module kzg_point_evaluation. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 32) ] ] |) @@ -426,6 +444,8 @@ Module kzg_point_evaluation. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 96); ("end_", Value.Integer IntegerKind.Usize 144) @@ -498,6 +518,11 @@ Module kzg_point_evaluation. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -514,6 +539,8 @@ Module kzg_point_evaluation. Value.StructTuple "revm_precompile::interface::PrecompileError::BlobMismatchedVersion" [] + [] + [] ] |) ] @@ -630,6 +657,8 @@ Module kzg_point_evaluation. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 32); ("end_", Value.Integer IntegerKind.Usize 64) @@ -733,6 +762,8 @@ Module kzg_point_evaluation. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 64); ("end_", Value.Integer IntegerKind.Usize 96) @@ -836,6 +867,8 @@ Module kzg_point_evaluation. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 144); ("end_", Value.Integer IntegerKind.Usize 192) @@ -889,6 +922,11 @@ Module kzg_point_evaluation. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -905,6 +943,8 @@ Module kzg_point_evaluation. Value.StructTuple "revm_precompile::interface::PrecompileError::BlobVerifyKzgProofFailed" [] + [] + [] ] |) ] @@ -918,6 +958,11 @@ Module kzg_point_evaluation. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", diff --git a/CoqOfRust/revm/revm_precompile/lib.v b/CoqOfRust/revm/revm_precompile/lib.v index 89fd5f605..b7554f795 100644 --- a/CoqOfRust/revm/revm_precompile/lib.v +++ b/CoqOfRust/revm/revm_precompile/lib.v @@ -89,6 +89,8 @@ Module Impl_core_clone_Clone_for_revm_precompile_Precompiles. (let self := M.alloc (| self |) in Value.StructRecord "revm_precompile::Precompiles" + [] + [] [ ("inner", M.call_closure (| @@ -217,6 +219,8 @@ Module Impl_core_default_Default_for_revm_precompile_Precompiles. ltac:(M.monadic (Value.StructRecord "revm_precompile::Precompiles" + [] + [] [ ("inner", M.call_closure (| @@ -2925,6 +2929,8 @@ Module Impl_core_clone_Clone_for_revm_precompile_PrecompileWithAddress. (let self := M.alloc (| self |) in Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -3100,6 +3106,8 @@ Module Impl_core_convert_From_Tuple_alloy_primitives_bits_address_Address_ref__a (let value := M.alloc (| value |) in Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.read (| M.SubPointer.get_tuple_field (| value, 0 |) |); M.read (| M.SubPointer.get_tuple_field (| value, 1 |) |) @@ -3846,7 +3854,11 @@ Module Impl_revm_precompile_PrecompileSpecId. | [] => ltac:(M.monadic (M.alloc (| - Value.StructTuple "revm_precompile::PrecompileSpecId::HOMESTEAD" [] + Value.StructTuple + "revm_precompile::PrecompileSpecId::HOMESTEAD" + [] + [] + [] |))) | _ => M.impossible "wrong number of arguments" end) @@ -3887,7 +3899,11 @@ Module Impl_revm_precompile_PrecompileSpecId. | [] => ltac:(M.monadic (M.alloc (| - Value.StructTuple "revm_precompile::PrecompileSpecId::BYZANTIUM" [] + Value.StructTuple + "revm_precompile::PrecompileSpecId::BYZANTIUM" + [] + [] + [] |))) | _ => M.impossible "wrong number of arguments" end) @@ -3920,7 +3936,11 @@ Module Impl_revm_precompile_PrecompileSpecId. | [] => ltac:(M.monadic (M.alloc (| - Value.StructTuple "revm_precompile::PrecompileSpecId::ISTANBUL" [] + Value.StructTuple + "revm_precompile::PrecompileSpecId::ISTANBUL" + [] + [] + [] |))) | _ => M.impossible "wrong number of arguments" end) @@ -3985,7 +4005,7 @@ Module Impl_revm_precompile_PrecompileSpecId. | [] => ltac:(M.monadic (M.alloc (| - Value.StructTuple "revm_precompile::PrecompileSpecId::BERLIN" [] + Value.StructTuple "revm_precompile::PrecompileSpecId::BERLIN" [] [] [] |))) | _ => M.impossible "wrong number of arguments" end) @@ -3994,7 +4014,9 @@ Module Impl_revm_precompile_PrecompileSpecId. ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "revm_specification::hardfork::SpecId::CANCUN" |) in - M.alloc (| Value.StructTuple "revm_precompile::PrecompileSpecId::CANCUN" [] |))); + M.alloc (| + Value.StructTuple "revm_precompile::PrecompileSpecId::CANCUN" [] [] [] + |))); fun γ => ltac:(M.monadic (M.find_or_pattern (Ty.tuple []) (| @@ -4023,7 +4045,7 @@ Module Impl_revm_precompile_PrecompileSpecId. | [] => ltac:(M.monadic (M.alloc (| - Value.StructTuple "revm_precompile::PrecompileSpecId::PRAGUE" [] + Value.StructTuple "revm_precompile::PrecompileSpecId::PRAGUE" [] [] [] |))) | _ => M.impossible "wrong number of arguments" end) @@ -4032,7 +4054,9 @@ Module Impl_revm_precompile_PrecompileSpecId. ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "revm_specification::hardfork::SpecId::LATEST" |) in - M.alloc (| Value.StructTuple "revm_precompile::PrecompileSpecId::LATEST" [] |))) + M.alloc (| + Value.StructTuple "revm_precompile::PrecompileSpecId::LATEST" [] [] [] + |))) ] |) |))) diff --git a/CoqOfRust/revm/revm_precompile/links/interface.v b/CoqOfRust/revm/revm_precompile/links/interface.v index f6105e6ab..f33385379 100644 --- a/CoqOfRust/revm/revm_precompile/links/interface.v +++ b/CoqOfRust/revm/revm_precompile/links/interface.v @@ -26,31 +26,31 @@ Module PrecompileError. φ x := match x with | OutOfGas => - Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] [] [] | Blake2WrongLength => - Value.StructTuple "revm_precompile::interface::PrecompileError::Blake2WrongLength" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::Blake2WrongLength" [] [] [] | Blake2WrongFinalIndicatorFlag => - Value.StructTuple "revm_precompile::interface::PrecompileError::Blake2WrongFinalIndicatorFlag" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::Blake2WrongFinalIndicatorFlag" [] [] [] | ModexpExpOverflow => - Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpExpOverflow" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpExpOverflow" [] [] [] | ModexpBaseOverflow => - Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpBaseOverflow" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpBaseOverflow" [] [] [] | ModexpModOverflow => - Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpModOverflow" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpModOverflow" [] [] [] | Bn128FieldPointNotAMember => - Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128FieldPointNotAMember" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128FieldPointNotAMember" [] [] [] | Bn128AffineGFailedToCreate => - Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128AffineGFailedToCreate" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128AffineGFailedToCreate" [] [] [] | Bn128PairLength => - Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128PairLength" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128PairLength" [] [] [] | BlobInvalidInputLength => - Value.StructTuple "revm_precompile::interface::PrecompileError::BlobInvalidInputLength" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::BlobInvalidInputLength" [] [] [] | BlobMismatchedVersion => - Value.StructTuple "revm_precompile::interface::PrecompileError::BlobMismatchedVersion" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::BlobMismatchedVersion" [] [] [] | BlobVerifyKzgProofFailed => - Value.StructTuple "revm_precompile::interface::PrecompileError::BlobVerifyKzgProofFailed" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::BlobVerifyKzgProofFailed" [] [] [] | Other γ0 => - Value.StructTuple "revm_precompile::interface::PrecompileError::Other" [ + Value.StructTuple "revm_precompile::interface::PrecompileError::Other" [] [] [ φ γ0 ] end @@ -61,73 +61,73 @@ Module PrecompileError. Smpl Add simple apply of_ty : of_ty. Lemma of_value_with_OutOfGas : - Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] = + Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] [] [] = φ OutOfGas. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_OutOfGas : of_value. Lemma of_value_with_Blake2WrongLength : - Value.StructTuple "revm_precompile::interface::PrecompileError::Blake2WrongLength" [] = + Value.StructTuple "revm_precompile::interface::PrecompileError::Blake2WrongLength" [] [] [] = φ Blake2WrongLength. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_Blake2WrongLength : of_value. Lemma of_value_with_Blake2WrongFinalIndicatorFlag : - Value.StructTuple "revm_precompile::interface::PrecompileError::Blake2WrongFinalIndicatorFlag" [] = + Value.StructTuple "revm_precompile::interface::PrecompileError::Blake2WrongFinalIndicatorFlag" [] [] [] = φ Blake2WrongFinalIndicatorFlag. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_Blake2WrongFinalIndicatorFlag : of_value. Lemma of_value_with_ModexpExpOverflow : - Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpExpOverflow" [] = + Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpExpOverflow" [] [] [] = φ ModexpExpOverflow. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_ModexpExpOverflow : of_value. Lemma of_value_with_ModexpBaseOverflow : - Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpBaseOverflow" [] = + Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpBaseOverflow" [] [] [] = φ ModexpBaseOverflow. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_ModexpBaseOverflow : of_value. Lemma of_value_with_ModexpModOverflow : - Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpModOverflow" [] = + Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpModOverflow" [] [] [] = φ ModexpModOverflow. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_ModexpModOverflow : of_value. Lemma of_value_with_Bn128FieldPointNotAMember : - Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128FieldPointNotAMember" [] = + Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128FieldPointNotAMember" [] [] [] = φ Bn128FieldPointNotAMember. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_Bn128FieldPointNotAMember : of_value. Lemma of_value_with_Bn128AffineGFailedToCreate : - Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128AffineGFailedToCreate" [] = + Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128AffineGFailedToCreate" [] [] [] = φ Bn128AffineGFailedToCreate. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_Bn128AffineGFailedToCreate : of_value. Lemma of_value_with_Bn128PairLength : - Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128PairLength" [] = + Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128PairLength" [] [] [] = φ Bn128PairLength. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_Bn128PairLength : of_value. Lemma of_value_with_BlobInvalidInputLength : - Value.StructTuple "revm_precompile::interface::PrecompileError::BlobInvalidInputLength" [] = + Value.StructTuple "revm_precompile::interface::PrecompileError::BlobInvalidInputLength" [] [] [] = φ BlobInvalidInputLength. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_BlobInvalidInputLength : of_value. Lemma of_value_with_BlobMismatchedVersion : - Value.StructTuple "revm_precompile::interface::PrecompileError::BlobMismatchedVersion" [] = + Value.StructTuple "revm_precompile::interface::PrecompileError::BlobMismatchedVersion" [] [] [] = φ BlobMismatchedVersion. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_BlobMismatchedVersion : of_value. Lemma of_value_with_BlobVerifyKzgProofFailed : - Value.StructTuple "revm_precompile::interface::PrecompileError::BlobVerifyKzgProofFailed" [] = + Value.StructTuple "revm_precompile::interface::PrecompileError::BlobVerifyKzgProofFailed" [] [] [] = φ BlobVerifyKzgProofFailed. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_BlobVerifyKzgProofFailed : of_value. @@ -135,7 +135,7 @@ Module PrecompileError. Lemma of_value_with_Other (γ0 : alloc.links.string.String.t) (γ0' : Value.t) : γ0' = φ γ0 -> - Value.StructTuple "revm_precompile::interface::PrecompileError::Other" [ + Value.StructTuple "revm_precompile::interface::PrecompileError::Other" [] [] [ γ0' ] = φ (Other γ0). @@ -144,84 +144,84 @@ Module PrecompileError. Definition of_value_OutOfGas : OfValue.t ( - Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] [] [] ). Proof. econstructor; apply of_value_with_OutOfGas; eassumption. Defined. Smpl Add simple apply of_value_OutOfGas : of_value. Definition of_value_Blake2WrongLength : OfValue.t ( - Value.StructTuple "revm_precompile::interface::PrecompileError::Blake2WrongLength" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::Blake2WrongLength" [] [] [] ). Proof. econstructor; apply of_value_with_Blake2WrongLength; eassumption. Defined. Smpl Add simple apply of_value_Blake2WrongLength : of_value. Definition of_value_Blake2WrongFinalIndicatorFlag : OfValue.t ( - Value.StructTuple "revm_precompile::interface::PrecompileError::Blake2WrongFinalIndicatorFlag" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::Blake2WrongFinalIndicatorFlag" [] [] [] ). Proof. econstructor; apply of_value_with_Blake2WrongFinalIndicatorFlag; eassumption. Defined. Smpl Add simple apply of_value_Blake2WrongFinalIndicatorFlag : of_value. Definition of_value_ModexpExpOverflow : OfValue.t ( - Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpExpOverflow" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpExpOverflow" [] [] [] ). Proof. econstructor; apply of_value_with_ModexpExpOverflow; eassumption. Defined. Smpl Add simple apply of_value_ModexpExpOverflow : of_value. Definition of_value_ModexpBaseOverflow : OfValue.t ( - Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpBaseOverflow" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpBaseOverflow" [] [] [] ). Proof. econstructor; apply of_value_with_ModexpBaseOverflow; eassumption. Defined. Smpl Add simple apply of_value_ModexpBaseOverflow : of_value. Definition of_value_ModexpModOverflow : OfValue.t ( - Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpModOverflow" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::ModexpModOverflow" [] [] [] ). Proof. econstructor; apply of_value_with_ModexpModOverflow; eassumption. Defined. Smpl Add simple apply of_value_ModexpModOverflow : of_value. Definition of_value_Bn128FieldPointNotAMember : OfValue.t ( - Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128FieldPointNotAMember" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128FieldPointNotAMember" [] [] [] ). Proof. econstructor; apply of_value_with_Bn128FieldPointNotAMember; eassumption. Defined. Smpl Add simple apply of_value_Bn128FieldPointNotAMember : of_value. Definition of_value_Bn128AffineGFailedToCreate : OfValue.t ( - Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128AffineGFailedToCreate" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128AffineGFailedToCreate" [] [] [] ). Proof. econstructor; apply of_value_with_Bn128AffineGFailedToCreate; eassumption. Defined. Smpl Add simple apply of_value_Bn128AffineGFailedToCreate : of_value. Definition of_value_Bn128PairLength : OfValue.t ( - Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128PairLength" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::Bn128PairLength" [] [] [] ). Proof. econstructor; apply of_value_with_Bn128PairLength; eassumption. Defined. Smpl Add simple apply of_value_Bn128PairLength : of_value. Definition of_value_BlobInvalidInputLength : OfValue.t ( - Value.StructTuple "revm_precompile::interface::PrecompileError::BlobInvalidInputLength" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::BlobInvalidInputLength" [] [] [] ). Proof. econstructor; apply of_value_with_BlobInvalidInputLength; eassumption. Defined. Smpl Add simple apply of_value_BlobInvalidInputLength : of_value. Definition of_value_BlobMismatchedVersion : OfValue.t ( - Value.StructTuple "revm_precompile::interface::PrecompileError::BlobMismatchedVersion" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::BlobMismatchedVersion" [] [] [] ). Proof. econstructor; apply of_value_with_BlobMismatchedVersion; eassumption. Defined. Smpl Add simple apply of_value_BlobMismatchedVersion : of_value. Definition of_value_BlobVerifyKzgProofFailed : OfValue.t ( - Value.StructTuple "revm_precompile::interface::PrecompileError::BlobVerifyKzgProofFailed" [] + Value.StructTuple "revm_precompile::interface::PrecompileError::BlobVerifyKzgProofFailed" [] [] [] ). Proof. econstructor; apply of_value_with_BlobVerifyKzgProofFailed; eassumption. Defined. Smpl Add simple apply of_value_BlobVerifyKzgProofFailed : of_value. @@ -230,7 +230,7 @@ Module PrecompileError. (γ0 : alloc.links.string.String.t) (γ0' : Value.t) : γ0' = φ γ0 -> OfValue.t ( - Value.StructTuple "revm_precompile::interface::PrecompileError::Other" [ + Value.StructTuple "revm_precompile::interface::PrecompileError::Other" [] [] [ γ0' ] ). diff --git a/CoqOfRust/revm/revm_precompile/modexp.v b/CoqOfRust/revm/revm_precompile/modexp.v index ad31e9436..fc1cdc7b2 100644 --- a/CoqOfRust/revm/revm_precompile/modexp.v +++ b/CoqOfRust/revm/revm_precompile/modexp.v @@ -7,6 +7,8 @@ Module modexp. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -29,6 +31,8 @@ Module modexp. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -948,6 +952,11 @@ Module modexp. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -964,6 +973,8 @@ Module modexp. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -1332,6 +1343,13 @@ Module modexp. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "revm_precompile::interface::PrecompileOutput"; + Ty.path + "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path @@ -1502,6 +1520,8 @@ Module modexp. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| @@ -1688,6 +1708,8 @@ Module modexp. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| exp_highp_len |)) @@ -1827,6 +1849,13 @@ Module modexp. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path + "revm_precompile::interface::PrecompileOutput"; + Ty.path + "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path @@ -1848,6 +1877,8 @@ Module modexp. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -2209,6 +2240,8 @@ Module modexp. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -2257,6 +2290,11 @@ Module modexp. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -2324,6 +2362,13 @@ Module modexp. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path + "revm_precompile::interface::PrecompileOutput"; + Ty.path + "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path diff --git a/CoqOfRust/revm/revm_precompile/secp256k1.v b/CoqOfRust/revm/revm_precompile/secp256k1.v index 608318a4d..c12505ff2 100644 --- a/CoqOfRust/revm/revm_precompile/secp256k1.v +++ b/CoqOfRust/revm/revm_precompile/secp256k1.v @@ -7,6 +7,8 @@ Module secp256k1. (M.alloc (| Value.StructTuple "revm_precompile::PrecompileWithAddress" + [] + [] [ M.call_closure (| Ty.path "alloy_primitives::bits::address::Address", @@ -532,6 +534,8 @@ Module secp256k1. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1) ] ] |) @@ -580,6 +584,8 @@ Module secp256k1. M.borrow (| Pointer.Kind.MutRef, hash |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", Value.Integer IntegerKind.Usize 12) ] ] |) @@ -589,7 +595,19 @@ Module secp256k1. ] |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| hash |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply + (Ty.path "alloy_primitives::bits::fixed::FixedBytes") + [ Value.Integer IntegerKind.Usize 32 ] + []; + Ty.path "secp256k1::Error" + ] + [ M.read (| hash |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -673,6 +691,11 @@ Module secp256k1. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileErrors", @@ -689,6 +712,8 @@ Module secp256k1. Value.StructTuple "revm_precompile::interface::PrecompileError::OutOfGas" [] + [] + [] ] |) ] @@ -902,6 +927,8 @@ Module secp256k1. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 32); @@ -1043,6 +1070,11 @@ Module secp256k1. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", @@ -1227,6 +1259,8 @@ Module secp256k1. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", Value.Integer IntegerKind.Usize 32) @@ -1434,6 +1468,8 @@ Module secp256k1. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 64); ("end_", Value.Integer IntegerKind.Usize 128) @@ -1627,6 +1663,11 @@ Module secp256k1. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "revm_precompile::interface::PrecompileOutput"; + Ty.path "revm_precompile::interface::PrecompileErrors" + ] [ M.call_closure (| Ty.path "revm_precompile::interface::PrecompileOutput", diff --git a/CoqOfRust/revm/revm_precompile/utilities.v b/CoqOfRust/revm/revm_precompile/utilities.v index b08b8d9f0..0ad2a55e4 100644 --- a/CoqOfRust/revm/revm_precompile/utilities.v +++ b/CoqOfRust/revm/revm_precompile/utilities.v @@ -56,6 +56,8 @@ Module utilities. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| offset |)) ] ] |) @@ -128,6 +130,8 @@ Module utilities. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| offset |)) ] ] |) @@ -199,7 +203,11 @@ Module utilities. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); - Value.StructRecord "core::ops::range::RangeTo" [ ("end_", LEN) ] + Value.StructRecord + "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] + [ ("end_", LEN) ] ] |) |) in @@ -209,6 +217,8 @@ Module utilities. M.alloc (| Value.StructTuple "alloc::borrow::Cow::Borrowed" + [] + [ Ty.apply (Ty.path "array") [ LEN ] [ Ty.path "u8" ] ] [ M.call_closure (| Ty.apply @@ -310,6 +320,8 @@ Module utilities. M.borrow (| Pointer.Kind.MutRef, padded |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -337,7 +349,11 @@ Module utilities. |) |) in M.alloc (| - Value.StructTuple "alloc::borrow::Cow::Owned" [ M.read (| padded |) ] + Value.StructTuple + "alloc::borrow::Cow::Owned" + [] + [ Ty.apply (Ty.path "array") [ LEN ] [ Ty.path "u8" ] ] + [ M.read (| padded |) ] |))) ] |) @@ -404,6 +420,8 @@ Module utilities. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| len |)) ] ] |) @@ -414,6 +432,8 @@ Module utilities. M.alloc (| Value.StructTuple "alloc::borrow::Cow::Borrowed" + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |) ] |))); fun γ => @@ -478,6 +498,8 @@ Module utilities. M.borrow (| Pointer.Kind.MutRef, padded |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -505,7 +527,11 @@ Module utilities. |) |) in M.alloc (| - Value.StructTuple "alloc::borrow::Cow::Owned" [ M.read (| padded |) ] + Value.StructTuple + "alloc::borrow::Cow::Owned" + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ] + [ M.read (| padded |) ] |))) ] |) @@ -569,7 +595,11 @@ Module utilities. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); - Value.StructRecord "core::ops::range::RangeTo" [ ("end_", LEN) ] + Value.StructRecord + "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] + [ ("end_", LEN) ] ] |) |) in @@ -579,6 +609,8 @@ Module utilities. M.alloc (| Value.StructTuple "alloc::borrow::Cow::Borrowed" + [] + [ Ty.apply (Ty.path "array") [ LEN ] [ Ty.path "u8" ] ] [ M.call_closure (| Ty.apply @@ -680,6 +712,8 @@ Module utilities. M.borrow (| Pointer.Kind.MutRef, padded |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -714,7 +748,11 @@ Module utilities. |) |) in M.alloc (| - Value.StructTuple "alloc::borrow::Cow::Owned" [ M.read (| padded |) ] + Value.StructTuple + "alloc::borrow::Cow::Owned" + [] + [ Ty.apply (Ty.path "array") [ LEN ] [ Ty.path "u8" ] ] + [ M.read (| padded |) ] |))) ] |) @@ -781,6 +819,8 @@ Module utilities. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| len |)) ] ] |) @@ -791,6 +831,8 @@ Module utilities. M.alloc (| Value.StructTuple "alloc::borrow::Cow::Borrowed" + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ] [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| data |) |) |) ] |))); fun γ => @@ -855,6 +897,8 @@ Module utilities. M.borrow (| Pointer.Kind.MutRef, padded |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -889,7 +933,11 @@ Module utilities. |) |) in M.alloc (| - Value.StructTuple "alloc::borrow::Cow::Owned" [ M.read (| padded |) ] + Value.StructTuple + "alloc::borrow::Cow::Owned" + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ] + [ M.read (| padded |) ] |))) ] |) diff --git a/CoqOfRust/revm/revm_specification/eip7702/authorization_list.v b/CoqOfRust/revm/revm_specification/eip7702/authorization_list.v index 0ae5dac6a..abc9601fb 100644 --- a/CoqOfRust/revm/revm_specification/eip7702/authorization_list.v +++ b/CoqOfRust/revm/revm_specification/eip7702/authorization_list.v @@ -83,6 +83,8 @@ Module eip7702. M.alloc (| Value.StructTuple "revm_specification::eip7702::authorization_list::AuthorizationList::Signed" + [] + [] [ M.call_closure (| Ty.apply @@ -125,6 +127,8 @@ Module eip7702. M.alloc (| Value.StructTuple "revm_specification::eip7702::authorization_list::AuthorizationList::Recovered" + [] + [] [ M.call_closure (| Ty.apply @@ -556,6 +560,8 @@ Module eip7702. ltac:(M.monadic (Value.StructTuple "revm_specification::eip7702::authorization_list::AuthorizationList::Signed" + [] + [] [ M.call_closure (| Ty.apply @@ -608,6 +614,8 @@ Module eip7702. (let signed := M.alloc (| signed |) in Value.StructTuple "revm_specification::eip7702::authorization_list::AuthorizationList::Signed" + [] + [] [ M.read (| signed |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -646,6 +654,8 @@ Module eip7702. (let recovered := M.alloc (| recovered |) in Value.StructTuple "revm_specification::eip7702::authorization_list::AuthorizationList::Recovered" + [] + [] [ M.read (| recovered |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -769,6 +779,8 @@ Module eip7702. ltac:(M.monadic (Value.StructTuple "revm_specification::eip7702::authorization_list::AuthorizationList::Recovered" + [] + [] [ M.call_closure (| Ty.apply @@ -1308,6 +1320,8 @@ Module eip7702. M.alloc (| Value.StructTuple "revm_specification::eip7702::authorization_list::AuthorizationList::Recovered" + [] + [] [ M.call_closure (| Ty.apply @@ -1650,6 +1664,8 @@ Module eip7702. Value.StructTuple "revm_specification::eip7702::authorization_list::InvalidAuthorization::InvalidChainId" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1663,6 +1679,8 @@ Module eip7702. Value.StructTuple "revm_specification::eip7702::authorization_list::InvalidAuthorization::InvalidYParity" [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1676,6 +1694,8 @@ Module eip7702. Value.StructTuple "revm_specification::eip7702::authorization_list::InvalidAuthorization::Eip2InvalidSValue" [] + [] + [] |))) ] |) diff --git a/CoqOfRust/revm/revm_specification/eip7702/recovered_authorization.v b/CoqOfRust/revm/revm_specification/eip7702/recovered_authorization.v index 42511c5f2..c776af011 100644 --- a/CoqOfRust/revm/revm_specification/eip7702/recovered_authorization.v +++ b/CoqOfRust/revm/revm_specification/eip7702/recovered_authorization.v @@ -110,6 +110,8 @@ Module eip7702. (let self := M.alloc (| self |) in Value.StructRecord "revm_specification::eip7702::recovered_authorization::RecoveredAuthorization" + [] + [] [ ("inner", M.call_closure (| @@ -442,6 +444,8 @@ Module eip7702. let authority := M.alloc (| authority |) in Value.StructRecord "revm_specification::eip7702::recovered_authorization::RecoveredAuthorization" + [] + [] [ ("inner", M.read (| inner |)); ("authority", M.read (| authority |)) ])) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/revm/revm_specification/hardfork.v b/CoqOfRust/revm/revm_specification/hardfork.v index e5ce84613..86ba4c5ba 100644 --- a/CoqOfRust/revm/revm_specification/hardfork.v +++ b/CoqOfRust/revm/revm_specification/hardfork.v @@ -464,7 +464,7 @@ Module hardfork. Definition default (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with | [], [], [] => - ltac:(M.monadic (Value.StructTuple "revm_specification::hardfork::SpecId::LATEST" [])) + ltac:(M.monadic (Value.StructTuple "revm_specification::hardfork::SpecId::LATEST" [] [] [])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -796,7 +796,15 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_specification::hardfork::SpecId::FRONTIER" [] ] + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] + [ + Value.StructTuple + "revm_specification::hardfork::SpecId::FRONTIER" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -808,10 +816,14 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] [ Value.StructTuple "revm_specification::hardfork::SpecId::FRONTIER_THAWING" [] + [] + [] ] |))); fun γ => @@ -824,7 +836,15 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_specification::hardfork::SpecId::HOMESTEAD" [] ] + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] + [ + Value.StructTuple + "revm_specification::hardfork::SpecId::HOMESTEAD" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -836,7 +856,15 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_specification::hardfork::SpecId::DAO_FORK" [] ] + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] + [ + Value.StructTuple + "revm_specification::hardfork::SpecId::DAO_FORK" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -848,7 +876,15 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_specification::hardfork::SpecId::TANGERINE" [] ] + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] + [ + Value.StructTuple + "revm_specification::hardfork::SpecId::TANGERINE" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -860,10 +896,14 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] [ Value.StructTuple "revm_specification::hardfork::SpecId::SPURIOUS_DRAGON" [] + [] + [] ] |))); fun γ => @@ -876,7 +916,15 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_specification::hardfork::SpecId::BYZANTIUM" [] ] + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] + [ + Value.StructTuple + "revm_specification::hardfork::SpecId::BYZANTIUM" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -888,10 +936,14 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] [ Value.StructTuple "revm_specification::hardfork::SpecId::CONSTANTINOPLE" [] + [] + [] ] |))); fun γ => @@ -904,7 +956,15 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_specification::hardfork::SpecId::PETERSBURG" [] ] + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] + [ + Value.StructTuple + "revm_specification::hardfork::SpecId::PETERSBURG" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -916,7 +976,15 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_specification::hardfork::SpecId::ISTANBUL" [] ] + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] + [ + Value.StructTuple + "revm_specification::hardfork::SpecId::ISTANBUL" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -928,7 +996,14 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_specification::hardfork::SpecId::MUIR_GLACIER" [] + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] + [ + Value.StructTuple + "revm_specification::hardfork::SpecId::MUIR_GLACIER" + [] + [] + [] ] |))); fun γ => @@ -941,7 +1016,10 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] ] + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] + [ Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] [] [] + ] |))); fun γ => ltac:(M.monadic @@ -953,7 +1031,10 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_specification::hardfork::SpecId::LONDON" [] ] + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] + [ Value.StructTuple "revm_specification::hardfork::SpecId::LONDON" [] [] [] + ] |))); fun γ => ltac:(M.monadic @@ -965,7 +1046,14 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_specification::hardfork::SpecId::ARROW_GLACIER" [] + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] + [ + Value.StructTuple + "revm_specification::hardfork::SpecId::ARROW_GLACIER" + [] + [] + [] ] |))); fun γ => @@ -978,7 +1066,14 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_specification::hardfork::SpecId::GRAY_GLACIER" [] + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] + [ + Value.StructTuple + "revm_specification::hardfork::SpecId::GRAY_GLACIER" + [] + [] + [] ] |))); fun γ => @@ -991,7 +1086,9 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_specification::hardfork::SpecId::MERGE" [] ] + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] + [ Value.StructTuple "revm_specification::hardfork::SpecId::MERGE" [] [] [] ] |))); fun γ => ltac:(M.monadic @@ -1003,7 +1100,15 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_specification::hardfork::SpecId::SHANGHAI" [] ] + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] + [ + Value.StructTuple + "revm_specification::hardfork::SpecId::SHANGHAI" + [] + [] + [] + ] |))); fun γ => ltac:(M.monadic @@ -1015,7 +1120,10 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_specification::hardfork::SpecId::CANCUN" [] ] + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] + [ Value.StructTuple "revm_specification::hardfork::SpecId::CANCUN" [] [] [] + ] |))); fun γ => ltac:(M.monadic @@ -1027,7 +1135,10 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_specification::hardfork::SpecId::PRAGUE" [] ] + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] + [ Value.StructTuple "revm_specification::hardfork::SpecId::PRAGUE" [] [] [] + ] |))); fun γ => ltac:(M.monadic @@ -1039,7 +1150,9 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_specification::hardfork::SpecId::OSAKA" [] ] + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] + [ Value.StructTuple "revm_specification::hardfork::SpecId::OSAKA" [] [] [] ] |))); fun γ => ltac:(M.monadic @@ -1051,10 +1164,20 @@ Module hardfork. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ Value.StructTuple "revm_specification::hardfork::SpecId::LATEST" [] ] + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] + [ Value.StructTuple "revm_specification::hardfork::SpecId::LATEST" [] [] [] + ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "revm_specification::hardfork::SpecId" ] + [] + |))) ] |) |))) @@ -1338,7 +1461,7 @@ Module hardfork. (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "Frontier" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::FRONTIER" [] + Value.StructTuple "revm_specification::hardfork::SpecId::FRONTIER" [] [] [] |))); fun γ => ltac:(M.monadic @@ -1348,42 +1471,50 @@ Module hardfork. mk_str (| "Frontier Thawing" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::FRONTIER_THAWING" [] + Value.StructTuple + "revm_specification::hardfork::SpecId::FRONTIER_THAWING" + [] + [] + [] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "Homestead" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::HOMESTEAD" [] + Value.StructTuple "revm_specification::hardfork::SpecId::HOMESTEAD" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "DAO Fork" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::DAO_FORK" [] + Value.StructTuple "revm_specification::hardfork::SpecId::DAO_FORK" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "Tangerine" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::TANGERINE" [] + Value.StructTuple "revm_specification::hardfork::SpecId::TANGERINE" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "Spurious" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::SPURIOUS_DRAGON" [] + Value.StructTuple + "revm_specification::hardfork::SpecId::SPURIOUS_DRAGON" + [] + [] + [] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "Byzantium" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::BYZANTIUM" [] + Value.StructTuple "revm_specification::hardfork::SpecId::BYZANTIUM" [] [] [] |))); fun γ => ltac:(M.monadic @@ -1393,42 +1524,50 @@ Module hardfork. mk_str (| "Constantinople" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::CONSTANTINOPLE" [] + Value.StructTuple + "revm_specification::hardfork::SpecId::CONSTANTINOPLE" + [] + [] + [] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "Petersburg" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::PETERSBURG" [] + Value.StructTuple "revm_specification::hardfork::SpecId::PETERSBURG" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "Istanbul" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::ISTANBUL" [] + Value.StructTuple "revm_specification::hardfork::SpecId::ISTANBUL" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "MuirGlacier" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::MUIR_GLACIER" [] + Value.StructTuple + "revm_specification::hardfork::SpecId::MUIR_GLACIER" + [] + [] + [] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "Berlin" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] + Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "London" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::LONDON" [] + Value.StructTuple "revm_specification::hardfork::SpecId::LONDON" [] [] [] |))); fun γ => ltac:(M.monadic @@ -1438,7 +1577,11 @@ Module hardfork. mk_str (| "Arrow Glacier" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::ARROW_GLACIER" [] + Value.StructTuple + "revm_specification::hardfork::SpecId::ARROW_GLACIER" + [] + [] + [] |))); fun γ => ltac:(M.monadic @@ -1448,54 +1591,58 @@ Module hardfork. mk_str (| "Gray Glacier" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::GRAY_GLACIER" [] + Value.StructTuple + "revm_specification::hardfork::SpecId::GRAY_GLACIER" + [] + [] + [] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "Merge" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::MERGE" [] + Value.StructTuple "revm_specification::hardfork::SpecId::MERGE" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "Shanghai" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::SHANGHAI" [] + Value.StructTuple "revm_specification::hardfork::SpecId::SHANGHAI" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "Cancun" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::CANCUN" [] + Value.StructTuple "revm_specification::hardfork::SpecId::CANCUN" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "Prague" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::PRAGUE" [] + Value.StructTuple "revm_specification::hardfork::SpecId::PRAGUE" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "PragueEOF" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::OSAKA" [] + Value.StructTuple "revm_specification::hardfork::SpecId::OSAKA" [] [] [] |))); fun γ => ltac:(M.monadic (let _ := is_constant_or_break_match (| M.read (| γ |), mk_str (| "Latest" |) |) in M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::LATEST" [] + Value.StructTuple "revm_specification::hardfork::SpecId::LATEST" [] [] [] |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "revm_specification::hardfork::SpecId::LATEST" [] + Value.StructTuple "revm_specification::hardfork::SpecId::LATEST" [] [] [] |))) ] |) diff --git a/CoqOfRust/revm/revm_specification/links/hardfork.v b/CoqOfRust/revm/revm_specification/links/hardfork.v index 9867ab9a8..b76686e7a 100644 --- a/CoqOfRust/revm/revm_specification/links/hardfork.v +++ b/CoqOfRust/revm/revm_specification/links/hardfork.v @@ -33,47 +33,47 @@ Module SpecId. φ x := match x with | FRONTIER => - Value.StructTuple "revm_specification::hardfork::SpecId::FRONTIER" [] + Value.StructTuple "revm_specification::hardfork::SpecId::FRONTIER" [] [] [] | FRONTIER_THAWING => - Value.StructTuple "revm_specification::hardfork::SpecId::FRONTIER_THAWING" [] + Value.StructTuple "revm_specification::hardfork::SpecId::FRONTIER_THAWING" [] [] [] | HOMESTEAD => - Value.StructTuple "revm_specification::hardfork::SpecId::HOMESTEAD" [] + Value.StructTuple "revm_specification::hardfork::SpecId::HOMESTEAD" [] [] [] | DAO_FORK => - Value.StructTuple "revm_specification::hardfork::SpecId::DAO_FORK" [] + Value.StructTuple "revm_specification::hardfork::SpecId::DAO_FORK" [] [] [] | TANGERINE => - Value.StructTuple "revm_specification::hardfork::SpecId::TANGERINE" [] + Value.StructTuple "revm_specification::hardfork::SpecId::TANGERINE" [] [] [] | SPURIOUS_DRAGON => - Value.StructTuple "revm_specification::hardfork::SpecId::SPURIOUS_DRAGON" [] + Value.StructTuple "revm_specification::hardfork::SpecId::SPURIOUS_DRAGON" [] [] [] | BYZANTIUM => - Value.StructTuple "revm_specification::hardfork::SpecId::BYZANTIUM" [] + Value.StructTuple "revm_specification::hardfork::SpecId::BYZANTIUM" [] [] [] | CONSTANTINOPLE => - Value.StructTuple "revm_specification::hardfork::SpecId::CONSTANTINOPLE" [] + Value.StructTuple "revm_specification::hardfork::SpecId::CONSTANTINOPLE" [] [] [] | PETERSBURG => - Value.StructTuple "revm_specification::hardfork::SpecId::PETERSBURG" [] + Value.StructTuple "revm_specification::hardfork::SpecId::PETERSBURG" [] [] [] | ISTANBUL => - Value.StructTuple "revm_specification::hardfork::SpecId::ISTANBUL" [] + Value.StructTuple "revm_specification::hardfork::SpecId::ISTANBUL" [] [] [] | MUIR_GLACIER => - Value.StructTuple "revm_specification::hardfork::SpecId::MUIR_GLACIER" [] + Value.StructTuple "revm_specification::hardfork::SpecId::MUIR_GLACIER" [] [] [] | BERLIN => - Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] + Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] [] [] | LONDON => - Value.StructTuple "revm_specification::hardfork::SpecId::LONDON" [] + Value.StructTuple "revm_specification::hardfork::SpecId::LONDON" [] [] [] | ARROW_GLACIER => - Value.StructTuple "revm_specification::hardfork::SpecId::ARROW_GLACIER" [] + Value.StructTuple "revm_specification::hardfork::SpecId::ARROW_GLACIER" [] [] [] | GRAY_GLACIER => - Value.StructTuple "revm_specification::hardfork::SpecId::GRAY_GLACIER" [] + Value.StructTuple "revm_specification::hardfork::SpecId::GRAY_GLACIER" [] [] [] | MERGE => - Value.StructTuple "revm_specification::hardfork::SpecId::MERGE" [] + Value.StructTuple "revm_specification::hardfork::SpecId::MERGE" [] [] [] | SHANGHAI => - Value.StructTuple "revm_specification::hardfork::SpecId::SHANGHAI" [] + Value.StructTuple "revm_specification::hardfork::SpecId::SHANGHAI" [] [] [] | CANCUN => - Value.StructTuple "revm_specification::hardfork::SpecId::CANCUN" [] + Value.StructTuple "revm_specification::hardfork::SpecId::CANCUN" [] [] [] | PRAGUE => - Value.StructTuple "revm_specification::hardfork::SpecId::PRAGUE" [] + Value.StructTuple "revm_specification::hardfork::SpecId::PRAGUE" [] [] [] | OSAKA => - Value.StructTuple "revm_specification::hardfork::SpecId::OSAKA" [] + Value.StructTuple "revm_specification::hardfork::SpecId::OSAKA" [] [] [] | LATEST => - Value.StructTuple "revm_specification::hardfork::SpecId::LATEST" [] + Value.StructTuple "revm_specification::hardfork::SpecId::LATEST" [] [] [] end }. @@ -82,274 +82,274 @@ Module SpecId. Smpl Add simple apply of_ty : of_ty. Lemma of_value_with_FRONTIER : - Value.StructTuple "revm_specification::hardfork::SpecId::FRONTIER" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::FRONTIER" [] [] [] = φ FRONTIER. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_FRONTIER : of_value. Lemma of_value_with_FRONTIER_THAWING : - Value.StructTuple "revm_specification::hardfork::SpecId::FRONTIER_THAWING" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::FRONTIER_THAWING" [] [] [] = φ FRONTIER_THAWING. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_FRONTIER_THAWING : of_value. Lemma of_value_with_HOMESTEAD : - Value.StructTuple "revm_specification::hardfork::SpecId::HOMESTEAD" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::HOMESTEAD" [] [] [] = φ HOMESTEAD. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_HOMESTEAD : of_value. Lemma of_value_with_DAO_FORK : - Value.StructTuple "revm_specification::hardfork::SpecId::DAO_FORK" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::DAO_FORK" [] [] [] = φ DAO_FORK. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_DAO_FORK : of_value. Lemma of_value_with_TANGERINE : - Value.StructTuple "revm_specification::hardfork::SpecId::TANGERINE" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::TANGERINE" [] [] [] = φ TANGERINE. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_TANGERINE : of_value. Lemma of_value_with_SPURIOUS_DRAGON : - Value.StructTuple "revm_specification::hardfork::SpecId::SPURIOUS_DRAGON" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::SPURIOUS_DRAGON" [] [] [] = φ SPURIOUS_DRAGON. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_SPURIOUS_DRAGON : of_value. Lemma of_value_with_BYZANTIUM : - Value.StructTuple "revm_specification::hardfork::SpecId::BYZANTIUM" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::BYZANTIUM" [] [] [] = φ BYZANTIUM. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_BYZANTIUM : of_value. Lemma of_value_with_CONSTANTINOPLE : - Value.StructTuple "revm_specification::hardfork::SpecId::CONSTANTINOPLE" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::CONSTANTINOPLE" [] [] [] = φ CONSTANTINOPLE. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_CONSTANTINOPLE : of_value. Lemma of_value_with_PETERSBURG : - Value.StructTuple "revm_specification::hardfork::SpecId::PETERSBURG" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::PETERSBURG" [] [] [] = φ PETERSBURG. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_PETERSBURG : of_value. Lemma of_value_with_ISTANBUL : - Value.StructTuple "revm_specification::hardfork::SpecId::ISTANBUL" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::ISTANBUL" [] [] [] = φ ISTANBUL. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_ISTANBUL : of_value. Lemma of_value_with_MUIR_GLACIER : - Value.StructTuple "revm_specification::hardfork::SpecId::MUIR_GLACIER" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::MUIR_GLACIER" [] [] [] = φ MUIR_GLACIER. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_MUIR_GLACIER : of_value. Lemma of_value_with_BERLIN : - Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] [] [] = φ BERLIN. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_BERLIN : of_value. Lemma of_value_with_LONDON : - Value.StructTuple "revm_specification::hardfork::SpecId::LONDON" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::LONDON" [] [] [] = φ LONDON. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_LONDON : of_value. Lemma of_value_with_ARROW_GLACIER : - Value.StructTuple "revm_specification::hardfork::SpecId::ARROW_GLACIER" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::ARROW_GLACIER" [] [] [] = φ ARROW_GLACIER. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_ARROW_GLACIER : of_value. Lemma of_value_with_GRAY_GLACIER : - Value.StructTuple "revm_specification::hardfork::SpecId::GRAY_GLACIER" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::GRAY_GLACIER" [] [] [] = φ GRAY_GLACIER. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_GRAY_GLACIER : of_value. Lemma of_value_with_MERGE : - Value.StructTuple "revm_specification::hardfork::SpecId::MERGE" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::MERGE" [] [] [] = φ MERGE. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_MERGE : of_value. Lemma of_value_with_SHANGHAI : - Value.StructTuple "revm_specification::hardfork::SpecId::SHANGHAI" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::SHANGHAI" [] [] [] = φ SHANGHAI. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_SHANGHAI : of_value. Lemma of_value_with_CANCUN : - Value.StructTuple "revm_specification::hardfork::SpecId::CANCUN" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::CANCUN" [] [] [] = φ CANCUN. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_CANCUN : of_value. Lemma of_value_with_PRAGUE : - Value.StructTuple "revm_specification::hardfork::SpecId::PRAGUE" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::PRAGUE" [] [] [] = φ PRAGUE. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_PRAGUE : of_value. Lemma of_value_with_OSAKA : - Value.StructTuple "revm_specification::hardfork::SpecId::OSAKA" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::OSAKA" [] [] [] = φ OSAKA. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_OSAKA : of_value. Lemma of_value_with_LATEST : - Value.StructTuple "revm_specification::hardfork::SpecId::LATEST" [] = + Value.StructTuple "revm_specification::hardfork::SpecId::LATEST" [] [] [] = φ LATEST. Proof. now intros; subst. Qed. Smpl Add simple apply of_value_with_LATEST : of_value. Definition of_value_FRONTIER : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::FRONTIER" [] + Value.StructTuple "revm_specification::hardfork::SpecId::FRONTIER" [] [] [] ). Proof. econstructor; apply of_value_with_FRONTIER; eassumption. Defined. Smpl Add simple apply of_value_FRONTIER : of_value. Definition of_value_FRONTIER_THAWING : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::FRONTIER_THAWING" [] + Value.StructTuple "revm_specification::hardfork::SpecId::FRONTIER_THAWING" [] [] [] ). Proof. econstructor; apply of_value_with_FRONTIER_THAWING; eassumption. Defined. Smpl Add simple apply of_value_FRONTIER_THAWING : of_value. Definition of_value_HOMESTEAD : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::HOMESTEAD" [] + Value.StructTuple "revm_specification::hardfork::SpecId::HOMESTEAD" [] [] [] ). Proof. econstructor; apply of_value_with_HOMESTEAD; eassumption. Defined. Smpl Add simple apply of_value_HOMESTEAD : of_value. Definition of_value_DAO_FORK : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::DAO_FORK" [] + Value.StructTuple "revm_specification::hardfork::SpecId::DAO_FORK" [] [] [] ). Proof. econstructor; apply of_value_with_DAO_FORK; eassumption. Defined. Smpl Add simple apply of_value_DAO_FORK : of_value. Definition of_value_TANGERINE : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::TANGERINE" [] + Value.StructTuple "revm_specification::hardfork::SpecId::TANGERINE" [] [] [] ). Proof. econstructor; apply of_value_with_TANGERINE; eassumption. Defined. Smpl Add simple apply of_value_TANGERINE : of_value. Definition of_value_SPURIOUS_DRAGON : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::SPURIOUS_DRAGON" [] + Value.StructTuple "revm_specification::hardfork::SpecId::SPURIOUS_DRAGON" [] [] [] ). Proof. econstructor; apply of_value_with_SPURIOUS_DRAGON; eassumption. Defined. Smpl Add simple apply of_value_SPURIOUS_DRAGON : of_value. Definition of_value_BYZANTIUM : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::BYZANTIUM" [] + Value.StructTuple "revm_specification::hardfork::SpecId::BYZANTIUM" [] [] [] ). Proof. econstructor; apply of_value_with_BYZANTIUM; eassumption. Defined. Smpl Add simple apply of_value_BYZANTIUM : of_value. Definition of_value_CONSTANTINOPLE : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::CONSTANTINOPLE" [] + Value.StructTuple "revm_specification::hardfork::SpecId::CONSTANTINOPLE" [] [] [] ). Proof. econstructor; apply of_value_with_CONSTANTINOPLE; eassumption. Defined. Smpl Add simple apply of_value_CONSTANTINOPLE : of_value. Definition of_value_PETERSBURG : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::PETERSBURG" [] + Value.StructTuple "revm_specification::hardfork::SpecId::PETERSBURG" [] [] [] ). Proof. econstructor; apply of_value_with_PETERSBURG; eassumption. Defined. Smpl Add simple apply of_value_PETERSBURG : of_value. Definition of_value_ISTANBUL : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::ISTANBUL" [] + Value.StructTuple "revm_specification::hardfork::SpecId::ISTANBUL" [] [] [] ). Proof. econstructor; apply of_value_with_ISTANBUL; eassumption. Defined. Smpl Add simple apply of_value_ISTANBUL : of_value. Definition of_value_MUIR_GLACIER : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::MUIR_GLACIER" [] + Value.StructTuple "revm_specification::hardfork::SpecId::MUIR_GLACIER" [] [] [] ). Proof. econstructor; apply of_value_with_MUIR_GLACIER; eassumption. Defined. Smpl Add simple apply of_value_MUIR_GLACIER : of_value. Definition of_value_BERLIN : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] + Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] [] [] ). Proof. econstructor; apply of_value_with_BERLIN; eassumption. Defined. Smpl Add simple apply of_value_BERLIN : of_value. Definition of_value_LONDON : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::LONDON" [] + Value.StructTuple "revm_specification::hardfork::SpecId::LONDON" [] [] [] ). Proof. econstructor; apply of_value_with_LONDON; eassumption. Defined. Smpl Add simple apply of_value_LONDON : of_value. Definition of_value_ARROW_GLACIER : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::ARROW_GLACIER" [] + Value.StructTuple "revm_specification::hardfork::SpecId::ARROW_GLACIER" [] [] [] ). Proof. econstructor; apply of_value_with_ARROW_GLACIER; eassumption. Defined. Smpl Add simple apply of_value_ARROW_GLACIER : of_value. Definition of_value_GRAY_GLACIER : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::GRAY_GLACIER" [] + Value.StructTuple "revm_specification::hardfork::SpecId::GRAY_GLACIER" [] [] [] ). Proof. econstructor; apply of_value_with_GRAY_GLACIER; eassumption. Defined. Smpl Add simple apply of_value_GRAY_GLACIER : of_value. Definition of_value_MERGE : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::MERGE" [] + Value.StructTuple "revm_specification::hardfork::SpecId::MERGE" [] [] [] ). Proof. econstructor; apply of_value_with_MERGE; eassumption. Defined. Smpl Add simple apply of_value_MERGE : of_value. Definition of_value_SHANGHAI : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::SHANGHAI" [] + Value.StructTuple "revm_specification::hardfork::SpecId::SHANGHAI" [] [] [] ). Proof. econstructor; apply of_value_with_SHANGHAI; eassumption. Defined. Smpl Add simple apply of_value_SHANGHAI : of_value. Definition of_value_CANCUN : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::CANCUN" [] + Value.StructTuple "revm_specification::hardfork::SpecId::CANCUN" [] [] [] ). Proof. econstructor; apply of_value_with_CANCUN; eassumption. Defined. Smpl Add simple apply of_value_CANCUN : of_value. Definition of_value_PRAGUE : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::PRAGUE" [] + Value.StructTuple "revm_specification::hardfork::SpecId::PRAGUE" [] [] [] ). Proof. econstructor; apply of_value_with_PRAGUE; eassumption. Defined. Smpl Add simple apply of_value_PRAGUE : of_value. Definition of_value_OSAKA : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::OSAKA" [] + Value.StructTuple "revm_specification::hardfork::SpecId::OSAKA" [] [] [] ). Proof. econstructor; apply of_value_with_OSAKA; eassumption. Defined. Smpl Add simple apply of_value_OSAKA : of_value. Definition of_value_LATEST : OfValue.t ( - Value.StructTuple "revm_specification::hardfork::SpecId::LATEST" [] + Value.StructTuple "revm_specification::hardfork::SpecId::LATEST" [] [] [] ). Proof. econstructor; apply of_value_with_LATEST; eassumption. Defined. Smpl Add simple apply of_value_LATEST : of_value. diff --git a/CoqOfRust/ruint/add.v b/CoqOfRust/ruint/add.v index c58b79c4a..f28896381 100644 --- a/CoqOfRust/ruint/add.v +++ b/CoqOfRust/ruint/add.v @@ -144,10 +144,21 @@ Module add. let value := M.copy (| γ0_0 |) in let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| value |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [ M.read (| value |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |))) ] |) |))) @@ -210,10 +221,21 @@ Module add. let value := M.copy (| γ0_0 |) in let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| value |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [ M.read (| value |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |))) ] |) |))) @@ -277,10 +299,21 @@ Module add. let value := M.copy (| γ0_0 |) in let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| value |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [ M.read (| value |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |))) ] |) |))) diff --git a/CoqOfRust/ruint/algorithms/add.v b/CoqOfRust/ruint/algorithms/add.v index 7114fe430..0c3991aab 100644 --- a/CoqOfRust/ruint/algorithms/add.v +++ b/CoqOfRust/ruint/algorithms/add.v @@ -38,6 +38,8 @@ Module algorithms. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -216,6 +218,8 @@ Module algorithms. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", diff --git a/CoqOfRust/ruint/algorithms/div/knuth.v b/CoqOfRust/ruint/algorithms/div/knuth.v index 8306a52c3..a4b3e3070 100644 --- a/CoqOfRust/ruint/algorithms/div/knuth.v +++ b/CoqOfRust/ruint/algorithms/div/knuth.v @@ -780,6 +780,8 @@ Module algorithms. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| j |)); @@ -912,6 +914,8 @@ Module algorithms. |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| j |)); ("end_", @@ -982,6 +986,8 @@ Module algorithms. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| @@ -1243,6 +1249,11 @@ Module algorithms. |); Value.StructRecord "core::ops::range::Range" + [] + [ + Ty.path + "usize" + ] [ ("start", M.read (| @@ -1325,6 +1336,11 @@ Module algorithms. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ + Ty.path + "usize" + ] [ ("end_", M.read (| @@ -1484,6 +1500,8 @@ Module algorithms. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1532,6 +1550,11 @@ Module algorithms. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -3003,6 +3026,11 @@ Module algorithms. |); Value.StructRecord "core::ops::range::Range" + [] + [ + Ty.path + "usize" + ] [ ("start", M.read (| @@ -3096,6 +3124,11 @@ Module algorithms. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ + Ty.path + "usize" + ] [ ("end_", M.call_closure (| @@ -3419,6 +3452,11 @@ Module algorithms. |); Value.StructRecord "core::ops::range::Range" + [] + [ + Ty.path + "usize" + ] [ ("start", M.read (| @@ -3752,6 +3790,11 @@ Module algorithms. |); Value.StructRecord "core::ops::range::Range" + [] + [ + Ty.path + "usize" + ] [ ("start", M.read (| @@ -3835,6 +3878,11 @@ Module algorithms. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ + Ty.path + "usize" + ] [ ("end_", M.read (| @@ -4029,6 +4077,8 @@ Module algorithms. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -4077,6 +4127,11 @@ Module algorithms. Value.StructTuple "core::option::Option::None" [] + [ + Ty.path + "core::fmt::Arguments" + ] + [] ] |) |) @@ -4215,6 +4270,11 @@ Module algorithms. |); Value.StructRecord "core::ops::range::Range" + [] + [ + Ty.path + "usize" + ] [ ("start", M.read (| @@ -4401,6 +4461,8 @@ Module algorithms. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| n |)) ] ] |) @@ -4433,6 +4495,8 @@ Module algorithms. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.read (| n |)) ]; Value.Integer IntegerKind.Usize 0 ] @@ -4488,6 +4552,8 @@ Module algorithms. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| diff --git a/CoqOfRust/ruint/algorithms/div/mod.v b/CoqOfRust/ruint/algorithms/div/mod.v index 164bc1f6d..77a7fda9e 100644 --- a/CoqOfRust/ruint/algorithms/div/mod.v +++ b/CoqOfRust/ruint/algorithms/div/mod.v @@ -192,6 +192,8 @@ Module algorithms. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| divisor |) |) |); Value.StructRecord "core::ops::range::RangeToInclusive" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| i |)) ] ] |) @@ -336,6 +338,9 @@ Module algorithms. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.path "u64" ] + ] [ M.borrow (| Pointer.Kind.Ref, @@ -530,6 +535,8 @@ Module algorithms. |); Value.StructRecord "core::ops::range::RangeToInclusive" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| i |)) ] ] |) diff --git a/CoqOfRust/ruint/algorithms/div/reciprocal.v b/CoqOfRust/ruint/algorithms/div/reciprocal.v index c7f8599bb..59d18aa09 100644 --- a/CoqOfRust/ruint/algorithms/div/reciprocal.v +++ b/CoqOfRust/ruint/algorithms/div/reciprocal.v @@ -343,7 +343,11 @@ Module algorithms. [] [ Ty.apply (Ty.path "core::num::wrapping::Wrapping") [] [ Ty.path "u64" ] ] := M.alloc (| - Value.StructTuple "core::num::wrapping::Wrapping" [ M.read (| d |) ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] + [ M.read (| d |) ] |) in let~ d0 : Ty.apply @@ -488,6 +492,8 @@ Module algorithms. M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.cast (Ty.path "u64") @@ -1039,7 +1045,11 @@ Module algorithms. Definition value_ZERO (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::num::wrapping::Wrapping" [ Value.Integer IntegerKind.U64 0 ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] + [ Value.Integer IntegerKind.U64 0 ] |))). Global Instance Instance_IsConstant_value_ZERO : @@ -1050,7 +1060,11 @@ Module algorithms. Definition value_ONE (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::num::wrapping::Wrapping" [ Value.Integer IntegerKind.U64 1 ] + Value.StructTuple + "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] + [ Value.Integer IntegerKind.U64 1 ] |))). Global Instance Instance_IsConstant_value_ONE : @@ -1831,6 +1845,8 @@ Module algorithms. M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.cast (Ty.path "u64") @@ -1957,6 +1973,8 @@ Module algorithms. M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.cast (Ty.path "u64") diff --git a/CoqOfRust/ruint/algorithms/div/small.v b/CoqOfRust/ruint/algorithms/div/small.v index 1f6db61a6..c393b8c93 100644 --- a/CoqOfRust/ruint/algorithms/div/small.v +++ b/CoqOfRust/ruint/algorithms/div/small.v @@ -735,6 +735,8 @@ Module algorithms. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1); ("end_", @@ -1843,6 +1845,8 @@ Module algorithms. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 1); ("end_", @@ -2597,6 +2601,8 @@ Module algorithms. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -2629,6 +2635,8 @@ Module algorithms. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -3735,6 +3743,8 @@ Module algorithms. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -3767,6 +3777,8 @@ Module algorithms. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/ruint/algorithms/gcd/matrix.v b/CoqOfRust/ruint/algorithms/gcd/matrix.v index c87826684..17e59acda 100644 --- a/CoqOfRust/ruint/algorithms/gcd/matrix.v +++ b/CoqOfRust/ruint/algorithms/gcd/matrix.v @@ -378,6 +378,8 @@ Module algorithms. (M.alloc (| Value.StructTuple "ruint::algorithms::gcd::matrix::Matrix" + [] + [] [ Value.Integer IntegerKind.U64 1; Value.Integer IntegerKind.U64 0; @@ -411,6 +413,8 @@ Module algorithms. let other := M.alloc (| other |) in Value.StructTuple "ruint::algorithms::gcd::matrix::Matrix" + [] + [] [ M.call_closure (| Ty.path "u64", @@ -2068,6 +2072,8 @@ Module algorithms. M.return_ (| Value.StructTuple "ruint::algorithms::gcd::matrix::Matrix" + [] + [] [ M.read (| q10 |); M.read (| q11 |); @@ -2173,6 +2179,8 @@ Module algorithms. M.return_ (| Value.StructTuple "ruint::algorithms::gcd::matrix::Matrix" + [] + [] [ M.read (| q00 |); M.read (| q01 |); @@ -2625,6 +2633,8 @@ Module algorithms. M.return_ (| Value.StructTuple "ruint::algorithms::gcd::matrix::Matrix" + [] + [] [ Value.Integer IntegerKind.U64 0; Value.Integer IntegerKind.U64 1; @@ -3516,6 +3526,8 @@ Module algorithms. M.alloc (| Value.StructTuple "ruint::algorithms::gcd::matrix::Matrix" + [] + [] [ M.read (| u2 |); M.read (| v2 |); @@ -3529,6 +3541,8 @@ Module algorithms. (M.alloc (| Value.StructTuple "ruint::algorithms::gcd::matrix::Matrix" + [] + [] [ M.read (| u1 |); M.read (| v1 |); @@ -3544,6 +3558,8 @@ Module algorithms. (M.alloc (| Value.StructTuple "ruint::algorithms::gcd::matrix::Matrix" + [] + [] [ M.read (| u0 |); M.read (| v0 |); @@ -3691,6 +3707,8 @@ Module algorithms. M.alloc (| Value.StructTuple "ruint::algorithms::gcd::matrix::Matrix" + [] + [] [ M.read (| u2 |); M.read (| v2 |); @@ -3704,6 +3722,8 @@ Module algorithms. (M.alloc (| Value.StructTuple "ruint::algorithms::gcd::matrix::Matrix" + [] + [] [ M.read (| u1 |); M.read (| v1 |); @@ -3719,6 +3739,8 @@ Module algorithms. (M.alloc (| Value.StructTuple "ruint::algorithms::gcd::matrix::Matrix" + [] + [] [ M.read (| u0 |); M.read (| v0 |); diff --git a/CoqOfRust/ruint/algorithms/gcd/mod.v b/CoqOfRust/ruint/algorithms/gcd/mod.v index 6c714db93..e3321f31e 100644 --- a/CoqOfRust/ruint/algorithms/gcd/mod.v +++ b/CoqOfRust/ruint/algorithms/gcd/mod.v @@ -1315,7 +1315,13 @@ Module algorithms. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |) |) |) |))); @@ -1422,7 +1428,13 @@ Module algorithms. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |) |) |) |))); @@ -1925,6 +1937,8 @@ Module algorithms. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] [ M.read (| M.match_operator (| @@ -1966,7 +1980,13 @@ Module algorithms. |))); fun γ => ltac:(M.monadic - (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |))) ] |) |))) diff --git a/CoqOfRust/ruint/algorithms/mod.v b/CoqOfRust/ruint/algorithms/mod.v index 59bc8420d..e9178b476 100644 --- a/CoqOfRust/ruint/algorithms/mod.v +++ b/CoqOfRust/ruint/algorithms/mod.v @@ -493,6 +493,8 @@ Module algorithms. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| left |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| l |)) ] ] |) @@ -527,6 +529,8 @@ Module algorithms. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| right |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| l |)) ] ] |) @@ -574,6 +578,8 @@ Module algorithms. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", M.read (| l |)) @@ -730,6 +736,8 @@ Module algorithms. Value.StructTuple "core::cmp::Ordering::Less" [] + [] + [] |) |) |) @@ -756,6 +764,8 @@ Module algorithms. Value.StructTuple "core::cmp::Ordering::Greater" [] + [] + [] |) |) |) diff --git a/CoqOfRust/ruint/algorithms/mul.v b/CoqOfRust/ruint/algorithms/mul.v index 386e4eafa..a1e84650c 100644 --- a/CoqOfRust/ruint/algorithms/mul.v +++ b/CoqOfRust/ruint/algorithms/mul.v @@ -1646,6 +1646,9 @@ Module algorithms. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" + ] [ ("end_", M.call_closure (| @@ -1735,6 +1738,8 @@ Module algorithms. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer @@ -2108,7 +2113,7 @@ Module algorithms. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -2138,7 +2143,11 @@ Module algorithms. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -2226,7 +2235,7 @@ Module algorithms. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -2256,7 +2265,11 @@ Module algorithms. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -2473,7 +2486,7 @@ Module algorithms. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -2503,7 +2516,11 @@ Module algorithms. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -2580,7 +2597,7 @@ Module algorithms. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -2610,7 +2627,11 @@ Module algorithms. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -2687,7 +2708,7 @@ Module algorithms. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -2717,7 +2738,11 @@ Module algorithms. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -2858,7 +2883,7 @@ Module algorithms. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -2888,7 +2913,11 @@ Module algorithms. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -2965,7 +2994,7 @@ Module algorithms. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -2995,7 +3024,11 @@ Module algorithms. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -3072,7 +3105,7 @@ Module algorithms. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -3102,7 +3135,11 @@ Module algorithms. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -3315,7 +3352,7 @@ Module algorithms. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -3345,7 +3382,11 @@ Module algorithms. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -3422,7 +3463,7 @@ Module algorithms. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -3452,7 +3493,11 @@ Module algorithms. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -3529,7 +3574,7 @@ Module algorithms. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -3559,7 +3604,11 @@ Module algorithms. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -3879,7 +3928,7 @@ Module algorithms. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -3909,7 +3958,11 @@ Module algorithms. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -3986,7 +4039,7 @@ Module algorithms. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -4016,7 +4069,11 @@ Module algorithms. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -4093,7 +4150,7 @@ Module algorithms. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -4123,7 +4180,11 @@ Module algorithms. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -4859,6 +4920,8 @@ Module algorithms. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -4891,6 +4954,8 @@ Module algorithms. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -5300,6 +5365,8 @@ Module algorithms. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -5332,6 +5399,8 @@ Module algorithms. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/ruint/algorithms/mul_redc.v b/CoqOfRust/ruint/algorithms/mul_redc.v index b2a508c57..661ad4199 100644 --- a/CoqOfRust/ruint/algorithms/mul_redc.v +++ b/CoqOfRust/ruint/algorithms/mul_redc.v @@ -244,6 +244,8 @@ Module algorithms. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -276,6 +278,8 @@ Module algorithms. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -396,6 +400,8 @@ Module algorithms. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -428,6 +434,8 @@ Module algorithms. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -548,6 +556,8 @@ Module algorithms. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -580,6 +590,8 @@ Module algorithms. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -687,6 +699,8 @@ Module algorithms. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -719,6 +733,8 @@ Module algorithms. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -839,6 +855,8 @@ Module algorithms. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -977,6 +995,8 @@ Module algorithms. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -1320,6 +1340,8 @@ Module algorithms. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -1822,6 +1844,8 @@ Module algorithms. M.borrow (| Pointer.Kind.Ref, temp |); Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| diff --git a/CoqOfRust/ruint/base_convert.v b/CoqOfRust/ruint/base_convert.v index 4e6cc2d67..1c12cd0ca 100644 --- a/CoqOfRust/ruint/base_convert.v +++ b/CoqOfRust/ruint/base_convert.v @@ -777,6 +777,8 @@ Module base_convert. M.alloc (| Value.StructRecord "ruint::base_convert::SpigotLittle" + [ LIMBS ] + [] [ ("base", M.read (| base |)); ("limbs", @@ -867,6 +869,8 @@ Module base_convert. M.alloc (| Value.StructRecord "ruint::base_convert::to_base_be::OwnedVecIterator" + [] + [] [ ("vec", M.call_closure (| @@ -1014,9 +1018,16 @@ Module base_convert. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.path "ruint::base_convert::BaseConvertError" + ] [ Value.StructTuple "ruint::base_convert::BaseConvertError::InvalidBase" + [] + [] [ M.read (| base |) ] ] |) @@ -1174,9 +1185,21 @@ Module base_convert. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path + "ruint::Uint") + [ BITS; LIMBS ] + []; + Ty.path + "ruint::base_convert::BaseConvertError" + ] [ Value.StructTuple "ruint::base_convert::BaseConvertError::InvalidDigit" + [] + [] [ M.read (| digit @@ -1229,10 +1252,22 @@ Module base_convert. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path + "ruint::Uint") + [ BITS; LIMBS ] + []; + Ty.path + "ruint::base_convert::BaseConvertError" + ] [ Value.StructTuple "ruint::base_convert::BaseConvertError::Overflow" [] + [] + [] ] |) |) @@ -1252,6 +1287,11 @@ Module base_convert. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.path "ruint::base_convert::BaseConvertError" + ] [ M.read (| get_associated_constant (| @@ -1488,9 +1528,20 @@ Module base_convert. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + []; + Ty.path + "ruint::base_convert::BaseConvertError" + ] [ Value.StructTuple "ruint::base_convert::BaseConvertError::InvalidDigit" + [] + [] [ M.read (| digit |); M.read (| base |) @@ -1630,10 +1681,21 @@ Module base_convert. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + []; + Ty.path + "ruint::base_convert::BaseConvertError" + ] [ Value.StructTuple "ruint::base_convert::BaseConvertError::Overflow" [] + [] + [] ] |) |) @@ -1862,9 +1924,20 @@ Module base_convert. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + []; + Ty.path + "ruint::base_convert::BaseConvertError" + ] [ Value.StructTuple "ruint::base_convert::BaseConvertError::InvalidDigit" + [] + [] [ M.read (| digit |); M.read (| base |) @@ -1907,10 +1980,21 @@ Module base_convert. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + []; + Ty.path + "ruint::base_convert::BaseConvertError" + ] [ Value.StructTuple "ruint::base_convert::BaseConvertError::Overflow" [] + [] + [] ] |) |) @@ -1926,7 +2010,16 @@ Module base_convert. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| result |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.path "ruint::base_convert::BaseConvertError" + ] + [ M.read (| result |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2019,9 +2112,16 @@ Module base_convert. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.path "ruint::base_convert::BaseConvertError" + ] [ Value.StructTuple "ruint::base_convert::BaseConvertError::InvalidBase" + [] + [] [ M.read (| base |) ] ] |) @@ -2153,9 +2253,20 @@ Module base_convert. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + []; + Ty.path + "ruint::base_convert::BaseConvertError" + ] [ Value.StructTuple "ruint::base_convert::BaseConvertError::InvalidDigit" + [] + [] [ M.read (| digit |); M.read (| base |) @@ -2492,10 +2603,21 @@ Module base_convert. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + []; + Ty.path + "ruint::base_convert::BaseConvertError" + ] [ Value.StructTuple "ruint::base_convert::BaseConvertError::Overflow" [] + [] + [] ] |) |) @@ -2511,7 +2633,16 @@ Module base_convert. |))) ] |)) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| result |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.path "ruint::base_convert::BaseConvertError" + ] + [ M.read (| result |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2839,12 +2970,16 @@ Module base_convert. |) |)) in let _ := is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))); + M.alloc (| + Value.StructTuple "core::option::Option::None" [] [ Ty.path "u64" ] [] + |))); fun γ => ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u64" ] [ M.cast (Ty.path "u64") (M.read (| remainder |)) ] |))) ] diff --git a/CoqOfRust/ruint/bit_arr.v b/CoqOfRust/ruint/bit_arr.v index d8d3752ac..c9bf1d2ff 100644 --- a/CoqOfRust/ruint/bit_arr.v +++ b/CoqOfRust/ruint/bit_arr.v @@ -146,6 +146,8 @@ Module bit_arr. ltac:(M.monadic (Value.StructTuple "ruint::bit_arr::Bits" + [ BITS; LIMBS ] + [] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -367,7 +369,7 @@ Module bit_arr. | [], [], [ value ] => ltac:(M.monadic (let value := M.alloc (| value |) in - Value.StructTuple "ruint::bit_arr::Bits" [ M.read (| value |) ])) + Value.StructTuple "ruint::bit_arr::Bits" [ BITS; LIMBS ] [] [ M.read (| value |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -487,7 +489,7 @@ Module bit_arr. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| src |) |) |) ] |); - M.constructor_as_closure "ruint::bit_arr::Bits" + M.constructor_as_closure "ruint::bit_arr::Bits" [ BITS; LIMBS ] [] ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -590,6 +592,8 @@ Module bit_arr. (M.alloc (| Value.StructTuple "ruint::bit_arr::Bits" + [ BITS; LIMBS ] + [] [ M.read (| get_associated_constant (| @@ -2255,6 +2259,8 @@ Module bit_arr. (let limbs := M.alloc (| limbs |) in Value.StructTuple "ruint::bit_arr::Bits" + [ BITS; LIMBS ] + [] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], diff --git a/CoqOfRust/ruint/bits.v b/CoqOfRust/ruint/bits.v index 2ce448697..92995d063 100644 --- a/CoqOfRust/ruint/bits.v +++ b/CoqOfRust/ruint/bits.v @@ -2014,10 +2014,21 @@ Module bits. let value := M.copy (| γ0_0 |) in let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| value |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [ M.read (| value |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |))) ] |) |))) @@ -2325,6 +2336,8 @@ Module bits. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -2575,6 +2588,8 @@ Module bits. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.read (| limbs |)); ("end_", LIMBS) @@ -2993,6 +3008,8 @@ Module bits. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| limbs |)) ] ] |) @@ -3074,6 +3091,8 @@ Module bits. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -3368,6 +3387,8 @@ Module bits. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -3849,6 +3870,8 @@ Module bits. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| limbs |)) ] ] |) @@ -3999,10 +4022,21 @@ Module bits. let value := M.copy (| γ0_0 |) in let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| value |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [ M.read (| value |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |))) ] |) |))) @@ -4233,6 +4267,8 @@ Module bits. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); @@ -4381,6 +4417,8 @@ Module bits. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); @@ -4558,6 +4596,8 @@ Module bits. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -4657,6 +4697,8 @@ Module bits. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", @@ -5150,6 +5192,8 @@ Module bits. |); Value.StructRecord "core::ops::range::RangeFrom" + [] + [ Ty.path "usize" ] [ ("start", M.call_closure (| @@ -6016,6 +6060,8 @@ Module bits. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", LIMBS) ] ] |) @@ -6504,6 +6550,8 @@ Module bits. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", LIMBS) ] ] |) @@ -6992,6 +7040,8 @@ Module bits. [ Value.StructRecord "core::ops::range::Range" + [] + [ Ty.path "usize" ] [ ("start", Value.Integer IntegerKind.Usize 0); ("end_", LIMBS) ] ] |) diff --git a/CoqOfRust/ruint/bytes.v b/CoqOfRust/ruint/bytes.v index e3a458ac5..d534d9711 100644 --- a/CoqOfRust/ruint/bytes.v +++ b/CoqOfRust/ruint/bytes.v @@ -243,6 +243,8 @@ Module bytes. M.return_ (| Value.StructTuple "alloc::borrow::Cow::Borrowed" + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -337,6 +339,8 @@ Module bytes. M.alloc (| Value.StructTuple "alloc::borrow::Cow::Borrowed" + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ] [ M.borrow (| Pointer.Kind.Ref, @@ -396,7 +400,11 @@ Module bytes. |) |) in M.alloc (| - Value.StructTuple "alloc::borrow::Cow::Owned" [ M.read (| vec |) ] + Value.StructTuple + "alloc::borrow::Cow::Owned" + [] + [ Ty.apply (Ty.path "slice") [] [ Ty.path "u8" ] ] + [ M.read (| vec |) ] |))) ] |) @@ -1365,7 +1373,13 @@ Module bytes. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |) |) |) |))); @@ -1639,6 +1653,8 @@ Module bytes. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -1877,7 +1893,13 @@ Module bytes. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |) |) |) |))); @@ -1887,6 +1909,8 @@ Module bytes. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -2216,7 +2240,13 @@ Module bytes. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |) |) |) |))); @@ -2472,6 +2502,8 @@ Module bytes. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -2685,7 +2717,13 @@ Module bytes. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |) |) |) |))); @@ -2695,6 +2733,8 @@ Module bytes. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], diff --git a/CoqOfRust/ruint/cmp.v b/CoqOfRust/ruint/cmp.v index 534eaa823..5961c1435 100644 --- a/CoqOfRust/ruint/cmp.v +++ b/CoqOfRust/ruint/cmp.v @@ -25,6 +25,8 @@ Module cmp. let other := M.alloc (| other |) in Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "core::cmp::Ordering" ] [ M.call_closure (| Ty.path "core::cmp::Ordering", diff --git a/CoqOfRust/ruint/div.v b/CoqOfRust/ruint/div.v index e989cf257..adcabd7bc 100644 --- a/CoqOfRust/ruint/div.v +++ b/CoqOfRust/ruint/div.v @@ -72,7 +72,13 @@ Module div. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |) |) |) |))); @@ -82,6 +88,8 @@ Module div. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -175,7 +183,13 @@ Module div. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |) |) |) |))); @@ -185,6 +199,8 @@ Module div. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], diff --git a/CoqOfRust/ruint/fmt.v b/CoqOfRust/ruint/fmt.v index fb8d16f38..17250f062 100644 --- a/CoqOfRust/ruint/fmt.v +++ b/CoqOfRust/ruint/fmt.v @@ -637,15 +637,21 @@ Module fmt. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 8; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Param" + [] + [] [ Value.Integer IntegerKind.Usize @@ -1244,15 +1250,21 @@ Module fmt. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 8; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Param" + [] + [] [ Value.Integer IntegerKind.Usize @@ -1798,15 +1810,21 @@ Module fmt. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 8; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Param" + [] + [] [ Value.Integer IntegerKind.Usize @@ -2352,15 +2370,21 @@ Module fmt. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 8; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Param" + [] + [] [ Value.Integer IntegerKind.Usize @@ -2906,15 +2930,21 @@ Module fmt. Value.UnicodeChar 32; Value.StructTuple "core::fmt::rt::Alignment::Unknown" + [] + [] []; Value.Integer IntegerKind.U32 8; Value.StructTuple "core::fmt::rt::Count::Implied" + [] + [] []; Value.StructTuple "core::fmt::rt::Count::Param" + [] + [] [ Value.Integer IntegerKind.Usize @@ -3046,6 +3076,8 @@ Module fmt. ltac:(M.monadic (Value.StructRecord "ruint::fmt::DisplayBuffer" + [ SIZE ] + [] [ ("buf", M.call_closure (| @@ -3195,6 +3227,8 @@ Module fmt. |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.read (| @@ -3405,7 +3439,9 @@ Module fmt. M.return_ (| Value.StructTuple "core::result::Result::Err" - [ Value.StructTuple "core::fmt::Error" [] ] + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.StructTuple "core::fmt::Error" [] [] [] ] |) |) |) @@ -3557,7 +3593,13 @@ Module fmt. |) |) |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Tuple [] ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ Ty.tuple []; Ty.path "core::fmt::Error" ] + [ Value.Tuple [] ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/ruint/from.v b/CoqOfRust/ruint/from.v index deb042307..872b75f0a 100644 --- a/CoqOfRust/ruint/from.v +++ b/CoqOfRust/ruint/from.v @@ -67,6 +67,8 @@ Module from. M.alloc (| Value.StructTuple "ruint::from::ToUintError::ValueTooLarge" + [] + [ T ] [ M.call_closure (| Ty.path "usize", @@ -116,6 +118,8 @@ Module from. M.alloc (| Value.StructTuple "ruint::from::ToUintError::ValueNegative" + [] + [ T ] [ M.call_closure (| Ty.path "usize", @@ -158,6 +162,8 @@ Module from. M.alloc (| Value.StructTuple "ruint::from::ToUintError::NotANumber" + [] + [ T ] [ M.call_closure (| Ty.path "usize", @@ -1266,6 +1272,8 @@ Module from. M.alloc (| Value.StructTuple "ruint::from::FromUintError::Overflow" + [] + [ T ] [ M.call_closure (| Ty.path "usize", @@ -3096,16 +3104,36 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + ] [ Value.StructTuple "ruint::from::ToUintError::ValueTooLarge" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] [ BITS; M.read (| n |) ] ] |))); fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| n |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + ] + [ M.read (| n |) ] |))) ] |))) @@ -3291,9 +3319,19 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS_DST; LIMBS_DST ] []; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS_DST; LIMBS_DST ] [] ] + ] [ Value.StructTuple "ruint::from::FromUintError::Overflow" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS_DST; LIMBS_DST ] [] ] [ BITS_DST; M.read (| n |); @@ -3316,7 +3354,17 @@ Module from. fun γ => ltac:(M.monadic (M.alloc (| - Value.StructTuple "core::result::Result::Ok" [ M.read (| n |) ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS_DST; LIMBS_DST ] []; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS_DST; LIMBS_DST ] [] ] + ] + [ M.read (| n |) ] |))) ] |))) @@ -3521,9 +3569,29 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + [] + ] + ] [ Value.StructTuple "ruint::from::ToUintError::ValueTooLarge" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + [] + ] [ BITS; M.call_closure (| @@ -3577,6 +3645,19 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + [] + ] + ] [ M.read (| get_associated_constant (| @@ -3618,6 +3699,14 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + ] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -3920,9 +4009,32 @@ Module from. (let n := M.copy (| γ |) in Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + [] + ] + ] [ Value.StructTuple "ruint::from::ToUintError::ValueTooLarge" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + [] + ] [ BITS; M.read (| n |) ] ])) ] @@ -4053,9 +4165,19 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + ] [ Value.StructTuple "ruint::from::ToUintError::ValueTooLarge" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] [ BITS; M.call_closure (| @@ -4076,6 +4198,14 @@ Module from. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + ] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -4510,6 +4640,14 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + ] [ M.read (| M.match_operator (| @@ -4595,6 +4733,13 @@ Module from. (M.alloc (| Value.StructTuple "ruint::from::ToUintError::ValueNegative" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + [] + ] [ BITS; M.read (| n |) ] |))) | _ => M.impossible "wrong number of arguments" @@ -4733,6 +4878,14 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + ] [ M.read (| M.match_operator (| @@ -4818,6 +4971,13 @@ Module from. (M.alloc (| Value.StructTuple "ruint::from::ToUintError::ValueNegative" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + [] + ] [ BITS; M.read (| n |) ] |))) | _ => M.impossible "wrong number of arguments" @@ -4956,6 +5116,14 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + ] [ M.read (| M.match_operator (| @@ -5041,6 +5209,13 @@ Module from. (M.alloc (| Value.StructTuple "ruint::from::ToUintError::ValueNegative" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + [] + ] [ BITS; M.read (| n |) ] |))) | _ => M.impossible "wrong number of arguments" @@ -5179,6 +5354,14 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + ] [ M.read (| M.match_operator (| @@ -5264,6 +5447,13 @@ Module from. (M.alloc (| Value.StructTuple "ruint::from::ToUintError::ValueNegative" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + [] + ] [ BITS; M.read (| n |) ] |))) | _ => M.impossible "wrong number of arguments" @@ -5402,6 +5592,14 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + ] [ M.read (| M.match_operator (| @@ -5487,6 +5685,13 @@ Module from. (M.alloc (| Value.StructTuple "ruint::from::ToUintError::ValueNegative" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + [] + ] [ BITS; M.read (| n |) ] |))) | _ => M.impossible "wrong number of arguments" @@ -5625,6 +5830,14 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + ] [ M.read (| M.match_operator (| @@ -5710,6 +5923,13 @@ Module from. (M.alloc (| Value.StructTuple "ruint::from::ToUintError::ValueNegative" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + [] + ] [ BITS; M.read (| n |) ] |))) | _ => M.impossible "wrong number of arguments" @@ -5903,9 +6123,19 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + ] [ Value.StructTuple "ruint::from::ToUintError::NotANumber" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] [ BITS ] ] |) @@ -6080,9 +6310,19 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + ] [ Value.StructTuple "ruint::from::ToUintError::ValueNegative" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] [ BITS; M.read (| wrapped |) ] ] |) @@ -6243,9 +6483,19 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + ] [ Value.StructTuple "ruint::from::ToUintError::ValueTooLarge" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] [ BITS; M.read (| wrapped |) ] ] |) @@ -6279,6 +6529,14 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + ] [ M.read (| get_associated_constant (| @@ -6502,9 +6760,19 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + ] [ Value.StructTuple "ruint::from::ToUintError::ValueTooLarge" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] [ BITS; M.read (| @@ -6838,9 +7106,29 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + [] + ] + ] [ Value.StructTuple "ruint::from::ToUintError::ValueTooLarge" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + [] + ] [ BITS; M.read (| n |) ] ] |))); @@ -6849,6 +7137,19 @@ Module from. (M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.apply + (Ty.path "ruint::from::ToUintError") + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + [] + ] + ] [ M.read (| n |) ] |))) ] @@ -7073,7 +7374,17 @@ Module from. M.never_to_any (| M.read (| M.return_ (| - Value.StructTuple "core::result::Result::Ok" [ Value.Bool false ] + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.path "bool"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "bool" ] + ] + [ Value.Bool false ] |) |) |) @@ -7122,9 +7433,19 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "bool"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "bool" ] + ] [ Value.StructTuple "ruint::from::FromUintError::Overflow" + [] + [ Ty.path "bool" ] [ BITS; M.call_closure (| @@ -7156,6 +7477,11 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "bool"; + Ty.apply (Ty.path "ruint::from::FromUintError") [] [ Ty.path "bool" ] + ] [ M.call_closure (| Ty.path "bool", @@ -7346,6 +7672,14 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "i8"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "i8" ] + ] [ Value.Integer IntegerKind.I8 0 ] |) |) @@ -7400,9 +7734,19 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i8"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "i8" ] + ] [ Value.StructTuple "ruint::from::FromUintError::Overflow" + [] + [ Ty.path "i8" ] [ BITS; M.cast @@ -7436,6 +7780,11 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "i8"; + Ty.apply (Ty.path "ruint::from::FromUintError") [] [ Ty.path "i8" ] + ] [ M.cast (Ty.path "i8") @@ -7617,6 +7966,14 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "u8"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "u8" ] + ] [ Value.Integer IntegerKind.U8 0 ] |) |) @@ -7671,9 +8028,19 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u8"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "u8" ] + ] [ Value.StructTuple "ruint::from::FromUintError::Overflow" + [] + [ Ty.path "u8" ] [ BITS; M.cast @@ -7707,6 +8074,11 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "u8"; + Ty.apply (Ty.path "ruint::from::FromUintError") [] [ Ty.path "u8" ] + ] [ M.cast (Ty.path "u8") @@ -7889,6 +8261,14 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "i16"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "i16" ] + ] [ Value.Integer IntegerKind.I16 0 ] |) |) @@ -7943,9 +8323,19 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i16"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "i16" ] + ] [ Value.StructTuple "ruint::from::FromUintError::Overflow" + [] + [ Ty.path "i16" ] [ BITS; M.cast @@ -7979,6 +8369,11 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "i16"; + Ty.apply (Ty.path "ruint::from::FromUintError") [] [ Ty.path "i16" ] + ] [ M.cast (Ty.path "i16") @@ -8161,6 +8556,14 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "u16"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "u16" ] + ] [ Value.Integer IntegerKind.U16 0 ] |) |) @@ -8215,9 +8618,19 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u16"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "u16" ] + ] [ Value.StructTuple "ruint::from::FromUintError::Overflow" + [] + [ Ty.path "u16" ] [ BITS; M.cast @@ -8251,6 +8664,11 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "u16"; + Ty.apply (Ty.path "ruint::from::FromUintError") [] [ Ty.path "u16" ] + ] [ M.cast (Ty.path "u16") @@ -8433,6 +8851,14 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "i32"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "i32" ] + ] [ Value.Integer IntegerKind.I32 0 ] |) |) @@ -8487,9 +8913,19 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i32"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "i32" ] + ] [ Value.StructTuple "ruint::from::FromUintError::Overflow" + [] + [ Ty.path "i32" ] [ BITS; M.cast @@ -8523,6 +8959,11 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "i32"; + Ty.apply (Ty.path "ruint::from::FromUintError") [] [ Ty.path "i32" ] + ] [ M.cast (Ty.path "i32") @@ -8705,6 +9146,14 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "u32"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "u32" ] + ] [ Value.Integer IntegerKind.U32 0 ] |) |) @@ -8759,9 +9208,19 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u32"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "u32" ] + ] [ Value.StructTuple "ruint::from::FromUintError::Overflow" + [] + [ Ty.path "u32" ] [ BITS; M.cast @@ -8795,6 +9254,11 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "u32"; + Ty.apply (Ty.path "ruint::from::FromUintError") [] [ Ty.path "u32" ] + ] [ M.cast (Ty.path "u32") @@ -8977,6 +9441,14 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "i64"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "i64" ] + ] [ Value.Integer IntegerKind.I64 0 ] |) |) @@ -9031,9 +9503,19 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i64"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "i64" ] + ] [ Value.StructTuple "ruint::from::FromUintError::Overflow" + [] + [ Ty.path "i64" ] [ BITS; M.cast @@ -9067,6 +9549,11 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "i64"; + Ty.apply (Ty.path "ruint::from::FromUintError") [] [ Ty.path "i64" ] + ] [ M.cast (Ty.path "i64") @@ -9249,6 +9736,14 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "u64"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "u64" ] + ] [ Value.Integer IntegerKind.U64 0 ] |) |) @@ -9303,9 +9798,19 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u64"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "u64" ] + ] [ Value.StructTuple "ruint::from::FromUintError::Overflow" + [] + [ Ty.path "u64" ] [ BITS; M.read (| @@ -9338,6 +9843,11 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "u64"; + Ty.apply (Ty.path "ruint::from::FromUintError") [] [ Ty.path "u64" ] + ] [ M.read (| M.use @@ -9521,6 +10031,14 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "isize"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "isize" ] + ] [ Value.Integer IntegerKind.Isize 0 ] |) |) @@ -9575,9 +10093,19 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "isize"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "isize" ] + ] [ Value.StructTuple "ruint::from::FromUintError::Overflow" + [] + [ Ty.path "isize" ] [ BITS; M.cast @@ -9611,6 +10139,11 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "isize"; + Ty.apply (Ty.path "ruint::from::FromUintError") [] [ Ty.path "isize" ] + ] [ M.cast (Ty.path "isize") @@ -9795,6 +10328,14 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "usize"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "usize" ] + ] [ Value.Integer IntegerKind.Usize 0 ] |) |) @@ -9849,9 +10390,19 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "usize"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "usize" ] + ] [ Value.StructTuple "ruint::from::FromUintError::Overflow" + [] + [ Ty.path "usize" ] [ BITS; M.cast @@ -9885,6 +10436,11 @@ Module from. M.alloc (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "usize"; + Ty.apply (Ty.path "ruint::from::FromUintError") [] [ Ty.path "usize" ] + ] [ M.cast (Ty.path "usize") @@ -10068,6 +10624,14 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "i128"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "i128" ] + ] [ Value.Integer IntegerKind.I128 0 ] |) |) @@ -10115,6 +10679,14 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "i128"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "i128" ] + ] [ M.read (| result |) ] |) |) @@ -10197,9 +10769,19 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "i128"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "i128" ] + ] [ Value.StructTuple "ruint::from::FromUintError::Overflow" + [] + [ Ty.path "i128" ] [ BITS; M.read (| result |); @@ -10219,7 +10801,16 @@ Module from. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| result |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.path "i128"; + Ty.apply (Ty.path "ruint::from::FromUintError") [] [ Ty.path "i128" ] + ] + [ M.read (| result |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -10377,6 +10968,14 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "u128"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "u128" ] + ] [ Value.Integer IntegerKind.U128 0 ] |) |) @@ -10424,6 +11023,14 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Ok" + [] + [ + Ty.path "u128"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "u128" ] + ] [ M.read (| result |) ] |) |) @@ -10506,9 +11113,19 @@ Module from. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.path "u128"; + Ty.apply + (Ty.path "ruint::from::FromUintError") + [] + [ Ty.path "u128" ] + ] [ Value.StructTuple "ruint::from::FromUintError::Overflow" + [] + [ Ty.path "u128" ] [ BITS; M.read (| result |); @@ -10528,7 +11145,16 @@ Module from. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructTuple "core::result::Result::Ok" [ M.read (| result |) ] |) + M.alloc (| + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.path "u128"; + Ty.apply (Ty.path "ruint::from::FromUintError") [] [ Ty.path "u128" ] + ] + [ M.read (| result |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/ruint/lib.v b/CoqOfRust/ruint/lib.v index 056ddf0b6..90a01c7ac 100644 --- a/CoqOfRust/ruint/lib.v +++ b/CoqOfRust/ruint/lib.v @@ -764,7 +764,9 @@ Module Impl_ruint_Uint_BITS_LIMBS. fun γ => ltac:(M.monadic (M.alloc (| Value.Tuple [] |))) ] |) in - M.alloc (| Value.StructRecord "ruint::Uint" [ ("limbs", M.read (| limbs |)) ] |) + M.alloc (| + Value.StructRecord "ruint::Uint" [ BITS; LIMBS ] [] [ ("limbs", M.read (| limbs |)) ] + |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -915,13 +917,25 @@ Module Impl_ruint_Uint_BITS_LIMBS. let γ0_1 := M.SubPointer.get_tuple_field (| γ, 1 |) in let n := M.copy (| γ0_0 |) in let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in - M.alloc (| Value.StructTuple "core::option::Option::Some" [ M.read (| n |) ] |))); + M.alloc (| + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [ M.read (| n |) ] + |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in let γ0_1 := M.SubPointer.get_tuple_field (| γ, 1 |) in let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |))) ] |) |))) @@ -1087,6 +1101,8 @@ Module Impl_ruint_Uint_BITS_LIMBS. M.borrow (| Pointer.Kind.MutRef, limbs |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| diff --git a/CoqOfRust/ruint/links/lib.v b/CoqOfRust/ruint/links/lib.v index 3bddb3fcc..1e86d4d39 100644 --- a/CoqOfRust/ruint/links/lib.v +++ b/CoqOfRust/ruint/links/lib.v @@ -12,7 +12,7 @@ Module Uint. Global Instance IsLink {BITS LIMBS : Usize.t} : Link (t BITS LIMBS) := { Φ := Ty.apply (Ty.path "ruint::Uint") [ φ BITS; φ LIMBS ] []; - φ x := Value.StructRecord "ruint::Uint" [ + φ x := Value.StructRecord "ruint::Uint" [ φ BITS; φ LIMBS ] [] [ ("limbs", φ x.(limbs)) ]; }. diff --git a/CoqOfRust/ruint/log.v b/CoqOfRust/ruint/log.v index 92b014749..de28a88d4 100644 --- a/CoqOfRust/ruint/log.v +++ b/CoqOfRust/ruint/log.v @@ -101,7 +101,13 @@ Module log. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "usize" ] + [] + |) |) |) |))); @@ -111,6 +117,8 @@ Module log. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "usize" ] [ M.call_closure (| Ty.path "usize", diff --git a/CoqOfRust/ruint/modular.v b/CoqOfRust/ruint/modular.v index d249a4850..1f6a28907 100644 --- a/CoqOfRust/ruint/modular.v +++ b/CoqOfRust/ruint/modular.v @@ -1194,7 +1194,11 @@ Module modular. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple + "core::panicking::AssertKind::Eq" + [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1224,7 +1228,11 @@ Module modular. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/ruint/mul.v b/CoqOfRust/ruint/mul.v index bf782b783..c72eee31b 100644 --- a/CoqOfRust/ruint/mul.v +++ b/CoqOfRust/ruint/mul.v @@ -57,10 +57,21 @@ Module mul. let value := M.copy (| γ0_0 |) in let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| value |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [ M.read (| value |) ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |))) ] |) |))) @@ -597,7 +608,13 @@ Module mul. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |) |) |) |))); @@ -637,6 +654,8 @@ Module mul. M.alloc (| Value.StructTuple "core::num::wrapping::Wrapping" + [] + [ Ty.path "u64" ] [ M.read (| M.SubPointer.get_array_field (| @@ -1177,6 +1196,8 @@ Module mul. Value.StructTuple "core::panicking::AssertKind::Eq" [] + [] + [] |) in M.alloc (| M.call_closure (| @@ -1213,6 +1234,8 @@ Module mul. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -1374,7 +1397,13 @@ Module mul. |) |) |) in - M.alloc (| Value.StructTuple "core::option::Option::Some" [ M.read (| result |) ] |) + M.alloc (| + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [ M.read (| result |) ] + |) |))) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1473,7 +1502,7 @@ Module mul. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -1503,7 +1532,11 @@ Module mul. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) @@ -1572,7 +1605,7 @@ Module mul. [] [ Ty.path "core::panicking::AssertKind" ] := M.alloc (| - Value.StructTuple "core::panicking::AssertKind::Eq" [] + Value.StructTuple "core::panicking::AssertKind::Eq" [] [] [] |) in M.alloc (| M.call_closure (| @@ -1602,7 +1635,11 @@ Module mul. |) |) |); - Value.StructTuple "core::option::Option::None" [] + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "core::fmt::Arguments" ] + [] ] |) |) diff --git a/CoqOfRust/ruint/pow.v b/CoqOfRust/ruint/pow.v index e60b7c234..77e273282 100644 --- a/CoqOfRust/ruint/pow.v +++ b/CoqOfRust/ruint/pow.v @@ -57,14 +57,24 @@ Module pow. let x := M.copy (| γ0_0 |) in let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool false |) in M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| x |) ] + Value.StructTuple + "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [ M.read (| x |) ] |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in let γ0_1 := M.SubPointer.get_tuple_field (| γ, 1 |) in let _ := is_constant_or_break_match (| M.read (| γ0_1 |), Value.Bool true |) in - M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |))) ] |) |))) @@ -849,6 +859,13 @@ Module pow. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.apply + (Ty.path "ruint::Uint") + [ BITS; LIMBS ] + [] + ] [ M.read (| get_associated_constant (| @@ -957,7 +974,13 @@ Module pow. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |) |) |) |))); @@ -1028,6 +1051,8 @@ Module pow. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] [ M.read (| M.match_operator (| diff --git a/CoqOfRust/ruint/special.v b/CoqOfRust/ruint/special.v index 8bca7b4e7..23a9fffe8 100644 --- a/CoqOfRust/ruint/special.v +++ b/CoqOfRust/ruint/special.v @@ -159,6 +159,8 @@ Module special. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] [ M.read (| self |) ] |) |) @@ -201,7 +203,13 @@ Module special. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |) |) |) |))); @@ -211,6 +219,8 @@ Module special. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] [ M.call_closure (| Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [], @@ -392,7 +402,13 @@ Module special. M.alloc (| M.never_to_any (| M.read (| - M.return_ (| Value.StructTuple "core::option::Option::None" [] |) + M.return_ (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] + [] + |) |) |) |))); @@ -477,6 +493,8 @@ Module special. M.return_ (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] [] ] [ M.read (| self |) ] |) |) diff --git a/CoqOfRust/ruint/string.v b/CoqOfRust/ruint/string.v index f199cd621..e0e1024df 100644 --- a/CoqOfRust/ruint/string.v +++ b/CoqOfRust/ruint/string.v @@ -539,6 +539,9 @@ Module string. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] + ] [ (* Unsize *) M.pointer_coercion @@ -546,7 +549,15 @@ Module string. ] |))); fun γ => - ltac:(M.monadic (M.alloc (| Value.StructTuple "core::option::Option::None" [] |))) + ltac:(M.monadic + (M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.apply (Ty.path "&") [] [ Ty.dyn [ ("core::error::Error::Trait", []) ] ] + ] + [] + |))) ] |) |))) @@ -575,7 +586,11 @@ Module string. | [], [], [ value ] => ltac:(M.monadic (let value := M.alloc (| value |) in - Value.StructTuple "ruint::string::ParseError::BaseConvertError" [ M.read (| value |) ])) + Value.StructTuple + "ruint::string::ParseError::BaseConvertError" + [] + [] + [ M.read (| value |) ])) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -916,9 +931,16 @@ Module string. M.return_ (| Value.StructTuple "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.path "ruint::string::ParseError" + ] [ Value.StructTuple "ruint::string::ParseError::InvalidRadix" + [] + [] [ M.read (| radix |) ] ] |) @@ -938,7 +960,13 @@ Module string. [] [ Ty.path "ruint::string::ParseError" ] ] := - M.alloc (| Value.StructTuple "core::option::Option::None" [] |) in + M.alloc (| + Value.StructTuple + "core::option::Option::None" + [] + [ Ty.path "ruint::string::ParseError" ] + [] + |) in let~ digits : Ty.apply (Ty.path "*") @@ -1049,6 +1077,8 @@ Module string. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "u64" ] + [] |) |) |) @@ -1230,6 +1260,8 @@ Module string. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "u64" ] + [] |) |) |) @@ -1249,9 +1281,16 @@ Module string. err, Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "ruint::string::ParseError" + ] [ Value.StructTuple "ruint::string::ParseError::InvalidDigit" + [] + [] [ M.read (| c |) ] ] |) @@ -1260,6 +1299,8 @@ Module string. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "u64" ] + [] |) |) |) @@ -1525,6 +1566,9 @@ Module string. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "u64" + ] + [] |) |) |) @@ -1549,9 +1593,16 @@ Module string. err, Value.StructTuple "core::option::Option::Some" + [] + [ + Ty.path + "ruint::string::ParseError" + ] [ Value.StructTuple "ruint::string::ParseError::InvalidDigit" + [] + [] [ M.read (| c |) ] ] |) @@ -1560,6 +1611,8 @@ Module string. Value.StructTuple "core::option::Option::None" [] + [ Ty.path "u64" ] + [] |) |) |) @@ -1572,6 +1625,8 @@ Module string. M.alloc (| Value.StructTuple "core::option::Option::Some" + [] + [ Ty.path "u64" ] [ M.read (| digit |) ] |) |))) @@ -1757,8 +1812,21 @@ Module string. |), [ M.read (| err |); - Value.StructTuple "core::result::Result::Ok" [ M.read (| value |) ]; - M.constructor_as_closure "core::result::Result::Err" + Value.StructTuple + "core::result::Result::Ok" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.path "ruint::string::ParseError" + ] + [ M.read (| value |) ]; + M.constructor_as_closure + "core::result::Result::Err" + [] + [ + Ty.apply (Ty.path "ruint::Uint") [ BITS; LIMBS ] []; + Ty.path "ruint::string::ParseError" + ] ] |) |) diff --git a/CoqOfRust/ruint/utils.v b/CoqOfRust/ruint/utils.v index e3c935239..0925f568e 100644 --- a/CoqOfRust/ruint/utils.v +++ b/CoqOfRust/ruint/utils.v @@ -211,6 +211,8 @@ Module utils. M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| slice |) |) |); Value.StructRecord "core::ops::range::RangeTo" + [] + [ Ty.path "usize" ] [ ("end_", M.call_closure (| diff --git a/lib/src/expression.rs b/lib/src/expression.rs index 00343c6cf..825cc1ae0 100644 --- a/lib/src/expression.rs +++ b/lib/src/expression.rs @@ -99,6 +99,11 @@ pub(crate) enum Expr { generic_tys: Vec>, }, Literal(Rc), + ConstructorAsClosure { + path: Rc, + generic_consts: Vec>, + generic_tys: Vec>, + }, Call { func: Rc, args: Vec>, @@ -154,11 +159,15 @@ pub(crate) enum Expr { ControlFlow(LoopControlFlow), StructStruct { path: Rc, + arg_consts: Vec>, + arg_tys: Vec>, fields: Vec<(String, Rc)>, base: Option>, }, StructTuple { path: Rc, + arg_consts: Vec>, + arg_tys: Vec>, fields: Vec>, }, Use(Rc), @@ -266,6 +275,7 @@ impl Expr { Expr::GetTraitMethod { .. } => false, Expr::GetAssociatedFunction { .. } => false, Expr::Literal(_) => false, + Expr::ConstructorAsClosure { .. } => false, Expr::Call { func, args, @@ -304,13 +314,20 @@ impl Expr { Expr::ControlFlow(_) => false, Expr::StructStruct { path: _, + arg_consts: _, + arg_tys: _, fields, base, } => { fields.iter().any(|(_, field)| field.has_return()) || base.iter().any(|base| base.has_return()) } - Expr::StructTuple { path: _, fields } => fields.iter().any(|field| field.has_return()), + Expr::StructTuple { + path: _, + arg_consts: _, + arg_tys: _, + fields, + } => fields.iter().any(|field| field.has_return()), Expr::Use(expr) => expr.has_return(), Expr::InternalString(_) => false, Expr::InternalInteger(_) => false, @@ -561,6 +578,25 @@ impl Expr { }), ]), Expr::Literal(literal) => literal.to_coq(), + Expr::ConstructorAsClosure { + path, + generic_consts, + generic_tys, + } => coq::Expression::just_name("M.constructor_as_closure").apply_many(&[ + Rc::new(coq::Expression::String(path.to_string())), + Rc::new(coq::Expression::List { + exprs: generic_consts + .iter() + .map(|generic_const| generic_const.to_coq()) + .collect_vec(), + }), + Rc::new(coq::Expression::List { + exprs: generic_tys + .iter() + .map(|generic_ty| generic_ty.to_coq()) + .collect_vec(), + }), + ]), Expr::Call { func, args, kind } => match kind { CallKind::Pure => func .to_coq() @@ -684,9 +720,24 @@ impl Expr { .monadic_apply_many(&[base.to_coq(), index.to_coq()]) } Expr::ControlFlow(lcf_expression) => lcf_expression.to_coq(), - Expr::StructStruct { path, fields, base } => match base { + Expr::StructStruct { + path, + arg_consts, + arg_tys, + fields, + base, + } => match base { None => coq::Expression::just_name("Value.StructRecord").apply_many(&[ Rc::new(coq::Expression::String(path.to_string())), + Rc::new(coq::Expression::List { + exprs: arg_consts + .iter() + .map(|arg_const| arg_const.to_coq()) + .collect_vec(), + }), + Rc::new(coq::Expression::List { + exprs: arg_tys.iter().map(|arg_ty| arg_ty.to_coq()).collect_vec(), + }), Rc::new(coq::Expression::List { exprs: fields .iter() @@ -714,13 +765,26 @@ impl Expr { }), ]), }, - Expr::StructTuple { path, fields } => coq::Expression::just_name("Value.StructTuple") - .apply_many(&[ - Rc::new(coq::Expression::String(path.to_string())), - Rc::new(coq::Expression::List { - exprs: fields.iter().map(|expr| expr.to_coq()).collect(), - }), - ]), + Expr::StructTuple { + path, + arg_consts, + arg_tys, + fields, + } => coq::Expression::just_name("Value.StructTuple").apply_many(&[ + Rc::new(coq::Expression::String(path.to_string())), + Rc::new(coq::Expression::List { + exprs: arg_consts + .iter() + .map(|arg_const| arg_const.to_coq()) + .collect_vec(), + }), + Rc::new(coq::Expression::List { + exprs: arg_tys.iter().map(|arg_ty| arg_ty.to_coq()).collect_vec(), + }), + Rc::new(coq::Expression::List { + exprs: fields.iter().map(|expr| expr.to_coq()).collect(), + }), + ]), Expr::Use(expr) => coq::Expression::just_name("M.use").apply(expr.to_coq()), Expr::InternalString(s) => Rc::new(coq::Expression::String(s.to_string())), Expr::InternalInteger(i) => coq::Expression::just_name(i.to_string().as_str()), diff --git a/lib/src/thir_expression.rs b/lib/src/thir_expression.rs index 9a91cf765..f355f3e1c 100644 --- a/lib/src/thir_expression.rs +++ b/lib/src/thir_expression.rs @@ -862,6 +862,15 @@ pub(crate) fn compile_expr<'a>( } } thir::ExprKind::Adt(adt_expr) => { + let ty = compile_type(env, &expr.span, generics, &expr.ty); + let (arg_consts, arg_tys) = match ty.as_ref() { + CoqType::Application { + func: _, + consts, + tys, + } => (consts.clone(), tys.clone()), + _ => (vec![], vec![]), + }; let AdtExpr { adt_def, variant_index, @@ -894,6 +903,8 @@ pub(crate) fn compile_expr<'a>( if fields.is_empty() { return Rc::new(Expr::StructTuple { path, + arg_consts, + arg_tys, fields: vec![], }) .alloc(); @@ -901,9 +912,22 @@ pub(crate) fn compile_expr<'a>( if is_a_tuple { let fields = fields.into_iter().map(|(_, pattern)| pattern).collect(); - Rc::new(Expr::StructTuple { path, fields }).alloc() + Rc::new(Expr::StructTuple { + path, + arg_consts, + arg_tys, + fields, + }) + .alloc() } else { - Rc::new(Expr::StructStruct { path, fields, base }).alloc() + Rc::new(Expr::StructStruct { + path, + arg_consts, + arg_tys, + fields, + base, + }) + .alloc() } } thir::ExprKind::PlaceTypeAscription { source, .. } @@ -1129,11 +1153,29 @@ pub(crate) fn compile_expr<'a>( } DefKind::Struct | DefKind::Variant => { let path = compile_def_id(env, *def_id); + let generic_consts = generic_args + .iter() + .filter_map(|generic_arg| { + generic_arg + .as_const() + .as_ref() + .map(|ct| compile_const(env, &expr.span, ct)) + }) + .collect::>(); + let generic_tys = generic_args + .iter() + .filter_map(|generic_arg| { + generic_arg + .as_type() + .as_ref() + .map(|ty| compile_type(env, &expr.span, generics, ty)) + }) + .collect::>(); - Rc::new(Expr::Call { - func: Expr::local_var("M.constructor_as_closure"), - args: vec![Rc::new(Expr::InternalString(path.to_string()))], - kind: CallKind::Pure, + Rc::new(Expr::ConstructorAsClosure { + path, + generic_consts, + generic_tys, }) .alloc() }