From e47e455e378320df13e391fe40fa31340eef8cfa Mon Sep 17 00:00:00 2001 From: Guillaume Claret Date: Thu, 27 Mar 2025 11:27:12 +0100 Subject: [PATCH] fix: fix the translation of string constants + a few more links --- CoqOfRust/alloc/alloc.v | 24 +- CoqOfRust/alloc/borrow.v | 5 +- CoqOfRust/alloc/boxed/convert.v | 18 +- CoqOfRust/alloc/boxed/thin.v | 28 +- CoqOfRust/alloc/collections/binary_heap/mod.v | 69 +- CoqOfRust/alloc/collections/btree/fix.v | 25 +- CoqOfRust/alloc/collections/btree/map.v | 37 +- CoqOfRust/alloc/collections/btree/map/entry.v | 41 +- .../alloc/collections/btree/merge_iter.v | 14 +- CoqOfRust/alloc/collections/btree/navigate.v | 17 +- CoqOfRust/alloc/collections/btree/node.v | 186 +-- CoqOfRust/alloc/collections/btree/remove.v | 20 +- CoqOfRust/alloc/collections/btree/search.v | 25 +- CoqOfRust/alloc/collections/btree/set.v | 74 +- CoqOfRust/alloc/collections/btree/set/entry.v | 13 +- CoqOfRust/alloc/collections/btree/set_val.v | 5 +- CoqOfRust/alloc/collections/btree/split.v | 6 +- CoqOfRust/alloc/collections/linked_list.v | 22 +- CoqOfRust/alloc/collections/mod.v | 34 +- CoqOfRust/alloc/collections/vec_deque/drain.v | 4 +- .../alloc/collections/vec_deque/into_iter.v | 2 +- CoqOfRust/alloc/collections/vec_deque/iter.v | 2 +- .../alloc/collections/vec_deque/iter_mut.v | 2 +- CoqOfRust/alloc/collections/vec_deque/mod.v | 140 +- .../alloc/collections/vec_deque/spec_extend.v | 17 +- CoqOfRust/alloc/ffi/c_str.v | 63 +- CoqOfRust/alloc/fmt.v | 5 +- CoqOfRust/alloc/raw_vec.v | 19 +- CoqOfRust/alloc/rc.v | 30 +- CoqOfRust/alloc/slice.v | 2 +- CoqOfRust/alloc/str.v | 11 +- CoqOfRust/alloc/string.v | 125 +- CoqOfRust/alloc/sync.v | 37 +- CoqOfRust/alloc/vec/drain.v | 5 +- CoqOfRust/alloc/vec/extract_if.v | 15 +- CoqOfRust/alloc/vec/in_place_collect.v | 20 +- CoqOfRust/alloc/vec/into_iter.v | 2 +- CoqOfRust/alloc/vec/links/mod.v | 20 +- CoqOfRust/alloc/vec/mod.v | 16 +- CoqOfRust/alloc/vec/spec_from_iter_nested.v | 3 +- CoqOfRust/alloc/vec/splice.v | 14 +- CoqOfRust/core/alloc/layout.v | 15 +- CoqOfRust/core/alloc/mod.v | 22 +- CoqOfRust/core/any.v | 20 +- CoqOfRust/core/array/iter.v | 2 +- CoqOfRust/core/array/mod.v | 14 +- CoqOfRust/core/ascii.v | 5 +- CoqOfRust/core/asserting.v | 7 +- CoqOfRust/core/async_iter/from_iter.v | 4 +- CoqOfRust/core/cell.v | 64 +- CoqOfRust/core/cell/lazy.v | 14 +- CoqOfRust/core/cell/once.v | 17 +- CoqOfRust/core/char/convert.v | 31 +- CoqOfRust/core/char/decode.v | 25 +- CoqOfRust/core/char/methods.v | 5 +- CoqOfRust/core/char/mod.v | 47 +- CoqOfRust/core/clone/uninit.v | 10 +- CoqOfRust/core/cmp.v | 21 +- CoqOfRust/core/error.v | 36 +- CoqOfRust/core/escape.v | 9 +- CoqOfRust/core/ffi/c_str.v | 45 +- CoqOfRust/core/ffi/mod.v | 5 +- CoqOfRust/core/ffi/va_list.v | 33 +- CoqOfRust/core/fmt/builders.v | 232 +-- CoqOfRust/core/fmt/float.v | 4 +- CoqOfRust/core/fmt/links/mod.v | 46 + CoqOfRust/core/fmt/links/rt.v | 23 + CoqOfRust/core/fmt/mod.v | 124 +- CoqOfRust/core/fmt/num.v | 61 +- CoqOfRust/core/future/async_drop.v | 4 +- CoqOfRust/core/future/join.v | 12 +- CoqOfRust/core/future/mod.v | 2 +- CoqOfRust/core/future/pending.v | 5 +- CoqOfRust/core/future/poll_fn.v | 5 +- CoqOfRust/core/future/ready.v | 8 +- CoqOfRust/core/hash/mod.v | 2 +- CoqOfRust/core/hash/sip.v | 95 +- CoqOfRust/core/intrinsics/mod.v | 1462 +++++++++++++---- CoqOfRust/core/io/borrowed_buf.v | 34 +- CoqOfRust/core/iter/adapters/array_chunks.v | 18 +- CoqOfRust/core/iter/adapters/by_ref_sized.v | 5 +- CoqOfRust/core/iter/adapters/chain.v | 6 +- CoqOfRust/core/iter/adapters/cloned.v | 4 +- CoqOfRust/core/iter/adapters/copied.v | 4 +- CoqOfRust/core/iter/adapters/cycle.v | 6 +- CoqOfRust/core/iter/adapters/enumerate.v | 9 +- CoqOfRust/core/iter/adapters/filter.v | 7 +- CoqOfRust/core/iter/adapters/filter_map.v | 7 +- CoqOfRust/core/iter/adapters/flatten.v | 31 +- CoqOfRust/core/iter/adapters/fuse.v | 4 +- CoqOfRust/core/iter/adapters/inspect.v | 7 +- CoqOfRust/core/iter/adapters/intersperse.v | 39 +- CoqOfRust/core/iter/adapters/map.v | 10 +- CoqOfRust/core/iter/adapters/map_while.v | 7 +- CoqOfRust/core/iter/adapters/map_windows.v | 34 +- CoqOfRust/core/iter/adapters/peekable.v | 15 +- CoqOfRust/core/iter/adapters/rev.v | 4 +- CoqOfRust/core/iter/adapters/scan.v | 9 +- CoqOfRust/core/iter/adapters/skip.v | 11 +- CoqOfRust/core/iter/adapters/skip_while.v | 9 +- CoqOfRust/core/iter/adapters/step_by.v | 16 +- CoqOfRust/core/iter/adapters/take.v | 6 +- CoqOfRust/core/iter/adapters/take_while.v | 9 +- CoqOfRust/core/iter/adapters/zip.v | 33 +- CoqOfRust/core/iter/range.v | 46 +- CoqOfRust/core/iter/sources/empty.v | 5 +- CoqOfRust/core/iter/sources/from_coroutine.v | 2 +- CoqOfRust/core/iter/sources/from_fn.v | 5 +- CoqOfRust/core/iter/sources/once.v | 4 +- CoqOfRust/core/iter/sources/once_with.v | 4 +- CoqOfRust/core/iter/sources/repeat.v | 7 +- CoqOfRust/core/iter/sources/repeat_n.v | 9 +- CoqOfRust/core/iter/sources/repeat_with.v | 5 +- CoqOfRust/core/iter/sources/successors.v | 7 +- CoqOfRust/core/iter/traits/iterator.v | 5 +- CoqOfRust/core/links/array.v | 18 + CoqOfRust/core/links/hint.v | 11 + CoqOfRust/core/links/panicking.v | 14 + CoqOfRust/core/marker.v | 5 +- CoqOfRust/core/mem/manually_drop.v | 7 +- CoqOfRust/core/mem/maybe_uninit.v | 7 +- CoqOfRust/core/mem/mod.v | 7 +- CoqOfRust/core/mem/transmutability.v | 16 +- CoqOfRust/core/net/ip_addr.v | 56 +- CoqOfRust/core/net/parser.v | 56 +- CoqOfRust/core/net/socket_addr.v | 35 +- CoqOfRust/core/num/bignum.v | 92 +- CoqOfRust/core/num/dec2flt/common.v | 9 +- CoqOfRust/core/num/dec2flt/decimal.v | 5 +- CoqOfRust/core/num/dec2flt/float.v | 10 +- CoqOfRust/core/num/dec2flt/lemire.v | 16 +- CoqOfRust/core/num/dec2flt/mod.v | 23 +- CoqOfRust/core/num/dec2flt/number.v | 22 +- CoqOfRust/core/num/dec2flt/parse.v | 6 +- CoqOfRust/core/num/diy_float.v | 14 +- CoqOfRust/core/num/error.v | 50 +- CoqOfRust/core/num/flt2dec/decoder.v | 38 +- CoqOfRust/core/num/flt2dec/mod.v | 71 +- CoqOfRust/core/num/flt2dec/strategy/dragon.v | 66 +- CoqOfRust/core/num/flt2dec/strategy/grisu.v | 90 +- CoqOfRust/core/num/fmt.v | 15 +- CoqOfRust/core/num/int_log10.v | 6 +- CoqOfRust/core/num/int_sqrt.v | 101 +- CoqOfRust/core/num/mod.v | 85 +- CoqOfRust/core/num/overflow_panic.v | 32 +- CoqOfRust/core/ops/control_flow.v | 10 +- CoqOfRust/core/ops/coroutine.v | 10 +- CoqOfRust/core/ops/index_range.v | 21 +- CoqOfRust/core/ops/range.v | 40 +- CoqOfRust/core/ops/try_trait.v | 2 +- CoqOfRust/core/option.v | 28 +- CoqOfRust/core/panic/location.v | 15 +- CoqOfRust/core/panic/panic_info.v | 28 +- CoqOfRust/core/panic/unwind_safe.v | 2 +- CoqOfRust/core/panicking.v | 137 +- CoqOfRust/core/ptr/alignment.v | 6 +- CoqOfRust/core/ptr/const_ptr.v | 20 +- CoqOfRust/core/ptr/metadata.v | 2 +- CoqOfRust/core/ptr/mut_ptr.v | 12 +- CoqOfRust/core/ptr/non_null.v | 5 +- CoqOfRust/core/range.v | 13 +- CoqOfRust/core/range/iter.v | 15 +- CoqOfRust/core/result.v | 34 +- CoqOfRust/core/slice/ascii.v | 5 +- CoqOfRust/core/slice/index.v | 12 +- CoqOfRust/core/slice/iter.v | 277 +--- CoqOfRust/core/slice/mod.v | 167 +- CoqOfRust/core/slice/sort/select.v | 20 +- CoqOfRust/core/slice/sort/shared/smallsort.v | 5 +- CoqOfRust/core/slice/sort/stable/drift.v | 4 +- CoqOfRust/core/str/error.v | 40 +- CoqOfRust/core/str/iter.v | 137 +- CoqOfRust/core/str/lossy.v | 21 +- CoqOfRust/core/str/mod.v | 37 +- CoqOfRust/core/str/pattern.v | 184 +-- CoqOfRust/core/str/traits.v | 8 +- CoqOfRust/core/sync/atomic.v | 87 +- CoqOfRust/core/sync/exclusive.v | 5 +- CoqOfRust/core/task/poll.v | 10 +- CoqOfRust/core/task/wake.v | 75 +- CoqOfRust/core/time.v | 134 +- CoqOfRust/core/ub_checks.v | 70 +- .../examples/custom/constructor_as_function.v | 9 +- .../default/examples/custom/hello_world.v | 49 +- .../examples/custom/module_duplicate.v | 8 +- .../ink_contracts/basic_contract_caller.v | 2 +- .../examples/ink_contracts/call_runtime.v | 54 +- .../ink_contracts/conditional_compilation.v | 48 +- .../ink_contracts/contract_terminate.v | 32 +- .../ink_contracts/contract_transfer.v | 98 +- .../ink_contracts/custom_environment.v | 32 +- .../default/examples/ink_contracts/dns.v | 172 +- .../examples/ink_contracts/e2e_call_runtime.v | 31 +- .../default/examples/ink_contracts/erc1155.v | 170 +- .../default/examples/ink_contracts/erc20.v | 69 +- .../default/examples/ink_contracts/erc721.v | 164 +- .../lang_err_integration_tests/call_builder.v | 23 +- .../constructors_return_value.v | 38 +- .../lang_err_integration_tests/contract_ref.v | 17 +- .../integration_flipper.v | 2 +- .../ink_contracts/mapping_integration_tests.v | 155 +- .../default/examples/ink_contracts/mother.v | 85 +- .../default/examples/ink_contracts/multisig.v | 224 ++- .../examples/ink_contracts/payment_channel.v | 231 ++- .../examples/ink_contracts/set_code_hash.v | 35 +- .../set_code_hash/updated_incrementer.v | 57 +- .../examples/ink_contracts/trait_erc20.v | 73 +- .../ink_contracts/wildcard_selector.v | 28 +- .../rust_book/cargo/concurrent_tests.v | 32 +- .../conversion/converting_to_string.v | 2 +- .../rust_book/conversion/parsing_a_string.v | 11 +- .../conversion/try_from_and_try_into.v | 2 +- .../rust_book/custom_types/constants.v | 35 +- .../examples/rust_book/custom_types/enums.v | 50 +- .../rust_book/custom_types/enums_c_like.v | 34 +- .../custom_types/enums_testcase_linked_list.v | 24 +- .../rust_book/custom_types/enums_use.v | 21 +- .../rust_book/custom_types/structures.v | 39 +- .../error_handling/aliases_for_result.v | 24 +- .../rust_book/error_handling/boxing_errors.v | 45 +- .../error_handling/combinators_and_then.v | 40 +- .../error_handling/combinators_map.v | 32 +- .../error_handling/defining_an_error_type.v | 45 +- .../rust_book/error_handling/early_returns.v | 24 +- .../introducing_question_mark.v | 24 +- ...ark_is_an_replacement_for_deprecated_try.v | 24 +- ..._valid_values_and_failures_via_partition.v | 28 +- ...ues_and_failures_via_partition_unwrapped.v | 28 +- ...sults_collect_via_map_err_and_filter_map.v | 42 +- ...esults_fail_entire_operation_via_collect.v | 22 +- .../iterating_over_results_failed.v | 22 +- ...ating_over_results_handle_via_filter_map.v | 22 +- .../map_in_result_via_combinators.v | 24 +- .../error_handling/map_in_result_via_match.v | 24 +- .../error_handling/multiple_error_types.v | 48 +- .../error_handling/option_and_unwrap.v | 44 +- .../other_uses_of_question_mark.v | 45 +- .../examples/rust_book/error_handling/panic.v | 16 +- .../pulling_results_out_of_options.v | 48 +- ...ut_of_options_with_stop_error_processing.v | 48 +- .../error_handling/result_use_in_main.v | 9 +- ...g_options_and_defaults_via_get_or_insert.v | 40 +- ...ions_and_defaults_via_get_or_insert_with.v | 60 +- .../unpacking_options_and_defaults_via_or.v | 32 +- ...packing_options_and_defaults_via_or_else.v | 45 +- .../error_handling/wrapping_errors.v | 67 +- .../examples/rust_book/expressions/blocks.v | 21 +- .../for_and_iterators_into_iter.v | 23 +- .../flow_of_control/for_and_iterators_iter.v | 33 +- .../for_and_iterators_iter_mut.v | 29 +- .../for_and_range_completely_inclusive.v | 31 +- .../for_and_range_inclusive_to_exclusive.v | 31 +- .../rust_book/flow_of_control/if_else.v | 35 +- .../rust_book/flow_of_control/if_let.v | 39 +- .../flow_of_control/if_let_challenge.v | 6 +- .../flow_of_control/if_let_dont_use_match.v | 6 +- .../if_let_match_enum_values.v | 26 +- .../rust_book/flow_of_control/infinite_loop.v | 19 +- .../flow_of_control/loop_nesting_and_labels.v | 26 +- .../rust_book/flow_of_control/match.v | 34 +- .../rust_book/flow_of_control/match_binding.v | 32 +- .../match_binding_destructure_enum_variants.v | 15 +- .../match_destructuring_arrays_slices.v | 32 +- .../match_destructuring_enums.v | 66 +- .../match_destructuring_pointers_ref.v | 24 +- .../match_destructuring_structs.v | 18 +- .../match_destructuring_tuples.v | 41 +- .../match_destructuring_tuples_fixed.v | 41 +- .../rust_book/flow_of_control/match_guards.v | 28 +- .../match_guards_unreachable.v | 13 +- .../rust_book/flow_of_control/while.v | 24 +- .../rust_book/flow_of_control/while_let.v | 12 +- .../while_let_match_is_weird.v | 12 +- .../associated_functions_and_methods.v | 22 +- .../rust_book/functions/diverging_functions.v | 2 +- ...erging_functions_example_sum_odd_numbers.v | 6 +- ...verging_functions_no_info_in_return_type.v | 8 +- .../examples/rust_book/functions/functions.v | 22 +- .../rust_book/functions/functions_closures.v | 23 +- .../functions_closures_as_input_parameters.v | 32 +- .../functions_closures_as_output_parameters.v | 27 +- .../functions/functions_closures_capturing.v | 17 +- .../functions_closures_example_Iterator_any.v | 47 +- ...earching_through_iterators_Iterator_find.v | 32 +- ...ions_closures_forced_capturing_with_move.v | 14 +- .../functions_closures_input_functions.v | 12 +- ...s_closures_type_anonymity_define_and_use.v | 7 +- .../functions/higher_order_functions.v | 21 +- .../generics_associated_types_problem.v | 32 +- .../generics_associated_types_solution.v | 40 +- .../rust_book/generics/generics_bounds.v | 21 +- .../generics_bounds_test_case_empty_bounds.v | 28 +- .../generics/generics_implementation.v | 9 +- .../generics/generics_multiple_bounds.v | 34 +- .../generics/generics_new_type_idiom.v | 16 +- ...hantom_type_test_case_unit_clarification.v | 16 +- .../generics/generics_where_clauses.v | 7 +- .../rust_book/guessing_game/guessing_game.v | 40 +- .../rust_book/hello_world/formatted_print.v | 81 +- .../rust_book/hello_world/hello_world.v | 2 +- .../rust_book/macro_rules/macro_example.v | 2 +- .../macro_rules/macro_rules_designators.v | 53 +- .../rust_book/macro_rules/macro_rules_dsl.v | 16 +- .../macro_rules/macro_rules_overload.v | 30 +- .../macro_rules/macro_rules_repeat.v | 16 +- .../macro_rules_variadic_interfaces.v | 24 +- .../rust_book/modules/struct_visibility.v | 11 +- .../rust_book/modules/super_and_self.v | 27 +- .../modules/the_use_as_declaration.v | 26 +- .../examples/rust_book/modules/visibility.v | 82 +- .../rust_book/primitives/arrays_and_slices.v | 70 +- .../rust_book/primitives/literals_operators.v | 87 +- .../examples/rust_book/primitives/tuples.v | 80 +- .../scoping_rules/scoping_rules_borrowing.v | 15 +- .../scoping_rules_borrowing_aliasing.v | 32 +- .../scoping_rules_borrowing_mutablity.v | 17 +- .../scoping_rules_borrowing_the_ref_pattern.v | 27 +- .../scoping_rules/scoping_rules_lifetimes.v | 18 +- .../scoping_rules_lifetimes_bounds.v | 18 +- .../scoping_rules_lifetimes_coercion.v | 16 +- .../scoping_rules_lifetimes_elision.v | 32 +- .../scoping_rules_lifetimes_functions.v | 14 +- .../scoping_rules_lifetimes_methods.v | 8 +- ...ules_lifetimes_reference_lifetime_static.v | 25 +- .../scoping_rules_lifetimes_structs.v | 51 +- .../scoping_rules_lifetimes_traits.v | 11 +- .../scoping_rules_ownership_and_rules.v | 20 +- ...ping_rules_ownership_and_rules_mutablity.v | 22 +- ..._rules_ownership_and_rules_partial_moves.v | 28 +- .../scoping_rules_raii_desctructor.v | 12 +- .../rust_book/std_library_types/arc.v | 12 +- .../std_library_types/box_stack_heap.v | 30 +- .../rust_book/std_library_types/hash_map.v | 72 +- .../hash_map_alternate_or_custom_key_types.v | 87 +- .../std_library_types/hash_map_hash_set.v | 49 +- .../rust_book/std_library_types/option.v | 30 +- .../rust_book/std_library_types/panic.v | 5 +- .../examples/rust_book/std_library_types/rc.v | 78 +- .../rust_book/std_library_types/result.v | 21 +- .../result_chaining_with_question_mark.v | 28 +- .../rust_book/std_library_types/strings.v | 57 +- .../strings_byte_strings_as_non_utf8.v | 38 +- .../strings_literals_and_escapes.v | 28 +- .../strings_raw_string_literals.v | 27 +- .../rust_book/std_library_types/vectors.v | 86 +- .../examples/rust_book/std_misc/channels.v | 25 +- .../rust_book/std_misc/child_processes.v | 24 +- .../std_misc/child_processes_pipes.v | 29 +- .../rust_book/std_misc/child_processes_wait.v | 10 +- .../rust_book/std_misc/file_io_create.v | 31 +- .../rust_book/std_misc/file_io_open.v | 22 +- .../rust_book/std_misc/file_io_read_lines.v | 14 +- .../file_io_read_lines_efficient_method.v | 12 +- .../std_misc/filesystem_operations.v | 150 +- .../std_misc/foreign_function_interface.v | 26 +- .../examples/rust_book/std_misc/path.v | 28 +- .../rust_book/std_misc/program_arguments.v | 14 +- .../std_misc/program_arguments_parsing.v | 55 +- .../examples/rust_book/std_misc/threads.v | 10 +- .../std_misc/threads_test_case_map_reduce.v | 41 +- .../rust_book/testing/documentation_testing.v | 2 +- .../default/examples/rust_book/traits/clone.v | 44 +- .../examples/rust_book/traits/derive.v | 24 +- .../disambiguating_overlapping_traits.v | 14 +- .../default/examples/rust_book/traits/drop.v | 54 +- .../default/examples/rust_book/traits/hash.v | 15 +- .../traits/impl_trait_as_return_type.v | 2 +- .../examples/rust_book/traits/iterators.v | 82 +- .../rust_book/traits/operator_overloading.v | 26 +- .../traits/returning_traits_with_dyn.v | 10 +- .../examples/rust_book/traits/supertraits.v | 8 +- .../examples/rust_book/traits/traits.v | 34 +- .../examples/rust_book/types/aliasing.v | 8 +- .../examples/rust_book/types/casting.v | 120 +- .../examples/rust_book/types/inference.v | 7 +- .../examples/rust_book/types/literals.v | 35 +- .../inline_assembly_clobbered_registers.v | 8 +- ...ssembly_symbol_operands_and_abi_clobbers.v | 10 +- .../unsafe_operations/raw_pointers.v | 2 +- .../variable_bindings/declare_first.v | 16 +- .../rust_book/variable_bindings/mutability.v | 16 +- .../rust_book/variable_bindings/scope.v | 16 +- .../variable_bindings/variable_bindings.v | 24 +- .../variable_bindings/variable_shadowing.v | 31 +- CoqOfRust/examples/default/examples/subtle.v | 23 +- CoqOfRust/lib/lib.v | 2 +- CoqOfRust/links/M.v | 23 +- .../translations/move_abstract_stack/lib.v | 75 +- .../move_binary_format/binary_config.v | 47 +- .../move_binary_format/check_bounds.v | 29 +- .../move_binary_format/compatibility.v | 29 +- .../move_binary_format/control_flow_graph.v | 52 +- .../move_binary_format/deserializer.v | 412 ++--- .../translations/move_binary_format/errors.v | 212 +-- .../move_binary_format/file_format.v | 928 +++-------- .../move_binary_format/file_format_common.v | 511 ++---- .../translations/move_binary_format/lib.v | 154 +- .../move_binary_format/normalized.v | 1069 +++++------- .../move_binary_format/serializer.v | 130 +- .../move_bytecode_verifier/absint.v | 10 +- .../acquires_list_verifier.v | 20 +- .../move_bytecode_verifier/control_flow_v5.v | 20 +- .../move_bytecode_verifier/dependencies.v | 32 +- .../instantiation_loops.v | 34 +- .../instruction_consistency.v | 5 +- .../move_bytecode_verifier/limits.v | 5 +- .../locals_safety/abstract_state.v | 54 +- .../locals_safety/mod.v | 5 +- .../move_bytecode_verifier/loop_summary.v | 2 +- .../reference_safety/abstract_state.v | 175 +- .../reference_safety/mod.v | 649 +++----- .../move_bytecode_verifier/script_signature.v | 5 +- .../move_bytecode_verifier/signature.v | 48 +- .../move_bytecode_verifier/struct_defs.v | 5 +- .../move_bytecode_verifier/type_safety.v | 433 ++--- .../move_bytecode_verifier/verifier.v | 27 +- .../move_bytecode_verifier_meter/bound.v | 58 +- .../move_bytecode_verifier_meter/lib.v | 20 +- .../translations/move_core_types/abi.v | 105 +- .../move_core_types/account_address.v | 53 +- .../move_core_types/annotated_value.v | 318 ++-- .../move_core_types/annotated_visitor.v | 17 +- .../translations/move_core_types/effects.v | 61 +- .../translations/move_core_types/errmap.v | 68 +- .../move_core_types/gas_algebra.v | 20 +- .../translations/move_core_types/identifier.v | 38 +- .../move_core_types/language_storage.v | 238 +-- .../translations/move_core_types/lib.v | 14 +- .../translations/move_core_types/metadata.v | 14 +- .../translations/move_core_types/parser.v | 365 ++-- .../move_core_types/runtime_value.v | 297 +--- .../translations/move_core_types/state.v | 20 +- .../move_core_types/transaction_argument.v | 108 +- .../translations/move_core_types/u256.v | 100 +- .../translations/move_core_types/vm_status.v | 564 +++---- CoqOfRust/revm/revm_bytecode/bytecode.v | 14 +- CoqOfRust/revm/revm_bytecode/decode_errors.v | 10 +- CoqOfRust/revm/revm_bytecode/eip7702.v | 31 +- CoqOfRust/revm/revm_bytecode/eof.v | 113 +- CoqOfRust/revm/revm_bytecode/eof/body.v | 20 +- CoqOfRust/revm/revm_bytecode/eof/header.v | 17 +- CoqOfRust/revm/revm_bytecode/eof/links/body.v | 3 +- CoqOfRust/revm/revm_bytecode/eof/printer.v | 30 +- .../revm/revm_bytecode/eof/types_section.v | 14 +- .../revm/revm_bytecode/eof/verification.v | 245 +-- .../revm/revm_bytecode/legacy/analyzed.v | 14 +- .../revm/revm_bytecode/legacy/jump_map.v | 7 +- CoqOfRust/revm/revm_bytecode/legacy/raw.v | 5 +- CoqOfRust/revm/revm_bytecode/opcode.v | 74 +- CoqOfRust/revm/revm_bytecode/opcode/parse.v | 10 +- .../revm/revm_context_interface/block/blob.v | 20 +- CoqOfRust/revm/revm_context_interface/cfg.v | 25 +- CoqOfRust/revm/revm_context_interface/host.v | 34 +- .../revm/revm_context_interface/host/dummy.v | 29 +- .../revm_context_interface/journaled_state.v | 42 +- .../revm/revm_context_interface/result.v | 458 ++---- .../revm/revm_context_interface/transaction.v | 60 +- .../transaction/transaction_type.v | 30 +- CoqOfRust/revm/revm_interpreter/gas.v | 19 +- .../revm_interpreter/instruction_result.v | 151 +- .../revm_interpreter/instructions/contract.v | 15 +- .../revm_interpreter/instructions/control.v | 8 +- .../revm/revm_interpreter/instructions/host.v | 4 +- .../revm/revm_interpreter/instructions/i256.v | 15 +- .../revm_interpreter/instructions/stack.v | 2 +- .../revm_interpreter/instructions/system.v | 5 +- .../revm_interpreter/instructions/utility.v | 8 +- CoqOfRust/revm/revm_interpreter/interpreter.v | 49 +- .../interpreter/ext_bytecode.v | 33 +- .../revm/revm_interpreter/interpreter/input.v | 22 +- .../interpreter/links/stack.v | 27 +- .../interpreter/return_data.v | 5 +- .../interpreter/shared_memory.v | 27 +- .../revm/revm_interpreter/interpreter/stack.v | 41 +- .../interpreter/subroutine_stack.v | 24 +- .../revm_interpreter/interpreter_action.v | 35 +- .../interpreter_action/call_inputs.v | 73 +- .../interpreter_action/call_outcome.v | 12 +- .../interpreter_action/create_inputs.v | 21 +- .../interpreter_action/create_outcome.v | 9 +- .../interpreter_action/eof_create_inputs.v | 43 +- CoqOfRust/revm/revm_precompile/bls12_381/g1.v | 18 +- .../revm/revm_precompile/bls12_381/g1_add.v | 10 +- .../revm/revm_precompile/bls12_381/g1_msm.v | 9 +- .../revm/revm_precompile/bls12_381/g1_mul.v | 10 +- CoqOfRust/revm/revm_precompile/bls12_381/g2.v | 18 +- .../revm/revm_precompile/bls12_381/g2_add.v | 10 +- .../revm/revm_precompile/bls12_381/g2_msm.v | 9 +- .../revm/revm_precompile/bls12_381/g2_mul.v | 10 +- .../revm_precompile/bls12_381/map_fp2_to_g2.v | 10 +- .../revm_precompile/bls12_381/map_fp_to_g1.v | 10 +- .../revm/revm_precompile/bls12_381/pairing.v | 9 +- .../revm/revm_precompile/bls12_381/utils.v | 33 +- CoqOfRust/revm/revm_precompile/bn128.v | 5 +- CoqOfRust/revm/revm_precompile/interface.v | 88 +- .../revm_precompile/kzg_point_evaluation.v | 2 +- CoqOfRust/revm/revm_precompile/lib.v | 46 +- CoqOfRust/revm/revm_precompile/secp256k1.v | 2 +- .../eip7702/authorization_list.v | 26 +- .../eip7702/recovered_authorization.v | 9 +- CoqOfRust/revm/revm_specification/hardfork.v | 189 +-- CoqOfRust/ruint/algorithms/div/knuth.v | 48 +- CoqOfRust/ruint/algorithms/div/mod.v | 29 +- CoqOfRust/ruint/algorithms/div/reciprocal.v | 30 +- CoqOfRust/ruint/algorithms/div/small.v | 92 +- CoqOfRust/ruint/algorithms/gcd/matrix.v | 72 +- CoqOfRust/ruint/algorithms/gcd/mod.v | 18 +- CoqOfRust/ruint/algorithms/mul_redc.v | 19 +- CoqOfRust/ruint/algorithms/shift.v | 4 +- CoqOfRust/ruint/base_convert.v | 28 +- CoqOfRust/ruint/bit_arr.v | 2 +- CoqOfRust/ruint/bits.v | 15 +- CoqOfRust/ruint/bytes.v | 23 +- CoqOfRust/ruint/div.v | 6 +- CoqOfRust/ruint/fmt.v | 38 +- CoqOfRust/ruint/from.v | 97 +- CoqOfRust/ruint/lib.v | 15 +- CoqOfRust/ruint/links/lib.v | 12 + CoqOfRust/ruint/log.v | 15 +- CoqOfRust/ruint/modular.v | 14 +- CoqOfRust/ruint/mul.v | 5 +- CoqOfRust/ruint/root.v | 6 +- CoqOfRust/ruint/special.v | 2 +- CoqOfRust/ruint/string.v | 26 +- lib/src/expression.rs | 5 +- lib/src/thir_expression.rs | 2 +- 526 files changed, 9609 insertions(+), 15170 deletions(-) create mode 100644 CoqOfRust/core/fmt/links/mod.v create mode 100644 CoqOfRust/core/fmt/links/rt.v create mode 100644 CoqOfRust/core/links/hint.v create mode 100644 CoqOfRust/core/links/panicking.v diff --git a/CoqOfRust/alloc/alloc.v b/CoqOfRust/alloc/alloc.v index a4a9d57bd..28f668174 100644 --- a/CoqOfRust/alloc/alloc.v +++ b/CoqOfRust/alloc/alloc.v @@ -112,7 +112,7 @@ Module alloc. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Global" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Global" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -831,9 +831,8 @@ Module alloc. M.alloc (| Value.Array [ - M.read (| - Value.String - "`new_layout.size()` must be greater than or equal to `old_layout.size()`" + mk_str (| + "`new_layout.size()` must be greater than or equal to `old_layout.size()`" |) ] |) @@ -1822,9 +1821,8 @@ Module alloc. M.alloc (| Value.Array [ - M.read (| - Value.String - "`new_layout.size()` must be smaller than or equal to `old_layout.size()`" + mk_str (| + "`new_layout.size()` must be smaller than or equal to `old_layout.size()`" |) ] |) @@ -2654,9 +2652,7 @@ Module alloc. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "allocation failed" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "allocation failed" |) ] |) |) |) |) @@ -2792,8 +2788,8 @@ Module alloc. M.alloc (| Value.Array [ - M.read (| Value.String "memory allocation of " |); - M.read (| Value.String " bytes failed" |) + mk_str (| "memory allocation of " |); + mk_str (| " bytes failed" |) ] |) |) @@ -2857,8 +2853,8 @@ Module alloc. M.alloc (| Value.Array [ - M.read (| Value.String "memory allocation of " |); - M.read (| Value.String " bytes failed" |) + mk_str (| "memory allocation of " |); + mk_str (| " bytes failed" |) ] |) |) diff --git a/CoqOfRust/alloc/borrow.v b/CoqOfRust/alloc/borrow.v index 034061fa6..fe80901ab 100644 --- a/CoqOfRust/alloc/borrow.v +++ b/CoqOfRust/alloc/borrow.v @@ -588,9 +588,8 @@ Module borrow. [] |), [ - M.read (| - Value.String - "internal error: entered unreachable code" + mk_str (| + "internal error: entered unreachable code" |) ] |) diff --git a/CoqOfRust/alloc/boxed/convert.v b/CoqOfRust/alloc/boxed/convert.v index e28848742..888347a10 100644 --- a/CoqOfRust/alloc/boxed/convert.v +++ b/CoqOfRust/alloc/boxed/convert.v @@ -1510,11 +1510,7 @@ Module boxed. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.is::()" - |) - ] + [ mk_str (| "assertion failed: self.is::()" |) ] |) |) |))); @@ -1754,11 +1750,7 @@ Module boxed. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.is::()" - |) - ] + [ mk_str (| "assertion failed: self.is::()" |) ] |) |) |))); @@ -2027,11 +2019,7 @@ Module boxed. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.is::()" - |) - ] + [ mk_str (| "assertion failed: self.is::()" |) ] |) |) |))); diff --git a/CoqOfRust/alloc/boxed/thin.v b/CoqOfRust/alloc/boxed/thin.v index 472218e93..560530704 100644 --- a/CoqOfRust/alloc/boxed/thin.v +++ b/CoqOfRust/alloc/boxed/thin.v @@ -1384,9 +1384,8 @@ Module boxed. [] |), [ - M.read (| - Value.String - "assertion failed: value_offset == 0 && T::IS_ZST && H::IS_ZST" + mk_str (| + "assertion failed: value_offset == 0 && T::IS_ZST && H::IS_ZST" |) ] |) @@ -1787,9 +1786,8 @@ Module boxed. [] |), [ - M.read (| - Value.String - "assertion failed: value_offset == 0 && mem::size_of::() == 0 && mem::size_of::() == 0" + mk_str (| + "assertion failed: value_offset == 0 && mem::size_of::() == 0 && mem::size_of::() == 0" |) ] |) @@ -2081,11 +2079,7 @@ Module boxed. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: mem::size_of::() == 0" - |) - ] + [ mk_str (| "assertion failed: mem::size_of::() == 0" |) ] |) |) |))); @@ -2183,11 +2177,7 @@ Module boxed. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: value_ptr.is_aligned()" - |) - ] + [ mk_str (| "assertion failed: value_ptr.is_aligned()" |) ] |) |) |))); @@ -2465,11 +2455,7 @@ Module boxed. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: hp.is_aligned()" - |) - ] + [ mk_str (| "assertion failed: hp.is_aligned()" |) ] |) |) |))); diff --git a/CoqOfRust/alloc/collections/binary_heap/mod.v b/CoqOfRust/alloc/collections/binary_heap/mod.v index 28f24af4f..7d7781e95 100644 --- a/CoqOfRust/alloc/collections/binary_heap/mod.v +++ b/CoqOfRust/alloc/collections/binary_heap/mod.v @@ -86,7 +86,7 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PeekMut" |) |) + M.deref (| mk_str (| "PeekMut" |) |) |) ] |) @@ -371,11 +371,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: !self.heap.is_empty()" - |) - ] + [ mk_str (| "assertion failed: !self.heap.is_empty()" |) ] |) |) |))); @@ -559,11 +555,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "assertion failed: !self.heap.is_empty()" - |) + [ mk_str (| "assertion failed: !self.heap.is_empty()" |) ] |) |) @@ -4951,11 +4943,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: pos < data.len()" - |) - ] + [ mk_str (| "assertion failed: pos < data.len()" |) ] |) |) |))); @@ -5159,11 +5147,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: index != self.pos" - |) - ] + [ mk_str (| "assertion failed: index != self.pos" |) ] |) |) |))); @@ -5233,11 +5217,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: index < self.data.len()" - |) - ] + [ mk_str (| "assertion failed: index < self.data.len()" |) ] |) |) |))); @@ -5353,11 +5333,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: index != self.pos" - |) - ] + [ mk_str (| "assertion failed: index != self.pos" |) ] |) |) |))); @@ -5427,11 +5403,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: index < self.data.len()" - |) - ] + [ mk_str (| "assertion failed: index < self.data.len()" |) ] |) |) |))); @@ -5765,10 +5737,7 @@ Module collections. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Iter" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Iter" |) |) |) ] |) |) @@ -6290,7 +6259,7 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IntoIter" |) |) + M.deref (| mk_str (| "IntoIter" |) |) |) ] |) @@ -6885,11 +6854,8 @@ Module collections. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IntoIterSorted" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "inner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "IntoIterSorted" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -7148,8 +7114,8 @@ Module collections. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Drain" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Drain" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -7482,11 +7448,8 @@ Module collections. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DrainSorted" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "inner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "DrainSorted" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/alloc/collections/btree/fix.v b/CoqOfRust/alloc/collections/btree/fix.v index 29bcfd17f..20b5b681b 100644 --- a/CoqOfRust/alloc/collections/btree/fix.v +++ b/CoqOfRust/alloc/collections/btree/fix.v @@ -1722,9 +1722,8 @@ Module collections. [] |), [ - M.read (| - Value.String - "assertion failed: last_kv.left_child_len() >= MIN_LEN * 2" + mk_str (| + "assertion failed: last_kv.left_child_len() >= MIN_LEN * 2" |) ] |) @@ -2244,9 +2243,8 @@ Module collections. [] |), [ - M.read (| - Value.String - "assertion failed: self.reborrow().into_node().len() > MIN_LEN" + mk_str (| + "assertion failed: self.reborrow().into_node().len() > MIN_LEN" |) ] |) @@ -2649,9 +2647,8 @@ Module collections. [] |), [ - M.read (| - Value.String - "assertion failed: self.reborrow().into_node().len() > MIN_LEN" + mk_str (| + "assertion failed: self.reborrow().into_node().len() > MIN_LEN" |) ] |) @@ -2848,9 +2845,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: internal_kv.right_child_len() >= MIN_LEN" + mk_str (| + "assertion failed: internal_kv.right_child_len() >= MIN_LEN" |) ] |) @@ -3159,9 +3155,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: internal_kv.left_child_len() >= MIN_LEN" + mk_str (| + "assertion failed: internal_kv.left_child_len() >= MIN_LEN" |) ] |) diff --git a/CoqOfRust/alloc/collections/btree/map.v b/CoqOfRust/alloc/collections/btree/map.v index 4bd7ed523..826637f9e 100644 --- a/CoqOfRust/alloc/collections/btree/map.v +++ b/CoqOfRust/alloc/collections/btree/map.v @@ -1579,9 +1579,8 @@ Module collections. M.alloc (| Value.Array [ - M.read (| - Value.String - "new value is not equal" + mk_str (| + "new value is not equal" |) ] |) @@ -17378,7 +17377,7 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ExtractIf" |) |) + M.deref (| mk_str (| "ExtractIf" |) |) |) ] |) @@ -22573,7 +22572,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "no entry found for key" |) |) + M.deref (| mk_str (| "no entry found for key" |) |) |) ] |) @@ -22953,7 +22952,7 @@ Module collections. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Cursor" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Cursor" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -23005,10 +23004,7 @@ Module collections. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CursorMut" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CursorMut" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -23101,10 +23097,7 @@ Module collections. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CursorMutKey" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CursorMutKey" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -28658,9 +28651,8 @@ Module collections. [] |), [ - M.read (| - Value.String - "assertion failed: root.is_none()" + mk_str (| + "assertion failed: root.is_none()" |) ] |) @@ -33718,10 +33710,7 @@ Module collections. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UnorderedKeyError" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "UnorderedKeyError" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -33774,11 +33763,7 @@ Module collections. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "key is not properly ordered relative to neighbors" - |) - ] + [ mk_str (| "key is not properly ordered relative to neighbors" |) ] |) |) |) diff --git a/CoqOfRust/alloc/collections/btree/map/entry.v b/CoqOfRust/alloc/collections/btree/map/entry.v index 639c3abd2..24f5cef21 100644 --- a/CoqOfRust/alloc/collections/btree/map/entry.v +++ b/CoqOfRust/alloc/collections/btree/map/entry.v @@ -126,7 +126,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Entry" |) |) + M.deref (| mk_str (| "Entry" |) |) |) ] |) @@ -198,7 +198,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Entry" |) |) + M.deref (| mk_str (| "Entry" |) |) |) ] |) @@ -336,7 +336,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VacantEntry" |) |) + M.deref (| mk_str (| "VacantEntry" |) |) |) ] |) @@ -497,9 +497,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "OccupiedEntry" |) - |) + M.deref (| mk_str (| "OccupiedEntry" |) |) |) ] |) @@ -507,7 +505,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "key" |) |) + M.deref (| mk_str (| "key" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -537,10 +535,7 @@ Module collections. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "value" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "value" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -694,9 +689,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "OccupiedError" |) - |) + M.deref (| mk_str (| "OccupiedError" |) |) |) ] |) @@ -704,7 +697,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "key" |) |) + M.deref (| mk_str (| "key" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -740,7 +733,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "old_value" |) |) + M.deref (| mk_str (| "old_value" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -774,10 +767,7 @@ Module collections. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "new_value" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "new_value" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -865,9 +855,9 @@ Module collections. M.alloc (| Value.Array [ - M.read (| Value.String "failed to insert " |); - M.read (| Value.String ", key " |); - M.read (| Value.String " already exists with value " |) + mk_str (| "failed to insert " |); + mk_str (| ", key " |); + mk_str (| " already exists with value " |) ] |) |) @@ -1038,10 +1028,7 @@ Module collections. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "key already exists" |) |) - |))) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "key already exists" |) |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/alloc/collections/btree/merge_iter.v b/CoqOfRust/alloc/collections/btree/merge_iter.v index d70a1251c..dfc17bd52 100644 --- a/CoqOfRust/alloc/collections/btree/merge_iter.v +++ b/CoqOfRust/alloc/collections/btree/merge_iter.v @@ -217,10 +217,7 @@ Module collections. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "A" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "A" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -252,10 +249,7 @@ Module collections. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "B" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "B" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -468,9 +462,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "MergeIterInner" |) - |) + M.deref (| mk_str (| "MergeIterInner" |) |) |) ] |) diff --git a/CoqOfRust/alloc/collections/btree/navigate.v b/CoqOfRust/alloc/collections/btree/navigate.v index aabd4e854..ae35fb4e2 100644 --- a/CoqOfRust/alloc/collections/btree/navigate.v +++ b/CoqOfRust/alloc/collections/btree/navigate.v @@ -5428,11 +5428,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.front.is_some()" - |) - ] + [ mk_str (| "assertion failed: self.front.is_some()" |) ] |) |) |))); @@ -5702,11 +5698,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.back.is_some()" - |) - ] + [ mk_str (| "assertion failed: self.back.is_some()" |) ] |) |) |))); @@ -6811,9 +6803,8 @@ Module collections. M.alloc (| Value.Array [ - M.read (| - Value.String - "internal error: entered unreachable code: BTreeMap has different depths" + mk_str (| + "internal error: entered unreachable code: BTreeMap has different depths" |) ] |) diff --git a/CoqOfRust/alloc/collections/btree/node.v b/CoqOfRust/alloc/collections/btree/node.v index 57645c9be..dea19d7ee 100644 --- a/CoqOfRust/alloc/collections/btree/node.v +++ b/CoqOfRust/alloc/collections/btree/node.v @@ -1204,8 +1204,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: height > 0" |) - ] + [ mk_str (| "assertion failed: height > 0" |) ] |) |) |))); @@ -1462,8 +1461,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: height > 0" |) - ] + [ mk_str (| "assertion failed: height > 0" |) ] |) |) |))); @@ -2071,9 +2069,8 @@ Module collections. [] |), [ - M.read (| - Value.String - "assertion failed: i <= self.len()" + mk_str (| + "assertion failed: i <= self.len()" |) ] |) @@ -2390,11 +2387,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: edge.height == self.height - 1" - |) - ] + [ mk_str (| "assertion failed: edge.height == self.height - 1" |) ] |) |) |))); @@ -2464,7 +2457,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: idx < CAPACITY" |) ] + [ mk_str (| "assertion failed: idx < CAPACITY" |) ] |) |) |))); @@ -3648,7 +3641,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: len > 0" |) ] + [ mk_str (| "assertion failed: len > 0" |) ] |) |) |))); @@ -3754,7 +3747,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: len > 0" |) ] + [ mk_str (| "assertion failed: len > 0" |) ] |) |) |))); @@ -5822,11 +5815,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.height == 0" - |) - ] + [ mk_str (| "assertion failed: self.height == 0" |) ] |) |) |))); @@ -5934,11 +5923,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.height > 0" - |) - ] + [ mk_str (| "assertion failed: self.height > 0" |) ] |) |) |))); @@ -6713,9 +6698,8 @@ Module collections. M.alloc (| Value.Array [ - M.read (| - Value.String - "internal error: entered unreachable code: empty internal node" + mk_str (| + "internal error: entered unreachable code: empty internal node" |) ] |) @@ -7252,7 +7236,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: self.height > 0" |) ] + [ mk_str (| "assertion failed: self.height > 0" |) ] |) |) |))); @@ -7796,7 +7780,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: idx < CAPACITY" |) ] + [ mk_str (| "assertion failed: idx < CAPACITY" |) ] |) |) |))); @@ -8498,11 +8482,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: idx < node.len()" - |) - ] + [ mk_str (| "assertion failed: idx < node.len()" |) ] |) |) |))); @@ -9221,11 +9201,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: idx <= node.len()" - |) - ] + [ mk_str (| "assertion failed: idx <= node.len()" |) ] |) |) |))); @@ -9639,11 +9615,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: edge_idx <= CAPACITY" - |) - ] + [ mk_str (| "assertion failed: edge_idx <= CAPACITY" |) ] |) |) |))); @@ -9879,9 +9851,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.node.len() < CAPACITY" + mk_str (| + "assertion failed: self.node.len() < CAPACITY" |) ] |) @@ -11956,9 +11927,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.node.len() < CAPACITY" + mk_str (| + "assertion failed: self.node.len() < CAPACITY" |) ] |) @@ -12028,9 +11998,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: edge.height == self.node.height - 1" + mk_str (| + "assertion failed: edge.height == self.node.height - 1" |) ] |) @@ -12553,9 +12522,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: edge.height == self.node.height - 1" + mk_str (| + "assertion failed: edge.height == self.node.height - 1" |) ] |) @@ -13553,9 +13521,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.idx < self.node.len()" + mk_str (| + "assertion failed: self.idx < self.node.len()" |) ] |) @@ -13948,9 +13915,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.idx < self.node.len()" + mk_str (| + "assertion failed: self.idx < self.node.len()" |) ] |) @@ -14190,9 +14156,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.idx < self.node.len()" + mk_str (| + "assertion failed: self.idx < self.node.len()" |) ] |) @@ -14484,9 +14449,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.idx < self.node.len()" + mk_str (| + "assertion failed: self.idx < self.node.len()" |) ] |) @@ -14868,9 +14832,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.idx < self.node.len()" + mk_str (| + "assertion failed: self.idx < self.node.len()" |) ] |) @@ -15591,9 +15554,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.idx < self.node.len()" + mk_str (| + "assertion failed: self.idx < self.node.len()" |) ] |) @@ -15877,9 +15839,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.idx < self.node.len()" + mk_str (| + "assertion failed: self.idx < self.node.len()" |) ] |) @@ -17854,11 +17815,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "assertion failed: new_left_len <= CAPACITY" - |) + [ mk_str (| "assertion failed: new_left_len <= CAPACITY" |) ] |) |) @@ -19771,9 +19728,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: match track_edge_idx { + mk_str (| + "assertion failed: match track_edge_idx { LeftOrRight::Left(idx) => idx <= old_left_len, LeftOrRight::Right(idx) => idx <= right_len, }" @@ -20207,7 +20163,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: count > 0" |) ] + [ mk_str (| "assertion failed: count > 0" |) ] |) |) |))); @@ -20335,11 +20291,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "assertion failed: old_right_len + count <= CAPACITY" - |) + [ mk_str (| "assertion failed: old_right_len + count <= CAPACITY" |) ] |) |) @@ -20368,11 +20320,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: old_left_len >= count" - |) - ] + [ mk_str (| "assertion failed: old_left_len >= count" |) ] |) |) |))); @@ -21710,8 +21658,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) - ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |) |))) @@ -21828,7 +21775,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: count > 0" |) ] + [ mk_str (| "assertion failed: count > 0" |) ] |) |) |))); @@ -21956,11 +21903,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "assertion failed: old_left_len + count <= CAPACITY" - |) + [ mk_str (| "assertion failed: old_left_len + count <= CAPACITY" |) ] |) |) @@ -21989,11 +21932,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: old_right_len >= count" - |) - ] + [ mk_str (| "assertion failed: old_right_len >= count" |) ] |) |) |))); @@ -23379,8 +23318,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) - ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |) |))) @@ -24233,11 +24171,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: right_node.len() == 0" - |) - ] + [ mk_str (| "assertion failed: right_node.len() == 0" |) ] |) |) |))); @@ -24281,9 +24215,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: left_node.height == right_node.height" + mk_str (| + "assertion failed: left_node.height == right_node.height" |) ] |) @@ -24998,11 +24931,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "internal error: entered unreachable code" - |) - ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |) |))) @@ -25573,7 +25502,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: len > idx" |) ] + [ mk_str (| "assertion failed: len > idx" |) ] |) |) |))); @@ -25826,7 +25755,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: idx < len" |) ] + [ mk_str (| "assertion failed: idx < len" |) ] |) |) |))); @@ -26238,8 +26167,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: src.len() == dst.len()" |) - ] + [ mk_str (| "assertion failed: src.len() == dst.len()" |) ] |) |) |))); diff --git a/CoqOfRust/alloc/collections/btree/remove.v b/CoqOfRust/alloc/collections/btree/remove.v index c14466131..835c4a02a 100644 --- a/CoqOfRust/alloc/collections/btree/remove.v +++ b/CoqOfRust/alloc/collections/btree/remove.v @@ -803,9 +803,8 @@ Module collections. [] |), [ - M.read (| - Value.String - "assertion failed: left_parent_kv.right_child_len() == MIN_LEN - 1" + mk_str (| + "assertion failed: left_parent_kv.right_child_len() == MIN_LEN - 1" |) ] |) @@ -1007,9 +1006,8 @@ Module collections. [] |), [ - M.read (| - Value.String - "assertion failed: left_parent_kv.left_child_len() > MIN_LEN" + mk_str (| + "assertion failed: left_parent_kv.left_child_len() > MIN_LEN" |) ] |) @@ -1155,9 +1153,8 @@ Module collections. [] |), [ - M.read (| - Value.String - "assertion failed: right_parent_kv.left_child_len() == MIN_LEN - 1" + mk_str (| + "assertion failed: right_parent_kv.left_child_len() == MIN_LEN - 1" |) ] |) @@ -1359,9 +1356,8 @@ Module collections. [] |), [ - M.read (| - Value.String - "assertion failed: right_parent_kv.right_child_len() > MIN_LEN" + mk_str (| + "assertion failed: right_parent_kv.right_child_len() > MIN_LEN" |) ] |) diff --git a/CoqOfRust/alloc/collections/btree/search.v b/CoqOfRust/alloc/collections/btree/search.v index 57051fb76..bcbb27a1e 100644 --- a/CoqOfRust/alloc/collections/btree/search.v +++ b/CoqOfRust/alloc/collections/btree/search.v @@ -736,9 +736,8 @@ Module collections. M.alloc (| Value.Array [ - M.read (| - Value.String - "range start and end are equal and excluded in BTreeSet" + mk_str (| + "range start and end are equal and excluded in BTreeSet" |) ] |) @@ -780,9 +779,8 @@ Module collections. M.alloc (| Value.Array [ - M.read (| - Value.String - "range start and end are equal and excluded in BTreeMap" + mk_str (| + "range start and end are equal and excluded in BTreeMap" |) ] |) @@ -940,9 +938,8 @@ Module collections. M.alloc (| Value.Array [ - M.read (| - Value.String - "range start is greater than range end in BTreeSet" + mk_str (| + "range start is greater than range end in BTreeSet" |) ] |) @@ -990,9 +987,8 @@ Module collections. M.alloc (| Value.Array [ - M.read (| - Value.String - "range start is greater than range end in BTreeMap" + mk_str (| + "range start is greater than range end in BTreeMap" |) ] |) @@ -2215,9 +2211,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: start_index <= keys.len()" + mk_str (| + "assertion failed: start_index <= keys.len()" |) ] |) diff --git a/CoqOfRust/alloc/collections/btree/set.v b/CoqOfRust/alloc/collections/btree/set.v index 8867b49bd..bce3e5c51 100644 --- a/CoqOfRust/alloc/collections/btree/set.v +++ b/CoqOfRust/alloc/collections/btree/set.v @@ -503,10 +503,7 @@ Module collections. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Iter" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Iter" |) |) |) ] |) |) @@ -610,11 +607,8 @@ Module collections. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IntoIter" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "IntoIter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -688,8 +682,8 @@ Module collections. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Range" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Range" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -902,9 +896,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Stitch" |) - |) + M.deref (| mk_str (| "Stitch" |) |) |) ] |) @@ -912,7 +904,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "self_iter" |) |) + M.deref (| mk_str (| "self_iter" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -924,7 +916,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "other_iter" |) |) + M.deref (| mk_str (| "other_iter" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -1015,9 +1007,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Search" |) - |) + M.deref (| mk_str (| "Search" |) |) |) ] |) @@ -1025,7 +1015,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "self_iter" |) |) + M.deref (| mk_str (| "self_iter" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -1037,7 +1027,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "other_iter" |) |) + M.deref (| mk_str (| "other_iter" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -1106,7 +1096,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Iterate" |) |) + M.deref (| mk_str (| "Iterate" |) |) |) ] |) @@ -1191,7 +1181,7 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Difference" |) |) + M.deref (| mk_str (| "Difference" |) |) |) ] |) @@ -1298,7 +1288,7 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SymmetricDifference" |) |) + M.deref (| mk_str (| "SymmetricDifference" |) |) |) ] |) @@ -1510,9 +1500,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Stitch" |) - |) + M.deref (| mk_str (| "Stitch" |) |) |) ] |) @@ -1520,7 +1508,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "a" |) |) + M.deref (| mk_str (| "a" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -1532,7 +1520,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "b" |) |) + M.deref (| mk_str (| "b" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| b |) |) |) ] @@ -1620,9 +1608,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Search" |) - |) + M.deref (| mk_str (| "Search" |) |) |) ] |) @@ -1630,7 +1616,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "small_iter" |) |) + M.deref (| mk_str (| "small_iter" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -1642,7 +1628,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "large_set" |) |) + M.deref (| mk_str (| "large_set" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -1711,7 +1697,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Answer" |) |) + M.deref (| mk_str (| "Answer" |) |) |) ] |) @@ -1796,7 +1782,7 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Intersection" |) |) + M.deref (| mk_str (| "Intersection" |) |) |) ] |) @@ -1903,7 +1889,7 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Union" |) |) + M.deref (| mk_str (| "Union" |) |) |) ] |) @@ -7877,7 +7863,7 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ExtractIf" |) |) + M.deref (| mk_str (| "ExtractIf" |) |) |) ] |) @@ -14288,7 +14274,7 @@ Module collections. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Cursor" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Cursor" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -14343,10 +14329,7 @@ Module collections. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CursorMut" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CursorMut" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -14401,10 +14384,7 @@ Module collections. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CursorMutKey" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CursorMutKey" |) |) |) ] |))) | _, _, _ => 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 31b2641c3..9efcf8da7 100644 --- a/CoqOfRust/alloc/collections/btree/set/entry.v +++ b/CoqOfRust/alloc/collections/btree/set/entry.v @@ -126,7 +126,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Entry" |) |) + M.deref (| mk_str (| "Entry" |) |) |) ] |) @@ -198,7 +198,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Entry" |) |) + M.deref (| mk_str (| "Entry" |) |) |) ] |) @@ -307,16 +307,13 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OccupiedEntry" |) |) + M.deref (| mk_str (| "OccupiedEntry" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "value" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "value" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -432,7 +429,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VacantEntry" |) |) + M.deref (| mk_str (| "VacantEntry" |) |) |) ] |) diff --git a/CoqOfRust/alloc/collections/btree/set_val.v b/CoqOfRust/alloc/collections/btree/set_val.v index 86e8723e7..dc6f50c92 100644 --- a/CoqOfRust/alloc/collections/btree/set_val.v +++ b/CoqOfRust/alloc/collections/btree/set_val.v @@ -30,10 +30,7 @@ Module collections. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SetValZST" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SetValZST" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/alloc/collections/btree/split.v b/CoqOfRust/alloc/collections/btree/split.v index 3f8081e60..1f6bc2905 100644 --- a/CoqOfRust/alloc/collections/btree/split.v +++ b/CoqOfRust/alloc/collections/btree/split.v @@ -1333,11 +1333,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "internal error: entered unreachable code" - |) - ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |) |))) diff --git a/CoqOfRust/alloc/collections/linked_list.v b/CoqOfRust/alloc/collections/linked_list.v index 8f1c6c66c..b89efb90e 100644 --- a/CoqOfRust/alloc/collections/linked_list.v +++ b/CoqOfRust/alloc/collections/linked_list.v @@ -199,7 +199,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Iter" |) |) + M.deref (| mk_str (| "Iter" |) |) |) ] |) @@ -507,7 +507,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IterMut" |) |) + M.deref (| mk_str (| "IterMut" |) |) |) ] |) @@ -784,7 +784,7 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IntoIter" |) |) + M.deref (| mk_str (| "IntoIter" |) |) |) ] |) @@ -5497,9 +5497,8 @@ Module collections. M.alloc (| Value.Array [ - M.read (| - Value.String - "Cannot split off at a nonexistent index" + mk_str (| + "Cannot split off at a nonexistent index" |) ] |) @@ -6187,9 +6186,8 @@ Module collections. M.alloc (| Value.Array [ - M.read (| - Value.String - "Cannot remove at an index outside of the list bounds" + mk_str (| + "Cannot remove at an index outside of the list bounds" |) ] |) @@ -8990,7 +8988,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Cursor" |) |) + M.deref (| mk_str (| "Cursor" |) |) |) ] |) @@ -9155,7 +9153,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CursorMut" |) |) + M.deref (| mk_str (| "CursorMut" |) |) |) ] |) @@ -15525,7 +15523,7 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ExtractIf" |) |) + M.deref (| mk_str (| "ExtractIf" |) |) |) ] |) diff --git a/CoqOfRust/alloc/collections/mod.v b/CoqOfRust/alloc/collections/mod.v index ca77f5287..a416fa45a 100644 --- a/CoqOfRust/alloc/collections/mod.v +++ b/CoqOfRust/alloc/collections/mod.v @@ -183,11 +183,8 @@ Module collections. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TryReserveError" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "kind" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "TryReserveError" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "kind" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -623,7 +620,7 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CapacityOverflow" |) |) + M.deref (| mk_str (| "CapacityOverflow" |) |) |) ] |) @@ -659,18 +656,12 @@ Module collections. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AllocError" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "layout" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "AllocError" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "layout" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_0 |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "non_exhaustive" |) |) + M.deref (| mk_str (| "non_exhaustive" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -828,7 +819,7 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| fmt |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "memory allocation failed" |) |) + M.deref (| mk_str (| "memory allocation failed" |) |) |) ] |) @@ -909,8 +900,11 @@ Module collections. γ, "alloc::collections::TryReserveErrorKind::CapacityOverflow" |) in - Value.String - " because the computed capacity exceeded the collection's maximum")); + M.alloc (| + mk_str (| + " because the computed capacity exceeded the collection's maximum" + |) + |))); fun γ => ltac:(M.monadic (let _ := @@ -922,9 +916,7 @@ Module collections. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String " because the memory allocator returned an error" - |) + mk_str (| " because the memory allocator returned an error" |) |) |) |))) diff --git a/CoqOfRust/alloc/collections/vec_deque/drain.v b/CoqOfRust/alloc/collections/vec_deque/drain.v index 44ced6d2e..b293b6262 100644 --- a/CoqOfRust/alloc/collections/vec_deque/drain.v +++ b/CoqOfRust/alloc/collections/vec_deque/drain.v @@ -457,9 +457,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Drain" |) - |) + M.deref (| mk_str (| "Drain" |) |) |) ] |) diff --git a/CoqOfRust/alloc/collections/vec_deque/into_iter.v b/CoqOfRust/alloc/collections/vec_deque/into_iter.v index b912d5442..93bafbbe3 100644 --- a/CoqOfRust/alloc/collections/vec_deque/into_iter.v +++ b/CoqOfRust/alloc/collections/vec_deque/into_iter.v @@ -184,7 +184,7 @@ Module collections. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IntoIter" |) |) + M.deref (| mk_str (| "IntoIter" |) |) |) ] |) diff --git a/CoqOfRust/alloc/collections/vec_deque/iter.v b/CoqOfRust/alloc/collections/vec_deque/iter.v index 19ad041e4..0fc6e5ca1 100644 --- a/CoqOfRust/alloc/collections/vec_deque/iter.v +++ b/CoqOfRust/alloc/collections/vec_deque/iter.v @@ -189,7 +189,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Iter" |) |) + M.deref (| mk_str (| "Iter" |) |) |) ] |) diff --git a/CoqOfRust/alloc/collections/vec_deque/iter_mut.v b/CoqOfRust/alloc/collections/vec_deque/iter_mut.v index 91aab3a82..0d5337b50 100644 --- a/CoqOfRust/alloc/collections/vec_deque/iter_mut.v +++ b/CoqOfRust/alloc/collections/vec_deque/iter_mut.v @@ -339,7 +339,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IterMut" |) |) + M.deref (| mk_str (| "IterMut" |) |) |) ] |) diff --git a/CoqOfRust/alloc/collections/vec_deque/mod.v b/CoqOfRust/alloc/collections/vec_deque/mod.v index d2f9cd570..5a37844d6 100644 --- a/CoqOfRust/alloc/collections/vec_deque/mod.v +++ b/CoqOfRust/alloc/collections/vec_deque/mod.v @@ -1013,10 +1013,10 @@ Module collections. M.alloc (| Value.Array [ - M.read (| Value.String "cpy dst=" |); - M.read (| Value.String " src=" |); - M.read (| Value.String " len=" |); - M.read (| Value.String " cap=" |) + mk_str (| "cpy dst=" |); + mk_str (| " src=" |); + mk_str (| " len=" |); + mk_str (| " cap=" |) ] |) |) @@ -1226,10 +1226,10 @@ Module collections. M.alloc (| Value.Array [ - M.read (| Value.String "cpy dst=" |); - M.read (| Value.String " src=" |); - M.read (| Value.String " len=" |); - M.read (| Value.String " cap=" |) + mk_str (| "cpy dst=" |); + mk_str (| " src=" |); + mk_str (| " len=" |); + mk_str (| " cap=" |) ] |) |) @@ -1550,10 +1550,10 @@ Module collections. M.alloc (| Value.Array [ - M.read (| Value.String "cno dst=" |); - M.read (| Value.String " src=" |); - M.read (| Value.String " len=" |); - M.read (| Value.String " cap=" |) + mk_str (| "cno dst=" |); + mk_str (| " src=" |); + mk_str (| " len=" |); + mk_str (| " cap=" |) ] |) |) @@ -1763,10 +1763,10 @@ Module collections. M.alloc (| Value.Array [ - M.read (| Value.String "cno dst=" |); - M.read (| Value.String " src=" |); - M.read (| Value.String " len=" |); - M.read (| Value.String " cap=" |) + mk_str (| "cno dst=" |); + mk_str (| " src=" |); + mk_str (| " len=" |); + mk_str (| " cap=" |) ] |) |) @@ -2250,10 +2250,10 @@ Module collections. M.alloc (| Value.Array [ - M.read (| Value.String "wrc dst=" |); - M.read (| Value.String " src=" |); - M.read (| Value.String " len=" |); - M.read (| Value.String " cap=" |) + mk_str (| "wrc dst=" |); + mk_str (| " src=" |); + mk_str (| " len=" |); + mk_str (| " cap=" |) ] |) |) @@ -2874,9 +2874,8 @@ Module collections. [] |), [ - M.read (| - Value.String - "assertion failed: dst_pre_wrap_len > src_pre_wrap_len" + mk_str (| + "assertion failed: dst_pre_wrap_len > src_pre_wrap_len" |) ] |) @@ -3031,9 +3030,8 @@ Module collections. [] |), [ - M.read (| - Value.String - "assertion failed: src_pre_wrap_len > dst_pre_wrap_len" + mk_str (| + "assertion failed: src_pre_wrap_len > dst_pre_wrap_len" |) ] |) @@ -3263,9 +3261,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: src.len() <= self.capacity()" + mk_str (| + "assertion failed: src.len() <= self.capacity()" |) ] |) @@ -4102,9 +4099,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: new_capacity >= old_capacity" + mk_str (| + "assertion failed: new_capacity >= old_capacity" |) ] |) @@ -4373,9 +4369,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.head < self.capacity() || self.capacity() == 0" + mk_str (| + "assertion failed: self.head < self.capacity() || self.capacity() == 0" |) ] |) @@ -4567,9 +4562,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: initialized.start <= initialized.end" + mk_str (| + "assertion failed: initialized.start <= initialized.end" |) ] |) @@ -4626,9 +4620,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: initialized.end <= capacity" + mk_str (| + "assertion failed: initialized.end <= capacity" |) ] |) @@ -5005,7 +4998,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: i < self.len()" |) ] + [ mk_str (| "assertion failed: i < self.len()" |) ] |) |) |))); @@ -5053,7 +5046,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: j < self.len()" |) ] + [ mk_str (| "assertion failed: j < self.len()" |) ] |) |) |))); @@ -5269,7 +5262,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "capacity overflow" |) |) + M.deref (| mk_str (| "capacity overflow" |) |) |) ] |) @@ -5412,7 +5405,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "capacity overflow" |) |) + M.deref (| mk_str (| "capacity overflow" |) |) |) ] |) @@ -7039,9 +7032,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.head < self.capacity() || self.capacity() == 0" + mk_str (| + "assertion failed: self.head < self.capacity() || self.capacity() == 0" |) ] |) @@ -7116,9 +7108,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.len <= self.capacity()" + mk_str (| + "assertion failed: self.len <= self.capacity()" |) ] |) @@ -10313,8 +10304,7 @@ Module collections. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "index out of bounds" |) ] + Value.Array [ mk_str (| "index out of bounds" |) ] |) |) |) @@ -11027,8 +11017,7 @@ Module collections. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "`at` out of bounds" |) ] + Value.Array [ mk_str (| "`at` out of bounds" |) ] |) |) |) @@ -11479,9 +11468,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "capacity overflow" |) - |) + M.deref (| mk_str (| "capacity overflow" |) |) |) ] |) @@ -12308,11 +12295,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.is_full()" - |) - ] + [ mk_str (| "assertion failed: self.is_full()" |) ] |) |) |))); @@ -12430,11 +12413,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: !self.is_full()" - |) - ] + [ mk_str (| "assertion failed: !self.is_full()" |) ] |) |) |))); @@ -13566,7 +13545,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: n <= self.len()" |) ] + [ mk_str (| "assertion failed: n <= self.len()" |) ] |) |) |))); @@ -13710,7 +13689,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: n <= self.len()" |) ] + [ mk_str (| "assertion failed: n <= self.len()" |) ] |) |) |))); @@ -13869,11 +13848,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: mid * 2 <= self.len()" - |) - ] + [ mk_str (| "assertion failed: mid * 2 <= self.len()" |) ] |) |) |))); @@ -14045,11 +14020,7 @@ Module collections. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: k * 2 <= self.len()" - |) - ] + [ mk_str (| "assertion failed: k * 2 <= self.len()" |) ] |) |) |))); @@ -15434,9 +15405,8 @@ Module collections. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: (logical_index == 0 && capacity == 0) || logical_index < capacity || + mk_str (| + "assertion failed: (logical_index == 0 && capacity == 0) || logical_index < capacity || (logical_index - capacity) < capacity" |) ] @@ -18118,7 +18088,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Out of bounds access" |) |) + M.deref (| mk_str (| "Out of bounds access" |) |) |) ] |) @@ -18194,7 +18164,7 @@ Module collections. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Out of bounds access" |) |) + M.deref (| mk_str (| "Out of bounds access" |) |) |) ] |) diff --git a/CoqOfRust/alloc/collections/vec_deque/spec_extend.v b/CoqOfRust/alloc/collections/vec_deque/spec_extend.v index 53bb67556..7912be2a5 100644 --- a/CoqOfRust/alloc/collections/vec_deque/spec_extend.v +++ b/CoqOfRust/alloc/collections/vec_deque/spec_extend.v @@ -548,9 +548,8 @@ Module collections. M.alloc (| Value.Array [ - M.read (| - Value.String - "TrustedLen iterator's size hint is not exact: " + mk_str (| + "TrustedLen iterator's size hint is not exact: " |) ] |) @@ -843,9 +842,8 @@ Module collections. M.alloc (| Value.Array [ - M.read (| - Value.String - "The number of items written to VecDeque doesn't match the TrustedLen size hint" + mk_str (| + "The number of items written to VecDeque doesn't match the TrustedLen size hint" |) ] |) @@ -896,12 +894,7 @@ Module collections. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "capacity overflow" - |) - ] + Value.Array [ mk_str (| "capacity overflow" |) ] |) |) |) diff --git a/CoqOfRust/alloc/ffi/c_str.v b/CoqOfRust/alloc/ffi/c_str.v index 4e3081c0f..7e8a39bfe 100644 --- a/CoqOfRust/alloc/ffi/c_str.v +++ b/CoqOfRust/alloc/ffi/c_str.v @@ -634,7 +634,7 @@ Module ffi. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "NulError" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "NulError" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -967,7 +967,7 @@ Module ffi. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InteriorNul" |) |) + M.deref (| mk_str (| "InteriorNul" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -1000,7 +1000,7 @@ Module ffi. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NotNulTerminated" |) |) + M.deref (| mk_str (| "NotNulTerminated" |) |) |) ] |) @@ -1292,14 +1292,8 @@ Module ffi. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FromVecWithNulError" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "error_kind" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FromVecWithNulError" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "error_kind" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1313,7 +1307,7 @@ Module ffi. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "bytes" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "bytes" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1683,11 +1677,8 @@ Module ffi. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IntoStringError" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "inner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "IntoStringError" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1701,7 +1692,7 @@ Module ffi. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "error" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "error" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1942,9 +1933,8 @@ Module ffi. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: memchr::memchr(0, &v).is_none()" + mk_str (| + "assertion failed: memchr::memchr(0, &v).is_none()" |) ] |) @@ -3067,9 +3057,8 @@ Module ffi. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: memchr::memchr(0, &v).unwrap() + 1 == v.len()" + mk_str (| + "assertion failed: memchr::memchr(0, &v).unwrap() + 1 == v.len()" |) ] |) @@ -5353,11 +5342,7 @@ Module ffi. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "nul byte found in provided data at position: " - |) - ] + [ mk_str (| "nul byte found in provided data at position: " |) ] |) |) |) @@ -5492,9 +5477,8 @@ Module ffi. M.alloc (| Value.Array [ - M.read (| - Value.String - "data provided contains an interior nul byte at pos " + mk_str (| + "data provided contains an interior nul byte at pos " |) ] |) @@ -5571,11 +5555,7 @@ Module ffi. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "data provided is not nul terminated" - |) - ] + [ mk_str (| "data provided is not nul terminated" |) ] |) |) |) @@ -5664,7 +5644,7 @@ Module ffi. (let self := M.alloc (| self |) in M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "C string contained non-utf8 bytes" |) |) + M.deref (| mk_str (| "C string contained non-utf8 bytes" |) |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6182,10 +6162,7 @@ Module ffi. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "nul byte found in data" |) |) - |))) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "nul byte found in data" |) |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6225,7 +6202,7 @@ Module ffi. (let self := M.alloc (| self |) in M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "C string contained non-utf8 bytes" |) |) + M.deref (| mk_str (| "C string contained non-utf8 bytes" |) |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/alloc/fmt.v b/CoqOfRust/alloc/fmt.v index 96260c2ba..c9724f2e0 100644 --- a/CoqOfRust/alloc/fmt.v +++ b/CoqOfRust/alloc/fmt.v @@ -162,9 +162,8 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "a formatting trait implementation returned an error when the underlying stream did not" + mk_str (| + "a formatting trait implementation returned an error when the underlying stream did not" |) |) |) diff --git a/CoqOfRust/alloc/raw_vec.v b/CoqOfRust/alloc/raw_vec.v index 4bcee350b..d49ecc51b 100644 --- a/CoqOfRust/alloc/raw_vec.v +++ b/CoqOfRust/alloc/raw_vec.v @@ -29,7 +29,7 @@ Module raw_vec. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "capacity overflow" |) ] |) + M.alloc (| Value.Array [ mk_str (| "capacity overflow" |) ] |) |) |) |) @@ -785,9 +785,8 @@ Module raw_vec. M.alloc (| Value.Array [ - M.read (| - Value.String - "`len` must be smaller than or equal to `self.capacity()`" + mk_str (| + "`len` must be smaller than or equal to `self.capacity()`" |) ] |) @@ -3818,11 +3817,7 @@ Module raw_vec. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: additional > 0" - |) - ] + [ mk_str (| "assertion failed: additional > 0" |) ] |) |) |))); @@ -4991,11 +4986,7 @@ Module raw_vec. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "Tried to shrink to a larger capacity" - |) - ] + [ mk_str (| "Tried to shrink to a larger capacity" |) ] |) |) |) diff --git a/CoqOfRust/alloc/rc.v b/CoqOfRust/alloc/rc.v index f9c062644..fe5a1499a 100644 --- a/CoqOfRust/alloc/rc.v +++ b/CoqOfRust/alloc/rc.v @@ -3964,9 +3964,8 @@ Module rc. M.alloc (| Value.Array [ - M.read (| - Value.String - "No prior strong references should exist" + mk_str (| + "No prior strong references should exist" |) ] |) @@ -6030,9 +6029,8 @@ Module rc. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: !is_dangling(this.ptr.as_ptr())" + mk_str (| + "assertion failed: !is_dangling(this.ptr.as_ptr())" |) ] |) @@ -10752,7 +10750,7 @@ Module rc. [], [] |), - [ M.read (| Value.String "" |) ] + [ mk_str (| "" |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -13192,9 +13190,8 @@ Module rc. M.alloc (| Value.Array [ - M.read (| - Value.String - "TrustedLen iterator's size hint is not exact: " + mk_str (| + "TrustedLen iterator's size hint is not exact: " |) ] |) @@ -13321,8 +13318,7 @@ Module rc. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "capacity overflow" |) ] + Value.Array [ mk_str (| "capacity overflow" |) ] |) |) |) @@ -15128,7 +15124,7 @@ Module rc. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "(Weak)" |) ] |) + M.alloc (| Value.Array [ mk_str (| "(Weak)" |) ] |) |) |) |) @@ -15991,8 +15987,8 @@ Module rc. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "UniqueRc" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "ptr" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "UniqueRc" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ptr" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -16006,7 +16002,7 @@ Module rc. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "phantom" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "phantom" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -16020,7 +16016,7 @@ Module rc. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "alloc" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "alloc" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/alloc/slice.v b/CoqOfRust/alloc/slice.v index 5efc959d1..7f9ca64d7 100644 --- a/CoqOfRust/alloc/slice.v +++ b/CoqOfRust/alloc/slice.v @@ -2554,7 +2554,7 @@ Module slice. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "capacity overflow" |) |) + M.deref (| mk_str (| "capacity overflow" |) |) |) ] |) diff --git a/CoqOfRust/alloc/str.v b/CoqOfRust/alloc/str.v index 7417502c5..4b9d6a4c0 100644 --- a/CoqOfRust/alloc/str.v +++ b/CoqOfRust/alloc/str.v @@ -32,7 +32,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| slice |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -569,9 +569,7 @@ Module str. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "attempt to join into collection with len > usize::MAX" - |) + mk_str (| "attempt to join into collection with len > usize::MAX" |) |) |) ] @@ -641,9 +639,8 @@ Module str. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: result.capacity() >= reserved_len" + mk_str (| + "assertion failed: result.capacity() >= reserved_len" |) ] |) diff --git a/CoqOfRust/alloc/string.v b/CoqOfRust/alloc/string.v index 409713a5d..26d34f4c9 100644 --- a/CoqOfRust/alloc/string.v +++ b/CoqOfRust/alloc/string.v @@ -296,11 +296,8 @@ Module string. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FromUtf8Error" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "bytes" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FromUtf8Error" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "bytes" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -314,7 +311,7 @@ Module string. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "error" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "error" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -611,10 +608,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FromUtf16Error" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FromUtf16Error" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1361,7 +1355,7 @@ Module string. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "" |) |) + M.deref (| mk_str (| "" |) |) |) ] |) @@ -2835,7 +2829,7 @@ Module string. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String (String.String "253" "") |) |) + M.deref (| mk_str (| String.String "253" "" |) |) |) ] |) @@ -3394,7 +3388,7 @@ Module string. M.read (| string |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String (String.String "253" "") |) |) + M.deref (| mk_str (| String.String "253" "" |) |) |) ] |) @@ -3979,7 +3973,7 @@ Module string. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String (String.String "253" "") |) |) + M.deref (| mk_str (| String.String "253" "" |) |) |) ] |) @@ -4538,7 +4532,7 @@ Module string. M.read (| string |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String (String.String "253" "") |) |) + M.deref (| mk_str (| String.String "253" "" |) |) |) ] |) @@ -4977,11 +4971,7 @@ Module string. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "assertion failed: self.is_char_boundary(start)" - |) + [ mk_str (| "assertion failed: self.is_char_boundary(start)" |) ] |) |) @@ -5047,11 +5037,7 @@ Module string. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.is_char_boundary(end)" - |) - ] + [ mk_str (| "assertion failed: self.is_char_boundary(end)" |) ] |) |) |))); @@ -5673,9 +5659,8 @@ Module string. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.is_char_boundary(new_len)" + mk_str (| + "assertion failed: self.is_char_boundary(new_len)" |) ] |) @@ -6076,9 +6061,8 @@ Module string. M.alloc (| Value.Array [ - M.read (| - Value.String - "cannot remove a char from the end of a string" + mk_str (| + "cannot remove a char from the end of a string" |) ] |) @@ -7543,11 +7527,7 @@ Module string. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.is_char_boundary(idx)" - |) - ] + [ mk_str (| "assertion failed: self.is_char_boundary(idx)" |) ] |) |) |))); @@ -7922,11 +7902,7 @@ Module string. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.is_char_boundary(idx)" - |) - ] + [ mk_str (| "assertion failed: self.is_char_boundary(idx)" |) ] |) |) |))); @@ -8141,11 +8117,7 @@ Module string. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.is_char_boundary(at)" - |) - ] + [ mk_str (| "assertion failed: self.is_char_boundary(at)" |) ] |) |) |))); @@ -8377,11 +8349,7 @@ Module string. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "assertion failed: self.is_char_boundary(start)" - |) + [ mk_str (| "assertion failed: self.is_char_boundary(start)" |) ] |) |) @@ -8447,11 +8415,7 @@ Module string. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.is_char_boundary(end)" - |) - ] + [ mk_str (| "assertion failed: self.is_char_boundary(end)" |) ] |) |) |))); @@ -8676,11 +8640,7 @@ Module string. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.is_char_boundary(n)" - |) - ] + [ mk_str (| "assertion failed: self.is_char_boundary(n)" |) ] |) |) |))); @@ -8757,11 +8717,7 @@ Module string. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "assertion failed: self.is_char_boundary(n + 1)" - |) + [ mk_str (| "assertion failed: self.is_char_boundary(n + 1)" |) ] |) |) @@ -8873,11 +8829,7 @@ Module string. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "assertion failed: self.is_char_boundary(n + 1)" - |) + [ mk_str (| "assertion failed: self.is_char_boundary(n + 1)" |) ] |) |) @@ -8952,11 +8904,7 @@ Module string. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.is_char_boundary(n)" - |) - ] + [ mk_str (| "assertion failed: self.is_char_boundary(n)" |) ] |) |) |))); @@ -9831,7 +9779,7 @@ Module string. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "invalid utf-16: lone surrogate found" |) |) + M.deref (| mk_str (| "invalid utf-16: lone surrogate found" |) |) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) ] @@ -9861,7 +9809,7 @@ Module string. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "invalid utf-8" |) |) |))) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "invalid utf-8" |) |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -9887,10 +9835,7 @@ Module string. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "invalid utf-16" |) |) - |))) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "invalid utf-16" |) |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -14627,9 +14572,7 @@ Module string. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "a Display implementation returned an error unexpectedly" - |) + mk_str (| "a Display implementation returned an error unexpectedly" |) |) |) ] @@ -14799,14 +14742,11 @@ Module string. (let γ := M.use (M.deref (| M.read (| self |) |)) in let _ := M.is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - Value.String "true")); + M.alloc (| mk_str (| "true" |) |))); fun γ => ltac:(M.monadic (M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "false" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "false" |) |) |) |))) ] |) @@ -17159,10 +17099,7 @@ Module string. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Drain" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Drain" |) |) |) ] |) |) diff --git a/CoqOfRust/alloc/sync.v b/CoqOfRust/alloc/sync.v index 5e8abb297..5a2ca72f0 100644 --- a/CoqOfRust/alloc/sync.v +++ b/CoqOfRust/alloc/sync.v @@ -12,7 +12,7 @@ Module sync. Global Hint Rewrite Constant_value_MAX_REFCOUNT : constant_rewrites. Definition value_INTERNAL_OVERFLOW_ERROR : Value.t := - M.run_constant ltac:(M.monadic (Value.String "Arc counter overflow")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "Arc counter overflow" |) |))). Axiom Constant_value_INTERNAL_OVERFLOW_ERROR : (M.get_constant "alloc::sync::INTERNAL_OVERFLOW_ERROR") = value_INTERNAL_OVERFLOW_ERROR. @@ -4045,9 +4045,8 @@ Module sync. M.alloc (| Value.Array [ - M.read (| - Value.String - "No prior strong references should exist" + mk_str (| + "No prior strong references should exist" |) ] |) @@ -6840,9 +6839,8 @@ Module sync. [] |), [ - M.read (| - Value.String - "assertion failed: !is_dangling(this.ptr.as_ptr())" + mk_str (| + "assertion failed: !is_dangling(this.ptr.as_ptr())" |) ] |) @@ -9209,7 +9207,7 @@ Module sync. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "(Weak)" |) ] |) + M.alloc (| Value.Array [ mk_str (| "(Weak)" |) ] |) |) |) |) @@ -12040,9 +12038,8 @@ Module sync. M.alloc (| Value.Array [ - M.read (| - Value.String - "Arcs backed by a static should never reach a strong count of 0. Likely decrement_strong_count or from_raw were called too many times." + mk_str (| + "Arcs backed by a static should never reach a strong count of 0. Likely decrement_strong_count or from_raw were called too many times." |) ] |) @@ -14333,9 +14330,8 @@ Module sync. M.alloc (| Value.Array [ - M.read (| - Value.String - "Arc/Weaks backed by a static should never be deallocated. Likely decrement_strong_count or from_raw were called too many times." + mk_str (| + "Arc/Weaks backed by a static should never be deallocated. Likely decrement_strong_count or from_raw were called too many times." |) ] |) @@ -15836,9 +15832,8 @@ Module sync. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: core::str::from_utf8(&*arc).is_ok()" + mk_str (| + "assertion failed: core::str::from_utf8(&*arc).is_ok()" |) ] |) @@ -18065,9 +18060,8 @@ Module sync. M.alloc (| Value.Array [ - M.read (| - Value.String - "TrustedLen iterator's size hint is not exact: " + mk_str (| + "TrustedLen iterator's size hint is not exact: " |) ] |) @@ -18194,8 +18188,7 @@ Module sync. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "capacity overflow" |) ] + Value.Array [ mk_str (| "capacity overflow" |) ] |) |) |) diff --git a/CoqOfRust/alloc/vec/drain.v b/CoqOfRust/alloc/vec/drain.v index 0705ec112..087b8ff89 100644 --- a/CoqOfRust/alloc/vec/drain.v +++ b/CoqOfRust/alloc/vec/drain.v @@ -74,10 +74,7 @@ Module vec. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Drain" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Drain" |) |) |) ] |) |) diff --git a/CoqOfRust/alloc/vec/extract_if.v b/CoqOfRust/alloc/vec/extract_if.v index 669be6b2f..c5b859f08 100644 --- a/CoqOfRust/alloc/vec/extract_if.v +++ b/CoqOfRust/alloc/vec/extract_if.v @@ -44,11 +44,8 @@ Module vec. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ExtractIf" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "vec" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ExtractIf" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "vec" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -62,7 +59,7 @@ Module vec. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "idx" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "idx" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -76,7 +73,7 @@ Module vec. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "del" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "del" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -90,7 +87,7 @@ Module vec. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "old_len" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "old_len" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -104,7 +101,7 @@ Module vec. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "pred" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "pred" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/alloc/vec/in_place_collect.v b/CoqOfRust/alloc/vec/in_place_collect.v index 27567a91b..18c915333 100644 --- a/CoqOfRust/alloc/vec/in_place_collect.v +++ b/CoqOfRust/alloc/vec/in_place_collect.v @@ -203,9 +203,8 @@ Module vec. M.alloc (| Value.Array [ - M.read (| - Value.String - "in_place_collectible() prevents this" + mk_str (| + "in_place_collectible() prevents this" |) ] |) @@ -1252,9 +1251,8 @@ Module vec. M.alloc (| Value.Array [ - M.read (| - Value.String - "InPlaceIterable contract violation, write pointer advanced beyond read pointer" + mk_str (| + "InPlaceIterable contract violation, write pointer advanced beyond read pointer" |) ] |) @@ -2217,9 +2215,8 @@ Module vec. M.alloc (| Value.Array [ - M.read (| - Value.String - "InPlaceIterable contract violation" + mk_str (| + "InPlaceIterable contract violation" |) ] |) @@ -2735,9 +2732,8 @@ Module vec. M.alloc (| Value.Array [ - M.read (| - Value.String - "InPlaceIterable contract violation" + mk_str (| + "InPlaceIterable contract violation" |) ] |) diff --git a/CoqOfRust/alloc/vec/into_iter.v b/CoqOfRust/alloc/vec/into_iter.v index f229630df..dd6ba7684 100644 --- a/CoqOfRust/alloc/vec/into_iter.v +++ b/CoqOfRust/alloc/vec/into_iter.v @@ -74,7 +74,7 @@ Module vec. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IntoIter" |) |) + M.deref (| mk_str (| "IntoIter" |) |) |) ] |) diff --git a/CoqOfRust/alloc/vec/links/mod.v b/CoqOfRust/alloc/vec/links/mod.v index 79676527b..1272d492a 100644 --- a/CoqOfRust/alloc/vec/links/mod.v +++ b/CoqOfRust/alloc/vec/links/mod.v @@ -97,25 +97,37 @@ Module Impl_Vec_T_A. (* pub const fn len(&self) -> usize *) - Instance run_len {T A : Set} `{Link T} `{Link A} (self : Ref.t Pointer.Kind.Ref (Self T A)) : + Instance run_len {T A : Set} `{Link T} `{Link A} (self : Ref.t Pointer.Kind.Ref (Self T A)) : Run.Trait (vec.Impl_alloc_vec_Vec_T_A.len (Φ T) (Φ A)) [] [] [φ self] Usize.t. Admitted. (* pub const fn is_empty(&self) -> bool *) - Instance run_is_empty {T A : Set} `{Link T} `{Link A} (self : Ref.t Pointer.Kind.Ref (Self T A)) : + Instance run_is_empty {T A : Set} `{Link T} `{Link A} (self : Ref.t Pointer.Kind.Ref (Self T A)) : Run.Trait (vec.Impl_alloc_vec_Vec_T_A.is_empty (Φ T) (Φ A)) [] [] [φ self] bool. Admitted. (* pub fn pop(&mut self) -> Option *) - Instance run_pop {T A : Set} `{Link T} `{Link A} (self : Ref.t Pointer.Kind.MutRef (Self T A)) : + Instance run_pop {T A : Set} `{Link T} `{Link A} (self : Ref.t Pointer.Kind.MutRef (Self T A)) : Run.Trait (vec.Impl_alloc_vec_Vec_T_A.pop (Φ T) (Φ A)) [] [] [φ self] (option T). Admitted. + + (* pub const fn capacity(&self) -> usize *) + Instance run_capacity {T A : Set} `{Link T} `{Link A} (self : Ref.t Pointer.Kind.Ref (Self T A)) : + Run.Trait (vec.Impl_alloc_vec_Vec_T_A.capacity (Φ T) (Φ A)) [] [] [φ self] Usize.t. + Admitted. + + (* pub fn push(&mut self, value: T) *) + Instance run_push {T A : Set} `{Link T} `{Link A} + (self : Ref.t Pointer.Kind.MutRef (Self T A)) + (value : T) : + Run.Trait (vec.Impl_alloc_vec_Vec_T_A.push (Φ T) (Φ A)) [] [] [φ self; φ value] unit. + Admitted. End Impl_Vec_T_A. Module Impl_Index_for_Vec_T_A. Definition Self := Vec.t. - Instance run {T I A Output : Set} `{Link T} `{Link I} `{Link A} `{Link Output} : + Instance run (T I A Output : Set) `{Link T} `{Link I} `{Link A} `{Link Output} : index.Index.Run (Self T A) I Output. Admitted. End Impl_Index_for_Vec_T_A. diff --git a/CoqOfRust/alloc/vec/mod.v b/CoqOfRust/alloc/vec/mod.v index ffeac9f26..cf2dc14a7 100644 --- a/CoqOfRust/alloc/vec/mod.v +++ b/CoqOfRust/alloc/vec/mod.v @@ -2215,11 +2215,7 @@ Module vec. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "assertion failed: new_len <= self.capacity()" - |) + [ mk_str (| "assertion failed: new_len <= self.capacity()" |) ] |) |) @@ -7252,9 +7248,8 @@ Module vec. M.alloc (| Value.Array [ - M.read (| - Value.String - "TrustedLen iterator's size hint is not exact: " + mk_str (| + "TrustedLen iterator's size hint is not exact: " |) ] |) @@ -7534,8 +7529,7 @@ Module vec. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "capacity overflow" |) ] + Value.Array [ mk_str (| "capacity overflow" |) ] |) |) |) @@ -7821,7 +7815,7 @@ Module vec. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "vec len overflow" |) |) + M.deref (| mk_str (| "vec len overflow" |) |) |) ] |); diff --git a/CoqOfRust/alloc/vec/spec_from_iter_nested.v b/CoqOfRust/alloc/vec/spec_from_iter_nested.v index fed61f1e8..97cf41d19 100644 --- a/CoqOfRust/alloc/vec/spec_from_iter_nested.v +++ b/CoqOfRust/alloc/vec/spec_from_iter_nested.v @@ -391,8 +391,7 @@ Module vec. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "capacity overflow" |) ] + Value.Array [ mk_str (| "capacity overflow" |) ] |) |) |) diff --git a/CoqOfRust/alloc/vec/splice.v b/CoqOfRust/alloc/vec/splice.v index b574fcb6b..ae038582f 100644 --- a/CoqOfRust/alloc/vec/splice.v +++ b/CoqOfRust/alloc/vec/splice.v @@ -45,8 +45,8 @@ Module vec. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Splice" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "drain" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Splice" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "drain" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -60,10 +60,7 @@ Module vec. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "replace_with" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "replace_with" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1188,9 +1185,8 @@ Module vec. [] |), [ - M.read (| - Value.String - "assertion failed: filled" + mk_str (| + "assertion failed: filled" |) ] |) diff --git a/CoqOfRust/core/alloc/layout.v b/CoqOfRust/core/alloc/layout.v index 14416eccd..b6b2fdbd0 100644 --- a/CoqOfRust/core/alloc/layout.v +++ b/CoqOfRust/core/alloc/layout.v @@ -113,8 +113,8 @@ Module alloc. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Layout" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "size" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Layout" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "size" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -128,7 +128,7 @@ Module alloc. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "align" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "align" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2036,10 +2036,7 @@ Module alloc. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LayoutError" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LayoutError" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2090,9 +2087,7 @@ Module alloc. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "invalid parameters to Layout::from_size_align" |) - |) + M.deref (| mk_str (| "invalid parameters to Layout::from_size_align" |) |) |) ] |))) diff --git a/CoqOfRust/core/alloc/mod.v b/CoqOfRust/core/alloc/mod.v index 0da276852..e0ba75baf 100644 --- a/CoqOfRust/core/alloc/mod.v +++ b/CoqOfRust/core/alloc/mod.v @@ -124,7 +124,7 @@ Module alloc. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "AllocError" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "AllocError" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -173,10 +173,7 @@ Module alloc. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "memory allocation failed" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "memory allocation failed" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -498,9 +495,8 @@ Module alloc. M.alloc (| Value.Array [ - M.read (| - Value.String - "`new_layout.size()` must be greater than or equal to `old_layout.size()`" + mk_str (| + "`new_layout.size()` must be greater than or equal to `old_layout.size()`" |) ] |) @@ -836,9 +832,8 @@ Module alloc. M.alloc (| Value.Array [ - M.read (| - Value.String - "`new_layout.size()` must be greater than or equal to `old_layout.size()`" + mk_str (| + "`new_layout.size()` must be greater than or equal to `old_layout.size()`" |) ] |) @@ -1170,9 +1165,8 @@ Module alloc. M.alloc (| Value.Array [ - M.read (| - Value.String - "`new_layout.size()` must be smaller than or equal to `old_layout.size()`" + mk_str (| + "`new_layout.size()` must be smaller than or equal to `old_layout.size()`" |) ] |) diff --git a/CoqOfRust/core/any.v b/CoqOfRust/core/any.v index 55d7c1adf..119b0f465 100644 --- a/CoqOfRust/core/any.v +++ b/CoqOfRust/core/any.v @@ -76,7 +76,7 @@ Module any. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Any" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Any" |) |) |) ] |) |) @@ -135,7 +135,7 @@ Module any. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Any" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Any" |) |) |) ] |) |) @@ -199,7 +199,7 @@ Module any. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Any" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Any" |) |) |) ] |) |) @@ -502,8 +502,7 @@ Module any. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: self.is::()" |) - ] + [ mk_str (| "assertion failed: self.is::()" |) ] |) |) |))); @@ -610,11 +609,7 @@ Module any. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.is::()" - |) - ] + [ mk_str (| "assertion failed: self.is::()" |) ] |) |) |))); @@ -1477,10 +1472,7 @@ Module any. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "TypeId(" |); M.read (| Value.String ")" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "TypeId(" |); mk_str (| ")" |) ] |) |) |) |); diff --git a/CoqOfRust/core/array/iter.v b/CoqOfRust/core/array/iter.v index 66531f51f..196ce7630 100644 --- a/CoqOfRust/core/array/iter.v +++ b/CoqOfRust/core/array/iter.v @@ -2519,7 +2519,7 @@ Module array. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IntoIter" |) |) + M.deref (| mk_str (| "IntoIter" |) |) |) ] |) diff --git a/CoqOfRust/core/array/mod.v b/CoqOfRust/core/array/mod.v index ee6f603aa..ce10d0858 100644 --- a/CoqOfRust/core/array/mod.v +++ b/CoqOfRust/core/array/mod.v @@ -423,10 +423,7 @@ Module array. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TryFromSliceError" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "TryFromSliceError" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -569,7 +566,7 @@ Module array. (let self := M.alloc (| self |) in M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "could not convert slice to array" |) |) + M.deref (| mk_str (| "could not convert slice to array" |) |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -6911,7 +6908,7 @@ Module array. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: iter.size_hint().0 >= N" |) ] + [ mk_str (| "assertion failed: iter.size_hint().0 >= N" |) ] |) |) |))); @@ -7564,9 +7561,8 @@ Module array. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.initialized <= self.array_mut.len()" + mk_str (| + "assertion failed: self.initialized <= self.array_mut.len()" |) ] |) diff --git a/CoqOfRust/core/ascii.v b/CoqOfRust/core/ascii.v index deaca2ea2..ce8b17546 100644 --- a/CoqOfRust/core/ascii.v +++ b/CoqOfRust/core/ascii.v @@ -678,10 +678,7 @@ Module ascii. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EscapeDefault" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EscapeDefault" |) |) |) ] |) |) diff --git a/CoqOfRust/core/asserting.v b/CoqOfRust/core/asserting.v index 729b06fbe..35b4788e5 100644 --- a/CoqOfRust/core/asserting.v +++ b/CoqOfRust/core/asserting.v @@ -69,7 +69,7 @@ Module asserting. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "N/A" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "N/A" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -205,10 +205,7 @@ Module asserting. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "N/A" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "N/A" |) |) |) ] |) |))); diff --git a/CoqOfRust/core/async_iter/from_iter.v b/CoqOfRust/core/async_iter/from_iter.v index 1fdf44d2f..74b215e3b 100644 --- a/CoqOfRust/core/async_iter/from_iter.v +++ b/CoqOfRust/core/async_iter/from_iter.v @@ -84,8 +84,8 @@ Module async_iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "FromIter" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FromIter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/cell.v b/CoqOfRust/core/cell.v index d254134a8..c7735670c 100644 --- a/CoqOfRust/core/cell.v +++ b/CoqOfRust/core/cell.v @@ -800,9 +800,8 @@ Module cell. M.alloc (| Value.Array [ - M.read (| - Value.String - "`Cell::swap` on overlapping non-identical `Cell`s" + mk_str (| + "`Cell::swap` on overlapping non-identical `Cell`s" |) ] |) @@ -1476,10 +1475,7 @@ Module cell. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BorrowError" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BorrowError" |) |) |) ] |) |) in @@ -1534,7 +1530,7 @@ Module cell. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "already mutably borrowed" |) |) + M.deref (| mk_str (| "already mutably borrowed" |) |) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) ] @@ -1591,10 +1587,7 @@ Module cell. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BorrowMutError" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BorrowMutError" |) |) |) ] |) |) in @@ -1647,10 +1640,7 @@ Module cell. [ Ty.tuple []; Ty.path "core::fmt::Error" ], M.get_trait_method (| "core::fmt::Display", Ty.path "str", [], [], "fmt", [], [] |), [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "already borrowed" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "already borrowed" |) |) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) ] |))) @@ -1694,7 +1684,7 @@ Module cell. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "already borrowed: " |) ] |) + M.alloc (| Value.Array [ mk_str (| "already borrowed: " |) ] |) |) |) |); @@ -1770,9 +1760,7 @@ Module cell. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "already mutably borrowed: " |) ] - |) + M.alloc (| Value.Array [ mk_str (| "already mutably borrowed: " |) ] |) |) |) |); @@ -4131,11 +4119,7 @@ Module cell. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: is_reading(borrow)" - |) - ] + [ mk_str (| "assertion failed: is_reading(borrow)" |) ] |) |) |))); @@ -4272,11 +4256,7 @@ Module cell. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: is_reading(borrow)" - |) - ] + [ mk_str (| "assertion failed: is_reading(borrow)" |) ] |) |) |))); @@ -4310,11 +4290,7 @@ Module cell. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: borrow != BorrowFlag::MAX" - |) - ] + [ mk_str (| "assertion failed: borrow != BorrowFlag::MAX" |) ] |) |) |))); @@ -5619,11 +5595,7 @@ Module cell. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: is_writing(borrow)" - |) - ] + [ mk_str (| "assertion failed: is_writing(borrow)" |) ] |) |) |))); @@ -5847,11 +5819,7 @@ Module cell. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: is_writing(borrow)" - |) - ] + [ mk_str (| "assertion failed: is_writing(borrow)" |) ] |) |) |))); @@ -5885,11 +5853,7 @@ Module cell. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: borrow != BorrowFlag::MIN" - |) - ] + [ mk_str (| "assertion failed: borrow != BorrowFlag::MIN" |) ] |) |) |))); diff --git a/CoqOfRust/core/cell/lazy.v b/CoqOfRust/core/cell/lazy.v index 3eccccf44..b7fac6aee 100644 --- a/CoqOfRust/core/cell/lazy.v +++ b/CoqOfRust/core/cell/lazy.v @@ -1042,10 +1042,7 @@ Module cell. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LazyCell" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LazyCell" |) |) |) ] |) |) in @@ -1136,8 +1133,7 @@ Module cell. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -1213,11 +1209,7 @@ Module cell. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "LazyCell instance has previously been poisoned" - |) - ] + [ mk_str (| "LazyCell instance has previously been poisoned" |) ] |) |) |) diff --git a/CoqOfRust/core/cell/once.v b/CoqOfRust/core/cell/once.v index a4bd8ccfb..9cc52be41 100644 --- a/CoqOfRust/core/cell/once.v +++ b/CoqOfRust/core/cell/once.v @@ -1184,8 +1184,7 @@ Module cell. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "reentrant init" |) ] + Value.Array [ mk_str (| "reentrant init" |) ] |) |) |) @@ -1362,10 +1361,7 @@ Module cell. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OnceCell" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "OnceCell" |) |) |) ] |) |) in @@ -1456,8 +1452,7 @@ Module cell. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -1626,11 +1621,7 @@ Module cell. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "internal error: entered unreachable code" - |) - ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |) |))) diff --git a/CoqOfRust/core/char/convert.v b/CoqOfRust/core/char/convert.v index 2afdb0faf..af949c58d 100644 --- a/CoqOfRust/core/char/convert.v +++ b/CoqOfRust/core/char/convert.v @@ -525,11 +525,8 @@ Module char. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ParseCharError" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "kind" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ParseCharError" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "kind" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -751,7 +748,7 @@ Module char. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EmptyString" |) |) + M.deref (| mk_str (| "EmptyString" |) |) |) |))); fun γ => @@ -765,7 +762,7 @@ Module char. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TooManyChars" |) |) + M.deref (| mk_str (| "TooManyChars" |) |) |) |))) ] @@ -908,9 +905,7 @@ Module char. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "cannot parse char from empty string" |) - |) + M.deref (| mk_str (| "cannot parse char from empty string" |) |) |) |))); fun γ => @@ -923,7 +918,7 @@ Module char. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "too many characters in string" |) |) + M.deref (| mk_str (| "too many characters in string" |) |) |) |))) ] @@ -1335,10 +1330,7 @@ Module char. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CharTryFromError" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CharTryFromError" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1491,9 +1483,7 @@ Module char. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "converted integer out of range for `char`" |) - |) + M.deref (| mk_str (| "converted integer out of range for `char`" |) |) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) ] @@ -1566,9 +1556,8 @@ Module char. M.alloc (| Value.Array [ - M.read (| - Value.String - "from_digit: radix is too high (maximum 36)" + mk_str (| + "from_digit: radix is too high (maximum 36)" |) ] |) diff --git a/CoqOfRust/core/char/decode.v b/CoqOfRust/core/char/decode.v index e0b50b729..16dc29d0d 100644 --- a/CoqOfRust/core/char/decode.v +++ b/CoqOfRust/core/char/decode.v @@ -113,11 +113,8 @@ Module char. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DecodeUtf16" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "DecodeUtf16" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -131,7 +128,7 @@ Module char. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "buf" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "buf" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -196,11 +193,8 @@ Module char. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DecodeUtf16Error" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "code" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "DecodeUtf16Error" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "code" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1315,9 +1309,7 @@ Module char. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "unpaired surrogate found: " |) ] - |) + M.alloc (| Value.Array [ mk_str (| "unpaired surrogate found: " |) ] |) |) |) |); @@ -1387,10 +1379,7 @@ Module char. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "unpaired surrogate found" |) |) - |))) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "unpaired surrogate found" |) |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/char/methods.v b/CoqOfRust/core/char/methods.v index bc37257c7..4c0c44375 100644 --- a/CoqOfRust/core/char/methods.v +++ b/CoqOfRust/core/char/methods.v @@ -266,9 +266,8 @@ Module char. M.alloc (| Value.Array [ - M.read (| - Value.String - "to_digit: invalid radix -- radix must be in the range 2 to 36 inclusive" + mk_str (| + "to_digit: invalid radix -- radix must be in the range 2 to 36 inclusive" |) ] |) diff --git a/CoqOfRust/core/char/mod.v b/CoqOfRust/core/char/mod.v index df753c418..8192d0e38 100644 --- a/CoqOfRust/core/char/mod.v +++ b/CoqOfRust/core/char/mod.v @@ -256,10 +256,7 @@ Module char. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EscapeUnicode" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EscapeUnicode" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -797,10 +794,7 @@ Module char. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EscapeDefault" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EscapeDefault" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1414,10 +1408,7 @@ Module char. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EscapeDebug" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EscapeDebug" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1617,10 +1608,7 @@ Module char. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Bytes" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Bytes" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -1652,10 +1640,7 @@ Module char. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Char" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Char" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -2271,10 +2256,7 @@ Module char. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ToLowercase" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ToLowercase" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2986,10 +2968,7 @@ Module char. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ToUppercase" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ToUppercase" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3707,10 +3686,7 @@ Module char. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CaseMappingIter" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CaseMappingIter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -4830,10 +4806,7 @@ Module char. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TryFromCharError" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "TryFromCharError" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5026,7 +4999,7 @@ Module char. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "unicode code point out of range" |) |) + M.deref (| mk_str (| "unicode code point out of range" |) |) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| fmt |) |) |) ] diff --git a/CoqOfRust/core/clone/uninit.v b/CoqOfRust/core/clone/uninit.v index d9ff1dd1d..4de64c1f5 100644 --- a/CoqOfRust/core/clone/uninit.v +++ b/CoqOfRust/core/clone/uninit.v @@ -222,9 +222,8 @@ Module clone. M.alloc (| Value.Array [ - M.read (| - Value.String - "clone_to_uninit() source and destination must have equal lengths" + mk_str (| + "clone_to_uninit() source and destination must have equal lengths" |) ] |) @@ -645,9 +644,8 @@ Module clone. M.alloc (| Value.Array [ - M.read (| - Value.String - "clone_to_uninit() source and destination must have equal lengths" + mk_str (| + "clone_to_uninit() source and destination must have equal lengths" |) ] |) diff --git a/CoqOfRust/core/cmp.v b/CoqOfRust/core/cmp.v index fa68a8555..0aa1987e3 100644 --- a/CoqOfRust/core/cmp.v +++ b/CoqOfRust/core/cmp.v @@ -369,30 +369,21 @@ Module cmp. (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::cmp::Ordering::Less" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Less" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Less" |) |) |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::cmp::Ordering::Equal" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Equal" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Equal" |) |) |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::cmp::Ordering::Greater" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Greater" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Greater" |) |) |) |))) ] |) @@ -910,7 +901,7 @@ Module cmp. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Reverse" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Reverse" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1489,7 +1480,7 @@ Module cmp. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: min <= max" |) ] + [ mk_str (| "assertion failed: min <= max" |) ] |) |) |))); @@ -4438,7 +4429,7 @@ Module cmp. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: min <= max" |) ] + [ mk_str (| "assertion failed: min <= max" |) ] |) |) |))); diff --git a/CoqOfRust/core/error.v b/CoqOfRust/core/error.v index 4c1c037b5..ffcd378f1 100644 --- a/CoqOfRust/core/error.v +++ b/CoqOfRust/core/error.v @@ -49,7 +49,7 @@ Module error. (let self := M.alloc (| self |) in M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "description() is deprecated; use Display" |) |) + M.deref (| mk_str (| "description() is deprecated; use Display" |) |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -113,7 +113,7 @@ Module error. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Internal" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Internal" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1377,10 +1377,7 @@ Module error. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Request" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Request" |) |) |) ] |) |) @@ -1455,7 +1452,7 @@ Module error. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Value" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Value" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1538,10 +1535,7 @@ Module error. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MaybeSizedValue" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MaybeSizedValue" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1624,7 +1618,7 @@ Module error. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Ref" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Ref" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2235,8 +2229,8 @@ Module error. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Source" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "current" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Source" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "current" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2642,7 +2636,7 @@ Module error. (let self := M.alloc (| self |) in M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "an error occurred when formatting an argument" |) |) + M.deref (| mk_str (| "an error occurred when formatting an argument" |) |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2669,10 +2663,7 @@ Module error. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "already mutably borrowed" |) |) - |))) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "already mutably borrowed" |) |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2698,10 +2689,7 @@ Module error. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "already borrowed" |) |) - |))) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "already borrowed" |) |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2729,7 +2717,7 @@ Module error. (let self := M.alloc (| self |) in M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "converted integer out of range for `char`" |) |) + M.deref (| mk_str (| "converted integer out of range for `char`" |) |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/escape.v b/CoqOfRust/core/escape.v index b7431a5d5..268b961cc 100644 --- a/CoqOfRust/core/escape.v +++ b/CoqOfRust/core/escape.v @@ -993,11 +993,8 @@ Module escape. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EscapeIterInner" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "data" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EscapeIterInner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "data" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1011,7 +1008,7 @@ Module escape. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "alive" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "alive" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/ffi/c_str.v b/CoqOfRust/core/ffi/c_str.v index 816840890..8e3ff7f7f 100644 --- a/CoqOfRust/core/ffi/c_str.v +++ b/CoqOfRust/core/ffi/c_str.v @@ -339,11 +339,8 @@ Module ffi. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FromBytesWithNulError" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "kind" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FromBytesWithNulError" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "kind" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -663,7 +660,7 @@ Module ffi. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InteriorNul" |) |) + M.deref (| mk_str (| "InteriorNul" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -696,7 +693,7 @@ Module ffi. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NotNulTerminated" |) |) + M.deref (| mk_str (| "NotNulTerminated" |) |) |) ] |) @@ -808,9 +805,7 @@ Module ffi. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "data provided contains an interior nul byte" |) - |) + M.deref (| mk_str (| "data provided contains an interior nul byte" |) |) |) |))); fun γ => @@ -823,9 +818,7 @@ Module ffi. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "data provided is not nul terminated" |) - |) + M.deref (| mk_str (| "data provided is not nul terminated" |) |) |) |))) ] @@ -1025,7 +1018,7 @@ Module ffi. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FromBytesUntilNulError" |) |) + M.deref (| mk_str (| "FromBytesUntilNulError" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -1096,8 +1089,7 @@ Module ffi. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "data provided does not contain a nul" |) ] + Value.Array [ mk_str (| "data provided does not contain a nul" |) ] |) |) |) @@ -1154,10 +1146,7 @@ Module ffi. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String """" |); M.read (| Value.String """" |) ] - |) + M.alloc (| Value.Array [ mk_str (| """" |); mk_str (| """" |) ] |) |) |) |); @@ -1541,9 +1530,7 @@ Module ffi. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String " at byte pos " |) - ] + Value.Array [ mk_str (| " at byte pos " |) ] |) |) |) @@ -2867,10 +2854,8 @@ Module ffi. M.alloc (| Value.Array [ - M.read (| - Value.String "index out of bounds: the len is " - |); - M.read (| Value.String " but the index is " |) + mk_str (| "index out of bounds: the len is " |); + mk_str (| " but the index is " |) ] |) |) @@ -3199,8 +3184,8 @@ Module ffi. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Bytes" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "ptr" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Bytes" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ptr" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3214,7 +3199,7 @@ Module ffi. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "phantom" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "phantom" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/ffi/mod.v b/CoqOfRust/core/ffi/mod.v index 69cb6d655..655a32c3a 100644 --- a/CoqOfRust/core/ffi/mod.v +++ b/CoqOfRust/core/ffi/mod.v @@ -111,10 +111,7 @@ Module ffi. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "c_void" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "c_void" |) |) |) ] |) |) diff --git a/CoqOfRust/core/ffi/va_list.v b/CoqOfRust/core/ffi/va_list.v index f4c44c714..56363470b 100644 --- a/CoqOfRust/core/ffi/va_list.v +++ b/CoqOfRust/core/ffi/va_list.v @@ -50,14 +50,8 @@ Module ffi. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VaListImpl" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "gp_offset" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "VaListImpl" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "gp_offset" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -71,10 +65,7 @@ Module ffi. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "fp_offset" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "fp_offset" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -88,10 +79,7 @@ Module ffi. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "overflow_arg_area" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "overflow_arg_area" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -105,10 +93,7 @@ Module ffi. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "reg_save_area" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "reg_save_area" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -122,7 +107,7 @@ Module ffi. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "_marker" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "_marker" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -194,8 +179,8 @@ Module ffi. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "VaList" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "inner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "VaList" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -209,7 +194,7 @@ Module ffi. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "_marker" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "_marker" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/fmt/builders.v b/CoqOfRust/core/fmt/builders.v index 47d290699..58daee806 100644 --- a/CoqOfRust/core/fmt/builders.v +++ b/CoqOfRust/core/fmt/builders.v @@ -399,9 +399,7 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String " " - |) + mk_str (| " " |) |) |) ] @@ -768,7 +766,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String " " |) |) + M.deref (| mk_str (| " " |) |) |) ] |) @@ -1327,9 +1325,8 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - " { + mk_str (| + " { " |) |) @@ -1706,9 +1703,7 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String ": " - |) + mk_str (| ": " |) |) |) ] @@ -1967,10 +1962,8 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String ", -" |) - |) + M.deref (| mk_str (| ", +" |) |) |) ] |) @@ -2007,16 +2000,16 @@ Module fmt. M.read (| γ |), Value.Bool true |) in - Value.String ", ")); + M.alloc (| + mk_str (| ", " |) + |))); fun γ => ltac:(M.monadic (M.alloc (| M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String " { " - |) + mk_str (| " { " |) |) |) |))) @@ -2396,9 +2389,7 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String ": " - |) + mk_str (| ": " |) |) |) ] @@ -2851,10 +2842,8 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String ".. -" - |) + mk_str (| ".. +" |) |) |) ] @@ -2970,9 +2959,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "}" |) - |) + M.deref (| mk_str (| "}" |) |) |) ] |) @@ -3012,9 +2999,7 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String ", .. }" - |) + mk_str (| ", .. }" |) |) |) ] @@ -3052,9 +3037,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String " { .. }" |) - |) + M.deref (| mk_str (| " { .. }" |) |) |) ] |) @@ -3245,11 +3228,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| - Value.String "}" - |) - |) + M.deref (| mk_str (| "}" |) |) |) ] |) @@ -3289,9 +3268,7 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String " }" - |) + mk_str (| " }" |) |) |) ] @@ -3787,9 +3764,8 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "( + mk_str (| + "( " |) |) @@ -4143,10 +4119,8 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String ", -" |) - |) + M.deref (| mk_str (| ", +" |) |) |) ] |) @@ -4192,16 +4166,16 @@ Module fmt. M.read (| γ |), Value.Bool true |) in - Value.String "(")); + M.alloc (| + mk_str (| "(" |) + |))); fun γ => ltac:(M.monadic (M.alloc (| M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String ", " - |) + mk_str (| ", " |) |) |) |))) @@ -4741,10 +4715,8 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String ".. -" - |) + mk_str (| ".. +" |) |) |) ] @@ -4860,9 +4832,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String ")" |) - |) + M.deref (| mk_str (| ")" |) |) |) ] |) @@ -4902,9 +4872,7 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String ", ..)" - |) + mk_str (| ", ..)" |) |) |) ] @@ -4942,9 +4910,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "(..)" |) - |) + M.deref (| mk_str (| "(..)" |) |) |) ] |) @@ -5217,9 +5183,7 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "," - |) + mk_str (| "," |) |) |) ] @@ -5340,9 +5304,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String ")" |) - |) + M.deref (| mk_str (| ")" |) |) |) ] |) @@ -5659,10 +5621,8 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String " -" - |) + mk_str (| " +" |) |) |) ] @@ -6003,10 +5963,8 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String ", -" |) - |) + M.deref (| mk_str (| ", +" |) |) |) ] |) @@ -6107,9 +6065,7 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String ", " - |) + mk_str (| ", " |) |) |) ] @@ -6352,7 +6308,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| fmt |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "{" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "{" |) |) |) ] |) |) in @@ -7011,10 +6967,8 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String ".. -" - |) + mk_str (| ".. +" |) |) |) ] @@ -7134,9 +7088,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "}" |) - |) + M.deref (| mk_str (| "}" |) |) |) ] |) @@ -7180,9 +7132,7 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String ", ..}" - |) + mk_str (| ", ..}" |) |) |) ] @@ -7224,9 +7174,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "..}" |) - |) + M.deref (| mk_str (| "..}" |) |) |) ] |) @@ -7366,7 +7314,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "}" |) |) + M.deref (| mk_str (| "}" |) |) |) ] |))) @@ -7435,7 +7383,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| fmt |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "[" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "[" |) |) |) ] |) |) in @@ -8069,12 +8017,8 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| - Value.String ".. -" - |) - |) + M.deref (| mk_str (| ".. +" |) |) |) ] |) @@ -8183,9 +8127,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "]" |) - |) + M.deref (| mk_str (| "]" |) |) |) ] |) @@ -8224,9 +8166,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String ", ..]" |) - |) + M.deref (| mk_str (| ", ..]" |) |) |) ] |) @@ -8266,7 +8206,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "..]" |) |) + M.deref (| mk_str (| "..]" |) |) |) ] |) @@ -8394,7 +8334,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "]" |) |) + M.deref (| mk_str (| "]" |) |) |) ] |))) @@ -8474,7 +8414,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| fmt |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "{" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "{" |) |) |) ] |) |) in @@ -8846,9 +8786,8 @@ Module fmt. M.alloc (| Value.Array [ - M.read (| - Value.String - "attempted to begin a new map entry without completing the previous one" + mk_str (| + "attempted to begin a new map entry without completing the previous one" |) ] |) @@ -9004,9 +8943,8 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - " + mk_str (| + " " |) |) @@ -9415,9 +9353,7 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String ": " - |) + mk_str (| ": " |) |) |) ] @@ -9600,9 +9536,8 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - ", " + mk_str (| + ", " |) |) |) @@ -9934,9 +9869,7 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String ": " - |) + mk_str (| ": " |) |) |) ] @@ -10316,9 +10249,8 @@ Module fmt. M.alloc (| Value.Array [ - M.read (| - Value.String - "attempted to format a map value before its key" + mk_str (| + "attempted to format a map value before its key" |) ] |) @@ -10660,10 +10592,8 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String ", -" - |) + mk_str (| ", +" |) |) |) ] @@ -11277,9 +11207,8 @@ Module fmt. M.alloc (| Value.Array [ - M.read (| - Value.String - "attempted to finish a map with a partial entry" + mk_str (| + "attempted to finish a map with a partial entry" |) ] |) @@ -11501,10 +11430,8 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String ".. -" - |) + mk_str (| ".. +" |) |) |) ] @@ -11620,9 +11547,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "}" |) - |) + M.deref (| mk_str (| "}" |) |) |) ] |) @@ -11662,9 +11587,7 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String ", ..}" - |) + mk_str (| ", ..}" |) |) |) ] @@ -11702,9 +11625,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "..}" |) - |) + M.deref (| mk_str (| "..}" |) |) |) ] |) @@ -11865,9 +11786,8 @@ Module fmt. M.alloc (| Value.Array [ - M.read (| - Value.String - "attempted to finish a map with a partial entry" + mk_str (| + "attempted to finish a map with a partial entry" |) ] |) @@ -11911,7 +11831,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "}" |) |) + M.deref (| mk_str (| "}" |) |) |) ] |) diff --git a/CoqOfRust/core/fmt/float.v b/CoqOfRust/core/fmt/float.v index 3ae2f1ae2..683316184 100644 --- a/CoqOfRust/core/fmt/float.v +++ b/CoqOfRust/core/fmt/float.v @@ -1703,7 +1703,7 @@ Module fmt. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -1845,7 +1845,7 @@ Module fmt. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); diff --git a/CoqOfRust/core/fmt/links/mod.v b/CoqOfRust/core/fmt/links/mod.v new file mode 100644 index 000000000..a96cc3188 --- /dev/null +++ b/CoqOfRust/core/fmt/links/mod.v @@ -0,0 +1,46 @@ +Require Import CoqOfRust.CoqOfRust. +Require Import CoqOfRust.links.M. +Require Import core.fmt.links.rt. +Require Import core.fmt.mod. +Require Import core.links.array. +(* +pub struct Arguments<'a> { + pieces: &'a [&'static str], + fmt: Option<&'a [rt::Placeholder]>, + args: &'a [rt::Argument<'a>], +} +*) +Module Arguments. + Parameter t : Set. + + Parameter to_value : t -> Value.t. + + Global Instance IsLink : Link t := { + Φ := Ty.path "core::fmt::Arguments"; + φ := to_value; + }. + + Definition of_ty : OfTy.t (Ty.path "core::fmt::Arguments"). + Proof. eapply OfTy.Make with (A := t); reflexivity. Defined. + Smpl Add apply of_ty : of_ty. +End Arguments. + +Module Impl_Arguments. + Definition Self : Set := Arguments.t. + + (* + pub fn new_v1( + pieces: &'a [&'static str; P], + args: &'a [rt::Argument<'a>; A], + ) -> Arguments<'a> + *) + Instance run_new_v1 + (P A : Usize.t) + (pieces : Ref.t Pointer.Kind.Ref (array.t (Ref.t Pointer.Kind.Ref string) P)) + (args : Ref.t Pointer.Kind.Ref (array.t (Ref.t Pointer.Kind.Ref Argument.t) A)) : + Run.Trait fmt.Impl_core_fmt_Arguments.new_v1 [φ P; φ A] [] [φ pieces; φ args] Self. + Proof. + constructor. + run_symbolic. + Admitted. +End Impl_Arguments. diff --git a/CoqOfRust/core/fmt/links/rt.v b/CoqOfRust/core/fmt/links/rt.v new file mode 100644 index 000000000..520c6af3e --- /dev/null +++ b/CoqOfRust/core/fmt/links/rt.v @@ -0,0 +1,23 @@ +Require Import CoqOfRust.CoqOfRust. +Require Import CoqOfRust.links.M. +Require Import core.links.array. + +(* +pub struct Argument<'a> { + ty: ArgumentType<'a>, +} +*) +Module Argument. + Parameter t : Set. + + Parameter to_value : t -> Value.t. + + Global Instance IsLink : Link t := { + Φ := Ty.path "core::fmt::Argument"; + φ := to_value; + }. + + Definition of_ty : OfTy.t (Ty.path "core::fmt::Argument"). + Proof. eapply OfTy.Make with (A := t); reflexivity. Defined. + Smpl Add apply of_ty : of_ty. +End Argument. diff --git a/CoqOfRust/core/fmt/mod.v b/CoqOfRust/core/fmt/mod.v index 716b032d7..32d0811f3 100644 --- a/CoqOfRust/core/fmt/mod.v +++ b/CoqOfRust/core/fmt/mod.v @@ -91,30 +91,21 @@ Module fmt. (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::fmt::Alignment::Left" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Left" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Left" |) |) |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::fmt::Alignment::Right" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Right" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Right" |) |) |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::fmt::Alignment::Center" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Center" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Center" |) |) |) |))) ] |) @@ -285,7 +276,7 @@ Module fmt. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Error" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Error" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3743,7 +3734,7 @@ Module fmt. "core::num::fmt::Formatted", "sign" |), - M.read (| Value.String "" |) + mk_str (| "" |) |) |) in let~ _ : Ty.tuple [] := @@ -8722,12 +8713,7 @@ Module fmt. M.alloc (| Value.StructTuple "core::option::Option::Some" - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) ] |))); fun γ => ltac:(M.monadic @@ -10625,11 +10611,7 @@ Module fmt. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: arg.position < args.len()" - |) - ] + [ mk_str (| "assertion failed: arg.position < args.len()" |) ] |) |) |))); @@ -10777,11 +10759,7 @@ Module fmt. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: i < args.len()" - |) - ] + [ mk_str (| "assertion failed: i < args.len()" |) ] |) |) |))); @@ -11364,9 +11342,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "an error occurred when formatting an argument" |) - |) + M.deref (| mk_str (| "an error occurred when formatting an argument" |) |) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) ] @@ -12208,18 +12184,12 @@ Module fmt. let _ := M.is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "true" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "true" |) |) |) |))); fun γ => ltac:(M.monadic (M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "false" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "false" |) |) |) |))) ] |) @@ -14482,7 +14452,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) ] |) |) in @@ -14899,7 +14869,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) ] |) |) in @@ -15288,7 +15258,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) ] |) |) in @@ -15648,7 +15618,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) ] |) |) in @@ -15980,7 +15950,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) ] |) |) in @@ -16284,7 +16254,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) ] |) |) in @@ -16555,7 +16525,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) ] |) |) in @@ -16798,7 +16768,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) ] |) |) in @@ -17013,7 +16983,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) ] |) |) in @@ -17200,7 +17170,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) ] |) |) in @@ -17359,7 +17329,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) ] |) |) in @@ -17490,7 +17460,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) ] |) |) in @@ -17667,7 +17637,7 @@ Module fmt. M.get_associated_function (| Ty.path "core::fmt::Formatter", "pad", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "()" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "()" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -17719,13 +17689,7 @@ Module fmt. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "PhantomData<" |); - M.read (| Value.String ">" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "PhantomData<" |); mk_str (| ">" |) ] |) |) |) |); @@ -17837,18 +17801,12 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Cell" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Cell" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "value" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "value" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -17921,10 +17879,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RefCell" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "RefCell" |) |) |) ] |) |) in @@ -17973,10 +17928,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, d |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "value" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "value" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, borrow |) |) @@ -18009,10 +17961,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, d |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "value" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "value" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -18034,8 +17983,7 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -18244,10 +18192,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UnsafeCell" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "UnsafeCell" |) |) |) ] |) |) @@ -18307,10 +18252,7 @@ Module fmt. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SyncUnsafeCell" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SyncUnsafeCell" |) |) |) ] |) |) diff --git a/CoqOfRust/core/fmt/num.v b/CoqOfRust/core/fmt/num.v index 8d1399a99..548fb27fa 100644 --- a/CoqOfRust/core/fmt/num.v +++ b/CoqOfRust/core/fmt/num.v @@ -1610,7 +1610,7 @@ Module fmt. (* const PREFIX: &'static str = $prefix; *) (* Ty.apply (Ty.path "&") [] [ Ty.path "str" ] *) - Definition value_PREFIX : Value.t := M.run ltac:(M.monadic (Value.String "0b")). + Definition value_PREFIX : Value.t := M.run ltac:(M.monadic (M.alloc (| mk_str (| "0b" |) |))). (* fn digit(x: u8) -> u8 { @@ -1665,10 +1665,8 @@ Module fmt. M.alloc (| Value.Array [ - M.read (| - Value.String "number not in the range 0..=" - |); - M.read (| Value.String ": " |) + mk_str (| "number not in the range 0..=" |); + mk_str (| ": " |) ] |) |) @@ -1766,7 +1764,7 @@ Module fmt. (* const PREFIX: &'static str = $prefix; *) (* Ty.apply (Ty.path "&") [] [ Ty.path "str" ] *) - Definition value_PREFIX : Value.t := M.run ltac:(M.monadic (Value.String "0o")). + Definition value_PREFIX : Value.t := M.run ltac:(M.monadic (M.alloc (| mk_str (| "0o" |) |))). (* fn digit(x: u8) -> u8 { @@ -1821,10 +1819,8 @@ Module fmt. M.alloc (| Value.Array [ - M.read (| - Value.String "number not in the range 0..=" - |); - M.read (| Value.String ": " |) + mk_str (| "number not in the range 0..=" |); + mk_str (| ": " |) ] |) |) @@ -1922,7 +1918,7 @@ Module fmt. (* const PREFIX: &'static str = $prefix; *) (* Ty.apply (Ty.path "&") [] [ Ty.path "str" ] *) - Definition value_PREFIX : Value.t := M.run ltac:(M.monadic (Value.String "0x")). + Definition value_PREFIX : Value.t := M.run ltac:(M.monadic (M.alloc (| mk_str (| "0x" |) |))). (* fn digit(x: u8) -> u8 { @@ -1986,10 +1982,8 @@ Module fmt. M.alloc (| Value.Array [ - M.read (| - Value.String "number not in the range 0..=" - |); - M.read (| Value.String ": " |) + mk_str (| "number not in the range 0..=" |); + mk_str (| ": " |) ] |) |) @@ -2087,7 +2081,7 @@ Module fmt. (* const PREFIX: &'static str = $prefix; *) (* Ty.apply (Ty.path "&") [] [ Ty.path "str" ] *) - Definition value_PREFIX : Value.t := M.run ltac:(M.monadic (Value.String "0x")). + Definition value_PREFIX : Value.t := M.run ltac:(M.monadic (M.alloc (| mk_str (| "0x" |) |))). (* fn digit(x: u8) -> u8 { @@ -2151,10 +2145,8 @@ Module fmt. M.alloc (| Value.Array [ - M.read (| - Value.String "number not in the range 0..=" - |); - M.read (| Value.String ": " |) + mk_str (| "number not in the range 0..=" |); + mk_str (| ": " |) ] |) |) @@ -7363,7 +7355,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.read (| is_nonnegative |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| buf_slice |) |) |) ] |) @@ -8098,7 +8090,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.read (| is_nonnegative |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| buf_slice |) |) |) ] |) @@ -8833,7 +8825,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.read (| is_nonnegative |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| buf_slice |) |) |) ] |) @@ -9568,7 +9560,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.read (| is_nonnegative |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| buf_slice |) |) |) ] |) @@ -10308,7 +10300,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.read (| is_nonnegative |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| buf_slice |) |) |) ] |) @@ -11708,7 +11700,7 @@ Module fmt. M.read (| γ |), Value.Bool true |) in - Value.String "-")); + M.alloc (| mk_str (| "-" |) |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -11746,13 +11738,13 @@ Module fmt. M.read (| γ |), Value.Bool true |) in - Value.String "+")); + M.alloc (| mk_str (| "+" |) |))); fun γ => ltac:(M.monadic (M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "" |) |) + M.deref (| mk_str (| "" |) |) |) |))) ] @@ -15620,7 +15612,7 @@ Module fmt. M.read (| γ |), Value.Bool true |) in - Value.String "-")); + M.alloc (| mk_str (| "-" |) |))); fun γ => ltac:(M.monadic (M.alloc (| @@ -15658,13 +15650,13 @@ Module fmt. M.read (| γ |), Value.Bool true |) in - Value.String "+")); + M.alloc (| mk_str (| "+" |) |))); fun γ => ltac:(M.monadic (M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "" |) |) + M.deref (| mk_str (| "" |) |) |) |))) ] @@ -16360,7 +16352,7 @@ Module fmt. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: *curr > 19" |) ] + [ mk_str (| "assertion failed: *curr > 19" |) ] |) |) |))); @@ -18100,10 +18092,7 @@ Module fmt. [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.read (| is_nonnegative |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| buf_slice |) |) |) ] |) diff --git a/CoqOfRust/core/future/async_drop.v b/CoqOfRust/core/future/async_drop.v index e12087a5b..778b7eba4 100644 --- a/CoqOfRust/core/future/async_drop.v +++ b/CoqOfRust/core/future/async_drop.v @@ -98,7 +98,7 @@ Module future. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AsyncDropOwning" |) |) + M.deref (| mk_str (| "AsyncDropOwning" |) |) |) ] |) @@ -483,7 +483,7 @@ Module future. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AsyncDropInPlace" |) |) + M.deref (| mk_str (| "AsyncDropInPlace" |) |) |) ] |) diff --git a/CoqOfRust/core/future/join.v b/CoqOfRust/core/future/join.v index 0fc88e0fd..a8d3d1ba5 100644 --- a/CoqOfRust/core/future/join.v +++ b/CoqOfRust/core/future/join.v @@ -113,11 +113,7 @@ Module future. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "internal error: entered unreachable code" - |) - ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |) |))) @@ -382,11 +378,7 @@ Module future. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "internal error: entered unreachable code" - |) - ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |) |))) diff --git a/CoqOfRust/core/future/mod.v b/CoqOfRust/core/future/mod.v index 823057ea3..5a1d6c52c 100644 --- a/CoqOfRust/core/future/mod.v +++ b/CoqOfRust/core/future/mod.v @@ -39,7 +39,7 @@ Module future. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "ResumeTy" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ResumeTy" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/future/pending.v b/CoqOfRust/core/future/pending.v index 4a5d27701..5974ed796 100644 --- a/CoqOfRust/core/future/pending.v +++ b/CoqOfRust/core/future/pending.v @@ -111,10 +111,7 @@ Module future. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Pending" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Pending" |) |) |) ] |) |) diff --git a/CoqOfRust/core/future/poll_fn.v b/CoqOfRust/core/future/poll_fn.v index edbb37dc1..5903a50d9 100644 --- a/CoqOfRust/core/future/poll_fn.v +++ b/CoqOfRust/core/future/poll_fn.v @@ -88,10 +88,7 @@ Module future. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PollFn" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "PollFn" |) |) |) ] |) |) diff --git a/CoqOfRust/core/future/ready.v b/CoqOfRust/core/future/ready.v index d779d758d..976c89e07 100644 --- a/CoqOfRust/core/future/ready.v +++ b/CoqOfRust/core/future/ready.v @@ -35,7 +35,7 @@ Module future. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Ready" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Ready" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -212,7 +212,7 @@ Module future. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "`Ready` polled after completion" |) |) + M.deref (| mk_str (| "`Ready` polled after completion" |) |) |) ] |) @@ -259,9 +259,7 @@ Module future. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Called `into_inner()` on `Ready` after completion" |) - |) + M.deref (| mk_str (| "Called `into_inner()` on `Ready` after completion" |) |) |) ] |))) diff --git a/CoqOfRust/core/hash/mod.v b/CoqOfRust/core/hash/mod.v index e8b2baf3e..407737166 100644 --- a/CoqOfRust/core/hash/mod.v +++ b/CoqOfRust/core/hash/mod.v @@ -1121,7 +1121,7 @@ Module hash. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BuildHasherDefault" |) |) + M.deref (| mk_str (| "BuildHasherDefault" |) |) |) ] |) diff --git a/CoqOfRust/core/hash/sip.v b/CoqOfRust/core/hash/sip.v index 3d14bd859..c9e6a99d9 100644 --- a/CoqOfRust/core/hash/sip.v +++ b/CoqOfRust/core/hash/sip.v @@ -41,11 +41,8 @@ Module hash. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SipHasher13" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "hasher" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SipHasher13" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "hasher" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -219,11 +216,8 @@ Module hash. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SipHasher24" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "hasher" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SipHasher24" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "hasher" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -390,10 +384,7 @@ Module hash. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SipHasher" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SipHasher" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -563,31 +554,13 @@ Module hash. M.alloc (| Value.Array [ - M.read (| Value.String "k0" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "k1" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "length" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "state" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "tail" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ntail" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "_marker" |) |) - |) + mk_str (| "k0" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "k1" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "length" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "state" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "tail" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ntail" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "_marker" |) |) |) ] |) |) @@ -729,10 +702,7 @@ Module hash. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Hasher" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Hasher" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| names |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| values |) |) |) ] @@ -789,8 +759,8 @@ Module hash. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "State" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "v0" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "State" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "v0" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -804,7 +774,7 @@ Module hash. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "v2" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "v2" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -818,7 +788,7 @@ Module hash. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "v1" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "v1" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -832,7 +802,7 @@ Module hash. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "v3" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "v3" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -975,7 +945,7 @@ Module hash. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: len < 8" |) ] + [ mk_str (| "assertion failed: len < 8" |) ] |) |) |))); @@ -1090,9 +1060,8 @@ Module hash. [] |), [ - M.read (| - Value.String - "assertion failed: start + i + mem::size_of::() <= buf.len()" + mk_str (| + "assertion failed: start + i + mem::size_of::() <= buf.len()" |) ] |) @@ -1302,9 +1271,8 @@ Module hash. [] |), [ - M.read (| - Value.String - "assertion failed: start + i + mem::size_of::() <= buf.len()" + mk_str (| + "assertion failed: start + i + mem::size_of::() <= buf.len()" |) ] |) @@ -1508,7 +1476,7 @@ Module hash. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: i == len" |) ] + [ mk_str (| "assertion failed: i == len" |) ] |) |) |))); @@ -2602,9 +2570,8 @@ Module hash. [] |), [ - M.read (| - Value.String - "assertion failed: i + mem::size_of::() <= msg.len()" + mk_str (| + "assertion failed: i + mem::size_of::() <= msg.len()" |) ] |) @@ -3220,10 +3187,7 @@ Module hash. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Sip13Rounds" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Sip13Rounds" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4753,10 +4717,7 @@ Module hash. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Sip24Rounds" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Sip24Rounds" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/core/intrinsics/mod.v b/CoqOfRust/core/intrinsics/mod.v index 4372cc623..0c5ef7ebc 100644 --- a/CoqOfRust/core/intrinsics/mod.v +++ b/CoqOfRust/core/intrinsics/mod.v @@ -35,9 +35,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "from_str_radix_int: must lie in the range `[2, 36]` - found " + mk_str (| + "from_str_radix_int: must lie in the range `[2, 36]` - found " |) ] |) @@ -126,9 +125,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "from_str_radix_int: must lie in the range `[2, 36]`" + mk_str (| + "from_str_radix_int: must lie in the range `[2, 36]`" |) ] |) @@ -199,7 +197,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -232,7 +230,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -265,7 +263,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -296,7 +294,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -329,7 +327,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -362,7 +360,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -393,7 +391,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -426,7 +424,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -459,7 +457,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -490,7 +488,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -521,7 +519,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -548,7 +546,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -579,7 +577,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -610,7 +608,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -637,7 +635,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -672,7 +670,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -709,7 +707,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -746,7 +744,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -783,7 +781,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -820,7 +818,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -857,7 +855,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -894,7 +892,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -931,7 +929,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -968,7 +966,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1005,7 +1003,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1042,7 +1040,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1075,7 +1073,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1112,7 +1110,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1149,7 +1147,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1182,7 +1180,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1209,7 +1207,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1234,7 +1232,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1259,7 +1257,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1284,7 +1282,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1310,7 +1308,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1336,7 +1334,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1362,7 +1360,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1388,7 +1386,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1414,7 +1412,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1440,7 +1438,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1466,7 +1464,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1492,7 +1490,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1518,7 +1516,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1544,7 +1542,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1570,7 +1568,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1596,7 +1594,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1622,7 +1620,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1648,7 +1646,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1674,7 +1672,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1700,7 +1698,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1726,7 +1724,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1752,7 +1750,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1778,7 +1776,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1804,7 +1802,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1830,7 +1828,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1856,7 +1854,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1882,7 +1880,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1908,7 +1906,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1934,7 +1932,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1960,7 +1958,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1986,7 +1984,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2012,7 +2010,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2038,7 +2036,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2064,7 +2062,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2090,7 +2088,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2116,7 +2114,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2142,7 +2140,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2168,7 +2166,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2194,7 +2192,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2220,7 +2218,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2246,7 +2244,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2272,7 +2270,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2298,7 +2296,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2324,7 +2322,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2350,7 +2348,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2376,7 +2374,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2402,7 +2400,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2428,7 +2426,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2454,7 +2452,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2480,7 +2478,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2506,7 +2504,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2532,7 +2530,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2558,7 +2556,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2584,7 +2582,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2610,7 +2608,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2636,7 +2634,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2662,7 +2660,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2688,7 +2686,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2714,7 +2712,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2740,7 +2738,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2766,7 +2764,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2792,7 +2790,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2818,7 +2816,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2842,7 +2840,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2866,7 +2864,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2890,7 +2888,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2914,7 +2912,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2942,7 +2940,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2972,7 +2970,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3002,7 +3000,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3032,7 +3030,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3060,7 +3058,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3086,7 +3084,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3112,7 +3110,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3138,7 +3136,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3162,7 +3160,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3193,7 +3191,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) ] @@ -3218,7 +3216,7 @@ Module intrinsics. (M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3239,7 +3237,7 @@ Module intrinsics. (M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -3441,7 +3439,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3465,7 +3463,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3493,7 +3491,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3519,7 +3517,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3550,7 +3548,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) ] @@ -3576,7 +3574,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3601,7 +3599,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3625,7 +3623,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3651,7 +3649,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3676,7 +3674,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3702,7 +3700,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3733,7 +3731,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3762,7 +3760,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3789,7 +3787,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3814,7 +3812,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3840,7 +3838,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3865,7 +3863,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3891,7 +3889,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3916,7 +3914,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3941,7 +3939,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3966,7 +3964,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -3991,7 +3989,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4017,7 +4015,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4043,7 +4041,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4069,7 +4067,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4095,7 +4093,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4120,7 +4118,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4144,7 +4142,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4168,7 +4166,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4192,7 +4190,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4217,7 +4215,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4241,7 +4239,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4265,7 +4263,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4289,7 +4287,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4315,7 +4313,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4340,7 +4338,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4365,7 +4363,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4390,7 +4388,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4415,7 +4413,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4439,7 +4437,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4463,7 +4461,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4487,7 +4485,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4512,7 +4510,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4537,7 +4535,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4562,7 +4560,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4587,7 +4585,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4612,7 +4610,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4636,7 +4634,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4660,7 +4658,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4684,7 +4682,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4709,7 +4707,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4734,7 +4732,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4759,7 +4757,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4784,7 +4782,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4809,7 +4807,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4834,7 +4832,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4859,7 +4857,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4884,7 +4882,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4911,7 +4909,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4937,7 +4935,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4963,7 +4961,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4989,7 +4987,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5016,7 +5014,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5043,7 +5041,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5070,7 +5068,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5097,7 +5095,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5122,7 +5120,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5147,7 +5145,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5172,7 +5170,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5197,7 +5195,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5222,7 +5220,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5247,7 +5245,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5272,7 +5270,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5297,7 +5295,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5322,7 +5320,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5347,7 +5345,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5372,7 +5370,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5397,7 +5395,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5422,7 +5420,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5447,7 +5445,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5472,7 +5470,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5497,7 +5495,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5522,7 +5520,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5547,7 +5545,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5572,7 +5570,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5597,7 +5595,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5622,7 +5620,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5647,7 +5645,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5672,7 +5670,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5697,7 +5695,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5722,7 +5720,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5747,7 +5745,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5772,7 +5770,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5797,7 +5795,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5823,7 +5821,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5849,7 +5847,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5875,7 +5873,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5901,7 +5899,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5927,7 +5925,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5952,7 +5950,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -5968,370 +5966,871 @@ Module intrinsics. unimplemented!() } *) - Parameter fadd_algebraic : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition fadd_algebraic (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _a; _b ] => + ltac:(M.monadic + (let _a := M.alloc (| _a |) in + let _b := M.alloc (| _b |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_fadd_algebraic : M.IsFunction.Trait "core::intrinsics::fadd_algebraic" fadd_algebraic. Admitted. + Global Typeclasses Opaque fadd_algebraic. (* pub fn fsub_algebraic(_a: T, _b: T) -> T { unimplemented!() } *) - Parameter fsub_algebraic : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition fsub_algebraic (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _a; _b ] => + ltac:(M.monadic + (let _a := M.alloc (| _a |) in + let _b := M.alloc (| _b |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_fsub_algebraic : M.IsFunction.Trait "core::intrinsics::fsub_algebraic" fsub_algebraic. Admitted. + Global Typeclasses Opaque fsub_algebraic. (* pub fn fmul_algebraic(_a: T, _b: T) -> T { unimplemented!() } *) - Parameter fmul_algebraic : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition fmul_algebraic (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _a; _b ] => + ltac:(M.monadic + (let _a := M.alloc (| _a |) in + let _b := M.alloc (| _b |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_fmul_algebraic : M.IsFunction.Trait "core::intrinsics::fmul_algebraic" fmul_algebraic. Admitted. + Global Typeclasses Opaque fmul_algebraic. (* pub fn fdiv_algebraic(_a: T, _b: T) -> T { unimplemented!() } *) - Parameter fdiv_algebraic : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition fdiv_algebraic (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _a; _b ] => + ltac:(M.monadic + (let _a := M.alloc (| _a |) in + let _b := M.alloc (| _b |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_fdiv_algebraic : M.IsFunction.Trait "core::intrinsics::fdiv_algebraic" fdiv_algebraic. Admitted. + Global Typeclasses Opaque fdiv_algebraic. (* pub fn frem_algebraic(_a: T, _b: T) -> T { unimplemented!() } *) - Parameter frem_algebraic : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition frem_algebraic (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _a; _b ] => + ltac:(M.monadic + (let _a := M.alloc (| _a |) in + let _b := M.alloc (| _b |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_frem_algebraic : M.IsFunction.Trait "core::intrinsics::frem_algebraic" frem_algebraic. Admitted. + Global Typeclasses Opaque frem_algebraic. (* pub const fn ctpop(_x: T) -> u32 { unimplemented!() } *) - Parameter ctpop : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition ctpop (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _x ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_ctpop : M.IsFunction.Trait "core::intrinsics::ctpop" ctpop. Admitted. + Global Typeclasses Opaque ctpop. (* pub const fn ctlz(_x: T) -> u32 { unimplemented!() } *) - Parameter ctlz : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition ctlz (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _x ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_ctlz : M.IsFunction.Trait "core::intrinsics::ctlz" ctlz. Admitted. + Global Typeclasses Opaque ctlz. (* pub const unsafe fn ctlz_nonzero(_x: T) -> u32 { unimplemented!() } *) - Parameter ctlz_nonzero : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition ctlz_nonzero (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _x ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_ctlz_nonzero : M.IsFunction.Trait "core::intrinsics::ctlz_nonzero" ctlz_nonzero. Admitted. + Global Typeclasses Opaque ctlz_nonzero. (* pub const fn cttz(_x: T) -> u32 { unimplemented!() } *) - Parameter cttz : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition cttz (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _x ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_cttz : M.IsFunction.Trait "core::intrinsics::cttz" cttz. Admitted. + Global Typeclasses Opaque cttz. (* pub const unsafe fn cttz_nonzero(_x: T) -> u32 { unimplemented!() } *) - Parameter cttz_nonzero : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition cttz_nonzero (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _x ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_cttz_nonzero : M.IsFunction.Trait "core::intrinsics::cttz_nonzero" cttz_nonzero. Admitted. + Global Typeclasses Opaque cttz_nonzero. (* pub const fn bswap(_x: T) -> T { unimplemented!() } *) - Parameter bswap : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition bswap (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _x ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_bswap : M.IsFunction.Trait "core::intrinsics::bswap" bswap. Admitted. + Global Typeclasses Opaque bswap. (* pub const fn bitreverse(_x: T) -> T { unimplemented!() } *) - Parameter bitreverse : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition bitreverse (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _x ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_bitreverse : M.IsFunction.Trait "core::intrinsics::bitreverse" bitreverse. Admitted. + Global Typeclasses Opaque bitreverse. (* pub const fn three_way_compare(_lhs: T, _rhss: T) -> crate::cmp::Ordering { unimplemented!() } *) - Parameter three_way_compare : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition three_way_compare (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _lhs; _rhss ] => + ltac:(M.monadic + (let _lhs := M.alloc (| _lhs |) in + let _rhss := M.alloc (| _rhss |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_three_way_compare : M.IsFunction.Trait "core::intrinsics::three_way_compare" three_way_compare. Admitted. + Global Typeclasses Opaque three_way_compare. (* pub const fn add_with_overflow(_x: T, _y: T) -> (T, bool) { unimplemented!() } *) - Parameter add_with_overflow : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition add_with_overflow (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_add_with_overflow : M.IsFunction.Trait "core::intrinsics::add_with_overflow" add_with_overflow. Admitted. + Global Typeclasses Opaque add_with_overflow. (* pub const fn sub_with_overflow(_x: T, _y: T) -> (T, bool) { unimplemented!() } *) - Parameter sub_with_overflow : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition sub_with_overflow (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_sub_with_overflow : M.IsFunction.Trait "core::intrinsics::sub_with_overflow" sub_with_overflow. Admitted. + Global Typeclasses Opaque sub_with_overflow. (* pub const fn mul_with_overflow(_x: T, _y: T) -> (T, bool) { unimplemented!() } *) - Parameter mul_with_overflow : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition mul_with_overflow (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_mul_with_overflow : M.IsFunction.Trait "core::intrinsics::mul_with_overflow" mul_with_overflow. Admitted. + Global Typeclasses Opaque mul_with_overflow. (* pub const unsafe fn exact_div(_x: T, _y: T) -> T { unimplemented!() } *) - Parameter exact_div : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition exact_div (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_exact_div : M.IsFunction.Trait "core::intrinsics::exact_div" exact_div. Admitted. + Global Typeclasses Opaque exact_div. (* pub const unsafe fn unchecked_div(_x: T, _y: T) -> T { unimplemented!() } *) - Parameter unchecked_div : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition unchecked_div (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_unchecked_div : M.IsFunction.Trait "core::intrinsics::unchecked_div" unchecked_div. Admitted. + Global Typeclasses Opaque unchecked_div. (* pub const unsafe fn unchecked_rem(_x: T, _y: T) -> T { unimplemented!() } *) - Parameter unchecked_rem : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition unchecked_rem (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_unchecked_rem : M.IsFunction.Trait "core::intrinsics::unchecked_rem" unchecked_rem. Admitted. + Global Typeclasses Opaque unchecked_rem. (* pub const unsafe fn unchecked_shl(_x: T, _y: U) -> T { unimplemented!() } *) - Parameter unchecked_shl : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition unchecked_shl (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T; U ], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_unchecked_shl : M.IsFunction.Trait "core::intrinsics::unchecked_shl" unchecked_shl. Admitted. + Global Typeclasses Opaque unchecked_shl. (* pub const unsafe fn unchecked_shr(_x: T, _y: U) -> T { unimplemented!() } *) - Parameter unchecked_shr : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition unchecked_shr (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T; U ], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_unchecked_shr : M.IsFunction.Trait "core::intrinsics::unchecked_shr" unchecked_shr. Admitted. + Global Typeclasses Opaque unchecked_shr. (* pub const unsafe fn unchecked_add(_x: T, _y: T) -> T { unimplemented!() } *) - Parameter unchecked_add : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition unchecked_add (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_unchecked_add : M.IsFunction.Trait "core::intrinsics::unchecked_add" unchecked_add. Admitted. + Global Typeclasses Opaque unchecked_add. (* pub const unsafe fn unchecked_sub(_x: T, _y: T) -> T { unimplemented!() } *) - Parameter unchecked_sub : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. - - Global Instance Instance_IsFunction_unchecked_sub : - M.IsFunction.Trait "core::intrinsics::unchecked_sub" unchecked_sub. + Definition unchecked_sub (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. + + Global Instance Instance_IsFunction_unchecked_sub : + M.IsFunction.Trait "core::intrinsics::unchecked_sub" unchecked_sub. Admitted. + Global Typeclasses Opaque unchecked_sub. (* pub const unsafe fn unchecked_mul(_x: T, _y: T) -> T { unimplemented!() } *) - Parameter unchecked_mul : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition unchecked_mul (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_unchecked_mul : M.IsFunction.Trait "core::intrinsics::unchecked_mul" unchecked_mul. Admitted. + Global Typeclasses Opaque unchecked_mul. (* pub const fn rotate_left(_x: T, _shift: u32) -> T { unimplemented!() } *) - Parameter rotate_left : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition rotate_left (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _x; _shift ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _shift := M.alloc (| _shift |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_rotate_left : M.IsFunction.Trait "core::intrinsics::rotate_left" rotate_left. Admitted. + Global Typeclasses Opaque rotate_left. (* pub const fn rotate_right(_x: T, _shift: u32) -> T { unimplemented!() } *) - Parameter rotate_right : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition rotate_right (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _x; _shift ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _shift := M.alloc (| _shift |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_rotate_right : M.IsFunction.Trait "core::intrinsics::rotate_right" rotate_right. Admitted. + Global Typeclasses Opaque rotate_right. (* pub const fn wrapping_add(_a: T, _b: T) -> T { unimplemented!() } *) - Parameter wrapping_add : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition wrapping_add (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _a; _b ] => + ltac:(M.monadic + (let _a := M.alloc (| _a |) in + let _b := M.alloc (| _b |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_wrapping_add : M.IsFunction.Trait "core::intrinsics::wrapping_add" wrapping_add. Admitted. + Global Typeclasses Opaque wrapping_add. (* pub const fn wrapping_sub(_a: T, _b: T) -> T { unimplemented!() } *) - Parameter wrapping_sub : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition wrapping_sub (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _a; _b ] => + ltac:(M.monadic + (let _a := M.alloc (| _a |) in + let _b := M.alloc (| _b |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_wrapping_sub : M.IsFunction.Trait "core::intrinsics::wrapping_sub" wrapping_sub. Admitted. + Global Typeclasses Opaque wrapping_sub. (* pub const fn wrapping_mul(_a: T, _b: T) -> T { unimplemented!() } *) - Parameter wrapping_mul : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition wrapping_mul (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _a; _b ] => + ltac:(M.monadic + (let _a := M.alloc (| _a |) in + let _b := M.alloc (| _b |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_wrapping_mul : M.IsFunction.Trait "core::intrinsics::wrapping_mul" wrapping_mul. Admitted. + Global Typeclasses Opaque wrapping_mul. (* pub const fn saturating_add(_a: T, _b: T) -> T { unimplemented!() } *) - Parameter saturating_add : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition saturating_add (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _a; _b ] => + ltac:(M.monadic + (let _a := M.alloc (| _a |) in + let _b := M.alloc (| _b |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_saturating_add : M.IsFunction.Trait "core::intrinsics::saturating_add" saturating_add. Admitted. + Global Typeclasses Opaque saturating_add. (* pub const fn saturating_sub(_a: T, _b: T) -> T { unimplemented!() } *) - Parameter saturating_sub : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition saturating_sub (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _a; _b ] => + ltac:(M.monadic + (let _a := M.alloc (| _a |) in + let _b := M.alloc (| _b |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_saturating_sub : M.IsFunction.Trait "core::intrinsics::saturating_sub" saturating_sub. Admitted. + Global Typeclasses Opaque saturating_sub. (* pub const unsafe fn read_via_copy(_ptr: *const T) -> T { unimplemented!() } *) - Parameter read_via_copy : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition read_via_copy (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _ptr ] => + ltac:(M.monadic + (let _ptr := M.alloc (| _ptr |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_read_via_copy : M.IsFunction.Trait "core::intrinsics::read_via_copy" read_via_copy. Admitted. + Global Typeclasses Opaque read_via_copy. (* pub const unsafe fn write_via_move(_ptr: *mut T, _value: T) { unimplemented!() } *) - Parameter write_via_move : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition write_via_move (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _ptr; _value ] => + ltac:(M.monadic + (let _ptr := M.alloc (| _ptr |) in + let _value := M.alloc (| _value |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_write_via_move : M.IsFunction.Trait "core::intrinsics::write_via_move" write_via_move. Admitted. + Global Typeclasses Opaque write_via_move. (* pub const fn discriminant_value(_v: &T) -> ::Discriminant { unimplemented!() } *) - Parameter discriminant_value : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition discriminant_value (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _v ] => + ltac:(M.monadic + (let _v := M.alloc (| _v |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_discriminant_value : M.IsFunction.Trait "core::intrinsics::discriminant_value" discriminant_value. Admitted. + Global Typeclasses Opaque discriminant_value. Parameter catch_unwind : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. @@ -6350,22 +6849,52 @@ Module intrinsics. unimplemented!() } *) - Parameter ptr_offset_from : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition ptr_offset_from (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _ptr; _base ] => + ltac:(M.monadic + (let _ptr := M.alloc (| _ptr |) in + let _base := M.alloc (| _base |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_ptr_offset_from : M.IsFunction.Trait "core::intrinsics::ptr_offset_from" ptr_offset_from. Admitted. + Global Typeclasses Opaque ptr_offset_from. (* pub const unsafe fn ptr_offset_from_unsigned(_ptr: *const T, _base: *const T) -> usize { unimplemented!() } *) - Parameter ptr_offset_from_unsigned : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition ptr_offset_from_unsigned (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _ptr; _base ] => + ltac:(M.monadic + (let _ptr := M.alloc (| _ptr |) in + let _base := M.alloc (| _base |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_ptr_offset_from_unsigned : M.IsFunction.Trait "core::intrinsics::ptr_offset_from_unsigned" ptr_offset_from_unsigned. Admitted. + Global Typeclasses Opaque ptr_offset_from_unsigned. (* pub const fn ptr_guaranteed_cmp(ptr: *const T, other: *const T) -> u8 { @@ -6392,32 +6921,77 @@ Module intrinsics. unimplemented!() } *) - Parameter raw_eq : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition raw_eq (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _a; _b ] => + ltac:(M.monadic + (let _a := M.alloc (| _a |) in + let _b := M.alloc (| _b |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_raw_eq : M.IsFunction.Trait "core::intrinsics::raw_eq" raw_eq. Admitted. + Global Typeclasses Opaque raw_eq. (* pub const unsafe fn compare_bytes(_left: *const u8, _right: *const u8, _bytes: usize) -> i32 { unimplemented!() } *) - Parameter compare_bytes : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition compare_bytes (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _left; _right; _bytes ] => + ltac:(M.monadic + (let _left := M.alloc (| _left |) in + let _right := M.alloc (| _right |) in + let _bytes := M.alloc (| _bytes |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_compare_bytes : M.IsFunction.Trait "core::intrinsics::compare_bytes" compare_bytes. Admitted. + Global Typeclasses Opaque compare_bytes. (* pub const fn black_box(_dummy: T) -> T { unimplemented!() } *) - Parameter black_box : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition black_box (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [ _dummy ] => + ltac:(M.monadic + (let _dummy := M.alloc (| _dummy |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_black_box : M.IsFunction.Trait "core::intrinsics::black_box" black_box. Admitted. + Global Typeclasses Opaque black_box. (* pub const fn const_eval_select( @@ -6443,7 +7017,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6582,7 +7156,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6607,7 +7181,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6631,7 +7205,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6655,7 +7229,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6679,7 +7253,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6703,7 +7277,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6728,7 +7302,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6753,7 +7327,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6777,7 +7351,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6801,7 +7375,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6829,7 +7403,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6893,7 +7467,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7033,7 +7607,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7164,7 +7738,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7292,7 +7866,7 @@ Module intrinsics. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7309,176 +7883,412 @@ Module intrinsics. unimplemented!(); } *) - Parameter minnumf16 : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition minnumf16 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_minnumf16 : M.IsFunction.Trait "core::intrinsics::minnumf16" minnumf16. Admitted. + Global Typeclasses Opaque minnumf16. (* pub const fn minnumf32(_x: f32, _y: f32) -> f32 { unimplemented!(); } *) - Parameter minnumf32 : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition minnumf32 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_minnumf32 : M.IsFunction.Trait "core::intrinsics::minnumf32" minnumf32. Admitted. + Global Typeclasses Opaque minnumf32. (* pub const fn minnumf64(_x: f64, _y: f64) -> f64 { unimplemented!(); } *) - Parameter minnumf64 : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition minnumf64 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_minnumf64 : M.IsFunction.Trait "core::intrinsics::minnumf64" minnumf64. Admitted. + Global Typeclasses Opaque minnumf64. (* pub const fn minnumf128(_x: f128, _y: f128) -> f128 { unimplemented!(); } *) - Parameter minnumf128 : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition minnumf128 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_minnumf128 : M.IsFunction.Trait "core::intrinsics::minnumf128" minnumf128. Admitted. + Global Typeclasses Opaque minnumf128. (* pub const fn maxnumf16(_x: f16, _y: f16) -> f16 { unimplemented!(); } *) - Parameter maxnumf16 : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition maxnumf16 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_maxnumf16 : M.IsFunction.Trait "core::intrinsics::maxnumf16" maxnumf16. Admitted. + Global Typeclasses Opaque maxnumf16. (* pub const fn maxnumf32(_x: f32, _y: f32) -> f32 { unimplemented!(); } *) - Parameter maxnumf32 : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition maxnumf32 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_maxnumf32 : M.IsFunction.Trait "core::intrinsics::maxnumf32" maxnumf32. Admitted. + Global Typeclasses Opaque maxnumf32. (* pub const fn maxnumf64(_x: f64, _y: f64) -> f64 { unimplemented!(); } *) - Parameter maxnumf64 : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition maxnumf64 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_maxnumf64 : M.IsFunction.Trait "core::intrinsics::maxnumf64" maxnumf64. Admitted. + Global Typeclasses Opaque maxnumf64. (* pub const fn maxnumf128(_x: f128, _y: f128) -> f128 { unimplemented!(); } *) - Parameter maxnumf128 : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition maxnumf128 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_maxnumf128 : M.IsFunction.Trait "core::intrinsics::maxnumf128" maxnumf128. Admitted. + Global Typeclasses Opaque maxnumf128. (* pub const unsafe fn fabsf16(_x: f16) -> f16 { unimplemented!(); } *) - Parameter fabsf16 : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition fabsf16 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _x ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_fabsf16 : M.IsFunction.Trait "core::intrinsics::fabsf16" fabsf16. Admitted. + Global Typeclasses Opaque fabsf16. (* pub const unsafe fn fabsf32(_x: f32) -> f32 { unimplemented!(); } *) - Parameter fabsf32 : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition fabsf32 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _x ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_fabsf32 : M.IsFunction.Trait "core::intrinsics::fabsf32" fabsf32. Admitted. + Global Typeclasses Opaque fabsf32. (* pub const unsafe fn fabsf64(_x: f64) -> f64 { unimplemented!(); } *) - Parameter fabsf64 : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition fabsf64 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _x ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_fabsf64 : M.IsFunction.Trait "core::intrinsics::fabsf64" fabsf64. Admitted. + Global Typeclasses Opaque fabsf64. (* pub const unsafe fn fabsf128(_x: f128) -> f128 { unimplemented!(); } *) - Parameter fabsf128 : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition fabsf128 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _x ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_fabsf128 : M.IsFunction.Trait "core::intrinsics::fabsf128" fabsf128. Admitted. + Global Typeclasses Opaque fabsf128. (* pub const unsafe fn copysignf16(_x: f16, _y: f16) -> f16 { unimplemented!(); } *) - Parameter copysignf16 : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition copysignf16 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_copysignf16 : M.IsFunction.Trait "core::intrinsics::copysignf16" copysignf16. Admitted. + Global Typeclasses Opaque copysignf16. (* pub const unsafe fn copysignf32(_x: f32, _y: f32) -> f32 { unimplemented!(); } *) - Parameter copysignf32 : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition copysignf32 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_copysignf32 : M.IsFunction.Trait "core::intrinsics::copysignf32" copysignf32. Admitted. + Global Typeclasses Opaque copysignf32. (* pub const unsafe fn copysignf64(_x: f64, _y: f64) -> f64 { unimplemented!(); } *) - Parameter copysignf64 : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition copysignf64 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_copysignf64 : M.IsFunction.Trait "core::intrinsics::copysignf64" copysignf64. Admitted. + Global Typeclasses Opaque copysignf64. (* pub const unsafe fn copysignf128(_x: f128, _y: f128) -> f128 { unimplemented!(); } *) - Parameter copysignf128 : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition copysignf128 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _x; _y ] => + ltac:(M.monadic + (let _x := M.alloc (| _x |) in + let _y := M.alloc (| _y |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_copysignf128 : M.IsFunction.Trait "core::intrinsics::copysignf128" copysignf128. Admitted. + Global Typeclasses Opaque copysignf128. End intrinsics. Module ub_checks. @@ -7811,9 +8621,9 @@ Module char. M.alloc (| Value.Array [ - M.read (| Value.String "encode_utf8: need " |); - M.read (| Value.String " bytes to encode U+" |); - M.read (| Value.String " but buffer has just " |) + mk_str (| "encode_utf8: need " |); + mk_str (| " bytes to encode U+" |); + mk_str (| " but buffer has just " |) ] |) |) @@ -8025,9 +8835,8 @@ Module char. M.alloc (| Value.Array [ - M.read (| - Value.String - "encode_utf8: buffer does not have enough bytes to encode code point" + mk_str (| + "encode_utf8: buffer does not have enough bytes to encode code point" |) ] |) @@ -8093,9 +8902,9 @@ Module char. M.alloc (| Value.Array [ - M.read (| Value.String "encode_utf16: need " |); - M.read (| Value.String " bytes to encode U+" |); - M.read (| Value.String " but buffer has just " |) + mk_str (| "encode_utf16: need " |); + mk_str (| " bytes to encode U+" |); + mk_str (| " but buffer has just " |) ] |) |) @@ -8307,9 +9116,8 @@ Module char. M.alloc (| Value.Array [ - M.read (| - Value.String - "encode_utf16: buffer does not have enough bytes to encode code point" + mk_str (| + "encode_utf16: buffer does not have enough bytes to encode code point" |) ] |) @@ -9358,9 +10166,8 @@ Module slice. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: offset_to_aligned <= len" + mk_str (| + "assertion failed: offset_to_aligned <= len" |) ] |) @@ -9447,9 +10254,8 @@ Module slice. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: word_ptr.is_aligned_to(mem::align_of::())" + mk_str (| + "assertion failed: word_ptr.is_aligned_to(mem::align_of::())" |) ] |) @@ -9542,9 +10348,8 @@ Module slice. [] |), [ - M.read (| - Value.String - "assertion failed: byte_pos + USIZE_SIZE <= len" + mk_str (| + "assertion failed: byte_pos + USIZE_SIZE <= len" |) ] |) @@ -9636,9 +10441,8 @@ Module slice. [] |), [ - M.read (| - Value.String - "assertion failed: word_ptr.cast::() == start.wrapping_add(byte_pos)" + mk_str (| + "assertion failed: word_ptr.cast::() == start.wrapping_add(byte_pos)" |) ] |) @@ -9796,9 +10600,8 @@ Module slice. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: byte_pos <= len && len - byte_pos <= USIZE_SIZE" + mk_str (| + "assertion failed: byte_pos <= len && len - byte_pos <= USIZE_SIZE" |) ] |) @@ -9940,8 +10743,8 @@ Module slice. M.alloc (| Value.Array [ - M.read (| Value.String "range start index " |); - M.read (| Value.String " out of range for slice of length " |) + mk_str (| "range start index " |); + mk_str (| " out of range for slice of length " |) ] |) |) @@ -10053,9 +10856,8 @@ Module slice. M.alloc (| Value.Array [ - M.read (| - Value.String - "slice start index is out of range for slice" + mk_str (| + "slice start index is out of range for slice" |) ] |) @@ -10118,8 +10920,8 @@ Module slice. M.alloc (| Value.Array [ - M.read (| Value.String "range end index " |); - M.read (| Value.String " out of range for slice of length " |) + mk_str (| "range end index " |); + mk_str (| " out of range for slice of length " |) ] |) |) @@ -10231,9 +11033,8 @@ Module slice. M.alloc (| Value.Array [ - M.read (| - Value.String - "slice end index is out of range for slice" + mk_str (| + "slice end index is out of range for slice" |) ] |) @@ -10296,8 +11097,8 @@ Module slice. M.alloc (| Value.Array [ - M.read (| Value.String "slice index starts at " |); - M.read (| Value.String " but ends at " |) + mk_str (| "slice index starts at " |); + mk_str (| " but ends at " |) ] |) |) @@ -10409,9 +11210,8 @@ Module slice. M.alloc (| Value.Array [ - M.read (| - Value.String - "slice index start is larger than end" + mk_str (| + "slice index start is larger than end" |) ] |) diff --git a/CoqOfRust/core/io/borrowed_buf.v b/CoqOfRust/core/io/borrowed_buf.v index e87d41795..70f13c0d5 100644 --- a/CoqOfRust/core/io/borrowed_buf.v +++ b/CoqOfRust/core/io/borrowed_buf.v @@ -116,9 +116,7 @@ Module io. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "BorrowedBuf" |) - |) + M.deref (| mk_str (| "BorrowedBuf" |) |) |) ] |) @@ -126,7 +124,7 @@ Module io. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "init" |) |) + M.deref (| mk_str (| "init" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -147,7 +145,7 @@ Module io. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "filled" |) |) + M.deref (| mk_str (| "filled" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -166,10 +164,7 @@ Module io. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "capacity" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "capacity" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1195,11 +1190,8 @@ Module io. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BorrowedCursor" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "buf" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BorrowedCursor" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "buf" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1213,7 +1205,7 @@ Module io. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "start" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "start" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2048,11 +2040,7 @@ Module io. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: filled <= self.buf.init" - |) - ] + [ mk_str (| "assertion failed: filled <= self.buf.init" |) ] |) |) |))); @@ -2536,11 +2524,7 @@ Module io. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.capacity() >= buf.len()" - |) - ] + [ mk_str (| "assertion failed: self.capacity() >= buf.len()" |) ] |) |) |))); diff --git a/CoqOfRust/core/iter/adapters/array_chunks.v b/CoqOfRust/core/iter/adapters/array_chunks.v index af8c9ccb1..1d114c318 100644 --- a/CoqOfRust/core/iter/adapters/array_chunks.v +++ b/CoqOfRust/core/iter/adapters/array_chunks.v @@ -63,11 +63,8 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ArrayChunks" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ArrayChunks" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -81,10 +78,7 @@ Module iter. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "remainder" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "remainder" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -296,11 +290,7 @@ Module iter. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "chunk size must be non-zero" - |) - ] + [ mk_str (| "chunk size must be non-zero" |) ] |) |) |) diff --git a/CoqOfRust/core/iter/adapters/by_ref_sized.v b/CoqOfRust/core/iter/adapters/by_ref_sized.v index 7ed1c4695..9ad3c5dd3 100644 --- a/CoqOfRust/core/iter/adapters/by_ref_sized.v +++ b/CoqOfRust/core/iter/adapters/by_ref_sized.v @@ -37,10 +37,7 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ByRefSized" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ByRefSized" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/chain.v b/CoqOfRust/core/iter/adapters/chain.v index 5786c5333..41b1840c4 100644 --- a/CoqOfRust/core/iter/adapters/chain.v +++ b/CoqOfRust/core/iter/adapters/chain.v @@ -125,8 +125,8 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Chain" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "a" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Chain" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "a" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -140,7 +140,7 @@ Module iter. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "b" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "b" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/cloned.v b/CoqOfRust/core/iter/adapters/cloned.v index 5cfc2ebe3..0efd40530 100644 --- a/CoqOfRust/core/iter/adapters/cloned.v +++ b/CoqOfRust/core/iter/adapters/cloned.v @@ -85,8 +85,8 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Cloned" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "it" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Cloned" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "it" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/copied.v b/CoqOfRust/core/iter/adapters/copied.v index c0ae34d27..ca19e883d 100644 --- a/CoqOfRust/core/iter/adapters/copied.v +++ b/CoqOfRust/core/iter/adapters/copied.v @@ -85,8 +85,8 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Copied" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "it" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Copied" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "it" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/cycle.v b/CoqOfRust/core/iter/adapters/cycle.v index f249c3ae4..9ca38f982 100644 --- a/CoqOfRust/core/iter/adapters/cycle.v +++ b/CoqOfRust/core/iter/adapters/cycle.v @@ -105,8 +105,8 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Cycle" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "orig" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Cycle" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "orig" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -120,7 +120,7 @@ Module iter. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/enumerate.v b/CoqOfRust/core/iter/adapters/enumerate.v index 98a3e0b76..1a722c970 100644 --- a/CoqOfRust/core/iter/adapters/enumerate.v +++ b/CoqOfRust/core/iter/adapters/enumerate.v @@ -113,11 +113,8 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Enumerate" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Enumerate" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -131,7 +128,7 @@ Module iter. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "count" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "count" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/filter.v b/CoqOfRust/core/iter/adapters/filter.v index 65e5a1f1e..dd2ae016f 100644 --- a/CoqOfRust/core/iter/adapters/filter.v +++ b/CoqOfRust/core/iter/adapters/filter.v @@ -663,16 +663,13 @@ Module iter. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Filter" |) |) + M.deref (| mk_str (| "Filter" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "iter" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/filter_map.v b/CoqOfRust/core/iter/adapters/filter_map.v index 552f969b9..f2901b0fb 100644 --- a/CoqOfRust/core/iter/adapters/filter_map.v +++ b/CoqOfRust/core/iter/adapters/filter_map.v @@ -164,16 +164,13 @@ Module iter. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FilterMap" |) |) + M.deref (| mk_str (| "FilterMap" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "iter" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/flatten.v b/CoqOfRust/core/iter/adapters/flatten.v index 18f80b7da..77009ac35 100644 --- a/CoqOfRust/core/iter/adapters/flatten.v +++ b/CoqOfRust/core/iter/adapters/flatten.v @@ -343,16 +343,13 @@ Module iter. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FlatMap" |) |) + M.deref (| mk_str (| "FlatMap" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "inner" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1680,16 +1677,13 @@ Module iter. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Flatten" |) |) + M.deref (| mk_str (| "Flatten" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "inner" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2675,11 +2669,8 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FlattenCompat" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FlattenCompat" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2693,10 +2684,7 @@ Module iter. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "frontiter" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "frontiter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2710,10 +2698,7 @@ Module iter. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "backiter" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "backiter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/fuse.v b/CoqOfRust/core/iter/adapters/fuse.v index d14390022..aea80de46 100644 --- a/CoqOfRust/core/iter/adapters/fuse.v +++ b/CoqOfRust/core/iter/adapters/fuse.v @@ -93,8 +93,8 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Fuse" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Fuse" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/inspect.v b/CoqOfRust/core/iter/adapters/inspect.v index 92d890bb4..6d7187fb7 100644 --- a/CoqOfRust/core/iter/adapters/inspect.v +++ b/CoqOfRust/core/iter/adapters/inspect.v @@ -258,16 +258,13 @@ Module iter. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Inspect" |) |) + M.deref (| mk_str (| "Inspect" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "iter" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/intersperse.v b/CoqOfRust/core/iter/adapters/intersperse.v index 69f85db9c..9b9a28633 100644 --- a/CoqOfRust/core/iter/adapters/intersperse.v +++ b/CoqOfRust/core/iter/adapters/intersperse.v @@ -49,14 +49,8 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Intersperse" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "started" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Intersperse" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "started" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -70,10 +64,7 @@ Module iter. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "separator" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "separator" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -87,10 +78,7 @@ Module iter. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "next_item" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "next_item" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -104,7 +92,7 @@ Module iter. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1080,9 +1068,7 @@ Module iter. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "IntersperseWith" - |) + mk_str (| "IntersperseWith" |) |) |) ] @@ -1091,9 +1077,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "started" |) - |) + M.deref (| mk_str (| "started" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -1114,7 +1098,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "separator" |) |) + M.deref (| mk_str (| "separator" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -1135,7 +1119,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "iter" |) |) + M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -1154,10 +1138,7 @@ Module iter. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "next_item" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "next_item" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/map.v b/CoqOfRust/core/iter/adapters/map.v index 84130c3ef..9c21dbb6d 100644 --- a/CoqOfRust/core/iter/adapters/map.v +++ b/CoqOfRust/core/iter/adapters/map.v @@ -194,18 +194,12 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Map" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Map" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "iter" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/map_while.v b/CoqOfRust/core/iter/adapters/map_while.v index f2554e81c..40a45d9c0 100644 --- a/CoqOfRust/core/iter/adapters/map_while.v +++ b/CoqOfRust/core/iter/adapters/map_while.v @@ -164,16 +164,13 @@ Module iter. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MapWhile" |) |) + M.deref (| mk_str (| "MapWhile" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "iter" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/map_windows.v b/CoqOfRust/core/iter/adapters/map_windows.v index 0ee4146c4..f023c294a 100644 --- a/CoqOfRust/core/iter/adapters/map_windows.v +++ b/CoqOfRust/core/iter/adapters/map_windows.v @@ -143,9 +143,8 @@ Module iter. M.alloc (| Value.Array [ - M.read (| - Value.String - "array in `Iterator::map_windows` must contain more than 0 elements" + mk_str (| + "array in `Iterator::map_windows` must contain more than 0 elements" |) ] |) @@ -272,9 +271,8 @@ Module iter. M.alloc (| Value.Array [ - M.read (| - Value.String - "array size of `Iterator::map_windows` is too large" + mk_str (| + "array size of `Iterator::map_windows` is too large" |) ] |) @@ -1706,11 +1704,7 @@ Module iter. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "assertion failed: self.start + N <= 2 * N" - |) + [ mk_str (| "assertion failed: self.start + N <= 2 * N" |) ] |) |) @@ -1905,9 +1899,8 @@ Module iter. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.start + N <= 2 * N" + mk_str (| + "assertion failed: self.start + N <= 2 * N" |) ] |) @@ -2188,11 +2181,7 @@ Module iter. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "assertion failed: self.start + N <= 2 * N" - |) + [ mk_str (| "assertion failed: self.start + N <= 2 * N" |) ] |) |) @@ -3423,16 +3412,13 @@ Module iter. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MapWindows" |) |) + M.deref (| mk_str (| "MapWindows" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "iter" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/peekable.v b/CoqOfRust/core/iter/adapters/peekable.v index cb9225369..d075dab7e 100644 --- a/CoqOfRust/core/iter/adapters/peekable.v +++ b/CoqOfRust/core/iter/adapters/peekable.v @@ -163,11 +163,8 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Peekable" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Peekable" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -181,7 +178,7 @@ Module iter. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "peeked" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "peeked" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -812,11 +809,7 @@ Module iter. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.peeked.is_none()" - |) - ] + [ mk_str (| "assertion failed: self.peeked.is_none()" |) ] |) |) |))); diff --git a/CoqOfRust/core/iter/adapters/rev.v b/CoqOfRust/core/iter/adapters/rev.v index 0f587ed27..6e11739c8 100644 --- a/CoqOfRust/core/iter/adapters/rev.v +++ b/CoqOfRust/core/iter/adapters/rev.v @@ -85,8 +85,8 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Rev" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Rev" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/scan.v b/CoqOfRust/core/iter/adapters/scan.v index eb9f5b334..d83bbb838 100644 --- a/CoqOfRust/core/iter/adapters/scan.v +++ b/CoqOfRust/core/iter/adapters/scan.v @@ -209,7 +209,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Scan" |) |) + M.deref (| mk_str (| "Scan" |) |) |) ] |) @@ -217,7 +217,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "iter" |) |) + M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -236,10 +236,7 @@ Module iter. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "state" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "state" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/skip.v b/CoqOfRust/core/iter/adapters/skip.v index da48ebca1..5a1be51db 100644 --- a/CoqOfRust/core/iter/adapters/skip.v +++ b/CoqOfRust/core/iter/adapters/skip.v @@ -113,8 +113,8 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Skip" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Skip" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -128,7 +128,7 @@ Module iter. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "n" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "n" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2931,9 +2931,8 @@ Module iter. M.alloc (| Value.Array [ - M.read (| - Value.String - "ExactSizeIterator contract violation" + mk_str (| + "ExactSizeIterator contract violation" |) ] |) diff --git a/CoqOfRust/core/iter/adapters/skip_while.v b/CoqOfRust/core/iter/adapters/skip_while.v index f6a8a4777..d2c3b61a4 100644 --- a/CoqOfRust/core/iter/adapters/skip_while.v +++ b/CoqOfRust/core/iter/adapters/skip_while.v @@ -214,7 +214,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SkipWhile" |) |) + M.deref (| mk_str (| "SkipWhile" |) |) |) ] |) @@ -222,7 +222,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "iter" |) |) + M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -241,10 +241,7 @@ Module iter. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "flag" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "flag" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/step_by.v b/CoqOfRust/core/iter/adapters/step_by.v index a0acdc24f..e595d55a1 100644 --- a/CoqOfRust/core/iter/adapters/step_by.v +++ b/CoqOfRust/core/iter/adapters/step_by.v @@ -142,8 +142,8 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "StepBy" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "StepBy" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -157,10 +157,7 @@ Module iter. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "step_minus_one" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "step_minus_one" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -174,10 +171,7 @@ Module iter. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "first_take" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "first_take" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -254,7 +248,7 @@ Module iter. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: step != 0" |) ] + [ mk_str (| "assertion failed: step != 0" |) ] |) |) |))); diff --git a/CoqOfRust/core/iter/adapters/take.v b/CoqOfRust/core/iter/adapters/take.v index e19cafbf5..1d5269969 100644 --- a/CoqOfRust/core/iter/adapters/take.v +++ b/CoqOfRust/core/iter/adapters/take.v @@ -113,8 +113,8 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Take" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Take" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -128,7 +128,7 @@ Module iter. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "n" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "n" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/take_while.v b/CoqOfRust/core/iter/adapters/take_while.v index 62f93e463..e8e59f3d3 100644 --- a/CoqOfRust/core/iter/adapters/take_while.v +++ b/CoqOfRust/core/iter/adapters/take_while.v @@ -214,7 +214,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TakeWhile" |) |) + M.deref (| mk_str (| "TakeWhile" |) |) |) ] |) @@ -222,7 +222,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "iter" |) |) + M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -241,10 +241,7 @@ Module iter. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "flag" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "flag" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/adapters/zip.v b/CoqOfRust/core/iter/adapters/zip.v index 14ac370ab..fa3bc9282 100644 --- a/CoqOfRust/core/iter/adapters/zip.v +++ b/CoqOfRust/core/iter/adapters/zip.v @@ -1821,8 +1821,7 @@ Module iter. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) - ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |) |))) @@ -2111,9 +2110,8 @@ Module iter. M.alloc (| Value.Array [ - M.read (| - Value.String - "internal error: entered unreachable code: Always specialized" + mk_str (| + "internal error: entered unreachable code: Always specialized" |) ] |) @@ -3221,8 +3219,7 @@ Module iter. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "internal error: entered unreachable code" |) - ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |) |))) @@ -5743,16 +5740,13 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Zip" |) |) + M.deref (| mk_str (| "Zip" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "a" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "a" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5770,10 +5764,7 @@ Module iter. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "b" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "b" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5849,10 +5840,7 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Zip" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Zip" |) |) |) ] |) |) @@ -6002,9 +5990,8 @@ Module iter. M.alloc (| Value.Array [ - M.read (| - Value.String - "Should only be called on TrustedRandomAccess iterators" + mk_str (| + "Should only be called on TrustedRandomAccess iterators" |) ] |) diff --git a/CoqOfRust/core/iter/range.v b/CoqOfRust/core/iter/range.v index c11dacbf7..dd8699ce2 100644 --- a/CoqOfRust/core/iter/range.v +++ b/CoqOfRust/core/iter/range.v @@ -227,7 +227,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "overflow in `Step::forward`" |) |) + M.deref (| mk_str (| "overflow in `Step::forward`" |) |) |) ] |))) @@ -286,7 +286,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "overflow in `Step::backward`" |) |) + M.deref (| mk_str (| "overflow in `Step::backward`" |) |) |) ] |))) @@ -8541,9 +8541,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "`Step` invariants not upheld" |) - |) + M.deref (| mk_str (| "`Step` invariants not upheld" |) |) |) ] |) @@ -8757,10 +8755,7 @@ Module iter. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "`Step` invariants not upheld" - |) + mk_str (| "`Step` invariants not upheld" |) |) |) ] @@ -8977,7 +8972,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "`Step` invariants not upheld" |) |) + M.deref (| mk_str (| "`Step` invariants not upheld" |) |) |) ] |) @@ -9161,9 +9156,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "`Step` invariants not upheld" |) - |) + M.deref (| mk_str (| "`Step` invariants not upheld" |) |) |) ] |) @@ -9372,10 +9365,7 @@ Module iter. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "`Step` invariants not upheld" - |) + mk_str (| "`Step` invariants not upheld" |) |) |) ] @@ -9615,7 +9605,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "`Step` invariants not upheld" |) |) + M.deref (| mk_str (| "`Step` invariants not upheld" |) |) |) ] |) @@ -10971,7 +10961,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "count overflowed usize" |) |) + M.deref (| mk_str (| "count overflowed usize" |) |) |) ] |) @@ -12220,9 +12210,7 @@ Module iter. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "`Step` invariants not upheld" - |) + mk_str (| "`Step` invariants not upheld" |) |) |) ] @@ -12497,9 +12485,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "`Step` invariants not upheld" |) - |) + M.deref (| mk_str (| "`Step` invariants not upheld" |) |) |) ] |) @@ -13026,9 +13012,7 @@ Module iter. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "`Step` invariants not upheld" - |) + mk_str (| "`Step` invariants not upheld" |) |) |) ] @@ -13303,9 +13287,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "`Step` invariants not upheld" |) - |) + M.deref (| mk_str (| "`Step` invariants not upheld" |) |) |) ] |) @@ -15508,7 +15490,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "count overflowed usize" |) |) + M.deref (| mk_str (| "count overflowed usize" |) |) |) ] |) diff --git a/CoqOfRust/core/iter/sources/empty.v b/CoqOfRust/core/iter/sources/empty.v index b11697177..5f8ea6086 100644 --- a/CoqOfRust/core/iter/sources/empty.v +++ b/CoqOfRust/core/iter/sources/empty.v @@ -73,10 +73,7 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Empty" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Empty" |) |) |) ] |) |) diff --git a/CoqOfRust/core/iter/sources/from_coroutine.v b/CoqOfRust/core/iter/sources/from_coroutine.v index 72377a5ae..3b93e9baa 100644 --- a/CoqOfRust/core/iter/sources/from_coroutine.v +++ b/CoqOfRust/core/iter/sources/from_coroutine.v @@ -251,7 +251,7 @@ Module iter. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FromCoroutine" |) |) + M.deref (| mk_str (| "FromCoroutine" |) |) |) ] |) diff --git a/CoqOfRust/core/iter/sources/from_fn.v b/CoqOfRust/core/iter/sources/from_fn.v index 2d6d8b9a3..7607c98cc 100644 --- a/CoqOfRust/core/iter/sources/from_fn.v +++ b/CoqOfRust/core/iter/sources/from_fn.v @@ -177,10 +177,7 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FromFn" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FromFn" |) |) |) ] |) |) diff --git a/CoqOfRust/core/iter/sources/once.v b/CoqOfRust/core/iter/sources/once.v index d011a61f2..0f95809c8 100644 --- a/CoqOfRust/core/iter/sources/once.v +++ b/CoqOfRust/core/iter/sources/once.v @@ -129,8 +129,8 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Once" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "inner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Once" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/sources/once_with.v b/CoqOfRust/core/iter/sources/once_with.v index e84673b00..4021a67d7 100644 --- a/CoqOfRust/core/iter/sources/once_with.v +++ b/CoqOfRust/core/iter/sources/once_with.v @@ -161,7 +161,7 @@ Module iter. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OnceWith(Some(_))" |) |) + M.deref (| mk_str (| "OnceWith(Some(_))" |) |) |) ] |) @@ -184,7 +184,7 @@ Module iter. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OnceWith(None)" |) |) + M.deref (| mk_str (| "OnceWith(None)" |) |) |) ] |) diff --git a/CoqOfRust/core/iter/sources/repeat.v b/CoqOfRust/core/iter/sources/repeat.v index 3186e5160..7793cc0a6 100644 --- a/CoqOfRust/core/iter/sources/repeat.v +++ b/CoqOfRust/core/iter/sources/repeat.v @@ -106,11 +106,8 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Repeat" |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "element" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Repeat" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "element" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/sources/repeat_n.v b/CoqOfRust/core/iter/sources/repeat_n.v index 0d930c623..25608b58c 100644 --- a/CoqOfRust/core/iter/sources/repeat_n.v +++ b/CoqOfRust/core/iter/sources/repeat_n.v @@ -511,7 +511,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RepeatN" |) |) + M.deref (| mk_str (| "RepeatN" |) |) |) ] |) @@ -519,7 +519,7 @@ Module iter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "count" |) |) + M.deref (| mk_str (| "count" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -538,10 +538,7 @@ Module iter. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "element" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "element" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/sources/repeat_with.v b/CoqOfRust/core/iter/sources/repeat_with.v index bfd06d848..7d105442c 100644 --- a/CoqOfRust/core/iter/sources/repeat_with.v +++ b/CoqOfRust/core/iter/sources/repeat_with.v @@ -136,10 +136,7 @@ Module iter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RepeatWith" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "RepeatWith" |) |) |) ] |) |) diff --git a/CoqOfRust/core/iter/sources/successors.v b/CoqOfRust/core/iter/sources/successors.v index 681a28d92..9bf3d5527 100644 --- a/CoqOfRust/core/iter/sources/successors.v +++ b/CoqOfRust/core/iter/sources/successors.v @@ -444,16 +444,13 @@ Module iter. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Successors" |) |) + M.deref (| mk_str (| "Successors" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "next" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "next" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/iter/traits/iterator.v b/CoqOfRust/core/iter/traits/iterator.v index 942d8f7e0..48ef044ea 100644 --- a/CoqOfRust/core/iter/traits/iterator.v +++ b/CoqOfRust/core/iter/traits/iterator.v @@ -5898,9 +5898,8 @@ Module iter. M.alloc (| Value.Array [ - M.read (| - Value.String - "internal error: entered unreachable code: Always specialized" + mk_str (| + "internal error: entered unreachable code: Always specialized" |) ] |) diff --git a/CoqOfRust/core/links/array.v b/CoqOfRust/core/links/array.v index 407f95dde..32bd0f45e 100644 --- a/CoqOfRust/core/links/array.v +++ b/CoqOfRust/core/links/array.v @@ -20,6 +20,24 @@ Definition of_ty (length' : Value.t) (length : Usize.t) (A' : Ty.t): Proof. intros ? [A]. eapply OfTy.Make with (A := t A length). now subst. Defined. Smpl Add eapply of_ty : of_ty. +Lemma of_value_with_1 {A : Set} `{Link A} + (value1' : Value.t) (value1 : A) : + value1' = φ value1 -> + Value.Array [value1'] = + φ ({| value := [value1] |} : t A {| Integer.value := 1 |}). +Proof. now intros; subst. Qed. +Smpl Add apply of_value_with_1 : of_value. + +Definition of_value_1 (value1' : Value.t) : + OfValue.t value1' -> + OfValue.t (Value.Array [value1']). +Proof. + intros [A]. + eapply OfValue.Make with (A := t A {| Integer.value := 1 |}). + apply of_value_with_1; eassumption. +Defined. +Smpl Add apply of_value_1 : of_value. + Module SubPointer. Definition get_index (A : Set) `{Link A} (length : Usize.t) (index : Z) : SubPointer.Runner.t (t A length) (Pointer.Index.Array index) := diff --git a/CoqOfRust/core/links/hint.v b/CoqOfRust/core/links/hint.v new file mode 100644 index 000000000..7aac4c573 --- /dev/null +++ b/CoqOfRust/core/links/hint.v @@ -0,0 +1,11 @@ +Require Import CoqOfRust.CoqOfRust. +Require Import CoqOfRust.links.M. +Require Import core.hint. + +(* pub const unsafe fn unreachable_unchecked() -> ! *) +Instance run_unreachable_unchecked : + Run.Trait hint.unreachable_unchecked [] [] [] Empty_set. +Proof. + constructor. + run_symbolic. +Admitted. diff --git a/CoqOfRust/core/links/panicking.v b/CoqOfRust/core/links/panicking.v new file mode 100644 index 000000000..30726d4fd --- /dev/null +++ b/CoqOfRust/core/links/panicking.v @@ -0,0 +1,14 @@ +Require Import CoqOfRust.CoqOfRust. +Require Import CoqOfRust.links.M. +Require Import core.fmt.links.mod. +Require Import core.panicking. + +Module panicking. + (* pub const fn panic_fmt(fmt: fmt::Arguments<'_>) -> ! *) + Instance run_panic_fmt (fmt : Arguments.t) : + Run.Trait panicking.panic_fmt [] [] [φ fmt] Empty_set. + Proof. + constructor. + run_symbolic. + Admitted. +End panicking. diff --git a/CoqOfRust/core/marker.v b/CoqOfRust/core/marker.v index 61271551b..1d6f98a53 100644 --- a/CoqOfRust/core/marker.v +++ b/CoqOfRust/core/marker.v @@ -911,10 +911,7 @@ Module marker. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PhantomPinned" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "PhantomPinned" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/core/mem/manually_drop.v b/CoqOfRust/core/mem/manually_drop.v index 7a1d55889..24fbf5da7 100644 --- a/CoqOfRust/core/mem/manually_drop.v +++ b/CoqOfRust/core/mem/manually_drop.v @@ -98,11 +98,8 @@ Module mem. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ManuallyDrop" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "value" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ManuallyDrop" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "value" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/mem/maybe_uninit.v b/CoqOfRust/core/mem/maybe_uninit.v index 75072d45b..45a7729cd 100644 --- a/CoqOfRust/core/mem/maybe_uninit.v +++ b/CoqOfRust/core/mem/maybe_uninit.v @@ -127,7 +127,7 @@ Module mem. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| full_name |) |) |); - M.read (| Value.String "mem::maybe_uninit::" |) + mk_str (| "mem::maybe_uninit::" |) ] |) ] @@ -1310,9 +1310,8 @@ Module mem. M.alloc (| Value.Array [ - M.read (| - Value.String - "destination and source slices have different lengths" + mk_str (| + "destination and source slices have different lengths" |) ] |) diff --git a/CoqOfRust/core/mem/mod.v b/CoqOfRust/core/mem/mod.v index d029da1c0..562b550ec 100644 --- a/CoqOfRust/core/mem/mod.v +++ b/CoqOfRust/core/mem/mod.v @@ -637,9 +637,8 @@ Module mem. M.alloc (| Value.Array [ - M.read (| - Value.String - "cannot transmute_copy if Dst is larger than Src" + mk_str (| + "cannot transmute_copy if Dst is larger than Src" |) ] |) @@ -960,7 +959,7 @@ Module mem. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| fmt |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Discriminant" |) |) + M.deref (| mk_str (| "Discriminant" |) |) |) ] |) diff --git a/CoqOfRust/core/mem/transmutability.v b/CoqOfRust/core/mem/transmutability.v index 24167ffbf..a80e2e4d3 100644 --- a/CoqOfRust/core/mem/transmutability.v +++ b/CoqOfRust/core/mem/transmutability.v @@ -288,11 +288,8 @@ Module mem. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Assume" |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "alignment" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Assume" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "alignment" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -306,10 +303,7 @@ Module mem. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "lifetimes" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "lifetimes" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -323,7 +317,7 @@ Module mem. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "safety" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "safety" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -337,7 +331,7 @@ Module mem. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "validity" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "validity" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/net/ip_addr.v b/CoqOfRust/core/net/ip_addr.v index e6ac7a974..7e3f1cea4 100644 --- a/CoqOfRust/core/net/ip_addr.v +++ b/CoqOfRust/core/net/ip_addr.v @@ -1469,7 +1469,7 @@ Module net. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InterfaceLocal" |) |) + M.deref (| mk_str (| "InterfaceLocal" |) |) |) |))); fun γ => @@ -1481,10 +1481,7 @@ Module net. "core::net::ip_addr::Ipv6MulticastScope::LinkLocal" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LinkLocal" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LinkLocal" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1495,10 +1492,7 @@ Module net. "core::net::ip_addr::Ipv6MulticastScope::RealmLocal" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RealmLocal" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "RealmLocal" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1509,10 +1503,7 @@ Module net. "core::net::ip_addr::Ipv6MulticastScope::AdminLocal" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AdminLocal" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "AdminLocal" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1523,10 +1514,7 @@ Module net. "core::net::ip_addr::Ipv6MulticastScope::SiteLocal" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SiteLocal" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SiteLocal" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1539,7 +1527,7 @@ Module net. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OrganizationLocal" |) |) + M.deref (| mk_str (| "OrganizationLocal" |) |) |) |))); fun γ => @@ -1551,10 +1539,7 @@ Module net. "core::net::ip_addr::Ipv6MulticastScope::Global" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Global" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Global" |) |) |) |))) ] |) @@ -3904,10 +3889,10 @@ Module net. M.alloc (| Value.Array [ - M.read (| Value.String "" |); - M.read (| Value.String "." |); - M.read (| Value.String "." |); - M.read (| Value.String "." |) + mk_str (| "" |); + mk_str (| "." |); + mk_str (| "." |); + mk_str (| "." |) ] |) |) @@ -4101,10 +4086,10 @@ Module net. M.alloc (| Value.Array [ - M.read (| Value.String "" |); - M.read (| Value.String "." |); - M.read (| Value.String "." |); - M.read (| Value.String "." |) + mk_str (| "" |); + mk_str (| "." |); + mk_str (| "." |); + mk_str (| "." |) ] |) |) @@ -7629,8 +7614,7 @@ Module net. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "::ffff:" |) ] + Value.Array [ mk_str (| "::ffff:" |) ] |) |) |) @@ -8324,9 +8308,7 @@ Module net. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "::" |) - |) + M.deref (| mk_str (| "::" |) |) |) ] |) @@ -8590,9 +8572,7 @@ Module net. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); diff --git a/CoqOfRust/core/net/parser.v b/CoqOfRust/core/net/parser.v index 9e6b7b04b..ae49c074a 100644 --- a/CoqOfRust/core/net/parser.v +++ b/CoqOfRust/core/net/parser.v @@ -2042,9 +2042,8 @@ Module net. [] |), [ - M.read (| - Value.String - "assertion failed: max_digits < 10" + mk_str (| + "assertion failed: max_digits < 10" |) ] |) @@ -7226,30 +7225,21 @@ Module net. (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::net::parser::AddrKind::Ip" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Ip" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Ip" |) |) |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::net::parser::AddrKind::Ipv4" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Ipv4" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Ipv4" |) |) |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::net::parser::AddrKind::Ipv6" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Ipv6" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Ipv6" |) |) |) |))); fun γ => ltac:(M.monadic @@ -7257,10 +7247,7 @@ Module net. let _ := M.is_struct_tuple (| γ, "core::net::parser::AddrKind::Socket" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Socket" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Socket" |) |) |) |))); fun γ => ltac:(M.monadic @@ -7268,10 +7255,7 @@ Module net. let _ := M.is_struct_tuple (| γ, "core::net::parser::AddrKind::SocketV4" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SocketV4" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SocketV4" |) |) |) |))); fun γ => ltac:(M.monadic @@ -7279,10 +7263,7 @@ Module net. let _ := M.is_struct_tuple (| γ, "core::net::parser::AddrKind::SocketV6" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SocketV6" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SocketV6" |) |) |) |))) ] |) @@ -7479,10 +7460,7 @@ Module net. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AddrParseError" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "AddrParseError" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -7753,7 +7731,7 @@ Module net. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "invalid IP address syntax" |) |) + M.deref (| mk_str (| "invalid IP address syntax" |) |) |) |))); fun γ => @@ -7762,7 +7740,7 @@ Module net. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "invalid IPv4 address syntax" |) |) + M.deref (| mk_str (| "invalid IPv4 address syntax" |) |) |) |))); fun γ => @@ -7771,7 +7749,7 @@ Module net. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "invalid IPv6 address syntax" |) |) + M.deref (| mk_str (| "invalid IPv6 address syntax" |) |) |) |))); fun γ => @@ -7780,7 +7758,7 @@ Module net. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "invalid socket address syntax" |) |) + M.deref (| mk_str (| "invalid socket address syntax" |) |) |) |))); fun γ => @@ -7790,9 +7768,7 @@ Module net. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "invalid IPv4 socket address syntax" |) - |) + M.deref (| mk_str (| "invalid IPv4 socket address syntax" |) |) |) |))); fun γ => @@ -7802,9 +7778,7 @@ Module net. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "invalid IPv6 socket address syntax" |) - |) + M.deref (| mk_str (| "invalid IPv6 socket address syntax" |) |) |) |))) ] diff --git a/CoqOfRust/core/net/socket_addr.v b/CoqOfRust/core/net/socket_addr.v index c8c558ba3..139cc1ffb 100644 --- a/CoqOfRust/core/net/socket_addr.v +++ b/CoqOfRust/core/net/socket_addr.v @@ -3509,11 +3509,7 @@ Module net. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String ":" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| ":" |) ] |) |) |) @@ -3695,11 +3691,7 @@ Module net. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String ":" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| ":" |) ] |) |) |) @@ -4089,11 +4081,7 @@ Module net. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "[" |); - M.read (| Value.String "]:" |) - ] + Value.Array [ mk_str (| "[" |); mk_str (| "]:" |) ] |) |) |) @@ -4246,9 +4234,9 @@ Module net. M.alloc (| Value.Array [ - M.read (| Value.String "[" |); - M.read (| Value.String "%" |); - M.read (| Value.String "]:" |) + mk_str (| "[" |); + mk_str (| "%" |); + mk_str (| "]:" |) ] |) |) @@ -4494,10 +4482,7 @@ Module net. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "[" |); - M.read (| Value.String "]:" |) - ] + [ mk_str (| "[" |); mk_str (| "]:" |) ] |) |) |) @@ -4655,9 +4640,9 @@ Module net. M.alloc (| Value.Array [ - M.read (| Value.String "[" |); - M.read (| Value.String "%" |); - M.read (| Value.String "]:" |) + mk_str (| "[" |); + mk_str (| "%" |); + mk_str (| "]:" |) ] |) |) diff --git a/CoqOfRust/core/num/bignum.v b/CoqOfRust/core/num/bignum.v index 2514da303..c8e5375a6 100644 --- a/CoqOfRust/core/num/bignum.v +++ b/CoqOfRust/core/num/bignum.v @@ -107,11 +107,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: borrow < other" - |) - ] + [ mk_str (| "assertion failed: borrow < other" |) ] |) |) |))); @@ -258,11 +254,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: borrow < other" - |) - ] + [ mk_str (| "assertion failed: borrow < other" |) ] |) |) |))); @@ -411,11 +403,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: borrow < other" - |) - ] + [ mk_str (| "assertion failed: borrow < other" |) ] |) |) |))); @@ -1954,7 +1942,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: noborrow" |) ] + [ mk_str (| "assertion failed: noborrow" |) ] |) |) |))); @@ -2333,7 +2321,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: digits < 40" |) ] + [ mk_str (| "assertion failed: digits < 40" |) ] |) |) |))); @@ -2522,9 +2510,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.base[40 - digits..].iter().all(|&v| v == 0)" + mk_str (| + "assertion failed: self.base[40 - digits..].iter().all(|&v| v == 0)" |) ] |) @@ -2603,9 +2590,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: bits == 0 || (self.base[40 - digits - 1] >> (digitbits - bits)) == 0" + mk_str (| + "assertion failed: bits == 0 || (self.base[40 - digits - 1] >> (digitbits - bits)) == 0" |) ] |) @@ -3816,7 +3802,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: other > 0" |) ] + [ mk_str (| "assertion failed: other > 0" |) ] |) |) |))); @@ -4134,7 +4120,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: !d.is_zero()" |) ] + [ mk_str (| "assertion failed: !d.is_zero()" |) ] |) |) |))); @@ -4950,9 +4936,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: q.base[q.size..].iter().all(|&d| d == 0)" + mk_str (| + "assertion failed: q.base[q.size..].iter().all(|&d| d == 0)" |) ] |) @@ -5138,9 +5123,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: r.base[r.size..].iter().all(|&d| d == 0)" + mk_str (| + "assertion failed: r.base[r.size..].iter().all(|&d| d == 0)" |) ] |) @@ -5793,7 +5777,7 @@ Module num. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -6187,11 +6171,7 @@ Module num. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "_" - |) - ] + [ mk_str (| "_" |) ] |) |) |) @@ -7896,7 +7876,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: noborrow" |) ] + [ mk_str (| "assertion failed: noborrow" |) ] |) |) |))); @@ -8294,7 +8274,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: digits < 3" |) ] + [ mk_str (| "assertion failed: digits < 3" |) ] |) |) |))); @@ -8486,9 +8466,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.base[3 - digits..].iter().all(|&v| v == 0)" + mk_str (| + "assertion failed: self.base[3 - digits..].iter().all(|&v| v == 0)" |) ] |) @@ -8570,9 +8549,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: bits == 0 || (self.base[3 - digits - 1] >> (digitbits - bits)) == 0" + mk_str (| + "assertion failed: bits == 0 || (self.base[3 - digits - 1] >> (digitbits - bits)) == 0" |) ] |) @@ -9805,7 +9783,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: other > 0" |) ] + [ mk_str (| "assertion failed: other > 0" |) ] |) |) |))); @@ -10134,7 +10112,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: !d.is_zero()" |) ] + [ mk_str (| "assertion failed: !d.is_zero()" |) ] |) |) |))); @@ -10982,9 +10960,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: q.base[q.size..].iter().all(|&d| d == 0)" + mk_str (| + "assertion failed: q.base[q.size..].iter().all(|&d| d == 0)" |) ] |) @@ -11174,9 +11151,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: r.base[r.size..].iter().all(|&d| d == 0)" + mk_str (| + "assertion failed: r.base[r.size..].iter().all(|&d| d == 0)" |) ] |) @@ -11836,9 +11812,7 @@ Module num. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -12241,11 +12215,7 @@ Module num. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "_" - |) - ] + [ mk_str (| "_" |) ] |) |) |) diff --git a/CoqOfRust/core/num/dec2flt/common.v b/CoqOfRust/core/num/dec2flt/common.v index 517e4535e..0015856b6 100644 --- a/CoqOfRust/core/num/dec2flt/common.v +++ b/CoqOfRust/core/num/dec2flt/common.v @@ -463,11 +463,8 @@ Module num. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BiasedFp" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "f" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BiasedFp" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "f" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -481,7 +478,7 @@ Module num. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "e" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "e" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/num/dec2flt/decimal.v b/CoqOfRust/core/num/dec2flt/decimal.v index eaf1aa767..83e3db9ff 100644 --- a/CoqOfRust/core/num/dec2flt/decimal.v +++ b/CoqOfRust/core/num/dec2flt/decimal.v @@ -395,9 +395,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.num_digits <= Self::MAX_DIGITS" + mk_str (| + "assertion failed: self.num_digits <= Self::MAX_DIGITS" |) ] |) diff --git a/CoqOfRust/core/num/dec2flt/float.v b/CoqOfRust/core/num/dec2flt/float.v index 4e16ed45f..d297c09d0 100644 --- a/CoqOfRust/core/num/dec2flt/float.v +++ b/CoqOfRust/core/num/dec2flt/float.v @@ -139,9 +139,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: v <= Self::MAX_MANTISSA_FAST_PATH" + mk_str (| + "assertion failed: v <= Self::MAX_MANTISSA_FAST_PATH" |) ] |) @@ -511,9 +510,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: v <= Self::MAX_MANTISSA_FAST_PATH" + mk_str (| + "assertion failed: v <= Self::MAX_MANTISSA_FAST_PATH" |) ] |) diff --git a/CoqOfRust/core/num/dec2flt/lemire.v b/CoqOfRust/core/num/dec2flt/lemire.v index 0194d8fdf..bb76fe321 100644 --- a/CoqOfRust/core/num/dec2flt/lemire.v +++ b/CoqOfRust/core/num/dec2flt/lemire.v @@ -889,9 +889,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: q >= SMALLEST_POWER_OF_FIVE as i64" + mk_str (| + "assertion failed: q >= SMALLEST_POWER_OF_FIVE as i64" |) ] |) @@ -947,9 +946,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: q <= LARGEST_POWER_OF_FIVE as i64" + mk_str (| + "assertion failed: q <= LARGEST_POWER_OF_FIVE as i64" |) ] |) @@ -999,11 +997,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: precision <= 64" - |) - ] + [ mk_str (| "assertion failed: precision <= 64" |) ] |) |) |))); diff --git a/CoqOfRust/core/num/dec2flt/mod.v b/CoqOfRust/core/num/dec2flt/mod.v index 5a85b98bf..33cec3b26 100644 --- a/CoqOfRust/core/num/dec2flt/mod.v +++ b/CoqOfRust/core/num/dec2flt/mod.v @@ -108,11 +108,8 @@ Module num. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ParseFloatError" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "kind" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ParseFloatError" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "kind" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -351,10 +348,7 @@ Module num. "core::num::dec2flt::FloatErrorKind::Empty" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Empty" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Empty" |) |) |) |))); fun γ => ltac:(M.monadic @@ -365,10 +359,7 @@ Module num. "core::num::dec2flt::FloatErrorKind::Invalid" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Invalid" |) |) |) |))) ] |) @@ -552,9 +543,7 @@ Module num. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "cannot parse float from empty string" |) - |) + M.deref (| mk_str (| "cannot parse float from empty string" |) |) |) |))); fun γ => @@ -564,7 +553,7 @@ Module num. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "invalid float literal" |) |) + M.deref (| mk_str (| "invalid float literal" |) |) |) |))) ] diff --git a/CoqOfRust/core/num/dec2flt/number.v b/CoqOfRust/core/num/dec2flt/number.v index 6767ea2d6..3d6e18dc6 100644 --- a/CoqOfRust/core/num/dec2flt/number.v +++ b/CoqOfRust/core/num/dec2flt/number.v @@ -126,11 +126,8 @@ Module num. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Number" |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "exponent" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Number" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "exponent" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -144,10 +141,7 @@ Module num. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "mantissa" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "mantissa" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -161,10 +155,7 @@ Module num. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "negative" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "negative" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -178,10 +169,7 @@ Module num. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "many_digits" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "many_digits" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/num/dec2flt/parse.v b/CoqOfRust/core/num/dec2flt/parse.v index 1bfef4db2..fedf12e42 100644 --- a/CoqOfRust/core/num/dec2flt/parse.v +++ b/CoqOfRust/core/num/dec2flt/parse.v @@ -1117,11 +1117,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: !s.is_empty()" - |) - ] + [ mk_str (| "assertion failed: !s.is_empty()" |) ] |) |) |))); diff --git a/CoqOfRust/core/num/diy_float.v b/CoqOfRust/core/num/diy_float.v index 3d05369e4..f957ec26b 100644 --- a/CoqOfRust/core/num/diy_float.v +++ b/CoqOfRust/core/num/diy_float.v @@ -82,8 +82,8 @@ Module num. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Fp" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "f" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Fp" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "f" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -97,7 +97,7 @@ Module num. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "e" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "e" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -635,11 +635,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: f >= (1 << 63)" - |) - ] + [ mk_str (| "assertion failed: f >= (1 << 63)" |) ] |) |) |))); @@ -714,7 +710,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: edelta >= 0" |) ] + [ mk_str (| "assertion failed: edelta >= 0" |) ] |) |) |))); diff --git a/CoqOfRust/core/num/error.v b/CoqOfRust/core/num/error.v index 6ebc622ee..6fb5362b3 100644 --- a/CoqOfRust/core/num/error.v +++ b/CoqOfRust/core/num/error.v @@ -34,10 +34,7 @@ Module num. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TryFromIntError" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "TryFromIntError" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -277,9 +274,7 @@ Module num. (let self := M.alloc (| self |) in M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "out of range integral type conversion attempted" |) - |) + M.deref (| mk_str (| "out of range integral type conversion attempted" |) |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -381,11 +376,8 @@ Module num. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ParseIntError" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "kind" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ParseIntError" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "kind" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -639,10 +631,7 @@ Module num. let _ := M.is_struct_tuple (| γ, "core::num::error::IntErrorKind::Empty" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Empty" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Empty" |) |) |) |))); fun γ => ltac:(M.monadic @@ -655,7 +644,7 @@ Module num. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidDigit" |) |) + M.deref (| mk_str (| "InvalidDigit" |) |) |) |))); fun γ => @@ -669,7 +658,7 @@ Module num. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PosOverflow" |) |) + M.deref (| mk_str (| "PosOverflow" |) |) |) |))); fun γ => @@ -683,7 +672,7 @@ Module num. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NegOverflow" |) |) + M.deref (| mk_str (| "NegOverflow" |) |) |) |))); fun γ => @@ -692,10 +681,7 @@ Module num. let _ := M.is_struct_tuple (| γ, "core::num::error::IntErrorKind::Zero" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Zero" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Zero" |) |) |) |))) ] |) @@ -989,9 +975,7 @@ Module num. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "cannot parse integer from empty string" |) - |) + M.deref (| mk_str (| "cannot parse integer from empty string" |) |) |) |))); fun γ => @@ -1001,7 +985,7 @@ Module num. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "invalid digit found in string" |) |) + M.deref (| mk_str (| "invalid digit found in string" |) |) |) |))); fun γ => @@ -1011,9 +995,7 @@ Module num. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "number too large to fit in target type" |) - |) + M.deref (| mk_str (| "number too large to fit in target type" |) |) |) |))); fun γ => @@ -1023,9 +1005,7 @@ Module num. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "number too small to fit in target type" |) - |) + M.deref (| mk_str (| "number too small to fit in target type" |) |) |) |))); fun γ => @@ -1034,9 +1014,7 @@ Module num. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "number would be zero for non-zero type" |) - |) + M.deref (| mk_str (| "number would be zero for non-zero type" |) |) |) |))) ] diff --git a/CoqOfRust/core/num/flt2dec/decoder.v b/CoqOfRust/core/num/flt2dec/decoder.v index 772be9e8e..4a6896e37 100644 --- a/CoqOfRust/core/num/flt2dec/decoder.v +++ b/CoqOfRust/core/num/flt2dec/decoder.v @@ -98,11 +98,8 @@ Module num. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Decoded" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "mant" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Decoded" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "mant" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -116,7 +113,7 @@ Module num. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "minus" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "minus" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -130,7 +127,7 @@ Module num. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "plus" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "plus" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -144,7 +141,7 @@ Module num. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "exp" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "exp" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -158,10 +155,7 @@ Module num. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "inclusive" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inclusive" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -486,10 +480,7 @@ Module num. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Nan" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Nan" |) |) |) ] |) |))); @@ -515,10 +506,7 @@ Module num. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Infinite" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Infinite" |) |) |) ] |) |))); @@ -544,10 +532,7 @@ Module num. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Zero" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Zero" |) |) |) ] |) |))); @@ -575,10 +560,7 @@ Module num. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Finite" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Finite" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) diff --git a/CoqOfRust/core/num/flt2dec/mod.v b/CoqOfRust/core/num/flt2dec/mod.v index 454a9e13f..d09087087 100644 --- a/CoqOfRust/core/num/flt2dec/mod.v +++ b/CoqOfRust/core/num/flt2dec/mod.v @@ -528,7 +528,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: !buf.is_empty()" |) ] + [ mk_str (| "assertion failed: !buf.is_empty()" |) ] |) |) |))); @@ -563,7 +563,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: buf[0] > b'0'" |) ] + [ mk_str (| "assertion failed: buf[0] > b'0'" |) ] |) |) |))); @@ -615,7 +615,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: parts.len() >= 4" |) ] + [ mk_str (| "assertion failed: parts.len() >= 4" |) ] |) |) |))); @@ -1984,7 +1984,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: !buf.is_empty()" |) ] + [ mk_str (| "assertion failed: !buf.is_empty()" |) ] |) |) |))); @@ -2019,7 +2019,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: buf[0] > b'0'" |) ] + [ mk_str (| "assertion failed: buf[0] > b'0'" |) ] |) |) |))); @@ -2071,7 +2071,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: parts.len() >= 6" |) ] + [ mk_str (| "assertion failed: parts.len() >= 6" |) ] |) |) |))); @@ -2876,10 +2876,7 @@ Module num. (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::num::flt2dec::Sign::Minus" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Minus" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Minus" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2887,10 +2884,7 @@ Module num. let _ := M.is_struct_tuple (| γ, "core::num::flt2dec::Sign::MinusPlus" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MinusPlus" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MinusPlus" |) |) |) |))) ] |) @@ -2953,7 +2947,7 @@ Module num. γ0_0, "core::num::flt2dec::decoder::FullDecoded::Nan" |) in - Value.String "")); + M.alloc (| mk_str (| "" |) |))); fun γ => ltac:(M.monadic (let γ0_0 := M.SubPointer.get_tuple_field (| γ, 0 |) in @@ -2968,8 +2962,8 @@ Module num. (let γ := M.use negative in let _ := M.is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - Value.String "-")); - fun γ => ltac:(M.monadic (Value.String "")) + M.alloc (| mk_str (| "-" |) |))); + fun γ => ltac:(M.monadic (M.alloc (| mk_str (| "" |) |))) ] |))); fun γ => @@ -2986,8 +2980,8 @@ Module num. (let γ := M.use negative in let _ := M.is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - Value.String "-")); - fun γ => ltac:(M.monadic (Value.String "+")) + M.alloc (| mk_str (| "-" |) |))); + fun γ => ltac:(M.monadic (M.alloc (| mk_str (| "+" |) |))) ] |))) ] @@ -3112,7 +3106,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: parts.len() >= 4" |) ] + [ mk_str (| "assertion failed: parts.len() >= 4" |) ] |) |) |))); @@ -3160,11 +3154,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: buf.len() >= MAX_SIG_DIGITS" - |) - ] + [ mk_str (| "assertion failed: buf.len() >= MAX_SIG_DIGITS" |) ] |) |) |))); @@ -4084,7 +4074,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: parts.len() >= 6" |) ] + [ mk_str (| "assertion failed: parts.len() >= 6" |) ] |) |) |))); @@ -4132,11 +4122,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: buf.len() >= MAX_SIG_DIGITS" - |) - ] + [ mk_str (| "assertion failed: buf.len() >= MAX_SIG_DIGITS" |) ] |) |) |))); @@ -4166,11 +4152,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: dec_bounds.0 <= dec_bounds.1" - |) - ] + [ mk_str (| "assertion failed: dec_bounds.0 <= dec_bounds.1" |) ] |) |) |))); @@ -5168,7 +5150,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: parts.len() >= 6" |) ] + [ mk_str (| "assertion failed: parts.len() >= 6" |) ] |) |) |))); @@ -5195,7 +5177,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: ndigits > 0" |) ] + [ mk_str (| "assertion failed: ndigits > 0" |) ] |) |) |))); @@ -6097,9 +6079,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: buf.len() >= ndigits || buf.len() >= maxlen" + mk_str (| + "assertion failed: buf.len() >= ndigits || buf.len() >= maxlen" |) ] |) @@ -6459,7 +6440,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: parts.len() >= 4" |) ] + [ mk_str (| "assertion failed: parts.len() >= 4" |) ] |) |) |))); @@ -7213,11 +7194,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: buf.len() >= maxlen" - |) - ] + [ mk_str (| "assertion failed: buf.len() >= maxlen" |) ] |) |) |))); diff --git a/CoqOfRust/core/num/flt2dec/strategy/dragon.v b/CoqOfRust/core/num/flt2dec/strategy/dragon.v index 453fd1652..71b96665c 100644 --- a/CoqOfRust/core/num/flt2dec/strategy/dragon.v +++ b/CoqOfRust/core/num/flt2dec/strategy/dragon.v @@ -223,11 +223,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: n < 512" - |) - ] + [ mk_str (| "assertion failed: n < 512" |) ] |) |) |))); @@ -1341,11 +1337,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: *x < *scale" - |) - ] + [ mk_str (| "assertion failed: *x < *scale" |) ] |) |) |))); @@ -1571,7 +1563,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: d.mant > 0" |) ] + [ mk_str (| "assertion failed: d.mant > 0" |) ] |) |) |))); @@ -1608,7 +1600,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: d.minus > 0" |) ] + [ mk_str (| "assertion failed: d.minus > 0" |) ] |) |) |))); @@ -1645,7 +1637,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: d.plus > 0" |) ] + [ mk_str (| "assertion failed: d.plus > 0" |) ] |) |) |))); @@ -1720,9 +1712,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: d.mant.checked_add(d.plus).is_some()" + mk_str (| + "assertion failed: d.mant.checked_add(d.plus).is_some()" |) ] |) @@ -1799,9 +1790,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: d.mant.checked_sub(d.minus).is_some()" + mk_str (| + "assertion failed: d.mant.checked_sub(d.minus).is_some()" |) ] |) @@ -1856,11 +1846,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: buf.len() >= MAX_SIG_DIGITS" - |) - ] + [ mk_str (| "assertion failed: buf.len() >= MAX_SIG_DIGITS" |) ] |) |) |))); @@ -2646,11 +2632,7 @@ Module num. [], [] |), - [ - M.read (| - Value.String "assertion failed: d < 10" - |) - ] + [ mk_str (| "assertion failed: d < 10" |) ] |) |) |))); @@ -3437,7 +3419,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: d.mant > 0" |) ] + [ mk_str (| "assertion failed: d.mant > 0" |) ] |) |) |))); @@ -3477,7 +3459,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: d.minus > 0" |) ] + [ mk_str (| "assertion failed: d.minus > 0" |) ] |) |) |))); @@ -3517,7 +3499,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: d.plus > 0" |) ] + [ mk_str (| "assertion failed: d.plus > 0" |) ] |) |) |))); @@ -3595,9 +3577,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: d.mant.checked_add(d.plus).is_some()" + mk_str (| + "assertion failed: d.mant.checked_add(d.plus).is_some()" |) ] |) @@ -3677,9 +3658,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: d.mant.checked_sub(d.minus).is_some()" + mk_str (| + "assertion failed: d.mant.checked_sub(d.minus).is_some()" |) ] |) @@ -5355,9 +5335,8 @@ Module num. [] |), [ - M.read (| - Value.String - "assertion failed: mant < scale" + mk_str (| + "assertion failed: mant < scale" |) ] |) @@ -5427,9 +5406,8 @@ Module num. [] |), [ - M.read (| - Value.String - "assertion failed: d < 10" + mk_str (| + "assertion failed: d < 10" |) ] |) diff --git a/CoqOfRust/core/num/flt2dec/strategy/grisu.v b/CoqOfRust/core/num/flt2dec/strategy/grisu.v index b36c3e555..9123be7c5 100644 --- a/CoqOfRust/core/num/flt2dec/strategy/grisu.v +++ b/CoqOfRust/core/num/flt2dec/strategy/grisu.v @@ -689,9 +689,8 @@ Module num. [] |), [ - M.read (| - Value.String - "assertion failed: alpha <= e && e <= gamma" + mk_str (| + "assertion failed: alpha <= e && e <= gamma" |) ] |) @@ -802,7 +801,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: x > 0" |) ] + [ mk_str (| "assertion failed: x > 0" |) ] |) |) |))); @@ -1557,7 +1556,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: d.mant > 0" |) ] + [ mk_str (| "assertion failed: d.mant > 0" |) ] |) |) |))); @@ -1597,7 +1596,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: d.minus > 0" |) ] + [ mk_str (| "assertion failed: d.minus > 0" |) ] |) |) |))); @@ -1637,7 +1636,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: d.plus > 0" |) ] + [ mk_str (| "assertion failed: d.plus > 0" |) ] |) |) |))); @@ -1715,9 +1714,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: d.mant.checked_add(d.plus).is_some()" + mk_str (| + "assertion failed: d.mant.checked_add(d.plus).is_some()" |) ] |) @@ -1797,9 +1795,8 @@ Module num. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: d.mant.checked_sub(d.minus).is_some()" + mk_str (| + "assertion failed: d.mant.checked_sub(d.minus).is_some()" |) ] |) @@ -1859,11 +1856,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "assertion failed: buf.len() >= MAX_SIG_DIGITS" - |) + [ mk_str (| "assertion failed: buf.len() >= MAX_SIG_DIGITS" |) ] |) |) @@ -1916,11 +1909,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "assertion failed: d.mant + d.plus < (1 << 61)" - |) + [ mk_str (| "assertion failed: d.mant + d.plus < (1 << 61)" |) ] |) |) @@ -2641,9 +2630,8 @@ Module num. [] |), [ - M.read (| - Value.String - "assertion failed: q < 10" + mk_str (| + "assertion failed: q < 10" |) ] |) @@ -3253,9 +3241,8 @@ Module num. [] |), [ - M.read (| - Value.String - "assertion failed: q < 10" + mk_str (| + "assertion failed: q < 10" |) ] |) @@ -3701,11 +3688,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: !buf.is_empty()" - |) - ] + [ mk_str (| "assertion failed: !buf.is_empty()" |) ] |) |) |))); @@ -3869,9 +3852,8 @@ Module num. [] |), [ - M.read (| - Value.String - "assertion failed: *last > b'0'" + mk_str (| + "assertion failed: *last > b'0'" |) ] |) @@ -4523,7 +4505,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: d.mant > 0" |) ] + [ mk_str (| "assertion failed: d.mant > 0" |) ] |) |) |))); @@ -4566,11 +4548,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: d.mant < (1 << 61)" - |) - ] + [ mk_str (| "assertion failed: d.mant < (1 << 61)" |) ] |) |) |))); @@ -4625,11 +4603,7 @@ Module num. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: !buf.is_empty()" - |) - ] + [ mk_str (| "assertion failed: !buf.is_empty()" |) ] |) |) |))); @@ -5133,9 +5107,8 @@ Module num. [] |), [ - M.read (| - Value.String - "assertion failed: len > 0" + mk_str (| + "assertion failed: len > 0" |) ] |) @@ -5223,9 +5196,8 @@ Module num. [] |), [ - M.read (| - Value.String - "assertion failed: q < 10" + mk_str (| + "assertion failed: q < 10" |) ] |) @@ -5922,9 +5894,8 @@ Module num. [] |), [ - M.read (| - Value.String - "assertion failed: q < 10" + mk_str (| + "assertion failed: q < 10" |) ] |) @@ -6308,9 +6279,8 @@ Module num. [] |), [ - M.read (| - Value.String - "assertion failed: remainder < ten_kappa" + mk_str (| + "assertion failed: remainder < ten_kappa" |) ] |) diff --git a/CoqOfRust/core/num/fmt.v b/CoqOfRust/core/num/fmt.v index afba95fdf..186e91290 100644 --- a/CoqOfRust/core/num/fmt.v +++ b/CoqOfRust/core/num/fmt.v @@ -397,10 +397,7 @@ Module num. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Zero" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Zero" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -432,10 +429,7 @@ Module num. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Num" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Num" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -467,10 +461,7 @@ Module num. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Copy" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Copy" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) diff --git a/CoqOfRust/core/num/int_log10.v b/CoqOfRust/core/num/int_log10.v index 3090d16dd..f5922cf2e 100644 --- a/CoqOfRust/core/num/int_log10.v +++ b/CoqOfRust/core/num/int_log10.v @@ -708,11 +708,7 @@ Module num. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "argument of integer logarithm must be positive" - |) - ] + [ mk_str (| "argument of integer logarithm must be positive" |) ] |) |) |) diff --git a/CoqOfRust/core/num/int_sqrt.v b/CoqOfRust/core/num/int_sqrt.v index 7c76bc197..a2111f3e6 100644 --- a/CoqOfRust/core/num/int_sqrt.v +++ b/CoqOfRust/core/num/int_sqrt.v @@ -246,9 +246,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "Negative input inside `isqrt`." + mk_str (| + "Negative input inside `isqrt`." |) ] |) @@ -351,9 +350,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "Negative input inside `isqrt`." + mk_str (| + "Negative input inside `isqrt`." |) ] |) @@ -456,9 +454,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "Negative input inside `isqrt`." + mk_str (| + "Negative input inside `isqrt`." |) ] |) @@ -561,9 +558,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "Negative input inside `isqrt`." + mk_str (| + "Negative input inside `isqrt`." |) ] |) @@ -666,9 +662,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "Negative input inside `isqrt`." + mk_str (| + "Negative input inside `isqrt`." |) ] |) @@ -774,9 +769,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "`$n` is zero in `first_stage!`." + mk_str (| + "`$n` is zero in `first_stage!`." |) ] |) @@ -896,9 +890,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "`$s` is zero in `last_stage!`." + mk_str (| + "`$s` is zero in `last_stage!`." |) ] |) @@ -1165,9 +1158,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "`$n` is zero in `first_stage!`." + mk_str (| + "`$n` is zero in `first_stage!`." |) ] |) @@ -1289,9 +1281,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "`$s` is zero in `middle_stage!`." + mk_str (| + "`$s` is zero in `middle_stage!`." |) ] |) @@ -1545,9 +1536,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "`$s` is zero in `last_stage!`." + mk_str (| + "`$s` is zero in `last_stage!`." |) ] |) @@ -1907,9 +1897,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "`$n` is zero in `first_stage!`." + mk_str (| + "`$n` is zero in `first_stage!`." |) ] |) @@ -2031,9 +2020,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "`$s` is zero in `middle_stage!`." + mk_str (| + "`$s` is zero in `middle_stage!`." |) ] |) @@ -2289,9 +2277,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "`$s` is zero in `middle_stage!`." + mk_str (| + "`$s` is zero in `middle_stage!`." |) ] |) @@ -2569,9 +2556,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "`$s` is zero in `last_stage!`." + mk_str (| + "`$s` is zero in `last_stage!`." |) ] |) @@ -3015,9 +3001,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "`$n` is zero in `first_stage!`." + mk_str (| + "`$n` is zero in `first_stage!`." |) ] |) @@ -3139,9 +3124,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "`$s` is zero in `middle_stage!`." + mk_str (| + "`$s` is zero in `middle_stage!`." |) ] |) @@ -3397,9 +3381,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "`$s` is zero in `middle_stage!`." + mk_str (| + "`$s` is zero in `middle_stage!`." |) ] |) @@ -3680,9 +3663,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "`$s` is zero in `middle_stage!`." + mk_str (| + "`$s` is zero in `middle_stage!`." |) ] |) @@ -3974,9 +3956,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "`$s` is zero in `last_stage!`." + mk_str (| + "`$s` is zero in `last_stage!`." |) ] |) @@ -5018,11 +4999,7 @@ Module num. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "argument of integer square root cannot be negative" - |) - ] + [ mk_str (| "argument of integer square root cannot be negative" |) ] |) |) |) diff --git a/CoqOfRust/core/num/mod.v b/CoqOfRust/core/num/mod.v index 6cd25c7c3..550f4bcb6 100644 --- a/CoqOfRust/core/num/mod.v +++ b/CoqOfRust/core/num/mod.v @@ -6297,9 +6297,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "base of integer logarithm must be at least 2" + mk_str (| + "base of integer logarithm must be at least 2" |) ] |) @@ -14641,9 +14640,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "base of integer logarithm must be at least 2" + mk_str (| + "base of integer logarithm must be at least 2" |) ] |) @@ -22985,9 +22983,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "base of integer logarithm must be at least 2" + mk_str (| + "base of integer logarithm must be at least 2" |) ] |) @@ -31329,9 +31326,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "base of integer logarithm must be at least 2" + mk_str (| + "base of integer logarithm must be at least 2" |) ] |) @@ -39742,9 +39738,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "base of integer logarithm must be at least 2" + mk_str (| + "base of integer logarithm must be at least 2" |) ] |) @@ -48191,9 +48186,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "base of integer logarithm must be at least 2" + mk_str (| + "base of integer logarithm must be at least 2" |) ] |) @@ -50807,9 +50801,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "base of integer logarithm must be at least 2" + mk_str (| + "base of integer logarithm must be at least 2" |) ] |) @@ -59102,9 +59095,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "base of integer logarithm must be at least 2" + mk_str (| + "base of integer logarithm must be at least 2" |) ] |) @@ -66670,9 +66662,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "base of integer logarithm must be at least 2" + mk_str (| + "base of integer logarithm must be at least 2" |) ] |) @@ -74192,9 +74183,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "base of integer logarithm must be at least 2" + mk_str (| + "base of integer logarithm must be at least 2" |) ] |) @@ -81732,9 +81722,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "base of integer logarithm must be at least 2" + mk_str (| + "base of integer logarithm must be at least 2" |) ] |) @@ -89191,9 +89180,8 @@ Module num. M.alloc (| Value.Array [ - M.read (| - Value.String - "base of integer logarithm must be at least 2" + mk_str (| + "base of integer logarithm must be at least 2" |) ] |) @@ -94237,50 +94225,35 @@ Module num. (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::num::FpCategory::Nan" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Nan" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Nan" |) |) |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::num::FpCategory::Infinite" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Infinite" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Infinite" |) |) |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::num::FpCategory::Zero" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Zero" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Zero" |) |) |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::num::FpCategory::Subnormal" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Subnormal" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Subnormal" |) |) |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::num::FpCategory::Normal" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Normal" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Normal" |) |) |) |))) ] |) diff --git a/CoqOfRust/core/num/overflow_panic.v b/CoqOfRust/core/num/overflow_panic.v index 35139dd14..ebe7f44da 100644 --- a/CoqOfRust/core/num/overflow_panic.v +++ b/CoqOfRust/core/num/overflow_panic.v @@ -30,9 +30,7 @@ Module num. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "attempt to add with overflow" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "attempt to add with overflow" |) ] |) |) |) |) @@ -76,8 +74,7 @@ Module num. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "attempt to subtract with overflow" |) ] + Value.Array [ mk_str (| "attempt to subtract with overflow" |) ] |) |) |) @@ -122,8 +119,7 @@ Module num. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "attempt to multiply with overflow" |) ] + Value.Array [ mk_str (| "attempt to multiply with overflow" |) ] |) |) |) @@ -167,10 +163,7 @@ Module num. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "attempt to divide with overflow" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "attempt to divide with overflow" |) ] |) |) |) |) @@ -215,11 +208,7 @@ Module num. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "attempt to calculate the remainder with overflow" - |) - ] + [ mk_str (| "attempt to calculate the remainder with overflow" |) ] |) |) |) @@ -263,10 +252,7 @@ Module num. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "attempt to negate with overflow" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "attempt to negate with overflow" |) ] |) |) |) |) @@ -310,8 +296,7 @@ Module num. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "attempt to shift right with overflow" |) ] + Value.Array [ mk_str (| "attempt to shift right with overflow" |) ] |) |) |) @@ -356,8 +341,7 @@ Module num. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "attempt to shift left with overflow" |) ] + Value.Array [ mk_str (| "attempt to shift left with overflow" |) ] |) |) |) diff --git a/CoqOfRust/core/ops/control_flow.v b/CoqOfRust/core/ops/control_flow.v index 841bbff84..d227e4a44 100644 --- a/CoqOfRust/core/ops/control_flow.v +++ b/CoqOfRust/core/ops/control_flow.v @@ -72,10 +72,7 @@ Module ops. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Continue" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Continue" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -107,10 +104,7 @@ Module ops. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Break" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Break" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) diff --git a/CoqOfRust/core/ops/coroutine.v b/CoqOfRust/core/ops/coroutine.v index 4cd939dcb..283f9bf91 100644 --- a/CoqOfRust/core/ops/coroutine.v +++ b/CoqOfRust/core/ops/coroutine.v @@ -758,10 +758,7 @@ Module ops. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Yielded" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Yielded" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -793,10 +790,7 @@ Module ops. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Complete" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Complete" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) diff --git a/CoqOfRust/core/ops/index_range.v b/CoqOfRust/core/ops/index_range.v index e071fc9ac..0615b65ff 100644 --- a/CoqOfRust/core/ops/index_range.v +++ b/CoqOfRust/core/ops/index_range.v @@ -115,11 +115,8 @@ Module ops. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IndexRange" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "start" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "IndexRange" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "start" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -133,7 +130,7 @@ Module ops. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "end" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "end" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -510,11 +507,7 @@ Module ops. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.start < self.end" - |) - ] + [ mk_str (| "assertion failed: self.start < self.end" |) ] |) |) |))); @@ -623,11 +616,7 @@ Module ops. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.start < self.end" - |) - ] + [ mk_str (| "assertion failed: self.start < self.end" |) ] |) |) |))); diff --git a/CoqOfRust/core/ops/range.v b/CoqOfRust/core/ops/range.v index 93b3fb661..bd1d8267b 100644 --- a/CoqOfRust/core/ops/range.v +++ b/CoqOfRust/core/ops/range.v @@ -185,7 +185,7 @@ Module ops. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String ".." |) ] |) + M.alloc (| Value.Array [ mk_str (| ".." |) ] |) |) |) |) @@ -723,9 +723,7 @@ Module ops. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String ".." |) ] - |) + M.alloc (| Value.Array [ mk_str (| ".." |) ] |) |) |) |) @@ -1404,9 +1402,7 @@ Module ops. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String ".." |) ] - |) + M.alloc (| Value.Array [ mk_str (| ".." |) ] |) |) |) |) @@ -1827,9 +1823,7 @@ Module ops. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String ".." |) ] - |) + M.alloc (| Value.Array [ mk_str (| ".." |) ] |) |) |) |) @@ -2945,9 +2939,7 @@ Module ops. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "..=" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "..=" |) ] |) |) |) |) @@ -3207,8 +3199,7 @@ Module ops. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String " (exhausted)" |) ] + Value.Array [ mk_str (| " (exhausted)" |) ] |) |) |) @@ -3589,9 +3580,7 @@ Module ops. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "..=" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "..=" |) ] |) |) |) |) @@ -4015,10 +4004,7 @@ Module ops. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Included" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Included" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -4050,10 +4036,7 @@ Module ops. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Excluded" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Excluded" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -4079,10 +4062,7 @@ Module ops. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Unbounded" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Unbounded" |) |) |) ] |) |))) diff --git a/CoqOfRust/core/ops/try_trait.v b/CoqOfRust/core/ops/try_trait.v index 04fd37e8d..36d89cf9f 100644 --- a/CoqOfRust/core/ops/try_trait.v +++ b/CoqOfRust/core/ops/try_trait.v @@ -381,7 +381,7 @@ Module ops. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Yeet" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Yeet" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/option.v b/CoqOfRust/core/option.v index 1979d4ac1..969f989aa 100644 --- a/CoqOfRust/core/option.v +++ b/CoqOfRust/core/option.v @@ -111,10 +111,7 @@ Module option. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "None" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "None" |) |) |) ] |) |))); @@ -142,10 +139,7 @@ Module option. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Some" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Some" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -3481,7 +3475,7 @@ Module option. (M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "called `Option::unwrap()` on a `None` value" |) ] + [ mk_str (| "called `Option::unwrap()` on a `None` value" |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -4401,8 +4395,8 @@ Module option. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Item" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "opt" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Item" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "opt" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -4682,8 +4676,8 @@ Module option. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Iter" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "inner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -4989,8 +4983,8 @@ Module option. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "IterMut" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "inner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "IterMut" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5293,8 +5287,8 @@ Module option. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "IntoIter" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "inner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "IntoIter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/panic/location.v b/CoqOfRust/core/panic/location.v index 72193ee5d..1d56d04db 100644 --- a/CoqOfRust/core/panic/location.v +++ b/CoqOfRust/core/panic/location.v @@ -87,8 +87,8 @@ Module panic. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Location" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "file" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Location" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "file" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -102,7 +102,7 @@ Module panic. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "line" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "line" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -116,7 +116,7 @@ Module panic. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "col" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "col" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -945,12 +945,7 @@ Module panic. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String ":" |); - M.read (| Value.String ":" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| ":" |); mk_str (| ":" |) ] |) |) |) diff --git a/CoqOfRust/core/panic/panic_info.v b/CoqOfRust/core/panic/panic_info.v index 20decdb74..b70fafc3c 100644 --- a/CoqOfRust/core/panic/panic_info.v +++ b/CoqOfRust/core/panic/panic_info.v @@ -40,11 +40,8 @@ Module panic. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PanicInfo" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "message" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "PanicInfo" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "message" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -58,7 +55,7 @@ Module panic. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "location" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "location" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -72,10 +69,7 @@ Module panic. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "can_unwind" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "can_unwind" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -89,10 +83,7 @@ Module panic. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "force_no_backtrace" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "force_no_backtrace" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -398,7 +389,7 @@ Module panic. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "panicked at " |) |) + M.deref (| mk_str (| "panicked at " |) |) |) ] |) @@ -627,11 +618,8 @@ Module panic. Pointer.Kind.MutRef, M.deref (| M.read (| formatter |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String ": -" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| ": +" |) |) |) ] |) ] diff --git a/CoqOfRust/core/panic/unwind_safe.v b/CoqOfRust/core/panic/unwind_safe.v index 22b075a4b..859f47b95 100644 --- a/CoqOfRust/core/panic/unwind_safe.v +++ b/CoqOfRust/core/panic/unwind_safe.v @@ -487,7 +487,7 @@ Module panic. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AssertUnwindSafe" |) |) + M.deref (| mk_str (| "AssertUnwindSafe" |) |) |) ] |) diff --git a/CoqOfRust/core/panicking.v b/CoqOfRust/core/panicking.v index 6d3aeae06..8a39386a4 100644 --- a/CoqOfRust/core/panicking.v +++ b/CoqOfRust/core/panicking.v @@ -272,9 +272,7 @@ Module panicking. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "attempt to add with overflow" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "attempt to add with overflow" |) ] |) |) |) |) @@ -326,8 +324,7 @@ Module panicking. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "attempt to subtract with overflow" |) ] + Value.Array [ mk_str (| "attempt to subtract with overflow" |) ] |) |) |) @@ -380,8 +377,7 @@ Module panicking. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "attempt to multiply with overflow" |) ] + Value.Array [ mk_str (| "attempt to multiply with overflow" |) ] |) |) |) @@ -433,10 +429,7 @@ Module panicking. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "attempt to divide with overflow" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "attempt to divide with overflow" |) ] |) |) |) |) @@ -489,11 +482,7 @@ Module panicking. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "attempt to calculate the remainder with overflow" - |) - ] + [ mk_str (| "attempt to calculate the remainder with overflow" |) ] |) |) |) @@ -545,10 +534,7 @@ Module panicking. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "attempt to negate with overflow" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "attempt to negate with overflow" |) ] |) |) |) |) @@ -600,8 +586,7 @@ Module panicking. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "attempt to shift right with overflow" |) ] + Value.Array [ mk_str (| "attempt to shift right with overflow" |) ] |) |) |) @@ -654,8 +639,7 @@ Module panicking. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "attempt to shift left with overflow" |) ] + Value.Array [ mk_str (| "attempt to shift left with overflow" |) ] |) |) |) @@ -707,9 +691,7 @@ Module panicking. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "attempt to divide by zero" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "attempt to divide by zero" |) ] |) |) |) |) @@ -763,9 +745,8 @@ Module panicking. M.alloc (| Value.Array [ - M.read (| - Value.String - "attempt to calculate the remainder with a divisor of zero" + mk_str (| + "attempt to calculate the remainder with a divisor of zero" |) ] |) @@ -824,8 +805,7 @@ Module panicking. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "coroutine resumed after completion" |) ] + Value.Array [ mk_str (| "coroutine resumed after completion" |) ] |) |) |) @@ -882,8 +862,7 @@ Module panicking. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "`async fn` resumed after completion" |) ] + Value.Array [ mk_str (| "`async fn` resumed after completion" |) ] |) |) |) @@ -940,8 +919,7 @@ Module panicking. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "`async gen fn` resumed after completion" |) ] + Value.Array [ mk_str (| "`async gen fn` resumed after completion" |) ] |) |) |) @@ -996,9 +974,8 @@ Module panicking. M.alloc (| Value.Array [ - M.read (| - Value.String - "`gen fn` should just keep returning `None` after completion" + mk_str (| + "`gen fn` should just keep returning `None` after completion" |) ] |) @@ -1057,8 +1034,7 @@ Module panicking. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "coroutine resumed after panicking" |) ] + Value.Array [ mk_str (| "coroutine resumed after panicking" |) ] |) |) |) @@ -1115,8 +1091,7 @@ Module panicking. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "`async fn` resumed after panicking" |) ] + Value.Array [ mk_str (| "`async fn` resumed after panicking" |) ] |) |) |) @@ -1173,8 +1148,7 @@ Module panicking. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "`async gen fn` resumed after panicking" |) ] + Value.Array [ mk_str (| "`async gen fn` resumed after panicking" |) ] |) |) |) @@ -1233,9 +1207,8 @@ Module panicking. M.alloc (| Value.Array [ - M.read (| - Value.String - "`gen fn` should just keep returning `None` after panicking" + mk_str (| + "`gen fn` should just keep returning `None` after panicking" |) ] |) @@ -1360,7 +1333,9 @@ Module panicking. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| M.borrow (| Pointer.Kind.Ref, Value.String "explicit panic" |) |) + M.deref (| + M.borrow (| Pointer.Kind.Ref, M.alloc (| mk_str (| "explicit panic" |) |) |) + |) |) ] |))) @@ -1401,8 +1376,7 @@ Module panicking. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "internal error: entered unreachable code: " |) ] + Value.Array [ mk_str (| "internal error: entered unreachable code: " |) ] |) |) |) @@ -1502,10 +1476,7 @@ Module panicking. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -1609,8 +1580,8 @@ Module panicking. M.alloc (| Value.Array [ - M.read (| Value.String "index out of bounds: the len is " |); - M.read (| Value.String " but the index is " |) + mk_str (| "index out of bounds: the len is " |); + mk_str (| " but the index is " |) ] |) |) @@ -1741,11 +1712,10 @@ Module panicking. M.alloc (| Value.Array [ - M.read (| - Value.String - "misaligned pointer dereference: address must be a multiple of " + mk_str (| + "misaligned pointer dereference: address must be a multiple of " |); - M.read (| Value.String " but is " |) + mk_str (| " but is " |) ] |) |) @@ -1881,7 +1851,7 @@ Module panicking. (M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic_nounwind", [], [] |), - [ M.read (| Value.String "panic in a function that cannot unwind" |) ] + [ mk_str (| "panic in a function that cannot unwind" |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -1904,7 +1874,7 @@ Module panicking. (M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic_nounwind_nobacktrace", [], [] |), - [ M.read (| Value.String "panic in a destructor during cleanup" |) ] + [ mk_str (| "panic in a destructor during cleanup" |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -2053,30 +2023,21 @@ Module panicking. (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::panicking::AssertKind::Eq" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Eq" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Eq" |) |) |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::panicking::AssertKind::Ne" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Ne" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Ne" |) |) |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "core::panicking::AssertKind::Match" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Match" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Match" |) |) |) |))) ] |) @@ -2291,24 +2252,18 @@ Module panicking. fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::panicking::AssertKind::Eq" |) in - Value.String "==")); + M.alloc (| mk_str (| "==" |) |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::panicking::AssertKind::Ne" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "!=" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "!=" |) |) |) |))); fun γ => ltac:(M.monadic (let _ := M.is_struct_tuple (| γ, "core::panicking::AssertKind::Match" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "matches" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "matches" |) |) |) |))) ] |) @@ -2345,11 +2300,11 @@ Module panicking. M.alloc (| Value.Array [ - M.read (| Value.String "assertion `left " |); - M.read (| Value.String " right` failed: " |); - M.read (| Value.String " + mk_str (| "assertion `left " |); + mk_str (| " right` failed: " |); + mk_str (| " left: " |); - M.read (| Value.String " + mk_str (| " right: " |) ] |) @@ -2470,10 +2425,10 @@ Module panicking. M.alloc (| Value.Array [ - M.read (| Value.String "assertion `left " |); - M.read (| Value.String " right` failed + mk_str (| "assertion `left " |); + mk_str (| " right` failed left: " |); - M.read (| Value.String " + mk_str (| " right: " |) ] |) diff --git a/CoqOfRust/core/ptr/alignment.v b/CoqOfRust/core/ptr/alignment.v index fc738300f..de9ec431e 100644 --- a/CoqOfRust/core/ptr/alignment.v +++ b/CoqOfRust/core/ptr/alignment.v @@ -625,11 +625,7 @@ Module ptr. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " (1 << " |); - M.read (| Value.String ")" |) - ] + [ mk_str (| "" |); mk_str (| " (1 << " |); mk_str (| ")" |) ] |) |) |) diff --git a/CoqOfRust/core/ptr/const_ptr.v b/CoqOfRust/core/ptr/const_ptr.v index e2ca0db73..61824ff6a 100644 --- a/CoqOfRust/core/ptr/const_ptr.v +++ b/CoqOfRust/core/ptr/const_ptr.v @@ -973,9 +973,8 @@ Module ptr. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: 0 < pointee_size && pointee_size <= isize::MAX as usize" + mk_str (| + "assertion failed: 0 < pointee_size && pointee_size <= isize::MAX as usize" |) ] |) @@ -1183,9 +1182,8 @@ Module ptr. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: 0 < pointee_size && pointee_size <= isize::MAX as usize" + mk_str (| + "assertion failed: 0 < pointee_size && pointee_size <= isize::MAX as usize" |) ] |) @@ -2220,9 +2218,8 @@ Module ptr. M.alloc (| Value.Array [ - M.read (| - Value.String - "align_offset: align is not a power-of-two" + mk_str (| + "align_offset: align is not a power-of-two" |) ] |) @@ -2367,9 +2364,8 @@ Module ptr. M.alloc (| Value.Array [ - M.read (| - Value.String - "is_aligned_to: align is not a power-of-two" + mk_str (| + "is_aligned_to: align is not a power-of-two" |) ] |) diff --git a/CoqOfRust/core/ptr/metadata.v b/CoqOfRust/core/ptr/metadata.v index 68ebdfa9e..fb623ddde 100644 --- a/CoqOfRust/core/ptr/metadata.v +++ b/CoqOfRust/core/ptr/metadata.v @@ -384,7 +384,7 @@ Module ptr. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DynMetadata" |) |) + M.deref (| mk_str (| "DynMetadata" |) |) |) ] |) diff --git a/CoqOfRust/core/ptr/mut_ptr.v b/CoqOfRust/core/ptr/mut_ptr.v index ccbe3a9d2..1684b4d67 100644 --- a/CoqOfRust/core/ptr/mut_ptr.v +++ b/CoqOfRust/core/ptr/mut_ptr.v @@ -2512,9 +2512,8 @@ Module ptr. M.alloc (| Value.Array [ - M.read (| - Value.String - "align_offset: align is not a power-of-two" + mk_str (| + "align_offset: align is not a power-of-two" |) ] |) @@ -2662,9 +2661,8 @@ Module ptr. M.alloc (| Value.Array [ - M.read (| - Value.String - "is_aligned_to: align is not a power-of-two" + mk_str (| + "is_aligned_to: align is not a power-of-two" |) ] |) @@ -2924,7 +2922,7 @@ Module ptr. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: mid <= self.len()" |) ] + [ mk_str (| "assertion failed: mid <= self.len()" |) ] |) |) |))); diff --git a/CoqOfRust/core/ptr/non_null.v b/CoqOfRust/core/ptr/non_null.v index d9b349c00..af61b31d0 100644 --- a/CoqOfRust/core/ptr/non_null.v +++ b/CoqOfRust/core/ptr/non_null.v @@ -2296,9 +2296,8 @@ Module ptr. M.alloc (| Value.Array [ - M.read (| - Value.String - "align_offset: align is not a power-of-two" + mk_str (| + "align_offset: align is not a power-of-two" |) ] |) diff --git a/CoqOfRust/core/range.v b/CoqOfRust/core/range.v index ae256b9cb..a1c2963a7 100644 --- a/CoqOfRust/core/range.v +++ b/CoqOfRust/core/range.v @@ -501,7 +501,7 @@ Module range. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String ".." |) ] |) + M.alloc (| Value.Array [ mk_str (| ".." |) ] |) |) |) |) @@ -1535,9 +1535,7 @@ Module range. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "..=" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "..=" |) ] |) |) |) |) @@ -2187,9 +2185,8 @@ Module range. M.alloc (| Value.Array [ - M.read (| - Value.String - "attempted to convert from an exhausted `legacy::RangeInclusive` (unspecified behavior)" + mk_str (| + "attempted to convert from an exhausted `legacy::RangeInclusive` (unspecified behavior)" |) ] |) @@ -2636,7 +2633,7 @@ Module range. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String ".." |) ] |) + M.alloc (| Value.Array [ mk_str (| ".." |) ] |) |) |) |) diff --git a/CoqOfRust/core/range/iter.v b/CoqOfRust/core/range/iter.v index 9e001be31..4dbb5311a 100644 --- a/CoqOfRust/core/range/iter.v +++ b/CoqOfRust/core/range/iter.v @@ -36,10 +36,7 @@ Module range. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IterRange" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "IterRange" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1151,10 +1148,7 @@ Module range. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IterRangeInclusive" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "IterRangeInclusive" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2066,10 +2060,7 @@ Module range. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IterRangeFrom" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "IterRangeFrom" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/result.v b/CoqOfRust/core/result.v index 7c70a76c0..9c95e5e76 100644 --- a/CoqOfRust/core/result.v +++ b/CoqOfRust/core/result.v @@ -619,10 +619,7 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Ok" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Ok" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -650,10 +647,7 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Err" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Err" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -1995,9 +1989,7 @@ Module result. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "called `Result::unwrap()` on an `Err` value" - |) + mk_str (| "called `Result::unwrap()` on an `Err` value" |) |) |); M.borrow (| @@ -2181,9 +2173,7 @@ Module result. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "called `Result::unwrap_err()` on an `Ok` value" - |) + mk_str (| "called `Result::unwrap_err()` on an `Ok` value" |) |) |); M.borrow (| @@ -3155,9 +3145,7 @@ Module result. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |); M.read (| Value.String ": " |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| ": " |) ] |) |) |) |); @@ -3628,8 +3616,8 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Iter" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "inner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3940,8 +3928,8 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "IterMut" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "inner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "IterMut" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -4264,8 +4252,8 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "IntoIter" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "inner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "IntoIter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/slice/ascii.v b/CoqOfRust/core/slice/ascii.v index dd508d1f4..7322879f8 100644 --- a/CoqOfRust/core/slice/ascii.v +++ b/CoqOfRust/core/slice/ascii.v @@ -2789,10 +2789,7 @@ Module slice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EscapeAscii" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EscapeAscii" |) |) |) ] |) |) diff --git a/CoqOfRust/core/slice/index.v b/CoqOfRust/core/slice/index.v index 6310752a2..b5726843e 100644 --- a/CoqOfRust/core/slice/index.v +++ b/CoqOfRust/core/slice/index.v @@ -263,11 +263,7 @@ Module slice. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "attempted to index slice from after maximum usize" - |) - ] + [ mk_str (| "attempted to index slice from after maximum usize" |) ] |) |) |) @@ -319,11 +315,7 @@ Module slice. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "attempted to index slice up to maximum usize" - |) - ] + [ mk_str (| "attempted to index slice up to maximum usize" |) ] |) |) |) diff --git a/CoqOfRust/core/slice/iter.v b/CoqOfRust/core/slice/iter.v index 8ae2b72fc..230303546 100644 --- a/CoqOfRust/core/slice/iter.v +++ b/CoqOfRust/core/slice/iter.v @@ -177,10 +177,7 @@ Module slice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Iter" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Iter" |) |) |) ] |) |) @@ -596,7 +593,7 @@ Module slice. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IterMut" |) |) + M.deref (| mk_str (| "IterMut" |) |) |) ] |) @@ -1440,16 +1437,13 @@ Module slice. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Split" |) |) + M.deref (| mk_str (| "Split" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "v" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "v" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1467,10 +1461,7 @@ Module slice. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "finished" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "finished" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2575,16 +2566,13 @@ Module slice. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SplitInclusive" |) |) + M.deref (| mk_str (| "SplitInclusive" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "v" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "v" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2602,10 +2590,7 @@ Module slice. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "finished" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "finished" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3821,16 +3806,13 @@ Module slice. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SplitMut" |) |) + M.deref (| mk_str (| "SplitMut" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "v" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "v" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3848,10 +3830,7 @@ Module slice. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "finished" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "finished" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -4970,18 +4949,13 @@ Module slice. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "SplitInclusiveMut" |) - |) + M.deref (| mk_str (| "SplitInclusiveMut" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "v" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "v" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -4999,10 +4973,7 @@ Module slice. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "finished" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "finished" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -6126,16 +6097,13 @@ Module slice. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RSplit" |) |) + M.deref (| mk_str (| "RSplit" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "v" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "v" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -6157,10 +6125,7 @@ Module slice. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "finished" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "finished" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -6600,16 +6565,13 @@ Module slice. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RSplitMut" |) |) + M.deref (| mk_str (| "RSplitMut" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "v" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "v" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -6631,10 +6593,7 @@ Module slice. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "finished" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "finished" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -6924,11 +6883,8 @@ Module slice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "GenericSplitN" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "GenericSplitN" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -6942,7 +6898,7 @@ Module slice. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "count" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "count" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -7372,18 +7328,12 @@ Module slice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SplitN" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SplitN" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "inner" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -7520,16 +7470,13 @@ Module slice. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RSplitN" |) |) + M.deref (| mk_str (| "RSplitN" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "inner" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -7666,16 +7613,13 @@ Module slice. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SplitNMut" |) |) + M.deref (| mk_str (| "SplitNMut" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "inner" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -7812,16 +7756,13 @@ Module slice. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RSplitNMut" |) |) + M.deref (| mk_str (| "RSplitNMut" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "inner" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -7890,8 +7831,8 @@ Module slice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Windows" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "v" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Windows" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "v" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -7905,7 +7846,7 @@ Module slice. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "size" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "size" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -9663,8 +9604,8 @@ Module slice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Chunks" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "v" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Chunks" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "v" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -9678,10 +9619,7 @@ Module slice. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "chunk_size" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "chunk_size" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11523,11 +11461,8 @@ Module slice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ChunksMut" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "v" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ChunksMut" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "v" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11541,10 +11476,7 @@ Module slice. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "chunk_size" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "chunk_size" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11558,7 +11490,7 @@ Module slice. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "_marker" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "_marker" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -13396,11 +13328,8 @@ Module slice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ChunksExact" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "v" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ChunksExact" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "v" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -13414,7 +13343,7 @@ Module slice. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "rem" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "rem" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -13428,10 +13357,7 @@ Module slice. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "chunk_size" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "chunk_size" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -14805,11 +14731,8 @@ Module slice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ChunksExactMut" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "v" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ChunksExactMut" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "v" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -14823,7 +14746,7 @@ Module slice. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "rem" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "rem" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -14837,10 +14760,7 @@ Module slice. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "chunk_size" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "chunk_size" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -14854,7 +14774,7 @@ Module slice. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "_marker" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "_marker" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -16272,14 +16192,8 @@ Module slice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ArrayWindows" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "slice_head" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ArrayWindows" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "slice_head" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -16293,7 +16207,7 @@ Module slice. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "num" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "num" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -16307,7 +16221,7 @@ Module slice. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "marker" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "marker" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -17511,11 +17425,8 @@ Module slice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ArrayChunks" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ArrayChunks" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -17529,7 +17440,7 @@ Module slice. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "rem" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "rem" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -18368,11 +18279,8 @@ Module slice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ArrayChunksMut" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ArrayChunksMut" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -18386,7 +18294,7 @@ Module slice. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "rem" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "rem" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -19160,8 +19068,8 @@ Module slice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "RChunks" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "v" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "RChunks" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "v" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -19175,10 +19083,7 @@ Module slice. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "chunk_size" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "chunk_size" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -20948,11 +20853,8 @@ Module slice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RChunksMut" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "v" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "RChunksMut" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "v" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -20966,10 +20868,7 @@ Module slice. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "chunk_size" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "chunk_size" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -20983,7 +20882,7 @@ Module slice. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "_marker" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "_marker" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -22776,11 +22675,8 @@ Module slice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RChunksExact" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "v" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "RChunksExact" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "v" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -22794,7 +22690,7 @@ Module slice. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "rem" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "rem" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -22808,10 +22704,7 @@ Module slice. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "chunk_size" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "chunk_size" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -24253,11 +24146,8 @@ Module slice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RChunksExactMut" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "v" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "RChunksExactMut" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "v" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -24271,7 +24161,7 @@ Module slice. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "rem" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "rem" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -24285,10 +24175,7 @@ Module slice. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "chunk_size" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "chunk_size" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -26648,16 +26535,13 @@ Module slice. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ChunkBy" |) |) + M.deref (| mk_str (| "ChunkBy" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "slice" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "slice" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -27629,16 +27513,13 @@ Module slice. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ChunkByMut" |) |) + M.deref (| mk_str (| "ChunkByMut" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "slice" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "slice" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/slice/mod.v b/CoqOfRust/core/slice/mod.v index eece6a590..5c98ff00d 100644 --- a/CoqOfRust/core/slice/mod.v +++ b/CoqOfRust/core/slice/mod.v @@ -379,11 +379,7 @@ Module slice. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "internal error: entered unreachable code" - |) - ] + [ mk_str (| "internal error: entered unreachable code" |) ] |) |) |))) @@ -3242,7 +3238,7 @@ Module slice. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "window size must be non-zero" |) |) + M.deref (| mk_str (| "window size must be non-zero" |) |) |) ] |) @@ -3325,12 +3321,7 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "chunk size must be non-zero" - |) - ] + Value.Array [ mk_str (| "chunk size must be non-zero" |) ] |) |) |) @@ -3422,12 +3413,7 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "chunk size must be non-zero" - |) - ] + Value.Array [ mk_str (| "chunk size must be non-zero" |) ] |) |) |) @@ -3519,12 +3505,7 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "chunk size must be non-zero" - |) - ] + Value.Array [ mk_str (| "chunk size must be non-zero" |) ] |) |) |) @@ -3621,12 +3602,7 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "chunk size must be non-zero" - |) - ] + Value.Array [ mk_str (| "chunk size must be non-zero" |) ] |) |) |) @@ -3868,12 +3844,7 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "chunk size must be non-zero" - |) - ] + Value.Array [ mk_str (| "chunk size must be non-zero" |) ] |) |) |) @@ -4041,12 +4012,7 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "chunk size must be non-zero" - |) - ] + Value.Array [ mk_str (| "chunk size must be non-zero" |) ] |) |) |) @@ -4221,12 +4187,7 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "chunk size must be non-zero" - |) - ] + Value.Array [ mk_str (| "chunk size must be non-zero" |) ] |) |) |) @@ -4496,12 +4457,7 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "chunk size must be non-zero" - |) - ] + Value.Array [ mk_str (| "chunk size must be non-zero" |) ] |) |) |) @@ -4682,12 +4638,7 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "chunk size must be non-zero" - |) - ] + Value.Array [ mk_str (| "chunk size must be non-zero" |) ] |) |) |) @@ -4872,12 +4823,7 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "chunk size must be non-zero" - |) - ] + Value.Array [ mk_str (| "chunk size must be non-zero" |) ] |) |) |) @@ -4966,11 +4912,7 @@ Module slice. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "window size must be non-zero" - |) - ] + [ mk_str (| "window size must be non-zero" |) ] |) |) |) @@ -5059,12 +5001,7 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "chunk size must be non-zero" - |) - ] + Value.Array [ mk_str (| "chunk size must be non-zero" |) ] |) |) |) @@ -5156,12 +5093,7 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "chunk size must be non-zero" - |) - ] + Value.Array [ mk_str (| "chunk size must be non-zero" |) ] |) |) |) @@ -5253,12 +5185,7 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "chunk size must be non-zero" - |) - ] + Value.Array [ mk_str (| "chunk size must be non-zero" |) ] |) |) |) @@ -5355,12 +5282,7 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "chunk size must be non-zero" - |) - ] + Value.Array [ mk_str (| "chunk size must be non-zero" |) ] |) |) |) @@ -5549,9 +5471,7 @@ Module slice. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "mid > len" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "mid > len" |) ] |) |) |) |) @@ -5654,9 +5574,7 @@ Module slice. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "mid > len" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "mid > len" |) ] |) |) |) |) @@ -10036,7 +9954,7 @@ Module slice. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: mid <= self.len()" |) ] + [ mk_str (| "assertion failed: mid <= self.len()" |) ] |) |) |))); @@ -10158,7 +10076,7 @@ Module slice. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: k <= self.len()" |) ] + [ mk_str (| "assertion failed: k <= self.len()" |) ] |) |) |))); @@ -10746,11 +10664,7 @@ Module slice. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "dest is out of bounds" - |) - ] + [ mk_str (| "dest is out of bounds" |) ] |) |) |) @@ -10917,9 +10831,8 @@ Module slice. M.alloc (| Value.Array [ - M.read (| - Value.String - "destination and source slices have different lengths" + mk_str (| + "destination and source slices have different lengths" |) ] |) @@ -15280,12 +15193,7 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "elements are zero-sized" - |) - ] + Value.Array [ mk_str (| "elements are zero-sized" |) ] |) |) |) @@ -15508,12 +15416,7 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "elements are zero-sized" - |) - ] + Value.Array [ mk_str (| "elements are zero-sized" |) ] |) |) |) @@ -15812,7 +15715,7 @@ Module slice. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "slice len overflow" |) |) + M.deref (| mk_str (| "slice len overflow" |) |) |) ] |) @@ -15986,7 +15889,7 @@ Module slice. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "slice len overflow" |) |) + M.deref (| mk_str (| "slice len overflow" |) |) |) ] |) @@ -16284,9 +16187,8 @@ Module slice. M.alloc (| Value.Array [ - M.read (| - Value.String - "destination and source slices have different lengths" + mk_str (| + "destination and source slices have different lengths" |) ] |) @@ -17209,10 +17111,7 @@ Module slice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "GetManyMutError" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "GetManyMutError" |) |) |) ] |) |) @@ -17258,9 +17157,7 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "an index is out of bounds or appeared multiple times in the array" - |) + mk_str (| "an index is out of bounds or appeared multiple times in the array" |) |) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) diff --git a/CoqOfRust/core/slice/sort/select.v b/CoqOfRust/core/slice/sort/select.v index 811cf32c1..62f5671de 100644 --- a/CoqOfRust/core/slice/sort/select.v +++ b/CoqOfRust/core/slice/sort/select.v @@ -107,12 +107,8 @@ Module slice. M.alloc (| Value.Array [ - M.read (| - Value.String "partition_at_index index " - |); - M.read (| - Value.String " greater than length of slice " - |) + mk_str (| "partition_at_index index " |); + mk_str (| " greater than length of slice " |) ] |) |) @@ -2057,11 +2053,7 @@ Module slice. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: k < v.len()" - |) - ] + [ mk_str (| "assertion failed: k < v.len()" |) ] |) |) |))); @@ -2111,11 +2103,7 @@ Module slice. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: !T::IS_ZST" - |) - ] + [ mk_str (| "assertion failed: !T::IS_ZST" |) ] |) |) |))); diff --git a/CoqOfRust/core/slice/sort/shared/smallsort.v b/CoqOfRust/core/slice/sort/shared/smallsort.v index 9e2c0ba58..9f0894f3c 100644 --- a/CoqOfRust/core/slice/sort/shared/smallsort.v +++ b/CoqOfRust/core/slice/sort/shared/smallsort.v @@ -6688,9 +6688,8 @@ Module slice. M.alloc (| Value.Array [ - M.read (| - Value.String - "user-provided comparison function does not correctly implement a total order" + mk_str (| + "user-provided comparison function does not correctly implement a total order" |) ] |) diff --git a/CoqOfRust/core/slice/sort/stable/drift.v b/CoqOfRust/core/slice/sort/stable/drift.v index decef1c0d..33a1b51b0 100644 --- a/CoqOfRust/core/slice/sort/stable/drift.v +++ b/CoqOfRust/core/slice/sort/stable/drift.v @@ -1089,9 +1089,7 @@ Module slice. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Platform not supported" |) - ] + Value.Array [ mk_str (| "Platform not supported" |) ] |) |) |) diff --git a/CoqOfRust/core/str/error.v b/CoqOfRust/core/str/error.v index 780ed99aa..93f1ef5ad 100644 --- a/CoqOfRust/core/str/error.v +++ b/CoqOfRust/core/str/error.v @@ -210,14 +210,8 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Utf8Error" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "valid_up_to" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Utf8Error" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "valid_up_to" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -231,10 +225,7 @@ Module str. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "error_len" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "error_len" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -428,8 +419,8 @@ Module str. M.alloc (| Value.Array [ - M.read (| Value.String "invalid utf-8 sequence of " |); - M.read (| Value.String " bytes from index " |) + mk_str (| "invalid utf-8 sequence of " |); + mk_str (| " bytes from index " |) ] |) |) @@ -530,9 +521,8 @@ Module str. M.alloc (| Value.Array [ - M.read (| - Value.String - "incomplete utf-8 byte sequence from index " + mk_str (| + "incomplete utf-8 byte sequence from index " |) ] |) @@ -611,7 +601,7 @@ Module str. (let self := M.alloc (| self |) in M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "invalid utf-8: corrupt contents" |) |) + M.deref (| mk_str (| "invalid utf-8: corrupt contents" |) |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -651,10 +641,7 @@ Module str. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ParseBoolError" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ParseBoolError" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -776,9 +763,7 @@ Module str. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "provided string was not `true` or `false`" |) - |) + M.deref (| mk_str (| "provided string was not `true` or `false`" |) |) |); M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |) ] @@ -808,10 +793,7 @@ Module str. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "failed to parse bool" |) |) - |))) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "failed to parse bool" |) |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/str/iter.v b/CoqOfRust/core/str/iter.v index 9d23f6271..ca65c1b43 100644 --- a/CoqOfRust/core/str/iter.v +++ b/CoqOfRust/core/str/iter.v @@ -1328,9 +1328,7 @@ Module str. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Chars(" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Chars(" |) ] |) |) |) |) @@ -1612,9 +1610,7 @@ Module str. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String ")" |) ] - |) + M.alloc (| Value.Array [ mk_str (| ")" |) ] |) |) |) |) @@ -1969,14 +1965,8 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CharIndices" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "front_offset" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CharIndices" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "front_offset" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1990,7 +1980,7 @@ Module str. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "iter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2614,7 +2604,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Bytes" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Bytes" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3610,9 +3600,7 @@ Module str. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "SplitInternal" - |) + mk_str (| "SplitInternal" |) |) |) ] @@ -3621,9 +3609,7 @@ Module str. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "start" |) - |) + M.deref (| mk_str (| "start" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -3644,7 +3630,7 @@ Module str. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "end" |) |) + M.deref (| mk_str (| "end" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -3665,7 +3651,7 @@ Module str. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "matcher" |) |) + M.deref (| mk_str (| "matcher" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -3686,7 +3672,7 @@ Module str. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "allow_trailing_empty" |) |) + M.deref (| mk_str (| "allow_trailing_empty" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -3705,10 +3691,7 @@ Module str. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "finished" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "finished" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5419,10 +5402,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Split" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Split" |) |) |) ] |) |) @@ -5627,10 +5607,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RSplit" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "RSplit" |) |) |) ] |) |) @@ -6054,7 +6031,7 @@ Module str. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SplitTerminator" |) |) + M.deref (| mk_str (| "SplitTerminator" |) |) |) ] |) @@ -6265,7 +6242,7 @@ Module str. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RSplitTerminator" |) |) + M.deref (| mk_str (| "RSplitTerminator" |) |) |) ] |) @@ -6787,16 +6764,13 @@ Module str. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SplitNInternal" |) |) + M.deref (| mk_str (| "SplitNInternal" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "iter" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "iter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -6814,10 +6788,7 @@ Module str. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "count" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "count" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -7232,10 +7203,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SplitN" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SplitN" |) |) |) ] |) |) @@ -7442,7 +7410,7 @@ Module str. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RSplitN" |) |) + M.deref (| mk_str (| "RSplitN" |) |) |) ] |) @@ -7832,7 +7800,7 @@ Module str. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MatchIndicesInternal" |) |) + M.deref (| mk_str (| "MatchIndicesInternal" |) |) |) ] |) @@ -8249,7 +8217,7 @@ Module str. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MatchIndices" |) |) + M.deref (| mk_str (| "MatchIndices" |) |) |) ] |) @@ -8461,7 +8429,7 @@ Module str. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RMatchIndices" |) |) + M.deref (| mk_str (| "RMatchIndices" |) |) |) ] |) @@ -8864,7 +8832,7 @@ Module str. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MatchesInternal" |) |) + M.deref (| mk_str (| "MatchesInternal" |) |) |) ] |) @@ -9264,7 +9232,7 @@ Module str. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Matches" |) |) + M.deref (| mk_str (| "Matches" |) |) |) ] |) @@ -9472,7 +9440,7 @@ Module str. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RMatches" |) |) + M.deref (| mk_str (| "RMatches" |) |) |) ] |) @@ -9844,7 +9812,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Lines" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Lines" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -10213,7 +10181,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "LinesAny" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LinesAny" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -10518,11 +10486,8 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SplitWhitespace" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "inner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SplitWhitespace" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -10688,11 +10653,8 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SplitAsciiWhitespace" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "inner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SplitAsciiWhitespace" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11459,16 +11421,13 @@ Module str. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SplitInclusive" |) |) + M.deref (| mk_str (| "SplitInclusive" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "0" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "0" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11794,10 +11753,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EncodeUtf16" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EncodeUtf16" |) |) |) ] |) |) @@ -12371,11 +12327,8 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EscapeDebug" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "inner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EscapeDebug" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -12517,11 +12470,8 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EscapeDefault" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "inner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EscapeDefault" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -12663,11 +12613,8 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EscapeUnicode" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "inner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EscapeUnicode" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/str/lossy.v b/CoqOfRust/core/str/lossy.v index 4f75959ab..d51692d70 100644 --- a/CoqOfRust/core/str/lossy.v +++ b/CoqOfRust/core/str/lossy.v @@ -161,11 +161,8 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Utf8Chunk" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "valid" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Utf8Chunk" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "valid" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -179,7 +176,7 @@ Module str. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "invalid" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "invalid" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1788,9 +1785,8 @@ Module str. M.alloc (| Value.Array [ - M.read (| - Value.String - "\x" + mk_str (| + "\x" |) ] |) @@ -3209,16 +3205,13 @@ Module str. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Utf8Chunks" |) |) + M.deref (| mk_str (| "Utf8Chunks" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "source" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "source" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/core/str/mod.v b/CoqOfRust/core/str/mod.v index cca375772..ac4a8a506 100644 --- a/CoqOfRust/core/str/mod.v +++ b/CoqOfRust/core/str/mod.v @@ -95,11 +95,7 @@ Module str. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "failed to slice string" - |) - ] + [ mk_str (| "failed to slice string" |) ] |) |) |) @@ -224,11 +220,11 @@ Module str. |) |)) in let _ := M.is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - Value.String "[...]")); + M.alloc (| mk_str (| "[...]" |) |))); fun γ => ltac:(M.monadic (M.alloc (| - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) |))) ] |) @@ -332,9 +328,9 @@ Module str. M.alloc (| Value.Array [ - M.read (| Value.String "byte index " |); - M.read (| Value.String " is out of bounds of `" |); - M.read (| Value.String "`" |) + mk_str (| "byte index " |); + mk_str (| " is out of bounds of `" |); + mk_str (| "`" |) ] |) |) @@ -454,10 +450,10 @@ Module str. M.alloc (| Value.Array [ - M.read (| Value.String "begin <= end (" |); - M.read (| Value.String " <= " |); - M.read (| Value.String ") when slicing `" |); - M.read (| Value.String "`" |) + mk_str (| "begin <= end (" |); + mk_str (| " <= " |); + mk_str (| ") when slicing `" |); + mk_str (| "`" |) ] |) |) @@ -701,11 +697,11 @@ Module str. M.alloc (| Value.Array [ - M.read (| Value.String "byte index " |); - M.read (| Value.String " is not a char boundary; it is inside " |); - M.read (| Value.String " (bytes " |); - M.read (| Value.String ") of `" |); - M.read (| Value.String "`" |) + mk_str (| "byte index " |); + mk_str (| " is not a char boundary; it is inside " |); + mk_str (| " (bytes " |); + mk_str (| ") of `" |); + mk_str (| "`" |) ] |) |) @@ -6037,8 +6033,7 @@ Module str. Definition default (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := match ε, τ, α with | [], [], [] => - ltac:(M.monadic - (M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |))) + ltac:(M.monadic (M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |))) | _, _, _ => M.impossible "wrong number of arguments" end. diff --git a/CoqOfRust/core/str/pattern.v b/CoqOfRust/core/str/pattern.v index a9cf70673..813a703b5 100644 --- a/CoqOfRust/core/str/pattern.v +++ b/CoqOfRust/core/str/pattern.v @@ -476,9 +476,8 @@ Module str. M.alloc (| Value.Array [ - M.read (| - Value.String - "The first search step from Searcher must include the first character" + mk_str (| + "The first search step from Searcher must include the first character" |) ] |) @@ -777,9 +776,8 @@ Module str. M.alloc (| Value.Array [ - M.read (| - Value.String - "The first search step from ReverseSearcher must include the last character" + mk_str (| + "The first search step from ReverseSearcher must include the last character" |) ] |) @@ -1207,7 +1205,7 @@ Module str. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "StringPattern" |) |) + M.deref (| mk_str (| "StringPattern" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -1242,7 +1240,7 @@ Module str. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CharPattern" |) |) + M.deref (| mk_str (| "CharPattern" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -1636,10 +1634,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Match" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Match" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_0 |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -1679,10 +1674,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Reject" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Reject" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_0 |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -1709,10 +1701,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Done" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Done" |) |) |) ] |) |))) @@ -2368,26 +2357,20 @@ Module str. M.alloc (| Value.Array [ - M.read (| Value.String "haystack" |); + mk_str (| "haystack" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "finger" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "finger" |) |) + M.deref (| mk_str (| "finger_back" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "needle" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "finger_back" |) |) + M.deref (| mk_str (| "utf8_size" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "needle" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "utf8_size" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "utf8_encoded" |) |) + M.deref (| mk_str (| "utf8_encoded" |) |) |) ] |) @@ -2517,10 +2500,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CharSearcher" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CharSearcher" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| names |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| values |) |) |) ] @@ -4694,7 +4674,7 @@ Module str. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "char len should be less than 255" |) |) + M.deref (| mk_str (| "char len should be less than 255" |) |) |) ] |) @@ -5582,11 +5562,8 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MultiCharEqSearcher" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "char_eq" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MultiCharEqSearcher" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "char_eq" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5600,7 +5577,7 @@ Module str. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "haystack" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "haystack" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5614,10 +5591,7 @@ Module str. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "char_indices" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "char_indices" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -6334,10 +6308,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CharArraySearcher" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CharArraySearcher" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -6487,10 +6458,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CharArrayRefSearcher" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CharArrayRefSearcher" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -7999,10 +7967,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CharSliceSearcher" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CharSliceSearcher" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -8778,9 +8743,7 @@ Module str. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "CharPredicateSearcher" |) - |) + M.deref (| mk_str (| "CharPredicateSearcher" |) |) |) ] |) @@ -8788,7 +8751,7 @@ Module str. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "haystack" |) |) + M.deref (| mk_str (| "haystack" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -8811,10 +8774,7 @@ Module str. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "char_indices" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "char_indices" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11172,11 +11132,8 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "StrSearcher" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "haystack" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "StrSearcher" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "haystack" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11190,7 +11147,7 @@ Module str. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "needle" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "needle" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11204,7 +11161,7 @@ Module str. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "searcher" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "searcher" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11393,10 +11350,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Empty" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Empty" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -11428,10 +11382,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TwoWay" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "TwoWay" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -11657,11 +11608,8 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EmptyNeedle" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "position" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EmptyNeedle" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "position" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11675,7 +11623,7 @@ Module str. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "end" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "end" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11689,10 +11637,7 @@ Module str. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "is_match_fw" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "is_match_fw" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11706,10 +11651,7 @@ Module str. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "is_match_bw" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "is_match_bw" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11723,10 +11665,7 @@ Module str. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "is_finished" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "is_finished" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -14184,34 +14123,22 @@ Module str. M.alloc (| Value.Array [ - M.read (| Value.String "crit_pos" |); + mk_str (| "crit_pos" |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "crit_pos_back" |) |) + M.deref (| mk_str (| "crit_pos_back" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "period" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "byteset" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "period" |) |) + M.deref (| mk_str (| "position" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "end" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "memory" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "byteset" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "position" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "end" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "memory" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "memory_back" |) |) + M.deref (| mk_str (| "memory_back" |) |) |) ] |) @@ -14367,10 +14294,7 @@ Module str. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TwoWaySearcher" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "TwoWaySearcher" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| names |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| values |) |) |) ] @@ -18173,11 +18097,7 @@ Module str. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: period <= known_period" - |) - ] + [ mk_str (| "assertion failed: period <= known_period" |) ] |) |) |))); @@ -18557,11 +18477,7 @@ Module str. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: needle.len() > 1" - |) - ] + [ mk_str (| "assertion failed: needle.len() > 1" |) ] |) |) |))); diff --git a/CoqOfRust/core/str/traits.v b/CoqOfRust/core/str/traits.v index 67468d8d9..f08d8e9f2 100644 --- a/CoqOfRust/core/str/traits.v +++ b/CoqOfRust/core/str/traits.v @@ -329,9 +329,7 @@ Module str. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "attempted to index str up to maximum usize" |) - ] + Value.Array [ mk_str (| "attempted to index str up to maximum usize" |) ] |) |) |) @@ -6102,14 +6100,14 @@ Module str. fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "true" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "true" |) |) in M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Bool true ] |))); fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "false" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "false" |) |) in M.alloc (| Value.StructTuple "core::result::Result::Ok" [ Value.Bool false ] |))); diff --git a/CoqOfRust/core/sync/atomic.v b/CoqOfRust/core/sync/atomic.v index 18827ef23..7d354121c 100644 --- a/CoqOfRust/core/sync/atomic.v +++ b/CoqOfRust/core/sync/atomic.v @@ -252,10 +252,7 @@ Module sync. let _ := M.is_struct_tuple (| γ, "core::sync::atomic::Ordering::Relaxed" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Relaxed" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Relaxed" |) |) |) |))); fun γ => ltac:(M.monadic @@ -263,10 +260,7 @@ Module sync. let _ := M.is_struct_tuple (| γ, "core::sync::atomic::Ordering::Release" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Release" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Release" |) |) |) |))); fun γ => ltac:(M.monadic @@ -274,10 +268,7 @@ Module sync. let _ := M.is_struct_tuple (| γ, "core::sync::atomic::Ordering::Acquire" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Acquire" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Acquire" |) |) |) |))); fun γ => ltac:(M.monadic @@ -285,10 +276,7 @@ Module sync. let _ := M.is_struct_tuple (| γ, "core::sync::atomic::Ordering::AcqRel" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AcqRel" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "AcqRel" |) |) |) |))); fun γ => ltac:(M.monadic @@ -296,10 +284,7 @@ Module sync. let _ := M.is_struct_tuple (| γ, "core::sync::atomic::Ordering::SeqCst" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SeqCst" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SeqCst" |) |) |) |))) ] |) @@ -1273,9 +1258,8 @@ Module sync. M.alloc (| Value.Array [ - M.read (| - Value.String - "there is no such thing as an acquire-release failure ordering" + mk_str (| + "there is no such thing as an acquire-release failure ordering" |) ] |) @@ -1378,9 +1362,8 @@ Module sync. M.alloc (| Value.Array [ - M.read (| - Value.String - "there is no such thing as a release failure ordering" + mk_str (| + "there is no such thing as a release failure ordering" |) ] |) @@ -18408,9 +18391,8 @@ Module sync. M.alloc (| Value.Array [ - M.read (| - Value.String - "there is no such thing as an acquire store" + mk_str (| + "there is no such thing as an acquire store" |) ] |) @@ -18449,9 +18431,8 @@ Module sync. M.alloc (| Value.Array [ - M.read (| - Value.String - "there is no such thing as an acquire-release store" + mk_str (| + "there is no such thing as an acquire-release store" |) ] |) @@ -18555,11 +18536,7 @@ Module sync. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String - "there is no such thing as a release load" - |) + [ mk_str (| "there is no such thing as a release load" |) ] |) |) @@ -18597,9 +18574,8 @@ Module sync. M.alloc (| Value.Array [ - M.read (| - Value.String - "there is no such thing as an acquire-release load" + mk_str (| + "there is no such thing as an acquire-release load" |) ] |) @@ -19247,9 +19223,8 @@ Module sync. M.alloc (| Value.Array [ - M.read (| - Value.String - "there is no such thing as an acquire-release failure ordering" + mk_str (| + "there is no such thing as an acquire-release failure ordering" |) ] |) @@ -19291,9 +19266,8 @@ Module sync. M.alloc (| Value.Array [ - M.read (| - Value.String - "there is no such thing as a release failure ordering" + mk_str (| + "there is no such thing as a release failure ordering" |) ] |) @@ -19712,9 +19686,8 @@ Module sync. M.alloc (| Value.Array [ - M.read (| - Value.String - "there is no such thing as an acquire-release failure ordering" + mk_str (| + "there is no such thing as an acquire-release failure ordering" |) ] |) @@ -19756,9 +19729,8 @@ Module sync. M.alloc (| Value.Array [ - M.read (| - Value.String - "there is no such thing as a release failure ordering" + mk_str (| + "there is no such thing as a release failure ordering" |) ] |) @@ -20597,11 +20569,7 @@ Module sync. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String - "there is no such thing as a relaxed fence" - |) + [ mk_str (| "there is no such thing as a relaxed fence" |) ] |) |) @@ -20730,9 +20698,8 @@ Module sync. M.alloc (| Value.Array [ - M.read (| - Value.String - "there is no such thing as a relaxed compiler fence" + mk_str (| + "there is no such thing as a relaxed compiler fence" |) ] |) diff --git a/CoqOfRust/core/sync/exclusive.v b/CoqOfRust/core/sync/exclusive.v index 699a1e6a2..85f99f1e3 100644 --- a/CoqOfRust/core/sync/exclusive.v +++ b/CoqOfRust/core/sync/exclusive.v @@ -99,10 +99,7 @@ Module sync. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Exclusive" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Exclusive" |) |) |) ] |) |) diff --git a/CoqOfRust/core/task/poll.v b/CoqOfRust/core/task/poll.v index 50445fab1..011d67e15 100644 --- a/CoqOfRust/core/task/poll.v +++ b/CoqOfRust/core/task/poll.v @@ -148,10 +148,7 @@ Module task. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Ready" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Ready" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -177,10 +174,7 @@ Module task. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Pending" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Pending" |) |) |) ] |) |))) diff --git a/CoqOfRust/core/task/wake.v b/CoqOfRust/core/task/wake.v index a2a228445..ce0d59253 100644 --- a/CoqOfRust/core/task/wake.v +++ b/CoqOfRust/core/task/wake.v @@ -121,8 +121,8 @@ Module task. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "RawWaker" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "data" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "RawWaker" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "data" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -136,7 +136,7 @@ Module task. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "vtable" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "vtable" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -456,11 +456,8 @@ Module task. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RawWakerVTable" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "clone" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "RawWakerVTable" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "clone" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -474,7 +471,7 @@ Module task. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "wake" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "wake" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -488,10 +485,7 @@ Module task. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "wake_by_ref" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "wake_by_ref" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -505,7 +499,7 @@ Module task. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "drop" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "drop" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -642,10 +636,7 @@ Module task. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Some" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Some" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -677,10 +668,7 @@ Module task. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "None" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "None" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -985,16 +973,13 @@ Module task. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Context" |) |) + M.deref (| mk_str (| "Context" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "waker" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "waker" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1076,11 +1061,8 @@ Module task. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ContextBuilder" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "waker" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ContextBuilder" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "waker" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1094,10 +1076,7 @@ Module task. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "local_waker" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "local_waker" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1111,7 +1090,7 @@ Module task. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "ext" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ext" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1125,7 +1104,7 @@ Module task. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "_marker" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "_marker" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1139,7 +1118,7 @@ Module task. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "_marker2" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "_marker2" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2251,7 +2230,7 @@ Module task. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Waker" |) |) + M.deref (| mk_str (| "Waker" |) |) |) ] |) @@ -2259,7 +2238,7 @@ Module task. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "data" |) |) + M.deref (| mk_str (| "data" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -2282,10 +2261,7 @@ Module task. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "vtable" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "vtable" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, vtable_ptr |) |) @@ -3083,7 +3059,7 @@ Module task. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LocalWaker" |) |) + M.deref (| mk_str (| "LocalWaker" |) |) |) ] |) @@ -3091,7 +3067,7 @@ Module task. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "data" |) |) + M.deref (| mk_str (| "data" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -3114,10 +3090,7 @@ Module task. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "vtable" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "vtable" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, vtable_ptr |) |) diff --git a/CoqOfRust/core/time.v b/CoqOfRust/core/time.v index daa5f1ec7..0dff17f37 100644 --- a/CoqOfRust/core/time.v +++ b/CoqOfRust/core/time.v @@ -1144,7 +1144,7 @@ Module time. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "overflow in Duration::new" |) |) + M.deref (| mk_str (| "overflow in Duration::new" |) |) |) ] |) @@ -1429,11 +1429,7 @@ Module time. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "overflow in Duration::from_weeks" - |) - ] + [ mk_str (| "overflow in Duration::from_weeks" |) ] |) |) |) @@ -1539,11 +1535,7 @@ Module time. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "overflow in Duration::from_days" - |) - ] + [ mk_str (| "overflow in Duration::from_days" |) ] |) |) |) @@ -1643,11 +1635,7 @@ Module time. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "overflow in Duration::from_hours" - |) - ] + [ mk_str (| "overflow in Duration::from_hours" |) ] |) |) |) @@ -1741,11 +1729,7 @@ Module time. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "overflow in Duration::from_mins" - |) - ] + [ mk_str (| "overflow in Duration::from_mins" |) ] |) |) |) @@ -2392,9 +2376,8 @@ Module time. [] |), [ - M.read (| - Value.String - "assertion failed: nanos < NANOS_PER_SEC" + mk_str (| + "assertion failed: nanos < NANOS_PER_SEC" |) ] |) @@ -2761,9 +2744,8 @@ Module time. [] |), [ - M.read (| - Value.String - "assertion failed: nanos < NANOS_PER_SEC" + mk_str (| + "assertion failed: nanos < NANOS_PER_SEC" |) ] |) @@ -3042,9 +3024,8 @@ Module time. [] |), [ - M.read (| - Value.String - "assertion failed: nanos < NANOS_PER_SEC" + mk_str (| + "assertion failed: nanos < NANOS_PER_SEC" |) ] |) @@ -3335,9 +3316,8 @@ Module time. [] |), [ - M.read (| - Value.String - "assertion failed: nanos < NANOS_PER_SEC" + mk_str (| + "assertion failed: nanos < NANOS_PER_SEC" |) ] |) @@ -5399,7 +5379,7 @@ Module time. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "overflow when adding durations" |) |) + M.deref (| mk_str (| "overflow when adding durations" |) |) |) ] |))) @@ -5501,7 +5481,7 @@ Module time. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "overflow when subtracting durations" |) |) + M.deref (| mk_str (| "overflow when subtracting durations" |) |) |) ] |))) @@ -5603,9 +5583,7 @@ Module time. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "overflow when multiplying duration by scalar" |) - |) + M.deref (| mk_str (| "overflow when multiplying duration by scalar" |) |) |) ] |))) @@ -5749,9 +5727,7 @@ Module time. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "divide by zero error when dividing duration by scalar" |) - |) + M.deref (| mk_str (| "divide by zero error when dividing duration by scalar" |) |) |) ] |))) @@ -5941,9 +5917,8 @@ Module time. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "overflow in iter::sum over durations" + mk_str (| + "overflow in iter::sum over durations" |) |) |) @@ -6049,9 +6024,8 @@ Module time. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "overflow in iter::sum over durations" + mk_str (| + "overflow in iter::sum over durations" |) |) |) @@ -6125,9 +6099,7 @@ Module time. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "overflow in iter::sum over durations" |) - |) + M.deref (| mk_str (| "overflow in iter::sum over durations" |) |) |) ] |) @@ -6290,9 +6262,8 @@ Module time. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "overflow in iter::sum over durations" + mk_str (| + "overflow in iter::sum over durations" |) |) |) @@ -6398,9 +6369,8 @@ Module time. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "overflow in iter::sum over durations" + mk_str (| + "overflow in iter::sum over durations" |) |) |) @@ -6474,9 +6444,7 @@ Module time. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "overflow in iter::sum over durations" |) - |) + M.deref (| mk_str (| "overflow in iter::sum over durations" |) |) |) ] |) @@ -6736,14 +6704,11 @@ Module time. |)) in let _ := M.is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - Value.String "+")); + M.alloc (| mk_str (| "+" |) |))); fun γ => ltac:(M.monadic (M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) |))) ] |) @@ -6805,10 +6770,7 @@ Module time. Value.Integer IntegerKind.U32 10 |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| prefix |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "s" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "s" |) |) |) ] |) |))); @@ -6891,10 +6853,7 @@ Module time. Pointer.Kind.Ref, M.deref (| M.read (| prefix |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ms" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ms" |) |) |) ] |) |))); @@ -6998,9 +6957,7 @@ Module time. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String (String.String "181" "s") |) - |) + M.deref (| mk_str (| String.String "181" "s" |) |) |) ] |) @@ -7045,7 +7002,7 @@ Module time. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ns" |) |) + M.deref (| mk_str (| "ns" |) |) |) ] |) @@ -7100,11 +7057,8 @@ Module time. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TryFromFloatSecsError" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "kind" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "TryFromFloatSecsError" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "kind" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -7323,7 +7277,9 @@ Module time. γ, "core::time::TryFromFloatSecsErrorKind::Negative" |) in - Value.String "cannot convert float seconds to Duration: value is negative")); + M.alloc (| + mk_str (| "cannot convert float seconds to Duration: value is negative" |) + |))); fun γ => ltac:(M.monadic (let _ := @@ -7331,8 +7287,11 @@ Module time. γ, "core::time::TryFromFloatSecsErrorKind::OverflowOrNan" |) in - Value.String - "cannot convert float seconds to Duration: value is either too big or NaN")) + M.alloc (| + mk_str (| + "cannot convert float seconds to Duration: value is either too big or NaN" + |) + |))) ] |) |))) @@ -7452,10 +7411,7 @@ Module time. "core::time::TryFromFloatSecsErrorKind::Negative" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Negative" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Negative" |) |) |) |))); fun γ => ltac:(M.monadic @@ -7468,7 +7424,7 @@ Module time. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OverflowOrNan" |) |) + M.deref (| mk_str (| "OverflowOrNan" |) |) |) |))) ] diff --git a/CoqOfRust/core/ub_checks.v b/CoqOfRust/core/ub_checks.v index da00e59b7..7f7ae79a0 100644 --- a/CoqOfRust/core/ub_checks.v +++ b/CoqOfRust/core/ub_checks.v @@ -31,9 +31,8 @@ Module hint. Ty.path "never", M.get_function (| "core::panicking::panic_nounwind", [], [] |), [ - M.read (| - Value.String - "unsafe precondition(s) violated: hint::unreachable_unchecked must never be reached" + mk_str (| + "unsafe precondition(s) violated: hint::unreachable_unchecked must never be reached" |) ] |) @@ -82,9 +81,8 @@ Module hint. Ty.path "never", M.get_function (| "core::panicking::panic_nounwind", [], [] |), [ - M.read (| - Value.String - "unsafe precondition(s) violated: hint::assert_unchecked must never be called when the condition is false" + mk_str (| + "unsafe precondition(s) violated: hint::assert_unchecked must never be called when the condition is false" |) ] |) @@ -207,9 +205,8 @@ Module intrinsics. Ty.path "never", M.get_function (| "core::panicking::panic_nounwind", [], [] |), [ - M.read (| - Value.String - "unsafe precondition(s) violated: ptr::copy_nonoverlapping requires that both pointer arguments are aligned and non-null and the specified memory ranges do not overlap" + mk_str (| + "unsafe precondition(s) violated: ptr::copy_nonoverlapping requires that both pointer arguments are aligned and non-null and the specified memory ranges do not overlap" |) ] |) @@ -293,9 +290,8 @@ Module intrinsics. Ty.path "never", M.get_function (| "core::panicking::panic_nounwind", [], [] |), [ - M.read (| - Value.String - "unsafe precondition(s) violated: ptr::copy requires that both pointer arguments are aligned and non-null" + mk_str (| + "unsafe precondition(s) violated: ptr::copy requires that both pointer arguments are aligned and non-null" |) ] |) @@ -360,9 +356,8 @@ Module intrinsics. Ty.path "never", M.get_function (| "core::panicking::panic_nounwind", [], [] |), [ - M.read (| - Value.String - "unsafe precondition(s) violated: ptr::write_bytes requires that the destination pointer is aligned and non-null" + mk_str (| + "unsafe precondition(s) violated: ptr::write_bytes requires that the destination pointer is aligned and non-null" |) ] |) @@ -487,9 +482,8 @@ Module ptr. Ty.path "never", M.get_function (| "core::panicking::panic_nounwind", [], [] |), [ - M.read (| - Value.String - "unsafe precondition(s) violated: ptr::swap_nonoverlapping requires that both pointer arguments are aligned and non-null and the specified memory ranges do not overlap" + mk_str (| + "unsafe precondition(s) violated: ptr::swap_nonoverlapping requires that both pointer arguments are aligned and non-null and the specified memory ranges do not overlap" |) ] |) @@ -554,9 +548,8 @@ Module ptr. Ty.path "never", M.get_function (| "core::panicking::panic_nounwind", [], [] |), [ - M.read (| - Value.String - "unsafe precondition(s) violated: ptr::replace requires that the pointer argument is aligned and non-null" + mk_str (| + "unsafe precondition(s) violated: ptr::replace requires that the pointer argument is aligned and non-null" |) ] |) @@ -621,9 +614,8 @@ Module ptr. Ty.path "never", M.get_function (| "core::panicking::panic_nounwind", [], [] |), [ - M.read (| - Value.String - "unsafe precondition(s) violated: ptr::read requires that the pointer argument is aligned and non-null" + mk_str (| + "unsafe precondition(s) violated: ptr::read requires that the pointer argument is aligned and non-null" |) ] |) @@ -692,9 +684,8 @@ Module ptr. Ty.path "never", M.get_function (| "core::panicking::panic_nounwind", [], [] |), [ - M.read (| - Value.String - "unsafe precondition(s) violated: ptr::write requires that the pointer argument is aligned and non-null" + mk_str (| + "unsafe precondition(s) violated: ptr::write requires that the pointer argument is aligned and non-null" |) ] |) @@ -759,9 +750,8 @@ Module ptr. Ty.path "never", M.get_function (| "core::panicking::panic_nounwind", [], [] |), [ - M.read (| - Value.String - "unsafe precondition(s) violated: ptr::read_volatile requires that the pointer argument is aligned and non-null" + mk_str (| + "unsafe precondition(s) violated: ptr::read_volatile requires that the pointer argument is aligned and non-null" |) ] |) @@ -830,9 +820,8 @@ Module ptr. Ty.path "never", M.get_function (| "core::panicking::panic_nounwind", [], [] |), [ - M.read (| - Value.String - "unsafe precondition(s) violated: ptr::write_volatile requires that the pointer argument is aligned and non-null" + mk_str (| + "unsafe precondition(s) violated: ptr::write_volatile requires that the pointer argument is aligned and non-null" |) ] |) @@ -1179,9 +1168,8 @@ Module char. Ty.path "never", M.get_function (| "core::panicking::panic_nounwind", [], [] |), [ - M.read (| - Value.String - "unsafe precondition(s) violated: invalid value for `char`" + mk_str (| + "unsafe precondition(s) violated: invalid value for `char`" |) ] |) @@ -1269,9 +1257,8 @@ Module slice. Ty.path "never", M.get_function (| "core::panicking::panic_nounwind", [], [] |), [ - M.read (| - Value.String - "unsafe precondition(s) violated: slice::from_raw_parts requires the pointer to be aligned and non-null, and the total size of the slice not to exceed `isize::MAX`" + mk_str (| + "unsafe precondition(s) violated: slice::from_raw_parts requires the pointer to be aligned and non-null, and the total size of the slice not to exceed `isize::MAX`" |) ] |) @@ -1355,9 +1342,8 @@ Module slice. Ty.path "never", M.get_function (| "core::panicking::panic_nounwind", [], [] |), [ - M.read (| - Value.String - "unsafe precondition(s) violated: slice::from_raw_parts_mut requires the pointer to be aligned and non-null, and the total size of the slice not to exceed `isize::MAX`" + mk_str (| + "unsafe precondition(s) violated: slice::from_raw_parts_mut requires the pointer to be aligned and non-null, and the total size of the slice not to exceed `isize::MAX`" |) ] |) diff --git a/CoqOfRust/examples/default/examples/custom/constructor_as_function.v b/CoqOfRust/examples/default/examples/custom/constructor_as_function.v index 0dfc9cd95..e907ce077 100644 --- a/CoqOfRust/examples/default/examples/custom/constructor_as_function.v +++ b/CoqOfRust/examples/default/examples/custom/constructor_as_function.v @@ -78,7 +78,7 @@ Module Impl_core_fmt_Debug_for_constructor_as_function_Constructor. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Constructor" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Constructor" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -286,11 +286,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/custom/hello_world.v b/CoqOfRust/examples/default/examples/custom/hello_world.v index ec2a90597..96aeb0d8b 100644 --- a/CoqOfRust/examples/default/examples/custom/hello_world.v +++ b/CoqOfRust/examples/default/examples/custom/hello_world.v @@ -1,7 +1,8 @@ (* Generated by coq-of-rust *) Require Import CoqOfRust.CoqOfRust. -Definition message : Value.t := M.run_constant ltac:(M.monadic (Value.String "Hello, World!")). +Definition message : Value.t := + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "Hello, World!" |) |))). Axiom Constant_message : (M.get_constant "hello_world::message") = message. Global Hint Rewrite Constant_message : constant_rewrites. @@ -71,11 +72,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); @@ -162,12 +160,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Matched " |); - M.read (| Value.String "! -" |) - ] + Value.Array [ mk_str (| "Matched " |); mk_str (| "! +" |) ] |) |) |) @@ -246,12 +240,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Matched " |); - M.read (| Value.String "! -" |) - ] + Value.Array [ mk_str (| "Matched " |); mk_str (| "! +" |) ] |) |) |) @@ -317,9 +307,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "Didn't match a number. Let's go with a letter! + mk_str (| + "Didn't match a number. Let's go with a letter! " |) ] @@ -370,12 +359,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Matched " |); - M.read (| Value.String "! -" |) - ] + Value.Array [ mk_str (| "Matched " |); mk_str (| "! +" |) ] |) |) |) @@ -450,9 +435,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "Didn't match a number. Let's go with a letter! + mk_str (| + "Didn't match a number. Let's go with a letter! " |) ] @@ -493,9 +477,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "I don't like letters. Let's go with an emoticon :)! + mk_str (| + "I don't like letters. Let's go with an emoticon :)! " |) ] diff --git a/CoqOfRust/examples/default/examples/custom/module_duplicate.v b/CoqOfRust/examples/default/examples/custom/module_duplicate.v index 4a90255af..db801135f 100644 --- a/CoqOfRust/examples/default/examples/custom/module_duplicate.v +++ b/CoqOfRust/examples/default/examples/custom/module_duplicate.v @@ -34,10 +34,8 @@ Module foo. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "foo::gre::bar -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "foo::gre::bar +" |) ] |) |) |) |) @@ -90,7 +88,7 @@ Module foo. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "foo::bar + M.alloc (| Value.Array [ mk_str (| "foo::bar " |) ] |) |) |) 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 0c8cb038b..ee4773159 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/basic_contract_caller.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/basic_contract_caller.v @@ -230,7 +230,7 @@ Module Impl_basic_contract_caller_BasicContractCaller. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "not yet implemented" |) ] + [ mk_str (| "not yet implemented" |) ] |) |) |) in diff --git a/CoqOfRust/examples/default/examples/ink_contracts/call_runtime.v b/CoqOfRust/examples/default/examples/ink_contracts/call_runtime.v index 42511b7ae..ab3d944ea 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/call_runtime.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/call_runtime.v @@ -118,7 +118,20 @@ Module Impl_core_convert_From_call_runtime_AccountId_for_call_runtime_MultiAddre unimplemented!() } *) - Parameter from : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition from (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _value ] => + ltac:(M.monadic + (let _value := M.alloc (| _value |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Axiom Implements : M.IsTraitInstance @@ -234,10 +247,7 @@ Module Impl_core_fmt_Debug_for_call_runtime_RuntimeError. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CallRuntimeFailed" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CallRuntimeFailed" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -377,7 +387,7 @@ Module Impl_core_convert_From_call_runtime_EnvError_for_call_runtime_RuntimeErro [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "Unexpected error from `pallet-contracts`." |) ] + [ mk_str (| "Unexpected error from `pallet-contracts`." |) ] |) |) |))) @@ -404,11 +414,26 @@ Module Impl_call_runtime_Env. unimplemented!() } *) - Parameter call_runtime : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition call_runtime (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ Call ], [ self; _call ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _call := M.alloc (| _call |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_call_runtime : M.IsAssociatedFunction.Trait Self "call_runtime" call_runtime. Admitted. + Global Typeclasses Opaque call_runtime. End Impl_call_runtime_Env. Module Impl_call_runtime_RuntimeCaller. @@ -419,11 +444,24 @@ Module Impl_call_runtime_RuntimeCaller. unimplemented!() } *) - Parameter init_env : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition init_env (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_init_env : M.IsAssociatedFunction.Trait Self "init_env" init_env. Admitted. + Global Typeclasses Opaque init_env. (* fn env(&self) -> Env { diff --git a/CoqOfRust/examples/default/examples/ink_contracts/conditional_compilation.v b/CoqOfRust/examples/default/examples/ink_contracts/conditional_compilation.v index 0d7d3d46c..cc2b49c81 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/conditional_compilation.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/conditional_compilation.v @@ -178,22 +178,51 @@ Module Impl_conditional_compilation_Env. unimplemented!() } *) - Parameter emit_event : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition emit_event (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self; _event ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _event := M.alloc (| _event |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_emit_event : M.IsAssociatedFunction.Trait Self "emit_event" emit_event. Admitted. + Global Typeclasses Opaque emit_event. (* fn block_number(&self) -> BlockNumber { unimplemented!() } *) - Parameter block_number : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition block_number (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_block_number : M.IsAssociatedFunction.Trait Self "block_number" block_number. Admitted. + Global Typeclasses Opaque block_number. End Impl_conditional_compilation_Env. (* StructRecord @@ -212,11 +241,24 @@ Module Impl_conditional_compilation_ConditionalCompilation. unimplemented!() } *) - Parameter init_env : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition init_env (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_init_env : M.IsAssociatedFunction.Trait Self "init_env" init_env. Admitted. + Global Typeclasses Opaque init_env. (* fn env(&self) -> Env { diff --git a/CoqOfRust/examples/default/examples/ink_contracts/contract_terminate.v b/CoqOfRust/examples/default/examples/ink_contracts/contract_terminate.v index 7ed8c243a..620597d58 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/contract_terminate.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/contract_terminate.v @@ -126,11 +126,26 @@ Module Impl_contract_terminate_Env. unimplemented!() } *) - Parameter terminate_contract : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition terminate_contract (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self; _account ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _account := M.alloc (| _account |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_terminate_contract : M.IsAssociatedFunction.Trait Self "terminate_contract" terminate_contract. Admitted. + Global Typeclasses Opaque terminate_contract. End Impl_contract_terminate_Env. (* StructTuple @@ -149,11 +164,24 @@ Module Impl_contract_terminate_JustTerminate. unimplemented!() } *) - Parameter init_env : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition init_env (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_init_env : M.IsAssociatedFunction.Trait Self "init_env" init_env. Admitted. + Global Typeclasses Opaque init_env. (* fn env(&self) -> Env { diff --git a/CoqOfRust/examples/default/examples/ink_contracts/contract_transfer.v b/CoqOfRust/examples/default/examples/ink_contracts/contract_transfer.v index d18a97f85..2a1f4c2a0 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/contract_transfer.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/contract_transfer.v @@ -128,32 +128,76 @@ Module Impl_contract_transfer_Env. unimplemented!() } *) - Parameter balance : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition balance (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_balance : M.IsAssociatedFunction.Trait Self "balance" balance. Admitted. + Global Typeclasses Opaque balance. (* fn transfer(&mut self, _to: AccountId, _value: Balance) -> Result<(), ()> { unimplemented!() } *) - Parameter transfer : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition transfer (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self; _to; _value ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _to := M.alloc (| _to |) in + let _value := M.alloc (| _value |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_transfer : M.IsAssociatedFunction.Trait Self "transfer" transfer. Admitted. + Global Typeclasses Opaque transfer. (* fn transferred_value(&self) -> Balance { unimplemented!() } *) - Parameter transferred_value : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition transferred_value (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_transferred_value : M.IsAssociatedFunction.Trait Self "transferred_value" transferred_value. Admitted. + Global Typeclasses Opaque transferred_value. End Impl_contract_transfer_Env. (* StructTuple @@ -172,11 +216,24 @@ Module Impl_contract_transfer_GiveMe. unimplemented!() } *) - Parameter init_env : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition init_env (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_init_env : M.IsAssociatedFunction.Trait Self "init_env" init_env. Admitted. + Global Typeclasses Opaque init_env. (* fn env(&self) -> Env { @@ -260,12 +317,8 @@ Module Impl_contract_transfer_GiveMe. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "requested value: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "requested value: " |); mk_str (| " +" |) ] |) |) |) @@ -326,12 +379,8 @@ Module Impl_contract_transfer_GiveMe. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "contract balance: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "contract balance: " |); mk_str (| " +" |) ] |) |) |) @@ -464,7 +513,7 @@ Module Impl_contract_transfer_GiveMe. [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "insufficient funds!" |) ] + [ mk_str (| "insufficient funds!" |) ] |) |) |))); @@ -577,9 +626,8 @@ Module Impl_contract_transfer_GiveMe. [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), [ - M.read (| - Value.String - "requested transfer failed. this can be the case if the contract does nothave sufficient free funds or if the transfer would have brought thecontract's balance below minimum balance." + mk_str (| + "requested transfer failed. this can be the case if the contract does nothave sufficient free funds or if the transfer would have brought thecontract's balance below minimum balance." |) ] |) @@ -630,12 +678,8 @@ Module Impl_contract_transfer_GiveMe. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "received payment: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "received payment: " |); mk_str (| " +" |) ] |) |) |) @@ -768,7 +812,7 @@ Module Impl_contract_transfer_GiveMe. [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "payment was not ten" |) ] + [ mk_str (| "payment was not ten" |) ] |) |) |))); diff --git a/CoqOfRust/examples/default/examples/ink_contracts/custom_environment.v b/CoqOfRust/examples/default/examples/ink_contracts/custom_environment.v index 799646539..e70a94046 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/custom_environment.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/custom_environment.v @@ -282,11 +282,26 @@ Module Impl_custom_environment_Env. unimplemented!() } *) - Parameter emit_event : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition emit_event (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self; _event ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _event := M.alloc (| _event |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_emit_event : M.IsAssociatedFunction.Trait Self "emit_event" emit_event. Admitted. + Global Typeclasses Opaque emit_event. End Impl_custom_environment_Env. Module Impl_custom_environment_Topics. @@ -297,11 +312,24 @@ Module Impl_custom_environment_Topics. unimplemented!() } *) - Parameter init_env : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition init_env (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_init_env : M.IsAssociatedFunction.Trait Self "init_env" init_env. Admitted. + Global Typeclasses Opaque init_env. (* fn env(&self) -> Env { diff --git a/CoqOfRust/examples/default/examples/ink_contracts/dns.v b/CoqOfRust/examples/default/examples/ink_contracts/dns.v index b3e710fd9..84427acb6 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/dns.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/dns.v @@ -75,84 +75,195 @@ Module Impl_dns_Mapping_K_V. unimplemented!() } *) - Parameter contains : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition contains (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_contains : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "contains" (contains K V). Admitted. + Global Typeclasses Opaque contains. (* fn get(&self, _key: &K) -> Option { unimplemented!() } *) - Parameter get : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition get (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_get : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "get" (get K V). Admitted. + Global Typeclasses Opaque get. (* fn insert(&mut self, _key: K, _value: V) -> Option { unimplemented!() } *) - Parameter insert : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition insert (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key; _value ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + let _value := M.alloc (| _value |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_insert : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "insert" (insert K V). Admitted. + Global Typeclasses Opaque insert. (* fn new() -> Mapping { unimplemented!() } *) - Parameter new : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition new (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_new : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "new" (new K V). Admitted. + Global Typeclasses Opaque new. (* fn remove(&self, _key: K) { unimplemented!() } *) - Parameter remove : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition remove (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_remove : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "remove" (remove K V). Admitted. + Global Typeclasses Opaque remove. (* fn size(&self, _key: K) -> Option { unimplemented!() } *) - Parameter size : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition size (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_size : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "size" (size K V). Admitted. + Global Typeclasses Opaque size. (* fn take(&self, _key: K) -> Option { unimplemented!() } *) - Parameter take : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition take (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_take : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "take" (take K V). Admitted. + Global Typeclasses Opaque take. End Impl_dns_Mapping_K_V. (* StructTuple @@ -298,7 +409,20 @@ Module Impl_core_convert_From_array_Usize_32_u8_for_dns_AccountId. unimplemented!() } *) - Parameter from : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition from (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _value ] => + ltac:(M.monadic + (let _value := M.alloc (| _value |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Axiom Implements : M.IsTraitInstance @@ -426,11 +550,26 @@ Module Impl_dns_Env. unimplemented!() } *) - Parameter emit_event : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition emit_event (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self; _event ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _event := M.alloc (| _event |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_emit_event : M.IsAssociatedFunction.Trait Self "emit_event" emit_event. Admitted. + Global Typeclasses Opaque emit_event. End Impl_dns_Env. (* StructRecord @@ -840,11 +979,24 @@ Module Impl_dns_DomainNameService. unimplemented!() } *) - Parameter init_env : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition init_env (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_init_env : M.IsAssociatedFunction.Trait Self "init_env" init_env. Admitted. + Global Typeclasses Opaque init_env. (* fn env(&self) -> Env { 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 fd1f1d455..a40e9c611 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/e2e_call_runtime.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/e2e_call_runtime.v @@ -104,10 +104,24 @@ Module Impl_e2e_call_runtime_Env. unimplemented!() } *) - Parameter balance : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition balance (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_balance : M.IsAssociatedFunction.Trait Self "balance" balance. Admitted. + Global Typeclasses Opaque balance. End Impl_e2e_call_runtime_Env. (* StructTuple @@ -145,11 +159,24 @@ Module Impl_e2e_call_runtime_Contract. unimplemented!() } *) - Parameter init_env : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition init_env (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_init_env : M.IsAssociatedFunction.Trait Self "init_env" init_env. Admitted. + Global Typeclasses Opaque init_env. (* fn env(&self) -> Env { diff --git a/CoqOfRust/examples/default/examples/ink_contracts/erc1155.v b/CoqOfRust/examples/default/examples/ink_contracts/erc1155.v index 14590e9cd..5326f93e3 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/erc1155.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/erc1155.v @@ -75,72 +75,169 @@ Module Impl_erc1155_Mapping_K_V. unimplemented!() } *) - Parameter contains : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition contains (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_contains : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "contains" (contains K V). Admitted. + Global Typeclasses Opaque contains. (* fn get(&self, _key: &K) -> Option { unimplemented!() } *) - Parameter get : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition get (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_get : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "get" (get K V). Admitted. + Global Typeclasses Opaque get. (* fn insert(&mut self, _key: K, _value: V) -> Option { unimplemented!() } *) - Parameter insert : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition insert (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key; _value ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + let _value := M.alloc (| _value |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_insert : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "insert" (insert K V). Admitted. + Global Typeclasses Opaque insert. (* fn remove(&self, _key: K) { unimplemented!() } *) - Parameter remove : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition remove (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_remove : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "remove" (remove K V). Admitted. + Global Typeclasses Opaque remove. (* fn size(&self, _key: K) -> Option { unimplemented!() } *) - Parameter size : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition size (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_size : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "size" (size K V). Admitted. + Global Typeclasses Opaque size. (* fn take(&self, _key: K) -> Option { unimplemented!() } *) - Parameter take : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition take (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_take : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "take" (take K V). Admitted. + Global Typeclasses Opaque take. End Impl_erc1155_Mapping_K_V. (* StructTuple @@ -286,7 +383,20 @@ Module Impl_core_convert_From_array_Usize_32_u8_for_erc1155_AccountId. unimplemented!() } *) - Parameter from : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition from (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _v ] => + ltac:(M.monadic + (let _v := M.alloc (| _v |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Axiom Implements : M.IsTraitInstance @@ -618,11 +728,26 @@ Module Impl_erc1155_Env. unimplemented!() } *) - Parameter emit_event : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition emit_event (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self; _event ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _event := M.alloc (| _event |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_emit_event : M.IsAssociatedFunction.Trait Self "emit_event" emit_event. Admitted. + Global Typeclasses Opaque emit_event. End Impl_erc1155_Env. (* StructRecord @@ -739,11 +864,24 @@ Module Impl_erc1155_Contract. unimplemented!() } *) - Parameter init_env : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition init_env (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_init_env : M.IsAssociatedFunction.Trait Self "init_env" init_env. Admitted. + Global Typeclasses Opaque init_env. (* fn env(&self) -> Env { @@ -1252,9 +1390,7 @@ Module Impl_erc1155_Contract. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Caller should have ensured that `from` holds `token_id`." - |) + mk_str (| "Caller should have ensured that `from` holds `token_id`." |) |) |) ] @@ -3474,9 +3610,8 @@ Module Impl_erc1155_Erc1155TokenReceiver_for_erc1155_Contract. M.alloc (| Value.Array [ - M.read (| - Value.String - "not implemented: This smart contract does not accept token transfer." + mk_str (| + "not implemented: This smart contract does not accept token transfer." |) ] |) @@ -3569,9 +3704,8 @@ Module Impl_erc1155_Erc1155TokenReceiver_for_erc1155_Contract. M.alloc (| Value.Array [ - M.read (| - Value.String - "not implemented: This smart contract does not accept batch token transfers." + mk_str (| + "not implemented: This smart contract does not accept batch token transfers." |) ] |) diff --git a/CoqOfRust/examples/default/examples/ink_contracts/erc20.v b/CoqOfRust/examples/default/examples/ink_contracts/erc20.v index 5a2e84888..3b0c1529d 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/erc20.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/erc20.v @@ -75,24 +75,57 @@ Module Impl_erc20_Mapping_K_V. unimplemented!() } *) - Parameter get : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition get (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_get : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "get" (get K V). Admitted. + Global Typeclasses Opaque get. (* fn insert(&mut self, _key: K, _value: V) { unimplemented!() } *) - Parameter insert : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition insert (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key; _value ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + let _value := M.alloc (| _value |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_insert : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "insert" (insert K V). Admitted. + Global Typeclasses Opaque insert. End Impl_erc20_Mapping_K_V. (* StructTuple @@ -401,11 +434,26 @@ Module Impl_erc20_Env. unimplemented!() } *) - Parameter emit_event : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition emit_event (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self; _event ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _event := M.alloc (| _event |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_emit_event : M.IsAssociatedFunction.Trait Self "emit_event" emit_event. Admitted. + Global Typeclasses Opaque emit_event. End Impl_erc20_Env. Module Impl_erc20_Erc20. @@ -416,11 +464,24 @@ Module Impl_erc20_Erc20. unimplemented!() } *) - Parameter init_env : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition init_env (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_init_env : M.IsAssociatedFunction.Trait Self "init_env" init_env. Admitted. + Global Typeclasses Opaque init_env. (* fn env(&self) -> Env { diff --git a/CoqOfRust/examples/default/examples/ink_contracts/erc721.v b/CoqOfRust/examples/default/examples/ink_contracts/erc721.v index ee36d3559..c2b7b3925 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/erc721.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/erc721.v @@ -75,72 +75,169 @@ Module Impl_erc721_Mapping_K_V. unimplemented!() } *) - Parameter contains : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition contains (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_contains : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "contains" (contains K V). Admitted. + Global Typeclasses Opaque contains. (* fn get(&self, _key: &K) -> Option { unimplemented!() } *) - Parameter get : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition get (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_get : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "get" (get K V). Admitted. + Global Typeclasses Opaque get. (* fn insert(&mut self, _key: K, _value: V) -> Option { unimplemented!() } *) - Parameter insert : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition insert (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key; _value ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + let _value := M.alloc (| _value |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_insert : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "insert" (insert K V). Admitted. + Global Typeclasses Opaque insert. (* fn remove(&self, _key: K) { unimplemented!() } *) - Parameter remove : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition remove (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_remove : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "remove" (remove K V). Admitted. + Global Typeclasses Opaque remove. (* fn size(&self, _key: K) -> Option { unimplemented!() } *) - Parameter size : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition size (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_size : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "size" (size K V). Admitted. + Global Typeclasses Opaque size. (* fn take(&self, _key: K) -> Option { unimplemented!() } *) - Parameter take : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition take (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_take : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "take" (take K V). Admitted. + Global Typeclasses Opaque take. End Impl_erc721_Mapping_K_V. (* StructTuple @@ -286,7 +383,20 @@ Module Impl_core_convert_From_array_Usize_32_u8_for_erc721_AccountId. unimplemented!() } *) - Parameter from : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition from (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _value ] => + ltac:(M.monadic + (let _value := M.alloc (| _value |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Axiom Implements : M.IsTraitInstance @@ -708,11 +818,26 @@ Module Impl_erc721_Env. unimplemented!() } *) - Parameter emit_event : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition emit_event (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self; _event ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _event := M.alloc (| _event |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_emit_event : M.IsAssociatedFunction.Trait Self "emit_event" emit_event. Admitted. + Global Typeclasses Opaque emit_event. End Impl_erc721_Env. Module Impl_erc721_Erc721. @@ -723,11 +848,24 @@ Module Impl_erc721_Erc721. unimplemented!() } *) - Parameter init_env : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition init_env (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_init_env : M.IsAssociatedFunction.Trait Self "init_env" init_env. Admitted. + Global Typeclasses Opaque init_env. (* fn env(&self) -> Env { @@ -1164,7 +1302,7 @@ Module Impl_erc721_Erc721. M.read (| owner |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Error with AccountId" |) |) + M.deref (| mk_str (| "Error with AccountId" |) |) |) ] |); @@ -1183,7 +1321,7 @@ Module Impl_erc721_Erc721. M.read (| from |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Error with AccountId" |) |) + M.deref (| mk_str (| "Error with AccountId" |) |) |) ] |) @@ -1819,9 +1957,7 @@ Module Impl_erc721_Erc721. M.read (| owner |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Error with AccountId" |) - |) + M.deref (| mk_str (| "Error with AccountId" |) |) |) ] |); 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 43ee6c709..71105f7c7 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 @@ -132,10 +132,24 @@ Module Impl_call_builder_Selector. unimplemented!() } *) - Parameter new : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition new (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ bytes ] => + ltac:(M.monadic + (let bytes := M.alloc (| bytes |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_new : M.IsAssociatedFunction.Trait Self "new" new. Admitted. + Global Typeclasses Opaque new. End Impl_call_builder_Selector. (* StructTuple @@ -234,7 +248,7 @@ Module Impl_call_builder_CallBuilderTest. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "not yet implemented" |) ] + [ mk_str (| "not yet implemented" |) ] |) |) |) in @@ -284,9 +298,8 @@ Module Impl_call_builder_CallBuilderTest. M.alloc (| Value.Array [ - M.read (| - Value.String - "not implemented: No other `LangError` variants exist at the moment." + mk_str (| + "not implemented: No other `LangError` variants exist at the moment." |) ] |) 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 78430ddca..de43e84bf 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 @@ -94,7 +94,20 @@ Module Impl_core_convert_From_array_Usize_32_u8_for_constructors_return_value_Ac unimplemented!() } *) - Parameter from : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition from (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ _value ] => + ltac:(M.monadic + (let _value := M.alloc (| _value |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Axiom Implements : M.IsTraitInstance @@ -165,10 +178,7 @@ Module Impl_core_fmt_Debug_for_constructors_return_value_ConstructorError. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ConstructorError" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ConstructorError" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -199,11 +209,25 @@ Module Impl_constructors_return_value_ReturnFlags. unimplemented!() } *) - Parameter new_with_reverted : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition new_with_reverted (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ has_reverted ] => + ltac:(M.monadic + (let has_reverted := M.alloc (| has_reverted |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_new_with_reverted : M.IsAssociatedFunction.Trait Self "new_with_reverted" new_with_reverted. Admitted. + Global Typeclasses Opaque new_with_reverted. End Impl_constructors_return_value_ReturnFlags. (* @@ -220,7 +244,7 @@ Definition return_value (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "not implemented" |) ] + [ mk_str (| "not implemented" |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. 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 8cf32f4fe..167113478 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 @@ -131,7 +131,7 @@ Module Impl_core_fmt_Debug_for_contract_ref_FlipperError. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "FlipperError" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FlipperError" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -154,11 +154,24 @@ Module Impl_contract_ref_FlipperRef. unimplemented!() } *) - Parameter init_env : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition init_env (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_init_env : M.IsAssociatedFunction.Trait Self "init_env" init_env. Admitted. + Global Typeclasses Opaque init_env. (* fn env(&self) -> Env { 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 0dff0ae3d..487bcff24 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 @@ -32,7 +32,7 @@ Module Impl_core_fmt_Debug_for_integration_flipper_FlipperError. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "FlipperError" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FlipperError" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" 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 8caa6414f..e1f16ee56 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/mapping_integration_tests.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/mapping_integration_tests.v @@ -77,84 +77,195 @@ Module Impl_mapping_integration_tests_Mapping_K_V. unimplemented!() } *) - Parameter contains : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition contains (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_contains : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "contains" (contains K V). Admitted. + Global Typeclasses Opaque contains. (* fn get(&self, _key: &K) -> Option { unimplemented!() } *) - Parameter get : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition get (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_get : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "get" (get K V). Admitted. + Global Typeclasses Opaque get. (* fn insert(&mut self, _key: K, _value: V) -> Option { unimplemented!() } *) - Parameter insert : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition insert (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key; _value ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + let _value := M.alloc (| _value |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_insert : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "insert" (insert K V). Admitted. + Global Typeclasses Opaque insert. (* fn new() -> Mapping { unimplemented!() } *) - Parameter new : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition new (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_new : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "new" (new K V). Admitted. + Global Typeclasses Opaque new. (* fn remove(&self, _key: K) { unimplemented!() } *) - Parameter remove : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition remove (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_remove : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "remove" (remove K V). Admitted. + Global Typeclasses Opaque remove. (* fn size(&self, _key: K) -> Option { unimplemented!() } *) - Parameter size : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition size (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_size : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "size" (size K V). Admitted. + Global Typeclasses Opaque size. (* fn take(&self, _key: K) -> Option { unimplemented!() } *) - Parameter take : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition take (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_take : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "take" (take K V). Admitted. + Global Typeclasses Opaque take. End Impl_mapping_integration_tests_Mapping_K_V. (* StructTuple @@ -347,21 +458,47 @@ Module Impl_mapping_integration_tests_Mappings. unimplemented!() } *) - Parameter init_env : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition init_env (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_init_env : M.IsAssociatedFunction.Trait Self "init_env" init_env. Admitted. + Global Typeclasses Opaque init_env. (* fn env() -> Env { unimplemented!() } *) - Parameter env : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition env (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_env : M.IsAssociatedFunction.Trait Self "env" env. Admitted. + Global Typeclasses Opaque env. (* pub fn new() -> Self { diff --git a/CoqOfRust/examples/default/examples/ink_contracts/mother.v b/CoqOfRust/examples/default/examples/ink_contracts/mother.v index 559a4d108..e973465eb 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/mother.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/mother.v @@ -75,24 +75,57 @@ Module Impl_mother_Mapping_K_V. unimplemented!() } *) - Parameter get : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition get (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_get : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "get" (get K V). Admitted. + Global Typeclasses Opaque get. (* fn insert(&mut self, _key: K, _value: V) { unimplemented!() } *) - Parameter insert : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition insert (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key; _value ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + let _value := M.alloc (| _value |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_insert : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "insert" (insert K V). Admitted. + Global Typeclasses Opaque insert. End Impl_mother_Mapping_K_V. (* StructTuple @@ -2083,11 +2116,26 @@ Module Impl_mother_Env. unimplemented!() } *) - Parameter emit_event : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition emit_event (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self; _event ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _event := M.alloc (| _event |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_emit_event : M.IsAssociatedFunction.Trait Self "emit_event" emit_event. Admitted. + Global Typeclasses Opaque emit_event. End Impl_mother_Env. (* StructRecord @@ -2169,11 +2217,24 @@ Module Impl_mother_Mother. unimplemented!() } *) - Parameter init_env : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition init_env (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_init_env : M.IsAssociatedFunction.Trait Self "init_env" init_env. Admitted. + Global Typeclasses Opaque init_env. (* fn env(&self) -> Env { @@ -2320,7 +2381,7 @@ Module Impl_mother_Mother. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Reverting instantiation" |) |) + M.deref (| mk_str (| "Reverting instantiation" |) |) |) ] |) @@ -2480,9 +2541,7 @@ Module Impl_mother_Mother. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Reverting on user demand!" |) - |) + M.deref (| mk_str (| "Reverting on user demand!" |) |) |) ] |) @@ -2503,7 +2562,7 @@ Module Impl_mother_Mother. [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "Trapping on user demand!" |) ] + [ mk_str (| "Trapping on user demand!" |) ] |) |) |))); @@ -2556,12 +2615,8 @@ Module Impl_mother_Mother. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "debug_log: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "debug_log: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/ink_contracts/multisig.v b/CoqOfRust/examples/default/examples/ink_contracts/multisig.v index 39520c5a1..dce5fc4c2 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/multisig.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/multisig.v @@ -75,72 +75,169 @@ Module Impl_multisig_Mapping_K_V. unimplemented!() } *) - Parameter contains : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition contains (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_contains : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "contains" (contains K V). Admitted. + Global Typeclasses Opaque contains. (* fn get(&self, _key: &K) -> Option { unimplemented!() } *) - Parameter get : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition get (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_get : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "get" (get K V). Admitted. + Global Typeclasses Opaque get. (* fn insert(&mut self, _key: K, _value: V) -> Option { unimplemented!() } *) - Parameter insert : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition insert (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key; _value ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + let _value := M.alloc (| _value |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_insert : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "insert" (insert K V). Admitted. + Global Typeclasses Opaque insert. (* fn remove(&self, _key: K) { unimplemented!() } *) - Parameter remove : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition remove (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_remove : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "remove" (remove K V). Admitted. + Global Typeclasses Opaque remove. (* fn size(&self, _key: K) -> Option { unimplemented!() } *) - Parameter size : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition size (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_size : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "size" (size K V). Admitted. + Global Typeclasses Opaque size. (* fn take(&self, _key: K) -> Option { unimplemented!() } *) - Parameter take : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition take (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_take : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "take" (take K V). Admitted. + Global Typeclasses Opaque take. End Impl_multisig_Mapping_K_V. (* StructTuple @@ -208,7 +305,7 @@ Module Impl_core_fmt_Debug_for_multisig_AccountId. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "AccountId" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "AccountId" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -500,7 +597,8 @@ Axiom TransactionId : (Ty.path "multisig::TransactionId") = (Ty.path "u32"). Definition value_WRONG_TRANSACTION_ID : Value.t := M.run_constant - ltac:(M.monadic (Value.String "The user specified an invalid transaction id. Abort.")). + ltac:(M.monadic + (M.alloc (| mk_str (| "The user specified an invalid transaction id. Abort." |) |))). Axiom Constant_value_WRONG_TRANSACTION_ID : (M.get_constant "multisig::WRONG_TRANSACTION_ID") = value_WRONG_TRANSACTION_ID. @@ -1071,33 +1169,76 @@ Module Impl_multisig_Env. unimplemented!() } *) - Parameter emit_event : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition emit_event (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self; _event ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _event := M.alloc (| _event |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_emit_event : M.IsAssociatedFunction.Trait Self "emit_event" emit_event. Admitted. + Global Typeclasses Opaque emit_event. (* fn transferred_value(&self) -> Balance { unimplemented!() } *) - Parameter transferred_value : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition transferred_value (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_transferred_value : M.IsAssociatedFunction.Trait Self "transferred_value" transferred_value. Admitted. + Global Typeclasses Opaque transferred_value. (* fn account_id(&self) -> AccountId { unimplemented!() } *) - Parameter account_id : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition account_id (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_account_id : M.IsAssociatedFunction.Trait Self "account_id" account_id. Admitted. + Global Typeclasses Opaque account_id. End Impl_multisig_Env. (* StructRecord @@ -1324,9 +1465,8 @@ Definition ensure_requirement_is_valid (ε : list Value.t) (τ : list Ty.t) (α Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: 0 < requirement && requirement <= owners && owners <= MAX_OWNERS" + mk_str (| + "assertion failed: 0 < requirement && requirement <= owners && owners <= MAX_OWNERS" |) ] |) @@ -1353,11 +1493,24 @@ Module Impl_multisig_Multisig. unimplemented!() } *) - Parameter init_env : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition init_env (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_init_env : M.IsAssociatedFunction.Trait Self "init_env" init_env. Admitted. + Global Typeclasses Opaque init_env. (* fn env(&self) -> Env { @@ -1761,9 +1914,8 @@ Module Impl_multisig_Multisig. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.confirmation_count.get(&trans_id).expect(WRONG_TRANSACTION_ID) >= + mk_str (| + "assertion failed: self.confirmation_count.get(&trans_id).expect(WRONG_TRANSACTION_ID) >= self.requirement" |) ] @@ -1908,11 +2060,7 @@ Module Impl_multisig_Multisig. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.is_owner.contains(owner)" - |) - ] + [ mk_str (| "assertion failed: self.is_owner.contains(owner)" |) ] |) |) |))); @@ -2243,11 +2391,7 @@ Module Impl_multisig_Multisig. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: !self.is_owner.contains(owner)" - |) - ] + [ mk_str (| "assertion failed: !self.is_owner.contains(owner)" |) ] |) |) |))); @@ -2592,9 +2736,8 @@ Module Impl_multisig_Multisig. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "This is only called after it was already verified that the id is + mk_str (| + "This is only called after it was already verified that the id is actually an owner." |) |) @@ -3925,7 +4068,7 @@ Module Impl_multisig_Multisig. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Transaction ids exhausted." |) |) + M.deref (| mk_str (| "Transaction ids exhausted." |) |) |) ] |) @@ -4304,9 +4447,8 @@ Module Impl_multisig_Multisig. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "The transaction exists hence it must also be in the list." + mk_str (| + "The transaction exists hence it must also be in the list." |) |) |) @@ -4962,9 +5104,8 @@ Module Impl_multisig_Multisig. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "There is a entry in `self.confirmations`. Hence a count must exit." + mk_str (| + "There is a entry in `self.confirmations`. Hence a count must exit." |) |) |) @@ -5202,9 +5343,8 @@ Module Impl_multisig_Multisig. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.env().transferred_value() == t.transferred_value" + mk_str (| + "assertion failed: self.env().transferred_value() == t.transferred_value" |) ] |) @@ -5235,7 +5375,7 @@ Module Impl_multisig_Multisig. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "not yet implemented" |) ] + [ mk_str (| "not yet implemented" |) ] |) |) |) in diff --git a/CoqOfRust/examples/default/examples/ink_contracts/payment_channel.v b/CoqOfRust/examples/default/examples/ink_contracts/payment_channel.v index 4fc2b02a5..edc8ed14f 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/payment_channel.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/payment_channel.v @@ -177,7 +177,20 @@ Module Impl_core_convert_From_array_Usize_32_u8_for_payment_channel_AccountId. unimplemented!() } *) - Parameter from : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition from (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ value ] => + ltac:(M.monadic + (let value := M.alloc (| value |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Axiom Implements : M.IsTraitInstance @@ -415,65 +428,153 @@ Module Impl_payment_channel_Env. unimplemented!() } *) - Parameter emit_event : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition emit_event (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self; _event ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _event := M.alloc (| _event |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_emit_event : M.IsAssociatedFunction.Trait Self "emit_event" emit_event. Admitted. + Global Typeclasses Opaque emit_event. (* fn terminate_contract(&self, sender: AccountId) { unimplemented!() } *) - Parameter terminate_contract : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition terminate_contract (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self; sender ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let sender := M.alloc (| sender |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_terminate_contract : M.IsAssociatedFunction.Trait Self "terminate_contract" terminate_contract. Admitted. + Global Typeclasses Opaque terminate_contract. (* fn transfer(&self, recipient: AccountId, amount: Balance) -> Result<()> { unimplemented!() } *) - Parameter transfer : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition transfer (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self; recipient; amount ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let recipient := M.alloc (| recipient |) in + let amount := M.alloc (| amount |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_transfer : M.IsAssociatedFunction.Trait Self "transfer" transfer. Admitted. + Global Typeclasses Opaque transfer. (* fn block_timestamp(&self) -> Timestamp { unimplemented!() } *) - Parameter block_timestamp : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition block_timestamp (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_block_timestamp : M.IsAssociatedFunction.Trait Self "block_timestamp" block_timestamp. Admitted. + Global Typeclasses Opaque block_timestamp. (* fn balance(&self) -> Balance { unimplemented!() } *) - Parameter balance : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition balance (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_balance : M.IsAssociatedFunction.Trait Self "balance" balance. Admitted. + Global Typeclasses Opaque balance. (* fn account_id(&self) -> AccountId { unimplemented!() } *) - Parameter account_id : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition account_id (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_account_id : M.IsAssociatedFunction.Trait Self "account_id" account_id. Admitted. + Global Typeclasses Opaque account_id. End Impl_payment_channel_Env. (* Trait *) @@ -490,11 +591,26 @@ where unimplemented!() } *) -Parameter hash_encoded : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. +Definition hash_encoded (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ H; T ], [ input; output ] => + ltac:(M.monadic + (let input := M.alloc (| input |) in + let output := M.alloc (| output |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_hash_encoded : M.IsFunction.Trait "payment_channel::hash_encoded" hash_encoded. Admitted. +Global Typeclasses Opaque hash_encoded. (* pub fn ecdsa_recover( @@ -505,11 +621,27 @@ pub fn ecdsa_recover( unimplemented!() } *) -Parameter ecdsa_recover : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. +Definition ecdsa_recover (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ signature; message_hash; output ] => + ltac:(M.monadic + (let signature := M.alloc (| signature |) in + let message_hash := M.alloc (| message_hash |) in + let output := M.alloc (| output |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_ecdsa_recover : M.IsFunction.Trait "payment_channel::ecdsa_recover" ecdsa_recover. Admitted. +Global Typeclasses Opaque ecdsa_recover. (* Enum Sha2x256 @@ -623,7 +755,21 @@ Module Impl_payment_channel_CryptoHash_for_payment_channel_Sha2x256. unimplemented!() } *) - Parameter hash : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition hash (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ input; output ] => + ltac:(M.monadic + (let input := M.alloc (| input |) in + let output := M.alloc (| output |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Axiom Implements : M.IsTraitInstance @@ -642,7 +788,21 @@ Module Impl_payment_channel_CryptoHash_for_payment_channel_Keccak256. unimplemented!() } *) - Parameter hash : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition hash (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ input; output ] => + ltac:(M.monadic + (let input := M.alloc (| input |) in + let output := M.alloc (| output |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Axiom Implements : M.IsTraitInstance @@ -661,7 +821,21 @@ Module Impl_payment_channel_CryptoHash_for_payment_channel_Blake2x256. unimplemented!() } *) - Parameter hash : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition hash (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ input; output ] => + ltac:(M.monadic + (let input := M.alloc (| input |) in + let output := M.alloc (| output |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Axiom Implements : M.IsTraitInstance @@ -680,7 +854,21 @@ Module Impl_payment_channel_CryptoHash_for_payment_channel_Blake2x128. unimplemented!() } *) - Parameter hash : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition hash (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ input; output ] => + ltac:(M.monadic + (let input := M.alloc (| input |) in + let output := M.alloc (| output |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Axiom Implements : M.IsTraitInstance @@ -699,11 +887,24 @@ Module Impl_payment_channel_PaymentChannel. unimplemented!() } *) - Parameter init_env : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition init_env (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_init_env : M.IsAssociatedFunction.Trait Self "init_env" init_env. Admitted. + Global Typeclasses Opaque init_env. (* fn env(&self) -> Env { @@ -896,7 +1097,7 @@ Module Impl_payment_channel_PaymentChannel. [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "recover failed: {err:?}" |) ] + [ mk_str (| "recover failed: {err:?}" |) ] |) |))) ] 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 9747e9aab..d5290203e 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/set_code_hash.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/set_code_hash.v @@ -16,11 +16,25 @@ fn set_code_hash(code_hash: &E) -> Result<(), Error> { unimplemented!() } *) -Parameter set_code_hash : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. +Definition set_code_hash (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ E ], [ code_hash ] => + ltac:(M.monadic + (let code_hash := M.alloc (| code_hash |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_set_code_hash : M.IsFunction.Trait "set_code_hash::set_code_hash" set_code_hash. Admitted. +Global Typeclasses Opaque set_code_hash. (* StructRecord { @@ -149,10 +163,9 @@ Module Impl_set_code_hash_Incrementer. M.alloc (| Value.Array [ - M.read (| Value.String "The new count is " |); - M.read (| - Value.String - ", it was modified using the original contract code. + mk_str (| "The new count is " |); + mk_str (| + ", it was modified using the original contract code. " |) ] @@ -312,9 +325,8 @@ Module Impl_set_code_hash_Incrementer. [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), [ - M.read (| - Value.String - "Failed to `set_code_hash` to {code_hash:?} due to {err:?}" + mk_str (| + "Failed to `set_code_hash` to {code_hash:?} due to {err:?}" |) ] |) @@ -349,11 +361,8 @@ Module Impl_set_code_hash_Incrementer. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Switched code hash to " |); - M.read (| Value.String ". -" |) - ] + [ mk_str (| "Switched code hash to " |); mk_str (| ". +" |) ] |) |) |) 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 7008b25ee..a93372bc3 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 @@ -116,11 +116,26 @@ Module Impl_updated_incrementer_Env. unimplemented!() } *) - Parameter set_code_hash : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition set_code_hash (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ E ], [ self; code_hash ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let code_hash := M.alloc (| code_hash |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_set_code_hash : M.IsAssociatedFunction.Trait Self "set_code_hash" set_code_hash. Admitted. + Global Typeclasses Opaque set_code_hash. End Impl_updated_incrementer_Env. (* StructRecord @@ -139,11 +154,24 @@ Module Impl_updated_incrementer_Incrementer. unimplemented!() } *) - Parameter init_env : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition init_env (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_init_env : M.IsAssociatedFunction.Trait Self "init_env" init_env. Admitted. + Global Typeclasses Opaque init_env. (* fn env(&self) -> Env { @@ -195,7 +223,11 @@ Module Impl_updated_incrementer_Incrementer. M.deref (| M.borrow (| Pointer.Kind.Ref, - Value.String "Constructors are not called when upgrading using `set_code_hash`." + M.alloc (| + mk_str (| + "Constructors are not called when upgrading using `set_code_hash`." + |) + |) |) |) |) @@ -258,10 +290,9 @@ Module Impl_updated_incrementer_Incrementer. M.alloc (| Value.Array [ - M.read (| Value.String "The new count is " |); - M.read (| - Value.String - ", it was modified using the updated `new_incrementer` code. + mk_str (| "The new count is " |); + mk_str (| + ", it was modified using the updated `new_incrementer` code. " |) ] @@ -438,9 +469,8 @@ Module Impl_updated_incrementer_Incrementer. [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), [ - M.read (| - Value.String - "Failed to `set_code_hash` to {code_hash:?} due to {err:?}" + mk_str (| + "Failed to `set_code_hash` to {code_hash:?} due to {err:?}" |) ] |) @@ -475,11 +505,8 @@ Module Impl_updated_incrementer_Incrementer. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Switched code hash to " |); - M.read (| Value.String ". -" |) - ] + [ mk_str (| "Switched code hash to " |); mk_str (| ". +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/ink_contracts/trait_erc20.v b/CoqOfRust/examples/default/examples/ink_contracts/trait_erc20.v index 34756f28a..253f723c5 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/trait_erc20.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/trait_erc20.v @@ -75,24 +75,57 @@ Module Impl_trait_erc20_Mapping_K_V. unimplemented!() } *) - Parameter get : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition get (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_get : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "get" (get K V). Admitted. + Global Typeclasses Opaque get. (* fn insert(&mut self, _key: K, _value: V) { unimplemented!() } *) - Parameter insert : forall (K V : Ty.t), (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition insert (K V : Ty.t) (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + let Self : Ty.t := Self K V in + match ε, τ, α with + | [], [], [ self; _key; _value ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _key := M.alloc (| _key |) in + let _value := M.alloc (| _value |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_insert : forall (K V : Ty.t), M.IsAssociatedFunction.Trait (Self K V) "insert" (insert K V). Admitted. + Global Typeclasses Opaque insert. End Impl_trait_erc20_Mapping_K_V. (* StructTuple @@ -242,7 +275,7 @@ Module Impl_core_fmt_Debug_for_trait_erc20_Error. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InsufficientBalance" |) |) + M.deref (| mk_str (| "InsufficientBalance" |) |) |) |))); fun γ => @@ -253,7 +286,7 @@ Module Impl_core_fmt_Debug_for_trait_erc20_Error. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InsufficientAllowance" |) |) + M.deref (| mk_str (| "InsufficientAllowance" |) |) |) |))) ] @@ -558,11 +591,26 @@ Module Impl_trait_erc20_Env. unimplemented!() } *) - Parameter emit_event : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition emit_event (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [ self; _event ] => + ltac:(M.monadic + (let self := M.alloc (| self |) in + let _event := M.alloc (| _event |) in + M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_emit_event : M.IsAssociatedFunction.Trait Self "emit_event" emit_event. Admitted. + Global Typeclasses Opaque emit_event. End Impl_trait_erc20_Env. Module Impl_trait_erc20_Erc20. @@ -573,11 +621,24 @@ Module Impl_trait_erc20_Erc20. unimplemented!() } *) - Parameter init_env : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. + Definition init_env (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance AssociatedFunction_init_env : M.IsAssociatedFunction.Trait Self "init_env" init_env. Admitted. + Global Typeclasses Opaque init_env. (* fn env(&self) -> Env { diff --git a/CoqOfRust/examples/default/examples/ink_contracts/wildcard_selector.v b/CoqOfRust/examples/default/examples/ink_contracts/wildcard_selector.v index 055f5be54..6dd7e2bfa 100644 --- a/CoqOfRust/examples/default/examples/ink_contracts/wildcard_selector.v +++ b/CoqOfRust/examples/default/examples/ink_contracts/wildcard_selector.v @@ -6,11 +6,24 @@ fn decode_input() -> Result { unimplemented!() } *) -Parameter decode_input : (list Value.t) -> (list Ty.t) -> (list Value.t) -> M. +Definition decode_input (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := + match ε, τ, α with + | [], [ T ], [] => + ltac:(M.monadic + (M.never_to_any (| + M.call_closure (| + Ty.path "never", + M.get_function (| "core::panicking::panic", [], [] |), + [ mk_str (| "not implemented" |) ] + |) + |))) + | _, _, _ => M.impossible "wrong number of arguments" + end. Global Instance Instance_IsFunction_decode_input : M.IsFunction.Trait "wildcard_selector::decode_input" decode_input. Admitted. +Global Typeclasses Opaque decode_input. (* StructTuple { @@ -150,9 +163,9 @@ Module Impl_wildcard_selector_WildcardSelector. M.alloc (| Value.Array [ - M.read (| Value.String "Wildcard selector: " |); - M.read (| Value.String ", message: " |); - M.read (| Value.String " + mk_str (| "Wildcard selector: " |); + mk_str (| ", message: " |); + mk_str (| " " |) ] |) @@ -264,11 +277,8 @@ Module Impl_wildcard_selector_WildcardSelector. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Wildcard complement message: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "Wildcard complement message: " |); mk_str (| " +" |) ] |) |) |) 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 c6ce40012..a8b34f297 100644 --- a/CoqOfRust/examples/default/examples/rust_book/cargo/concurrent_tests.v +++ b/CoqOfRust/examples/default/examples/rust_book/cargo/concurrent_tests.v @@ -44,7 +44,7 @@ Definition foo (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "some + M.alloc (| Value.Array [ mk_str (| "some " |) ] |) |) |) @@ -78,7 +78,7 @@ Definition foo (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "nothing + M.alloc (| Value.Array [ mk_str (| "nothing " |) ] |) |) |) @@ -196,12 +196,12 @@ Module tests. |) |) |); - M.read (| Value.String "ferris.txt" |) + mk_str (| "ferris.txt" |) ] |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Failed to open ferris.txt" |) |) + M.deref (| mk_str (| "Failed to open ferris.txt" |) |) |) ] |) @@ -327,10 +327,8 @@ Module tests. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Ferris -" |) - |) + M.deref (| mk_str (| "Ferris +" |) |) |) ] |) @@ -341,9 +339,7 @@ Module tests. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Could not write to ferris.txt" - |) + mk_str (| "Could not write to ferris.txt" |) |) |) ] @@ -461,12 +457,12 @@ Module tests. |) |) |); - M.read (| Value.String "ferris.txt" |) + mk_str (| "ferris.txt" |) ] |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Failed to open ferris.txt" |) |) + M.deref (| mk_str (| "Failed to open ferris.txt" |) |) |) ] |) @@ -592,10 +588,8 @@ Module tests. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Corro -" |) - |) + M.deref (| mk_str (| "Corro +" |) |) |) ] |) @@ -606,9 +600,7 @@ Module tests. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Could not write to ferris.txt" - |) + mk_str (| "Could not write to ferris.txt" |) |) |) ] 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 01a82e2ff..5ffc453cf 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 @@ -42,7 +42,7 @@ Module Impl_core_fmt_Display_for_converting_to_string_Circle. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Circle of radius " |) ] |) + M.alloc (| Value.Array [ mk_str (| "Circle of radius " |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/conversion/parsing_a_string.v b/CoqOfRust/examples/default/examples/rust_book/conversion/parsing_a_string.v index 00300cf51..85f00e2ed 100644 --- a/CoqOfRust/examples/default/examples/rust_book/conversion/parsing_a_string.v +++ b/CoqOfRust/examples/default/examples/rust_book/conversion/parsing_a_string.v @@ -25,7 +25,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ], M.get_associated_function (| Ty.path "str", "parse", [], [ Ty.path "i32" ] |), - [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "12" |) |) |) ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "12" |) |) |) ] |) |) in let~ _ : @@ -40,7 +40,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "bool"; Ty.path "core::str::error::ParseBoolError" ], M.get_associated_function (| Ty.path "str", "parse", [], [ Ty.path "bool" ] |), - [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "true" |) |) |) ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "true" |) |) |) ] |) |) in let~ _ : @@ -55,12 +55,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] [ Ty.path "u32"; Ty.path "core::num::error::ParseIntError" ], M.get_associated_function (| Ty.path "str", "parse", [], [ Ty.path "u32" ] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "unparsable" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "unparsable" |) |) |) ] |) |) in M.alloc (| Value.Tuple [] |) 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 7efb61eb0..f17381c37 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 @@ -29,7 +29,7 @@ Module Impl_core_fmt_Debug_for_try_from_and_try_into_EvenNumber. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "EvenNumber" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EvenNumber" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/examples/default/examples/rust_book/custom_types/constants.v b/CoqOfRust/examples/default/examples/rust_book/custom_types/constants.v index 3c12922bf..0ac0cd652 100644 --- a/CoqOfRust/examples/default/examples/rust_book/custom_types/constants.v +++ b/CoqOfRust/examples/default/examples/rust_book/custom_types/constants.v @@ -2,7 +2,7 @@ Require Import CoqOfRust.CoqOfRust. Definition value_LANGUAGE : Value.t := - M.run_constant ltac:(M.monadic (M.alloc (| Value.String "Rust" |))). + M.run_constant ltac:(M.monadic (M.alloc (| M.alloc (| mk_str (| "Rust" |) |) |))). Axiom Constant_value_LANGUAGE : (M.get_constant "constants::LANGUAGE") = value_LANGUAGE. Global Hint Rewrite Constant_value_LANGUAGE : constant_rewrites. @@ -73,14 +73,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "This is " |); - M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "This is " |); mk_str (| " +" |) ] |) |) |) |); @@ -147,12 +141,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "The threshold is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "The threshold is " |); mk_str (| " +" |) ] |) |) |) @@ -218,13 +208,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| " is " |); mk_str (| " +" |) ] |) |) |) @@ -290,15 +275,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.read (| γ |), Value.Bool true |) in - Value.String "big")); + M.alloc (| mk_str (| "big" |) |))); fun γ => ltac:(M.monadic (M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "small" |) - |) + M.deref (| mk_str (| "small" |) |) |) |))) ] 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 e6ea859a6..f642c9cf4 100644 --- a/CoqOfRust/examples/default/examples/rust_book/custom_types/enums.v +++ b/CoqOfRust/examples/default/examples/rust_book/custom_types/enums.v @@ -89,14 +89,13 @@ Definition inspect (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.alloc (| Value.Array [ - M.read (| - Value.String - ("page loaded, r" - ++ - (String.String - "233" - ("f" ++ (String.String "233" " -")))) + mk_str (| + String.append + "page loaded, r" + (String.String + "233" + (String.append "f" (String.String "233" " +"))) |) ] |) @@ -132,10 +131,8 @@ Definition inspect (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "page unloaded -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "page unloaded +" |) ] |) |) |) |) @@ -172,12 +169,8 @@ Definition inspect (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "pressed '" |); - M.read (| Value.String "'. -" |) - ] + Value.Array [ mk_str (| "pressed '" |); mk_str (| "'. +" |) ] |) |) |) @@ -243,12 +236,8 @@ Definition inspect (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "pasted """ |); - M.read (| Value.String """. -" |) - ] + Value.Array [ mk_str (| "pasted """ |); mk_str (| """. +" |) ] |) |) |) @@ -320,9 +309,9 @@ Definition inspect (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.alloc (| Value.Array [ - M.read (| Value.String "clicked at x=" |); - M.read (| Value.String ", y=" |); - M.read (| Value.String ". + mk_str (| "clicked at x=" |); + mk_str (| ", y=" |); + mk_str (| ". " |) ] |) @@ -428,12 +417,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "my text" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "my text" |) |) |) ] |) ] |) in 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 01f3bfe01..605b1bba2 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 @@ -91,14 +91,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "zero is " |); - M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "zero is " |); mk_str (| " +" |) ] |) |) |) |); @@ -166,12 +160,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "one is " |); M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "one is " |); mk_str (| " +" |) ] |) |) |) |); @@ -240,12 +230,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "roses are #" |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "roses are #" |); mk_str (| " +" |) ] |) |) |) @@ -361,12 +347,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "violets are #" |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "violets are #" |); mk_str (| " +" |) ] |) |) |) 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 76d31807c..be94215da 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 @@ -241,11 +241,7 @@ Module Impl_enums_testcase_linked_list_List. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String ", " |) - ] + Value.Array [ mk_str (| "" |); mk_str (| ", " |) ] |) |) |) @@ -366,9 +362,7 @@ Module Impl_enums_testcase_linked_list_List. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Nil" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Nil" |) ] |) |) |) |) @@ -498,11 +492,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "linked list has length: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "linked list has length: " |); mk_str (| " +" |) ] |) |) |) @@ -578,11 +569,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); 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 9dde8bf96..63ede953b 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 @@ -103,10 +103,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "The rich have lots of money! -" |) - ] + Value.Array [ mk_str (| "The rich have lots of money! +" |) ] |) |) |) @@ -141,8 +139,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "The poor have no money... + Value.Array [ mk_str (| "The poor have no money... " |) ] |) |) @@ -183,10 +180,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Civilians work! -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Civilians work! +" |) ] |) |) |) |) @@ -219,10 +214,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Soldiers fight! -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Soldiers fight! +" |) ] |) |) |) |) 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 ccf55da87..c30969dbe 100644 --- a/CoqOfRust/examples/default/examples/rust_book/custom_types/structures.v +++ b/CoqOfRust/examples/default/examples/rust_book/custom_types/structures.v @@ -29,8 +29,8 @@ Module Impl_core_fmt_Debug_for_structures_Person. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Person" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "name" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Person" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "name" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -44,7 +44,7 @@ Module Impl_core_fmt_Debug_for_structures_Person. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "age" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "age" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -182,7 +182,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [] |), - [ M.read (| Value.String "Peter" |) ] + [ mk_str (| "Peter" |) ] |) |) in let~ age : Ty.path "u8" := M.alloc (| Value.Integer IntegerKind.U8 27 |) in @@ -213,11 +213,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); @@ -285,9 +282,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "point coordinates: (" |); - M.read (| Value.String ", " |); - M.read (| Value.String ") + mk_str (| "point coordinates: (" |); + mk_str (| ", " |); + mk_str (| ") " |) ] |) @@ -389,9 +386,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "second point: (" |); - M.read (| Value.String ", " |); - M.read (| Value.String ") + mk_str (| "second point: (" |); + mk_str (| ", " |); + mk_str (| ") " |) ] |) @@ -522,9 +519,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "pair contains " |); - M.read (| Value.String " and " |); - M.read (| Value.String " + mk_str (| "pair contains " |); + mk_str (| " and " |); + mk_str (| " " |) ] |) @@ -637,9 +634,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "pair contains " |); - M.read (| Value.String " and " |); - M.read (| Value.String " + mk_str (| "pair contains " |); + mk_str (| " and " |); + mk_str (| " " |) ] |) diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/aliases_for_result.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/aliases_for_result.v index 4d8dfa76d..652eb0805 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/aliases_for_result.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/aliases_for_result.v @@ -192,12 +192,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "n is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "n is " |); mk_str (| " +" |) ] |) |) |) @@ -263,12 +259,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Error: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Error: " |); mk_str (| " +" |) ] |) |) |) @@ -341,8 +333,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ], M.get_function (| "aliases_for_result::multiply", [], [] |), [ - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "10" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "2" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "10" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "2" |) |) |) ] |) ] @@ -361,8 +353,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ], M.get_function (| "aliases_for_result::multiply", [], [] |), [ - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "t" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "2" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "t" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "2" |) |) |) ] |) ] 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 cddac9819..779f9ee01 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 @@ -38,7 +38,7 @@ Module Impl_core_fmt_Debug_for_boxing_errors_EmptyVec. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "EmptyVec" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EmptyVec" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -108,9 +108,7 @@ Module Impl_core_fmt_Display_for_boxing_errors_EmptyVec. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "invalid first item to double" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "invalid first item to double" |) ] |) |) |) |) @@ -618,11 +616,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "The first doubled is " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "The first doubled is " |); mk_str (| " +" |) ] |) |) |) @@ -688,12 +683,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Error: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Error: " |); mk_str (| " +" |) ] |) |) |) @@ -815,15 +806,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "42" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "42" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] @@ -904,15 +889,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "tofu" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "tofu" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] 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 4a8f2e1fe..88e76b20d 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 @@ -54,30 +54,21 @@ Module Impl_core_fmt_Debug_for_combinators_and_then_Food. let _ := M.is_struct_tuple (| γ, "combinators_and_then::Food::CordonBleu" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CordonBleu" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CordonBleu" |) |) |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "combinators_and_then::Food::Steak" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Steak" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Steak" |) |) |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "combinators_and_then::Food::Sushi" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Sushi" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Sushi" |) |) |) |))) ] |) @@ -148,30 +139,21 @@ Module Impl_core_fmt_Debug_for_combinators_and_then_Day. (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "combinators_and_then::Day::Monday" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Monday" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Monday" |) |) |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "combinators_and_then::Day::Tuesday" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Tuesday" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Tuesday" |) |) |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "combinators_and_then::Day::Wednesday" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Wednesday" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Wednesday" |) |) |) |))) ] |) @@ -448,9 +430,9 @@ Definition eat (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Yay! On " |); - M.read (| Value.String " we get to eat " |); - M.read (| Value.String ". + mk_str (| "Yay! On " |); + mk_str (| " we get to eat " |); + mk_str (| ". " |) ] |) @@ -533,8 +515,8 @@ Definition eat (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Oh no. We don't get to eat on " |); - M.read (| Value.String "? + mk_str (| "Oh no. We don't get to eat on " |); + mk_str (| "? " |) ] |) 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 26edd6c82..d1e91cc15 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 @@ -53,30 +53,21 @@ Module Impl_core_fmt_Debug_for_combinators_map_Food. (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "combinators_map::Food::Apple" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Apple" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Apple" |) |) |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "combinators_map::Food::Carrot" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Carrot" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Carrot" |) |) |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "combinators_map::Food::Potato" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Potato" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Potato" |) |) |) |))) ] |) @@ -123,7 +114,7 @@ Module Impl_core_fmt_Debug_for_combinators_map_Peeled. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Peeled" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Peeled" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -184,7 +175,7 @@ Module Impl_core_fmt_Debug_for_combinators_map_Chopped. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Chopped" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Chopped" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -245,7 +236,7 @@ Module Impl_core_fmt_Debug_for_combinators_map_Cooked. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Cooked" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Cooked" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -614,12 +605,8 @@ Definition eat (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Mmm. I love " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Mmm. I love " |); mk_str (| " +" |) ] |) |) |) @@ -682,8 +669,7 @@ Definition eat (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Oh no! It wasn't edible. + Value.Array [ mk_str (| "Oh no! It wasn't edible. " |) ] |) |) 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 91c43b707..cb45c1749 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 @@ -24,7 +24,7 @@ Module Impl_core_fmt_Debug_for_defining_an_error_type_DoubleError. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "DoubleError" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "DoubleError" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -102,9 +102,7 @@ Module Impl_core_fmt_Display_for_defining_an_error_type_DoubleError. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "invalid first item to double" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "invalid first item to double" |) ] |) |) |) |) @@ -438,11 +436,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "The first doubled is " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "The first doubled is " |); mk_str (| " +" |) ] |) |) |) @@ -508,12 +503,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Error: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Error: " |); mk_str (| " +" |) ] |) |) |) @@ -628,15 +619,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "42" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "42" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] @@ -717,15 +702,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "tofu" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "tofu" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] 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 781413152..f798b8777 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 @@ -183,12 +183,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "n is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "n is " |); mk_str (| " +" |) ] |) |) |) @@ -254,12 +250,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Error: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Error: " |); mk_str (| " +" |) ] |) |) |) @@ -332,8 +324,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ], M.get_function (| "early_returns::multiply", [], [] |), [ - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "10" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "2" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "10" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "2" |) |) |) ] |) ] @@ -352,8 +344,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ], M.get_function (| "early_returns::multiply", [], [] |), [ - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "t" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "2" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "t" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "2" |) |) |) ] |) ] 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 e927aa001..ac2c1a63d 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 @@ -300,12 +300,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "n is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "n is " |); mk_str (| " +" |) ] |) |) |) @@ -371,12 +367,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Error: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Error: " |); mk_str (| " +" |) ] |) |) |) @@ -450,8 +442,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ], M.get_function (| "introducing_question_mark::multiply", [], [] |), [ - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "10" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "2" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "10" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "2" |) |) |) ] |) ] @@ -470,8 +462,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ], M.get_function (| "introducing_question_mark::multiply", [], [] |), [ - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "t" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "2" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "t" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "2" |) |) |) ] |) ] 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 a01ad4aff..81ad42111 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 @@ -210,12 +210,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "n is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "n is " |); mk_str (| " +" |) ] |) |) |) @@ -281,12 +277,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Error: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Error: " |); mk_str (| " +" |) ] |) |) |) @@ -368,8 +360,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] |), [ - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "10" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "2" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "10" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "2" |) |) |) ] |) ] @@ -396,8 +388,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [] |), [ - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "t" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "2" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "t" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "2" |) |) |) ] |) ] diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_collect_valid_values_and_failures_via_partition.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_collect_valid_values_and_failures_via_partition.v index d0303c589..70246d672 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_collect_valid_values_and_failures_via_partition.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_collect_valid_values_and_failures_via_partition.v @@ -66,15 +66,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "tofu" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "tofu" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] @@ -315,12 +309,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Numbers: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Numbers: " |); mk_str (| " +" |) ] |) |) |) @@ -398,12 +388,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Errors: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Errors: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_collect_valid_values_and_failures_via_partition_unwrapped.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_collect_valid_values_and_failures_via_partition_unwrapped.v index 0fc653bab..72966b830 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_collect_valid_values_and_failures_via_partition_unwrapped.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_collect_valid_values_and_failures_via_partition_unwrapped.v @@ -68,15 +68,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "tofu" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "tofu" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] @@ -614,12 +608,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Numbers: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Numbers: " |); mk_str (| " +" |) ] |) |) |) @@ -688,12 +678,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Errors: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Errors: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_collect_via_map_err_and_filter_map.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_collect_via_map_err_and_filter_map.v index 8be4c104f..7e1c48e77 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_collect_via_map_err_and_filter_map.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_collect_via_map_err_and_filter_map.v @@ -68,23 +68,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "42" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "tofu" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "999" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "42" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "tofu" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "999" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] @@ -524,14 +512,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "Numbers: " |); - M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "Numbers: " |); mk_str (| " +" |) ] |) |) |) |); @@ -595,14 +577,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "Errors: " |); - M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "Errors: " |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_fail_entire_operation_via_collect.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_fail_entire_operation_via_collect.v index c1ae652e1..0bc389dbb 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_fail_entire_operation_via_collect.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_fail_entire_operation_via_collect.v @@ -62,15 +62,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "tofu" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "tofu" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] @@ -276,14 +270,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "Results: " |); - M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "Results: " |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_failed.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_failed.v index 8503026c8..f6890da0b 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_failed.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_failed.v @@ -62,15 +62,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "tofu" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "tofu" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] @@ -276,14 +270,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "Results: " |); - M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "Results: " |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_handle_via_filter_map.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_handle_via_filter_map.v index 7d30f9772..adbc9255f 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_handle_via_filter_map.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/iterating_over_results_handle_via_filter_map.v @@ -65,15 +65,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "tofu" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "tofu" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] @@ -270,14 +264,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "Results: " |); - M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "Results: " |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/map_in_result_via_combinators.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/map_in_result_via_combinators.v index 28c286da7..df227b7df 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/map_in_result_via_combinators.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/map_in_result_via_combinators.v @@ -187,12 +187,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "n is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "n is " |); mk_str (| " +" |) ] |) |) |) @@ -258,12 +254,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Error: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Error: " |); mk_str (| " +" |) ] |) |) |) @@ -342,8 +334,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ], M.get_function (| "map_in_result_via_combinators::multiply", [], [] |), [ - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "10" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "2" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "10" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "2" |) |) |) ] |) |) in @@ -368,8 +360,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ], M.get_function (| "map_in_result_via_combinators::multiply", [], [] |), [ - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "t" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "2" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "t" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "2" |) |) |) ] |) |) in 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 e97617ea7..f8b151a82 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 @@ -158,12 +158,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "n is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "n is " |); mk_str (| " +" |) ] |) |) |) @@ -229,12 +225,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Error: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Error: " |); mk_str (| " +" |) ] |) |) |) @@ -313,8 +305,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ], M.get_function (| "map_in_result_via_match::multiply", [], [] |), [ - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "10" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "2" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "10" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "2" |) |) |) ] |) |) in @@ -339,8 +331,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Ty.path "i32"; Ty.path "core::num::error::ParseIntError" ], M.get_function (| "map_in_result_via_match::multiply", [], [] |), [ - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "t" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "2" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "t" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "2" |) |) |) ] |) |) in diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/multiple_error_types.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/multiple_error_types.v index 65ec8eed1..cb2b850d0 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/multiple_error_types.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/multiple_error_types.v @@ -186,15 +186,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "42" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "42" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] @@ -275,15 +269,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "tofu" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "tofu" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] @@ -314,12 +302,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "The first doubled is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "The first doubled is " |); mk_str (| " +" |) ] |) |) |) @@ -395,12 +379,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "The first doubled is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "The first doubled is " |); mk_str (| " +" |) ] |) |) |) @@ -476,12 +456,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "The first doubled is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "The first doubled is " |); mk_str (| " +" |) ] |) |) |) 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 5afd93e64..e48ddf9b9 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 @@ -26,7 +26,7 @@ Definition give_adult (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : (let γ0_0 := M.SubPointer.get_struct_tuple_field (| γ, "core::option::Option::Some", 0 |) in let _ := - M.is_constant_or_break_match (| M.read (| γ0_0 |), Value.String "lemonade" |) in + M.is_constant_or_break_match (| M.read (| γ0_0 |), mk_str (| "lemonade" |) |) in let~ _ : Ty.tuple [] := M.alloc (| M.call_closure (| @@ -47,10 +47,8 @@ Definition give_adult (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Yuck! Too sugary. -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Yuck! Too sugary. +" |) ] |) |) |) |) @@ -87,12 +85,8 @@ Definition give_adult (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String "? How nice. -" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| "? How nice. +" |) ] |) |) |) @@ -154,10 +148,8 @@ Definition give_adult (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "No drink? Oh well. -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "No drink? Oh well. +" |) ] |) |) |) |) @@ -234,7 +226,7 @@ Definition drink (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |), [ M.borrow (| Pointer.Kind.Ref, inside |); - M.borrow (| Pointer.Kind.Ref, Value.String "lemonade" |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| mk_str (| "lemonade" |) |) |) ] |) |)) in @@ -248,7 +240,7 @@ Definition drink (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "AAAaaaaa!!!!" |) ] + [ mk_str (| "AAAaaaaa!!!!" |) ] |) |) |))); @@ -277,12 +269,8 @@ Definition drink (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "I love " |); - M.read (| Value.String "s!!!!! -" |) - ] + Value.Array [ mk_str (| "I love " |); mk_str (| "s!!!!! +" |) ] |) |) |) @@ -357,16 +345,14 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := (Ty.path "core::option::Option") [] [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] := - M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| Value.String "water" |) ] - |) in + M.alloc (| Value.StructTuple "core::option::Option::Some" [ mk_str (| "water" |) ] |) in let~ lemonade : Ty.apply (Ty.path "core::option::Option") [] [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] := M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| Value.String "lemonade" |) ] + Value.StructTuple "core::option::Option::Some" [ mk_str (| "lemonade" |) ] |) in let~ void : Ty.apply @@ -403,9 +389,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := (Ty.path "core::option::Option") [] [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] := - M.alloc (| - Value.StructTuple "core::option::Option::Some" [ M.read (| Value.String "coffee" |) ] - |) in + M.alloc (| Value.StructTuple "core::option::Option::Some" [ mk_str (| "coffee" |) ] |) in let~ nothing : Ty.apply (Ty.path "core::option::Option") 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 627739677..d2d7858fb 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 @@ -38,7 +38,7 @@ Module Impl_core_fmt_Debug_for_other_uses_of_question_mark_EmptyVec. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "EmptyVec" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EmptyVec" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -86,9 +86,7 @@ Module Impl_core_fmt_Display_for_other_uses_of_question_mark_EmptyVec. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "invalid first item to double" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "invalid first item to double" |) ] |) |) |) |) @@ -526,11 +524,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "The first doubled is " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "The first doubled is " |); mk_str (| " +" |) ] |) |) |) @@ -596,12 +591,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Error: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Error: " |); mk_str (| " +" |) ] |) |) |) @@ -724,15 +715,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "42" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "42" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] @@ -813,15 +798,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "tofu" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "tofu" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/panic.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/panic.v index 9d5876a4a..a919d9cb9 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/panic.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/panic.v @@ -40,7 +40,7 @@ Definition drink (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |), [ M.borrow (| Pointer.Kind.Ref, beverage |); - M.borrow (| Pointer.Kind.Ref, Value.String "lemonade" |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| mk_str (| "lemonade" |) |) |) ] |) |)) in @@ -54,7 +54,7 @@ Definition drink (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "AAAaaaaa!!!!" |) ] + [ mk_str (| "AAAaaaaa!!!!" |) ] |) |) |))); @@ -84,11 +84,8 @@ Definition drink (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Some refreshing " |); - M.read (| Value.String " is all I need. -" |) - ] + [ mk_str (| "Some refreshing " |); mk_str (| " is all I need. +" |) ] |) |) |) @@ -152,7 +149,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.call_closure (| Ty.tuple [], M.get_function (| "panic::drink", [], [] |), - [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "water" |) |) |) ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "water" |) |) |) ] |) |) in let~ _ : Ty.tuple [] := @@ -160,8 +157,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.call_closure (| Ty.tuple [], M.get_function (| "panic::drink", [], [] |), - [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "lemonade" |) |) |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "lemonade" |) |) |) ] |) |) in M.alloc (| Value.Tuple [] |) diff --git a/CoqOfRust/examples/default/examples/rust_book/error_handling/pulling_results_out_of_options.v b/CoqOfRust/examples/default/examples/rust_book/error_handling/pulling_results_out_of_options.v index 00ad72015..63dbebbb7 100644 --- a/CoqOfRust/examples/default/examples/rust_book/error_handling/pulling_results_out_of_options.v +++ b/CoqOfRust/examples/default/examples/rust_book/error_handling/pulling_results_out_of_options.v @@ -263,15 +263,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "42" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "42" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] @@ -352,15 +346,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "tofu" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "tofu" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] @@ -391,12 +379,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "The first doubled is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "The first doubled is " |); mk_str (| " +" |) ] |) |) |) @@ -496,12 +480,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "The first doubled is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "The first doubled is " |); mk_str (| " +" |) ] |) |) |) @@ -601,12 +581,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "The first doubled is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "The first doubled is " |); mk_str (| " +" |) ] |) |) |) 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 4000867f5..f9075fd8d 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 @@ -408,15 +408,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "42" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "42" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] @@ -497,15 +491,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "tofu" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "tofu" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] @@ -536,12 +524,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "The first doubled is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "The first doubled is " |); mk_str (| " +" |) ] |) |) |) @@ -637,12 +621,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "The first doubled is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "The first doubled is " |); mk_str (| " +" |) ] |) |) |) @@ -738,12 +718,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "The first doubled is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "The first doubled is " |); mk_str (| " +" |) ] |) |) |) 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 5b61889f2..6f01f3175 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 @@ -20,7 +20,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.read (| let~ number_str : Ty.apply (Ty.path "&") [] [ Ty.path "str" ] := - M.copy (| Value.String "10" |) in + M.alloc (| mk_str (| "10" |) |) in let~ number : Ty.path "i32" := M.copy (| M.match_operator (| @@ -88,11 +88,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); 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 20afc4940..abb5050e1 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 @@ -72,10 +72,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_get_or_insert_ "unpacking_options_and_defaults_via_get_or_insert::Fruit::Apple" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Apple" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Apple" |) |) |) |))); fun γ => ltac:(M.monadic @@ -86,10 +83,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_get_or_insert_ "unpacking_options_and_defaults_via_get_or_insert::Fruit::Orange" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Orange" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Orange" |) |) |) |))); fun γ => ltac:(M.monadic @@ -100,10 +94,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_get_or_insert_ "unpacking_options_and_defaults_via_get_or_insert::Fruit::Banana" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Banana" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Banana" |) |) |) |))); fun γ => ltac:(M.monadic @@ -114,10 +105,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_get_or_insert_ "unpacking_options_and_defaults_via_get_or_insert::Fruit::Kiwi" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Kiwi" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Kiwi" |) |) |) |))); fun γ => ltac:(M.monadic @@ -128,10 +116,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_get_or_insert_ "unpacking_options_and_defaults_via_get_or_insert::Fruit::Lemon" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Lemon" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Lemon" |) |) |) |))) ] |) @@ -223,12 +208,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "my_fruit is: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "my_fruit is: " |); mk_str (| " +" |) ] |) |) |) @@ -300,11 +281,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "first_available_fruit is: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "first_available_fruit is: " |); mk_str (| " +" |) ] |) |) |) 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 e83e23778..7081d7adc 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 @@ -72,10 +72,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_get_or_insert_ "unpacking_options_and_defaults_via_get_or_insert_with::Fruit::Apple" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Apple" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Apple" |) |) |) |))); fun γ => ltac:(M.monadic @@ -86,10 +83,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_get_or_insert_ "unpacking_options_and_defaults_via_get_or_insert_with::Fruit::Orange" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Orange" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Orange" |) |) |) |))); fun γ => ltac:(M.monadic @@ -100,10 +94,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_get_or_insert_ "unpacking_options_and_defaults_via_get_or_insert_with::Fruit::Banana" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Banana" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Banana" |) |) |) |))); fun γ => ltac:(M.monadic @@ -114,10 +105,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_get_or_insert_ "unpacking_options_and_defaults_via_get_or_insert_with::Fruit::Kiwi" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Kiwi" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Kiwi" |) |) |) |))); fun γ => ltac:(M.monadic @@ -128,10 +116,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_get_or_insert_ "unpacking_options_and_defaults_via_get_or_insert_with::Fruit::Lemon" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Lemon" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Lemon" |) |) |) |))) ] |) @@ -231,9 +216,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "Providing lemon as fallback + mk_str (| + "Providing lemon as fallback " |) ] @@ -307,12 +291,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "my_fruit is: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "my_fruit is: " |); mk_str (| " +" |) ] |) |) |) @@ -384,11 +364,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "first_available_fruit is: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "first_available_fruit is: " |); mk_str (| " +" |) ] |) |) |) @@ -500,12 +477,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "should_be_apple is: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "should_be_apple is: " |); mk_str (| " +" |) ] |) |) |) @@ -577,11 +550,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "my_apple is unchanged: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "my_apple is unchanged: " |); mk_str (| " +" |) ] |) |) |) 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 26578665a..a08b5a8ec 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 @@ -72,10 +72,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_or_Fruit. "unpacking_options_and_defaults_via_or::Fruit::Apple" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Apple" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Apple" |) |) |) |))); fun γ => ltac:(M.monadic @@ -86,10 +83,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_or_Fruit. "unpacking_options_and_defaults_via_or::Fruit::Orange" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Orange" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Orange" |) |) |) |))); fun γ => ltac:(M.monadic @@ -100,10 +94,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_or_Fruit. "unpacking_options_and_defaults_via_or::Fruit::Banana" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Banana" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Banana" |) |) |) |))); fun γ => ltac:(M.monadic @@ -114,10 +105,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_or_Fruit. "unpacking_options_and_defaults_via_or::Fruit::Kiwi" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Kiwi" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Kiwi" |) |) |) |))); fun γ => ltac:(M.monadic @@ -128,10 +116,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_or_Fruit. "unpacking_options_and_defaults_via_or::Fruit::Lemon" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Lemon" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Lemon" |) |) |) |))) ] |) @@ -262,11 +247,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "first_available_fruit: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "first_available_fruit: " |); mk_str (| " +" |) ] |) |) |) 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 2abdafb29..379851b5d 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 @@ -72,10 +72,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_or_else_Fruit. "unpacking_options_and_defaults_via_or_else::Fruit::Apple" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Apple" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Apple" |) |) |) |))); fun γ => ltac:(M.monadic @@ -86,10 +83,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_or_else_Fruit. "unpacking_options_and_defaults_via_or_else::Fruit::Orange" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Orange" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Orange" |) |) |) |))); fun γ => ltac:(M.monadic @@ -100,10 +94,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_or_else_Fruit. "unpacking_options_and_defaults_via_or_else::Fruit::Banana" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Banana" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Banana" |) |) |) |))); fun γ => ltac:(M.monadic @@ -114,10 +105,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_or_else_Fruit. "unpacking_options_and_defaults_via_or_else::Fruit::Kiwi" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Kiwi" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Kiwi" |) |) |) |))); fun γ => ltac:(M.monadic @@ -128,10 +116,7 @@ Module Impl_core_fmt_Debug_for_unpacking_options_and_defaults_via_or_else_Fruit. "unpacking_options_and_defaults_via_or_else::Fruit::Lemon" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Lemon" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Lemon" |) |) |) |))) ] |) @@ -242,12 +227,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String - "Providing kiwi as fallback -" - |) + [ mk_str (| "Providing kiwi as fallback +" |) ] |) |) @@ -325,9 +306,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "Providing lemon as fallback + mk_str (| + "Providing lemon as fallback " |) ] @@ -434,11 +414,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "first_available_fruit: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "first_available_fruit: " |); mk_str (| " +" |) ] |) |) |) 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 09bb9738a..fa9b9cd73 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 @@ -61,10 +61,7 @@ Module Impl_core_fmt_Debug_for_wrapping_errors_DoubleError. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EmptyVec" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EmptyVec" |) |) |) ] |) |))); @@ -92,10 +89,7 @@ Module Impl_core_fmt_Debug_for_wrapping_errors_DoubleError. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Parse" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Parse" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -184,11 +178,7 @@ Module Impl_core_fmt_Display_for_wrapping_errors_DoubleError. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String - "please use a vector with at least one element" - |) + [ mk_str (| "please use a vector with at least one element" |) ] |) |) @@ -233,9 +223,8 @@ Module Impl_core_fmt_Display_for_wrapping_errors_DoubleError. M.alloc (| Value.Array [ - M.read (| - Value.String - "the provided string could not be parsed as int" + mk_str (| + "the provided string could not be parsed as int" |) ] |) @@ -727,11 +716,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "The first doubled is " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "The first doubled is " |); mk_str (| " +" |) ] |) |) |) @@ -798,12 +784,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Error: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Error: " |); mk_str (| " +" |) ] |) |) |) @@ -905,11 +887,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String " Caused by: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| " Caused by: " |); mk_str (| " +" |) ] |) |) |) @@ -1037,15 +1016,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "42" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "42" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] @@ -1126,15 +1099,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "tofu" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "93" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "18" |) |) - |) + mk_str (| "tofu" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "93" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "18" |) |) |) ] |) ] diff --git a/CoqOfRust/examples/default/examples/rust_book/expressions/blocks.v b/CoqOfRust/examples/default/examples/rust_book/expressions/blocks.v index 2b21a5421..eaac850da 100644 --- a/CoqOfRust/examples/default/examples/rust_book/expressions/blocks.v +++ b/CoqOfRust/examples/default/examples/rust_book/expressions/blocks.v @@ -69,11 +69,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "x is " |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "x is " |); mk_str (| " +" |) ] |) |) |) |); @@ -132,11 +129,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "y is " |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "y is " |); mk_str (| " +" |) ] |) |) |) |); @@ -195,11 +189,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "z is " |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "z is " |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_iterators_into_iter.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_iterators_into_iter.v index 712e91cd9..82b6d4480 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_iterators_into_iter.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_iterators_into_iter.v @@ -70,15 +70,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Bob" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Frank" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Ferris" |) |) - |) + mk_str (| "Bob" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Frank" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Ferris" |) |) |) ] |) ] @@ -197,7 +191,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "Ferris" + mk_str (| "Ferris" |) |) in let~ _ : Ty.tuple [] := M.alloc (| @@ -222,9 +216,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "There is a rustacean among us! + mk_str (| + "There is a rustacean among us! " |) ] @@ -266,8 +259,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Hello " |); - M.read (| Value.String " + mk_str (| "Hello " |); + mk_str (| " " |) ] |) diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_iterators_iter.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_iterators_iter.v index 448990591..24ec86e86 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_iterators_iter.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_iterators_iter.v @@ -70,15 +70,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Bob" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Frank" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Ferris" |) |) - |) + mk_str (| "Bob" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Frank" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Ferris" |) |) |) ] |) ] @@ -228,7 +222,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "Ferris" + mk_str (| "Ferris" |) |) in let~ _ : Ty.tuple [] := M.alloc (| @@ -257,9 +251,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "There is a rustacean among us! + mk_str (| + "There is a rustacean among us! " |) ] @@ -305,10 +298,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String "Hello " - |); - M.read (| Value.String " + mk_str (| "Hello " |); + mk_str (| " " |) ] |) @@ -395,12 +386,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "names: " |); M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "names: " |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_iterators_iter_mut.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_iterators_iter_mut.v index b55a3b43f..b0237efa2 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_iterators_iter_mut.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_iterators_iter_mut.v @@ -69,15 +69,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Bob" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Frank" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Ferris" |) |) - |) + mk_str (| "Bob" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Frank" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Ferris" |) |) |) ] |) ] @@ -231,16 +225,13 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "Ferris" + mk_str (| "Ferris" |) |) in M.alloc (| M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "There is a rustacean among us!" - |) + mk_str (| "There is a rustacean among us!" |) |) |) |))); @@ -249,7 +240,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := (M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Hello" |) |) + M.deref (| mk_str (| "Hello" |) |) |) |))) ] @@ -284,12 +275,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "names: " |); M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "names: " |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_range_completely_inclusive.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_range_completely_inclusive.v index b83fef48c..9d8aa8131 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_range_completely_inclusive.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/for_and_range_completely_inclusive.v @@ -147,12 +147,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "fizzbuzz -" - |) - ] + [ mk_str (| "fizzbuzz +" |) ] |) |) |) @@ -215,12 +211,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "fizz -" - |) - ] + [ mk_str (| "fizz +" |) ] |) |) |) @@ -289,9 +281,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "buzz + mk_str (| + "buzz " |) ] @@ -344,13 +335,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String "" - |); - M.read (| - Value.String " -" - |) + mk_str (| "" |); + mk_str (| " +" |) ] |) |) 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 e463a371b..bb269ef0f 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 @@ -140,12 +140,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "fizzbuzz -" - |) - ] + [ mk_str (| "fizzbuzz +" |) ] |) |) |) @@ -208,12 +204,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "fizz -" - |) - ] + [ mk_str (| "fizz +" |) ] |) |) |) @@ -282,9 +274,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "buzz + mk_str (| + "buzz " |) ] @@ -337,13 +328,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String "" - |); - M.read (| - Value.String " -" - |) + mk_str (| "" |); + mk_str (| " +" |) ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_else.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_else.v index 7c9fa6f3f..56616a5b5 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_else.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/if_else.v @@ -74,11 +74,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " is negative" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| " is negative" |) ] |) |) |) @@ -159,10 +155,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " is positive" |) - ] + [ mk_str (| "" |); mk_str (| " is positive" |) ] |) |) |) @@ -232,10 +225,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " is zero" |) - ] + [ mk_str (| "" |); mk_str (| " is zero" |) ] |) |) |) @@ -323,9 +313,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - ", and is a small number, increase ten-fold + mk_str (| + ", and is a small number, increase ten-fold " |) ] @@ -368,9 +357,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - ", and is a big number, halve the number + mk_str (| + ", and is a big number, halve the number " |) ] @@ -412,13 +400,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " -> " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| " -> " |); mk_str (| " +" |) ] |) |) |) 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 df25cc6c4..971771b81 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 @@ -86,12 +86,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Matched " |); - M.read (| Value.String "! -" |) - ] + Value.Array [ mk_str (| "Matched " |); mk_str (| "! +" |) ] |) |) |) @@ -170,12 +166,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Matched " |); - M.read (| Value.String "! -" |) - ] + Value.Array [ mk_str (| "Matched " |); mk_str (| "! +" |) ] |) |) |) @@ -241,9 +233,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "Didn't match a number. Let's go with a letter! + mk_str (| + "Didn't match a number. Let's go with a letter! " |) ] @@ -294,12 +285,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Matched " |); - M.read (| Value.String "! -" |) - ] + Value.Array [ mk_str (| "Matched " |); mk_str (| "! +" |) ] |) |) |) @@ -374,9 +361,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "Didn't match a number. Let's go with a letter! + mk_str (| + "Didn't match a number. Let's go with a letter! " |) ] @@ -417,9 +403,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "I don't like letters. Let's go with an emoticon :)! + mk_str (| + "I don't like letters. Let's go with an emoticon :)! " |) ] 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 635e4bf1f..ca6d7d3e2 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 @@ -65,10 +65,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "a is foobar -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "a is foobar +" |) ] |) |) |) |) 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 d3c868163..2b451a567 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 @@ -64,10 +64,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String "This is a really long string and `" - |); - M.read (| Value.String "` + mk_str (| "This is a really long string and `" |); + mk_str (| "` " |) ] |) 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 309d6c7f3..896a4c843 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 @@ -103,10 +103,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "a is foobar -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "a is foobar +" |) ] |) |) |) |) @@ -150,10 +148,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "b is foobar -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "b is foobar +" |) ] |) |) |) |) @@ -207,12 +203,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "c is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "c is " |); mk_str (| " +" |) ] |) |) |) @@ -297,10 +289,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "c is one hundred -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "c is one hundred +" |) ] |) |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/infinite_loop.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/infinite_loop.v index 1c0767fa4..3b5f18d13 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/infinite_loop.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/infinite_loop.v @@ -57,8 +57,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Let's count until infinity! + Value.Array [ mk_str (| "Let's count until infinity! " |) ] |) |) @@ -118,10 +117,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "three -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "three +" |) ] |) |) |) |) @@ -159,11 +156,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); @@ -238,8 +232,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "OK, that's enough + Value.Array [ mk_str (| "OK, that's enough " |) ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/loop_nesting_and_labels.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/loop_nesting_and_labels.v index b552ba17c..47bda317c 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/loop_nesting_and_labels.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/loop_nesting_and_labels.v @@ -53,8 +53,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Entered the outer loop + Value.Array [ mk_str (| "Entered the outer loop " |) ] |) |) @@ -96,12 +95,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "Entered the inner loop -" - |) - ] + [ mk_str (| "Entered the inner loop +" |) ] |) |) |) @@ -139,13 +134,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "This point will never be reached -" - |) - ] + Value.Array [ mk_str (| "This point will never be reached +" |) ] |) |) |) @@ -179,10 +169,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Exited the outer loop -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Exited the outer loop +" |) ] |) |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match.v index 7ad7110f7..4fa6399c1 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match.v @@ -60,12 +60,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Tell me about " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Tell me about " |); mk_str (| " +" |) ] |) |) |) @@ -136,7 +132,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "One! + M.alloc (| Value.Array [ mk_str (| "One! " |) ] |) |) |) @@ -219,8 +215,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "This is a prime + Value.Array [ mk_str (| "This is a prime " |) ] |) |) @@ -257,10 +252,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "A teen -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "A teen +" |) ] |) |) |) |) @@ -292,10 +285,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Ain't special -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Ain't special +" |) ] |) |) |) |) @@ -347,13 +338,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " -> " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| " -> " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_binding.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_binding.v index 463cf442a..2990cbd90 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_binding.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_binding.v @@ -59,8 +59,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Tell me what type of person you are + Value.Array [ mk_str (| "Tell me what type of person you are " |) ] |) |) @@ -111,12 +110,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "I haven't celebrated my first birthday yet -" - |) - ] + [ mk_str (| "I haven't celebrated my first birthday yet +" |) ] |) |) |) @@ -153,11 +148,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "I'm a child of age " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "I'm a child of age " |); mk_str (| " +" |) ] |) |) |) @@ -222,11 +214,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "I'm a teen of age " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "I'm a teen of age " |); mk_str (| " +" |) ] |) |) |) @@ -291,11 +280,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "I'm an old person of age " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "I'm an old person of age " |); mk_str (| " +" |) ] |) |) |) 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 7a0c53569..437b01e3c 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 @@ -79,12 +79,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "The Answer: " |); - M.read (| Value.String "! -" |) - ] + Value.Array [ mk_str (| "The Answer: " |); mk_str (| "! +" |) ] |) |) |) @@ -151,11 +147,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Not interesting... " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "Not interesting... " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_arrays_slices.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_arrays_slices.v index 434af616e..f8fb90704 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_arrays_slices.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_arrays_slices.v @@ -95,9 +95,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "array[0] = 0, array[1] = " |); - M.read (| Value.String ", array[2] = " |); - M.read (| Value.String " + mk_str (| "array[0] = 0, array[1] = " |); + mk_str (| ", array[2] = " |); + mk_str (| " " |) ] |) @@ -188,8 +188,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "array[0] = 1, array[2] = " |); - M.read (| Value.String " and array[1] was ignored + mk_str (| "array[0] = 1, array[2] = " |); + mk_str (| " and array[1] was ignored " |) ] |) @@ -265,11 +265,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "array[0] = -1, array[1] = " |); - M.read (| - Value.String " and all the other ones were ignored -" - |) + mk_str (| "array[0] = -1, array[1] = " |); + mk_str (| " and all the other ones were ignored +" |) ] |) |) @@ -345,9 +343,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "array[0] = 3, array[1] = " |); - M.read (| Value.String " and the other elements were " |); - M.read (| Value.String " + mk_str (| "array[0] = 3, array[1] = " |); + mk_str (| " and the other elements were " |); + mk_str (| " " |) ] |) @@ -440,10 +438,10 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "array[0] = " |); - M.read (| Value.String ", middle = " |); - M.read (| Value.String ", array[2] = " |); - M.read (| Value.String " + mk_str (| "array[0] = " |); + mk_str (| ", middle = " |); + mk_str (| ", array[2] = " |); + mk_str (| " " |) ] |) 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 f219058b1..3bc99e96e 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 @@ -112,10 +112,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "What color is it? -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "What color is it? +" |) ] |) |) |) |) @@ -152,10 +150,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "The color is Red! -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "The color is Red! +" |) ] |) |) |) |) @@ -188,10 +184,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "The color is Blue! -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "The color is Blue! +" |) ] |) |) |) |) @@ -224,10 +218,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "The color is Green! -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "The color is Green! +" |) ] |) |) |) |) @@ -284,10 +276,10 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Red: " |); - M.read (| Value.String ", green: " |); - M.read (| Value.String ", and blue: " |); - M.read (| Value.String "! + mk_str (| "Red: " |); + mk_str (| ", green: " |); + mk_str (| ", and blue: " |); + mk_str (| "! " |) ] |) @@ -405,10 +397,10 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Hue: " |); - M.read (| Value.String ", saturation: " |); - M.read (| Value.String ", value: " |); - M.read (| Value.String "! + mk_str (| "Hue: " |); + mk_str (| ", saturation: " |); + mk_str (| ", value: " |); + mk_str (| "! " |) ] |) @@ -526,10 +518,10 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Hue: " |); - M.read (| Value.String ", saturation: " |); - M.read (| Value.String ", lightness: " |); - M.read (| Value.String "! + mk_str (| "Hue: " |); + mk_str (| ", saturation: " |); + mk_str (| ", lightness: " |); + mk_str (| "! " |) ] |) @@ -647,10 +639,10 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Cyan: " |); - M.read (| Value.String ", magenta: " |); - M.read (| Value.String ", yellow: " |); - M.read (| Value.String "! + mk_str (| "Cyan: " |); + mk_str (| ", magenta: " |); + mk_str (| ", yellow: " |); + mk_str (| "! " |) ] |) @@ -775,11 +767,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Cyan: " |); - M.read (| Value.String ", magenta: " |); - M.read (| Value.String ", yellow: " |); - M.read (| Value.String ", key (black): " |); - M.read (| Value.String "! + mk_str (| "Cyan: " |); + mk_str (| ", magenta: " |); + mk_str (| ", yellow: " |); + mk_str (| ", key (black): " |); + mk_str (| "! " |) ] |) diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_pointers_ref.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_pointers_ref.v index 687eb530b..fee43880e 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_pointers_ref.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_pointers_ref.v @@ -95,10 +95,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String "Got a value via destructuring: " - |); - M.read (| Value.String " + mk_str (| "Got a value via destructuring: " |); + mk_str (| " " |) ] |) @@ -173,10 +171,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String "Got a value via dereferencing: " - |); - M.read (| Value.String " + mk_str (| "Got a value via dereferencing: " |); + mk_str (| " " |) ] |) @@ -263,10 +259,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String "Got a reference to a value: " - |); - M.read (| Value.String " + mk_str (| "Got a reference to a value: " |); + mk_str (| " " |) ] |) @@ -354,10 +348,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String "We added 10. `mut_value`: " - |); - M.read (| Value.String " + mk_str (| "We added 10. `mut_value`: " |); + mk_str (| " " |) ] |) 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 0eab96e6e..559c2e9a4 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 @@ -94,9 +94,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "First of x is 1, b = " |); - M.read (| Value.String ", y = " |); - M.read (| Value.String " + mk_str (| "First of x is 1, b = " |); + mk_str (| ", y = " |); + mk_str (| " " |) ] |) @@ -194,12 +194,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "y is 2, i = " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "y is 2, i = " |); mk_str (| " +" |) ] |) |) |) @@ -270,9 +266,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "y = " |); - M.read (| Value.String ", we don't care about x + [ mk_str (| "y = " |); mk_str (| ", we don't care about x " |) ] |) diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_tuples.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_tuples.v index 56d825d2a..fc8dcd1eb 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_tuples.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_tuples.v @@ -56,12 +56,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Tell me about " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Tell me about " |); mk_str (| " +" |) ] |) |) |) @@ -140,9 +136,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "First is `0`, `y` is " |); - M.read (| Value.String ", and `z` is " |); - M.read (| Value.String " + mk_str (| "First is `0`, `y` is " |); + mk_str (| ", and `z` is " |); + mk_str (| " " |) ] |) @@ -230,12 +226,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "First is `1` and the rest doesn't matter -" - |) - ] + [ mk_str (| "First is `1` and the rest doesn't matter +" |) ] |) |) |) @@ -278,12 +270,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "last is `2` and the rest doesn't matter -" - |) - ] + [ mk_str (| "last is `2` and the rest doesn't matter +" |) ] |) |) |) @@ -332,9 +320,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "First is `3`, last is `4`, and the rest doesn't matter + mk_str (| + "First is `3`, last is `4`, and the rest doesn't matter " |) ] @@ -371,10 +358,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "It doesn't matter what they are -" |) - ] + Value.Array [ mk_str (| "It doesn't matter what they are +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_tuples_fixed.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_tuples_fixed.v index ec0d4d833..272ac0dd5 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_tuples_fixed.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_destructuring_tuples_fixed.v @@ -56,12 +56,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Tell me about " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Tell me about " |); mk_str (| " +" |) ] |) |) |) @@ -140,9 +136,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "First is `0`, `y` is " |); - M.read (| Value.String ", and `z` is " |); - M.read (| Value.String " + mk_str (| "First is `0`, `y` is " |); + mk_str (| ", and `z` is " |); + mk_str (| " " |) ] |) @@ -230,12 +226,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "First is `1` and the rest doesn't matter -" - |) - ] + [ mk_str (| "First is `1` and the rest doesn't matter +" |) ] |) |) |) @@ -278,12 +270,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "last is `2` and the rest doesn't matter -" - |) - ] + [ mk_str (| "last is `2` and the rest doesn't matter +" |) ] |) |) |) @@ -332,9 +320,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "First is `3`, last is `4`, and the rest doesn't matter + mk_str (| + "First is `3`, last is `4`, and the rest doesn't matter " |) ] @@ -371,10 +358,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "It doesn't matter what they are -" |) - ] + Value.Array [ mk_str (| "It doesn't matter what they are +" |) ] |) |) |) 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 cdf8ceb55..84af75ee5 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 @@ -89,11 +89,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String "C is above 30 Celsius -" |) - ] + [ mk_str (| "" |); mk_str (| "C is above 30 Celsius +" |) ] |) |) |) @@ -164,11 +161,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String "C is below 30 Celsius -" |) - ] + [ mk_str (| "" |); mk_str (| "C is below 30 Celsius +" |) ] |) |) |) @@ -242,11 +236,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String "F is above 86 Fahrenheit -" |) - ] + [ mk_str (| "" |); mk_str (| "F is above 86 Fahrenheit +" |) ] |) |) |) @@ -317,11 +308,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String "F is below 86 Fahrenheit -" |) - ] + [ mk_str (| "" |); mk_str (| "F is below 86 Fahrenheit +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_guards_unreachable.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_guards_unreachable.v index 4edd8fbee..0c10df86e 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_guards_unreachable.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/match_guards_unreachable.v @@ -49,7 +49,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Zero + M.alloc (| Value.Array [ mk_str (| "Zero " |) ] |) |) |) @@ -86,10 +86,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Greater than zero -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Greater than zero +" |) ] |) |) |) |) @@ -114,7 +112,10 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| Pointer.Kind.Ref, Value.String "Should never happen." |) + M.borrow (| + Pointer.Kind.Ref, + M.alloc (| mk_str (| "Should never happen." |) |) + |) |) |) ] diff --git a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/while.v b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/while.v index eda6cb91d..5a59c53de 100644 --- a/CoqOfRust/examples/default/examples/rust_book/flow_of_control/while.v +++ b/CoqOfRust/examples/default/examples/rust_book/flow_of_control/while.v @@ -89,8 +89,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "fizzbuzz + Value.Array [ mk_str (| "fizzbuzz " |) ] |) |) @@ -149,8 +148,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "fizz + Value.Array [ mk_str (| "fizz " |) ] |) |) @@ -214,12 +212,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "buzz -" - |) - ] + [ mk_str (| "buzz +" |) ] |) |) |) @@ -264,13 +258,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String "" - |); - M.read (| - Value.String " -" - |) + mk_str (| "" |); + mk_str (| " +" |) ] |) |) 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 75ad734b8..9a17a7ff2 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 @@ -85,12 +85,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "Greater than 9, quit! -" - |) - ] + [ mk_str (| "Greater than 9, quit! +" |) ] |) |) |) @@ -138,8 +134,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "`i` is `" |); - M.read (| Value.String "`. Try again. + mk_str (| "`i` is `" |); + mk_str (| "`. Try again. " |) ] |) 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 90469ad8b..80a7fbbe2 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 @@ -89,12 +89,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "Greater than 9, quit! -" - |) - ] + [ mk_str (| "Greater than 9, quit! +" |) ] |) |) |) @@ -142,8 +138,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "`i` is `" |); - M.read (| Value.String "`. Try again. + mk_str (| "`i` is `" |); + mk_str (| "`. Try again. " |) ] |) 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 666c1cb90..f6653e8fe 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 @@ -435,9 +435,9 @@ Module Impl_associated_functions_and_methods_Pair. M.alloc (| Value.Array [ - M.read (| Value.String "Destroying Pair(" |); - M.read (| Value.String ", " |); - M.read (| Value.String ") + mk_str (| "Destroying Pair(" |); + mk_str (| ", " |); + mk_str (| ") " |) ] |) @@ -613,12 +613,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Rectangle perimeter: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Rectangle perimeter: " |); mk_str (| " +" |) ] |) |) |) @@ -696,12 +692,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Rectangle area: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Rectangle area: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/functions/diverging_functions.v b/CoqOfRust/examples/default/examples/rust_book/functions/diverging_functions.v index 79af2f8fa..7d8cb8072 100644 --- a/CoqOfRust/examples/default/examples/rust_book/functions/diverging_functions.v +++ b/CoqOfRust/examples/default/examples/rust_book/functions/diverging_functions.v @@ -35,7 +35,7 @@ Module main. [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "This call never returns." |) ] + [ mk_str (| "This call never returns." |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. 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 7860218e9..99fb04983 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 @@ -55,10 +55,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String "Sum of odd numbers up to 9 (excluding): " - |); - M.read (| Value.String " + mk_str (| "Sum of odd numbers up to 9 (excluding): " |); + mk_str (| " " |) ] |) diff --git a/CoqOfRust/examples/default/examples/rust_book/functions/diverging_functions_no_info_in_return_type.v b/CoqOfRust/examples/default/examples/rust_book/functions/diverging_functions_no_info_in_return_type.v index e85ff3d14..2f489e989 100644 --- a/CoqOfRust/examples/default/examples/rust_book/functions/diverging_functions_no_info_in_return_type.v +++ b/CoqOfRust/examples/default/examples/rust_book/functions/diverging_functions_no_info_in_return_type.v @@ -58,12 +58,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "This function returns and you can see this line. -" - |) - ] + [ mk_str (| "This function returns and you can see this line. +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/functions/functions.v b/CoqOfRust/examples/default/examples/rust_book/functions/functions.v index 2af8b3eb6..b421fd8df 100644 --- a/CoqOfRust/examples/default/examples/rust_book/functions/functions.v +++ b/CoqOfRust/examples/default/examples/rust_book/functions/functions.v @@ -112,10 +112,8 @@ Definition fizzbuzz (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "fizzbuzz -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "fizzbuzz +" |) ] |) |) |) |) @@ -166,10 +164,8 @@ Definition fizzbuzz (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "fizz -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "fizz +" |) ] |) |) |) |) @@ -224,8 +220,7 @@ Definition fizzbuzz (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "buzz + Value.Array [ mk_str (| "buzz " |) ] |) |) @@ -266,11 +261,8 @@ Definition fizzbuzz (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures.v b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures.v index a2ccbbf28..5fe5bcd95 100644 --- a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures.v +++ b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures.v @@ -100,12 +100,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "closure_annotated: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "closure_annotated: " |); mk_str (| " +" |) ] |) |) |) @@ -193,12 +189,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "closure_inferred: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "closure_inferred: " |); mk_str (| " +" |) ] |) |) |) @@ -300,11 +292,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "closure returning one: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "closure returning one: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_as_input_parameters.v b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_as_input_parameters.v index f96f4c0ba..33831127e 100644 --- a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_as_input_parameters.v +++ b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_as_input_parameters.v @@ -120,7 +120,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.read (| let~ greeting : Ty.apply (Ty.path "&") [] [ Ty.path "str" ] := - M.copy (| Value.String "hello" |) in + M.alloc (| mk_str (| "hello" |) |) in let~ farewell : Ty.path "alloc::string::String" := M.alloc (| M.call_closure (| @@ -134,7 +134,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [] |), - [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "goodbye" |) |) |) ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "goodbye" |) |) |) ] |) |) in let~ diary : Ty.function [ Ty.tuple [] ] (Ty.tuple []) := @@ -178,9 +178,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "I said " |); - M.read (| Value.String ". + [ mk_str (| "I said " |); mk_str (| ". " |) ] |) @@ -245,7 +243,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.MutRef, farewell |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "!!!" |) |) + M.deref (| mk_str (| "!!!" |) |) |) ] |) @@ -277,10 +275,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String "Then I screamed " - |); - M.read (| Value.String ". + mk_str (| "Then I screamed " |); + mk_str (| ". " |) ] |) @@ -349,12 +345,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "Now I can sleep. zzzzz -" - |) - ] + [ mk_str (| "Now I can sleep. zzzzz +" |) ] |) |) |) @@ -439,12 +431,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "3 doubled: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "3 doubled: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_as_output_parameters.v b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_as_output_parameters.v index abd0a9731..89f66b493 100644 --- a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_as_output_parameters.v +++ b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_as_output_parameters.v @@ -26,7 +26,7 @@ Definition create_fn (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : [], [] |), - [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Fn" |) |) |) ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Fn" |) |) |) ] |) |) in M.alloc (| @@ -68,11 +68,8 @@ Definition create_fn (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "This is a: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "This is a: " |); mk_str (| " +" |) ] |) |) |) @@ -153,7 +150,7 @@ Definition create_fnmut (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) [], [] |), - [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "FnMut" |) |) |) ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FnMut" |) |) |) ] |) |) in M.alloc (| @@ -195,11 +192,8 @@ Definition create_fnmut (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "This is a: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "This is a: " |); mk_str (| " +" |) ] |) |) |) @@ -280,7 +274,7 @@ Definition create_fnonce (ε : list Value.t) (τ : list Ty.t) (α : list Value.t [], [] |), - [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "FnOnce" |) |) |) ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FnOnce" |) |) |) ] |) |) in M.alloc (| @@ -322,11 +316,8 @@ Definition create_fnonce (ε : list Value.t) (τ : list Ty.t) (α : list Value.t Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "This is a: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "This is a: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_capturing.v b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_capturing.v index 5fadb25bd..97084debc 100644 --- a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_capturing.v +++ b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_capturing.v @@ -87,7 +87,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [] |), - [ M.read (| Value.String "green" |) ] + [ mk_str (| "green" |) ] |) |) in let~ print : Ty.function [ Ty.tuple [] ] (Ty.tuple []) := @@ -130,11 +130,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "`color`: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "`color`: " |); mk_str (| " +" |) ] |) |) |) @@ -272,9 +269,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "`count`: " |); - M.read (| Value.String " + [ mk_str (| "`count`: " |); mk_str (| " " |) ] |) @@ -426,8 +421,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "`movable`: " |); - M.read (| Value.String " + mk_str (| "`movable`: " |); + mk_str (| " " |) ] |) diff --git a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_example_Iterator_any.v b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_example_Iterator_any.v index 831d9ff4f..3b291c941 100644 --- a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_example_Iterator_any.v +++ b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_example_Iterator_any.v @@ -175,12 +175,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "2 in vec1: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "2 in vec1: " |); mk_str (| " +" |) ] |) |) |) @@ -371,12 +367,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "2 in vec2: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "2 in vec2: " |); mk_str (| " +" |) ] |) |) |) @@ -523,12 +515,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "vec1 len: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "vec1 len: " |); mk_str (| " +" |) ] |) |) |) @@ -610,11 +598,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "First element of vec1 is: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "First element of vec1 is: " |); mk_str (| " +" |) ] |) |) |) @@ -721,12 +706,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "2 in array1: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "2 in array1: " |); mk_str (| " +" |) ] |) |) |) @@ -879,12 +860,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "2 in array2: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "2 in array2: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_example_searching_through_iterators_Iterator_find.v b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_example_searching_through_iterators_Iterator_find.v index bcdf9dc57..f9c961e60 100644 --- a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_example_searching_through_iterators_Iterator_find.v +++ b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_example_searching_through_iterators_Iterator_find.v @@ -238,12 +238,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Find 2 in vec1: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Find 2 in vec1: " |); mk_str (| " +" |) ] |) |) |) @@ -395,12 +391,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Find 2 in vec2: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Find 2 in vec2: " |); mk_str (| " +" |) ] |) |) |) @@ -562,12 +554,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Find 2 in array1: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Find 2 in array1: " |); mk_str (| " +" |) ] |) |) |) @@ -739,12 +727,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Find 2 in array2: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Find 2 in array2: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_forced_capturing_with_move.v b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_forced_capturing_with_move.v index 655e63a6c..8ae946f84 100644 --- a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_forced_capturing_with_move.v +++ b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_forced_capturing_with_move.v @@ -169,11 +169,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); @@ -281,11 +278,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_input_functions.v b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_input_functions.v index be4bdfc3d..43d07816c 100644 --- a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_input_functions.v +++ b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_input_functions.v @@ -69,10 +69,8 @@ Definition function (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "I'm a function! -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "I'm a function! +" |) ] |) |) |) |) @@ -142,10 +140,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "I'm a closure! -" |) - ] + Value.Array [ mk_str (| "I'm a closure! +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_type_anonymity_define_and_use.v b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_type_anonymity_define_and_use.v index c8d73f2c3..c99c5c395 100644 --- a/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_type_anonymity_define_and_use.v +++ b/CoqOfRust/examples/default/examples/rust_book/functions/functions_closures_type_anonymity_define_and_use.v @@ -98,11 +98,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) 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 1efabf366..f0bdb3302 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 @@ -84,9 +84,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "Find the sum of all the squared odd numbers under 1000 + mk_str (| + "Find the sum of all the squared odd numbers under 1000 " |) ] @@ -271,12 +270,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "imperative style: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "imperative style: " |); mk_str (| " +" |) ] |) |) |) @@ -570,12 +565,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "functional style: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "functional style: " |); mk_str (| " +" |) ] |) |) |) 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 d6e9190c6..7b17bf52d 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 @@ -248,10 +248,10 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Does container contain " |); - M.read (| Value.String " and " |); - M.read (| Value.String ": " |); - M.read (| Value.String " + mk_str (| "Does container contain " |); + mk_str (| " and " |); + mk_str (| ": " |); + mk_str (| " " |) ] |) @@ -388,12 +388,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "First number: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "First number: " |); mk_str (| " +" |) ] |) |) |) @@ -474,12 +470,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Last number: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Last number: " |); mk_str (| " +" |) ] |) |) |) @@ -560,12 +552,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "The difference is: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "The difference is: " |); mk_str (| " +" |) ] |) |) |) 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 25bf3a920..478687e43 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 @@ -397,10 +397,10 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Does container contain " |); - M.read (| Value.String " and " |); - M.read (| Value.String ": " |); - M.read (| Value.String " + mk_str (| "Does container contain " |); + mk_str (| " and " |); + mk_str (| ": " |); + mk_str (| " " |) ] |) @@ -537,12 +537,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "First number: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "First number: " |); mk_str (| " +" |) ] |) |) |) @@ -623,12 +619,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Last number: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Last number: " |); mk_str (| " +" |) ] |) |) |) @@ -709,12 +701,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "The difference is: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "The difference is: " |); mk_str (| " +" |) ] |) |) |) @@ -800,12 +788,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Get output.0: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Get output.0: " |); mk_str (| " +" |) ] |) |) |) 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 5c6dd8c9f..eb48b9045 100644 --- a/CoqOfRust/examples/default/examples/rust_book/generics/generics_bounds.v +++ b/CoqOfRust/examples/default/examples/rust_book/generics/generics_bounds.v @@ -32,8 +32,8 @@ Module Impl_core_fmt_Debug_for_generics_bounds_Rectangle. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Rectangle" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "length" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Rectangle" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "length" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -47,7 +47,7 @@ Module Impl_core_fmt_Debug_for_generics_bounds_Rectangle. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "height" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "height" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -161,11 +161,8 @@ Definition print_debug (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); @@ -316,12 +313,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "Area: " |); M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "Area: " |); mk_str (| " +" |) ] |) |) |) |); 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 baaecc388..aa2255066 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 @@ -65,11 +65,7 @@ Definition red (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := | [], [ T ], [ β0 ] => ltac:(M.monadic (let β0 := M.alloc (| β0 |) in - M.match_operator (| - None, - β0, - [ fun γ => ltac:(M.monadic (M.read (| Value.String "red" |))) ] - |))) + M.match_operator (| None, β0, [ fun γ => ltac:(M.monadic (mk_str (| "red" |))) ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -88,11 +84,7 @@ Definition blue (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := | [], [ T ], [ β0 ] => ltac:(M.monadic (let β0 := M.alloc (| β0 |) in - M.match_operator (| - None, - β0, - [ fun γ => ltac:(M.monadic (M.read (| Value.String "blue" |))) ] - |))) + M.match_operator (| None, β0, [ fun γ => ltac:(M.monadic (mk_str (| "blue" |))) ] |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -148,12 +140,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "A cardinal is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "A cardinal is " |); mk_str (| " +" |) ] |) |) |) @@ -239,12 +227,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "A blue jay is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "A blue jay is " |); mk_str (| " +" |) ] |) |) |) 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 4e95fd6e5..d6bca63e7 100644 --- a/CoqOfRust/examples/default/examples/rust_book/generics/generics_implementation.v +++ b/CoqOfRust/examples/default/examples/rust_book/generics/generics_implementation.v @@ -136,13 +136,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String ", " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| ", " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/generics/generics_multiple_bounds.v b/CoqOfRust/examples/default/examples/rust_book/generics/generics_multiple_bounds.v index a8d93a6fd..a89c6647a 100644 --- a/CoqOfRust/examples/default/examples/rust_book/generics/generics_multiple_bounds.v +++ b/CoqOfRust/examples/default/examples/rust_book/generics/generics_multiple_bounds.v @@ -34,14 +34,8 @@ Definition compare_prints (ε : list Value.t) (τ : list Ty.t) (α : list Value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "Debug: `" |); - M.read (| Value.String "` -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "Debug: `" |); mk_str (| "` +" |) ] |) |) |) |); @@ -101,12 +95,8 @@ Definition compare_prints (ε : list Value.t) (τ : list Ty.t) (α : list Value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Display: `" |); - M.read (| Value.String "` -" |) - ] + Value.Array [ mk_str (| "Display: `" |); mk_str (| "` +" |) ] |) |) |) @@ -189,11 +179,8 @@ Definition compare_types (ε : list Value.t) (τ : list Ty.t) (α : list Value.t M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "t: `" |); M.read (| Value.String "` -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "t: `" |); mk_str (| "` +" |) ] |) |) |) |); @@ -252,11 +239,8 @@ Definition compare_types (ε : list Value.t) (τ : list Ty.t) (α : list Value.t M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "u: `" |); M.read (| Value.String "` -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "u: `" |); mk_str (| "` +" |) ] |) |) |) |); @@ -323,7 +307,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.read (| let~ string : Ty.apply (Ty.path "&") [] [ Ty.path "str" ] := - M.copy (| Value.String "words" |) in + M.alloc (| mk_str (| "words" |) |) in let~ array : Ty.apply (Ty.path "array") [ Value.Integer IntegerKind.Usize 3 ] [ Ty.path "i32" ] := M.alloc (| 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 1ccf133da..a7e229a54 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 @@ -169,12 +169,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Old enough " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Old enough " |); mk_str (| " +" |) ] |) |) |) @@ -257,12 +253,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Old enough " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Old enough " |); mk_str (| " +" |) ] |) |) |) 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 915fb0e04..b6b333571 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 @@ -173,7 +173,7 @@ Module Impl_core_fmt_Debug_where_core_fmt_Debug_Unit_for_generics_phantom_type_t |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Length" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Length" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -499,11 +499,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "one foot + one_foot = " |); - M.read (| Value.String " in -" |) - ] + [ mk_str (| "one foot + one_foot = " |); mk_str (| " in +" |) ] |) |) |) @@ -574,11 +571,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "one meter + one_meter = " |); - M.read (| Value.String " mm -" |) - ] + [ mk_str (| "one meter + one_meter = " |); mk_str (| " mm +" |) ] |) |) |) 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 c2795895b..600b5b182 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 @@ -40,11 +40,8 @@ Module Impl_generics_where_clauses_PrintInOption_where_core_fmt_Debug_core_optio M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/guessing_game/guessing_game.v b/CoqOfRust/examples/default/examples/rust_book/guessing_game/guessing_game.v index 357835e65..747777329 100644 --- a/CoqOfRust/examples/default/examples/rust_book/guessing_game/guessing_game.v +++ b/CoqOfRust/examples/default/examples/rust_book/guessing_game/guessing_game.v @@ -14,7 +14,7 @@ Definition gen_range (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "not yet implemented" |) ] + [ mk_str (| "not yet implemented" |) ] |) |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -85,10 +85,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Guess the number! -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Guess the number! +" |) ] |) |) |) |) @@ -131,8 +129,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Please input your guess. + Value.Array [ mk_str (| "Please input your guess. " |) ] |) |) @@ -196,7 +193,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Failed to read line" |) |) + M.deref (| mk_str (| "Failed to read line" |) |) |) ] |) @@ -290,12 +287,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "You guessed: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "You guessed: " |); mk_str (| " +" |) ] |) |) |) @@ -373,10 +366,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Too small! -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Too small! +" |) ] |) |) |) |) @@ -409,10 +400,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Too big! -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Too big! +" |) ] |) |) |) |) @@ -449,11 +438,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "You win! -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "You win! +" |) ] |) |) |) |) 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 86d0c8d8b..88b537487 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 @@ -89,7 +89,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "31 days + M.alloc (| Value.Array [ mk_str (| "31 days " |) ] |) |) |) @@ -145,13 +145,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "Alice, this is Bob. Bob, this is Alice -" - |) - ] + Value.Array [ mk_str (| "Alice, this is Bob. Bob, this is Alice +" |) ] |) |) |) @@ -208,12 +203,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "the quick brown fox jumps over the lazy dog -" - |) - ] + [ mk_str (| "the quick brown fox jumps over the lazy dog +" |) ] |) |) |) @@ -269,8 +260,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Base 10: 69420 + Value.Array [ mk_str (| "Base 10: 69420 " |) ] |) |) @@ -328,11 +318,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Base 2 (binary): " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "Base 2 (binary): " |); mk_str (| " +" |) ] |) |) |) @@ -399,11 +386,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Base 8 (octal): " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "Base 8 (octal): " |); mk_str (| " +" |) ] |) |) |) @@ -470,11 +454,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Base 16 (hexadecimal): " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "Base 16 (hexadecimal): " |); mk_str (| " +" |) ] |) |) |) @@ -541,11 +522,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Base 16 (hexadecimal): " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "Base 16 (hexadecimal): " |); mk_str (| " +" |) ] |) |) |) @@ -610,11 +588,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); @@ -720,11 +695,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); @@ -830,11 +802,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); @@ -961,8 +930,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "My name is Bond, James Bond + Value.Array [ mk_str (| "My name is Bond, James Bond " |) ] |) |) @@ -1020,11 +988,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/hello_world/hello_world.v b/CoqOfRust/examples/default/examples/rust_book/hello_world/hello_world.v index 9c1b4bd87..439b46957 100644 --- a/CoqOfRust/examples/default/examples/rust_book/hello_world/hello_world.v +++ b/CoqOfRust/examples/default/examples/rust_book/hello_world/hello_world.v @@ -35,7 +35,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Hello World! + M.alloc (| Value.Array [ mk_str (| "Hello World! " |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_example.v b/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_example.v index c0cdf396d..81ae6ae67 100644 --- a/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_example.v +++ b/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_example.v @@ -32,7 +32,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Hello! + M.alloc (| Value.Array [ mk_str (| "Hello! " |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_designators.v b/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_designators.v index bc067b418..1a3d201fa 100644 --- a/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_designators.v +++ b/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_designators.v @@ -34,12 +34,8 @@ Definition foo (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "You called " |); - M.read (| Value.String "() -" |) - ] + Value.Array [ mk_str (| "You called " |); mk_str (| "() +" |) ] |) |) |) @@ -64,7 +60,10 @@ Definition foo (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| Pointer.Kind.Ref, Value.String "foo" |) + M.borrow (| + Pointer.Kind.Ref, + M.alloc (| mk_str (| "foo" |) |) + |) |) |) ] @@ -122,12 +121,8 @@ Definition bar (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "You called " |); - M.read (| Value.String "() -" |) - ] + Value.Array [ mk_str (| "You called " |); mk_str (| "() +" |) ] |) |) |) @@ -152,7 +147,10 @@ Definition bar (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| Pointer.Kind.Ref, Value.String "bar" |) + M.borrow (| + Pointer.Kind.Ref, + M.alloc (| mk_str (| "bar" |) |) + |) |) |) ] @@ -235,13 +233,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " = " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| " = " |); mk_str (| " +" |) ] |) |) |) @@ -266,7 +259,10 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| Pointer.Kind.Ref, Value.String "1u32 + 1" |) + M.borrow (| + Pointer.Kind.Ref, + M.alloc (| mk_str (| "1u32 + 1" |) |) + |) |) |) ] @@ -329,13 +325,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " = " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| " = " |); mk_str (| " +" |) ] |) |) |) @@ -362,7 +353,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - Value.String "{ let x = 1u32; x * x + 2 * x - 1 }" + M.alloc (| + mk_str (| "{ let x = 1u32; x * x + 2 * x - 1 }" |) + |) |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_dsl.v b/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_dsl.v index f4b8bd913..5f6ad6c99 100644 --- a/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_dsl.v +++ b/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_dsl.v @@ -47,12 +47,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "1 + 2 = " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "1 + 2 = " |); mk_str (| " +" |) ] |) |) |) @@ -127,12 +123,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "(1 + 2) * (3 / 4) = " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "(1 + 2) * (3 / 4) = " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_overload.v b/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_overload.v index 2cb9ed44e..fe863bf3d 100644 --- a/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_overload.v +++ b/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_overload.v @@ -36,10 +36,10 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "" |); - M.read (| Value.String " and " |); - M.read (| Value.String " is " |); - M.read (| Value.String " + mk_str (| "" |); + mk_str (| " and " |); + mk_str (| " is " |); + mk_str (| " " |) ] |) @@ -68,7 +68,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - Value.String "1i32 + 1 == 2i32" + M.alloc (| mk_str (| "1i32 + 1 == 2i32" |) |) |) |) |) @@ -88,7 +88,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - Value.String "2i32 * 2 == 4i32" + M.alloc (| mk_str (| "2i32 * 2 == 4i32" |) |) |) |) |) @@ -167,10 +167,10 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "" |); - M.read (| Value.String " or " |); - M.read (| Value.String " is " |); - M.read (| Value.String " + mk_str (| "" |); + mk_str (| " or " |); + mk_str (| " is " |); + mk_str (| " " |) ] |) @@ -197,7 +197,10 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| Pointer.Kind.Ref, Value.String "true" |) + M.borrow (| + Pointer.Kind.Ref, + M.alloc (| mk_str (| "true" |) |) + |) |) |) ] @@ -214,7 +217,10 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| Pointer.Kind.Ref, Value.String "false" |) + M.borrow (| + Pointer.Kind.Ref, + M.alloc (| mk_str (| "false" |) |) + |) |) |) ] diff --git a/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_repeat.v b/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_repeat.v index 1364c1a42..a50f54f24 100644 --- a/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_repeat.v +++ b/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_repeat.v @@ -34,7 +34,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "1 + M.alloc (| Value.Array [ mk_str (| "1 " |) ] |) |) |) @@ -89,11 +89,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); @@ -173,11 +170,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_variadic_interfaces.v b/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_variadic_interfaces.v index 2c9ce7fdd..4c96cca05 100644 --- a/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_variadic_interfaces.v +++ b/CoqOfRust/examples/default/examples/rust_book/macro_rules/macro_rules_variadic_interfaces.v @@ -45,12 +45,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "1 + 2 = " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "1 + 2 = " |); mk_str (| " +" |) ] |) |) |) @@ -120,12 +116,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "3 + 4 = " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "3 + 4 = " |); mk_str (| " +" |) ] |) |) |) @@ -197,12 +189,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "(2 * 3) + 1 = " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "(2 * 3) + 1 = " |); mk_str (| " +" |) ] |) |) |) 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 dbd304402..dd9b9b806 100644 --- a/CoqOfRust/examples/default/examples/rust_book/modules/struct_visibility.v +++ b/CoqOfRust/examples/default/examples/rust_book/modules/struct_visibility.v @@ -85,7 +85,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.StructRecord "struct_visibility::my::OpenBox" - [ ("contents", M.read (| Value.String "public information" |)) ] + [ ("contents", mk_str (| "public information" |)) ] |) in let~ _ : Ty.tuple [] := let~ _ : Ty.tuple [] := @@ -110,11 +110,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "The open box contains: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "The open box contains: " |); mk_str (| " +" |) ] |) |) |) @@ -182,7 +179,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [] |), - [ M.read (| Value.String "classified information" |) ] + [ mk_str (| "classified information" |) ] |) |) in M.alloc (| Value.Tuple [] |) diff --git a/CoqOfRust/examples/default/examples/rust_book/modules/super_and_self.v b/CoqOfRust/examples/default/examples/rust_book/modules/super_and_self.v index 7cd4ed397..1a645368d 100644 --- a/CoqOfRust/examples/default/examples/rust_book/modules/super_and_self.v +++ b/CoqOfRust/examples/default/examples/rust_book/modules/super_and_self.v @@ -32,10 +32,8 @@ Definition function (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "called `function()` -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "called `function()` +" |) ] |) |) |) |) @@ -88,8 +86,7 @@ Module cool. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "called `cool::function()` + Value.Array [ mk_str (| "called `cool::function()` " |) ] |) |) @@ -144,10 +141,8 @@ Module my. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "called `my::function()` -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "called `my::function()` +" |) ] |) |) |) |) @@ -200,8 +195,7 @@ Module my. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "called `my::cool::function()` + Value.Array [ mk_str (| "called `my::cool::function()` " |) ] |) |) @@ -276,13 +270,8 @@ Module my. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "called `my::indirect_call()`, that -> " - |) - ] + Value.Array [ mk_str (| "called `my::indirect_call()`, that +> " |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/modules/the_use_as_declaration.v b/CoqOfRust/examples/default/examples/rust_book/modules/the_use_as_declaration.v index 48bdbb660..2970a81d1 100644 --- a/CoqOfRust/examples/default/examples/rust_book/modules/the_use_as_declaration.v +++ b/CoqOfRust/examples/default/examples/rust_book/modules/the_use_as_declaration.v @@ -32,10 +32,8 @@ Definition function (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "called `function()` -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "called `function()` +" |) ] |) |) |) |) @@ -90,12 +88,8 @@ Module deeply. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "called `deeply::nested::function()` -" - |) - ] + [ mk_str (| "called `deeply::nested::function()` +" |) ] |) |) |) @@ -173,10 +167,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Entering block -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Entering block +" |) ] |) |) |) |) @@ -216,10 +208,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Leaving block -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Leaving block +" |) ] |) |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/modules/visibility.v b/CoqOfRust/examples/default/examples/rust_book/modules/visibility.v index c47bf364d..06f6b0b06 100644 --- a/CoqOfRust/examples/default/examples/rust_book/modules/visibility.v +++ b/CoqOfRust/examples/default/examples/rust_book/modules/visibility.v @@ -34,10 +34,8 @@ Module my_mod. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "called `my_mod::private_function()` -" |) - ] + Value.Array [ mk_str (| "called `my_mod::private_function()` +" |) ] |) |) |) @@ -90,8 +88,7 @@ Module my_mod. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "called `my_mod::function()` + Value.Array [ mk_str (| "called `my_mod::function()` " |) ] |) |) @@ -147,12 +144,8 @@ Module my_mod. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "called `my_mod::indirect_access()`, that -> " - |) - ] + [ mk_str (| "called `my_mod::indirect_access()`, that +> " |) ] |) |) |) @@ -215,12 +208,8 @@ Module my_mod. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "called `my_mod::nested::function()` -" - |) - ] + [ mk_str (| "called `my_mod::nested::function()` +" |) ] |) |) |) @@ -274,12 +263,8 @@ Module my_mod. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "called `my_mod::nested::private_function()` -" - |) - ] + [ mk_str (| "called `my_mod::nested::private_function()` +" |) ] |) |) |) @@ -339,9 +324,8 @@ Module my_mod. M.alloc (| Value.Array [ - M.read (| - Value.String - "called `my_mod::nested::public_function_in_my_mod()`, that + mk_str (| + "called `my_mod::nested::public_function_in_my_mod()`, that > " |) ] @@ -417,9 +401,8 @@ Module my_mod. M.alloc (| Value.Array [ - M.read (| - Value.String - "called `my_mod::nested::public_function_in_nested()` + mk_str (| + "called `my_mod::nested::public_function_in_nested()` " |) ] @@ -483,9 +466,8 @@ Module my_mod. M.alloc (| Value.Array [ - M.read (| - Value.String - "called `my_mod::nested::public_function_in_super_mod()` + mk_str (| + "called `my_mod::nested::public_function_in_super_mod()` " |) ] @@ -553,9 +535,8 @@ Module my_mod. M.alloc (| Value.Array [ - M.read (| - Value.String - "called `my_mod::call_public_function_in_my_mod()`, that + mk_str (| + "called `my_mod::call_public_function_in_my_mod()`, that > " |) ] @@ -602,7 +583,7 @@ Module my_mod. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "> " |) ] |) + M.alloc (| Value.Array [ mk_str (| "> " |) ] |) |) |) |) @@ -669,12 +650,8 @@ Module my_mod. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "called `my_mod::public_function_in_crate()` -" - |) - ] + [ mk_str (| "called `my_mod::public_function_in_crate()` +" |) ] |) |) |) @@ -729,12 +706,8 @@ Module my_mod. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "called `my_mod::private_nested::function()` -" - |) - ] + [ mk_str (| "called `my_mod::private_nested::function()` +" |) ] |) |) |) @@ -789,9 +762,8 @@ Module my_mod. M.alloc (| Value.Array [ - M.read (| - Value.String - "called `my_mod::private_nested::restricted_function()` + mk_str (| + "called `my_mod::private_nested::restricted_function()` " |) ] @@ -850,10 +822,8 @@ Definition function (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "called `function()` -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "called `function()` +" |) ] |) |) |) |) 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 090ca85cc..465a395df 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 @@ -36,11 +36,8 @@ Definition analyze_slice (ε : list Value.t) (τ : list Ty.t) (α : list Value.t Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "first element of the slice: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "first element of the slice: " |); mk_str (| " +" |) ] |) |) |) @@ -110,11 +107,8 @@ Definition analyze_slice (ε : list Value.t) (τ : list Ty.t) (α : list Value.t Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "the slice has " |); - M.read (| Value.String " elements -" |) - ] + [ mk_str (| "the slice has " |); mk_str (| " elements +" |) ] |) |) |) @@ -278,11 +272,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "first element of the array: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "first element of the array: " |); mk_str (| " +" |) ] |) |) |) @@ -352,11 +343,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "second element of the array: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "second element of the array: " |); mk_str (| " +" |) ] |) |) |) @@ -426,11 +414,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "number of elements in array: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "number of elements in array: " |); mk_str (| " +" |) ] |) |) |) @@ -507,12 +492,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "array occupies " |); - M.read (| Value.String " bytes -" |) - ] + Value.Array [ mk_str (| "array occupies " |); mk_str (| " bytes +" |) ] |) |) |) @@ -600,8 +581,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "borrow the whole array as a slice + Value.Array [ mk_str (| "borrow the whole array as a slice " |) ] |) |) @@ -644,12 +624,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "borrow a section of the array as a slice -" - |) - ] + [ mk_str (| "borrow a section of the array as a slice +" |) ] |) |) |) @@ -1148,9 +1124,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "" |); - M.read (| Value.String ": " |); - M.read (| Value.String " + mk_str (| "" |); + mk_str (| ": " |); + mk_str (| " " |) ] |) @@ -1253,13 +1229,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String "Slow down! " - |); - M.read (| - Value.String " is too far! -" - |) + mk_str (| "Slow down! " |); + mk_str (| " is too far! +" |) ] |) |) 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 737df43f4..3936ee123 100644 --- a/CoqOfRust/examples/default/examples/rust_book/primitives/literals_operators.v +++ b/CoqOfRust/examples/default/examples/rust_book/primitives/literals_operators.v @@ -52,14 +52,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "1 + 2 = " |); - M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "1 + 2 = " |); mk_str (| " +" |) ] |) |) |) |); @@ -128,14 +122,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "1 - 2 = " |); - M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "1 - 2 = " |); mk_str (| " +" |) ] |) |) |) |); @@ -205,12 +193,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "true AND false is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "true AND false is " |); mk_str (| " +" |) ] |) |) |) @@ -281,12 +265,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "true OR false is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "true OR false is " |); mk_str (| " +" |) ] |) |) |) @@ -357,12 +337,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "NOT true is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "NOT true is " |); mk_str (| " +" |) ] |) |) |) @@ -428,12 +404,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "0011 AND 0101 is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "0011 AND 0101 is " |); mk_str (| " +" |) ] |) |) |) @@ -545,12 +517,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "0011 OR 0101 is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "0011 OR 0101 is " |); mk_str (| " +" |) ] |) |) |) @@ -662,12 +630,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "0011 XOR 0101 is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "0011 XOR 0101 is " |); mk_str (| " +" |) ] |) |) |) @@ -779,12 +743,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "1 << 5 is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "1 << 5 is " |); mk_str (| " +" |) ] |) |) |) @@ -855,12 +815,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "0x80 >> 2 is 0x" |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "0x80 >> 2 is 0x" |); mk_str (| " +" |) ] |) |) |) @@ -931,8 +887,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "One million is written as 1000000 + Value.Array [ mk_str (| "One million is written as 1000000 " |) ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/primitives/tuples.v b/CoqOfRust/examples/default/examples/rust_book/primitives/tuples.v index 23ad322ed..88df01e36 100644 --- a/CoqOfRust/examples/default/examples/rust_book/primitives/tuples.v +++ b/CoqOfRust/examples/default/examples/rust_book/primitives/tuples.v @@ -64,7 +64,7 @@ Module Impl_core_fmt_Debug_for_tuples_Matrix. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Matrix" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Matrix" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -241,11 +241,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "long tuple first value: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "long tuple first value: " |); mk_str (| " +" |) ] |) |) |) @@ -312,11 +309,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "long tuple second value: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "long tuple second value: " |); mk_str (| " +" |) ] |) |) |) @@ -402,12 +396,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "tuple of tuples: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "tuple of tuples: " |); mk_str (| " +" |) ] |) |) |) @@ -478,14 +468,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "pair is " |); - M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "pair is " |); mk_str (| " +" |) ] |) |) |) |); @@ -545,12 +529,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "the reversed pair is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "the reversed pair is " |); mk_str (| " +" |) ] |) |) |) @@ -622,12 +602,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "one element tuple: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "one element tuple: " |); mk_str (| " +" |) ] |) |) |) @@ -695,12 +671,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "just an integer: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "just an integer: " |); mk_str (| " +" |) ] |) |) |) @@ -756,7 +728,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Value.Tuple [ Value.Integer IntegerKind.I32 1; - M.read (| Value.String "hello" |); + mk_str (| "hello" |); M.read (| UnsupportedLiteral |); Value.Bool true ] @@ -800,11 +772,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "" |); - M.read (| Value.String ", " |); - M.read (| Value.String ", " |); - M.read (| Value.String ", " |); - M.read (| Value.String " + mk_str (| "" |); + mk_str (| ", " |); + mk_str (| ", " |); + mk_str (| ", " |); + mk_str (| " " |) ] |) @@ -923,14 +895,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_borrowing.v b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_borrowing.v index 89e85197b..68c724319 100644 --- a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_borrowing.v +++ b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_borrowing.v @@ -35,11 +35,8 @@ Definition eat_box_i32 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Destroying box that contains " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "Destroying box that contains " |); mk_str (| " +" |) ] |) |) |) @@ -126,12 +123,8 @@ Definition borrow_i32 (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "This int is: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "This int is: " |); mk_str (| " +" |) ] |) |) |) 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 723958d2b..5022ae5c7 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 @@ -111,10 +111,10 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Point has coordinates: (" |); - M.read (| Value.String ", " |); - M.read (| Value.String ", " |); - M.read (| Value.String ") + mk_str (| "Point has coordinates: (" |); + mk_str (| ", " |); + mk_str (| ", " |); + mk_str (| ") " |) ] |) @@ -236,10 +236,10 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Point has coordinates: (" |); - M.read (| Value.String ", " |); - M.read (| Value.String ", " |); - M.read (| Value.String ") + mk_str (| "Point has coordinates: (" |); + mk_str (| ", " |); + mk_str (| ", " |); + mk_str (| ") " |) ] |) @@ -397,10 +397,10 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Point has coordinates: (" |); - M.read (| Value.String ", " |); - M.read (| Value.String ", " |); - M.read (| Value.String ") + mk_str (| "Point has coordinates: (" |); + mk_str (| ", " |); + mk_str (| ", " |); + mk_str (| ") " |) ] |) @@ -525,10 +525,10 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Point now has coordinates: (" |); - M.read (| Value.String ", " |); - M.read (| Value.String ", " |); - M.read (| Value.String ") + mk_str (| "Point now has coordinates: (" |); + mk_str (| ", " |); + mk_str (| ", " |); + mk_str (| ") " |) ] |) 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 4814391f0..884bcbb30 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 @@ -108,9 +108,9 @@ Definition borrow_book (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) M.alloc (| Value.Array [ - M.read (| Value.String "I immutably borrowed " |); - M.read (| Value.String " - " |); - M.read (| Value.String " edition + mk_str (| "I immutably borrowed " |); + mk_str (| " - " |); + mk_str (| " edition " |) ] |) @@ -241,9 +241,9 @@ Definition new_edition (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) M.alloc (| Value.Array [ - M.read (| Value.String "I mutably borrowed " |); - M.read (| Value.String " - " |); - M.read (| Value.String " edition + mk_str (| "I mutably borrowed " |); + mk_str (| " - " |); + mk_str (| " edition " |) ] |) @@ -364,9 +364,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Value.StructRecord "scoping_rules_borrowing_mutablity::Book" [ - ("author", M.read (| Value.String "Douglas Hofstadter" |)); - ("title", - M.read (| Value.String ("G" ++ (String.String "246" "del, Escher, Bach")) |)); + ("author", mk_str (| "Douglas Hofstadter" |)); + ("title", mk_str (| String.append "G" (String.String "246" "del, Escher, Bach") |)); ("year", Value.Integer IntegerKind.U32 1979) ] |) in 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 785a76075..8bbd0f161 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 @@ -145,11 +145,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "ref_c1 equals ref_c2: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "ref_c1 equals ref_c2: " |); mk_str (| " +" |) ] |) |) |) @@ -293,9 +290,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "point is (" |); - M.read (| Value.String ", " |); - M.read (| Value.String ") + mk_str (| "point is (" |); + mk_str (| ", " |); + mk_str (| ") " |) ] |) @@ -394,9 +391,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "mutable_point is (" |); - M.read (| Value.String ", " |); - M.read (| Value.String ") + mk_str (| "mutable_point is (" |); + mk_str (| ", " |); + mk_str (| ") " |) ] |) @@ -544,12 +541,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "tuple is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "tuple is " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes.v b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes.v index a29d09892..4720b1562 100644 --- a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes.v +++ b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes.v @@ -53,12 +53,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "borrow1: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "borrow1: " |); mk_str (| " +" |) ] |) |) |) @@ -121,14 +117,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "borrow2: " |); - M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "borrow2: " |); mk_str (| " +" |) ] |) |) |) |); 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 867179eaa..13ec9f556 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 @@ -31,7 +31,7 @@ Module Impl_core_fmt_Debug_where_core_fmt_Debug_T_for_scoping_rules_lifetimes_bo |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Ref" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Ref" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -101,12 +101,8 @@ Definition print (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "`print`: t is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "`print`: t is " |); mk_str (| " +" |) ] |) |) |) @@ -191,12 +187,8 @@ Definition print_ref (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "`print_ref`: t is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "`print_ref`: t is " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_coercion.v b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_coercion.v index e92ebd1d6..796d315ab 100644 --- a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_coercion.v +++ b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_coercion.v @@ -102,12 +102,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "The product is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "The product is " |); mk_str (| " +" |) ] |) |) |) @@ -196,12 +192,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " is the first -" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| " is the first +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_elision.v b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_elision.v index 476a1349c..195ec39cb 100644 --- a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_elision.v +++ b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_elision.v @@ -34,12 +34,8 @@ Definition elided_input (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "`elided_input`: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "`elided_input`: " |); mk_str (| " +" |) ] |) |) |) @@ -121,12 +117,8 @@ Definition annotated_input (ε : list Value.t) (τ : list Ty.t) (α : list Value M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "`annotated_input`: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "`annotated_input`: " |); mk_str (| " +" |) ] |) |) |) @@ -268,12 +260,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "`elided_pass`: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "`elided_pass`: " |); mk_str (| " +" |) ] |) |) |) @@ -354,12 +342,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "`annotated_pass`: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "`annotated_pass`: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_functions.v b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_functions.v index ec5eed7e6..74b3715e8 100644 --- a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_functions.v +++ b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_functions.v @@ -34,12 +34,8 @@ Definition print_one (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "`print_one`: x is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "`print_one`: x is " |); mk_str (| " +" |) ] |) |) |) @@ -150,9 +146,9 @@ Definition print_multi (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) M.alloc (| Value.Array [ - M.read (| Value.String "`print_multi`: x is " |); - M.read (| Value.String ", y is " |); - M.read (| Value.String " + mk_str (| "`print_multi`: x is " |); + mk_str (| ", y is " |); + mk_str (| " " |) ] |) 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 14b8de76e..a7fe67277 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 @@ -75,12 +75,8 @@ Module Impl_scoping_rules_lifetimes_methods_Owner. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "`print`: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "`print`: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_reference_lifetime_static.v b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_reference_lifetime_static.v index f317b39b2..1b0aa8ee4 100644 --- a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_reference_lifetime_static.v +++ b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_lifetimes_reference_lifetime_static.v @@ -80,7 +80,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := (M.read (| let~ _ : Ty.tuple [] := let~ static_string : Ty.apply (Ty.path "&") [] [ Ty.path "str" ] := - M.copy (| Value.String "I'm in read-only memory" |) in + M.alloc (| mk_str (| "I'm in read-only memory" |) |) in let~ _ : Ty.tuple [] := let~ _ : Ty.tuple [] := M.alloc (| @@ -103,12 +103,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "static_string: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "static_string: " |); mk_str (| " +" |) ] |) |) |) @@ -191,12 +187,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "coerced_static: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "coerced_static: " |); mk_str (| " +" |) ] |) |) |) @@ -261,11 +253,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "NUM: " |); - M.read (| Value.String " stays accessible! -" |) - ] + [ mk_str (| "NUM: " |); mk_str (| " stays accessible! +" |) ] |) |) |) 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 5d581b1f3..e3394179f 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 @@ -29,7 +29,7 @@ Module Impl_core_fmt_Debug_for_scoping_rules_lifetimes_structs_Borrowed. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Borrowed" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Borrowed" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -94,11 +94,8 @@ Module Impl_core_fmt_Debug_for_scoping_rules_lifetimes_structs_NamedBorrowed. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NamedBorrowed" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "x" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "NamedBorrowed" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "x" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -112,7 +109,7 @@ Module Impl_core_fmt_Debug_for_scoping_rules_lifetimes_structs_NamedBorrowed. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "y" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "y" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -210,10 +207,7 @@ Module Impl_core_fmt_Debug_for_scoping_rules_lifetimes_structs_Either. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Num" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Num" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -245,10 +239,7 @@ Module Impl_core_fmt_Debug_for_scoping_rules_lifetimes_structs_Either. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Ref" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Ref" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -346,12 +337,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "x is borrowed in " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "x is borrowed in " |); mk_str (| " +" |) ] |) |) |) @@ -413,11 +400,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "x and y are borrowed in " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "x and y are borrowed in " |); mk_str (| " +" |) ] |) |) |) @@ -478,12 +462,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "x is borrowed in " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "x is borrowed in " |); mk_str (| " +" |) ] |) |) |) @@ -545,11 +525,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "y is *not* borrowed in " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "y is *not* borrowed in " |); mk_str (| " +" |) ] |) |) |) 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 22e18e392..23055ca58 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 @@ -29,8 +29,8 @@ Module Impl_core_fmt_Debug_for_scoping_rules_lifetimes_traits_Borrowed. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Borrowed" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "x" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Borrowed" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "x" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -146,11 +146,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "b is " |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "b is " |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_ownership_and_rules.v b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_ownership_and_rules.v index d255c88df..8a3b42159 100644 --- a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_ownership_and_rules.v +++ b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_ownership_and_rules.v @@ -37,11 +37,8 @@ Definition destroy_box (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Destroying a box that contains " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "Destroying a box that contains " |); mk_str (| " +" |) ] |) |) |) @@ -162,10 +159,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "x is " |); - M.read (| Value.String ", and y is " |); - M.read (| Value.String " + [ mk_str (| "x is " |); mk_str (| ", and y is " |); mk_str (| " " |) ] |) @@ -266,12 +260,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "a contains: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "a contains: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_ownership_and_rules_mutablity.v b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_ownership_and_rules_mutablity.v index b7f6cc430..8d2921b8c 100644 --- a/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_ownership_and_rules_mutablity.v +++ b/CoqOfRust/examples/default/examples/rust_book/scoping_rules/scoping_rules_ownership_and_rules_mutablity.v @@ -72,11 +72,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "immutable_box contains " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "immutable_box contains " |); mk_str (| " +" |) ] |) |) |) @@ -148,12 +145,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "mutable_box contains " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "mutable_box contains " |); mk_str (| " +" |) ] |) |) |) @@ -224,11 +217,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "mutable_box now contains " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "mutable_box now contains " |); mk_str (| " +" |) ] |) |) |) 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 b25db25d4..5d194a7f2 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 @@ -50,7 +50,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [] |), - [ M.read (| Value.String "Alice" |) ] + [ mk_str (| "Alice" |) ] |)); ("age", M.call_closure (| @@ -115,11 +115,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "The person's age is " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "The person's age is " |); mk_str (| " +" |) ] |) |) |) @@ -193,11 +190,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "The person's name is " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "The person's name is " |); mk_str (| " +" |) ] |) |) |) @@ -261,10 +255,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String "The person's age from person struct is " - |); - M.read (| Value.String " + mk_str (| "The person's age from person struct is " |); + mk_str (| " " |) ] |) @@ -372,8 +364,8 @@ Module main. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Person" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "name" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Person" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "name" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -387,7 +379,7 @@ Module main. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "age" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "age" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| 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 d81bbca56..e7b9ccc09 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 @@ -44,10 +44,8 @@ Module Impl_core_ops_drop_Drop_for_scoping_rules_raii_desctructor_ToDrop. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "ToDrop is being dropped -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "ToDrop is being dropped +" |) ] |) |) |) |) @@ -105,10 +103,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Made a ToDrop! -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Made a ToDrop! +" |) ] |) |) |) |) 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 b0105a558..d25db13b3 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 @@ -47,7 +47,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [] |), - [ M.read (| Value.String "the same apple" |) ] + [ mk_str (| "the same apple" |) ] |) |) in let~ _ : Ty.tuple [] := @@ -228,13 +228,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |); - M.read (| - Value.String - " + mk_str (| + " " |) ] 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 12b473f59..6b9d76442 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 @@ -29,8 +29,8 @@ Module Impl_core_fmt_Debug_for_box_stack_heap_Point. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Point" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "x" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Point" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "x" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -44,7 +44,7 @@ Module Impl_core_fmt_Debug_for_box_stack_heap_Point. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "y" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "y" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -414,8 +414,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Point occupies " |); - M.read (| Value.String " bytes on the stack + mk_str (| "Point occupies " |); + mk_str (| " bytes on the stack " |) ] |) @@ -502,8 +502,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Rectangle occupies " |); - M.read (| Value.String " bytes on the stack + mk_str (| "Rectangle occupies " |); + mk_str (| " bytes on the stack " |) ] |) @@ -590,8 +590,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Boxed point occupies " |); - M.read (| Value.String " bytes on the stack + mk_str (| "Boxed point occupies " |); + mk_str (| " bytes on the stack " |) ] |) @@ -686,8 +686,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Boxed rectangle occupies " |); - M.read (| Value.String " bytes on the stack + mk_str (| "Boxed rectangle occupies " |); + mk_str (| " bytes on the stack " |) ] |) @@ -785,8 +785,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Boxed box occupies " |); - M.read (| Value.String " bytes on the stack + mk_str (| "Boxed box occupies " |); + mk_str (| " bytes on the stack " |) ] |) @@ -889,8 +889,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Unboxed point occupies " |); - M.read (| Value.String " bytes on the stack + mk_str (| "Unboxed point occupies " |); + mk_str (| " bytes on the stack " |) ] |) diff --git a/CoqOfRust/examples/default/examples/rust_book/std_library_types/hash_map.v b/CoqOfRust/examples/default/examples/rust_book/std_library_types/hash_map.v index c16ba2979..f2de37da4 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_library_types/hash_map.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_library_types/hash_map.v @@ -29,14 +29,13 @@ Definition call (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "798-1364" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "798-1364" |) |) in M.alloc (| M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "We're sorry, the call cannot be completed as dialed. + mk_str (| + "We're sorry, the call cannot be completed as dialed. Please hang up and try again." |) |) @@ -45,14 +44,13 @@ Definition call (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "645-7689" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "645-7689" |) |) in M.alloc (| M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Hello, this is Mr. Awesome's Pizza. My name is Fred. + mk_str (| + "Hello, this is Mr. Awesome's Pizza. My name is Fred. What can I get for you today?" |) |) @@ -63,7 +61,7 @@ Definition call (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := (M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Hi! Who is this again?" |) |) + M.deref (| mk_str (| "Hi! Who is this again?" |) |) |) |))) ] @@ -175,8 +173,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |), [ M.borrow (| Pointer.Kind.MutRef, contacts |); - M.read (| Value.String "Daniel" |); - M.read (| Value.String "798-1364" |) + mk_str (| "Daniel" |); + mk_str (| "798-1364" |) ] |) |) in @@ -206,8 +204,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |), [ M.borrow (| Pointer.Kind.MutRef, contacts |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Ashley" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "645-7689" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Ashley" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "645-7689" |) |) |) ] |) |) in @@ -237,8 +235,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |), [ M.borrow (| Pointer.Kind.MutRef, contacts |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Katie" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "435-8291" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Katie" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "435-8291" |) |) |) ] |) |) in @@ -268,8 +266,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |), [ M.borrow (| Pointer.Kind.MutRef, contacts |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Robert" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "956-1745" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Robert" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "956-1745" |) |) |) ] |) |) in @@ -299,7 +297,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, contacts |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.borrow (| Pointer.Kind.Ref, Value.String "Daniel" |) |) + M.deref (| + M.borrow (| Pointer.Kind.Ref, M.alloc (| mk_str (| "Daniel" |) |) |) + |) |) ] |) @@ -334,11 +334,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Calling Daniel: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "Calling Daniel: " |); mk_str (| " +" |) ] |) |) |) @@ -420,8 +417,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Don't have Daniel's number. + Value.Array [ mk_str (| "Don't have Daniel's number. " |) ] |) |) @@ -461,8 +457,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |), [ M.borrow (| Pointer.Kind.MutRef, contacts |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Daniel" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "164-6743" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Daniel" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "164-6743" |) |) |) ] |) |) in @@ -492,7 +488,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, contacts |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.borrow (| Pointer.Kind.Ref, Value.String "Ashley" |) |) + M.deref (| + M.borrow (| Pointer.Kind.Ref, M.alloc (| mk_str (| "Ashley" |) |) |) + |) |) ] |) @@ -527,11 +525,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Calling Ashley: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "Calling Ashley: " |); mk_str (| " +" |) ] |) |) |) @@ -613,8 +608,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Don't have Ashley's number. + Value.Array [ mk_str (| "Don't have Ashley's number. " |) ] |) |) @@ -656,7 +650,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.MutRef, contacts |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.borrow (| Pointer.Kind.Ref, Value.String "Ashley" |) |) + M.deref (| M.borrow (| Pointer.Kind.Ref, M.alloc (| mk_str (| "Ashley" |) |) |) |) |) ] |) @@ -811,9 +805,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Calling " |); - M.read (| Value.String ": " |); - M.read (| Value.String " + mk_str (| "Calling " |); + mk_str (| ": " |); + mk_str (| " " |) ] |) 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 0ff65efb8..ab0091a9a 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 @@ -307,12 +307,8 @@ Definition try_logon (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Username: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Username: " |); mk_str (| " +" |) ] |) |) |) @@ -373,12 +369,8 @@ Definition try_logon (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Password: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Password: " |); mk_str (| " +" |) ] |) |) |) @@ -438,10 +430,8 @@ Definition try_logon (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Attempting logon... -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Attempting logon... +" |) ] |) |) |) |) @@ -522,10 +512,8 @@ Definition try_logon (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Successful logon! -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Successful logon! +" |) ] |) |) |) |) @@ -558,12 +546,8 @@ Definition try_logon (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Name: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Name: " |); mk_str (| " +" |) ] |) |) |) @@ -634,12 +618,8 @@ Definition try_logon (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Email: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Email: " |); mk_str (| " +" |) ] |) |) |) @@ -710,10 +690,8 @@ Definition try_logon (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Login failed! -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Login failed! +" |) ] |) |) |) |) @@ -801,15 +779,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := "hash_map_alternate_or_custom_key_types::Account" [ ("username", - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "j.everyman" |) |) - |)); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "j.everyman" |) |) |)); ("password", - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "password123" |) |) - |)) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "password123" |) |) |)) ] |) in let~ account_info : Ty.path "hash_map_alternate_or_custom_key_types::AccountInfo" := @@ -818,14 +790,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := "hash_map_alternate_or_custom_key_types::AccountInfo" [ ("name", - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "John Everyman" |) |) - |)); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "John Everyman" |) |) |)); ("email", M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "j.everyman@email.com" |) |) + M.deref (| mk_str (| "j.everyman@email.com" |) |) |)) ] |) in @@ -870,14 +839,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, accounts |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "j.everyman" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "psasword123" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "j.everyman" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "psasword123" |) |) |) ] |) |) in @@ -891,14 +854,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, accounts |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "j.everyman" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "password123" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "j.everyman" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "password123" |) |) |) ] |) |) in diff --git a/CoqOfRust/examples/default/examples/rust_book/std_library_types/hash_map_hash_set.v b/CoqOfRust/examples/default/examples/rust_book/std_library_types/hash_map_hash_set.v index 2906b6eb0..4bbaaa18f 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_library_types/hash_map_hash_set.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_library_types/hash_map_hash_set.v @@ -289,7 +289,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: a.insert(4)" |) ] + [ mk_str (| "assertion failed: a.insert(4)" |) ] |) |) |))); @@ -339,7 +339,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: a.contains(&4)" |) ] + [ mk_str (| "assertion failed: a.contains(&4)" |) ] |) |) |))); @@ -383,11 +383,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "A: " |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "A: " |); mk_str (| " +" |) ] |) |) |) |); @@ -452,11 +449,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "B: " |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "B: " |); mk_str (| " +" |) ] |) |) |) |); @@ -521,12 +515,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "Union: " |); M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "Union: " |); mk_str (| " +" |) ] |) |) |) |); @@ -665,12 +655,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Difference: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Difference: " |); mk_str (| " +" |) ] |) |) |) @@ -812,12 +798,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Intersection: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Intersection: " |); mk_str (| " +" |) ] |) |) |) @@ -960,11 +942,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Symmetric Difference: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "Symmetric Difference: " |); mk_str (| " +" |) ] |) |) |) 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 170ac5665..a91a91394 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 @@ -105,9 +105,9 @@ Definition try_division (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) M.alloc (| Value.Array [ - M.read (| Value.String "" |); - M.read (| Value.String " / " |); - M.read (| Value.String " failed! + mk_str (| "" |); + mk_str (| " / " |); + mk_str (| " failed! " |) ] |) @@ -194,10 +194,10 @@ Definition try_division (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) M.alloc (| Value.Array [ - M.read (| Value.String "" |); - M.read (| Value.String " / " |); - M.read (| Value.String " = " |); - M.read (| Value.String " + mk_str (| "" |); + mk_str (| " / " |); + mk_str (| " = " |); + mk_str (| " " |) ] |) @@ -357,12 +357,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " unwraps to " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "" |); mk_str (| " unwraps to " |); mk_str (| " +" |) ] |) |) |) @@ -465,12 +461,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " unwraps to " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "" |); mk_str (| " unwraps to " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/std_library_types/panic.v b/CoqOfRust/examples/default/examples/rust_book/std_library_types/panic.v index d21cc6c22..4103e9c0a 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_library_types/panic.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_library_types/panic.v @@ -39,7 +39,7 @@ Definition division (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "division by zero" |) ] + [ mk_str (| "division by zero" |) ] |) |) |))); @@ -127,8 +127,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "This point won't be reached! + Value.Array [ mk_str (| "This point won't be reached! " |) ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/std_library_types/rc.v b/CoqOfRust/examples/default/examples/rust_book/std_library_types/rc.v index 92003d0f3..b9b378c3a 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_library_types/rc.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_library_types/rc.v @@ -56,12 +56,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Rc examples" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Rc examples" |) |) |) ] |) |) in let~ _ : Ty.tuple [] := @@ -85,10 +80,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "--- rc_a is created --- -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "--- rc_a is created --- +" |) ] |) |) |) |) @@ -144,11 +137,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Reference Count of rc_a: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "Reference Count of rc_a: " |); mk_str (| " +" |) ] |) |) |) @@ -239,8 +229,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "--- rc_a is cloned to rc_b --- + Value.Array [ mk_str (| "--- rc_a is cloned to rc_b --- " |) ] |) |) @@ -306,11 +295,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Reference Count of rc_b: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "Reference Count of rc_b: " |); mk_str (| " +" |) ] |) |) |) @@ -401,11 +387,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Reference Count of rc_a: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "Reference Count of rc_a: " |); mk_str (| " +" |) ] |) |) |) @@ -496,11 +479,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "rc_a and rc_b are equal: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "rc_a and rc_b are equal: " |); mk_str (| " +" |) ] |) |) |) @@ -604,8 +584,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Length of the value inside rc_a: " |); - M.read (| Value.String " + mk_str (| "Length of the value inside rc_a: " |); + mk_str (| " " |) ] |) @@ -712,12 +692,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Value of rc_b: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Value of rc_b: " |); mk_str (| " +" |) ] |) |) |) @@ -786,13 +762,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "--- rc_b is dropped out of scope --- -" - |) - ] + Value.Array [ mk_str (| "--- rc_b is dropped out of scope --- +" |) ] |) |) |) @@ -827,11 +798,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Reference Count of rc_a: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "Reference Count of rc_a: " |); mk_str (| " +" |) ] |) |) |) @@ -921,10 +889,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "--- rc_a is dropped out of scope --- -" |) - ] + Value.Array [ mk_str (| "--- rc_a is dropped out of scope --- +" |) ] |) |) |) 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 a5a8f69f3..a9f7a9c3a 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 @@ -63,7 +63,7 @@ Module checked. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DivisionByZero" |) |) + M.deref (| mk_str (| "DivisionByZero" |) |) |) |))); fun γ => @@ -77,7 +77,7 @@ Module checked. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NonPositiveLogarithm" |) |) + M.deref (| mk_str (| "NonPositiveLogarithm" |) |) |) |))); fun γ => @@ -91,7 +91,7 @@ Module checked. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NegativeSquareRoot" |) |) + M.deref (| mk_str (| "NegativeSquareRoot" |) |) |) |))) ] @@ -355,7 +355,7 @@ Definition op (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -443,7 +443,7 @@ Definition op (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -537,9 +537,7 @@ Definition op (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -635,11 +633,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); 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 e33596999..b453c274a 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 @@ -68,7 +68,7 @@ Module checked. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DivisionByZero" |) |) + M.deref (| mk_str (| "DivisionByZero" |) |) |) |))); fun γ => @@ -82,7 +82,7 @@ Module checked. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NonPositiveLogarithm" |) |) + M.deref (| mk_str (| "NonPositiveLogarithm" |) |) |) |))); fun γ => @@ -96,7 +96,7 @@ Module checked. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NegativeSquareRoot" |) |) + M.deref (| mk_str (| "NegativeSquareRoot" |) |) |) |))) ] @@ -663,7 +663,9 @@ Module checked. γ, "result_chaining_with_question_mark::checked::MathError::NonPositiveLogarithm" |) in - Value.String "logarithm of non-positive number")); + M.alloc (| + mk_str (| "logarithm of non-positive number" |) + |))); fun γ => ltac:(M.monadic (let _ := @@ -674,9 +676,7 @@ Module checked. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "division by zero" |) - |) + M.deref (| mk_str (| "division by zero" |) |) |) |))); fun γ => @@ -690,9 +690,7 @@ Module checked. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "square root of negative number" - |) + mk_str (| "square root of negative number" |) |) |) |))) @@ -731,14 +729,8 @@ Module checked. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/std_library_types/strings.v b/CoqOfRust/examples/default/examples/rust_book/std_library_types/strings.v index 8e5f820fe..5fd729e7b 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_library_types/strings.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_library_types/strings.v @@ -49,7 +49,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.read (| let~ pangram : Ty.apply (Ty.path "&") [] [ Ty.path "str" ] := - M.copy (| Value.String "the quick brown fox jumps over the lazy dog" |) in + M.alloc (| mk_str (| "the quick brown fox jumps over the lazy dog" |) |) in let~ _ : Ty.tuple [] := let~ _ : Ty.tuple [] := M.alloc (| @@ -71,14 +71,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "Pangram: " |); - M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "Pangram: " |); mk_str (| " +" |) ] |) |) |) |); @@ -137,10 +131,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Words in reverse -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Words in reverse +" |) ] |) |) |) |) @@ -275,11 +267,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "> " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "> " |); mk_str (| " +" |) ] |) |) |) @@ -532,7 +521,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.MutRef, string |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String ", " |) |) + M.deref (| mk_str (| ", " |) |) |) ] |) @@ -618,12 +607,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Used characters: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Used characters: " |); mk_str (| " +" |) ] |) |) |) @@ -675,7 +660,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [] |), - [ M.read (| Value.String "I like dogs" |) ] + [ mk_str (| "I like dogs" |) ] |) |) in let~ bob : Ty.path "alloc::string::String" := @@ -707,8 +692,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - M.read (| Value.String "dog" |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "cat" |) |) |) + mk_str (| "dog" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "cat" |) |) |) ] |) |) in @@ -734,12 +719,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Alice says: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Alice says: " |); mk_str (| " +" |) ] |) |) |) @@ -800,12 +781,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Bob says: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Bob says: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/std_library_types/strings_byte_strings_as_non_utf8.v b/CoqOfRust/examples/default/examples/rust_book/std_library_types/strings_byte_strings_as_non_utf8.v index b9d059466..cc137dba1 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_library_types/strings_byte_strings_as_non_utf8.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_library_types/strings_byte_strings_as_non_utf8.v @@ -73,12 +73,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "A byte string: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "A byte string: " |); mk_str (| " +" |) ] |) |) |) @@ -156,12 +152,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Some escaped bytes: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Some escaped bytes: " |); mk_str (| " +" |) ] |) |) |) @@ -238,11 +230,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); @@ -344,8 +333,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "And the same as text: '" |); - M.read (| Value.String "' + mk_str (| "And the same as text: '" |); + mk_str (| "' " |) ] |) @@ -451,9 +440,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Conversion successful: '" |); - M.read (| Value.String "' + [ mk_str (| "Conversion successful: '" |); mk_str (| "' " |) ] |) @@ -524,11 +511,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Conversion failed: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "Conversion failed: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/std_library_types/strings_literals_and_escapes.v b/CoqOfRust/examples/default/examples/rust_book/std_library_types/strings_literals_and_escapes.v index f8ecec1a4..b1edd3cda 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_library_types/strings_literals_and_escapes.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_library_types/strings_literals_and_escapes.v @@ -29,7 +29,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.read (| let~ byte_escape : Ty.apply (Ty.path "&") [] [ Ty.path "str" ] := - M.copy (| Value.String "I'm writing Rust!" |) in + M.alloc (| mk_str (| "I'm writing Rust!" |) |) in let~ _ : Ty.tuple [] := let~ _ : Ty.tuple [] := M.alloc (| @@ -54,8 +54,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "What are you doing? (\x3F means ?) " |); - M.read (| Value.String " + mk_str (| "What are you doing? (\x3F means ?) " |); + mk_str (| " " |) ] |) @@ -97,9 +97,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) in M.alloc (| Value.Tuple [] |) in let~ unicode_codepoint : Ty.apply (Ty.path "&") [] [ Ty.path "str" ] := - M.copy (| Value.String (String.String "029" "") |) in + M.alloc (| mk_str (| String.String "029" "" |) |) in let~ character_name : Ty.apply (Ty.path "&") [] [ Ty.path "str" ] := - M.copy (| Value.String """DOUBLE-STRUCK CAPITAL R""" |) in + M.alloc (| mk_str (| """DOUBLE-STRUCK CAPITAL R""" |) |) in let~ _ : Ty.tuple [] := let~ _ : Ty.tuple [] := M.alloc (| @@ -124,9 +124,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Unicode character " |); - M.read (| Value.String " (U+211D) is called " |); - M.read (| Value.String " + mk_str (| "Unicode character " |); + mk_str (| " (U+211D) is called " |); + mk_str (| " " |) ] |) @@ -187,11 +187,12 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) in M.alloc (| Value.Tuple [] |) in let~ long_string : Ty.apply (Ty.path "&") [] [ Ty.path "str" ] := - M.copy (| - Value.String + M.alloc (| + mk_str (| "String literals can span multiple lines. The linebreak and indentation here -><- can be escaped too!" + |) |) in let~ _ : Ty.tuple [] := let~ _ : Ty.tuple [] := @@ -214,11 +215,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/std_library_types/strings_raw_string_literals.v b/CoqOfRust/examples/default/examples/rust_book/std_library_types/strings_raw_string_literals.v index 989c7d152..a9130cfb6 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_library_types/strings_raw_string_literals.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_library_types/strings_raw_string_literals.v @@ -23,7 +23,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.read (| let~ raw_str : Ty.apply (Ty.path "&") [] [ Ty.path "str" ] := - M.copy (| Value.String "Escapes don't work here: \x3F \u{211D}" |) in + M.alloc (| mk_str (| "Escapes don't work here: \x3F \u{211D}" |) |) in let~ _ : Ty.tuple [] := let~ _ : Ty.tuple [] := M.alloc (| @@ -45,11 +45,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); @@ -88,7 +85,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) in M.alloc (| Value.Tuple [] |) in let~ quotes : Ty.apply (Ty.path "&") [] [ Ty.path "str" ] := - M.copy (| Value.String "And then I said: ""There is no escape!""" |) in + M.alloc (| mk_str (| "And then I said: ""There is no escape!""" |) |) in let~ _ : Ty.tuple [] := let~ _ : Ty.tuple [] := M.alloc (| @@ -110,11 +107,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); @@ -153,7 +147,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) in M.alloc (| Value.Tuple [] |) in let~ longer_delimiter : Ty.apply (Ty.path "&") [] [ Ty.path "str" ] := - M.copy (| Value.String "A string with ""# in it. And even ""##!" |) in + M.alloc (| mk_str (| "A string with ""# in it. And even ""##!" |) |) in let~ _ : Ty.tuple [] := let~ _ : Ty.tuple [] := M.alloc (| @@ -175,11 +169,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); 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 e9177af73..a3adf4f71 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 @@ -116,11 +116,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Collected (0..10) into: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "Collected (0..10) into: " |); mk_str (| " +" |) ] |) |) |) @@ -248,12 +245,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Initial vector: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Initial vector: " |); mk_str (| " +" |) ] |) |) |) @@ -318,10 +311,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Push 4 into the vector -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Push 4 into the vector +" |) ] |) |) |) |) @@ -368,14 +359,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "Vector: " |); - M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "Vector: " |); mk_str (| " +" |) ] |) |) |) |); @@ -440,12 +425,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Vector length: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Vector length: " |); mk_str (| " +" |) ] |) |) |) @@ -526,12 +507,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Second element: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Second element: " |); mk_str (| " +" |) ] |) |) |) @@ -618,12 +595,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Pop last element: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Pop last element: " |); mk_str (| " +" |) ] |) |) |) @@ -711,10 +684,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Contents of xs: -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Contents of xs: +" |) ] |) |) |) |) @@ -853,11 +824,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "> " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "> " |); mk_str (| " +" |) ] |) |) |) @@ -1081,13 +1049,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String "In position " - |); - M.read (| - Value.String " we have value " - |); - M.read (| Value.String " + mk_str (| "In position " |); + mk_str (| " we have value " |); + mk_str (| " " |) ] |) @@ -1311,12 +1275,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Updated vector: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Updated vector: " |); mk_str (| " +" |) ] |) |) |) 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 b16362342..a8a8a36d2 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_misc/channels.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_misc/channels.v @@ -352,13 +352,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "thread " + mk_str (| + "thread " |); - M.read (| - Value.String - " finished + mk_str (| + " finished " |) ] @@ -796,10 +794,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "oops! the child thread panicked" - |) + mk_str (| "oops! the child thread panicked" |) |) |) ] @@ -834,14 +829,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/std_misc/child_processes.v b/CoqOfRust/examples/default/examples/rust_book/std_misc/child_processes.v index 08fe30ce6..c9448b135 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_misc/child_processes.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_misc/child_processes.v @@ -72,11 +72,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "rustc" |) ] + [ mk_str (| "rustc" |) ] |) |) |); - M.read (| Value.String "--version" |) + mk_str (| "--version" |) ] |) |) @@ -123,11 +123,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "failed to execute process: " - |) - ] + [ mk_str (| "failed to execute process: " |) ] |) |) |) @@ -280,12 +276,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "rustc succeeded and stdout was: -" - |) - ] + [ mk_str (| "rustc succeeded and stdout was: +" |) ] |) |) |) @@ -407,10 +399,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "rustc failed and stderr was: -" |) - ] + Value.Array [ mk_str (| "rustc failed and stderr was: +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/std_misc/child_processes_pipes.v b/CoqOfRust/examples/default/examples/rust_book/std_misc/child_processes_pipes.v index e4ba063fc..eadd81486 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_misc/child_processes_pipes.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_misc/child_processes_pipes.v @@ -3,8 +3,9 @@ Require Import CoqOfRust.CoqOfRust. Definition value_PANGRAM : Value.t := M.run_constant - ltac:(M.monadic (M.alloc (| Value.String "the quick brown fox jumped over the lazy dog -" |))). + ltac:(M.monadic + (M.alloc (| M.alloc (| mk_str (| "the quick brown fox jumped over the lazy dog +" |) |) |))). Axiom Constant_value_PANGRAM : (M.get_constant "child_processes_pipes::PANGRAM") = value_PANGRAM. Global Hint Rewrite Constant_value_PANGRAM : constant_rewrites. @@ -96,7 +97,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "wc" |) ] + [ mk_str (| "wc" |) ] |) |) |); @@ -161,8 +162,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "couldn't spawn wc: " |) ] + Value.Array [ mk_str (| "couldn't spawn wc: " |) ] |) |) |) @@ -310,8 +310,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "couldn't write to wc stdin: " |) ] + Value.Array [ mk_str (| "couldn't write to wc stdin: " |) ] |) |) |) @@ -374,11 +373,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "sent pangram to wc -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "sent pangram to wc +" |) ] |) |) |) |) @@ -477,8 +473,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "couldn't read wc stdout: " |) ] + Value.Array [ mk_str (| "couldn't read wc stdout: " |) ] |) |) |) @@ -542,10 +537,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "wc responded with: -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "wc responded with: +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/std_misc/child_processes_wait.v b/CoqOfRust/examples/default/examples/rust_book/std_misc/child_processes_wait.v index 3c3b09d91..1f8be1d2b 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_misc/child_processes_wait.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_misc/child_processes_wait.v @@ -58,11 +58,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "sleep" |) ] + [ mk_str (| "sleep" |) ] |) |) |); - M.read (| Value.String "5" |) + mk_str (| "5" |) ] |) |) @@ -118,10 +118,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "reached end of main -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "reached end of main +" |) ] |) |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/std_misc/file_io_create.v b/CoqOfRust/examples/default/examples/rust_book/std_misc/file_io_create.v index d146a9dd0..5411efa82 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_misc/file_io_create.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_misc/file_io_create.v @@ -5,14 +5,17 @@ Definition value_LOREM_IPSUM : Value.t := M.run_constant ltac:(M.monadic (M.alloc (| - Value.String - "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod + M.alloc (| + mk_str (| + "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. " + |) + |) |))). Axiom Constant_value_LOREM_IPSUM : @@ -52,12 +55,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [ Ty.path "str" ] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "lorem_ipsum.txt" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "lorem_ipsum.txt" |) |) |) ] |) |) in let~ display : Ty.path "std::path::Display" := @@ -123,10 +121,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "couldn't create " |); - M.read (| Value.String ": " |) - ] + [ mk_str (| "couldn't create " |); mk_str (| ": " |) ] |) |) |) @@ -263,10 +258,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "couldn't write to " |); - M.read (| Value.String ": " |) - ] + [ mk_str (| "couldn't write to " |); mk_str (| ": " |) ] |) |) |) @@ -347,11 +339,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "successfully wrote to " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "successfully wrote to " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/std_misc/file_io_open.v b/CoqOfRust/examples/default/examples/rust_book/std_misc/file_io_open.v index 037d21c5f..124777538 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_misc/file_io_open.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_misc/file_io_open.v @@ -38,8 +38,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [ Ty.path "str" ] |), - [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "hello.txt" |) |) |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "hello.txt" |) |) |) ] |) |) in let~ display : Ty.path "std::path::Display" := @@ -105,10 +104,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "couldn't open " |); - M.read (| Value.String ": " |) - ] + [ mk_str (| "couldn't open " |); mk_str (| ": " |) ] |) |) |) @@ -235,11 +231,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "couldn't read " |); - M.read (| Value.String ": " |) - ] + Value.Array [ mk_str (| "couldn't read " |); mk_str (| ": " |) ] |) |) |) @@ -319,12 +311,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " contains: -" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| " contains: +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/std_misc/file_io_read_lines.v b/CoqOfRust/examples/default/examples/rust_book/std_misc/file_io_read_lines.v index ef79ce623..47c7ab05b 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_misc/file_io_read_lines.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_misc/file_io_read_lines.v @@ -151,12 +151,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "./hosts" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "./hosts" |) |) |) ] |) ] |) @@ -284,11 +279,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) 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 fc7fc31b8..b9e46c79e 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 @@ -248,7 +248,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "./hosts" |) ] + [ mk_str (| "./hosts" |) ] |) |) in let γ0_0 := @@ -399,13 +399,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String "" - |); - M.read (| - Value.String " -" - |) + mk_str (| "" |); + mk_str (| " +" |) ] |) |) 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 96c8ca594..7d44a1f4d 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 @@ -550,7 +550,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "`mkdir a` + M.alloc (| Value.Array [ mk_str (| "`mkdir a` " |) ] |) |) |) @@ -575,7 +575,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "a" |) ] + [ mk_str (| "a" |) ] |) |), [ @@ -606,12 +606,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "! " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "! " |); mk_str (| " +" |) ] |) |) |) @@ -694,10 +690,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "`echo hello > a/b.txt` -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "`echo hello > a/b.txt` +" |) ] |) |) |) |) @@ -728,10 +722,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ Ty.tuple []; Ty.path "std::io::error::Error" ], M.get_function (| "filesystem_operations::echo", [], [] |), [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "hello" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "hello" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -751,7 +742,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "a/b.txt" |) |) + M.deref (| mk_str (| "a/b.txt" |) |) |) ] |) @@ -806,11 +797,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "! " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "! " |); mk_str (| " +" |) ] |) |) |) @@ -905,10 +893,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "`mkdir -p a/c/d` -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "`mkdir -p a/c/d` +" |) ] |) |) |) |) @@ -942,7 +928,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "a/c/d" |) ] + [ mk_str (| "a/c/d" |) ] |); M.closure (fun γ => @@ -987,11 +973,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "! " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "! " |); mk_str (| " +" |) ] |) |) |) @@ -1086,10 +1069,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "`touch a/c/e.txt` -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "`touch a/c/e.txt` +" |) ] |) |) |) |) @@ -1139,7 +1120,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "a/c/e.txt" |) |) + M.deref (| mk_str (| "a/c/e.txt" |) |) |) ] |) @@ -1194,11 +1175,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "! " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "! " |); mk_str (| " +" |) ] |) |) |) @@ -1293,11 +1271,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "`ln -s ../b.txt a/c/b.txt` -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "`ln -s ../b.txt a/c/b.txt` +" |) ] |) |) |) |) @@ -1347,10 +1322,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ - M.read (| Value.String "../b.txt" |); - M.read (| Value.String "a/c/b.txt" |) - ] + [ mk_str (| "../b.txt" |); mk_str (| "a/c/b.txt" |) ] |); M.closure (fun γ => @@ -1400,13 +1372,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String "! " - |); - M.read (| - Value.String " -" - |) + mk_str (| "! " |); + mk_str (| " +" |) ] |) |) @@ -1508,10 +1476,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "`cat a/c/b.txt` -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "`cat a/c/b.txt` +" |) ] |) |) |) |) @@ -1551,7 +1517,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [ M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "a/c/b.txt" |) |) + M.deref (| mk_str (| "a/c/b.txt" |) |) |) ] |) @@ -1592,12 +1558,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "! " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "! " |); mk_str (| " +" |) ] |) |) |) @@ -1679,12 +1641,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "> " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "> " |); mk_str (| " +" |) ] |) |) |) @@ -1746,7 +1704,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "`ls a` + M.alloc (| Value.Array [ mk_str (| "`ls a` " |) ] |) |) |) @@ -1771,7 +1729,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "a" |) ] + [ mk_str (| "a" |) ] |) |), [ @@ -1802,12 +1760,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "! " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "! " |); mk_str (| " +" |) ] |) |) |) @@ -1977,8 +1931,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "> " |); - M.read (| Value.String " + mk_str (| "> " |); + mk_str (| " " |) ] |) @@ -2102,10 +2056,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "`rm a/c/e.txt` -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "`rm a/c/e.txt` +" |) ] |) |) |) |) @@ -2139,7 +2091,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "a/c/e.txt" |) ] + [ mk_str (| "a/c/e.txt" |) ] |); M.closure (fun γ => @@ -2184,11 +2136,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "! " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "! " |); mk_str (| " +" |) ] |) |) |) @@ -2283,7 +2232,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "`rmdir a/c/d` + M.alloc (| Value.Array [ mk_str (| "`rmdir a/c/d` " |) ] |) |) |) @@ -2318,7 +2267,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "a/c/d" |) ] + [ mk_str (| "a/c/d" |) ] |); M.closure (fun γ => @@ -2363,11 +2312,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "! " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "! " |); mk_str (| " +" |) ] |) |) |) 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 153e7c582..378772ba3 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 @@ -92,9 +92,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "the square root of " |); - M.read (| Value.String " is " |); - M.read (| Value.String " + mk_str (| "the square root of " |); + mk_str (| " is " |); + mk_str (| " " |) ] |) @@ -173,12 +173,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "cos(" |); - M.read (| Value.String ") = " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "cos(" |); mk_str (| ") = " |); mk_str (| " +" |) ] |) |) |) @@ -380,11 +376,7 @@ Module Impl_core_fmt_Debug_for_foreign_function_interface_Complex. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String "-" |); - M.read (| Value.String "i" |) - ] + [ mk_str (| "" |); mk_str (| "-" |); mk_str (| "i" |) ] |) |) |) @@ -494,11 +486,7 @@ Module Impl_core_fmt_Debug_for_foreign_function_interface_Complex. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String "+" |); - M.read (| Value.String "i" |) - ] + [ mk_str (| "" |); mk_str (| "+" |); mk_str (| "i" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/std_misc/path.v b/CoqOfRust/examples/default/examples/rust_book/std_misc/path.v index c7318f65c..aa4d3deb0 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_misc/path.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_misc/path.v @@ -42,7 +42,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [ Ty.path "str" ] |), - [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "." |) |) |) ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "." |) |) |) ] |) |) in let~ _display : Ty.path "std::path::Display" := @@ -92,7 +92,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| path |) |) |); - M.read (| Value.String "a" |) + mk_str (| "a" |) ] |) |) @@ -101,7 +101,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |) |); - M.read (| Value.String "b" |) + mk_str (| "b" |) ] |) |) in @@ -115,7 +115,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.borrow (| Pointer.Kind.MutRef, new_path |); M.read (| Value.String "c" |) ] + [ M.borrow (| Pointer.Kind.MutRef, new_path |); mk_str (| "c" |) ] |) |) in let~ _ : Ty.tuple [] := @@ -128,10 +128,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ - M.borrow (| Pointer.Kind.MutRef, new_path |); - M.read (| Value.String "myfile.tar.gz" |) - ] + [ M.borrow (| Pointer.Kind.MutRef, new_path |); mk_str (| "myfile.tar.gz" |) ] |) |) in let~ _ : Ty.tuple [] := @@ -144,10 +141,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ - M.borrow (| Pointer.Kind.MutRef, new_path |); - M.read (| Value.String "package.tgz" |) - ] + [ M.borrow (| Pointer.Kind.MutRef, new_path |); mk_str (| "package.tgz" |) ] |) |) in M.match_operator (| @@ -194,7 +188,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "new path is not a valid UTF-8 sequence" |) ] + [ mk_str (| "new path is not a valid UTF-8 sequence" |) ] |) |) |))); @@ -225,12 +219,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "new path is " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "new path is " |); mk_str (| " +" |) ] |) |) |) 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 e6018ba09..017c06176 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 @@ -75,12 +75,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "My path is " |); - M.read (| Value.String ". -" |) - ] + Value.Array [ mk_str (| "My path is " |); mk_str (| ". +" |) ] |) |) |) @@ -174,9 +170,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "I got " |); - M.read (| Value.String " arguments: " |); - M.read (| Value.String ". + mk_str (| "I got " |); + mk_str (| " arguments: " |); + mk_str (| ". " |) ] |) 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 b904ca328..d1aef49d4 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 @@ -33,11 +33,8 @@ Definition increase (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); @@ -127,11 +124,8 @@ Definition decrease (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); @@ -229,9 +223,8 @@ Definition help (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "usage: + mk_str (| + "usage: match_args Check whether given string is the answer. match_args {increase|decrease} @@ -394,9 +387,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "My name is 'match_args'. Try passing some arguments! + mk_str (| + "My name is 'match_args'. Try passing some arguments! " |) ] @@ -520,10 +512,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "This is the answer! -" |) - ] + Value.Array [ mk_str (| "This is the answer! +" |) ] |) |) |) @@ -558,12 +548,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "This is not the answer. -" - |) - ] + [ mk_str (| "This is not the answer. +" |) ] |) |) |) @@ -732,9 +718,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "error: second argument not an integer + mk_str (| + "error: second argument not an integer " |) ] @@ -798,7 +783,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "increase" + mk_str (| "increase" |) |) in M.alloc (| M.call_closure (| @@ -812,7 +797,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "decrease" + mk_str (| "decrease" |) |) in M.alloc (| M.call_closure (| @@ -846,12 +831,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "error: invalid command -" - |) - ] + [ mk_str (| "error: invalid command +" |) ] |) |) |) 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 709af8f53..44ab32ed1 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_misc/threads.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_misc/threads.v @@ -221,13 +221,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "this is thread number " + mk_str (| + "this is thread number " |); - M.read (| - Value.String - " + mk_str (| + " " |) ] diff --git a/CoqOfRust/examples/default/examples/rust_book/std_misc/threads_test_case_map_reduce.v b/CoqOfRust/examples/default/examples/rust_book/std_misc/threads_test_case_map_reduce.v index 8e8b1a322..156ab958d 100644 --- a/CoqOfRust/examples/default/examples/rust_book/std_misc/threads_test_case_map_reduce.v +++ b/CoqOfRust/examples/default/examples/rust_book/std_misc/threads_test_case_map_reduce.v @@ -94,8 +94,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.read (| let~ data : Ty.apply (Ty.path "&") [] [ Ty.path "str" ] := - M.copy (| - Value.String + M.alloc (| + mk_str (| "86967897737416471853297327050364959 11861322575564723963297542624962850 70856234701860851907960690014725639 @@ -104,6 +104,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := 58495327135744041048897885734297812 69920216438980873548808413720956532 16278424637452589860345374828574668" + |) |) in let~ children : Ty.apply @@ -272,11 +273,9 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String "data segment " - |); - M.read (| Value.String " is """ |); - M.read (| Value.String """ + mk_str (| "data segment " |); + mk_str (| " is """ |); + mk_str (| """ " |) ] |) @@ -560,9 +559,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "should be a digit" + mk_str (| + "should be a digit" |) |) |) @@ -616,17 +614,14 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "processed segment " + mk_str (| + "processed segment " |); - M.read (| - Value.String - ", result=" + mk_str (| + ", result=" |); - M.read (| - Value.String - " + mk_str (| + " " |) ] @@ -931,12 +926,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Final sum result: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Final sum result: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/testing/documentation_testing.v b/CoqOfRust/examples/default/examples/rust_book/testing/documentation_testing.v index 75748e8aa..bdfb6fe6c 100644 --- a/CoqOfRust/examples/default/examples/rust_book/testing/documentation_testing.v +++ b/CoqOfRust/examples/default/examples/rust_book/testing/documentation_testing.v @@ -58,7 +58,7 @@ Definition div (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [ Ty.apply (Ty.path "&") [] [ Ty.path "str" ] ] |), - [ M.read (| Value.String "Divide-by-zero error" |) ] + [ mk_str (| "Divide-by-zero error" |) ] |) |) |))); diff --git a/CoqOfRust/examples/default/examples/rust_book/traits/clone.v b/CoqOfRust/examples/default/examples/rust_book/traits/clone.v index d15d06ae5..36fe7eb52 100644 --- a/CoqOfRust/examples/default/examples/rust_book/traits/clone.v +++ b/CoqOfRust/examples/default/examples/rust_book/traits/clone.v @@ -24,7 +24,7 @@ Module Impl_core_fmt_Debug_for_clone_Unit. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Unit" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Unit" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -196,7 +196,7 @@ Module Impl_core_fmt_Debug_for_clone_Pair. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Pair" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Pair" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -307,12 +307,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "original: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "original: " |); mk_str (| " +" |) ] |) |) |) @@ -372,12 +368,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "copy: " |); M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "copy: " |); mk_str (| " +" |) ] |) |) |) |); @@ -476,12 +468,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "original: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "original: " |); mk_str (| " +" |) ] |) |) |) @@ -542,12 +530,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "moved: " |); M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "moved: " |); mk_str (| " +" |) ] |) |) |) |); @@ -630,12 +614,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "clone: " |); M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "clone: " |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/traits/derive.v b/CoqOfRust/examples/default/examples/rust_book/traits/derive.v index 39a6bf796..eb742023f 100644 --- a/CoqOfRust/examples/default/examples/rust_book/traits/derive.v +++ b/CoqOfRust/examples/default/examples/rust_book/traits/derive.v @@ -149,7 +149,7 @@ Module Impl_core_fmt_Debug_for_derive_Inches. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Inches" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Inches" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -295,12 +295,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "One foot equals " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "One foot equals " |); mk_str (| " +" |) ] |) |) |) @@ -386,14 +382,11 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) |)) in let _ := M.is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - Value.String "smaller")); + M.alloc (| mk_str (| "smaller" |) |))); fun γ => ltac:(M.monadic (M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "bigger" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "bigger" |) |) |) |))) ] |) @@ -421,11 +414,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "One foot is " |); - M.read (| Value.String " than one meter. -" |) - ] + [ mk_str (| "One foot is " |); mk_str (| " than one meter. +" |) ] |) |) |) 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 2c236dd7e..44b2945b4 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 @@ -134,12 +134,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "rustacean" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "rustacean" |) |) |) ] |)); ("age", Value.Integer IntegerKind.U8 28) ] @@ -181,12 +176,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "rustacean" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "rustacean" |) |) |) ] |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/traits/drop.v b/CoqOfRust/examples/default/examples/rust_book/traits/drop.v index ff40caf19..0aea0bf27 100644 --- a/CoqOfRust/examples/default/examples/rust_book/traits/drop.v +++ b/CoqOfRust/examples/default/examples/rust_book/traits/drop.v @@ -45,12 +45,8 @@ Module Impl_core_ops_drop_Drop_for_drop_Droppable. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "> Dropping " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "> Dropping " |); mk_str (| " +" |) ] |) |) |) @@ -149,23 +145,15 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := ltac:(M.monadic (M.read (| let~ _a : Ty.path "drop::Droppable" := - M.alloc (| - Value.StructRecord "drop::Droppable" [ ("name", M.read (| Value.String "a" |)) ] - |) in + M.alloc (| Value.StructRecord "drop::Droppable" [ ("name", mk_str (| "a" |)) ] |) in let~ _ : Ty.tuple [] := let~ _b : Ty.path "drop::Droppable" := - M.alloc (| - Value.StructRecord "drop::Droppable" [ ("name", M.read (| Value.String "b" |)) ] - |) in + M.alloc (| Value.StructRecord "drop::Droppable" [ ("name", mk_str (| "b" |)) ] |) in let~ _ : Ty.tuple [] := let~ _c : Ty.path "drop::Droppable" := - M.alloc (| - Value.StructRecord "drop::Droppable" [ ("name", M.read (| Value.String "c" |)) ] - |) in + M.alloc (| Value.StructRecord "drop::Droppable" [ ("name", mk_str (| "c" |)) ] |) in let~ _d : Ty.path "drop::Droppable" := - M.alloc (| - Value.StructRecord "drop::Droppable" [ ("name", M.read (| Value.String "d" |)) ] - |) in + M.alloc (| Value.StructRecord "drop::Droppable" [ ("name", mk_str (| "d" |)) ] |) in let~ _ : Ty.tuple [] := let~ _ : Ty.tuple [] := M.alloc (| @@ -187,10 +175,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Exiting block B -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Exiting block B +" |) ] |) |) |) |) @@ -222,10 +208,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Just exited block B -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Just exited block B +" |) ] |) |) |) |) @@ -256,10 +240,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Exiting block A -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Exiting block A +" |) ] |) |) |) |) @@ -291,10 +273,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Just exited block A -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Just exited block A +" |) ] |) |) |) |) @@ -333,10 +313,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "end of the main function -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "end of the main function +" |) ] |) |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/traits/hash.v b/CoqOfRust/examples/default/examples/rust_book/traits/hash.v index 3413505aa..ee2e91139 100644 --- a/CoqOfRust/examples/default/examples/rust_book/traits/hash.v +++ b/CoqOfRust/examples/default/examples/rust_book/traits/hash.v @@ -238,12 +238,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Janet" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Janet" |) |) |) ] |)); ("phone", Value.Integer IntegerKind.U64 5556667777) ] @@ -266,8 +261,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [] |), - [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Bob" |) |) |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Bob" |) |) |) ] |)); ("phone", Value.Integer IntegerKind.U64 5556667777) ] @@ -322,9 +316,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: calculate_hash(&person1) != calculate_hash(&person2)" + mk_str (| + "assertion failed: calculate_hash(&person1) != calculate_hash(&person2)" |) ] |) 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 02441ce94..4edeb8fcb 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 @@ -1146,7 +1146,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "all done + M.alloc (| Value.Array [ mk_str (| "all done " |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/traits/iterators.v b/CoqOfRust/examples/default/examples/rust_book/traits/iterators.v index 97948169b..c8476dcbb 100644 --- a/CoqOfRust/examples/default/examples/rust_book/traits/iterators.v +++ b/CoqOfRust/examples/default/examples/rust_book/traits/iterators.v @@ -186,10 +186,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Four consecutive `next` calls on 0..3 -" |) - ] + Value.Array [ mk_str (| "Four consecutive `next` calls on 0..3 +" |) ] |) |) |) @@ -221,11 +219,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "> " |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "> " |); mk_str (| " +" |) ] |) |) |) |); @@ -314,11 +309,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "> " |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "> " |); mk_str (| " +" |) ] |) |) |) |); @@ -407,11 +399,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "> " |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "> " |); mk_str (| " +" |) ] |) |) |) |); @@ -500,11 +489,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "> " |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "> " |); mk_str (| " +" |) ] |) |) |) |); @@ -594,8 +580,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Iterate through 0..3 using `for` + Value.Array [ mk_str (| "Iterate through 0..3 using `for` " |) ] |) |) @@ -704,11 +689,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "> " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "> " |); mk_str (| " +" |) ] |) |) |) @@ -783,9 +765,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "The first four terms of the Fibonacci sequence are: + mk_str (| + "The first four terms of the Fibonacci sequence are: " |) ] @@ -922,11 +903,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "> " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "> " |); mk_str (| " +" |) ] |) |) |) @@ -1001,9 +979,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String - "The next four terms of the Fibonacci sequence are: + mk_str (| + "The next four terms of the Fibonacci sequence are: " |) ] @@ -1181,11 +1158,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "> " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "> " |); mk_str (| " +" |) ] |) |) |) @@ -1270,11 +1244,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "Iterate the following array " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "Iterate the following array " |); mk_str (| " +" |) ] |) |) |) @@ -1430,11 +1401,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "> " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "> " |); mk_str (| " +" |) ] |) |) |) 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 e73da4fe7..690bfee0f 100644 --- a/CoqOfRust/examples/default/examples/rust_book/traits/operator_overloading.v +++ b/CoqOfRust/examples/default/examples/rust_book/traits/operator_overloading.v @@ -40,7 +40,7 @@ Module Impl_core_fmt_Debug_for_operator_overloading_FooBar. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "FooBar" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FooBar" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -78,7 +78,7 @@ Module Impl_core_fmt_Debug_for_operator_overloading_BarFoo. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "BarFoo" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BarFoo" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -135,8 +135,7 @@ Module Impl_core_ops_arith_Add_operator_overloading_Bar_for_operator_overloading M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "> Foo.add(Bar) was called + Value.Array [ mk_str (| "> Foo.add(Bar) was called " |) ] |) |) @@ -204,8 +203,7 @@ Module Impl_core_ops_arith_Add_operator_overloading_Foo_for_operator_overloading M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "> Bar.add(Foo) was called + Value.Array [ mk_str (| "> Bar.add(Foo) was called " |) ] |) |) @@ -264,12 +262,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Foo + Bar = " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Foo + Bar = " |); mk_str (| " +" |) ] |) |) |) @@ -352,12 +346,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Bar + Foo = " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Bar + Foo = " |); mk_str (| " +" |) ] |) |) |) 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 7122a379a..87956fa3e 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 @@ -33,7 +33,7 @@ Module Impl_returning_traits_with_dyn_Animal_for_returning_traits_with_dyn_Sheep | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - M.read (| Value.String "baaaaah!" |))) + mk_str (| "baaaaah!" |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -59,7 +59,7 @@ Module Impl_returning_traits_with_dyn_Animal_for_returning_traits_with_dyn_Cow. | [], [], [ self ] => ltac:(M.monadic (let self := M.alloc (| self |) in - M.read (| Value.String "moooooo!" |))) + mk_str (| "moooooo!" |))) | _, _, _ => M.impossible "wrong number of arguments" end. @@ -219,10 +219,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| - Value.String "You've randomly chosen an animal, and it says " - |); - M.read (| Value.String " + mk_str (| "You've randomly chosen an animal, and it says " |); + mk_str (| " " |) ] |) diff --git a/CoqOfRust/examples/default/examples/rust_book/traits/supertraits.v b/CoqOfRust/examples/default/examples/rust_book/traits/supertraits.v index bb0846fed..c53ff927d 100644 --- a/CoqOfRust/examples/default/examples/rust_book/traits/supertraits.v +++ b/CoqOfRust/examples/default/examples/rust_book/traits/supertraits.v @@ -57,10 +57,10 @@ Definition comp_sci_student_greeting (ε : list Value.t) (τ : list Ty.t) (α : M.alloc (| Value.Array [ - M.read (| Value.String "My name is " |); - M.read (| Value.String " and I attend " |); - M.read (| Value.String ". My favorite language is " |); - M.read (| Value.String ". My Git username is " |) + mk_str (| "My name is " |); + mk_str (| " and I attend " |); + mk_str (| ". My favorite language is " |); + mk_str (| ". My Git username is " |) ] |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/traits/traits.v b/CoqOfRust/examples/default/examples/rust_book/traits/traits.v index 985cdfb55..0f01cb53c 100644 --- a/CoqOfRust/examples/default/examples/rust_book/traits/traits.v +++ b/CoqOfRust/examples/default/examples/rust_book/traits/traits.v @@ -40,12 +40,8 @@ Module Animal. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " says " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "" |); mk_str (| " says " |); mk_str (| " +" |) ] |) |) |) @@ -247,11 +243,8 @@ Module Impl_traits_Sheep. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " is already naked... -" |) - ] + [ mk_str (| "" |); mk_str (| " is already naked... +" |) ] |) |) |) @@ -346,11 +339,8 @@ Module Impl_traits_Sheep. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " gets a haircut! -" |) - ] + [ mk_str (| "" |); mk_str (| " gets a haircut! +" |) ] |) |) |) @@ -499,8 +489,8 @@ Module Impl_traits_Animal_for_traits_Sheep. |) |)) in let _ := M.is_constant_or_break_match (| M.read (| γ |), Value.Bool true |) in - Value.String "baaaaah?")); - fun γ => ltac:(M.monadic (Value.String "baaaaah!")) + M.alloc (| mk_str (| "baaaaah?" |) |))); + fun γ => ltac:(M.monadic (M.alloc (| mk_str (| "baaaaah!" |) |))) ] |) |))) @@ -543,9 +533,9 @@ Module Impl_traits_Animal_for_traits_Sheep. M.alloc (| Value.Array [ - M.read (| Value.String "" |); - M.read (| Value.String " pauses briefly... " |); - M.read (| Value.String " + mk_str (| "" |); + mk_str (| " pauses briefly... " |); + mk_str (| " " |) ] |) @@ -684,7 +674,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := [], [] |), - [ M.read (| Value.String "Dolly" |) ] + [ mk_str (| "Dolly" |) ] |) |) in let~ _ : Ty.tuple [] := diff --git a/CoqOfRust/examples/default/examples/rust_book/types/aliasing.v b/CoqOfRust/examples/default/examples/rust_book/types/aliasing.v index 81fdda66d..f0b60f6f1 100644 --- a/CoqOfRust/examples/default/examples/rust_book/types/aliasing.v +++ b/CoqOfRust/examples/default/examples/rust_book/types/aliasing.v @@ -56,10 +56,10 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "" |); - M.read (| Value.String " nanoseconds + " |); - M.read (| Value.String " inches = " |); - M.read (| Value.String " unit? + mk_str (| "" |); + mk_str (| " nanoseconds + " |); + mk_str (| " inches = " |); + mk_str (| " unit? " |) ] |) diff --git a/CoqOfRust/examples/default/examples/rust_book/types/casting.v b/CoqOfRust/examples/default/examples/rust_book/types/casting.v index 88da43df9..e3d429aa0 100644 --- a/CoqOfRust/examples/default/examples/rust_book/types/casting.v +++ b/CoqOfRust/examples/default/examples/rust_book/types/casting.v @@ -114,10 +114,10 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.alloc (| Value.Array [ - M.read (| Value.String "Casting: " |); - M.read (| Value.String " -> " |); - M.read (| Value.String " -> " |); - M.read (| Value.String " + mk_str (| "Casting: " |); + mk_str (| " -> " |); + mk_str (| " -> " |); + mk_str (| " " |) ] |) @@ -210,12 +210,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "1000 as a u16 is: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "1000 as a u16 is: " |); mk_str (| " +" |) ] |) |) |) @@ -281,12 +277,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "1000 as a u8 is : " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "1000 as a u8 is : " |); mk_str (| " +" |) ] |) |) |) @@ -352,12 +344,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String " -1 as a u8 is : " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| " -1 as a u8 is : " |); mk_str (| " +" |) ] |) |) |) @@ -427,12 +415,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "1000 mod 256 is : " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "1000 mod 256 is : " |); mk_str (| " +" |) ] |) |) |) @@ -503,12 +487,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String " 128 as a i16 is: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| " 128 as a i16 is: " |); mk_str (| " +" |) ] |) |) |) @@ -574,12 +554,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String " 128 as a i8 is : " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| " 128 as a i8 is : " |); mk_str (| " +" |) ] |) |) |) @@ -645,12 +621,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "1000 as a u8 is : " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "1000 as a u8 is : " |); mk_str (| " +" |) ] |) |) |) @@ -716,12 +688,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String " 232 as a i8 is : " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| " 232 as a i8 is : " |); mk_str (| " +" |) ] |) |) |) @@ -787,12 +755,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String " 300.0 as u8 is : " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| " 300.0 as u8 is : " |); mk_str (| " +" |) ] |) |) |) @@ -862,12 +826,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "-100.0 as u8 is : " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "-100.0 as u8 is : " |); mk_str (| " +" |) ] |) |) |) @@ -937,12 +897,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String " nan as u8 is : " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| " nan as u8 is : " |); mk_str (| " +" |) ] |) |) |) @@ -1012,12 +968,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String " 300.0 as u8 is : " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| " 300.0 as u8 is : " |); mk_str (| " +" |) ] |) |) |) @@ -1094,12 +1046,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "-100.0 as u8 is : " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "-100.0 as u8 is : " |); mk_str (| " +" |) ] |) |) |) @@ -1176,12 +1124,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String " nan as u8 is : " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| " nan as u8 is : " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/types/inference.v b/CoqOfRust/examples/default/examples/rust_book/types/inference.v index 4349c1529..b07a9df45 100644 --- a/CoqOfRust/examples/default/examples/rust_book/types/inference.v +++ b/CoqOfRust/examples/default/examples/rust_book/types/inference.v @@ -85,11 +85,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "" |); M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/types/literals.v b/CoqOfRust/examples/default/examples/rust_book/types/literals.v index 1e337b599..a7fd88d23 100644 --- a/CoqOfRust/examples/default/examples/rust_book/types/literals.v +++ b/CoqOfRust/examples/default/examples/rust_book/types/literals.v @@ -53,11 +53,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "size of `x` in bytes: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "size of `x` in bytes: " |); mk_str (| " +" |) ] |) |) |) @@ -139,11 +136,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "size of `y` in bytes: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "size of `y` in bytes: " |); mk_str (| " +" |) ] |) |) |) @@ -225,11 +219,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "size of `z` in bytes: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "size of `z` in bytes: " |); mk_str (| " +" |) ] |) |) |) @@ -311,11 +302,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "size of `i` in bytes: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "size of `i` in bytes: " |); mk_str (| " +" |) ] |) |) |) @@ -397,11 +385,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "size of `f` in bytes: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "size of `f` in bytes: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_clobbered_registers.v b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_clobbered_registers.v index a7f03e5fa..72b615c80 100644 --- a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_clobbered_registers.v +++ b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_clobbered_registers.v @@ -107,12 +107,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "CPU Manufacturer ID: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "CPU Manufacturer ID: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_symbol_operands_and_abi_clobbers.v b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_symbol_operands_and_abi_clobbers.v index 614893141..dfdcdbfe0 100644 --- a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_symbol_operands_and_abi_clobbers.v +++ b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/inline_assembly_symbol_operands_and_abi_clobbers.v @@ -75,14 +75,8 @@ Module main. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "arg = " |); - M.read (| Value.String " -" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "arg = " |); mk_str (| " +" |) ] |) |) |) |); diff --git a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/raw_pointers.v b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/raw_pointers.v index 20f508a4b..78fdcabbc 100644 --- a/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/raw_pointers.v +++ b/CoqOfRust/examples/default/examples/rust_book/unsafe_operations/raw_pointers.v @@ -47,7 +47,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: *raw_p == 10" |) ] + [ mk_str (| "assertion failed: *raw_p == 10" |) ] |) |) |))); diff --git a/CoqOfRust/examples/default/examples/rust_book/variable_bindings/declare_first.v b/CoqOfRust/examples/default/examples/rust_book/variable_bindings/declare_first.v index a2bc3dc89..bb6d9571c 100644 --- a/CoqOfRust/examples/default/examples/rust_book/variable_bindings/declare_first.v +++ b/CoqOfRust/examples/default/examples/rust_book/variable_bindings/declare_first.v @@ -61,12 +61,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "a binding: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "a binding: " |); mk_str (| " +" |) ] |) |) |) @@ -130,12 +126,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "another binding: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "another binding: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/variable_bindings/mutability.v b/CoqOfRust/examples/default/examples/rust_book/variable_bindings/mutability.v index 50dce4fc9..2903d946a 100644 --- a/CoqOfRust/examples/default/examples/rust_book/variable_bindings/mutability.v +++ b/CoqOfRust/examples/default/examples/rust_book/variable_bindings/mutability.v @@ -47,12 +47,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Before mutation: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Before mutation: " |); mk_str (| " +" |) ] |) |) |) @@ -120,12 +116,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "After mutation: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "After mutation: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/variable_bindings/scope.v b/CoqOfRust/examples/default/examples/rust_book/variable_bindings/scope.v index dea366a5e..9660d40e2 100644 --- a/CoqOfRust/examples/default/examples/rust_book/variable_bindings/scope.v +++ b/CoqOfRust/examples/default/examples/rust_book/variable_bindings/scope.v @@ -53,12 +53,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "inner short: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "inner short: " |); mk_str (| " +" |) ] |) |) |) @@ -122,12 +118,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "outer long: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "outer long: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/variable_bindings/variable_bindings.v b/CoqOfRust/examples/default/examples/rust_book/variable_bindings/variable_bindings.v index 3df565405..f9c1a5447 100644 --- a/CoqOfRust/examples/default/examples/rust_book/variable_bindings/variable_bindings.v +++ b/CoqOfRust/examples/default/examples/rust_book/variable_bindings/variable_bindings.v @@ -54,12 +54,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "An integer: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "An integer: " |); mk_str (| " +" |) ] |) |) |) @@ -122,12 +118,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "A boolean: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "A boolean: " |); mk_str (| " +" |) ] |) |) |) @@ -188,12 +180,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Meet the unit value: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Meet the unit value: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/rust_book/variable_bindings/variable_shadowing.v b/CoqOfRust/examples/default/examples/rust_book/variable_bindings/variable_shadowing.v index 913eb573e..2518109e6 100644 --- a/CoqOfRust/examples/default/examples/rust_book/variable_bindings/variable_shadowing.v +++ b/CoqOfRust/examples/default/examples/rust_book/variable_bindings/variable_shadowing.v @@ -50,11 +50,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "before being shadowed: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "before being shadowed: " |); mk_str (| " +" |) ] |) |) |) @@ -96,7 +93,7 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := |) in M.alloc (| Value.Tuple [] |) in let~ shadowed_binding : Ty.apply (Ty.path "&") [] [ Ty.path "str" ] := - M.copy (| Value.String "abc" |) in + M.alloc (| mk_str (| "abc" |) |) in let~ _ : Ty.tuple [] := let~ _ : Ty.tuple [] := M.alloc (| @@ -120,11 +117,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "shadowed in inner block: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "shadowed in inner block: " |); mk_str (| " +" |) ] |) |) |) @@ -188,12 +182,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "outside inner block: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "outside inner block: " |); mk_str (| " +" |) ] |) |) |) @@ -258,11 +248,8 @@ Definition main (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M := Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "shadowed in outer block: " |); - M.read (| Value.String " -" |) - ] + [ mk_str (| "shadowed in outer block: " |); mk_str (| " +" |) ] |) |) |) diff --git a/CoqOfRust/examples/default/examples/subtle.v b/CoqOfRust/examples/default/examples/subtle.v index b33c2e98f..4a6624c7f 100644 --- a/CoqOfRust/examples/default/examples/subtle.v +++ b/CoqOfRust/examples/default/examples/subtle.v @@ -69,7 +69,7 @@ Module Impl_core_fmt_Debug_for_subtle_Choice. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Choice" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Choice" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -200,9 +200,8 @@ Module Impl_core_convert_From_subtle_Choice_for_bool. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: (source.0 == 0u8) | (source.0 == 1u8)" + mk_str (| + "assertion failed: (source.0 == 0u8) | (source.0 == 1u8)" |) ] |) @@ -627,11 +626,7 @@ Definition black_box (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "assertion failed: (input == 0u8) | (input == 1u8)" - |) + [ mk_str (| "assertion failed: (input == 0u8) | (input == 1u8)" |) ] |) |) @@ -3774,8 +3769,8 @@ Module Impl_core_fmt_Debug_where_core_fmt_Debug_T_for_subtle_CtOption_T. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "CtOption" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "value" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CtOption" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "value" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3789,7 +3784,7 @@ Module Impl_core_fmt_Debug_where_core_fmt_Debug_T_for_subtle_CtOption_T. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "is_some" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "is_some" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -4071,9 +4066,7 @@ Module Impl_subtle_CtOption_T. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); diff --git a/CoqOfRust/lib/lib.v b/CoqOfRust/lib/lib.v index 260d20111..9ffb7f638 100644 --- a/CoqOfRust/lib/lib.v +++ b/CoqOfRust/lib/lib.v @@ -55,7 +55,7 @@ Definition assign (target : Value.t) (source : Value.t) : M := (** A value with an address of type `ref str`. *) Definition mk_str (s : string) : M := let* pointer := M.alloc (Value.String s) in - M.alloc pointer. + M.borrow Pointer.Kind.Ref pointer. Module Integer. Definition min (kind : IntegerKind.t) : Z := diff --git a/CoqOfRust/links/M.v b/CoqOfRust/links/M.v index 61aad26ea..55b85f758 100644 --- a/CoqOfRust/links/M.v +++ b/CoqOfRust/links/M.v @@ -356,7 +356,28 @@ Module Slice. Defined. Smpl Add apply of_ty : of_ty. End Slice. - + +Module Str. + Global Instance IsLink : Link string := { + Φ := Ty.path "str"; + φ x := Value.String x; + }. + + Definition of_ty : OfTy.t (Ty.path "str"). + Proof. eapply OfTy.Make with (A := string); reflexivity. Defined. + Smpl Add apply of_ty : of_ty. + + Lemma of_value_with (x : string) : + Value.String x = φ x. + Proof. reflexivity. Qed. + Smpl Add apply of_value_with : of_value. + + Definition of_value (x : string) : + OfValue.t (Value.String x). + Proof. eapply OfValue.Make with (A := string); smpl of_value. Defined. + Smpl Add apply of_value : of_value. +End Str. + (** A general type for references. Can be used for mutable or non-mutable references, as well as for unsafe pointers (we assume that the `unsafe` code is safe). *) Module Ref. diff --git a/CoqOfRust/move_sui/translations/move_abstract_stack/lib.v b/CoqOfRust/move_sui/translations/move_abstract_stack/lib.v index 7f242d272..52671fdd9 100644 --- a/CoqOfRust/move_sui/translations/move_abstract_stack/lib.v +++ b/CoqOfRust/move_sui/translations/move_abstract_stack/lib.v @@ -100,11 +100,8 @@ Module Impl_core_fmt_Debug_where_core_fmt_Debug_T_for_move_abstract_stack_Abstra |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AbstractStack" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "values" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "AbstractStack" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "values" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -118,7 +115,7 @@ Module Impl_core_fmt_Debug_where_core_fmt_Debug_T_for_move_abstract_stack_Abstra |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "len" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "len" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -289,9 +286,8 @@ Module Impl_move_abstract_stack_AbstractStack_T. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: !self.values.is_empty() || self.len == 0" + mk_str (| + "assertion failed: !self.values.is_empty() || self.len == 0" |) ] |) @@ -471,9 +467,8 @@ Module Impl_move_abstract_stack_AbstractStack_T. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.values.is_empty() || self.values.last().unwrap().0 <= self.len" + mk_str (| + "assertion failed: self.values.is_empty() || self.values.last().unwrap().0 <= self.len" |) ] |) @@ -609,9 +604,8 @@ Module Impl_move_abstract_stack_AbstractStack_T. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.len != 0 || self.values.is_empty()" + mk_str (| + "assertion failed: self.len != 0 || self.values.is_empty()" |) ] |) @@ -808,9 +802,8 @@ Module Impl_move_abstract_stack_AbstractStack_T. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.len == 0 || + mk_str (| + "assertion failed: self.len == 0 || (!self.values.is_empty() && self.values.last().unwrap().0 <= self.len)" |) ] @@ -1121,9 +1114,8 @@ Module Impl_move_abstract_stack_AbstractStack_T. [] |), [ - M.read (| - Value.String - "assertion failed: *count > 0" + mk_str (| + "assertion failed: *count > 0" |) ] |) @@ -1477,11 +1469,7 @@ Module Impl_move_abstract_stack_AbstractStack_T. [], [] |), - [ - M.read (| - Value.String "assertion failed: *count > 0" - |) - ] + [ mk_str (| "assertion failed: *count > 0" |) ] |) |) |))); @@ -1922,9 +1910,8 @@ Module Impl_move_abstract_stack_AbstractStack_T. [] |), [ - M.read (| - Value.String - "assertion failed: *count > 0" + mk_str (| + "assertion failed: *count > 0" |) ] |) @@ -2442,7 +2429,7 @@ Module Impl_core_fmt_Debug_for_move_abstract_stack_AbsStackError. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ElementNotEqual" |) |) + M.deref (| mk_str (| "ElementNotEqual" |) |) |) |))); fun γ => @@ -2454,10 +2441,7 @@ Module Impl_core_fmt_Debug_for_move_abstract_stack_AbsStackError. "move_abstract_stack::AbsStackError::Underflow" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Underflow" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Underflow" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2465,10 +2449,7 @@ Module Impl_core_fmt_Debug_for_move_abstract_stack_AbsStackError. let _ := M.is_struct_tuple (| γ, "move_abstract_stack::AbsStackError::Overflow" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Overflow" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Overflow" |) |) |) |))) ] |) @@ -2558,11 +2539,7 @@ Module Impl_core_fmt_Display_for_move_abstract_stack_AbsStackError. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String - "Popped element is not equal to specified item" - |) + [ mk_str (| "Popped element is not equal to specified item" |) ] |) |) @@ -2608,11 +2585,7 @@ Module Impl_core_fmt_Display_for_move_abstract_stack_AbsStackError. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "Popped more values than are on the stack" - |) - ] + [ mk_str (| "Popped more values than are on the stack" |) ] |) |) |) @@ -2657,11 +2630,7 @@ Module Impl_core_fmt_Display_for_move_abstract_stack_AbsStackError. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "Pushed too many elements on the stack" - |) - ] + [ mk_str (| "Pushed too many elements on the stack" |) ] |) |) |) 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 38225a72f..0da185df2 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/binary_config.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/binary_config.v @@ -473,58 +473,58 @@ Module binary_config. M.alloc (| Value.Array [ - M.read (| Value.String "module_handles" |); + mk_str (| "module_handles" |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "struct_handles" |) |) + M.deref (| mk_str (| "struct_handles" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "function_handles" |) |) + M.deref (| mk_str (| "function_handles" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "function_instantiations" |) |) + M.deref (| mk_str (| "function_instantiations" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "signatures" |) |) + M.deref (| mk_str (| "signatures" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "constant_pool" |) |) + M.deref (| mk_str (| "constant_pool" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "identifiers" |) |) + M.deref (| mk_str (| "identifiers" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "address_identifiers" |) |) + M.deref (| mk_str (| "address_identifiers" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "struct_defs" |) |) + M.deref (| mk_str (| "struct_defs" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "struct_def_instantiations" |) |) + M.deref (| mk_str (| "struct_def_instantiations" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "function_defs" |) |) + M.deref (| mk_str (| "function_defs" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "field_handles" |) |) + M.deref (| mk_str (| "field_handles" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "field_instantiations" |) |) + M.deref (| mk_str (| "field_instantiations" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "friend_decls" |) |) + M.deref (| mk_str (| "friend_decls" |) |) |) ] |) @@ -758,10 +758,7 @@ Module binary_config. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TableConfig" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "TableConfig" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| names |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| values |) |) |) ] @@ -978,13 +975,10 @@ Module binary_config. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BinaryConfig" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BinaryConfig" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "max_binary_format_version" |) |) + M.deref (| mk_str (| "max_binary_format_version" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -1001,7 +995,7 @@ Module binary_config. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "check_no_extraneous_bytes" |) |) + M.deref (| mk_str (| "check_no_extraneous_bytes" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -1016,10 +1010,7 @@ Module binary_config. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "table_config" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "table_config" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| 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 0b5a4052d..296134f46 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/check_bounds.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/check_bounds.v @@ -17367,13 +17367,11 @@ Module check_bounds. M.alloc (| Value.Array [ - M.read (| - Value.String - "expected " + mk_str (| + "expected " |); - M.read (| - Value.String - " type parameters got 0 (Struct)" + mk_str (| + " type parameters got 0 (Struct)" |) ] |) @@ -17981,13 +17979,11 @@ Module check_bounds. M.alloc (| Value.Array [ - M.read (| - Value.String - "expected " + mk_str (| + "expected " |); - M.read (| - Value.String - " type parameters got " + mk_str (| + " type parameters got " |) ] |) @@ -19055,12 +19051,9 @@ Module check_bounds. M.alloc (| Value.Array [ - M.read (| - Value.String "Indexing into bytecode " - |); - M.read (| - Value.String - " during bounds checking but 'current_function' was not set" + mk_str (| "Indexing into bytecode " |); + mk_str (| + " during bounds checking but 'current_function' was not set" |) ] |) diff --git a/CoqOfRust/move_sui/translations/move_binary_format/compatibility.v b/CoqOfRust/move_sui/translations/move_binary_format/compatibility.v index 7e9b58adc..ad40a7a48 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/compatibility.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/compatibility.v @@ -248,28 +248,26 @@ Module compatibility. M.alloc (| Value.Array [ - M.read (| Value.String "check_struct_and_pub_function_linking" |); + mk_str (| "check_struct_and_pub_function_linking" |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "check_struct_layout" |) |) + M.deref (| mk_str (| "check_struct_layout" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "check_friend_linking" |) |) + M.deref (| mk_str (| "check_friend_linking" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "check_private_entry_linking" |) |) + M.deref (| mk_str (| "check_private_entry_linking" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "disallowed_new_abilities" |) |) + M.deref (| mk_str (| "disallowed_new_abilities" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "disallow_change_struct_type_params" |) - |) + M.deref (| mk_str (| "disallow_change_struct_type_params" |) |) |) ] |) @@ -399,10 +397,7 @@ Module compatibility. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Compatibility" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Compatibility" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| names |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| values |) |) |) ] @@ -3643,10 +3638,7 @@ Module compatibility. "move_binary_format::compatibility::InclusionCheck::Subset" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Subset" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Subset" |) |) |) |))); fun γ => ltac:(M.monadic @@ -3657,10 +3649,7 @@ Module compatibility. "move_binary_format::compatibility::InclusionCheck::Equal" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Equal" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Equal" |) |) |) |))) ] |) 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 68b2b46d8..06382e244 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 @@ -118,8 +118,7 @@ Module control_flow_graph. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "+=======================+ + Value.Array [ mk_str (| "+=======================+ " |) ] |) |) @@ -154,11 +153,8 @@ Module control_flow_graph. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "| Enter: " |); - M.read (| Value.String " | -" |) - ] + [ mk_str (| "| Enter: " |); mk_str (| " | +" |) ] |) |) |) @@ -219,8 +215,7 @@ Module control_flow_graph. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "+-----------------------+ + Value.Array [ mk_str (| "+-----------------------+ " |) ] |) |) @@ -254,12 +249,8 @@ Module control_flow_graph. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "==> Children: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "==> Children: " |); mk_str (| " +" |) ] |) |) |) @@ -334,8 +325,7 @@ Module control_flow_graph. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "+-----------------------+ + Value.Array [ mk_str (| "+-----------------------+ " |) ] |) |) @@ -370,11 +360,8 @@ Module control_flow_graph. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "| Exit: " |); - M.read (| Value.String " | -" |) - ] + [ mk_str (| "| Exit: " |); mk_str (| " | +" |) ] |) |) |) @@ -444,8 +431,7 @@ Module control_flow_graph. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "+=======================+ + Value.Array [ mk_str (| "+=======================+ " |) ] |) |) @@ -2344,9 +2330,8 @@ Module control_flow_graph. [] |), [ - M.read (| - Value.String - "assertion failed: window.len() == 2" + mk_str (| + "assertion failed: window.len() == 2" |) ] |) @@ -2587,12 +2572,8 @@ Module control_flow_graph. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Traversal: " |); - M.read (| Value.String " -" |) - ] + Value.Array [ mk_str (| "Traversal: " |); mk_str (| " +" |) ] |) |) |) @@ -3692,9 +3673,8 @@ Module control_flow_graph. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.blocks.contains_key(&block_id)" + mk_str (| + "assertion failed: self.blocks.contains_key(&block_id)" |) ] |) diff --git a/CoqOfRust/move_sui/translations/move_binary_format/deserializer.v b/CoqOfRust/move_sui/translations/move_binary_format/deserializer.v index 9657ebb39..2f0b84c5c 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/deserializer.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/deserializer.v @@ -539,8 +539,8 @@ Module deserializer. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Table" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "kind" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Table" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "kind" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -554,7 +554,7 @@ Module deserializer. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "offset" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "offset" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -568,7 +568,7 @@ Module deserializer. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "count" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "count" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1929,9 +1929,7 @@ Module deserializer. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Bad Uleb" |) - |) + M.deref (| mk_str (| "Bad Uleb" |) |) |) ] |) @@ -2060,9 +2058,7 @@ Module deserializer. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Uleb greater than max requested" - |) + mk_str (| "Uleb greater than max requested" |) |) |) ] @@ -2183,9 +2179,8 @@ Module deserializer. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Failed to convert u64 to target integer type. This should not happen. Is the maximum value correct?" + mk_str (| + "Failed to convert u64 to target integer type. This should not happen. Is the maximum value correct?" |) |) |) @@ -5586,9 +5581,7 @@ Module deserializer. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Error reading table" |) - |) + M.deref (| mk_str (| "Error reading table" |) |) |) ] |) @@ -7909,17 +7902,14 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "Exceeded size (" + mk_str (| + "Exceeded size (" |); - M.read (| - Value.String - " > " + mk_str (| + " > " |); - M.read (| - Value.String - ") in " + mk_str (| + ") in " |) ] |) @@ -8424,17 +8414,14 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "Exceeded size (" + mk_str (| + "Exceeded size (" |); - M.read (| - Value.String - " > " + mk_str (| + " > " |); - M.read (| - Value.String - ") in " + mk_str (| + ") in " |) ] |) @@ -8939,17 +8926,14 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "Exceeded size (" + mk_str (| + "Exceeded size (" |); - M.read (| - Value.String - " > " + mk_str (| + " > " |); - M.read (| - Value.String - ") in " + mk_str (| + ") in " |) ] |) @@ -9454,17 +9438,14 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "Exceeded size (" + mk_str (| + "Exceeded size (" |); - M.read (| - Value.String - " > " + mk_str (| + " > " |); - M.read (| - Value.String - ") in " + mk_str (| + ") in " |) ] |) @@ -9967,17 +9948,14 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "Exceeded size (" + mk_str (| + "Exceeded size (" |); - M.read (| - Value.String - " > " + mk_str (| + " > " |); - M.read (| - Value.String - ") in " + mk_str (| + ") in " |) ] |) @@ -10480,17 +10458,14 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "Exceeded size (" + mk_str (| + "Exceeded size (" |); - M.read (| - Value.String - " > " + mk_str (| + " > " |); - M.read (| - Value.String - ") in " + mk_str (| + ") in " |) ] |) @@ -10807,9 +10782,8 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "metadata declarations not applicable in bytecode version " + mk_str (| + "metadata declarations not applicable in bytecode version " |) ] |) @@ -11427,17 +11401,14 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "Exceeded size (" + mk_str (| + "Exceeded size (" |); - M.read (| - Value.String - " > " + mk_str (| + " > " |); - M.read (| - Value.String - ") in " + mk_str (| + ") in " |) ] |) @@ -11942,17 +11913,14 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "Exceeded size (" + mk_str (| + "Exceeded size (" |); - M.read (| - Value.String - " > " + mk_str (| + " > " |); - M.read (| - Value.String - ") in " + mk_str (| + ") in " |) ] |) @@ -12264,9 +12232,8 @@ Module deserializer. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Friend declarations not applicable in bytecode version 1" + mk_str (| + "Friend declarations not applicable in bytecode version 1" |) |) |) @@ -12937,17 +12904,14 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "Exceeded size (" + mk_str (| + "Exceeded size (" |); - M.read (| - Value.String - " > " + mk_str (| + " > " |); - M.read (| - Value.String - ") in " + mk_str (| + ") in " |) ] |) @@ -13431,17 +13395,14 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "Exceeded size (" + mk_str (| + "Exceeded size (" |); - M.read (| - Value.String - " > " + mk_str (| + " > " |); - M.read (| - Value.String - ") in " + mk_str (| + ") in " |) ] |) @@ -13925,17 +13886,14 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "Exceeded size (" + mk_str (| + "Exceeded size (" |); - M.read (| - Value.String - " > " + mk_str (| + " > " |); - M.read (| - Value.String - ") in " + mk_str (| + ") in " |) ] |) @@ -14419,17 +14377,14 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "Exceeded size (" + mk_str (| + "Exceeded size (" |); - M.read (| - Value.String - " > " + mk_str (| + " > " |); - M.read (| - Value.String - ") in " + mk_str (| + ") in " |) ] |) @@ -14913,17 +14868,14 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "Exceeded size (" + mk_str (| + "Exceeded size (" |); - M.read (| - Value.String - " > " + mk_str (| + " > " |); - M.read (| - Value.String - ") in " + mk_str (| + ") in " |) ] |) @@ -15407,17 +15359,14 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "Exceeded size (" + mk_str (| + "Exceeded size (" |); - M.read (| - Value.String - " > " + mk_str (| + " > " |); - M.read (| - Value.String - ") in " + mk_str (| + ") in " |) ] |) @@ -19003,9 +18952,8 @@ Module deserializer. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Bad Identifier pool size" + mk_str (| + "Bad Identifier pool size" |) |) |) @@ -19170,9 +19118,8 @@ Module deserializer. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Invalid Identifier" + mk_str (| + "Invalid Identifier" |) |) |) @@ -19434,9 +19381,7 @@ Module deserializer. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Bad Address Identifier pool size" - |) + mk_str (| "Bad Address Identifier pool size" |) |) |) ] @@ -19710,9 +19655,8 @@ Module deserializer. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Invalid Address format" + mk_str (| + "Invalid Address format" |) |) |) @@ -21394,9 +21338,7 @@ Module deserializer. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Unexpected end of table" - |) + mk_str (| "Unexpected end of table" |) |) |) ] @@ -21538,9 +21480,7 @@ Module deserializer. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Bad byte blob size" |) - |) + M.deref (| mk_str (| "Bad byte blob size" |) |) |) ] |) @@ -22883,9 +22823,8 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "u16, u32, u256 integers not supported in bytecode version " + mk_str (| + "u16, u32, u256 integers not supported in bytecode version " |) ] |) @@ -23860,9 +23799,8 @@ Module deserializer. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Struct inst with arity 0" + mk_str (| + "Struct inst with arity 0" |) |) |) @@ -24137,9 +24075,7 @@ Module deserializer. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Unexpected EOF" - |) + mk_str (| "Unexpected EOF" |) |) |) ] @@ -24489,9 +24425,8 @@ Module deserializer. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Maximum recursion depth reached" + mk_str (| + "Maximum recursion depth reached" |) |) |) @@ -25372,9 +25307,8 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "internal error: entered unreachable code: invalid type constructor application" + mk_str (| + "internal error: entered unreachable code: invalid type constructor application" |) ] |) @@ -25513,9 +25447,8 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "internal error: entered unreachable code: cannot unwrap unsaturated type constructor" + mk_str (| + "internal error: entered unreachable code: cannot unwrap unsaturated type constructor" |) ] |) @@ -25827,9 +25760,7 @@ Module deserializer. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Unexpected EOF" |) - |) + M.deref (| mk_str (| "Unexpected EOF" |) |) |) ] |) @@ -26440,9 +26371,8 @@ Module deserializer. [] |), [ - M.read (| - Value.String - "internal error: entered unreachable code" + mk_str (| + "internal error: entered unreachable code" |) ] |) @@ -28468,9 +28398,8 @@ Module deserializer. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Invalid field info in struct" + mk_str (| + "Invalid field info in struct" |) |) |) @@ -30966,9 +30895,7 @@ Module deserializer. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Unexpected EOF" - |) + mk_str (| "Unexpected EOF" |) |) |) ] @@ -31390,9 +31317,8 @@ Module deserializer. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Invalid visibility byte" + mk_str (| + "Invalid visibility byte" |) |) |) @@ -31642,9 +31568,8 @@ Module deserializer. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Unexpected EOF" + mk_str (| + "Unexpected EOF" |) |) |) @@ -31895,9 +31820,8 @@ Module deserializer. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Invalid visibility byte" + mk_str (| + "Invalid visibility byte" |) |) |) @@ -32127,9 +32051,8 @@ Module deserializer. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Unexpected EOF" + mk_str (| + "Unexpected EOF" |) |) |) @@ -33956,9 +33879,8 @@ Module deserializer. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Unexpected EOF" + mk_str (| + "Unexpected EOF" |) |) |) @@ -34372,9 +34294,8 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "Vector operations not available before bytecode version " + mk_str (| + "Vector operations not available before bytecode version " |) ] |) @@ -34626,9 +34547,8 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "Loading or casting u16, u32, u256 integers not supported in bytecode version " + mk_str (| + "Loading or casting u16, u32, u256 integers not supported in bytecode version " |) ] |) @@ -35334,9 +35254,8 @@ Module deserializer. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Unexpected EOF" + mk_str (| + "Unexpected EOF" |) |) |) @@ -42647,7 +42566,7 @@ Module deserializer. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NOMINAL_RESOURCE" |) |) + M.deref (| mk_str (| "NOMINAL_RESOURCE" |) |) |) |))); fun γ => @@ -42661,7 +42580,7 @@ Module deserializer. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NORMAL_STRUCT" |) |) + M.deref (| mk_str (| "NORMAL_STRUCT" |) |) |) |))) ] @@ -44423,30 +44342,21 @@ Module deserializer. M.alloc (| Value.Array [ - M.read (| Value.String "binary_config" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "binary" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "version" |) |) - |); + mk_str (| "binary_config" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "binary" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "version" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "tables" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "tables" |) |) + M.deref (| mk_str (| "module_idx" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "module_idx" |) |) + M.deref (| mk_str (| "data_offset" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "data_offset" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "binary_end_offset" |) |) + M.deref (| mk_str (| "binary_end_offset" |) |) |) ] |) @@ -44589,10 +44499,7 @@ Module deserializer. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VersionedBinary" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "VersionedBinary" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| names |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| values |) |) |) ] @@ -44650,11 +44557,8 @@ Module deserializer. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VersionedCursor" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "version" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "VersionedCursor" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "version" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -44668,7 +44572,7 @@ Module deserializer. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "cursor" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "cursor" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -45011,9 +44915,7 @@ Module deserializer. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Bad binary header" |) - |) + M.deref (| mk_str (| "Bad binary header" |) |) |) ] |) @@ -45113,9 +45015,7 @@ Module deserializer. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Bad binary header" |) - |) + M.deref (| mk_str (| "Bad binary header" |) |) |) ] |) @@ -45681,9 +45581,7 @@ Module deserializer. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Table size too big" |) - |) + M.deref (| mk_str (| "Table size too big" |) |) |) ] |) diff --git a/CoqOfRust/move_sui/translations/move_binary_format/errors.v b/CoqOfRust/move_sui/translations/move_binary_format/errors.v index 07e08b05d..88841a79f 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/errors.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/errors.v @@ -160,10 +160,7 @@ Module errors. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Undefined" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Undefined" |) |) |) ] |) |))); @@ -191,10 +188,7 @@ Module errors. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Module" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Module" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -745,14 +739,8 @@ Module errors. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ExecutionState" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "stack_trace" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ExecutionState" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "stack_trace" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -4061,9 +4049,8 @@ Module errors. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "VMError" + mk_str (| + "VMError" |) |) |) @@ -4074,9 +4061,8 @@ Module errors. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "major_status" + mk_str (| + "major_status" |) |) |); @@ -4095,9 +4081,8 @@ Module errors. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "sub_status" + mk_str (| + "sub_status" |) |) |); @@ -4116,9 +4101,7 @@ Module errors. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "message" - |) + mk_str (| "message" |) |) |); M.borrow (| @@ -4133,9 +4116,7 @@ Module errors. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "exec_state" |) - |) + M.deref (| mk_str (| "exec_state" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -4147,9 +4128,7 @@ Module errors. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "location" |) - |) + M.deref (| mk_str (| "location" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -4161,7 +4140,7 @@ Module errors. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "indices" |) |) + M.deref (| mk_str (| "indices" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -4173,7 +4152,7 @@ Module errors. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "offsets" |) |) + M.deref (| mk_str (| "offsets" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -5039,11 +5018,7 @@ Module errors. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "assertion failed: self.0.sub_status.is_none()" - |) + [ mk_str (| "assertion failed: self.0.sub_status.is_none()" |) ] |) |) @@ -5160,11 +5135,7 @@ Module errors. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.0.message.is_none()" - |) - ] + [ mk_str (| "assertion failed: self.0.message.is_none()" |) ] |) |) |))); @@ -5281,11 +5252,7 @@ Module errors. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "assertion failed: self.0.exec_state.is_none()" - |) + [ mk_str (| "assertion failed: self.0.exec_state.is_none()" |) ] |) |) @@ -5887,9 +5854,7 @@ Module errors. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "UNDEFINED" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "UNDEFINED" |) ] |) |) |) |) @@ -5937,9 +5902,7 @@ Module errors. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Module " |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Module " |) ] |) |) |) |); @@ -6066,12 +6029,7 @@ Module errors. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "PartialVMError with status " - |) - ] + Value.Array [ mk_str (| "PartialVMError with status " |) ] |) |) |) @@ -6245,10 +6203,8 @@ Module errors. M.alloc (| Value.Array [ - M.read (| Value.String "" |); - M.read (| - Value.String " with sub status " - |) + mk_str (| "" |); + mk_str (| " with sub status " |) ] |) |) @@ -6395,8 +6351,8 @@ Module errors. M.alloc (| Value.Array [ - M.read (| Value.String "" |); - M.read (| Value.String " and message " |) + mk_str (| "" |); + mk_str (| " and message " |) ] |) |) @@ -6641,16 +6597,9 @@ Module errors. M.alloc (| Value.Array [ - M.read (| - Value.String "" - |); - M.read (| - Value.String - " at index " - |); - M.read (| - Value.String " for " - |) + mk_str (| "" |); + mk_str (| " at index " |); + mk_str (| " for " |) ] |) |) @@ -6949,16 +6898,12 @@ Module errors. M.alloc (| Value.Array [ - M.read (| - Value.String "" + mk_str (| "" |); + mk_str (| + " at code offset " |); - M.read (| - Value.String - " at code offset " - |); - M.read (| - Value.String - " in function definition " + mk_str (| + " in function definition " |) ] |) @@ -7101,7 +7046,7 @@ Module errors. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -7220,8 +7165,7 @@ Module errors. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "VMError with status " |) ] + Value.Array [ mk_str (| "VMError with status " |) ] |) |) |) @@ -7395,10 +7339,8 @@ Module errors. M.alloc (| Value.Array [ - M.read (| Value.String "" |); - M.read (| - Value.String " with sub status " - |) + mk_str (| "" |); + mk_str (| " with sub status " |) ] |) |) @@ -7510,10 +7452,7 @@ Module errors. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " at location " |) - ] + [ mk_str (| "" |); mk_str (| " at location " |) ] |) |) |) @@ -7665,8 +7604,8 @@ Module errors. M.alloc (| Value.Array [ - M.read (| Value.String "" |); - M.read (| Value.String " and message " |) + mk_str (| "" |); + mk_str (| " and message " |) ] |) |) @@ -7911,16 +7850,9 @@ Module errors. M.alloc (| Value.Array [ - M.read (| - Value.String "" - |); - M.read (| - Value.String - " at index " - |); - M.read (| - Value.String " for " - |) + mk_str (| "" |); + mk_str (| " at index " |); + mk_str (| " for " |) ] |) |) @@ -8219,16 +8151,12 @@ Module errors. M.alloc (| Value.Array [ - M.read (| - Value.String "" - |); - M.read (| - Value.String - " at code offset " + mk_str (| "" |); + mk_str (| + " at code offset " |); - M.read (| - Value.String - " in function definition " + mk_str (| + " in function definition " |) ] |) @@ -8371,7 +8299,7 @@ Module errors. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -8487,11 +8415,11 @@ Module errors. M.alloc (| Value.Array [ - M.read (| Value.String "Index " |); - M.read (| Value.String " out of bounds for " |); - M.read (| Value.String " at bytecode offset " |); - M.read (| Value.String " in function " |); - M.read (| Value.String " while indexing " |) + mk_str (| "Index " |); + mk_str (| " out of bounds for " |); + mk_str (| " at bytecode offset " |); + mk_str (| " in function " |); + mk_str (| " while indexing " |) ] |) |) @@ -8719,9 +8647,9 @@ Module errors. M.alloc (| Value.Array [ - M.read (| Value.String "Index " |); - M.read (| Value.String " out of bounds for " |); - M.read (| Value.String " while indexing " |) + mk_str (| "Index " |); + mk_str (| " out of bounds for " |); + mk_str (| " while indexing " |) ] |) |) @@ -9166,9 +9094,8 @@ Module errors. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "PartialVMError" + mk_str (| + "PartialVMError" |) |) |) @@ -9179,9 +9106,8 @@ Module errors. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "major_status" + mk_str (| + "major_status" |) |) |); @@ -9200,9 +9126,7 @@ Module errors. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "sub_status" - |) + mk_str (| "sub_status" |) |) |); M.borrow (| @@ -9217,9 +9141,7 @@ Module errors. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "message" |) - |) + M.deref (| mk_str (| "message" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -9231,9 +9153,7 @@ Module errors. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "exec_state" |) - |) + M.deref (| mk_str (| "exec_state" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -9245,7 +9165,7 @@ Module errors. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "indices" |) |) + M.deref (| mk_str (| "indices" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -9257,7 +9177,7 @@ Module errors. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "offsets" |) |) + M.deref (| mk_str (| "offsets" |) |) |); M.borrow (| Pointer.Kind.Ref, 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 621414dc1..8482c4472 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/file_format.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/file_format.v @@ -390,10 +390,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -486,11 +483,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "ModuleHandleIndex(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "ModuleHandleIndex(" |); mk_str (| ")" |) ] |) |) |) @@ -979,10 +972,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -1075,11 +1065,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "StructHandleIndex(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "StructHandleIndex(" |); mk_str (| ")" |) ] |) |) |) @@ -1568,10 +1554,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -1664,11 +1647,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "FunctionHandleIndex(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "FunctionHandleIndex(" |); mk_str (| ")" |) ] |) |) |) @@ -2157,10 +2136,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -2253,11 +2229,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "FieldHandleIndex(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "FieldHandleIndex(" |); mk_str (| ")" |) ] |) |) |) @@ -2757,10 +2729,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -2855,10 +2824,7 @@ Module file_format. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "StructDefInstantiationIndex(" |); - M.read (| Value.String ")" |) - ] + [ mk_str (| "StructDefInstantiationIndex(" |); mk_str (| ")" |) ] |) |) |) @@ -3350,10 +3316,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -3447,10 +3410,7 @@ Module file_format. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "FunctionInstantiationIndex(" |); - M.read (| Value.String ")" |) - ] + [ mk_str (| "FunctionInstantiationIndex(" |); mk_str (| ")" |) ] |) |) |) @@ -3941,10 +3901,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -4037,11 +3994,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "FieldInstantiationIndex(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "FieldInstantiationIndex(" |); mk_str (| ")" |) ] |) |) |) @@ -4528,10 +4481,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -4624,11 +4574,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "IdentifierIndex(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "IdentifierIndex(" |); mk_str (| ")" |) ] |) |) |) @@ -5117,10 +5063,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -5213,11 +5156,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "AddressIdentifierIndex(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "AddressIdentifierIndex(" |); mk_str (| ")" |) ] |) |) |) @@ -5706,10 +5645,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -5802,11 +5738,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "ConstantPoolIndex(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "ConstantPoolIndex(" |); mk_str (| ")" |) ] |) |) |) @@ -6291,10 +6223,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -6387,11 +6316,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "SignatureIndex(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "SignatureIndex(" |); mk_str (| ")" |) ] |) |) |) @@ -6880,10 +6805,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -6976,11 +6898,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "StructDefinitionIndex(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "StructDefinitionIndex(" |); mk_str (| ")" |) ] |) |) |) @@ -7469,10 +7387,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -7565,11 +7480,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "FunctionDefinitionIndex(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "FunctionDefinitionIndex(" |); mk_str (| ")" |) ] |) |) |) @@ -7738,7 +7649,7 @@ Module file_format. [], [] |), - [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "" |) |) |) ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) ] |) |) |))) @@ -7879,11 +7790,8 @@ Module file_format. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ModuleHandle" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "address" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ModuleHandle" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "address" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -7897,7 +7805,7 @@ Module file_format. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "name" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "name" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -8595,11 +8503,8 @@ Module file_format. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "StructHandle" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "module" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "StructHandle" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "module" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -8613,7 +8518,7 @@ Module file_format. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "name" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "name" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -8627,7 +8532,7 @@ Module file_format. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "abilities" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "abilities" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -8641,10 +8546,7 @@ Module file_format. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "type_parameters" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "type_parameters" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -9830,14 +9732,8 @@ Module file_format. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "StructTypeParameter" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "constraints" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "StructTypeParameter" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "constraints" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -9851,7 +9747,7 @@ Module file_format. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "is_phantom" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "is_phantom" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -10394,7 +10290,7 @@ Module file_format. |), [ M.read (| __serializer |); - M.read (| Value.String "StructTypeParameter" |); + mk_str (| "StructTypeParameter" |); BinOp.Wrap.add (| BinOp.Wrap.add (| M.cast (Ty.path "usize") (Value.Bool false), @@ -10470,7 +10366,7 @@ Module file_format. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "constraints" |); + mk_str (| "constraints" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -10551,7 +10447,7 @@ Module file_format. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "is_phantom" |); + mk_str (| "is_phantom" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -10663,7 +10559,7 @@ Module file_format. |), [ M.read (| __deserializer |); - M.read (| Value.String "StructTypeParameter" |); + mk_str (| "StructTypeParameter" |); M.read (| M.get_constant "move_binary_format::file_format::_'1::deserialize::FIELDS" |); @@ -10735,9 +10631,9 @@ Module file_format. |), [ M.read (| __serializer |); - M.read (| Value.String "Visibility" |); + mk_str (| "Visibility" |); Value.Integer IntegerKind.U32 0; - M.read (| Value.String "Private" |) + mk_str (| "Private" |) ] |) |))); @@ -10768,9 +10664,9 @@ Module file_format. |), [ M.read (| __serializer |); - M.read (| Value.String "Visibility" |); + mk_str (| "Visibility" |); Value.Integer IntegerKind.U32 1; - M.read (| Value.String "Public" |) + mk_str (| "Public" |) ] |) |))); @@ -10801,9 +10697,9 @@ Module file_format. |), [ M.read (| __serializer |); - M.read (| Value.String "Visibility" |); + mk_str (| "Visibility" |); Value.Integer IntegerKind.U32 2; - M.read (| Value.String "Friend" |) + mk_str (| "Friend" |) ] |) |))) @@ -10849,7 +10745,7 @@ Module file_format. |), [ M.read (| __deserializer |); - M.read (| Value.String "Visibility" |); + mk_str (| "Visibility" |); M.read (| M.get_constant "move_binary_format::file_format::_'3::deserialize::VARIANTS" |); @@ -10901,7 +10797,7 @@ Module file_format. |), [ M.read (| __serializer |); - M.read (| Value.String "AbilitySet" |); + mk_str (| "AbilitySet" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -10956,7 +10852,7 @@ Module file_format. |), [ M.read (| __deserializer |); - M.read (| Value.String "AbilitySet" |); + mk_str (| "AbilitySet" |); Value.StructRecord "move_binary_format::file_format::_'5::deserialize::__Visitor" [ @@ -11201,11 +11097,8 @@ Module file_format. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FunctionHandle" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "module" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FunctionHandle" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "module" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11219,7 +11112,7 @@ Module file_format. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "name" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "name" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11233,7 +11126,7 @@ Module file_format. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "parameters" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "parameters" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11247,7 +11140,7 @@ Module file_format. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "return_" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "return_" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11261,10 +11154,7 @@ Module file_format. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "type_parameters" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "type_parameters" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11864,11 +11754,8 @@ Module file_format. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FieldHandle" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "owner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FieldHandle" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "owner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11882,7 +11769,7 @@ Module file_format. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "field" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "field" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -12282,10 +12169,7 @@ Module file_format. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Native" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Native" |) |) |) ] |) |))); @@ -12313,10 +12197,7 @@ Module file_format. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Declared" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Declared" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -12628,11 +12509,8 @@ Module file_format. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "StructDefInstantiation" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "def" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "StructDefInstantiation" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "def" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -12646,10 +12524,7 @@ Module file_format. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "type_parameters" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "type_parameters" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -13022,11 +12897,8 @@ Module file_format. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FunctionInstantiation" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "handle" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FunctionInstantiation" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "handle" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -13040,10 +12912,7 @@ Module file_format. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "type_parameters" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "type_parameters" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -13416,11 +13285,8 @@ Module file_format. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FieldInstantiation" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "handle" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FieldInstantiation" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "handle" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -13434,10 +13300,7 @@ Module file_format. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "type_parameters" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "type_parameters" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -13810,14 +13673,8 @@ Module file_format. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "StructDefinition" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "struct_handle" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "StructDefinition" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "struct_handle" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -13831,10 +13688,7 @@ Module file_format. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "field_information" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "field_information" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -14092,9 +13946,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Looking for field in native structure" - |) + mk_str (| "Looking for field in native structure" |) |) |) ] @@ -14498,11 +14350,8 @@ Module file_format. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FieldDefinition" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "name" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FieldDefinition" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "name" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -14516,7 +14365,7 @@ Module file_format. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "signature" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "signature" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -14804,10 +14653,7 @@ Module file_format. "move_binary_format::file_format::Visibility::Private" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Private" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Private" |) |) |) |))); fun γ => ltac:(M.monadic @@ -14818,10 +14664,7 @@ Module file_format. "move_binary_format::file_format::Visibility::Public" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Public" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Public" |) |) |) |))); fun γ => ltac:(M.monadic @@ -14832,10 +14675,7 @@ Module file_format. "move_binary_format::file_format::Visibility::Friend" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Friend" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Friend" |) |) |) |))) ] |) @@ -15449,11 +15289,8 @@ Module file_format. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FunctionDefinition" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "function" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FunctionDefinition" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "function" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -15467,7 +15304,7 @@ Module file_format. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "visibility" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "visibility" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -15481,7 +15318,7 @@ Module file_format. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "is_entry" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "is_entry" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -15497,7 +15334,7 @@ Module file_format. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "acquires_global_resources" |) |) + M.deref (| mk_str (| "acquires_global_resources" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -15512,7 +15349,7 @@ Module file_format. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "code" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "code" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -16087,10 +15924,7 @@ Module file_format. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TypeSignature" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "TypeSignature" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -16472,11 +16306,8 @@ Module file_format. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FunctionSignature" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "return_" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FunctionSignature" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "return_" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -16490,7 +16321,7 @@ Module file_format. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "parameters" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "parameters" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -16504,10 +16335,7 @@ Module file_format. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "type_parameters" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "type_parameters" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -17000,7 +16828,7 @@ Module file_format. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Signature" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Signature" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -17553,10 +17381,7 @@ Module file_format. "move_binary_format::file_format::Ability::Copy" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Copy" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Copy" |) |) |) |))); fun γ => ltac:(M.monadic @@ -17567,10 +17392,7 @@ Module file_format. "move_binary_format::file_format::Ability::Drop" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Drop" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Drop" |) |) |) |))); fun γ => ltac:(M.monadic @@ -17581,10 +17403,7 @@ Module file_format. "move_binary_format::file_format::Ability::Store" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Store" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Store" |) |) |) |))); fun γ => ltac:(M.monadic @@ -17595,10 +17414,7 @@ Module file_format. "move_binary_format::file_format::Ability::Key" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Key" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Key" |) |) |) |))) ] |) @@ -19264,9 +19080,8 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "the length of `declared_phantom_parameters` doesn't match the length of `type_arguments`" + mk_str (| + "the length of `declared_phantom_parameters` doesn't match the length of `type_arguments`" |) |) |) @@ -20437,7 +20252,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "[" |) ] |) + M.alloc (| Value.Array [ mk_str (| "[" |) ] |) |) |) |) @@ -20645,12 +20460,8 @@ Module file_format. M.alloc (| Value.Array [ - M.read (| - Value.String "" - |); - M.read (| - Value.String ", " - |) + mk_str (| "" |); + mk_str (| ", " |) ] |) |) @@ -20800,7 +20611,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "]" |) ] |) + M.alloc (| Value.Array [ mk_str (| "]" |) ] |) |) |) |) @@ -24340,7 +24151,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Bool" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Bool" |) ] |) |) |) |) @@ -24385,7 +24196,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "U8" |) ] |) + M.alloc (| Value.Array [ mk_str (| "U8" |) ] |) |) |) |) @@ -24430,7 +24241,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "U16" |) ] |) + M.alloc (| Value.Array [ mk_str (| "U16" |) ] |) |) |) |) @@ -24475,7 +24286,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "U32" |) ] |) + M.alloc (| Value.Array [ mk_str (| "U32" |) ] |) |) |) |) @@ -24520,7 +24331,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "U64" |) ] |) + M.alloc (| Value.Array [ mk_str (| "U64" |) ] |) |) |) |) @@ -24565,7 +24376,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "U128" |) ] |) + M.alloc (| Value.Array [ mk_str (| "U128" |) ] |) |) |) |) @@ -24610,7 +24421,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "U256" |) ] |) + M.alloc (| Value.Array [ mk_str (| "U256" |) ] |) |) |) |) @@ -24655,9 +24466,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "Address" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "Address" |) ] |) |) |) |) @@ -24702,7 +24511,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Signer" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Signer" |) ] |) |) |) |) @@ -24751,11 +24560,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Vector(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "Vector(" |); mk_str (| ")" |) ] |) |) |) @@ -24847,11 +24652,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Struct(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "Struct(" |); mk_str (| ")" |) ] |) |) |) @@ -24957,9 +24758,9 @@ Module file_format. M.alloc (| Value.Array [ - M.read (| Value.String "StructInstantiation(" |); - M.read (| Value.String ", " |); - M.read (| Value.String ")" |) + mk_str (| "StructInstantiation(" |); + mk_str (| ", " |); + mk_str (| ")" |) ] |) |) @@ -25081,11 +24882,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Reference(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "Reference(" |); mk_str (| ")" |) ] |) |) |) @@ -25178,10 +24975,7 @@ Module file_format. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "MutableReference(" |); - M.read (| Value.String ")" |) - ] + [ mk_str (| "MutableReference(" |); mk_str (| ")" |) ] |) |) |) @@ -25274,10 +25068,7 @@ Module file_format. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "TypeParameter(" |); - M.read (| Value.String ")" |) - ] + [ mk_str (| "TypeParameter(" |); mk_str (| ")" |) ] |) |) |) @@ -26318,10 +26109,8 @@ Module file_format. M.alloc (| Value.Array [ - M.read (| Value.String "debug_set_sh_idx (to " |); - M.read (| - Value.String ") called for non-struct token " - |) + mk_str (| "debug_set_sh_idx (to " |); + mk_str (| ") called for non-struct token " |) ] |) |) @@ -26758,8 +26547,8 @@ Module file_format. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Constant" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "type_" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Constant" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "type_" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -26773,7 +26562,7 @@ Module file_format. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "data" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "data" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -27173,8 +26962,8 @@ Module file_format. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "CodeUnit" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "locals" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CodeUnit" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "locals" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -27188,7 +26977,7 @@ Module file_format. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "code" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "code" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -31474,11 +31263,7 @@ Module file_format. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "Program counter out of bounds" - |) - ] + [ mk_str (| "Program counter out of bounds" |) ] |) |) |) @@ -34170,7 +33955,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Pop" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Pop" |) ] |) |) |) |) @@ -34212,7 +33997,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Ret" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Ret" |) ] |) |) |) |) @@ -34261,11 +34046,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "BrTrue(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "BrTrue(" |); mk_str (| ")" |) ] |) |) |) @@ -34343,11 +34124,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "BrFalse(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "BrFalse(" |); mk_str (| ")" |) ] |) |) |) @@ -34425,11 +34202,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Branch(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "Branch(" |); mk_str (| ")" |) ] |) |) |) @@ -34507,11 +34280,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "LdU8(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "LdU8(" |); mk_str (| ")" |) ] |) |) |) @@ -34589,11 +34358,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "LdU16(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "LdU16(" |); mk_str (| ")" |) ] |) |) |) @@ -34671,11 +34436,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "LdU32(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "LdU32(" |); mk_str (| ")" |) ] |) |) |) @@ -34753,11 +34514,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "LdU64(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "LdU64(" |); mk_str (| ")" |) ] |) |) |) @@ -34835,11 +34592,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "LdU128(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "LdU128(" |); mk_str (| ")" |) ] |) |) |) @@ -34930,11 +34683,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "LdU256(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "LdU256(" |); mk_str (| ")" |) ] |) |) |) @@ -35021,7 +34770,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "CastU8" |) ] |) + M.alloc (| Value.Array [ mk_str (| "CastU8" |) ] |) |) |) |) @@ -35066,9 +34815,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "CastU16" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "CastU16" |) ] |) |) |) |) @@ -35113,9 +34860,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "CastU32" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "CastU32" |) ] |) |) |) |) @@ -35160,9 +34905,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "CastU64" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "CastU64" |) ] |) |) |) |) @@ -35207,9 +34950,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "CastU128" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "CastU128" |) ] |) |) |) |) @@ -35254,9 +34995,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "CastU256" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "CastU256" |) ] |) |) |) |) @@ -35305,11 +35044,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "LdConst(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "LdConst(" |); mk_str (| ")" |) ] |) |) |) @@ -35391,7 +35126,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "LdTrue" |) ] |) + M.alloc (| Value.Array [ mk_str (| "LdTrue" |) ] |) |) |) |) @@ -35436,9 +35171,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "LdFalse" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "LdFalse" |) ] |) |) |) |) @@ -35487,11 +35220,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "CopyLoc(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "CopyLoc(" |); mk_str (| ")" |) ] |) |) |) @@ -35569,11 +35298,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "MoveLoc(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "MoveLoc(" |); mk_str (| ")" |) ] |) |) |) @@ -35651,11 +35376,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "StLoc(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "StLoc(" |); mk_str (| ")" |) ] |) |) |) @@ -35733,11 +35454,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Call(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "Call(" |); mk_str (| ")" |) ] |) |) |) @@ -35823,11 +35540,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "CallGeneric(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "CallGeneric(" |); mk_str (| ")" |) ] |) |) |) @@ -35913,11 +35626,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Pack(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "Pack(" |); mk_str (| ")" |) ] |) |) |) @@ -36003,11 +35712,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "PackGeneric(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "PackGeneric(" |); mk_str (| ")" |) ] |) |) |) @@ -36093,11 +35798,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Unpack(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "Unpack(" |); mk_str (| ")" |) ] |) |) |) @@ -36184,10 +35885,7 @@ Module file_format. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "UnpackGeneric(" |); - M.read (| Value.String ")" |) - ] + [ mk_str (| "UnpackGeneric(" |); mk_str (| ")" |) ] |) |) |) @@ -36269,9 +35967,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "ReadRef" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "ReadRef" |) ] |) |) |) |) @@ -36316,9 +36012,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "WriteRef" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "WriteRef" |) ] |) |) |) |) @@ -36363,9 +36057,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "FreezeRef" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "FreezeRef" |) ] |) |) |) |) @@ -36414,11 +36106,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "MutBorrowLoc(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "MutBorrowLoc(" |); mk_str (| ")" |) ] |) |) |) @@ -36496,11 +36184,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "ImmBorrowLoc(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "ImmBorrowLoc(" |); mk_str (| ")" |) ] |) |) |) @@ -36579,10 +36263,7 @@ Module file_format. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "MutBorrowField(" |); - M.read (| Value.String ")" |) - ] + [ mk_str (| "MutBorrowField(" |); mk_str (| ")" |) ] |) |) |) @@ -36669,10 +36350,7 @@ Module file_format. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "MutBorrowFieldGeneric(" |); - M.read (| Value.String ")" |) - ] + [ mk_str (| "MutBorrowFieldGeneric(" |); mk_str (| ")" |) ] |) |) |) @@ -36759,10 +36437,7 @@ Module file_format. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "ImmBorrowField(" |); - M.read (| Value.String ")" |) - ] + [ mk_str (| "ImmBorrowField(" |); mk_str (| ")" |) ] |) |) |) @@ -36849,10 +36524,7 @@ Module file_format. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "ImmBorrowFieldGeneric(" |); - M.read (| Value.String ")" |) - ] + [ mk_str (| "ImmBorrowFieldGeneric(" |); mk_str (| ")" |) ] |) |) |) @@ -36939,10 +36611,7 @@ Module file_format. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "MutBorrowGlobal(" |); - M.read (| Value.String ")" |) - ] + [ mk_str (| "MutBorrowGlobal(" |); mk_str (| ")" |) ] |) |) |) @@ -37029,10 +36698,7 @@ Module file_format. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "MutBorrowGlobalGeneric(" |); - M.read (| Value.String ")" |) - ] + [ mk_str (| "MutBorrowGlobalGeneric(" |); mk_str (| ")" |) ] |) |) |) @@ -37119,10 +36785,7 @@ Module file_format. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "ImmBorrowGlobal(" |); - M.read (| Value.String ")" |) - ] + [ mk_str (| "ImmBorrowGlobal(" |); mk_str (| ")" |) ] |) |) |) @@ -37209,10 +36872,7 @@ Module file_format. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "ImmBorrowGlobalGeneric(" |); - M.read (| Value.String ")" |) - ] + [ mk_str (| "ImmBorrowGlobalGeneric(" |); mk_str (| ")" |) ] |) |) |) @@ -37291,7 +36951,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Add" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Add" |) ] |) |) |) |) @@ -37333,7 +36993,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Sub" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Sub" |) ] |) |) |) |) @@ -37375,7 +37035,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Mul" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Mul" |) ] |) |) |) |) @@ -37417,7 +37077,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Mod" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Mod" |) ] |) |) |) |) @@ -37459,7 +37119,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Div" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Div" |) ] |) |) |) |) @@ -37504,7 +37164,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "BitOr" |) ] |) + M.alloc (| Value.Array [ mk_str (| "BitOr" |) ] |) |) |) |) @@ -37549,7 +37209,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "BitAnd" |) ] |) + M.alloc (| Value.Array [ mk_str (| "BitAnd" |) ] |) |) |) |) @@ -37591,7 +37251,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Xor" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Xor" |) ] |) |) |) |) @@ -37633,7 +37293,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Shl" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Shl" |) ] |) |) |) |) @@ -37675,7 +37335,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Shr" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Shr" |) ] |) |) |) |) @@ -37717,7 +37377,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Or" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Or" |) ] |) |) |) |) @@ -37759,7 +37419,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "And" |) ] |) + M.alloc (| Value.Array [ mk_str (| "And" |) ] |) |) |) |) @@ -37801,7 +37461,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Not" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Not" |) ] |) |) |) |) @@ -37843,7 +37503,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Eq" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Eq" |) ] |) |) |) |) @@ -37885,7 +37545,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Neq" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Neq" |) ] |) |) |) |) @@ -37927,7 +37587,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Lt" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Lt" |) ] |) |) |) |) @@ -37969,7 +37629,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Gt" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Gt" |) ] |) |) |) |) @@ -38011,7 +37671,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Le" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Le" |) ] |) |) |) |) @@ -38053,7 +37713,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Ge" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Ge" |) ] |) |) |) |) @@ -38098,7 +37758,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Abort" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Abort" |) ] |) |) |) |) @@ -38140,7 +37800,7 @@ Module file_format. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "Nop" |) ] |) + M.alloc (| Value.Array [ mk_str (| "Nop" |) ] |) |) |) |) @@ -38189,11 +37849,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "Exists(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "Exists(" |); mk_str (| ")" |) ] |) |) |) @@ -38280,10 +37936,7 @@ Module file_format. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "ExistsGeneric(" |); - M.read (| Value.String ")" |) - ] + [ mk_str (| "ExistsGeneric(" |); mk_str (| ")" |) ] |) |) |) @@ -38369,11 +38022,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "MoveFrom(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "MoveFrom(" |); mk_str (| ")" |) ] |) |) |) @@ -38460,10 +38109,7 @@ Module file_format. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "MoveFromGeneric(" |); - M.read (| Value.String ")" |) - ] + [ mk_str (| "MoveFromGeneric(" |); mk_str (| ")" |) ] |) |) |) @@ -38549,11 +38195,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "MoveTo(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "MoveTo(" |); mk_str (| ")" |) ] |) |) |) @@ -38640,10 +38282,7 @@ Module file_format. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "MoveToGeneric(" |); - M.read (| Value.String ")" |) - ] + [ mk_str (| "MoveToGeneric(" |); mk_str (| ")" |) ] |) |) |) @@ -38738,9 +38377,9 @@ Module file_format. M.alloc (| Value.Array [ - M.read (| Value.String "VecPack(" |); - M.read (| Value.String ", " |); - M.read (| Value.String ")" |) + mk_str (| "VecPack(" |); + mk_str (| ", " |); + mk_str (| ")" |) ] |) |) @@ -38842,11 +38481,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "VecLen(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "VecLen(" |); mk_str (| ")" |) ] |) |) |) @@ -38932,11 +38567,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "VecImmBorrow(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "VecImmBorrow(" |); mk_str (| ")" |) ] |) |) |) @@ -39022,11 +38653,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "VecMutBorrow(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "VecMutBorrow(" |); mk_str (| ")" |) ] |) |) |) @@ -39112,11 +38739,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "VecPushBack(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "VecPushBack(" |); mk_str (| ")" |) ] |) |) |) @@ -39202,11 +38825,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "VecPopBack(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "VecPopBack(" |); mk_str (| ")" |) ] |) |) |) @@ -39301,9 +38920,9 @@ Module file_format. M.alloc (| Value.Array [ - M.read (| Value.String "VecUnpack(" |); - M.read (| Value.String ", " |); - M.read (| Value.String ")" |) + mk_str (| "VecUnpack(" |); + mk_str (| ", " |); + mk_str (| ")" |) ] |) |) @@ -39405,11 +39024,7 @@ Module file_format. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "VecSwap(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "VecSwap(" |); mk_str (| ")" |) ] |) |) |) @@ -40303,70 +39918,67 @@ Module file_format. M.alloc (| Value.Array [ - M.read (| Value.String "version" |); + mk_str (| "version" |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "self_module_handle_idx" |) |) + M.deref (| mk_str (| "self_module_handle_idx" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "module_handles" |) |) + M.deref (| mk_str (| "module_handles" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "struct_handles" |) |) + M.deref (| mk_str (| "struct_handles" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "function_handles" |) |) + M.deref (| mk_str (| "function_handles" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "field_handles" |) |) + M.deref (| mk_str (| "field_handles" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "friend_decls" |) |) + M.deref (| mk_str (| "friend_decls" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "struct_def_instantiations" |) |) + M.deref (| mk_str (| "struct_def_instantiations" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "function_instantiations" |) |) + M.deref (| mk_str (| "function_instantiations" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "field_instantiations" |) |) + M.deref (| mk_str (| "field_instantiations" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "signatures" |) |) + M.deref (| mk_str (| "signatures" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "identifiers" |) |) + M.deref (| mk_str (| "identifiers" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "address_identifiers" |) |) + M.deref (| mk_str (| "address_identifiers" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "constant_pool" |) |) + M.deref (| mk_str (| "constant_pool" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "metadata" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "metadata" |) |) + M.deref (| mk_str (| "struct_defs" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "struct_defs" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "function_defs" |) |) + M.deref (| mk_str (| "function_defs" |) |) |) ] |) @@ -40639,10 +40251,7 @@ Module file_format. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CompiledModule" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CompiledModule" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| names |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| values |) |) |) ] @@ -42224,9 +41833,8 @@ Module file_format. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: !matches!(kind, IndexKind::LocalPool | IndexKind::CodeDefinition | + mk_str (| + "assertion failed: !matches!(kind, IndexKind::LocalPool | IndexKind::CodeDefinition | IndexKind::FieldDefinition | IndexKind::TypeParameter | IndexKind::MemberCount)" |) @@ -42782,9 +42390,8 @@ Module file_format. M.alloc (| Value.Array [ - M.read (| - Value.String - "internal error: entered unreachable code: invalid kind for count: " + mk_str (| + "internal error: entered unreachable code: invalid kind for count: " |) ] |) @@ -42996,9 +42603,8 @@ Module file_format. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: handle.address.into_index() < self.address_identifiers.len()" + mk_str (| + "assertion failed: handle.address.into_index() < self.address_identifiers.len()" |) ] |) @@ -43093,9 +42699,8 @@ Module file_format. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: handle.name.into_index() < self.identifiers.len()" + mk_str (| + "assertion failed: handle.name.into_index() < self.identifiers.len()" |) ] |) @@ -43487,9 +43092,8 @@ Module file_format. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: handle.address.into_index() < self.address_identifiers.len()" + mk_str (| + "assertion failed: handle.address.into_index() < self.address_identifiers.len()" |) ] |) @@ -43584,9 +43188,8 @@ Module file_format. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: handle.name.into_index() < self.identifiers.len()" + mk_str (| + "assertion failed: handle.name.into_index() < self.identifiers.len()" |) ] |) @@ -43762,9 +43365,8 @@ Module file_format. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: handle.module.into_index() < self.module_handles.len()" + mk_str (| + "assertion failed: handle.module.into_index() < self.module_handles.len()" |) ] |) @@ -43941,9 +43543,8 @@ Module file_format. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: handle.parameters.into_index() < self.signatures.len()" + mk_str (| + "assertion failed: handle.parameters.into_index() < self.signatures.len()" |) ] |) @@ -44039,9 +43640,8 @@ Module file_format. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: handle.return_.into_index() < self.signatures.len()" + mk_str (| + "assertion failed: handle.return_.into_index() < self.signatures.len()" |) ] |) @@ -44217,9 +43817,8 @@ Module file_format. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: handle.owner.into_index() < self.struct_defs.len()" + mk_str (| + "assertion failed: handle.owner.into_index() < self.struct_defs.len()" |) ] |) @@ -45035,9 +44634,8 @@ Module file_format. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: result.function.into_index() < self.function_handles().len()" + mk_str (| + "assertion failed: result.function.into_index() < self.function_handles().len()" |) ] |) @@ -45194,9 +44792,8 @@ Module file_format. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: match &result.code { + mk_str (| + "assertion failed: match &result.code { Some(code) => code.locals.into_index() < self.signatures().len(), None => true, }" @@ -49474,12 +49071,7 @@ Module file_format. [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "foo" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "foo" |) |) |) ] |) ] |) @@ -49788,12 +49380,7 @@ Module file_format. [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Bar" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Bar" |) |) |) ] |) ] |) @@ -50014,12 +49601,7 @@ Module file_format. [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "x" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "x" |) |) |) ] |) ] |) 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 564937309..e4731e1f0 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 @@ -525,7 +525,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MODULE_HANDLES" |) |) + M.deref (| mk_str (| "MODULE_HANDLES" |) |) |) |))); fun γ => @@ -539,7 +539,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "STRUCT_HANDLES" |) |) + M.deref (| mk_str (| "STRUCT_HANDLES" |) |) |) |))); fun γ => @@ -553,7 +553,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FUNCTION_HANDLES" |) |) + M.deref (| mk_str (| "FUNCTION_HANDLES" |) |) |) |))); fun γ => @@ -567,7 +567,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FUNCTION_INST" |) |) + M.deref (| mk_str (| "FUNCTION_INST" |) |) |) |))); fun γ => @@ -579,10 +579,7 @@ Module file_format_common. "move_binary_format::file_format_common::TableType::SIGNATURES" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SIGNATURES" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SIGNATURES" |) |) |) |))); fun γ => ltac:(M.monadic @@ -595,7 +592,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CONSTANT_POOL" |) |) + M.deref (| mk_str (| "CONSTANT_POOL" |) |) |) |))); fun γ => @@ -607,10 +604,7 @@ Module file_format_common. "move_binary_format::file_format_common::TableType::IDENTIFIERS" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IDENTIFIERS" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "IDENTIFIERS" |) |) |) |))); fun γ => ltac:(M.monadic @@ -623,7 +617,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ADDRESS_IDENTIFIERS" |) |) + M.deref (| mk_str (| "ADDRESS_IDENTIFIERS" |) |) |) |))); fun γ => @@ -635,10 +629,7 @@ Module file_format_common. "move_binary_format::file_format_common::TableType::STRUCT_DEFS" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "STRUCT_DEFS" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "STRUCT_DEFS" |) |) |) |))); fun γ => ltac:(M.monadic @@ -651,7 +642,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "STRUCT_DEF_INST" |) |) + M.deref (| mk_str (| "STRUCT_DEF_INST" |) |) |) |))); fun γ => @@ -665,7 +656,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FUNCTION_DEFS" |) |) + M.deref (| mk_str (| "FUNCTION_DEFS" |) |) |) |))); fun γ => @@ -677,10 +668,7 @@ Module file_format_common. "move_binary_format::file_format_common::TableType::FIELD_HANDLE" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FIELD_HANDLE" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FIELD_HANDLE" |) |) |) |))); fun γ => ltac:(M.monadic @@ -691,10 +679,7 @@ Module file_format_common. "move_binary_format::file_format_common::TableType::FIELD_INST" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FIELD_INST" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FIELD_INST" |) |) |) |))); fun γ => ltac:(M.monadic @@ -705,10 +690,7 @@ Module file_format_common. "move_binary_format::file_format_common::TableType::FRIEND_DECLS" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FRIEND_DECLS" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FRIEND_DECLS" |) |) |) |))); fun γ => ltac:(M.monadic @@ -719,10 +701,7 @@ Module file_format_common. "move_binary_format::file_format_common::TableType::METADATA" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "METADATA" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "METADATA" |) |) |) |))) ] |) @@ -1055,10 +1034,7 @@ Module file_format_common. "move_binary_format::file_format_common::SerializedType::BOOL" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BOOL" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BOOL" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1069,10 +1045,7 @@ Module file_format_common. "move_binary_format::file_format_common::SerializedType::U8" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U8" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U8" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1083,10 +1056,7 @@ Module file_format_common. "move_binary_format::file_format_common::SerializedType::U64" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U64" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U64" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1097,10 +1067,7 @@ Module file_format_common. "move_binary_format::file_format_common::SerializedType::U128" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U128" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U128" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1111,10 +1078,7 @@ Module file_format_common. "move_binary_format::file_format_common::SerializedType::ADDRESS" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ADDRESS" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ADDRESS" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1125,10 +1089,7 @@ Module file_format_common. "move_binary_format::file_format_common::SerializedType::REFERENCE" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "REFERENCE" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "REFERENCE" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1141,7 +1102,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MUTABLE_REFERENCE" |) |) + M.deref (| mk_str (| "MUTABLE_REFERENCE" |) |) |) |))); fun γ => @@ -1153,10 +1114,7 @@ Module file_format_common. "move_binary_format::file_format_common::SerializedType::STRUCT" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "STRUCT" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "STRUCT" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1169,7 +1127,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TYPE_PARAMETER" |) |) + M.deref (| mk_str (| "TYPE_PARAMETER" |) |) |) |))); fun γ => @@ -1181,10 +1139,7 @@ Module file_format_common. "move_binary_format::file_format_common::SerializedType::VECTOR" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VECTOR" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "VECTOR" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1195,10 +1150,7 @@ Module file_format_common. "move_binary_format::file_format_common::SerializedType::STRUCT_INST" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "STRUCT_INST" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "STRUCT_INST" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1209,10 +1161,7 @@ Module file_format_common. "move_binary_format::file_format_common::SerializedType::SIGNER" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SIGNER" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SIGNER" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1223,10 +1172,7 @@ Module file_format_common. "move_binary_format::file_format_common::SerializedType::U16" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U16" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U16" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1237,10 +1183,7 @@ Module file_format_common. "move_binary_format::file_format_common::SerializedType::U32" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U32" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U32" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1251,10 +1194,7 @@ Module file_format_common. "move_binary_format::file_format_common::SerializedType::U256" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U256" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U256" |) |) |) |))) ] |) @@ -1368,10 +1308,7 @@ Module file_format_common. "move_binary_format::file_format_common::SerializedNativeStructFlag::NATIVE" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NATIVE" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "NATIVE" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1382,10 +1319,7 @@ Module file_format_common. "move_binary_format::file_format_common::SerializedNativeStructFlag::DECLARED" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DECLARED" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "DECLARED" |) |) |) |))) ] |) @@ -1958,10 +1892,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::POP" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "POP" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "POP" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1972,10 +1903,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::RET" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RET" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "RET" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1986,10 +1914,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::BR_TRUE" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BR_TRUE" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BR_TRUE" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2000,10 +1925,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::BR_FALSE" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BR_FALSE" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BR_FALSE" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2014,10 +1936,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::BRANCH" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BRANCH" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BRANCH" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2028,10 +1947,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::LD_U64" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LD_U64" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LD_U64" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2042,10 +1958,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::LD_CONST" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LD_CONST" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LD_CONST" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2056,10 +1969,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::LD_TRUE" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LD_TRUE" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LD_TRUE" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2070,10 +1980,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::LD_FALSE" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LD_FALSE" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LD_FALSE" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2084,10 +1991,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::COPY_LOC" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "COPY_LOC" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "COPY_LOC" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2098,10 +2002,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::MOVE_LOC" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MOVE_LOC" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MOVE_LOC" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2112,10 +2013,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::ST_LOC" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ST_LOC" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ST_LOC" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2128,7 +2026,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MUT_BORROW_LOC" |) |) + M.deref (| mk_str (| "MUT_BORROW_LOC" |) |) |) |))); fun γ => @@ -2142,7 +2040,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IMM_BORROW_LOC" |) |) + M.deref (| mk_str (| "IMM_BORROW_LOC" |) |) |) |))); fun γ => @@ -2156,7 +2054,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MUT_BORROW_FIELD" |) |) + M.deref (| mk_str (| "MUT_BORROW_FIELD" |) |) |) |))); fun γ => @@ -2170,7 +2068,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IMM_BORROW_FIELD" |) |) + M.deref (| mk_str (| "IMM_BORROW_FIELD" |) |) |) |))); fun γ => @@ -2182,10 +2080,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::CALL" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CALL" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CALL" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2196,10 +2091,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::PACK" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PACK" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "PACK" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2210,10 +2102,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::UNPACK" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNPACK" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "UNPACK" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2224,10 +2113,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::READ_REF" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "READ_REF" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "READ_REF" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2238,10 +2124,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::WRITE_REF" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "WRITE_REF" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "WRITE_REF" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2252,10 +2135,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::ADD" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ADD" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ADD" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2266,10 +2146,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::SUB" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SUB" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SUB" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2280,10 +2157,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::MUL" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MUL" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MUL" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2294,10 +2168,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::MOD" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MOD" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MOD" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2308,10 +2179,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::DIV" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DIV" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "DIV" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2322,10 +2190,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::BIT_OR" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BIT_OR" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BIT_OR" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2336,10 +2201,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::BIT_AND" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BIT_AND" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BIT_AND" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2350,10 +2212,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::XOR" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "XOR" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "XOR" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2364,10 +2223,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::OR" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OR" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "OR" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2378,10 +2234,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::AND" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AND" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "AND" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2392,10 +2245,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::NOT" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NOT" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "NOT" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2406,10 +2256,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::EQ" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EQ" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EQ" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2420,10 +2267,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::NEQ" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NEQ" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "NEQ" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2434,10 +2278,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::LT" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LT" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LT" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2448,10 +2289,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::GT" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "GT" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "GT" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2462,10 +2300,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::LE" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LE" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LE" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2476,10 +2311,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::GE" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "GE" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "GE" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2490,10 +2322,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::ABORT" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ABORT" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ABORT" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2504,10 +2333,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::NOP" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NOP" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "NOP" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2518,10 +2344,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::FREEZE_REF" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FREEZE_REF" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FREEZE_REF" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2532,10 +2355,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::SHL" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SHL" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SHL" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2546,10 +2366,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::SHR" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SHR" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SHR" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2560,10 +2377,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::LD_U8" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LD_U8" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LD_U8" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2574,10 +2388,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::LD_U128" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LD_U128" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LD_U128" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2588,10 +2399,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::CAST_U8" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CAST_U8" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CAST_U8" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2602,10 +2410,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::CAST_U64" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CAST_U64" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CAST_U64" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2616,10 +2421,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::CAST_U128" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CAST_U128" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CAST_U128" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2632,7 +2434,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MUT_BORROW_FIELD_GENERIC" |) |) + M.deref (| mk_str (| "MUT_BORROW_FIELD_GENERIC" |) |) |) |))); fun γ => @@ -2646,7 +2448,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IMM_BORROW_FIELD_GENERIC" |) |) + M.deref (| mk_str (| "IMM_BORROW_FIELD_GENERIC" |) |) |) |))); fun γ => @@ -2658,10 +2460,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::CALL_GENERIC" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CALL_GENERIC" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CALL_GENERIC" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2672,10 +2471,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::PACK_GENERIC" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PACK_GENERIC" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "PACK_GENERIC" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2688,7 +2484,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNPACK_GENERIC" |) |) + M.deref (| mk_str (| "UNPACK_GENERIC" |) |) |) |))); fun γ => @@ -2700,10 +2496,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::VEC_PACK" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VEC_PACK" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "VEC_PACK" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2714,10 +2507,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::VEC_LEN" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VEC_LEN" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "VEC_LEN" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2730,7 +2520,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VEC_IMM_BORROW" |) |) + M.deref (| mk_str (| "VEC_IMM_BORROW" |) |) |) |))); fun γ => @@ -2744,7 +2534,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VEC_MUT_BORROW" |) |) + M.deref (| mk_str (| "VEC_MUT_BORROW" |) |) |) |))); fun γ => @@ -2758,7 +2548,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VEC_PUSH_BACK" |) |) + M.deref (| mk_str (| "VEC_PUSH_BACK" |) |) |) |))); fun γ => @@ -2770,10 +2560,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::VEC_POP_BACK" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VEC_POP_BACK" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "VEC_POP_BACK" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2784,10 +2571,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::VEC_UNPACK" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VEC_UNPACK" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "VEC_UNPACK" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2798,10 +2582,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::VEC_SWAP" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VEC_SWAP" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "VEC_SWAP" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2812,10 +2593,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::LD_U16" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LD_U16" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LD_U16" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2826,10 +2604,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::LD_U32" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LD_U32" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LD_U32" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2840,10 +2615,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::LD_U256" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LD_U256" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LD_U256" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2854,10 +2626,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::CAST_U16" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CAST_U16" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CAST_U16" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2868,10 +2637,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::CAST_U32" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CAST_U32" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CAST_U32" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2882,10 +2648,7 @@ Module file_format_common. "move_binary_format::file_format_common::Opcodes::CAST_U256" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CAST_U256" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CAST_U256" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2898,7 +2661,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EXISTS_DEPRECATED" |) |) + M.deref (| mk_str (| "EXISTS_DEPRECATED" |) |) |) |))); fun γ => @@ -2912,7 +2675,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MUT_BORROW_GLOBAL_DEPRECATED" |) |) + M.deref (| mk_str (| "MUT_BORROW_GLOBAL_DEPRECATED" |) |) |) |))); fun γ => @@ -2926,7 +2689,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IMM_BORROW_GLOBAL_DEPRECATED" |) |) + M.deref (| mk_str (| "IMM_BORROW_GLOBAL_DEPRECATED" |) |) |) |))); fun γ => @@ -2940,7 +2703,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MOVE_FROM_DEPRECATED" |) |) + M.deref (| mk_str (| "MOVE_FROM_DEPRECATED" |) |) |) |))); fun γ => @@ -2954,7 +2717,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MOVE_TO_DEPRECATED" |) |) + M.deref (| mk_str (| "MOVE_TO_DEPRECATED" |) |) |) |))); fun γ => @@ -2968,7 +2731,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EXISTS_GENERIC_DEPRECATED" |) |) + M.deref (| mk_str (| "EXISTS_GENERIC_DEPRECATED" |) |) |) |))); fun γ => @@ -2982,9 +2745,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "MUT_BORROW_GLOBAL_GENERIC_DEPRECATED" |) - |) + M.deref (| mk_str (| "MUT_BORROW_GLOBAL_GENERIC_DEPRECATED" |) |) |) |))); fun γ => @@ -2998,9 +2759,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "IMM_BORROW_GLOBAL_GENERIC_DEPRECATED" |) - |) + M.deref (| mk_str (| "IMM_BORROW_GLOBAL_GENERIC_DEPRECATED" |) |) |) |))); fun γ => @@ -3014,7 +2773,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MOVE_FROM_GENERIC_DEPRECATED" |) |) + M.deref (| mk_str (| "MOVE_FROM_GENERIC_DEPRECATED" |) |) |) |))); fun γ => @@ -3028,7 +2787,7 @@ Module file_format_common. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MOVE_TO_GENERIC_DEPRECATED" |) |) + M.deref (| mk_str (| "MOVE_TO_GENERIC_DEPRECATED" |) |) |) |))) ] @@ -3146,8 +2905,8 @@ Module file_format_common. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "BinaryData" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "_binary" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BinaryData" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "_binary" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3470,17 +3229,13 @@ Module file_format_common. M.alloc (| Value.Array [ - M.read (| - Value.String - "binary size (" + mk_str (| + "binary size (" |); - M.read (| - Value.String - ") + 1 is greater than limit (" + mk_str (| + ") + 1 is greater than limit (" |); - M.read (| - Value.String ")" - |) + mk_str (| ")" |) ] |) |) @@ -3787,20 +3542,14 @@ Module file_format_common. M.alloc (| Value.Array [ - M.read (| - Value.String - "binary size (" - |); - M.read (| - Value.String ") + " + mk_str (| + "binary size (" |); - M.read (| - Value.String - " is greater than limit (" + mk_str (| ") + " |); + mk_str (| + " is greater than limit (" |); - M.read (| - Value.String ")" - |) + mk_str (| ")" |) ] |) |) @@ -5148,9 +4897,8 @@ Module file_format_common. M.alloc (| Value.Array [ - M.read (| - Value.String - "invalid ULEB128 repr for usize" + mk_str (| + "invalid ULEB128 repr for usize" |) ] |) @@ -5276,9 +5024,8 @@ Module file_format_common. M.alloc (| Value.Array [ - M.read (| - Value.String - "invalid ULEB128 repr for usize" + mk_str (| + "invalid ULEB128 repr for usize" |) ] |) @@ -5392,11 +5139,7 @@ Module file_format_common. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "invalid ULEB128 repr for usize" - |) - ] + [ mk_str (| "invalid ULEB128 repr for usize" |) ] |) |) |) diff --git a/CoqOfRust/move_sui/translations/move_binary_format/lib.v b/CoqOfRust/move_sui/translations/move_binary_format/lib.v index 6ad8a5c34..a48a38337 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/lib.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/lib.v @@ -187,10 +187,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_IndexKind. let _ := M.is_struct_tuple (| γ, "move_binary_format::IndexKind::ModuleHandle" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ModuleHandle" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ModuleHandle" |) |) |) |))); fun γ => ltac:(M.monadic @@ -198,10 +195,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_IndexKind. let _ := M.is_struct_tuple (| γ, "move_binary_format::IndexKind::StructHandle" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "StructHandle" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "StructHandle" |) |) |) |))); fun γ => ltac:(M.monadic @@ -212,10 +206,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_IndexKind. "move_binary_format::IndexKind::FunctionHandle" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FunctionHandle" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FunctionHandle" |) |) |) |))); fun γ => ltac:(M.monadic @@ -223,10 +214,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_IndexKind. let _ := M.is_struct_tuple (| γ, "move_binary_format::IndexKind::FieldHandle" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FieldHandle" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FieldHandle" |) |) |) |))); fun γ => ltac:(M.monadic @@ -239,7 +227,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_IndexKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FriendDeclaration" |) |) + M.deref (| mk_str (| "FriendDeclaration" |) |) |) |))); fun γ => @@ -253,7 +241,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_IndexKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FunctionInstantiation" |) |) + M.deref (| mk_str (| "FunctionInstantiation" |) |) |) |))); fun γ => @@ -267,7 +255,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_IndexKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FieldInstantiation" |) |) + M.deref (| mk_str (| "FieldInstantiation" |) |) |) |))); fun γ => @@ -281,7 +269,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_IndexKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "StructDefinition" |) |) + M.deref (| mk_str (| "StructDefinition" |) |) |) |))); fun γ => @@ -295,7 +283,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_IndexKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "StructDefInstantiation" |) |) + M.deref (| mk_str (| "StructDefInstantiation" |) |) |) |))); fun γ => @@ -309,7 +297,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_IndexKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FunctionDefinition" |) |) + M.deref (| mk_str (| "FunctionDefinition" |) |) |) |))); fun γ => @@ -323,7 +311,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_IndexKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FieldDefinition" |) |) + M.deref (| mk_str (| "FieldDefinition" |) |) |) |))); fun γ => @@ -332,10 +320,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_IndexKind. let _ := M.is_struct_tuple (| γ, "move_binary_format::IndexKind::Signature" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Signature" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Signature" |) |) |) |))); fun γ => ltac:(M.monadic @@ -343,10 +328,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_IndexKind. let _ := M.is_struct_tuple (| γ, "move_binary_format::IndexKind::Identifier" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Identifier" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Identifier" |) |) |) |))); fun γ => ltac:(M.monadic @@ -359,7 +341,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_IndexKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AddressIdentifier" |) |) + M.deref (| mk_str (| "AddressIdentifier" |) |) |) |))); fun γ => @@ -368,10 +350,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_IndexKind. let _ := M.is_struct_tuple (| γ, "move_binary_format::IndexKind::ConstantPool" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ConstantPool" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ConstantPool" |) |) |) |))); fun γ => ltac:(M.monadic @@ -379,10 +358,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_IndexKind. let _ := M.is_struct_tuple (| γ, "move_binary_format::IndexKind::LocalPool" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LocalPool" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LocalPool" |) |) |) |))); fun γ => ltac:(M.monadic @@ -393,10 +369,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_IndexKind. "move_binary_format::IndexKind::CodeDefinition" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CodeDefinition" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CodeDefinition" |) |) |) |))); fun γ => ltac:(M.monadic @@ -404,10 +377,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_IndexKind. let _ := M.is_struct_tuple (| γ, "move_binary_format::IndexKind::TypeParameter" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TypeParameter" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "TypeParameter" |) |) |) |))); fun γ => ltac:(M.monadic @@ -415,10 +385,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_IndexKind. let _ := M.is_struct_tuple (| γ, "move_binary_format::IndexKind::MemberCount" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MemberCount" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MemberCount" |) |) |) |))) ] |) @@ -842,17 +809,14 @@ Module Impl_core_fmt_Display_for_move_binary_format_IndexKind. (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "move_binary_format::IndexKind::ModuleHandle" |) in - Value.String "module handle")); + M.alloc (| mk_str (| "module handle" |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in let _ := M.is_struct_tuple (| γ, "move_binary_format::IndexKind::StructHandle" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "struct handle" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "struct handle" |) |) |) |))); fun γ => ltac:(M.monadic @@ -865,7 +829,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_IndexKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "function handle" |) |) + M.deref (| mk_str (| "function handle" |) |) |) |))); fun γ => @@ -874,10 +838,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_IndexKind. let _ := M.is_struct_tuple (| γ, "move_binary_format::IndexKind::FieldHandle" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "field handle" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "field handle" |) |) |) |))); fun γ => ltac:(M.monadic @@ -890,7 +851,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_IndexKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "friend declaration" |) |) + M.deref (| mk_str (| "friend declaration" |) |) |) |))); fun γ => @@ -904,7 +865,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_IndexKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "struct instantiation" |) |) + M.deref (| mk_str (| "struct instantiation" |) |) |) |))); fun γ => @@ -918,7 +879,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_IndexKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "function instantiation" |) |) + M.deref (| mk_str (| "function instantiation" |) |) |) |))); fun γ => @@ -932,7 +893,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_IndexKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "field instantiation" |) |) + M.deref (| mk_str (| "field instantiation" |) |) |) |))); fun γ => @@ -946,7 +907,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_IndexKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "struct definition" |) |) + M.deref (| mk_str (| "struct definition" |) |) |) |))); fun γ => @@ -960,7 +921,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_IndexKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "function definition" |) |) + M.deref (| mk_str (| "function definition" |) |) |) |))); fun γ => @@ -974,7 +935,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_IndexKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "field definition" |) |) + M.deref (| mk_str (| "field definition" |) |) |) |))); fun γ => @@ -983,10 +944,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_IndexKind. let _ := M.is_struct_tuple (| γ, "move_binary_format::IndexKind::Signature" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "signature" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "signature" |) |) |) |))); fun γ => ltac:(M.monadic @@ -994,10 +952,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_IndexKind. let _ := M.is_struct_tuple (| γ, "move_binary_format::IndexKind::Identifier" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "identifier" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "identifier" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1010,7 +965,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_IndexKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "address identifier" |) |) + M.deref (| mk_str (| "address identifier" |) |) |) |))); fun γ => @@ -1019,10 +974,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_IndexKind. let _ := M.is_struct_tuple (| γ, "move_binary_format::IndexKind::ConstantPool" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "constant pool" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "constant pool" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1030,10 +982,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_IndexKind. let _ := M.is_struct_tuple (| γ, "move_binary_format::IndexKind::LocalPool" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "local pool" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "local pool" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1046,7 +995,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_IndexKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "code definition pool" |) |) + M.deref (| mk_str (| "code definition pool" |) |) |) |))); fun γ => @@ -1055,10 +1004,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_IndexKind. let _ := M.is_struct_tuple (| γ, "move_binary_format::IndexKind::TypeParameter" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "type parameter" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "type parameter" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1066,10 +1012,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_IndexKind. let _ := M.is_struct_tuple (| γ, "move_binary_format::IndexKind::MemberCount" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "field offset" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "field offset" |) |) |) |))) ] |) @@ -1193,10 +1136,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_SignatureTokenKind. "move_binary_format::SignatureTokenKind::Value" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Value" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Value" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1207,10 +1147,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_SignatureTokenKind. "move_binary_format::SignatureTokenKind::Reference" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Reference" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Reference" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1223,7 +1160,7 @@ Module Impl_core_fmt_Debug_for_move_binary_format_SignatureTokenKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MutableReference" |) |) + M.deref (| mk_str (| "MutableReference" |) |) |) |))) ] @@ -1504,7 +1441,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_SignatureTokenKind. γ, "move_binary_format::SignatureTokenKind::Value" |) in - Value.String "value")); + M.alloc (| mk_str (| "value" |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in @@ -1514,10 +1451,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_SignatureTokenKind. "move_binary_format::SignatureTokenKind::Reference" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "reference" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "reference" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1530,7 +1464,7 @@ Module Impl_core_fmt_Display_for_move_binary_format_SignatureTokenKind. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "mutable reference" |) |) + M.deref (| mk_str (| "mutable reference" |) |) |) |))) ] diff --git a/CoqOfRust/move_sui/translations/move_binary_format/normalized.v b/CoqOfRust/move_sui/translations/move_binary_format/normalized.v index b9184d62c..7cd3d1c3f 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/normalized.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/normalized.v @@ -523,10 +523,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Bool" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Bool" |) |) |) ] |) |))); @@ -549,10 +546,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U8" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U8" |) |) |) ] |) |))); @@ -575,10 +569,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U64" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U64" |) |) |) ] |) |))); @@ -601,10 +592,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U128" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U128" |) |) |) ] |) |))); @@ -627,10 +615,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Address" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Address" |) |) |) ] |) |))); @@ -653,10 +638,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Signer" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Signer" |) |) |) ] |) |))); @@ -705,28 +687,16 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Struct" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "address" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Struct" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "address" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_0 |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "module" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "module" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_1 |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "name" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "name" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_2 |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "type_arguments" |) |) + M.deref (| mk_str (| "type_arguments" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -759,10 +729,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Vector" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Vector" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -796,7 +763,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TypeParameter" |) |) + M.deref (| mk_str (| "TypeParameter" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -829,10 +796,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Reference" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Reference" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -866,7 +830,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MutableReference" |) |) + M.deref (| mk_str (| "MutableReference" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -894,10 +858,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U16" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U16" |) |) |) ] |) |))); @@ -920,10 +881,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U32" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U32" |) |) |) ] |) |))); @@ -946,10 +904,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U256" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U256" |) |) |) ] |) |))) @@ -2625,9 +2580,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Type" |); + mk_str (| "Type" |); Value.Integer IntegerKind.U32 0; - M.read (| Value.String "bool" |) + mk_str (| "bool" |) ] |) |))); @@ -2655,9 +2610,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Type" |); + mk_str (| "Type" |); Value.Integer IntegerKind.U32 1; - M.read (| Value.String "u8" |) + mk_str (| "u8" |) ] |) |))); @@ -2688,9 +2643,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Type" |); + mk_str (| "Type" |); Value.Integer IntegerKind.U32 2; - M.read (| Value.String "u64" |) + mk_str (| "u64" |) ] |) |))); @@ -2721,9 +2676,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Type" |); + mk_str (| "Type" |); Value.Integer IntegerKind.U32 3; - M.read (| Value.String "u128" |) + mk_str (| "u128" |) ] |) |))); @@ -2754,9 +2709,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Type" |); + mk_str (| "Type" |); Value.Integer IntegerKind.U32 4; - M.read (| Value.String "address" |) + mk_str (| "address" |) ] |) |))); @@ -2787,9 +2742,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Type" |); + mk_str (| "Type" |); Value.Integer IntegerKind.U32 5; - M.read (| Value.String "signer" |) + mk_str (| "signer" |) ] |) |))); @@ -2869,9 +2824,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Type" |); + mk_str (| "Type" |); Value.Integer IntegerKind.U32 6; - M.read (| Value.String "Struct" |); + mk_str (| "Struct" |); BinOp.Wrap.add (| BinOp.Wrap.add (| BinOp.Wrap.add (| @@ -2960,7 +2915,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "address" |); + mk_str (| "address" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| address |) |) @@ -3039,7 +2994,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "module" |); + mk_str (| "module" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| module |) |) @@ -3118,7 +3073,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "name" |); + mk_str (| "name" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| name |) |) |) ] |) @@ -3202,7 +3157,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "type_arguments" |); + mk_str (| "type_arguments" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| type_arguments |) |) @@ -3306,9 +3261,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Type" |); + mk_str (| "Type" |); Value.Integer IntegerKind.U32 7; - M.read (| Value.String "vector" |); + mk_str (| "vector" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -3342,9 +3297,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Type" |); + mk_str (| "Type" |); Value.Integer IntegerKind.U32 8; - M.read (| Value.String "TypeParameter" |); + mk_str (| "TypeParameter" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -3386,9 +3341,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Type" |); + mk_str (| "Type" |); Value.Integer IntegerKind.U32 9; - M.read (| Value.String "Reference" |); + mk_str (| "Reference" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -3430,9 +3385,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Type" |); + mk_str (| "Type" |); Value.Integer IntegerKind.U32 10; - M.read (| Value.String "MutableReference" |); + mk_str (| "MutableReference" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -3464,9 +3419,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Type" |); + mk_str (| "Type" |); Value.Integer IntegerKind.U32 11; - M.read (| Value.String "u16" |) + mk_str (| "u16" |) ] |) |))); @@ -3497,9 +3452,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Type" |); + mk_str (| "Type" |); Value.Integer IntegerKind.U32 12; - M.read (| Value.String "u32" |) + mk_str (| "u32" |) ] |) |))); @@ -3530,9 +3485,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Type" |); + mk_str (| "Type" |); Value.Integer IntegerKind.U32 13; - M.read (| Value.String "u256" |) + mk_str (| "u256" |) ] |) |))) @@ -3579,7 +3534,7 @@ Module normalized. |), [ M.read (| __deserializer |); - M.read (| Value.String "Type" |); + mk_str (| "Type" |); M.read (| M.get_constant "move_binary_format::normalized::_'1::deserialize::VARIANTS" |); @@ -3651,7 +3606,7 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Field" |); + mk_str (| "Field" |); BinOp.Wrap.add (| BinOp.Wrap.add (| M.cast (Ty.path "usize") (Value.Bool false), @@ -3727,7 +3682,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "name" |); + mk_str (| "name" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3808,7 +3763,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "type_" |); + mk_str (| "type_" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3920,7 +3875,7 @@ Module normalized. |), [ M.read (| __deserializer |); - M.read (| Value.String "Field" |); + mk_str (| "Field" |); M.read (| M.get_constant "move_binary_format::normalized::_'3::deserialize::FIELDS" |); @@ -3992,7 +3947,7 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Constant" |); + mk_str (| "Constant" |); BinOp.Wrap.add (| BinOp.Wrap.add (| M.cast (Ty.path "usize") (Value.Bool false), @@ -4068,7 +4023,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "type_" |); + mk_str (| "type_" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -4154,7 +4109,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "data" |); + mk_str (| "data" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -4266,7 +4221,7 @@ Module normalized. |), [ M.read (| __deserializer |); - M.read (| Value.String "Constant" |); + mk_str (| "Constant" |); M.read (| M.get_constant "move_binary_format::normalized::_'5::deserialize::FIELDS" |); @@ -4338,7 +4293,7 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Struct" |); + mk_str (| "Struct" |); BinOp.Wrap.add (| BinOp.Wrap.add (| BinOp.Wrap.add (| @@ -4417,7 +4372,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "abilities" |); + mk_str (| "abilities" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -4506,7 +4461,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "type_parameters" |); + mk_str (| "type_parameters" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -4595,7 +4550,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "fields" |); + mk_str (| "fields" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -4707,7 +4662,7 @@ Module normalized. |), [ M.read (| __deserializer |); - M.read (| Value.String "Struct" |); + mk_str (| "Struct" |); M.read (| M.get_constant "move_binary_format::normalized::_'7::deserialize::FIELDS" |); @@ -4779,7 +4734,7 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Function" |); + mk_str (| "Function" |); BinOp.Wrap.add (| BinOp.Wrap.add (| BinOp.Wrap.add (| @@ -4867,7 +4822,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "visibility" |); + mk_str (| "visibility" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -4948,7 +4903,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "is_entry" |); + mk_str (| "is_entry" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5037,7 +4992,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "type_parameters" |); + mk_str (| "type_parameters" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5126,7 +5081,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "parameters" |); + mk_str (| "parameters" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5215,7 +5170,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "return_" |); + mk_str (| "return_" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5304,7 +5259,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "code" |); + mk_str (| "code" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5416,7 +5371,7 @@ Module normalized. |), [ M.read (| __deserializer |); - M.read (| Value.String "Function" |); + mk_str (| "Function" |); M.read (| M.get_constant "move_binary_format::normalized::_'9::deserialize::FIELDS" |); @@ -5488,7 +5443,7 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "FieldRef" |); + mk_str (| "FieldRef" |); BinOp.Wrap.add (| BinOp.Wrap.add (| M.cast (Ty.path "usize") (Value.Bool false), @@ -5564,7 +5519,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "struct_name" |); + mk_str (| "struct_name" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5645,7 +5600,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "field_index" |); + mk_str (| "field_index" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5757,7 +5712,7 @@ Module normalized. |), [ M.read (| __deserializer |); - M.read (| Value.String "FieldRef" |); + mk_str (| "FieldRef" |); M.read (| M.get_constant "move_binary_format::normalized::_'11::deserialize::FIELDS" |); @@ -5829,7 +5784,7 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "FunctionRef" |); + mk_str (| "FunctionRef" |); BinOp.Wrap.add (| BinOp.Wrap.add (| M.cast (Ty.path "usize") (Value.Bool false), @@ -5905,7 +5860,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "module_id" |); + mk_str (| "module_id" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5986,7 +5941,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "function_ident" |); + mk_str (| "function_ident" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -6098,7 +6053,7 @@ Module normalized. |), [ M.read (| __deserializer |); - M.read (| Value.String "FunctionRef" |); + mk_str (| "FunctionRef" |); M.read (| M.get_constant "move_binary_format::normalized::_'13::deserialize::FIELDS" |); @@ -6172,9 +6127,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 0; - M.read (| Value.String "Pop" |) + mk_str (| "Pop" |) ] |) |))); @@ -6205,9 +6160,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 1; - M.read (| Value.String "Ret" |) + mk_str (| "Ret" |) ] |) |))); @@ -6240,9 +6195,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 2; - M.read (| Value.String "BrTrue" |); + mk_str (| "BrTrue" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -6276,9 +6231,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 3; - M.read (| Value.String "BrFalse" |); + mk_str (| "BrFalse" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -6312,9 +6267,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 4; - M.read (| Value.String "Branch" |); + mk_str (| "Branch" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -6348,9 +6303,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 5; - M.read (| Value.String "LdU8" |); + mk_str (| "LdU8" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -6384,9 +6339,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 6; - M.read (| Value.String "LdU64" |); + mk_str (| "LdU64" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -6420,9 +6375,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 7; - M.read (| Value.String "LdU128" |); + mk_str (| "LdU128" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -6454,9 +6409,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 8; - M.read (| Value.String "CastU8" |) + mk_str (| "CastU8" |) ] |) |))); @@ -6487,9 +6442,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 9; - M.read (| Value.String "CastU64" |) + mk_str (| "CastU64" |) ] |) |))); @@ -6520,9 +6475,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 10; - M.read (| Value.String "CastU128" |) + mk_str (| "CastU128" |) ] |) |))); @@ -6555,9 +6510,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 11; - M.read (| Value.String "LdConst" |); + mk_str (| "LdConst" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -6589,9 +6544,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 12; - M.read (| Value.String "LdTrue" |) + mk_str (| "LdTrue" |) ] |) |))); @@ -6622,9 +6577,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 13; - M.read (| Value.String "LdFalse" |) + mk_str (| "LdFalse" |) ] |) |))); @@ -6657,9 +6612,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 14; - M.read (| Value.String "CopyLoc" |); + mk_str (| "CopyLoc" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -6693,9 +6648,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 15; - M.read (| Value.String "MoveLoc" |); + mk_str (| "MoveLoc" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -6729,9 +6684,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 16; - M.read (| Value.String "StLoc" |); + mk_str (| "StLoc" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -6765,9 +6720,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 17; - M.read (| Value.String "Call" |); + mk_str (| "Call" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -6813,9 +6768,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 18; - M.read (| Value.String "CallGeneric" |); + mk_str (| "CallGeneric" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -6849,9 +6804,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 19; - M.read (| Value.String "Pack" |); + mk_str (| "Pack" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -6897,9 +6852,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 20; - M.read (| Value.String "PackGeneric" |); + mk_str (| "PackGeneric" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -6933,9 +6888,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 21; - M.read (| Value.String "Unpack" |); + mk_str (| "Unpack" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -6981,9 +6936,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 22; - M.read (| Value.String "UnpackGeneric" |); + mk_str (| "UnpackGeneric" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -7015,9 +6970,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 23; - M.read (| Value.String "ReadRef" |) + mk_str (| "ReadRef" |) ] |) |))); @@ -7048,9 +7003,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 24; - M.read (| Value.String "WriteRef" |) + mk_str (| "WriteRef" |) ] |) |))); @@ -7081,9 +7036,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 25; - M.read (| Value.String "FreezeRef" |) + mk_str (| "FreezeRef" |) ] |) |))); @@ -7116,9 +7071,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 26; - M.read (| Value.String "MutBorrowLoc" |); + mk_str (| "MutBorrowLoc" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -7152,9 +7107,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 27; - M.read (| Value.String "ImmBorrowLoc" |); + mk_str (| "ImmBorrowLoc" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -7188,9 +7143,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 28; - M.read (| Value.String "MutBorrowField" |); + mk_str (| "MutBorrowField" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -7236,9 +7191,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 29; - M.read (| Value.String "MutBorrowFieldGeneric" |); + mk_str (| "MutBorrowFieldGeneric" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -7272,9 +7227,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 30; - M.read (| Value.String "ImmBorrowField" |); + mk_str (| "ImmBorrowField" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -7320,9 +7275,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 31; - M.read (| Value.String "ImmBorrowFieldGeneric" |); + mk_str (| "ImmBorrowFieldGeneric" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -7354,9 +7309,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 32; - M.read (| Value.String "Add" |) + mk_str (| "Add" |) ] |) |))); @@ -7387,9 +7342,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 33; - M.read (| Value.String "Sub" |) + mk_str (| "Sub" |) ] |) |))); @@ -7420,9 +7375,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 34; - M.read (| Value.String "Mul" |) + mk_str (| "Mul" |) ] |) |))); @@ -7453,9 +7408,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 35; - M.read (| Value.String "Mod" |) + mk_str (| "Mod" |) ] |) |))); @@ -7486,9 +7441,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 36; - M.read (| Value.String "Div" |) + mk_str (| "Div" |) ] |) |))); @@ -7519,9 +7474,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 37; - M.read (| Value.String "BitOr" |) + mk_str (| "BitOr" |) ] |) |))); @@ -7552,9 +7507,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 38; - M.read (| Value.String "BitAnd" |) + mk_str (| "BitAnd" |) ] |) |))); @@ -7585,9 +7540,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 39; - M.read (| Value.String "Xor" |) + mk_str (| "Xor" |) ] |) |))); @@ -7618,9 +7573,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 40; - M.read (| Value.String "Or" |) + mk_str (| "Or" |) ] |) |))); @@ -7651,9 +7606,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 41; - M.read (| Value.String "And" |) + mk_str (| "And" |) ] |) |))); @@ -7684,9 +7639,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 42; - M.read (| Value.String "Not" |) + mk_str (| "Not" |) ] |) |))); @@ -7717,9 +7672,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 43; - M.read (| Value.String "Eq" |) + mk_str (| "Eq" |) ] |) |))); @@ -7750,9 +7705,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 44; - M.read (| Value.String "Neq" |) + mk_str (| "Neq" |) ] |) |))); @@ -7783,9 +7738,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 45; - M.read (| Value.String "Lt" |) + mk_str (| "Lt" |) ] |) |))); @@ -7816,9 +7771,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 46; - M.read (| Value.String "Gt" |) + mk_str (| "Gt" |) ] |) |))); @@ -7849,9 +7804,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 47; - M.read (| Value.String "Le" |) + mk_str (| "Le" |) ] |) |))); @@ -7882,9 +7837,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 48; - M.read (| Value.String "Ge" |) + mk_str (| "Ge" |) ] |) |))); @@ -7915,9 +7870,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 49; - M.read (| Value.String "Abort" |) + mk_str (| "Abort" |) ] |) |))); @@ -7948,9 +7903,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 50; - M.read (| Value.String "Nop" |) + mk_str (| "Nop" |) ] |) |))); @@ -7981,9 +7936,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 51; - M.read (| Value.String "Shl" |) + mk_str (| "Shl" |) ] |) |))); @@ -8014,9 +7969,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 52; - M.read (| Value.String "Shr" |) + mk_str (| "Shr" |) ] |) |))); @@ -8082,9 +8037,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 53; - M.read (| Value.String "VecPack" |); + mk_str (| "VecPack" |); BinOp.Wrap.add (| BinOp.Wrap.add (| Value.Integer IntegerKind.Usize 0, @@ -8340,9 +8295,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 54; - M.read (| Value.String "VecLen" |); + mk_str (| "VecLen" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -8376,9 +8331,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 55; - M.read (| Value.String "VecImmBorrow" |); + mk_str (| "VecImmBorrow" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -8412,9 +8367,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 56; - M.read (| Value.String "VecMutBorrow" |); + mk_str (| "VecMutBorrow" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -8448,9 +8403,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 57; - M.read (| Value.String "VecPushBack" |); + mk_str (| "VecPushBack" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -8484,9 +8439,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 58; - M.read (| Value.String "VecPopBack" |); + mk_str (| "VecPopBack" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -8553,9 +8508,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 59; - M.read (| Value.String "VecUnpack" |); + mk_str (| "VecUnpack" |); BinOp.Wrap.add (| BinOp.Wrap.add (| Value.Integer IntegerKind.Usize 0, @@ -8811,9 +8766,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 60; - M.read (| Value.String "VecSwap" |); + mk_str (| "VecSwap" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -8847,9 +8802,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 61; - M.read (| Value.String "LdU16" |); + mk_str (| "LdU16" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -8883,9 +8838,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 62; - M.read (| Value.String "LdU32" |); + mk_str (| "LdU32" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -8919,9 +8874,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 63; - M.read (| Value.String "LdU256" |); + mk_str (| "LdU256" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -8953,9 +8908,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 64; - M.read (| Value.String "CastU16" |) + mk_str (| "CastU16" |) ] |) |))); @@ -8986,9 +8941,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 65; - M.read (| Value.String "CastU32" |) + mk_str (| "CastU32" |) ] |) |))); @@ -9019,9 +8974,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 66; - M.read (| Value.String "CastU256" |) + mk_str (| "CastU256" |) ] |) |))); @@ -9054,9 +9009,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 67; - M.read (| Value.String "MutBorrowGlobalDeprecated" |); + mk_str (| "MutBorrowGlobalDeprecated" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -9102,9 +9057,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 68; - M.read (| Value.String "MutBorrowGlobalGenericDeprecated" |); + mk_str (| "MutBorrowGlobalGenericDeprecated" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -9138,9 +9093,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 69; - M.read (| Value.String "ImmBorrowGlobalDeprecated" |); + mk_str (| "ImmBorrowGlobalDeprecated" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -9186,9 +9141,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 70; - M.read (| Value.String "ImmBorrowGlobalGenericDeprecated" |); + mk_str (| "ImmBorrowGlobalGenericDeprecated" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -9222,9 +9177,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 71; - M.read (| Value.String "ExistsDeprecated" |); + mk_str (| "ExistsDeprecated" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -9270,9 +9225,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 72; - M.read (| Value.String "ExistsGenericDeprecated" |); + mk_str (| "ExistsGenericDeprecated" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -9306,9 +9261,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 73; - M.read (| Value.String "MoveFromDeprecated" |); + mk_str (| "MoveFromDeprecated" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -9354,9 +9309,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 74; - M.read (| Value.String "MoveFromGenericDeprecated" |); + mk_str (| "MoveFromGenericDeprecated" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -9390,9 +9345,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 75; - M.read (| Value.String "MoveToDeprecated" |); + mk_str (| "MoveToDeprecated" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -9438,9 +9393,9 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); Value.Integer IntegerKind.U32 76; - M.read (| Value.String "MoveToGenericDeprecated" |); + mk_str (| "MoveToGenericDeprecated" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -9488,7 +9443,7 @@ Module normalized. |), [ M.read (| __deserializer |); - M.read (| Value.String "Bytecode" |); + mk_str (| "Bytecode" |); M.read (| M.get_constant "move_binary_format::normalized::_'15::deserialize::VARIANTS" |); @@ -9560,7 +9515,7 @@ Module normalized. |), [ M.read (| __serializer |); - M.read (| Value.String "Module" |); + mk_str (| "Module" |); BinOp.Wrap.add (| BinOp.Wrap.add (| BinOp.Wrap.add (| @@ -9654,7 +9609,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "file_format_version" |); + mk_str (| "file_format_version" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -9735,7 +9690,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "address" |); + mk_str (| "address" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -9816,7 +9771,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "name" |); + mk_str (| "name" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -9905,7 +9860,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "dependencies" |); + mk_str (| "dependencies" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -9994,7 +9949,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "friends" |); + mk_str (| "friends" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -10084,7 +10039,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "structs" |); + mk_str (| "structs" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -10174,7 +10129,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "functions" |); + mk_str (| "functions" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -10263,7 +10218,7 @@ Module normalized. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "constants" |); + mk_str (| "constants" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -10375,7 +10330,7 @@ Module normalized. |), [ M.read (| __deserializer |); - M.read (| Value.String "Module" |); + mk_str (| "Module" |); M.read (| M.get_constant "move_binary_format::normalized::_'17::deserialize::FIELDS" |); @@ -10517,8 +10472,8 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Field" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "name" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Field" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "name" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -10532,7 +10487,7 @@ Module normalized. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "type_" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "type_" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11080,8 +11035,8 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Constant" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "type_" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Constant" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "type_" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11095,7 +11050,7 @@ Module normalized. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "data" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "data" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11716,8 +11671,8 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Struct" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "abilities" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Struct" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "abilities" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11731,10 +11686,7 @@ Module normalized. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "type_parameters" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "type_parameters" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -11748,7 +11700,7 @@ Module normalized. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "fields" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "fields" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -12703,27 +12655,18 @@ Module normalized. M.alloc (| Value.Array [ - M.read (| Value.String "visibility" |); + mk_str (| "visibility" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "is_entry" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "is_entry" |) |) + M.deref (| mk_str (| "type_parameters" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "type_parameters" |) |) + M.deref (| mk_str (| "parameters" |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "parameters" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "return_" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "code" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "return_" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "code" |) |) |) ] |) |) @@ -12852,10 +12795,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Function" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Function" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| names |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| values |) |) |) ] @@ -14177,11 +14117,8 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "FieldRef" |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "struct_name" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FieldRef" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "struct_name" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -14195,10 +14132,7 @@ Module normalized. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "field_index" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "field_index" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -14722,11 +14656,8 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FunctionRef" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "module_id" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FunctionRef" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "module_id" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -14740,10 +14671,7 @@ Module normalized. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "function_ident" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "function_ident" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -17651,10 +17579,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Pop" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Pop" |) |) |) ] |) |))); @@ -17677,10 +17602,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Ret" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Ret" |) |) |) ] |) |))); @@ -17708,10 +17630,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BrTrue" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BrTrue" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -17743,10 +17662,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BrFalse" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BrFalse" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -17778,10 +17694,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Branch" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Branch" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -17813,10 +17726,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LdU8" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LdU8" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -17848,10 +17758,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LdU64" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LdU64" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -17883,10 +17790,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LdU128" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LdU128" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -17916,10 +17820,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CastU8" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CastU8" |) |) |) ] |) |))); @@ -17945,10 +17846,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CastU64" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CastU64" |) |) |) ] |) |))); @@ -17974,10 +17872,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CastU128" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CastU128" |) |) |) ] |) |))); @@ -18005,10 +17900,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LdConst" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LdConst" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -18038,10 +17930,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LdTrue" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LdTrue" |) |) |) ] |) |))); @@ -18067,10 +17956,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LdFalse" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LdFalse" |) |) |) ] |) |))); @@ -18098,10 +17984,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CopyLoc" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CopyLoc" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -18133,10 +18016,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MoveLoc" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MoveLoc" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -18168,10 +18048,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "StLoc" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "StLoc" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -18203,10 +18080,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Call" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Call" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -18238,10 +18112,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CallGeneric" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CallGeneric" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -18273,10 +18144,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Pack" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Pack" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -18308,10 +18176,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PackGeneric" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "PackGeneric" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -18343,10 +18208,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Unpack" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Unpack" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -18380,7 +18242,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UnpackGeneric" |) |) + M.deref (| mk_str (| "UnpackGeneric" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -18411,10 +18273,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ReadRef" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ReadRef" |) |) |) ] |) |))); @@ -18440,10 +18299,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "WriteRef" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "WriteRef" |) |) |) ] |) |))); @@ -18469,10 +18325,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FreezeRef" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FreezeRef" |) |) |) ] |) |))); @@ -18502,7 +18355,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MutBorrowLoc" |) |) + M.deref (| mk_str (| "MutBorrowLoc" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -18537,7 +18390,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ImmBorrowLoc" |) |) + M.deref (| mk_str (| "ImmBorrowLoc" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -18572,7 +18425,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MutBorrowField" |) |) + M.deref (| mk_str (| "MutBorrowField" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -18607,7 +18460,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MutBorrowFieldGeneric" |) |) + M.deref (| mk_str (| "MutBorrowFieldGeneric" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -18642,7 +18495,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ImmBorrowField" |) |) + M.deref (| mk_str (| "ImmBorrowField" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -18677,7 +18530,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ImmBorrowFieldGeneric" |) |) + M.deref (| mk_str (| "ImmBorrowFieldGeneric" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -18705,10 +18558,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Add" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Add" |) |) |) ] |) |))); @@ -18731,10 +18581,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Sub" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Sub" |) |) |) ] |) |))); @@ -18757,10 +18604,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Mul" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Mul" |) |) |) ] |) |))); @@ -18783,10 +18627,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Mod" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Mod" |) |) |) ] |) |))); @@ -18809,10 +18650,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Div" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Div" |) |) |) ] |) |))); @@ -18838,10 +18676,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BitOr" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BitOr" |) |) |) ] |) |))); @@ -18867,10 +18702,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BitAnd" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BitAnd" |) |) |) ] |) |))); @@ -18893,10 +18725,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Xor" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Xor" |) |) |) ] |) |))); @@ -18919,10 +18748,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Or" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Or" |) |) |) ] |) |))); @@ -18945,10 +18771,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "And" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "And" |) |) |) ] |) |))); @@ -18971,10 +18794,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Not" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Not" |) |) |) ] |) |))); @@ -18997,10 +18817,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Eq" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Eq" |) |) |) ] |) |))); @@ -19023,10 +18840,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Neq" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Neq" |) |) |) ] |) |))); @@ -19049,10 +18863,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Lt" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Lt" |) |) |) ] |) |))); @@ -19075,10 +18886,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Gt" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Gt" |) |) |) ] |) |))); @@ -19101,10 +18909,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Le" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Le" |) |) |) ] |) |))); @@ -19127,10 +18932,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Ge" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Ge" |) |) |) ] |) |))); @@ -19156,10 +18958,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Abort" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Abort" |) |) |) ] |) |))); @@ -19182,10 +18981,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Nop" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Nop" |) |) |) ] |) |))); @@ -19208,10 +19004,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Shl" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Shl" |) |) |) ] |) |))); @@ -19234,10 +19027,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Shr" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Shr" |) |) |) ] |) |))); @@ -19272,10 +19062,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VecPack" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "VecPack" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_0 |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -19308,10 +19095,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VecLen" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "VecLen" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -19345,7 +19129,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VecImmBorrow" |) |) + M.deref (| mk_str (| "VecImmBorrow" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -19380,7 +19164,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VecMutBorrow" |) |) + M.deref (| mk_str (| "VecMutBorrow" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -19413,10 +19197,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VecPushBack" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "VecPushBack" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -19448,10 +19229,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VecPopBack" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "VecPopBack" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -19490,10 +19268,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VecUnpack" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "VecUnpack" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_0 |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -19526,10 +19301,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VecSwap" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "VecSwap" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -19561,10 +19333,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LdU16" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LdU16" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -19596,10 +19365,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LdU32" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LdU32" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -19631,10 +19397,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LdU256" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LdU256" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -19664,10 +19427,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CastU16" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CastU16" |) |) |) ] |) |))); @@ -19693,10 +19453,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CastU32" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CastU32" |) |) |) ] |) |))); @@ -19722,10 +19479,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CastU256" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CastU256" |) |) |) ] |) |))); @@ -19755,7 +19509,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MutBorrowGlobalDeprecated" |) |) + M.deref (| mk_str (| "MutBorrowGlobalDeprecated" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -19790,9 +19544,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "MutBorrowGlobalGenericDeprecated" |) - |) + M.deref (| mk_str (| "MutBorrowGlobalGenericDeprecated" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -19827,7 +19579,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ImmBorrowGlobalDeprecated" |) |) + M.deref (| mk_str (| "ImmBorrowGlobalDeprecated" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -19862,9 +19614,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "ImmBorrowGlobalGenericDeprecated" |) - |) + M.deref (| mk_str (| "ImmBorrowGlobalGenericDeprecated" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -19899,7 +19649,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ExistsDeprecated" |) |) + M.deref (| mk_str (| "ExistsDeprecated" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -19934,7 +19684,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ExistsGenericDeprecated" |) |) + M.deref (| mk_str (| "ExistsGenericDeprecated" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -19969,7 +19719,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MoveFromDeprecated" |) |) + M.deref (| mk_str (| "MoveFromDeprecated" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -20004,7 +19754,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MoveFromGenericDeprecated" |) |) + M.deref (| mk_str (| "MoveFromGenericDeprecated" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -20039,7 +19789,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MoveToDeprecated" |) |) + M.deref (| mk_str (| "MoveToDeprecated" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -20074,7 +19824,7 @@ Module normalized. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MoveToGenericDeprecated" |) |) + M.deref (| mk_str (| "MoveToGenericDeprecated" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -27719,35 +27469,17 @@ Module normalized. M.alloc (| Value.Array [ - M.read (| Value.String "file_format_version" |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "address" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "name" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "dependencies" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "friends" |) |) - |); + mk_str (| "file_format_version" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "address" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "name" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "structs" |) |) + M.deref (| mk_str (| "dependencies" |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "functions" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "constants" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "friends" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "structs" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "functions" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "constants" |) |) |) ] |) |) @@ -27902,7 +27634,7 @@ Module normalized. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Module" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Module" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| names |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| values |) |) |) ] @@ -29407,9 +29139,8 @@ Module normalized. M.alloc (| Value.Array [ - M.read (| - Value.String - "A struct with N type parameters should be encoded as StructModuleInstantiation with type_arguments = [TypeParameter(1), ..., TypeParameter(N)]" + mk_str (| + "A struct with N type parameters should be encoded as StructModuleInstantiation with type_arguments = [TypeParameter(1), ..., TypeParameter(N)]" |) ] |) @@ -30946,9 +30677,8 @@ Module normalized. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Invariant violation: vector type argument contains reference" + mk_str (| + "Invariant violation: vector type argument contains reference" |) |) |) @@ -31221,9 +30951,8 @@ Module normalized. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Invariant violation: struct type argument contains reference" + mk_str (| + "Invariant violation: struct type argument contains reference" |) |) |) @@ -31257,11 +30986,7 @@ Module normalized. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "internal error: entered unreachable code" - |) + [ mk_str (| "internal error: entered unreachable code" |) ] |) |) @@ -32112,9 +31837,7 @@ Module normalized. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Type parameter index out of bound" |) - |) + M.deref (| mk_str (| "Type parameter index out of bound" |) |) |) ] |) @@ -37249,9 +36972,9 @@ Module normalized. M.alloc (| Value.Array [ - M.read (| Value.String "0x" |); - M.read (| Value.String "::" |); - M.read (| Value.String "::" |) + mk_str (| "0x" |); + mk_str (| "::" |); + mk_str (| "::" |) ] |) |) @@ -37568,8 +37291,7 @@ Module normalized. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "<" |) ] + Value.Array [ mk_str (| "<" |) ] |) |) |) @@ -37704,8 +37426,7 @@ Module normalized. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -38120,9 +37841,8 @@ Module normalized. M.alloc (| Value.Array [ - M.read (| - Value.String - ", " + mk_str (| + ", " |) ] |) @@ -38325,8 +38045,7 @@ Module normalized. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String ">" |) ] + Value.Array [ mk_str (| ">" |) ] |) |) |) @@ -38445,11 +38164,7 @@ Module normalized. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "vector<" |); - M.read (| Value.String ">" |) - ] + Value.Array [ mk_str (| "vector<" |); mk_str (| ">" |) ] |) |) |) @@ -38536,7 +38251,7 @@ Module normalized. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "u8" |) ] |) + M.alloc (| Value.Array [ mk_str (| "u8" |) ] |) |) |) |) @@ -38578,9 +38293,7 @@ Module normalized. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "u16" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "u16" |) ] |) |) |) |) @@ -38622,9 +38335,7 @@ Module normalized. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "u32" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "u32" |) ] |) |) |) |) @@ -38666,9 +38377,7 @@ Module normalized. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "u64" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "u64" |) ] |) |) |) |) @@ -38710,9 +38419,7 @@ Module normalized. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "u128" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "u128" |) ] |) |) |) |) @@ -38754,9 +38461,7 @@ Module normalized. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "u256" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "u256" |) ] |) |) |) |) @@ -38801,9 +38506,7 @@ Module normalized. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "address" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "address" |) ] |) |) |) |) @@ -38848,9 +38551,7 @@ Module normalized. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "signer" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "signer" |) ] |) |) |) |) @@ -38892,9 +38593,7 @@ Module normalized. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "bool" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "bool" |) ] |) |) |) |) @@ -38944,7 +38643,7 @@ Module normalized. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "&" |) ] |) + M.alloc (| Value.Array [ mk_str (| "&" |) ] |) |) |) |); @@ -39036,9 +38735,7 @@ Module normalized. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "&mut " |) ] - |) + M.alloc (| Value.Array [ mk_str (| "&mut " |) ] |) |) |) |); @@ -39130,7 +38827,7 @@ Module normalized. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "T" |) ] |) + M.alloc (| Value.Array [ mk_str (| "T" |) ] |) |) |) |); diff --git a/CoqOfRust/move_sui/translations/move_binary_format/serializer.v b/CoqOfRust/move_sui/translations/move_binary_format/serializer.v index 2203c6e32..f506f0e50 100644 --- a/CoqOfRust/move_sui/translations/move_binary_format/serializer.v +++ b/CoqOfRust/move_sui/translations/move_binary_format/serializer.v @@ -124,14 +124,11 @@ Module serializer. M.alloc (| Value.Array [ - M.read (| - Value.String "value (" - |); - M.read (| - Value.String - ") cannot exceed (" + mk_str (| "value (" |); + mk_str (| + ") cannot exceed (" |); - M.read (| Value.String ")" |) + mk_str (| ")" |) ] |) |) @@ -1493,20 +1490,14 @@ Module serializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "The requested bytecode version " + mk_str (| + "The requested bytecode version " |); - M.read (| - Value.String - " is not supported. Only " + mk_str (| + " is not supported. Only " |); - M.read (| - Value.String " to " - |); - M.read (| - Value.String " are." - |) + mk_str (| " to " |); + mk_str (| " are." |) ] |) |) @@ -2087,17 +2078,13 @@ Module serializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "table content size (" + mk_str (| + "table content size (" |); - M.read (| - Value.String - ") cannot exceed (" + mk_str (| + ") cannot exceed (" |); - M.read (| - Value.String ")" - |) + mk_str (| ")" |) ] |) |) @@ -2751,47 +2738,44 @@ Module serializer. M.alloc (| Value.Array [ - M.read (| Value.String "major_version" |); + mk_str (| "major_version" |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "table_count" |) |) + M.deref (| mk_str (| "table_count" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "module_handles" |) |) + M.deref (| mk_str (| "module_handles" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "struct_handles" |) |) + M.deref (| mk_str (| "struct_handles" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "function_handles" |) |) + M.deref (| mk_str (| "function_handles" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "function_instantiations" |) |) + M.deref (| mk_str (| "function_instantiations" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "signatures" |) |) + M.deref (| mk_str (| "signatures" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "identifiers" |) |) + M.deref (| mk_str (| "identifiers" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "address_identifiers" |) |) + M.deref (| mk_str (| "address_identifiers" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "constant_pool" |) |) + M.deref (| mk_str (| "constant_pool" |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "metadata" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "metadata" |) |) |) ] |) |) @@ -2985,10 +2969,7 @@ Module serializer. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CommonSerializer" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CommonSerializer" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| names |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| values |) |) |) ] @@ -3054,30 +3035,30 @@ Module serializer. M.alloc (| Value.Array [ - M.read (| Value.String "common" |); + mk_str (| "common" |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "struct_defs" |) |) + M.deref (| mk_str (| "struct_defs" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "struct_def_instantiations" |) |) + M.deref (| mk_str (| "struct_def_instantiations" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "function_defs" |) |) + M.deref (| mk_str (| "function_defs" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "field_handles" |) |) + M.deref (| mk_str (| "field_handles" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "field_instantiations" |) |) + M.deref (| mk_str (| "field_instantiations" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "friend_decls" |) |) + M.deref (| mk_str (| "friend_decls" |) |) |) ] |) @@ -3220,10 +3201,7 @@ Module serializer. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ModuleSerializer" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ModuleSerializer" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| names |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| values |) |) |) ] @@ -3345,13 +3323,11 @@ Module serializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "Compilation unit too big (" + mk_str (| + "Compilation unit too big (" |); - M.read (| - Value.String - ") cannot exceed " + mk_str (| + ") cannot exceed " |) ] |) @@ -13201,9 +13177,8 @@ Module serializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "max recursion depth reached" + mk_str (| + "max recursion depth reached" |) ] |) @@ -14468,9 +14443,8 @@ Module serializer. M.alloc (| Value.Array [ - M.read (| - Value.String - "Loading or casting u16, u32, u256 integers not supported in bytecode version " + mk_str (| + "Loading or casting u16, u32, u256 integers not supported in bytecode version " |) ] |) @@ -22997,11 +22971,7 @@ Module serializer. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "table start must be before end" - |) - ] + [ mk_str (| "table start must be before end" |) ] |) |) |) @@ -24754,11 +24724,7 @@ Module serializer. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.table_count == 0" - |) - ] + [ mk_str (| "assertion failed: self.table_count == 0" |) ] |) |) |))); @@ -25222,11 +25188,7 @@ Module serializer. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.table_count < 6" - |) - ] + [ mk_str (| "assertion failed: self.table_count < 6" |) ] |) |) |))); diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/absint.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/absint.v index eee39e61b..f4d518ad0 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/absint.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/absint.v @@ -95,10 +95,7 @@ Module absint. "move_bytecode_verifier::absint::JoinResult::Changed" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Changed" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Changed" |) |) |) |))); fun γ => ltac:(M.monadic @@ -109,10 +106,7 @@ Module absint. "move_bytecode_verifier::absint::JoinResult::Unchanged" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Unchanged" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Unchanged" |) |) |) |))) ] |) 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 9755f73ed..77d3a54b0 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 @@ -766,9 +766,8 @@ Module acquires_list_verifier. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/acquires_list_verifier.rs:59 (none)" + mk_str (| + "crates/move-bytecode-verifier/src/acquires_list_verifier.rs:59 (none)" |) ] |) @@ -878,9 +877,8 @@ Module acquires_list_verifier. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -1558,9 +1556,8 @@ Module acquires_list_verifier. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/acquires_list_verifier.rs:74 (none)" + mk_str (| + "crates/move-bytecode-verifier/src/acquires_list_verifier.rs:74 (none)" |) ] |) @@ -1668,9 +1665,8 @@ Module acquires_list_verifier. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) 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 a49d5dfd0..2ff183c73 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 @@ -2897,9 +2897,8 @@ Module control_flow_v5. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/control_flow_v5.rs:150 (none)" + mk_str (| + "crates/move-bytecode-verifier/src/control_flow_v5.rs:150 (none)" |) ] |) @@ -3012,9 +3011,8 @@ Module control_flow_v5. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -3720,9 +3718,8 @@ Module control_flow_v5. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/control_flow_v5.rs:173 (none)" + mk_str (| + "crates/move-bytecode-verifier/src/control_flow_v5.rs:173 (none)" |) ] |) @@ -3844,9 +3841,8 @@ Module control_flow_v5. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/dependencies.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/dependencies.v index f381181aa..3cade246a 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/dependencies.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/dependencies.v @@ -4994,9 +4994,8 @@ Module dependencies. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/dependencies.rs:195 (none)" + mk_str (| + "crates/move-bytecode-verifier/src/dependencies.rs:195 (none)" |) ] |) @@ -5108,11 +5107,7 @@ Module dependencies. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String - "" - |) + [ mk_str (| "" |) ] |) |) @@ -6307,9 +6302,8 @@ Module dependencies. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/dependencies.rs:238 (none)" + mk_str (| + "crates/move-bytecode-verifier/src/dependencies.rs:238 (none)" |) ] |) @@ -6421,11 +6415,7 @@ Module dependencies. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String - "" - |) + [ mk_str (| "" |) ] |) |) @@ -10706,9 +10696,8 @@ Module dependencies. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: context.module.version() < VERSION_5" + mk_str (| + "assertion failed: context.module.version() < VERSION_5" |) ] |) @@ -11636,9 +11625,8 @@ Module dependencies. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "script-visible functions can only be called from scripts or other script-visible functions" + mk_str (| + "script-visible functions can only be called from scripts or other script-visible functions" |) |) |) 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 8dc1bf21f..0a7dd85be 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/instantiation_loops.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/instantiation_loops.v @@ -1430,10 +1430,7 @@ Module instantiation_loops. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String ", " |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| ", " |) |) |) ] |) |) in @@ -1682,10 +1679,7 @@ Module instantiation_loops. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String ", " |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| ", " |) |) |) ] |) |) in @@ -1726,11 +1720,9 @@ Module instantiation_loops. M.alloc (| Value.Array [ - M.read (| - Value.String "edges with constructors: [" - |); - M.read (| Value.String "], nodes: [" |); - M.read (| Value.String "]" |) + mk_str (| "edges with constructors: [" |); + mk_str (| "], nodes: [" |); + mk_str (| "]" |) ] |) |) @@ -5635,11 +5627,7 @@ Module instantiation_loops. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "f" |); - M.read (| Value.String "#" |) - ] + Value.Array [ mk_str (| "f" |); mk_str (| "#" |) ] |) |) |) @@ -5974,9 +5962,9 @@ Module instantiation_loops. M.alloc (| Value.Array [ - M.read (| Value.String "" |); - M.read (| Value.String " --" |); - M.read (| Value.String "--> " |) + mk_str (| "" |); + mk_str (| " --" |); + mk_str (| "--> " |) ] |) |) @@ -6121,9 +6109,7 @@ Module instantiation_loops. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " ----> " |) + [ mk_str (| "" |); mk_str (| " ----> " |) ] |) |) 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 eb71e3646..7a0e31cf7 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/instruction_consistency.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/instruction_consistency.v @@ -4533,9 +4533,8 @@ Module instruction_consistency. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "VecPack/VecUnpack argument out of range" + mk_str (| + "VecPack/VecUnpack argument out of range" |) |) |) diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/limits.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/limits.v index a5013522c..259843fbc 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/limits.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/limits.v @@ -4427,9 +4427,8 @@ Module limits. M.alloc (| Value.Array [ - M.read (| - Value.String - "vector size limit is " + mk_str (| + "vector size limit is " |) ] |) 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 bb3a74393..a99a3c466 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 @@ -110,7 +110,7 @@ Module locals_safety. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Unavailable" |) |) + M.deref (| mk_str (| "Unavailable" |) |) |) |))); fun γ => @@ -124,7 +124,7 @@ Module locals_safety. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MaybeAvailable" |) |) + M.deref (| mk_str (| "MaybeAvailable" |) |) |) |))); fun γ => @@ -136,10 +136,7 @@ Module locals_safety. "move_bytecode_verifier::locals_safety::abstract_state::LocalState::Available" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Available" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Available" |) |) |) |))) ] |) @@ -481,14 +478,8 @@ Module locals_safety. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AbstractState" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "current_function" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "AbstractState" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "current_function" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -502,10 +493,7 @@ Module locals_safety. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "all_local_abilities" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "all_local_abilities" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -519,10 +507,7 @@ Module locals_safety. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "local_states" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "local_states" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2060,9 +2045,8 @@ Module locals_safety. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.local_states[idx as usize] == Available" + mk_str (| + "assertion failed: self.local_states[idx as usize] == Available" |) ] |) @@ -2302,9 +2286,8 @@ Module locals_safety. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.current_function == other.current_function" + mk_str (| + "assertion failed: self.current_function == other.current_function" |) ] |) @@ -2386,9 +2369,8 @@ Module locals_safety. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.all_local_abilities.len() == other.all_local_abilities.len()" + mk_str (| + "assertion failed: self.all_local_abilities.len() == other.all_local_abilities.len()" |) ] |) @@ -2472,9 +2454,8 @@ Module locals_safety. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.local_states.len() == other.local_states.len()" + mk_str (| + "assertion failed: self.local_states.len() == other.local_states.len()" |) ] |) @@ -3597,9 +3578,8 @@ Module locals_safety. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.local_states.len() == joined.local_states.len()" + mk_str (| + "assertion failed: self.local_states.len() == joined.local_states.len()" |) ] |) 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 50fe9da0a..3e1d16887 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 @@ -1287,9 +1287,8 @@ Module locals_safety. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: local_states.len() == all_local_abilities.len()" + mk_str (| + "assertion failed: local_states.len() == all_local_abilities.len()" |) ] |) 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 822658c9d..8110ee15a 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/loop_summary.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/loop_summary.v @@ -73,7 +73,7 @@ Module loop_summary. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "NodeId" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "NodeId" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| 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 59351de80..7750034d8 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 @@ -125,10 +125,7 @@ Module reference_safety. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Reference" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Reference" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -160,7 +157,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NonReference" |) |) + M.deref (| mk_str (| "NonReference" |) |) |) ] |) @@ -678,10 +675,7 @@ Module reference_safety. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Local" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Local" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -713,10 +707,7 @@ Module reference_safety. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Global" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Global" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -748,10 +739,7 @@ Module reference_safety. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Field" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Field" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -1565,9 +1553,7 @@ Module reference_safety. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "local#" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "local#" |) ] |) |) |) |); @@ -1645,9 +1631,7 @@ Module reference_safety. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "resource@" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "resource@" |) ] |) |) |) |); @@ -1733,9 +1717,7 @@ Module reference_safety. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "field#" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "field#" |) ] |) |) |) |); @@ -2100,14 +2082,8 @@ Module reference_safety. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AbstractState" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "current_function" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "AbstractState" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "current_function" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2121,7 +2097,7 @@ Module reference_safety. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "locals" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "locals" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2135,10 +2111,7 @@ Module reference_safety. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "borrow_graph" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "borrow_graph" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2152,7 +2125,7 @@ Module reference_safety. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "next_id" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "next_id" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3070,7 +3043,7 @@ Module reference_safety. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: state.is_canonical()" |) ] + [ mk_str (| "assertion failed: state.is_canonical()" |) ] |) |) |))); @@ -5010,11 +4983,7 @@ Module reference_safety. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.borrow_graph.is_mutable(id)" - |) - ] + [ mk_str (| "assertion failed: self.borrow_graph.is_mutable(id)" |) ] |) |) |))); @@ -5110,11 +5079,7 @@ Module reference_safety. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.borrow_graph.is_mutable(id)" - |) - ] + [ mk_str (| "assertion failed: self.borrow_graph.is_mutable(id)" |) ] |) |) |))); @@ -5765,9 +5730,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs:305 (none)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs:305 (none)" |) ] |) @@ -5858,9 +5822,7 @@ Module reference_safety. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -6330,9 +6292,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs:325 (none)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs:325 (none)" |) ] |) @@ -6443,11 +6404,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String - "" - |) + [ mk_str (| "" |) ] |) |) @@ -6878,9 +6835,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs:344 (none)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs:344 (none)" |) ] |) @@ -6991,11 +6947,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String - "" - |) + [ mk_str (| "" |) ] |) |) @@ -7586,11 +7538,7 @@ Module reference_safety. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: v1.is_value()" - |) - ] + [ mk_str (| "assertion failed: v1.is_value()" |) ] |) |) |))); @@ -7631,11 +7579,7 @@ Module reference_safety. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: v2.is_value()" - |) - ] + [ mk_str (| "assertion failed: v2.is_value()" |) ] |) |) |))); @@ -8730,9 +8674,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs:486 (none)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs:486 (none)" |) ] |) @@ -8822,8 +8765,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -9114,9 +9056,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs:500 (none)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs:500 (none)" |) ] |) @@ -9206,8 +9147,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -12867,11 +12807,7 @@ Module reference_safety. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.locals.len() == locals.len()" - |) - ] + [ mk_str (| "assertion failed: self.locals.len() == locals.len()" |) ] |) |) |))); @@ -13027,11 +12963,7 @@ Module reference_safety. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: canonical_state.is_canonical()" - |) - ] + [ mk_str (| "assertion failed: canonical_state.is_canonical()" |) ] |) |) |))); @@ -13672,9 +13604,8 @@ Module reference_safety. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.current_function == other.current_function" + mk_str (| + "assertion failed: self.current_function == other.current_function" |) ] |) @@ -13739,9 +13670,8 @@ Module reference_safety. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.is_canonical() && other.is_canonical()" + mk_str (| + "assertion failed: self.is_canonical() && other.is_canonical()" |) ] |) @@ -13786,11 +13716,7 @@ Module reference_safety. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: self.next_id == other.next_id" - |) - ] + [ mk_str (| "assertion failed: self.next_id == other.next_id" |) ] |) |) |))); @@ -13872,9 +13798,8 @@ Module reference_safety. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.locals.len() == other.locals.len()" + mk_str (| + "assertion failed: self.locals.len() == other.locals.len()" |) ] |) @@ -14525,9 +14450,8 @@ Module reference_safety. [] |), [ - M.read (| - Value.String - "assertion failed: v1 == v2" + mk_str (| + "assertion failed: v1 == v2" |) ] |) @@ -14724,11 +14648,7 @@ Module reference_safety. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: joined.is_canonical()" - |) - ] + [ mk_str (| "assertion failed: joined.is_canonical()" |) ] |) |) |))); @@ -14810,9 +14730,8 @@ Module reference_safety. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: self.locals.len() == joined.locals.len()" + mk_str (| + "assertion failed: self.locals.len() == joined.locals.len()" |) ] |) 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 8eb112f0f..3233e66ca 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 @@ -229,9 +229,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:58 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:58 " |) ] |) @@ -372,9 +371,7 @@ Module reference_safety. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -575,9 +572,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:63 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:63 " |) ] |) @@ -718,9 +714,7 @@ Module reference_safety. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -2510,9 +2504,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:127 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:127 " |) ] |) @@ -2680,9 +2673,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -2841,9 +2833,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:127 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:127 (assert)" |) ] |) @@ -2940,11 +2931,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -3315,9 +3302,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:138 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:138 " |) ] |) @@ -3477,11 +3463,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -3614,9 +3596,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:138 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:138 (assert)" |) ] |) @@ -3693,9 +3674,7 @@ Module reference_safety. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -4902,9 +4881,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:172 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:172 " |) ] |) @@ -5058,9 +5036,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) - ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -5862,9 +5838,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:183 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:183 " |) ] |) @@ -6024,11 +5999,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -6320,9 +6291,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:187 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:187 " |) ] |) @@ -6482,11 +6452,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -6637,9 +6603,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:187 (none)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:187 (none)" |) ] |) @@ -6729,8 +6694,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -7217,9 +7181,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:192 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:192 " |) ] |) @@ -7379,11 +7342,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -7582,9 +7541,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:193 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:193 " |) ] |) @@ -7744,11 +7702,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -8239,9 +8193,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:198 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:198 " |) ] |) @@ -8401,11 +8354,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -8556,9 +8505,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:198 (none)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:198 (none)" |) ] |) @@ -8648,8 +8596,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -9131,9 +9078,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:203 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:203 " |) ] |) @@ -9293,11 +9239,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -9448,9 +9390,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:203 (none)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:203 (none)" |) ] |) @@ -9540,8 +9481,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -9733,9 +9673,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:204 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:204 " |) ] |) @@ -9887,8 +9826,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -10048,9 +9986,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:205 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:205 (assert)" |) ] |) @@ -10140,8 +10077,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -11030,9 +10966,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:218 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:218 " |) ] |) @@ -11192,11 +11127,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -11347,9 +11278,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:218 (none)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:218 (none)" |) ] |) @@ -11439,8 +11369,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -11960,9 +11889,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:224 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:224 " |) ] |) @@ -12122,11 +12050,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -12277,9 +12201,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:224 (none)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:224 (none)" |) ] |) @@ -12369,8 +12292,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -12862,9 +12784,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:229 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:229 " |) ] |) @@ -13024,11 +12945,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -13179,9 +13096,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:229 (none)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:229 (none)" |) ] |) @@ -13271,8 +13187,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -13792,9 +13707,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:235 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:235 " |) ] |) @@ -13954,11 +13868,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -14109,9 +14019,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:235 (none)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:235 (none)" |) ] |) @@ -14201,8 +14110,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -14704,9 +14612,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:241 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:241 " |) ] |) @@ -14872,9 +14779,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -15016,9 +14922,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:241 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:241 (assert)" |) ] |) @@ -15108,8 +15013,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -15604,9 +15508,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:246 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:246 " |) ] |) @@ -15772,9 +15675,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -15916,9 +15818,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:246 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:246 (assert)" |) ] |) @@ -16008,8 +15909,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -16546,9 +16446,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:252 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:252 " |) ] |) @@ -16714,9 +16613,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -16858,9 +16756,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:252 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:252 (assert)" |) ] |) @@ -16950,8 +16847,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -17446,9 +17342,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:257 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:257 " |) ] |) @@ -17614,9 +17509,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -17758,9 +17652,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:257 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:257 (assert)" |) ] |) @@ -17850,8 +17743,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -18388,9 +18280,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:263 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:263 " |) ] |) @@ -18556,9 +18447,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -18700,9 +18590,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:263 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:263 (assert)" |) ] |) @@ -18792,8 +18681,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -19287,9 +19175,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:268 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:268 " |) ] |) @@ -19455,9 +19342,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -19599,9 +19485,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:268 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:268 (assert)" |) ] |) @@ -19691,8 +19576,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -20795,9 +20679,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:287 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:287 " |) ] |) @@ -20963,9 +20846,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -21544,9 +21426,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:307 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:307 " |) ] |) @@ -21712,9 +21593,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -21872,9 +21752,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:307 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:307 (assert)" |) ] |) @@ -21966,11 +21845,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -22233,9 +22108,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:311 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:311 " |) ] |) @@ -22401,9 +22275,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -22561,9 +22434,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:311 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:311 (assert)" |) ] |) @@ -22655,11 +22527,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -22873,9 +22741,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:313 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:313 " |) ] |) @@ -23038,11 +22905,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String - "" - |) + [ mk_str (| "" |) ] |) |) @@ -24781,9 +24644,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:346 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:346 " |) ] |) @@ -24949,9 +24811,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -25109,9 +24970,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:346 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:346 (assert)" |) ] |) @@ -25203,11 +25063,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -25435,9 +25291,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:347 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:347 " |) ] |) @@ -25603,9 +25458,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -25763,9 +25617,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:347 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:347 (assert)" |) ] |) @@ -25857,11 +25710,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -27012,9 +26861,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:374 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:374 " |) ] |) @@ -27174,11 +27022,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -27350,9 +27194,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:375 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:375 (assert)" |) ] |) @@ -27444,11 +27287,7 @@ Module reference_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -27957,9 +27796,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:383 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:383 " |) ] |) @@ -28111,8 +27949,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -28625,9 +28462,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:389 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:389 " |) ] |) @@ -28793,9 +28629,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -28937,9 +28772,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:389 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:389 (assert)" |) ] |) @@ -29029,8 +28863,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -29222,9 +29055,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:390 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:390 " |) ] |) @@ -29376,8 +29208,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -29871,9 +29702,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:395 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:395 " |) ] |) @@ -30039,9 +29869,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -30183,9 +30012,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:395 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:395 (assert)" |) ] |) @@ -30275,8 +30103,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -30468,9 +30295,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:396 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:396 " |) ] |) @@ -30622,8 +30448,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -31117,9 +30942,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:402 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:402 " |) ] |) @@ -31285,9 +31109,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -31429,9 +31252,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:402 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:402 (assert)" |) ] |) @@ -31521,8 +31343,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -31714,9 +31535,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:403 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:403 " |) ] |) @@ -31868,8 +31688,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -32199,9 +32018,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:408 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:408 " |) ] |) @@ -32353,8 +32171,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -32995,9 +32812,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:416 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:416 " |) ] |) @@ -33163,9 +32979,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -33307,9 +33122,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:416 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:416 (assert)" |) ] |) @@ -33399,8 +33213,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -33907,9 +33720,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:423 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:423 " |) ] |) @@ -34075,9 +33887,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -34219,9 +34030,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:423 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:423 (assert)" |) ] |) @@ -34311,8 +34121,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -34537,9 +34346,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:424 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:424 " |) ] |) @@ -34705,9 +34513,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -34849,9 +34656,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:424 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:424 (assert)" |) ] |) @@ -34941,8 +34747,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -35134,9 +34939,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:425 " + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:425 " |) ] |) @@ -35288,8 +35092,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -35776,9 +35579,8 @@ Module reference_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/reference_safety/mod.rs:446 (assert)" + mk_str (| + "crates/move-bytecode-verifier/src/reference_safety/mod.rs:446 (assert)" |) ] |) @@ -35868,8 +35670,7 @@ Module reference_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) 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 c369cb846..1e1ba5f7c 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/script_signature.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/script_signature.v @@ -1148,9 +1148,8 @@ Module script_signature. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "function not found in verify_module_script_function" + mk_str (| + "function not found in verify_module_script_function" |) |) |) diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/signature.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/signature.v index 303b4a6f7..c2c1a8bf0 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/signature.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/signature.v @@ -6885,9 +6885,8 @@ Module signature. M.alloc (| Value.Array [ - M.read (| - Value.String - "expected 1 type token for vector operations, got " + mk_str (| + "expected 1 type token for vector operations, got " |) ] |) @@ -7806,13 +7805,11 @@ Module signature. M.alloc (| Value.Array [ - M.read (| - Value.String - "at offset " + mk_str (| + "at offset " |); - M.read (| - Value.String - " " + mk_str (| + " " |) ] |) @@ -8771,9 +8768,8 @@ Module signature. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "phantom type parameter cannot be used in non-phantom position" + mk_str (| + "phantom type parameter cannot be used in non-phantom position" |) |) |) @@ -9924,9 +9920,7 @@ Module signature. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "reference not allowed" |) - |) + M.deref (| mk_str (| "reference not allowed" |) |) |) ] |) @@ -11594,12 +11588,9 @@ Module signature. M.alloc (| Value.Array [ - M.read (| - Value.String "expected " - |); - M.read (| - Value.String - " type argument(s), got " + mk_str (| "expected " |); + mk_str (| + " type argument(s), got " |) ] |) @@ -12171,17 +12162,14 @@ Module signature. M.alloc (| Value.Array [ - M.read (| - Value.String - "expected type with abilities " + mk_str (| + "expected type with abilities " |); - M.read (| - Value.String - " got type actual " + mk_str (| + " got type actual " |); - M.read (| - Value.String - " with incompatible abilities " + mk_str (| + " with incompatible abilities " |) ] |) 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 344d4b5f9..8f88e7411 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/struct_defs.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/struct_defs.v @@ -2618,9 +2618,8 @@ Module struct_defs. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Reference field when checking recursive structs" + mk_str (| + "Reference field when checking recursive structs" |) |) |) 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 91071c5c1..619584efc 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/type_safety.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/type_safety.v @@ -845,9 +845,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:95 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:95 " |) ] |) @@ -988,9 +987,7 @@ Module type_safety. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -1312,9 +1309,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:106 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:106 " |) ] |) @@ -1455,9 +1451,7 @@ Module type_safety. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -2712,9 +2706,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:170 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:170 " |) ] |) @@ -2855,9 +2848,7 @@ Module type_safety. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -4010,9 +4001,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:243 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:243 " |) ] |) @@ -4153,9 +4143,7 @@ Module type_safety. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -5171,9 +5159,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:275 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:275 " |) ] |) @@ -5336,11 +5323,7 @@ Module type_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String - "" - |) + [ mk_str (| "" |) ] |) |) @@ -6785,9 +6768,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:320 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:320 " |) ] |) @@ -6950,11 +6932,7 @@ Module type_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String - "" - |) + [ mk_str (| "" |) ] |) |) @@ -7409,9 +7387,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:341 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:341 " |) ] |) @@ -7552,9 +7529,7 @@ Module type_safety. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -8431,9 +8406,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:368 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:368 " |) ] |) @@ -8574,9 +8548,7 @@ Module type_safety. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -9226,9 +9198,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:394 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:394 " |) ] |) @@ -9369,9 +9340,7 @@ Module type_safety. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -10022,9 +9991,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:415 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:415 " |) ] |) @@ -10165,9 +10133,7 @@ Module type_safety. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -10343,9 +10309,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:416 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:416 " |) ] |) @@ -10486,9 +10451,7 @@ Module type_safety. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -10876,9 +10839,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:436 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:436 " |) ] |) @@ -11019,9 +10981,7 @@ Module type_safety. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -11196,9 +11156,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:437 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:437 " |) ] |) @@ -11339,9 +11298,7 @@ Module type_safety. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -12403,9 +12360,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:467 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:467 " |) ] |) @@ -12556,8 +12512,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -13041,9 +12996,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:477 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:477 " |) ] |) @@ -13203,11 +13157,7 @@ Module type_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -13482,9 +13432,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:484 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:484 " |) ] |) @@ -13635,8 +13584,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -13938,9 +13886,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:491 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:491 " |) ] |) @@ -14091,8 +14038,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -14636,9 +14582,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:500 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:500 " |) ] |) @@ -14804,9 +14749,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -15134,9 +15078,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:510 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:510 " |) ] |) @@ -15287,8 +15230,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -20875,9 +20817,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:658 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:658 " |) ] |) @@ -21028,8 +20969,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -21669,9 +21609,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:673 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:673 " |) ] |) @@ -21822,8 +21761,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -22008,9 +21946,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:674 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:674 " |) ] |) @@ -22161,8 +22098,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -22690,9 +22626,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:693 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:693 " |) ] |) @@ -22843,8 +22778,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -23233,9 +23167,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:700 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:700 " |) ] |) @@ -23386,8 +23319,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -23776,9 +23708,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:707 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:707 " |) ] |) @@ -23929,8 +23860,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -24408,9 +24338,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:722 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:722 " |) ] |) @@ -24570,11 +24499,7 @@ Module type_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -24772,9 +24697,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:723 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:723 " |) ] |) @@ -24934,11 +24858,7 @@ Module type_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -25389,9 +25309,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:732 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:732 " |) ] |) @@ -25551,11 +25470,7 @@ Module type_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -25753,9 +25668,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:733 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:733 " |) ] |) @@ -25915,11 +25829,7 @@ Module type_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -26377,9 +26287,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:742 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:742 " |) ] |) @@ -26539,11 +26448,7 @@ Module type_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -26741,9 +26646,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:743 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:743 " |) ] |) @@ -26903,11 +26807,7 @@ Module type_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -27348,9 +27248,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:752 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:752 " |) ] |) @@ -27501,8 +27400,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -27939,9 +27837,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:761 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:761 " |) ] |) @@ -28101,11 +27998,7 @@ Module type_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -28303,9 +28196,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:762 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:762 " |) ] |) @@ -28465,11 +28357,7 @@ Module type_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -29092,9 +28980,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:771 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:771 " |) ] |) @@ -29254,11 +29141,7 @@ Module type_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -29456,9 +29339,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:772 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:772 " |) ] |) @@ -29618,11 +29500,7 @@ Module type_safety. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -33642,9 +33520,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:857 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:857 " |) ] |) @@ -33795,8 +33672,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -34736,9 +34612,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:877 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:877 " |) ] |) @@ -34889,8 +34764,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -35075,9 +34949,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:878 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:878 " |) ] |) @@ -35228,8 +35101,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -35694,9 +35566,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:890 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:890 " |) ] |) @@ -35847,8 +35718,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -36365,9 +36235,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:901 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:901 " |) ] |) @@ -36518,8 +36387,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -37063,9 +36931,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:910 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:910 " |) ] |) @@ -37216,8 +37083,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -37402,9 +37268,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:911 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:911 " |) ] |) @@ -37555,8 +37420,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -37741,9 +37605,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:912 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:912 " |) ] |) @@ -37894,8 +37757,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -38379,9 +38241,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:923 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:923 " |) ] |) @@ -38532,8 +38393,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -38922,9 +38782,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:930 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:930 " |) ] |) @@ -39075,8 +38934,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -39465,9 +39323,8 @@ Module type_safety. M.alloc (| Value.Array [ - M.read (| - Value.String - "crates/move-bytecode-verifier/src/type_safety.rs:937 " + mk_str (| + "crates/move-bytecode-verifier/src/type_safety.rs:937 " |) ] |) @@ -39618,8 +39475,7 @@ Module type_safety. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -40847,9 +40703,8 @@ Module type_safety. [] |), [ - M.read (| - Value.String - "assertion failed: (*idx as usize) < subst.len()" + mk_str (| + "assertion failed: (*idx as usize) < subst.len()" |) ] |) diff --git a/CoqOfRust/move_sui/translations/move_bytecode_verifier/verifier.v b/CoqOfRust/move_sui/translations/move_bytecode_verifier/verifier.v index c1bb733df..8791b2f07 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier/verifier.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier/verifier.v @@ -219,11 +219,11 @@ Module verifier. M.alloc (| Value.Array [ - M.read (| Value.String "--> " |); - M.read (| Value.String ": verification time: " |); - M.read (| Value.String "ms, result: " |); - M.read (| Value.String ", size: " |); - M.read (| Value.String "kb + mk_str (| "--> " |); + mk_str (| ": verification time: " |); + mk_str (| "ms, result: " |); + mk_str (| ", size: " |); + mk_str (| "kb " |) ] |) @@ -385,9 +385,8 @@ Module verifier. M.alloc (| Value.Array [ - M.read (| - Value.String - "" + mk_str (| + "" |) ] |) @@ -481,9 +480,7 @@ Module verifier. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Ok" |) - |) + M.deref (| mk_str (| "Ok" |) |) |) ] |) @@ -698,11 +695,9 @@ Module verifier. M.alloc (| Value.Array [ - M.read (| - Value.String "test module exceeds size limit " - |); - M.read (| Value.String " (given size " |); - M.read (| Value.String ")" |) + mk_str (| "test module exceeds size limit " |); + mk_str (| " (given size " |); + mk_str (| ")" |) ] |) |) 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 942f704dc..b4f4f6b01 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier_meter/bound.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier_meter/bound.v @@ -416,25 +416,20 @@ Module bound. M.alloc (| Value.Array [ - M.read (| - Value.String - "program too complex (in `" + mk_str (| + "program too complex (in `" |); - M.read (| - Value.String - "` with `" + mk_str (| + "` with `" |); - M.read (| - Value.String - " current + " + mk_str (| + " current + " |); - M.read (| - Value.String - " new > " + mk_str (| + " new > " |); - M.read (| - Value.String - " max`)" + mk_str (| + " max`)" |) ] |) @@ -663,12 +658,7 @@ Module bound. [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) ] |)); ("units", Value.Integer IntegerKind.U128 0); ("max", @@ -696,12 +686,7 @@ Module bound. [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) ] |)); ("units", Value.Integer IntegerKind.U128 0); ("max", @@ -729,12 +714,7 @@ Module bound. [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "" |) |) |) ] |)); ("units", Value.Integer IntegerKind.U128 0); ("max", @@ -880,11 +860,7 @@ Module bound. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "transaction scope unsupported." - |) - ] + [ mk_str (| "transaction scope unsupported." |) ] |) |) |) @@ -1033,11 +1009,7 @@ Module bound. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "transaction scope unsupported." - |) - ] + [ mk_str (| "transaction scope unsupported." |) ] |) |) |) 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 243e87364..e7130fa4f 100644 --- a/CoqOfRust/move_sui/translations/move_bytecode_verifier_meter/lib.v +++ b/CoqOfRust/move_sui/translations/move_bytecode_verifier_meter/lib.v @@ -100,10 +100,7 @@ Module Impl_core_fmt_Debug_for_move_bytecode_verifier_meter_Scope. "move_bytecode_verifier_meter::Scope::Transaction" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Transaction" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Transaction" |) |) |) |))); fun γ => ltac:(M.monadic @@ -111,10 +108,7 @@ Module Impl_core_fmt_Debug_for_move_bytecode_verifier_meter_Scope. let _ := M.is_struct_tuple (| γ, "move_bytecode_verifier_meter::Scope::Package" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Package" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Package" |) |) |) |))); fun γ => ltac:(M.monadic @@ -122,10 +116,7 @@ Module Impl_core_fmt_Debug_for_move_bytecode_verifier_meter_Scope. let _ := M.is_struct_tuple (| γ, "move_bytecode_verifier_meter::Scope::Module" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Module" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Module" |) |) |) |))); fun γ => ltac:(M.monadic @@ -136,10 +127,7 @@ Module Impl_core_fmt_Debug_for_move_bytecode_verifier_meter_Scope. "move_bytecode_verifier_meter::Scope::Function" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Function" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Function" |) |) |) |))) ] |) diff --git a/CoqOfRust/move_sui/translations/move_core_types/abi.v b/CoqOfRust/move_sui/translations/move_core_types/abi.v index 2d396e97d..3743493b9 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/abi.v +++ b/CoqOfRust/move_sui/translations/move_core_types/abi.v @@ -158,7 +158,7 @@ Module abi. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TransactionScript" |) |) + M.deref (| mk_str (| "TransactionScript" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -193,7 +193,7 @@ Module abi. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ScriptFunction" |) |) + M.deref (| mk_str (| "ScriptFunction" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -607,9 +607,9 @@ Module abi. |), [ M.read (| __serializer |); - M.read (| Value.String "ScriptABI" |); + mk_str (| "ScriptABI" |); Value.Integer IntegerKind.U32 0; - M.read (| Value.String "TransactionScript" |); + mk_str (| "TransactionScript" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -643,9 +643,9 @@ Module abi. |), [ M.read (| __serializer |); - M.read (| Value.String "ScriptABI" |); + mk_str (| "ScriptABI" |); Value.Integer IntegerKind.U32 1; - M.read (| Value.String "ScriptFunction" |); + mk_str (| "ScriptFunction" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -692,7 +692,7 @@ Module abi. |), [ M.read (| __deserializer |); - M.read (| Value.String "ScriptABI" |); + mk_str (| "ScriptABI" |); M.read (| M.get_constant "move_core_types::abi::_'1::deserialize::VARIANTS" |); Value.StructRecord "move_core_types::abi::_'1::deserialize::__Visitor" @@ -762,7 +762,7 @@ Module abi. |), [ M.read (| __serializer |); - M.read (| Value.String "ScriptFunctionABI" |); + mk_str (| "ScriptFunctionABI" |); BinOp.Wrap.add (| BinOp.Wrap.add (| BinOp.Wrap.add (| @@ -847,7 +847,7 @@ Module abi. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "name" |); + mk_str (| "name" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -928,7 +928,7 @@ Module abi. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "module_name" |); + mk_str (| "module_name" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1009,7 +1009,7 @@ Module abi. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "doc" |); + mk_str (| "doc" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1098,7 +1098,7 @@ Module abi. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "ty_args" |); + mk_str (| "ty_args" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1187,7 +1187,7 @@ Module abi. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "args" |); + mk_str (| "args" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1299,7 +1299,7 @@ Module abi. |), [ M.read (| __deserializer |); - M.read (| Value.String "ScriptFunctionABI" |); + mk_str (| "ScriptFunctionABI" |); M.read (| M.get_constant "move_core_types::abi::_'3::deserialize::FIELDS" |); Value.StructRecord "move_core_types::abi::_'3::deserialize::__Visitor" @@ -1369,7 +1369,7 @@ Module abi. |), [ M.read (| __serializer |); - M.read (| Value.String "TransactionScriptABI" |); + mk_str (| "TransactionScriptABI" |); BinOp.Wrap.add (| BinOp.Wrap.add (| BinOp.Wrap.add (| @@ -1454,7 +1454,7 @@ Module abi. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "name" |); + mk_str (| "name" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1535,7 +1535,7 @@ Module abi. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "doc" |); + mk_str (| "doc" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1616,7 +1616,7 @@ Module abi. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "code" |); + mk_str (| "code" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1725,7 +1725,7 @@ Module abi. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "ty_args" |); + mk_str (| "ty_args" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1814,7 +1814,7 @@ Module abi. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "args" |); + mk_str (| "args" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1926,7 +1926,7 @@ Module abi. |), [ M.read (| __deserializer |); - M.read (| Value.String "TransactionScriptABI" |); + mk_str (| "TransactionScriptABI" |); M.read (| M.get_constant "move_core_types::abi::_'5::deserialize::FIELDS" |); Value.StructRecord "move_core_types::abi::_'5::deserialize::__Visitor" @@ -1996,7 +1996,7 @@ Module abi. |), [ M.read (| __serializer |); - M.read (| Value.String "ArgumentABI" |); + mk_str (| "ArgumentABI" |); BinOp.Wrap.add (| BinOp.Wrap.add (| M.cast (Ty.path "usize") (Value.Bool false), @@ -2072,7 +2072,7 @@ Module abi. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "name" |); + mk_str (| "name" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2153,7 +2153,7 @@ Module abi. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "type_tag" |); + mk_str (| "type_tag" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2265,7 +2265,7 @@ Module abi. |), [ M.read (| __deserializer |); - M.read (| Value.String "ArgumentABI" |); + mk_str (| "ArgumentABI" |); M.read (| M.get_constant "move_core_types::abi::_'7::deserialize::FIELDS" |); Value.StructRecord "move_core_types::abi::_'7::deserialize::__Visitor" @@ -2335,7 +2335,7 @@ Module abi. |), [ M.read (| __serializer |); - M.read (| Value.String "TypeArgumentABI" |); + mk_str (| "TypeArgumentABI" |); BinOp.Wrap.add (| M.cast (Ty.path "usize") (Value.Bool false), Value.Integer IntegerKind.Usize 1 @@ -2408,7 +2408,7 @@ Module abi. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "name" |); + mk_str (| "name" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2520,7 +2520,7 @@ Module abi. |), [ M.read (| __deserializer |); - M.read (| Value.String "TypeArgumentABI" |); + mk_str (| "TypeArgumentABI" |); M.read (| M.get_constant "move_core_types::abi::_'9::deserialize::FIELDS" |); Value.StructRecord "move_core_types::abi::_'9::deserialize::__Visitor" @@ -2774,11 +2774,8 @@ Module abi. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ScriptFunctionABI" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "name" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ScriptFunctionABI" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "name" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2792,10 +2789,7 @@ Module abi. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "module_name" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "module_name" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2809,7 +2803,7 @@ Module abi. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "doc" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "doc" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2823,7 +2817,7 @@ Module abi. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "ty_args" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ty_args" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2837,7 +2831,7 @@ Module abi. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "args" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "args" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3575,11 +3569,8 @@ Module abi. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TransactionScriptABI" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "name" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "TransactionScriptABI" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "name" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3593,7 +3584,7 @@ Module abi. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "doc" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "doc" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3607,7 +3598,7 @@ Module abi. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "code" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "code" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3621,7 +3612,7 @@ Module abi. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "ty_args" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ty_args" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3635,7 +3626,7 @@ Module abi. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "args" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "args" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -4260,11 +4251,8 @@ Module abi. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ArgumentABI" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "name" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ArgumentABI" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "name" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -4278,7 +4266,7 @@ Module abi. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "type_tag" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "type_tag" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -4620,11 +4608,8 @@ Module abi. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TypeArgumentABI" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "name" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "TypeArgumentABI" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "name" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| 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 fa68ac9bb..91dc352d6 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/account_address.v +++ b/CoqOfRust/move_sui/translations/move_core_types/account_address.v @@ -811,12 +811,7 @@ Module account_address. [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "0" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "0" |) |) |) ] |) |))); fun γ => ltac:(M.monadic hex_str) @@ -948,7 +943,7 @@ Module account_address. Pointer.Kind.Ref, M.deref (| M.read (| literal |) |) |); - M.read (| Value.String "0x" |) + mk_str (| "0x" |) ] |) |) @@ -1326,7 +1321,7 @@ Module account_address. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "0x" |) ] |) + M.alloc (| Value.Array [ mk_str (| "0x" |) ] |) |) |) |); @@ -1576,7 +1571,7 @@ Module account_address. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -1960,10 +1955,7 @@ Module account_address. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -2049,10 +2041,7 @@ Module account_address. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -2213,9 +2202,7 @@ Module account_address. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "0x" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "0x" |) ] |) |) |) |) @@ -2441,9 +2428,7 @@ Module account_address. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) - ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -2746,9 +2731,7 @@ Module account_address. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "0x" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "0x" |) ] |) |) |) |) @@ -2974,9 +2957,7 @@ Module account_address. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) - ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -4296,7 +4277,7 @@ Module account_address. |), [ M.read (| serializer |); - M.read (| Value.String "AccountAddress" |); + mk_str (| "AccountAddress" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -4388,10 +4369,7 @@ Module account_address. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AccountAddressParseError" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "AccountAddressParseError" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4449,11 +4427,10 @@ Module account_address. M.alloc (| Value.Array [ - M.read (| - Value.String - "Unable to parse AccountAddress (must be hex string of length " + mk_str (| + "Unable to parse AccountAddress (must be hex string of length " |); - M.read (| Value.String ")" |) + mk_str (| ")" |) ] |) |) 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 2e2d6d60f..8191bd766 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/annotated_value.v +++ b/CoqOfRust/move_sui/translations/move_core_types/annotated_value.v @@ -3,21 +3,21 @@ Require Import CoqOfRust.CoqOfRust. Module annotated_value. Definition value_MOVE_STRUCT_NAME : Value.t := - M.run_constant ltac:(M.monadic (Value.String "struct")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "struct" |) |))). Axiom Constant_value_MOVE_STRUCT_NAME : (M.get_constant "move_core_types::annotated_value::MOVE_STRUCT_NAME") = value_MOVE_STRUCT_NAME. Global Hint Rewrite Constant_value_MOVE_STRUCT_NAME : constant_rewrites. Definition value_MOVE_STRUCT_TYPE : Value.t := - M.run_constant ltac:(M.monadic (Value.String "type")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "type" |) |))). Axiom Constant_value_MOVE_STRUCT_TYPE : (M.get_constant "move_core_types::annotated_value::MOVE_STRUCT_TYPE") = value_MOVE_STRUCT_TYPE. Global Hint Rewrite Constant_value_MOVE_STRUCT_TYPE : constant_rewrites. Definition value_MOVE_STRUCT_FIELDS : Value.t := - M.run_constant ltac:(M.monadic (Value.String "fields")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "fields" |) |))). Axiom Constant_value_MOVE_STRUCT_FIELDS : (M.get_constant "move_core_types::annotated_value::MOVE_STRUCT_FIELDS") = @@ -70,8 +70,8 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "MoveStruct" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "type_" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MoveStruct" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "type_" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -85,7 +85,7 @@ Module annotated_value. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "fields" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "fields" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -510,10 +510,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U8" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U8" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -545,10 +542,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U64" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U64" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -580,10 +574,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U128" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U128" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -615,10 +606,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Bool" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Bool" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -650,10 +638,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Address" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Address" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -685,10 +670,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Vector" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Vector" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -720,10 +702,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Struct" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Struct" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -755,10 +734,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Signer" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Signer" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -790,10 +766,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U16" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U16" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -825,10 +798,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U32" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U32" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -860,10 +830,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U256" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U256" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -1952,11 +1919,8 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MoveFieldLayout" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "name" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MoveFieldLayout" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "name" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1970,7 +1934,7 @@ Module annotated_value. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "layout" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "layout" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2134,7 +2098,7 @@ Module annotated_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveFieldLayout" |); + mk_str (| "MoveFieldLayout" |); BinOp.Wrap.add (| BinOp.Wrap.add (| M.cast (Ty.path "usize") (Value.Bool false), @@ -2210,7 +2174,7 @@ Module annotated_value. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "name" |); + mk_str (| "name" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2291,7 +2255,7 @@ Module annotated_value. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "layout" |); + mk_str (| "layout" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2403,7 +2367,7 @@ Module annotated_value. |), [ M.read (| __deserializer |); - M.read (| Value.String "MoveFieldLayout" |); + mk_str (| "MoveFieldLayout" |); M.read (| M.get_constant "move_core_types::annotated_value::_'1::deserialize::FIELDS" |); @@ -2475,7 +2439,7 @@ Module annotated_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveStructLayout" |); + mk_str (| "MoveStructLayout" |); BinOp.Wrap.add (| BinOp.Wrap.add (| M.cast (Ty.path "usize") (Value.Bool false), @@ -2551,7 +2515,7 @@ Module annotated_value. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "type_" |); + mk_str (| "type_" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2640,7 +2604,7 @@ Module annotated_value. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "fields" |); + mk_str (| "fields" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2752,7 +2716,7 @@ Module annotated_value. |), [ M.read (| __deserializer |); - M.read (| Value.String "MoveStructLayout" |); + mk_str (| "MoveStructLayout" |); M.read (| M.get_constant "move_core_types::annotated_value::_'3::deserialize::FIELDS" |); @@ -2824,9 +2788,9 @@ Module annotated_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 0; - M.read (| Value.String "bool" |) + mk_str (| "bool" |) ] |) |))); @@ -2857,9 +2821,9 @@ Module annotated_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 1; - M.read (| Value.String "u8" |) + mk_str (| "u8" |) ] |) |))); @@ -2890,9 +2854,9 @@ Module annotated_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 2; - M.read (| Value.String "u64" |) + mk_str (| "u64" |) ] |) |))); @@ -2923,9 +2887,9 @@ Module annotated_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 3; - M.read (| Value.String "u128" |) + mk_str (| "u128" |) ] |) |))); @@ -2956,9 +2920,9 @@ Module annotated_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 4; - M.read (| Value.String "address" |) + mk_str (| "address" |) ] |) |))); @@ -2999,9 +2963,9 @@ Module annotated_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 5; - M.read (| Value.String "vector" |); + mk_str (| "vector" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -3035,9 +2999,9 @@ Module annotated_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 6; - M.read (| Value.String "struct" |); + mk_str (| "struct" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -3069,9 +3033,9 @@ Module annotated_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 7; - M.read (| Value.String "signer" |) + mk_str (| "signer" |) ] |) |))); @@ -3102,9 +3066,9 @@ Module annotated_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 8; - M.read (| Value.String "u16" |) + mk_str (| "u16" |) ] |) |))); @@ -3135,9 +3099,9 @@ Module annotated_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 9; - M.read (| Value.String "u32" |) + mk_str (| "u32" |) ] |) |))); @@ -3168,9 +3132,9 @@ Module annotated_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 10; - M.read (| Value.String "u256" |) + mk_str (| "u256" |) ] |) |))) @@ -3216,7 +3180,7 @@ Module annotated_value. |), [ M.read (| __deserializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); M.read (| M.get_constant "move_core_types::annotated_value::_'5::deserialize::VARIANTS" |); @@ -3309,11 +3273,8 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MoveStructLayout" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "type_" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MoveStructLayout" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "type_" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3327,7 +3288,7 @@ Module annotated_value. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "fields" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "fields" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3584,10 +3545,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Bool" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Bool" |) |) |) ] |) |))); @@ -3613,10 +3571,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U8" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U8" |) |) |) ] |) |))); @@ -3642,10 +3597,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U64" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U64" |) |) |) ] |) |))); @@ -3671,10 +3623,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U128" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U128" |) |) |) ] |) |))); @@ -3700,10 +3649,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Address" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Address" |) |) |) ] |) |))); @@ -3731,10 +3677,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Vector" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Vector" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -3766,10 +3709,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Struct" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Struct" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -3799,10 +3739,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Signer" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Signer" |) |) |) ] |) |))); @@ -3828,10 +3765,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U16" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U16" |) |) |) ] |) |))); @@ -3857,10 +3791,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U32" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U32" |) |) |) ] |) |))); @@ -3886,10 +3817,7 @@ Module annotated_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U256" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U256" |) |) |) ] |) |))) @@ -5171,9 +5099,7 @@ Module annotated_value. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "serialization should succeed" |) - |) + M.deref (| mk_str (| "serialization should succeed" |) |) |) ] |))) @@ -7265,7 +7191,7 @@ Module annotated_value. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| formatter |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Vector" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Vector" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -7651,7 +7577,7 @@ Module annotated_value. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| formatter |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Struct" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Struct" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -11105,7 +11031,7 @@ Module annotated_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "bool" |) ] |) + M.alloc (| Value.Array [ mk_str (| "bool" |) ] |) |) |) |) @@ -11150,7 +11076,7 @@ Module annotated_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "u8" |) ] |) + M.alloc (| Value.Array [ mk_str (| "u8" |) ] |) |) |) |) @@ -11195,7 +11121,7 @@ Module annotated_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "u16" |) ] |) + M.alloc (| Value.Array [ mk_str (| "u16" |) ] |) |) |) |) @@ -11240,7 +11166,7 @@ Module annotated_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "u32" |) ] |) + M.alloc (| Value.Array [ mk_str (| "u32" |) ] |) |) |) |) @@ -11285,7 +11211,7 @@ Module annotated_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "u64" |) ] |) + M.alloc (| Value.Array [ mk_str (| "u64" |) ] |) |) |) |) @@ -11330,7 +11256,7 @@ Module annotated_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "u128" |) ] |) + M.alloc (| Value.Array [ mk_str (| "u128" |) ] |) |) |) |) @@ -11375,7 +11301,7 @@ Module annotated_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "u256" |) ] |) + M.alloc (| Value.Array [ mk_str (| "u256" |) ] |) |) |) |) @@ -11420,9 +11346,7 @@ Module annotated_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "address" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "address" |) ] |) |) |) |) @@ -11467,7 +11391,7 @@ Module annotated_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "signer" |) ] |) + M.alloc (| Value.Array [ mk_str (| "signer" |) ] |) |) |) |) @@ -11529,11 +11453,7 @@ Module annotated_value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "vector<" |); - M.read (| Value.String ">" |) - ] + Value.Array [ mk_str (| "vector<" |); mk_str (| ">" |) ] |) |) |) @@ -11667,11 +11587,7 @@ Module annotated_value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "vector<" |); - M.read (| Value.String ">" |) - ] + Value.Array [ mk_str (| "vector<" |); mk_str (| ">" |) ] |) |) |) @@ -11775,7 +11691,7 @@ Module annotated_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -11901,7 +11817,7 @@ Module annotated_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -12043,7 +11959,7 @@ Module annotated_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -12162,7 +12078,7 @@ Module annotated_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -12303,9 +12219,7 @@ Module annotated_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "struct " |) ] - |) + M.alloc (| Value.Array [ mk_str (| "struct " |) ] |) |) |) |) @@ -12432,11 +12346,7 @@ Module annotated_value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " " |) - ] + Value.Array [ mk_str (| "" |); mk_str (| " " |) ] |) |) |) @@ -13195,11 +13105,7 @@ Module annotated_value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String "u8" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| "u8" |) ] |) |) |) @@ -13279,11 +13185,7 @@ Module annotated_value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String "u16" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| "u16" |) ] |) |) |) @@ -13363,11 +13265,7 @@ Module annotated_value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String "u32" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| "u32" |) ] |) |) |) @@ -13447,11 +13345,7 @@ Module annotated_value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String "u64" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| "u64" |) ] |) |) |) @@ -13531,11 +13425,7 @@ Module annotated_value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String "u128" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| "u128" |) ] |) |) |) @@ -13615,11 +13505,7 @@ Module annotated_value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String "u256" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| "u256" |) ] |) |) |) @@ -13701,9 +13587,7 @@ Module annotated_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "false" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "false" |) ] |) |) |) |) @@ -13751,9 +13635,7 @@ Module annotated_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "true" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "true" |) ] |) |) |) |) @@ -13803,7 +13685,7 @@ Module annotated_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -13904,11 +13786,7 @@ Module annotated_value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "signer(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "signer(" |); mk_str (| ")" |) ] |) |) |) @@ -14039,9 +13917,7 @@ Module annotated_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "vector" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "vector" |) ] |) |) |) |) @@ -14535,7 +14411,7 @@ Module annotated_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String " " |) ] |) + M.alloc (| Value.Array [ mk_str (| " " |) ] |) |) |) |) 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 947f4d48d..e3728552d 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/annotated_visitor.v +++ b/CoqOfRust/move_sui/translations/move_core_types/annotated_visitor.v @@ -1387,8 +1387,7 @@ Module annotated_visitor. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "unexpected end of input" |) ] + Value.Array [ mk_str (| "unexpected end of input" |) ] |) |) |) @@ -1440,9 +1439,7 @@ Module annotated_visitor. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "unexpected byte: " |) ] - |) + M.alloc (| Value.Array [ mk_str (| "unexpected byte: " |) ] |) |) |) |); @@ -1546,8 +1543,8 @@ Module annotated_visitor. M.alloc (| Value.Array [ - M.read (| Value.String "trailing " |); - M.read (| Value.String " byte(s) at the end of input" |) + mk_str (| "trailing " |); + mk_str (| " byte(s) at the end of input" |) ] |) |) @@ -1669,7 +1666,7 @@ Module annotated_visitor. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UnexpectedEof" |) |) + M.deref (| mk_str (| "UnexpectedEof" |) |) |) ] |) @@ -1700,7 +1697,7 @@ Module annotated_visitor. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UnexpectedByte" |) |) + M.deref (| mk_str (| "UnexpectedByte" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -1735,7 +1732,7 @@ Module annotated_visitor. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TrailingBytes" |) |) + M.deref (| mk_str (| "TrailingBytes" |) |) |); M.borrow (| Pointer.Kind.Ref, diff --git a/CoqOfRust/move_sui/translations/move_core_types/effects.v b/CoqOfRust/move_sui/translations/move_core_types/effects.v index b82bd5dc2..358cfa208 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/effects.v +++ b/CoqOfRust/move_sui/translations/move_core_types/effects.v @@ -73,10 +73,7 @@ Module effects. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "New" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "New" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -108,10 +105,7 @@ Module effects. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Modify" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Modify" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -137,10 +131,7 @@ Module effects. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Delete" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Delete" |) |) |) ] |) |))) @@ -1086,11 +1077,8 @@ Module effects. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AccountChangeSet" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "modules" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "AccountChangeSet" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "modules" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1104,7 +1092,7 @@ Module effects. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "resources" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "resources" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2279,9 +2267,8 @@ Module effects. M.alloc (| Value.Array [ - M.read (| - Value.String - "The given change sets cannot be squashed" + mk_str (| + "The given change sets cannot be squashed" |) ] |) @@ -2812,12 +2799,9 @@ Module effects. M.alloc (| Value.Array [ - M.read (| - Value.String "Module " - |); - M.read (| - Value.String - " already exists" + mk_str (| "Module " |); + mk_str (| + " already exists" |) ] |) @@ -3153,12 +3137,9 @@ Module effects. M.alloc (| Value.Array [ - M.read (| - Value.String "Resource " - |); - M.read (| - Value.String - " already exists" + mk_str (| "Resource " |); + mk_str (| + " already exists" |) ] |) @@ -3826,8 +3807,8 @@ Module effects. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "ChangeSet" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "accounts" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ChangeSet" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "accounts" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -4403,13 +4384,11 @@ Module effects. M.alloc (| Value.Array [ - M.read (| - Value.String - "Failed to add account change set. Account " + mk_str (| + "Failed to add account change set. Account " |); - M.read (| - Value.String - " already exists." + mk_str (| + " already exists." |) ] |) diff --git a/CoqOfRust/move_sui/translations/move_core_types/errmap.v b/CoqOfRust/move_sui/translations/move_core_types/errmap.v index d40250209..7d0d93736 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/errmap.v +++ b/CoqOfRust/move_sui/translations/move_core_types/errmap.v @@ -37,11 +37,8 @@ Module errmap. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ErrorDescription" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "code_name" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ErrorDescription" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "code_name" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -55,10 +52,7 @@ Module errmap. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "code_description" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "code_description" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -222,7 +216,7 @@ Module errmap. |), [ M.read (| __serializer |); - M.read (| Value.String "ErrorDescription" |); + mk_str (| "ErrorDescription" |); BinOp.Wrap.add (| BinOp.Wrap.add (| M.cast (Ty.path "usize") (Value.Bool false), @@ -298,7 +292,7 @@ Module errmap. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "code_name" |); + mk_str (| "code_name" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -379,7 +373,7 @@ Module errmap. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "code_description" |); + mk_str (| "code_description" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -491,7 +485,7 @@ Module errmap. |), [ M.read (| __deserializer |); - M.read (| Value.String "ErrorDescription" |); + mk_str (| "ErrorDescription" |); M.read (| M.get_constant "move_core_types::errmap::_'1::deserialize::FIELDS" |); Value.StructRecord "move_core_types::errmap::_'1::deserialize::__Visitor" @@ -561,7 +555,7 @@ Module errmap. |), [ M.read (| __serializer |); - M.read (| Value.String "ErrorMapping" |); + mk_str (| "ErrorMapping" |); BinOp.Wrap.add (| BinOp.Wrap.add (| M.cast (Ty.path "usize") (Value.Bool false), @@ -646,7 +640,7 @@ Module errmap. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "error_categories" |); + mk_str (| "error_categories" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -743,7 +737,7 @@ Module errmap. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "module_error_maps" |); + mk_str (| "module_error_maps" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -855,7 +849,7 @@ Module errmap. |), [ M.read (| __deserializer |); - M.read (| Value.String "ErrorMapping" |); + mk_str (| "ErrorMapping" |); M.read (| M.get_constant "move_core_types::errmap::_'3::deserialize::FIELDS" |); Value.StructRecord "move_core_types::errmap::_'3::deserialize::__Visitor" @@ -937,14 +931,8 @@ Module errmap. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ErrorMapping" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "error_categories" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ErrorMapping" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "error_categories" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -958,10 +946,7 @@ Module errmap. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "module_error_maps" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "module_error_maps" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1338,13 +1323,11 @@ Module errmap. M.alloc (| Value.Array [ - M.read (| - Value.String - "Entry for category " + mk_str (| + "Entry for category " |); - M.read (| - Value.String - " already taken by: " + mk_str (| + " already taken by: " |) ] |) @@ -1808,17 +1791,14 @@ Module errmap. M.alloc (| Value.Array [ - M.read (| - Value.String - "Duplicate entry for abort code " + mk_str (| + "Duplicate entry for abort code " |); - M.read (| - Value.String - " found in " + mk_str (| + " found in " |); - M.read (| - Value.String - ", previous entry: " + mk_str (| + ", previous entry: " |) ] |) 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 fb17dd802..fecc18d31 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/gas_algebra.v +++ b/CoqOfRust/move_sui/translations/move_core_types/gas_algebra.v @@ -145,7 +145,7 @@ Module gas_algebra. |), [ M.read (| __serializer |); - M.read (| Value.String "GasQuantity" |); + mk_str (| "GasQuantity" |); BinOp.Wrap.add (| BinOp.Wrap.add (| M.cast (Ty.path "usize") (Value.Bool false), @@ -221,7 +221,7 @@ Module gas_algebra. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "val" |); + mk_str (| "val" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -302,7 +302,7 @@ Module gas_algebra. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "phantom" |); + mk_str (| "phantom" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -422,7 +422,7 @@ Module gas_algebra. |), [ M.read (| __deserializer |); - M.read (| Value.String "GasQuantity" |); + mk_str (| "GasQuantity" |); M.read (| M.get_constant "move_core_types::gas_algebra::_'1::deserialize::FIELDS" |); @@ -1650,10 +1650,7 @@ Module gas_algebra. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -1749,12 +1746,7 @@ Module gas_algebra. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String " (" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| " (" |); mk_str (| ")" |) ] |) |) |) diff --git a/CoqOfRust/move_sui/translations/move_core_types/identifier.v b/CoqOfRust/move_sui/translations/move_core_types/identifier.v index bfc0b39cf..948d6028c 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/identifier.v +++ b/CoqOfRust/move_sui/translations/move_core_types/identifier.v @@ -449,7 +449,7 @@ Module identifier. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Identifier" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Identifier" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -810,7 +810,7 @@ Module identifier. |), [ M.read (| __serializer |); - M.read (| Value.String "Identifier" |); + mk_str (| "Identifier" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -865,7 +865,7 @@ Module identifier. |), [ M.read (| __deserializer |); - M.read (| Value.String "Identifier" |); + mk_str (| "Identifier" |); Value.StructRecord "move_core_types::identifier::_'2::deserialize::__Visitor" [ @@ -1040,11 +1040,10 @@ Module identifier. M.alloc (| Value.Array [ - M.read (| - Value.String - "Invalid identifier '" + mk_str (| + "Invalid identifier '" |); - M.read (| Value.String "'" |) + mk_str (| "'" |) ] |) |) @@ -1203,7 +1202,7 @@ Module identifier. |) |) |); - M.borrow (| Pointer.Kind.Ref, Value.String "" |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| mk_str (| "" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -1713,10 +1712,7 @@ Module identifier. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -1818,7 +1814,7 @@ Module identifier. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "IdentStr" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "IdentStr" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2130,7 +2126,7 @@ Module identifier. [ Ty.path "move_core_types::identifier::IdentStr"; Ty.path "str" ] |), [ - M.read (| Value.String "IdentStr" |); + mk_str (| "IdentStr" |); M.read (| M.get_constant "ref_cast::layout::LayoutUnsized::SIZE" |); M.read (| M.get_constant "ref_cast::layout::LayoutUnsized::SIZE" |); M.read (| M.get_constant "ref_cast::layout::LayoutUnsized::ALIGN" |); @@ -2190,7 +2186,7 @@ Module identifier. [ Ty.path "move_core_types::identifier::IdentStr"; Ty.path "str" ] |), [ - M.read (| Value.String "IdentStr" |); + mk_str (| "IdentStr" |); M.read (| M.get_constant "ref_cast::layout::LayoutUnsized::SIZE" |); M.read (| M.get_constant "ref_cast::layout::LayoutUnsized::SIZE" |); M.read (| M.get_constant "ref_cast::layout::LayoutUnsized::ALIGN" |); @@ -2387,11 +2383,10 @@ Module identifier. M.alloc (| Value.Array [ - M.read (| - Value.String - "Invalid identifier '" + mk_str (| + "Invalid identifier '" |); - M.read (| Value.String "'" |) + mk_str (| "'" |) ] |) |) @@ -2831,10 +2826,7 @@ Module identifier. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| 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 1371e6129..e17ac5a86 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/language_storage.v +++ b/CoqOfRust/move_sui/translations/move_core_types/language_storage.v @@ -289,9 +289,9 @@ Module language_storage. |), [ M.read (| __serializer |); - M.read (| Value.String "TypeTag" |); + mk_str (| "TypeTag" |); Value.Integer IntegerKind.U32 0; - M.read (| Value.String "bool" |) + mk_str (| "bool" |) ] |) |))); @@ -322,9 +322,9 @@ Module language_storage. |), [ M.read (| __serializer |); - M.read (| Value.String "TypeTag" |); + mk_str (| "TypeTag" |); Value.Integer IntegerKind.U32 1; - M.read (| Value.String "u8" |) + mk_str (| "u8" |) ] |) |))); @@ -355,9 +355,9 @@ Module language_storage. |), [ M.read (| __serializer |); - M.read (| Value.String "TypeTag" |); + mk_str (| "TypeTag" |); Value.Integer IntegerKind.U32 2; - M.read (| Value.String "u64" |) + mk_str (| "u64" |) ] |) |))); @@ -388,9 +388,9 @@ Module language_storage. |), [ M.read (| __serializer |); - M.read (| Value.String "TypeTag" |); + mk_str (| "TypeTag" |); Value.Integer IntegerKind.U32 3; - M.read (| Value.String "u128" |) + mk_str (| "u128" |) ] |) |))); @@ -421,9 +421,9 @@ Module language_storage. |), [ M.read (| __serializer |); - M.read (| Value.String "TypeTag" |); + mk_str (| "TypeTag" |); Value.Integer IntegerKind.U32 4; - M.read (| Value.String "address" |) + mk_str (| "address" |) ] |) |))); @@ -454,9 +454,9 @@ Module language_storage. |), [ M.read (| __serializer |); - M.read (| Value.String "TypeTag" |); + mk_str (| "TypeTag" |); Value.Integer IntegerKind.U32 5; - M.read (| Value.String "signer" |) + mk_str (| "signer" |) ] |) |))); @@ -497,9 +497,9 @@ Module language_storage. |), [ M.read (| __serializer |); - M.read (| Value.String "TypeTag" |); + mk_str (| "TypeTag" |); Value.Integer IntegerKind.U32 6; - M.read (| Value.String "vector" |); + mk_str (| "vector" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -541,9 +541,9 @@ Module language_storage. |), [ M.read (| __serializer |); - M.read (| Value.String "TypeTag" |); + mk_str (| "TypeTag" |); Value.Integer IntegerKind.U32 7; - M.read (| Value.String "struct" |); + mk_str (| "struct" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -575,9 +575,9 @@ Module language_storage. |), [ M.read (| __serializer |); - M.read (| Value.String "TypeTag" |); + mk_str (| "TypeTag" |); Value.Integer IntegerKind.U32 8; - M.read (| Value.String "u16" |) + mk_str (| "u16" |) ] |) |))); @@ -608,9 +608,9 @@ Module language_storage. |), [ M.read (| __serializer |); - M.read (| Value.String "TypeTag" |); + mk_str (| "TypeTag" |); Value.Integer IntegerKind.U32 9; - M.read (| Value.String "u32" |) + mk_str (| "u32" |) ] |) |))); @@ -641,9 +641,9 @@ Module language_storage. |), [ M.read (| __serializer |); - M.read (| Value.String "TypeTag" |); + mk_str (| "TypeTag" |); Value.Integer IntegerKind.U32 10; - M.read (| Value.String "u256" |) + mk_str (| "u256" |) ] |) |))) @@ -689,7 +689,7 @@ Module language_storage. |), [ M.read (| __deserializer |); - M.read (| Value.String "TypeTag" |); + mk_str (| "TypeTag" |); M.read (| M.get_constant "move_core_types::language_storage::_'1::deserialize::VARIANTS" |); @@ -761,7 +761,7 @@ Module language_storage. |), [ M.read (| __serializer |); - M.read (| Value.String "StructTag" |); + mk_str (| "StructTag" |); BinOp.Wrap.add (| BinOp.Wrap.add (| BinOp.Wrap.add (| @@ -843,7 +843,7 @@ Module language_storage. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "address" |); + mk_str (| "address" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -924,7 +924,7 @@ Module language_storage. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "module" |); + mk_str (| "module" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1005,7 +1005,7 @@ Module language_storage. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "name" |); + mk_str (| "name" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1094,7 +1094,7 @@ Module language_storage. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "type_args" |); + mk_str (| "type_args" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1206,7 +1206,7 @@ Module language_storage. |), [ M.read (| __deserializer |); - M.read (| Value.String "StructTag" |); + mk_str (| "StructTag" |); M.read (| M.get_constant "move_core_types::language_storage::_'3::deserialize::FIELDS" |); @@ -1278,7 +1278,7 @@ Module language_storage. |), [ M.read (| __serializer |); - M.read (| Value.String "ResourceKey" |); + mk_str (| "ResourceKey" |); BinOp.Wrap.add (| BinOp.Wrap.add (| M.cast (Ty.path "usize") (Value.Bool false), @@ -1354,7 +1354,7 @@ Module language_storage. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "address" |); + mk_str (| "address" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1435,7 +1435,7 @@ Module language_storage. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "type_" |); + mk_str (| "type_" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1547,7 +1547,7 @@ Module language_storage. |), [ M.read (| __deserializer |); - M.read (| Value.String "ResourceKey" |); + mk_str (| "ResourceKey" |); M.read (| M.get_constant "move_core_types::language_storage::_'5::deserialize::FIELDS" |); @@ -1619,7 +1619,7 @@ Module language_storage. |), [ M.read (| __serializer |); - M.read (| Value.String "ModuleId" |); + mk_str (| "ModuleId" |); BinOp.Wrap.add (| BinOp.Wrap.add (| M.cast (Ty.path "usize") (Value.Bool false), @@ -1695,7 +1695,7 @@ Module language_storage. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "address" |); + mk_str (| "address" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1776,7 +1776,7 @@ Module language_storage. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "name" |); + mk_str (| "name" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1888,7 +1888,7 @@ Module language_storage. |), [ M.read (| __deserializer |); - M.read (| Value.String "ModuleId" |); + mk_str (| "ModuleId" |); M.read (| M.get_constant "move_core_types::language_storage::_'7::deserialize::FIELDS" |); @@ -1955,10 +1955,7 @@ Module language_storage. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Bool" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Bool" |) |) |) ] |) |))); @@ -1981,10 +1978,7 @@ Module language_storage. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U8" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U8" |) |) |) ] |) |))); @@ -2010,10 +2004,7 @@ Module language_storage. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U64" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U64" |) |) |) ] |) |))); @@ -2039,10 +2030,7 @@ Module language_storage. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U128" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U128" |) |) |) ] |) |))); @@ -2068,10 +2056,7 @@ Module language_storage. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Address" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Address" |) |) |) ] |) |))); @@ -2097,10 +2082,7 @@ Module language_storage. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Signer" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Signer" |) |) |) ] |) |))); @@ -2128,10 +2110,7 @@ Module language_storage. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Vector" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Vector" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -2163,10 +2142,7 @@ Module language_storage. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Struct" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Struct" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -2196,10 +2172,7 @@ Module language_storage. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U16" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U16" |) |) |) ] |) |))); @@ -2225,10 +2198,7 @@ Module language_storage. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U32" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U32" |) |) |) ] |) |))); @@ -2254,10 +2224,7 @@ Module language_storage. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U256" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U256" |) |) |) ] |) |))) @@ -3724,8 +3691,8 @@ Module language_storage. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "StructTag" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "address" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "StructTag" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "address" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3739,7 +3706,7 @@ Module language_storage. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "module" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "module" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3753,7 +3720,7 @@ Module language_storage. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "name" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "name" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3767,10 +3734,7 @@ Module language_storage. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "type_params" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "type_params" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5098,7 +5062,7 @@ Module language_storage. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "ascii" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ascii" |) |) |) ] |))) |), @@ -5161,7 +5125,7 @@ Module language_storage. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "String" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "String" |) |) |) ] |))) |))) @@ -5270,10 +5234,7 @@ Module language_storage. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "string" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "string" |) |) |) ] |))) |), @@ -5336,7 +5297,7 @@ Module language_storage. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "String" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "String" |) |) |) ] |))) |))) @@ -6062,11 +6023,8 @@ Module language_storage. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ResourceKey" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "address" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ResourceKey" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "address" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -6080,7 +6038,7 @@ Module language_storage. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "type_" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "type_" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -6783,8 +6741,8 @@ Module language_storage. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "ModuleId" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "address" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ModuleId" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "address" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -6798,7 +6756,7 @@ Module language_storage. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "name" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "name" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -7818,13 +7776,7 @@ Module language_storage. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "0x" |); - M.read (| Value.String "::" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "0x" |); mk_str (| "::" |) ] |) |) |) |); @@ -7958,10 +7910,7 @@ Module language_storage. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -8124,9 +8073,9 @@ Module language_storage. M.alloc (| Value.Array [ - M.read (| Value.String "0x" |); - M.read (| Value.String "::" |); - M.read (| Value.String "::" |) + mk_str (| "0x" |); + mk_str (| "::" |); + mk_str (| "::" |) ] |) |) @@ -8446,9 +8395,7 @@ Module language_storage. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "<" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "<" |) ] |) |) |) |) @@ -8580,9 +8527,7 @@ Module language_storage. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -8974,11 +8919,7 @@ Module language_storage. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String - ", " - |) + [ mk_str (| ", " |) ] |) |) @@ -9173,9 +9114,7 @@ Module language_storage. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String ">" |) ] - |) + M.alloc (| Value.Array [ mk_str (| ">" |) ] |) |) |) |) @@ -9336,7 +9275,7 @@ Module language_storage. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -9427,11 +9366,7 @@ Module language_storage. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "vector<" |); - M.read (| Value.String ">" |) - ] + Value.Array [ mk_str (| "vector<" |); mk_str (| ">" |) ] |) |) |) @@ -9516,7 +9451,7 @@ Module language_storage. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "u8" |) ] |) + M.alloc (| Value.Array [ mk_str (| "u8" |) ] |) |) |) |) @@ -9561,7 +9496,7 @@ Module language_storage. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "u16" |) ] |) + M.alloc (| Value.Array [ mk_str (| "u16" |) ] |) |) |) |) @@ -9606,7 +9541,7 @@ Module language_storage. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "u32" |) ] |) + M.alloc (| Value.Array [ mk_str (| "u32" |) ] |) |) |) |) @@ -9651,7 +9586,7 @@ Module language_storage. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "u64" |) ] |) + M.alloc (| Value.Array [ mk_str (| "u64" |) ] |) |) |) |) @@ -9696,7 +9631,7 @@ Module language_storage. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "u128" |) ] |) + M.alloc (| Value.Array [ mk_str (| "u128" |) ] |) |) |) |) @@ -9741,7 +9676,7 @@ Module language_storage. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "u256" |) ] |) + M.alloc (| Value.Array [ mk_str (| "u256" |) ] |) |) |) |) @@ -9786,9 +9721,7 @@ Module language_storage. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "address" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "address" |) ] |) |) |) |) @@ -9833,7 +9766,7 @@ Module language_storage. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "signer" |) ] |) + M.alloc (| Value.Array [ mk_str (| "signer" |) ] |) |) |) |) @@ -9878,7 +9811,7 @@ Module language_storage. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "bool" |) ] |) + M.alloc (| Value.Array [ mk_str (| "bool" |) ] |) |) |) |) @@ -9938,10 +9871,7 @@ Module language_storage. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ M.read (| Value.String "0x" |); M.read (| Value.String "/" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "0x" |); mk_str (| "/" |) ] |) |) |) |); diff --git a/CoqOfRust/move_sui/translations/move_core_types/lib.v b/CoqOfRust/move_sui/translations/move_core_types/lib.v index 3bcd15a31..af6034716 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/lib.v +++ b/CoqOfRust/move_sui/translations/move_core_types/lib.v @@ -87,7 +87,7 @@ Definition fmt_list (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -309,9 +309,7 @@ Definition fmt_list (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -565,11 +563,7 @@ Definition fmt_list (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String ", " - |) - ] + [ mk_str (| ", " |) ] |) |) |) @@ -748,7 +742,7 @@ Definition fmt_list (ε : list Value.t) (τ : list Ty.t) (α : list Value.t) : M M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); diff --git a/CoqOfRust/move_sui/translations/move_core_types/metadata.v b/CoqOfRust/move_sui/translations/move_core_types/metadata.v index 20fa6136f..3bd2a8a2a 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/metadata.v +++ b/CoqOfRust/move_sui/translations/move_core_types/metadata.v @@ -292,8 +292,8 @@ Module metadata. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Metadata" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "key" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Metadata" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "key" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -307,7 +307,7 @@ Module metadata. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "value" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "value" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -390,7 +390,7 @@ Module metadata. |), [ M.read (| __serializer |); - M.read (| Value.String "Metadata" |); + mk_str (| "Metadata" |); BinOp.Wrap.add (| BinOp.Wrap.add (| M.cast (Ty.path "usize") (Value.Bool false), @@ -471,7 +471,7 @@ Module metadata. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "key" |); + mk_str (| "key" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -557,7 +557,7 @@ Module metadata. Pointer.Kind.MutRef, M.deref (| M.borrow (| Pointer.Kind.MutRef, __serde_state |) |) |); - M.read (| Value.String "value" |); + mk_str (| "value" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -669,7 +669,7 @@ Module metadata. |), [ M.read (| __deserializer |); - M.read (| Value.String "Metadata" |); + mk_str (| "Metadata" |); M.read (| M.get_constant "move_core_types::metadata::_'1::deserialize::FIELDS" |); Value.StructRecord "move_core_types::metadata::_'1::deserialize::__Visitor" diff --git a/CoqOfRust/move_sui/translations/move_core_types/parser.v b/CoqOfRust/move_sui/translations/move_core_types/parser.v index b3009b7b6..4eed513e4 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/parser.v +++ b/CoqOfRust/move_sui/translations/move_core_types/parser.v @@ -683,10 +683,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U8Type" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U8Type" |) |) |) ] |) |))); @@ -708,10 +705,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U16Type" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U16Type" |) |) |) ] |) |))); @@ -733,10 +727,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U32Type" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U32Type" |) |) |) ] |) |))); @@ -758,10 +749,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U64Type" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U64Type" |) |) |) ] |) |))); @@ -784,10 +772,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U128Type" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U128Type" |) |) |) ] |) |))); @@ -810,10 +795,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U256Type" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U256Type" |) |) |) ] |) |))); @@ -836,10 +818,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BoolType" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BoolType" |) |) |) ] |) |))); @@ -862,10 +841,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AddressType" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "AddressType" |) |) |) ] |) |))); @@ -888,10 +864,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VectorType" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "VectorType" |) |) |) ] |) |))); @@ -914,10 +887,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SignerType" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SignerType" |) |) |) ] |) |))); @@ -945,10 +915,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Whitespace" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Whitespace" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -980,10 +947,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Name" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Name" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -1015,10 +979,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Address" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Address" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -1050,10 +1011,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U8" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U8" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -1085,10 +1043,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U16" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U16" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -1120,10 +1075,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U32" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U32" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -1155,10 +1107,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U64" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U64" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -1190,10 +1139,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U128" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U128" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -1225,10 +1171,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U256" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U256" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -1260,10 +1203,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Bytes" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Bytes" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -1289,10 +1229,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "True" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "True" |) |) |) ] |) |))); @@ -1314,10 +1251,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "False" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "False" |) |) |) ] |) |))); @@ -1340,10 +1274,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ColonColon" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ColonColon" |) |) |) ] |) |))); @@ -1365,10 +1296,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Lt" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Lt" |) |) |) ] |) |))); @@ -1390,10 +1318,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Gt" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Gt" |) |) |) ] |) |))); @@ -1415,10 +1340,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Comma" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Comma" |) |) |) ] |) |))); @@ -1440,10 +1362,7 @@ Module parser. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EOF" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EOF" |) |) |) ] |) |))) @@ -1558,12 +1477,7 @@ Module parser. [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "u8" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "u8" |) |) |) ] |) |))); fun γ => @@ -1582,12 +1496,7 @@ Module parser. [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "u16" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "u16" |) |) |) ] |) |))); fun γ => @@ -1606,12 +1515,7 @@ Module parser. [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "u32" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "u32" |) |) |) ] |) |))); fun γ => @@ -1630,12 +1534,7 @@ Module parser. [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "u64" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "u64" |) |) |) ] |) |))); fun γ => @@ -1654,12 +1553,7 @@ Module parser. [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "u128" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "u128" |) |) |) ] |) |))); fun γ => @@ -1678,12 +1572,7 @@ Module parser. [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "u256" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "u256" |) |) |) ] |) |))); fun γ => @@ -1702,12 +1591,7 @@ Module parser. [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "bool" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "bool" |) |) |) ] |) |))); fun γ => @@ -1732,7 +1616,7 @@ Module parser. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "address" |) |) + M.deref (| mk_str (| "address" |) |) |) ] |) @@ -1756,11 +1640,7 @@ Module parser. [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "vector" |) |) - |) + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "vector" |) |) |) ] |) |))); @@ -1780,12 +1660,7 @@ Module parser. [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "true" |) |) - |) - ] + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "true" |) |) |) ] |) |))); fun γ => @@ -1804,11 +1679,7 @@ Module parser. [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "false" |) |) - |) + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "false" |) |) |) ] |) |))); @@ -1831,11 +1702,7 @@ Module parser. [], [] |), - [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "signer" |) |) - |) + [ M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "signer" |) |) |) ] |) |))); @@ -2042,9 +1909,8 @@ Module parser. M.alloc (| Value.Array [ - M.read (| - Value.String - "Invalid token. Expected a name but got " + mk_str (| + "Invalid token. Expected a name but got " |) ] |) @@ -2158,61 +2024,61 @@ Module parser. [ fun γ => ltac:(M.monadic - (let _ := M.is_constant_or_break_match (| M.read (| γ |), Value.String "u8" |) in + (let _ := M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "u8" |) |) in M.alloc (| Value.StructTuple "move_core_types::parser::Token::U8Type" [] |))); fun γ => ltac:(M.monadic - (let _ := M.is_constant_or_break_match (| M.read (| γ |), Value.String "u16" |) in + (let _ := M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "u16" |) |) in M.alloc (| Value.StructTuple "move_core_types::parser::Token::U16Type" [] |))); fun γ => ltac:(M.monadic - (let _ := M.is_constant_or_break_match (| M.read (| γ |), Value.String "u32" |) in + (let _ := M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "u32" |) |) in M.alloc (| Value.StructTuple "move_core_types::parser::Token::U32Type" [] |))); fun γ => ltac:(M.monadic - (let _ := M.is_constant_or_break_match (| M.read (| γ |), Value.String "u64" |) in + (let _ := M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "u64" |) |) in M.alloc (| Value.StructTuple "move_core_types::parser::Token::U64Type" [] |))); fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "u128" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "u128" |) |) in M.alloc (| Value.StructTuple "move_core_types::parser::Token::U128Type" [] |))); fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "u256" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "u256" |) |) in M.alloc (| Value.StructTuple "move_core_types::parser::Token::U256Type" [] |))); fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "bool" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "bool" |) |) in M.alloc (| Value.StructTuple "move_core_types::parser::Token::BoolType" [] |))); fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "address" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "address" |) |) in M.alloc (| Value.StructTuple "move_core_types::parser::Token::AddressType" [] |))); fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "vector" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "vector" |) |) in M.alloc (| Value.StructTuple "move_core_types::parser::Token::VectorType" [] |))); fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "true" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "true" |) |) in M.alloc (| Value.StructTuple "move_core_types::parser::Token::True" [] |))); fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "false" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "false" |) |) in M.alloc (| Value.StructTuple "move_core_types::parser::Token::False" [] |))); fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "signer" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "signer" |) |) in M.alloc (| Value.StructTuple "move_core_types::parser::Token::SignerType" [] |))); fun γ => ltac:(M.monadic @@ -2555,7 +2421,7 @@ Module parser. (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "u8" + mk_str (| "u8" |) |) in M.alloc (| Value.StructTuple @@ -2567,7 +2433,7 @@ Module parser. (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "u16" + mk_str (| "u16" |) |) in M.alloc (| Value.StructTuple @@ -2579,7 +2445,7 @@ Module parser. (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "u32" + mk_str (| "u32" |) |) in M.alloc (| Value.StructTuple @@ -2591,7 +2457,7 @@ Module parser. (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "u64" + mk_str (| "u64" |) |) in M.alloc (| Value.StructTuple @@ -2603,7 +2469,7 @@ Module parser. (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "u128" + mk_str (| "u128" |) |) in M.alloc (| Value.StructTuple @@ -2615,7 +2481,7 @@ Module parser. (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "u256" + mk_str (| "u256" |) |) in M.alloc (| Value.StructTuple @@ -2668,9 +2534,8 @@ Module parser. M.alloc (| Value.Array [ - M.read (| - Value.String - "invalid suffix" + mk_str (| + "invalid suffix" |) ] |) @@ -3103,9 +2968,8 @@ Module parser. M.alloc (| Value.Array [ - M.read (| - Value.String - "unrecognized token" + mk_str (| + "unrecognized token" |) ] |) @@ -3702,9 +3566,8 @@ Module parser. M.alloc (| Value.Array [ - M.read (| - Value.String - "unrecognized token" + mk_str (| + "unrecognized token" |) ] |) @@ -4172,9 +4035,8 @@ Module parser. M.alloc (| Value.Array [ - M.read (| - Value.String - "unrecognized token" + mk_str (| + "unrecognized token" |) ] |) @@ -4498,9 +4360,8 @@ Module parser. M.alloc (| Value.Array [ - M.read (| - Value.String - "unrecognized token" + mk_str (| + "unrecognized token" |) ] |) @@ -5062,9 +4923,8 @@ Module parser. M.alloc (| Value.Array [ - M.read (| - Value.String - "unrecognized token" + mk_str (| + "unrecognized token" |) ] |) @@ -5584,9 +5444,8 @@ Module parser. M.alloc (| Value.Array [ - M.read (| - Value.String - "out of tokens, this should not happen" + mk_str (| + "out of tokens, this should not happen" |) ] |) @@ -5868,13 +5727,10 @@ Module parser. M.alloc (| Value.Array [ - M.read (| - Value.String - "expected token " + mk_str (| + "expected token " |); - M.read (| - Value.String ", got " - |) + mk_str (| ", got " |) ] |) |) @@ -6865,13 +6721,11 @@ Module parser. M.alloc (| Value.Array [ - M.read (| - Value.String - "unexpected token " + mk_str (| + "unexpected token " |); - M.read (| - Value.String - ", expected string" + mk_str (| + ", expected string" |) ] |) @@ -9405,13 +9259,11 @@ Module parser. M.alloc (| Value.Array [ - M.read (| - Value.String - "unexpected token " + mk_str (| + "unexpected token " |); - M.read (| - Value.String - ", expected type tag" + mk_str (| + ", expected type tag" |) ] |) @@ -9761,9 +9613,7 @@ Module parser. Value.UnicodeChar 95; M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "" |) - |) + M.deref (| mk_str (| "" |) |) |) ] |) @@ -9966,9 +9816,7 @@ Module parser. Value.UnicodeChar 95; M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "" |) - |) + M.deref (| mk_str (| "" |) |) |) ] |) @@ -10171,9 +10019,7 @@ Module parser. Value.UnicodeChar 95; M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "" |) - |) + M.deref (| mk_str (| "" |) |) |) ] |) @@ -10376,9 +10222,7 @@ Module parser. Value.UnicodeChar 95; M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "" |) - |) + M.deref (| mk_str (| "" |) |) |) ] |) @@ -10581,9 +10425,7 @@ Module parser. Value.UnicodeChar 95; M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "" |) - |) + M.deref (| mk_str (| "" |) |) |) ] |) @@ -10786,9 +10628,7 @@ Module parser. Value.UnicodeChar 95; M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "" |) - |) + M.deref (| mk_str (| "" |) |) |) ] |) @@ -11265,13 +11105,11 @@ Module parser. M.alloc (| Value.Array [ - M.read (| - Value.String - "unexpected token " + mk_str (| + "unexpected token " |); - M.read (| - Value.String - ", expected transaction argument" + mk_str (| + ", expected transaction argument" |) ] |) @@ -13492,14 +13330,10 @@ Module parser. M.alloc (| Value.Array [ - M.read (| - Value.String - "invalid struct tag: " + mk_str (| + "invalid struct tag: " |); - M.read (| - Value.String - ", " - |) + mk_str (| ", " |) ] |) |) @@ -13737,9 +13571,8 @@ Module parser. M.alloc (| Value.Array [ - M.read (| - Value.String - "invalid struct tag: " + mk_str (| + "invalid struct tag: " |) ] |) 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 ff9a9a5d3..6685caeee 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/runtime_value.v +++ b/CoqOfRust/move_sui/translations/move_core_types/runtime_value.v @@ -3,21 +3,21 @@ Require Import CoqOfRust.CoqOfRust. Module runtime_value. Definition value_MOVE_STRUCT_NAME : Value.t := - M.run_constant ltac:(M.monadic (Value.String "struct")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "struct" |) |))). Axiom Constant_value_MOVE_STRUCT_NAME : (M.get_constant "move_core_types::runtime_value::MOVE_STRUCT_NAME") = value_MOVE_STRUCT_NAME. Global Hint Rewrite Constant_value_MOVE_STRUCT_NAME : constant_rewrites. Definition value_MOVE_STRUCT_TYPE : Value.t := - M.run_constant ltac:(M.monadic (Value.String "type")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "type" |) |))). Axiom Constant_value_MOVE_STRUCT_TYPE : (M.get_constant "move_core_types::runtime_value::MOVE_STRUCT_TYPE") = value_MOVE_STRUCT_TYPE. Global Hint Rewrite Constant_value_MOVE_STRUCT_TYPE : constant_rewrites. Definition value_MOVE_STRUCT_FIELDS : Value.t := - M.run_constant ltac:(M.monadic (Value.String "fields")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "fields" |) |))). Axiom Constant_value_MOVE_STRUCT_FIELDS : (M.get_constant "move_core_types::runtime_value::MOVE_STRUCT_FIELDS") = @@ -61,7 +61,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "MoveStruct" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MoveStruct" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -400,10 +400,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U8" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U8" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -435,10 +432,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U64" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U64" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -470,10 +464,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U128" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U128" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -505,10 +496,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Bool" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Bool" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -540,10 +528,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Address" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Address" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -575,10 +560,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Vector" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Vector" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -610,10 +592,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Struct" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Struct" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -645,10 +624,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Signer" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Signer" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -680,10 +656,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U16" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U16" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -715,10 +688,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U32" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U32" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -750,10 +720,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U256" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U256" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -1847,10 +1814,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MoveStructLayout" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MoveStructLayout" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1985,7 +1949,7 @@ Module runtime_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveStructLayout" |); + mk_str (| "MoveStructLayout" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2040,7 +2004,7 @@ Module runtime_value. |), [ M.read (| __deserializer |); - M.read (| Value.String "MoveStructLayout" |); + mk_str (| "MoveStructLayout" |); Value.StructRecord "move_core_types::runtime_value::_'1::deserialize::__Visitor" [ @@ -2109,9 +2073,9 @@ Module runtime_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 0; - M.read (| Value.String "bool" |) + mk_str (| "bool" |) ] |) |))); @@ -2142,9 +2106,9 @@ Module runtime_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 1; - M.read (| Value.String "u8" |) + mk_str (| "u8" |) ] |) |))); @@ -2175,9 +2139,9 @@ Module runtime_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 2; - M.read (| Value.String "u64" |) + mk_str (| "u64" |) ] |) |))); @@ -2208,9 +2172,9 @@ Module runtime_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 3; - M.read (| Value.String "u128" |) + mk_str (| "u128" |) ] |) |))); @@ -2241,9 +2205,9 @@ Module runtime_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 4; - M.read (| Value.String "address" |) + mk_str (| "address" |) ] |) |))); @@ -2284,9 +2248,9 @@ Module runtime_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 5; - M.read (| Value.String "vector" |); + mk_str (| "vector" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -2320,9 +2284,9 @@ Module runtime_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 6; - M.read (| Value.String "struct" |); + mk_str (| "struct" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -2354,9 +2318,9 @@ Module runtime_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 7; - M.read (| Value.String "signer" |) + mk_str (| "signer" |) ] |) |))); @@ -2387,9 +2351,9 @@ Module runtime_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 8; - M.read (| Value.String "u16" |) + mk_str (| "u16" |) ] |) |))); @@ -2420,9 +2384,9 @@ Module runtime_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 9; - M.read (| Value.String "u32" |) + mk_str (| "u32" |) ] |) |))); @@ -2453,9 +2417,9 @@ Module runtime_value. |), [ M.read (| __serializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); Value.Integer IntegerKind.U32 10; - M.read (| Value.String "u256" |) + mk_str (| "u256" |) ] |) |))) @@ -2501,7 +2465,7 @@ Module runtime_value. |), [ M.read (| __deserializer |); - M.read (| Value.String "MoveTypeLayout" |); + mk_str (| "MoveTypeLayout" |); M.read (| M.get_constant "move_core_types::runtime_value::_'3::deserialize::VARIANTS" |); @@ -2656,10 +2620,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Bool" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Bool" |) |) |) ] |) |))); @@ -2685,10 +2646,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U8" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U8" |) |) |) ] |) |))); @@ -2714,10 +2672,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U64" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U64" |) |) |) ] |) |))); @@ -2743,10 +2698,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U128" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U128" |) |) |) ] |) |))); @@ -2772,10 +2724,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Address" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Address" |) |) |) ] |) |))); @@ -2803,10 +2752,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Vector" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Vector" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -2838,10 +2784,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Struct" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Struct" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -2871,10 +2814,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Signer" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Signer" |) |) |) ] |) |))); @@ -2900,10 +2840,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U16" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U16" |) |) |) ] |) |))); @@ -2929,10 +2866,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U32" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U32" |) |) |) ] |) |))); @@ -2958,10 +2892,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U256" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U256" |) |) |) ] |) |))) @@ -3748,9 +3679,8 @@ Module runtime_value. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Expected inner MoveValue in Vec to be a MoveValue::U8" + mk_str (| + "Expected inner MoveValue in Vec to be a MoveValue::U8" |) |) |) @@ -4401,8 +4331,7 @@ Module runtime_value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Invalid decoration" |) ] + Value.Array [ mk_str (| "Invalid decoration" |) ] |) |) |) @@ -4649,9 +4578,7 @@ Module runtime_value. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "serialization should succeed" |) - |) + M.deref (| mk_str (| "serialization should succeed" |) |) |) ] |))) @@ -6569,7 +6496,7 @@ Module runtime_value. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| formatter |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Vector" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Vector" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -6944,7 +6871,7 @@ Module runtime_value. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| formatter |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Struct" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Struct" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -9364,7 +9291,7 @@ Module runtime_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "bool" |) ] |) + M.alloc (| Value.Array [ mk_str (| "bool" |) ] |) |) |) |) @@ -9409,7 +9336,7 @@ Module runtime_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "u8" |) ] |) + M.alloc (| Value.Array [ mk_str (| "u8" |) ] |) |) |) |) @@ -9454,7 +9381,7 @@ Module runtime_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "u16" |) ] |) + M.alloc (| Value.Array [ mk_str (| "u16" |) ] |) |) |) |) @@ -9499,7 +9426,7 @@ Module runtime_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "u32" |) ] |) + M.alloc (| Value.Array [ mk_str (| "u32" |) ] |) |) |) |) @@ -9544,7 +9471,7 @@ Module runtime_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "u64" |) ] |) + M.alloc (| Value.Array [ mk_str (| "u64" |) ] |) |) |) |) @@ -9589,7 +9516,7 @@ Module runtime_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "u128" |) ] |) + M.alloc (| Value.Array [ mk_str (| "u128" |) ] |) |) |) |) @@ -9634,7 +9561,7 @@ Module runtime_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "u256" |) ] |) + M.alloc (| Value.Array [ mk_str (| "u256" |) ] |) |) |) |) @@ -9679,9 +9606,7 @@ Module runtime_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "address" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "address" |) ] |) |) |) |) @@ -9726,7 +9651,7 @@ Module runtime_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "signer" |) ] |) + M.alloc (| Value.Array [ mk_str (| "signer" |) ] |) |) |) |) @@ -9788,11 +9713,7 @@ Module runtime_value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "vector<" |); - M.read (| Value.String ">" |) - ] + Value.Array [ mk_str (| "vector<" |); mk_str (| ">" |) ] |) |) |) @@ -9926,11 +9847,7 @@ Module runtime_value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "vector<" |); - M.read (| Value.String ">" |) - ] + Value.Array [ mk_str (| "vector<" |); mk_str (| ">" |) ] |) |) |) @@ -10034,7 +9951,7 @@ Module runtime_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -10160,7 +10077,7 @@ Module runtime_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -10302,7 +10219,7 @@ Module runtime_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -10421,7 +10338,7 @@ Module runtime_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -10563,9 +10480,7 @@ Module runtime_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "struct " |) ] - |) + M.alloc (| Value.Array [ mk_str (| "struct " |) ] |) |) |) |) @@ -11005,13 +10920,7 @@ Module runtime_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String "u8" |) - ] - |) + M.alloc (| Value.Array [ mk_str (| "" |); mk_str (| "u8" |) ] |) |) |) |); @@ -11088,11 +10997,7 @@ Module runtime_value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String "u16" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| "u16" |) ] |) |) |) @@ -11170,11 +11075,7 @@ Module runtime_value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String "u32" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| "u32" |) ] |) |) |) @@ -11252,11 +11153,7 @@ Module runtime_value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String "u64" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| "u64" |) ] |) |) |) @@ -11334,11 +11231,7 @@ Module runtime_value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String "u128" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| "u128" |) ] |) |) |) @@ -11416,11 +11309,7 @@ Module runtime_value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "" |); - M.read (| Value.String "u256" |) - ] + Value.Array [ mk_str (| "" |); mk_str (| "u256" |) ] |) |) |) @@ -11502,7 +11391,7 @@ Module runtime_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "false" |) ] |) + M.alloc (| Value.Array [ mk_str (| "false" |) ] |) |) |) |) @@ -11550,7 +11439,7 @@ Module runtime_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "true" |) ] |) + M.alloc (| Value.Array [ mk_str (| "true" |) ] |) |) |) |) @@ -11598,7 +11487,7 @@ Module runtime_value. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -11697,11 +11586,7 @@ Module runtime_value. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "signer(" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "signer(" |); mk_str (| ")" |) ] |) |) |) @@ -11801,15 +11686,9 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "vector[" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "vector[" |) |) |); M.read (| v |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "]" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "]" |) |) |) ] |) |))); @@ -11899,7 +11778,7 @@ Module runtime_value. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "struct[" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "struct[" |) |) |); M.borrow (| Pointer.Kind.Ref, M.SubPointer.get_struct_tuple_field (| @@ -11908,7 +11787,7 @@ Module runtime_value. 0 |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "]" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "]" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" diff --git a/CoqOfRust/move_sui/translations/move_core_types/state.v b/CoqOfRust/move_sui/translations/move_core_types/state.v index 7cedaf6e6..1625891c6 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/state.v +++ b/CoqOfRust/move_sui/translations/move_core_types/state.v @@ -103,10 +103,7 @@ Module state. "move_core_types::state::VMState::DESERIALIZER" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DESERIALIZER" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "DESERIALIZER" |) |) |) |))); fun γ => ltac:(M.monadic @@ -114,10 +111,7 @@ Module state. let _ := M.is_struct_tuple (| γ, "move_core_types::state::VMState::VERIFIER" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VERIFIER" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "VERIFIER" |) |) |) |))); fun γ => ltac:(M.monadic @@ -125,10 +119,7 @@ Module state. let _ := M.is_struct_tuple (| γ, "move_core_types::state::VMState::RUNTIME" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RUNTIME" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "RUNTIME" |) |) |) |))); fun γ => ltac:(M.monadic @@ -136,10 +127,7 @@ Module state. let _ := M.is_struct_tuple (| γ, "move_core_types::state::VMState::OTHER" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OTHER" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "OTHER" |) |) |) |))) ] |) 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 d39c7220c..3b1c76ad8 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/transaction_argument.v +++ b/CoqOfRust/move_sui/translations/move_core_types/transaction_argument.v @@ -1308,9 +1308,9 @@ Module transaction_argument. |), [ M.read (| __serializer |); - M.read (| Value.String "TransactionArgument" |); + mk_str (| "TransactionArgument" |); Value.Integer IntegerKind.U32 0; - M.read (| Value.String "U8" |); + mk_str (| "U8" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -1344,9 +1344,9 @@ Module transaction_argument. |), [ M.read (| __serializer |); - M.read (| Value.String "TransactionArgument" |); + mk_str (| "TransactionArgument" |); Value.Integer IntegerKind.U32 1; - M.read (| Value.String "U64" |); + mk_str (| "U64" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -1380,9 +1380,9 @@ Module transaction_argument. |), [ M.read (| __serializer |); - M.read (| Value.String "TransactionArgument" |); + mk_str (| "TransactionArgument" |); Value.Integer IntegerKind.U32 2; - M.read (| Value.String "U128" |); + mk_str (| "U128" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -1416,9 +1416,9 @@ Module transaction_argument. |), [ M.read (| __serializer |); - M.read (| Value.String "TransactionArgument" |); + mk_str (| "TransactionArgument" |); Value.Integer IntegerKind.U32 3; - M.read (| Value.String "Address" |); + mk_str (| "Address" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -1455,9 +1455,9 @@ Module transaction_argument. |), [ M.read (| __serializer |); - M.read (| Value.String "TransactionArgument" |); + mk_str (| "TransactionArgument" |); Value.Integer IntegerKind.U32 4; - M.read (| Value.String "U8Vector" |); + mk_str (| "U8Vector" |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1514,9 +1514,9 @@ Module transaction_argument. |), [ M.read (| __serializer |); - M.read (| Value.String "TransactionArgument" |); + mk_str (| "TransactionArgument" |); Value.Integer IntegerKind.U32 5; - M.read (| Value.String "Bool" |); + mk_str (| "Bool" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -1550,9 +1550,9 @@ Module transaction_argument. |), [ M.read (| __serializer |); - M.read (| Value.String "TransactionArgument" |); + mk_str (| "TransactionArgument" |); Value.Integer IntegerKind.U32 6; - M.read (| Value.String "U16" |); + mk_str (| "U16" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -1586,9 +1586,9 @@ Module transaction_argument. |), [ M.read (| __serializer |); - M.read (| Value.String "TransactionArgument" |); + mk_str (| "TransactionArgument" |); Value.Integer IntegerKind.U32 7; - M.read (| Value.String "U32" |); + mk_str (| "U32" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -1622,9 +1622,9 @@ Module transaction_argument. |), [ M.read (| __serializer |); - M.read (| Value.String "TransactionArgument" |); + mk_str (| "TransactionArgument" |); Value.Integer IntegerKind.U32 8; - M.read (| Value.String "U256" |); + mk_str (| "U256" |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __field0 |) |) |) ] |) @@ -1672,7 +1672,7 @@ Module transaction_argument. |), [ M.read (| __deserializer |); - M.read (| Value.String "TransactionArgument" |); + mk_str (| "TransactionArgument" |); M.read (| M.get_constant "move_core_types::transaction_argument::_'1::deserialize::VARIANTS" |); @@ -1723,7 +1723,7 @@ Module transaction_argument. |), [ M.read (| __deserializer |); - M.read (| Value.String "VecBytes" |); + mk_str (| "VecBytes" |); Value.StructRecord "move_core_types::transaction_argument::_'2::deserialize::__Visitor" [ @@ -1821,11 +1821,7 @@ Module transaction_argument. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "{U8: " |); - M.read (| Value.String "}" |) - ] + Value.Array [ mk_str (| "{U8: " |); mk_str (| "}" |) ] |) |) |) @@ -1903,11 +1899,7 @@ Module transaction_argument. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "{U64: " |); - M.read (| Value.String "}" |) - ] + Value.Array [ mk_str (| "{U64: " |); mk_str (| "}" |) ] |) |) |) @@ -1985,11 +1977,7 @@ Module transaction_argument. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "{U128: " |); - M.read (| Value.String "}" |) - ] + Value.Array [ mk_str (| "{U128: " |); mk_str (| "}" |) ] |) |) |) @@ -2067,11 +2055,7 @@ Module transaction_argument. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "{BOOL: " |); - M.read (| Value.String "}" |) - ] + Value.Array [ mk_str (| "{BOOL: " |); mk_str (| "}" |) ] |) |) |) @@ -2151,11 +2135,7 @@ Module transaction_argument. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "{ADDRESS: " |); - M.read (| Value.String "}" |) - ] + Value.Array [ mk_str (| "{ADDRESS: " |); mk_str (| "}" |) ] |) |) |) @@ -2243,11 +2223,7 @@ Module transaction_argument. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "{U8Vector: 0x" |); - M.read (| Value.String "}" |) - ] + Value.Array [ mk_str (| "{U8Vector: 0x" |); mk_str (| "}" |) ] |) |) |) @@ -2353,11 +2329,7 @@ Module transaction_argument. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "{U16: " |); - M.read (| Value.String "}" |) - ] + Value.Array [ mk_str (| "{U16: " |); mk_str (| "}" |) ] |) |) |) @@ -2435,11 +2407,7 @@ Module transaction_argument. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "{U32: " |); - M.read (| Value.String "}" |) - ] + Value.Array [ mk_str (| "{U32: " |); mk_str (| "}" |) ] |) |) |) @@ -2517,11 +2485,7 @@ Module transaction_argument. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "{U256: " |); - M.read (| Value.String "}" |) - ] + Value.Array [ mk_str (| "{U256: " |); mk_str (| "}" |) ] |) |) |) @@ -3219,9 +3183,8 @@ Module transaction_argument. M.alloc (| Value.Array [ - M.read (| - Value.String - "unexpected value in bytes: " + mk_str (| + "unexpected value in bytes: " |) ] |) @@ -3453,9 +3416,8 @@ Module transaction_argument. M.alloc (| Value.Array [ - M.read (| - Value.String - "invalid transaction argument: " + mk_str (| + "invalid transaction argument: " |) ] |) @@ -3836,9 +3798,7 @@ Module transaction_argument. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "transaction arguments must serialize" - |) + mk_str (| "transaction arguments must serialize" |) |) |) ] diff --git a/CoqOfRust/move_sui/translations/move_core_types/u256.v b/CoqOfRust/move_sui/translations/move_core_types/u256.v index e7348ab2b..348a2366f 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/u256.v +++ b/CoqOfRust/move_sui/translations/move_core_types/u256.v @@ -61,10 +61,7 @@ Module u256. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U256FromStrError" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U256FromStrError" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -173,7 +170,7 @@ Module u256. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TooLargeForU8" |) |) + M.deref (| mk_str (| "TooLargeForU8" |) |) |) |))); fun γ => @@ -187,7 +184,7 @@ Module u256. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TooLargeForU16" |) |) + M.deref (| mk_str (| "TooLargeForU16" |) |) |) |))); fun γ => @@ -201,7 +198,7 @@ Module u256. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TooLargeForU32" |) |) + M.deref (| mk_str (| "TooLargeForU32" |) |) |) |))); fun γ => @@ -215,7 +212,7 @@ Module u256. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TooLargeForU64" |) |) + M.deref (| mk_str (| "TooLargeForU64" |) |) |) |))); fun γ => @@ -229,7 +226,7 @@ Module u256. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TooLargeForU128" |) |) + M.deref (| mk_str (| "TooLargeForU128" |) |) |) |))) ] @@ -463,11 +460,8 @@ Module u256. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "U256CastError" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "kind" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U256CastError" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "kind" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -481,7 +475,7 @@ Module u256. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "val" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "val" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -610,7 +604,7 @@ Module u256. γ, "move_core_types::u256::U256CastErrorKind::TooLargeForU8" |) in - Value.String "u8")); + M.alloc (| mk_str (| "u8" |) |))); fun γ => ltac:(M.monadic (let _ := @@ -619,10 +613,7 @@ Module u256. "move_core_types::u256::U256CastErrorKind::TooLargeForU16" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "u16" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "u16" |) |) |) |))); fun γ => ltac:(M.monadic @@ -632,10 +623,7 @@ Module u256. "move_core_types::u256::U256CastErrorKind::TooLargeForU32" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "u32" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "u32" |) |) |) |))); fun γ => ltac:(M.monadic @@ -645,10 +633,7 @@ Module u256. "move_core_types::u256::U256CastErrorKind::TooLargeForU64" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "u64" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "u64" |) |) |) |))); fun γ => ltac:(M.monadic @@ -658,10 +643,7 @@ Module u256. "move_core_types::u256::U256CastErrorKind::TooLargeForU128" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "u128" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "u128" |) |) |) |))) ] |) @@ -703,9 +685,9 @@ Module u256. M.alloc (| Value.Array [ - M.read (| Value.String "Cast failed. " |); - M.read (| Value.String " too large for " |); - M.read (| Value.String "." |) + mk_str (| "Cast failed. " |); + mk_str (| " too large for " |); + mk_str (| "." |) ] |) |) @@ -798,7 +780,7 @@ Module u256. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -932,10 +914,7 @@ Module u256. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| @@ -1050,7 +1029,7 @@ Module u256. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "U256" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "U256" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3957,8 +3936,7 @@ Module u256. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Fatal! Downcast failed" |) ] + Value.Array [ mk_str (| "Fatal! Downcast failed" |) ] |) |) |) @@ -4947,7 +4925,7 @@ Module u256. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -5051,7 +5029,7 @@ Module u256. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Cannot convert to U256" |) |) + M.deref (| mk_str (| "Cannot convert to U256" |) |) |) ] |) @@ -5760,11 +5738,8 @@ Module u256. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UniformU256" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "low" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "UniformU256" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "low" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5778,7 +5753,7 @@ Module u256. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "range" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "range" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5792,7 +5767,7 @@ Module u256. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "z" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "z" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -6116,11 +6091,7 @@ Module u256. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String - "Uniform::new called with `low >= high`" - |) + [ mk_str (| "Uniform::new called with `low >= high`" |) ] |) |) @@ -6306,9 +6277,8 @@ Module u256. M.alloc (| Value.Array [ - M.read (| - Value.String - "Uniform::new_inclusive called with `low > high`" + mk_str (| + "Uniform::new_inclusive called with `low > high`" |) ] |) @@ -6869,9 +6839,8 @@ Module u256. M.alloc (| Value.Array [ - M.read (| - Value.String - "UniformSampler::sample_single: low >= high" + mk_str (| + "UniformSampler::sample_single: low >= high" |) ] |) @@ -7070,9 +7039,8 @@ Module u256. M.alloc (| Value.Array [ - M.read (| - Value.String - "UniformSampler::sample_single_inclusive: low > high" + mk_str (| + "UniformSampler::sample_single_inclusive: low > high" |) ] |) 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 bc8d4e9b2..010edaab9 100644 --- a/CoqOfRust/move_sui/translations/move_core_types/vm_status.v +++ b/CoqOfRust/move_sui/translations/move_core_types/vm_status.v @@ -355,10 +355,7 @@ Module vm_status. "move_core_types::vm_status::StatusType::Validation" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Validation" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Validation" |) |) |) |))); fun γ => ltac:(M.monadic @@ -369,10 +366,7 @@ Module vm_status. "move_core_types::vm_status::StatusType::Verification" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Verification" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Verification" |) |) |) |))); fun γ => ltac:(M.monadic @@ -385,7 +379,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvariantViolation" |) |) + M.deref (| mk_str (| "InvariantViolation" |) |) |) |))); fun γ => @@ -399,7 +393,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Deserialization" |) |) + M.deref (| mk_str (| "Deserialization" |) |) |) |))); fun γ => @@ -411,10 +405,7 @@ Module vm_status. "move_core_types::vm_status::StatusType::Execution" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Execution" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Execution" |) |) |) |))); fun γ => ltac:(M.monadic @@ -425,10 +416,7 @@ Module vm_status. "move_core_types::vm_status::StatusType::Unknown" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Unknown" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Unknown" |) |) |) |))) ] |) @@ -1894,7 +1882,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNKNOWN_VALIDATION_STATUS" |) |) + M.deref (| mk_str (| "UNKNOWN_VALIDATION_STATUS" |) |) |) |))); fun γ => @@ -1908,7 +1896,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "INVALID_SIGNATURE" |) |) + M.deref (| mk_str (| "INVALID_SIGNATURE" |) |) |) |))); fun γ => @@ -1922,7 +1910,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "INVALID_AUTH_KEY" |) |) + M.deref (| mk_str (| "INVALID_AUTH_KEY" |) |) |) |))); fun γ => @@ -1936,7 +1924,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SEQUENCE_NUMBER_TOO_OLD" |) |) + M.deref (| mk_str (| "SEQUENCE_NUMBER_TOO_OLD" |) |) |) |))); fun γ => @@ -1950,7 +1938,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SEQUENCE_NUMBER_TOO_NEW" |) |) + M.deref (| mk_str (| "SEQUENCE_NUMBER_TOO_NEW" |) |) |) |))); fun γ => @@ -1964,9 +1952,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "INSUFFICIENT_BALANCE_FOR_TRANSACTION_FEE" |) - |) + M.deref (| mk_str (| "INSUFFICIENT_BALANCE_FOR_TRANSACTION_FEE" |) |) |) |))); fun γ => @@ -1980,7 +1966,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TRANSACTION_EXPIRED" |) |) + M.deref (| mk_str (| "TRANSACTION_EXPIRED" |) |) |) |))); fun γ => @@ -1994,7 +1980,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SENDING_ACCOUNT_DOES_NOT_EXIST" |) |) + M.deref (| mk_str (| "SENDING_ACCOUNT_DOES_NOT_EXIST" |) |) |) |))); fun γ => @@ -2008,7 +1994,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "REJECTED_WRITE_SET" |) |) + M.deref (| mk_str (| "REJECTED_WRITE_SET" |) |) |) |))); fun γ => @@ -2022,7 +2008,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "INVALID_WRITE_SET" |) |) + M.deref (| mk_str (| "INVALID_WRITE_SET" |) |) |) |))); fun γ => @@ -2036,7 +2022,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EXCEEDED_MAX_TRANSACTION_SIZE" |) |) + M.deref (| mk_str (| "EXCEEDED_MAX_TRANSACTION_SIZE" |) |) |) |))); fun γ => @@ -2050,7 +2036,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNKNOWN_SCRIPT" |) |) + M.deref (| mk_str (| "UNKNOWN_SCRIPT" |) |) |) |))); fun γ => @@ -2064,7 +2050,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNKNOWN_MODULE" |) |) + M.deref (| mk_str (| "UNKNOWN_MODULE" |) |) |) |))); fun γ => @@ -2078,9 +2064,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "MAX_GAS_UNITS_EXCEEDS_MAX_GAS_UNITS_BOUND" |) - |) + M.deref (| mk_str (| "MAX_GAS_UNITS_EXCEEDS_MAX_GAS_UNITS_BOUND" |) |) |) |))); fun γ => @@ -2095,9 +2079,7 @@ Module vm_status. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "MAX_GAS_UNITS_BELOW_MIN_TRANSACTION_GAS_UNITS" - |) + mk_str (| "MAX_GAS_UNITS_BELOW_MIN_TRANSACTION_GAS_UNITS" |) |) |) |))); @@ -2112,7 +2094,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "GAS_UNIT_PRICE_BELOW_MIN_BOUND" |) |) + M.deref (| mk_str (| "GAS_UNIT_PRICE_BELOW_MIN_BOUND" |) |) |) |))); fun γ => @@ -2126,7 +2108,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "GAS_UNIT_PRICE_ABOVE_MAX_BOUND" |) |) + M.deref (| mk_str (| "GAS_UNIT_PRICE_ABOVE_MAX_BOUND" |) |) |) |))); fun γ => @@ -2140,7 +2122,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "INVALID_GAS_SPECIFIER" |) |) + M.deref (| mk_str (| "INVALID_GAS_SPECIFIER" |) |) |) |))); fun γ => @@ -2154,7 +2136,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SENDING_ACCOUNT_FROZEN" |) |) + M.deref (| mk_str (| "SENDING_ACCOUNT_FROZEN" |) |) |) |))); fun γ => @@ -2168,7 +2150,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNABLE_TO_DESERIALIZE_ACCOUNT" |) |) + M.deref (| mk_str (| "UNABLE_TO_DESERIALIZE_ACCOUNT" |) |) |) |))); fun γ => @@ -2182,7 +2164,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CURRENCY_INFO_DOES_NOT_EXIST" |) |) + M.deref (| mk_str (| "CURRENCY_INFO_DOES_NOT_EXIST" |) |) |) |))); fun γ => @@ -2196,7 +2178,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "INVALID_MODULE_PUBLISHER" |) |) + M.deref (| mk_str (| "INVALID_MODULE_PUBLISHER" |) |) |) |))); fun γ => @@ -2210,7 +2192,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NO_ACCOUNT_ROLE" |) |) + M.deref (| mk_str (| "NO_ACCOUNT_ROLE" |) |) |) |))); fun γ => @@ -2222,10 +2204,7 @@ Module vm_status. "move_core_types::vm_status::StatusCode::BAD_CHAIN_ID" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BAD_CHAIN_ID" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BAD_CHAIN_ID" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2238,7 +2217,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SEQUENCE_NUMBER_TOO_BIG" |) |) + M.deref (| mk_str (| "SEQUENCE_NUMBER_TOO_BIG" |) |) |) |))); fun γ => @@ -2252,7 +2231,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BAD_TRANSACTION_FEE_CURRENCY" |) |) + M.deref (| mk_str (| "BAD_TRANSACTION_FEE_CURRENCY" |) |) |) |))); fun γ => @@ -2266,7 +2245,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FEATURE_UNDER_GATING" |) |) + M.deref (| mk_str (| "FEATURE_UNDER_GATING" |) |) |) |))); fun γ => @@ -2280,9 +2259,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "SECONDARY_KEYS_ADDRESSES_COUNT_MISMATCH" |) - |) + M.deref (| mk_str (| "SECONDARY_KEYS_ADDRESSES_COUNT_MISMATCH" |) |) |) |))); fun γ => @@ -2296,7 +2273,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SIGNERS_CONTAIN_DUPLICATES" |) |) + M.deref (| mk_str (| "SIGNERS_CONTAIN_DUPLICATES" |) |) |) |))); fun γ => @@ -2310,7 +2287,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SEQUENCE_NONCE_INVALID" |) |) + M.deref (| mk_str (| "SEQUENCE_NONCE_INVALID" |) |) |) |))); fun γ => @@ -2324,9 +2301,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "CHAIN_ACCOUNT_INFO_DOES_NOT_EXIST" |) - |) + M.deref (| mk_str (| "CHAIN_ACCOUNT_INFO_DOES_NOT_EXIST" |) |) |) |))); fun γ => @@ -2340,7 +2315,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNKNOWN_VERIFICATION_ERROR" |) |) + M.deref (| mk_str (| "UNKNOWN_VERIFICATION_ERROR" |) |) |) |))); fun γ => @@ -2354,7 +2329,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "INDEX_OUT_OF_BOUNDS" |) |) + M.deref (| mk_str (| "INDEX_OUT_OF_BOUNDS" |) |) |) |))); fun γ => @@ -2368,7 +2343,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "INVALID_SIGNATURE_TOKEN" |) |) + M.deref (| mk_str (| "INVALID_SIGNATURE_TOKEN" |) |) |) |))); fun γ => @@ -2382,7 +2357,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RECURSIVE_STRUCT_DEFINITION" |) |) + M.deref (| mk_str (| "RECURSIVE_STRUCT_DEFINITION" |) |) |) |))); fun γ => @@ -2396,7 +2371,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FIELD_MISSING_TYPE_ABILITY" |) |) + M.deref (| mk_str (| "FIELD_MISSING_TYPE_ABILITY" |) |) |) |))); fun γ => @@ -2410,7 +2385,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "INVALID_FALL_THROUGH" |) |) + M.deref (| mk_str (| "INVALID_FALL_THROUGH" |) |) |) |))); fun γ => @@ -2424,9 +2399,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "NEGATIVE_STACK_SIZE_WITHIN_BLOCK" |) - |) + M.deref (| mk_str (| "NEGATIVE_STACK_SIZE_WITHIN_BLOCK" |) |) |) |))); fun γ => @@ -2440,9 +2413,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "INVALID_MAIN_FUNCTION_SIGNATURE" |) - |) + M.deref (| mk_str (| "INVALID_MAIN_FUNCTION_SIGNATURE" |) |) |) |))); fun γ => @@ -2456,7 +2427,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DUPLICATE_ELEMENT" |) |) + M.deref (| mk_str (| "DUPLICATE_ELEMENT" |) |) |) |))); fun γ => @@ -2470,7 +2441,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "INVALID_MODULE_HANDLE" |) |) + M.deref (| mk_str (| "INVALID_MODULE_HANDLE" |) |) |) |))); fun γ => @@ -2484,7 +2455,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNIMPLEMENTED_HANDLE" |) |) + M.deref (| mk_str (| "UNIMPLEMENTED_HANDLE" |) |) |) |))); fun γ => @@ -2498,7 +2469,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LOOKUP_FAILED" |) |) + M.deref (| mk_str (| "LOOKUP_FAILED" |) |) |) |))); fun γ => @@ -2512,7 +2483,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TYPE_MISMATCH" |) |) + M.deref (| mk_str (| "TYPE_MISMATCH" |) |) |) |))); fun γ => @@ -2526,7 +2497,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MISSING_DEPENDENCY" |) |) + M.deref (| mk_str (| "MISSING_DEPENDENCY" |) |) |) |))); fun γ => @@ -2540,7 +2511,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "POP_WITHOUT_DROP_ABILITY" |) |) + M.deref (| mk_str (| "POP_WITHOUT_DROP_ABILITY" |) |) |) |))); fun γ => @@ -2554,7 +2525,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BR_TYPE_MISMATCH_ERROR" |) |) + M.deref (| mk_str (| "BR_TYPE_MISMATCH_ERROR" |) |) |) |))); fun γ => @@ -2568,7 +2539,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ABORT_TYPE_MISMATCH_ERROR" |) |) + M.deref (| mk_str (| "ABORT_TYPE_MISMATCH_ERROR" |) |) |) |))); fun γ => @@ -2582,7 +2553,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "STLOC_TYPE_MISMATCH_ERROR" |) |) + M.deref (| mk_str (| "STLOC_TYPE_MISMATCH_ERROR" |) |) |) |))); fun γ => @@ -2596,7 +2567,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "STLOC_UNSAFE_TO_DESTROY_ERROR" |) |) + M.deref (| mk_str (| "STLOC_UNSAFE_TO_DESTROY_ERROR" |) |) |) |))); fun γ => @@ -2610,11 +2581,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| - Value.String "UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED" - |) - |) + M.deref (| mk_str (| "UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED" |) |) |) |))); fun γ => @@ -2628,7 +2595,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RET_TYPE_MISMATCH_ERROR" |) |) + M.deref (| mk_str (| "RET_TYPE_MISMATCH_ERROR" |) |) |) |))); fun γ => @@ -2642,9 +2609,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "RET_BORROWED_MUTABLE_REFERENCE_ERROR" |) - |) + M.deref (| mk_str (| "RET_BORROWED_MUTABLE_REFERENCE_ERROR" |) |) |) |))); fun γ => @@ -2658,7 +2623,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FREEZEREF_TYPE_MISMATCH_ERROR" |) |) + M.deref (| mk_str (| "FREEZEREF_TYPE_MISMATCH_ERROR" |) |) |) |))); fun γ => @@ -2672,9 +2637,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "FREEZEREF_EXISTS_MUTABLE_BORROW_ERROR" |) - |) + M.deref (| mk_str (| "FREEZEREF_EXISTS_MUTABLE_BORROW_ERROR" |) |) |) |))); fun γ => @@ -2688,9 +2651,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "BORROWFIELD_TYPE_MISMATCH_ERROR" |) - |) + M.deref (| mk_str (| "BORROWFIELD_TYPE_MISMATCH_ERROR" |) |) |) |))); fun γ => @@ -2704,7 +2665,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BORROWFIELD_BAD_FIELD_ERROR" |) |) + M.deref (| mk_str (| "BORROWFIELD_BAD_FIELD_ERROR" |) |) |) |))); fun γ => @@ -2718,9 +2679,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "BORROWFIELD_EXISTS_MUTABLE_BORROW_ERROR" |) - |) + M.deref (| mk_str (| "BORROWFIELD_EXISTS_MUTABLE_BORROW_ERROR" |) |) |) |))); fun γ => @@ -2734,7 +2693,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "COPYLOC_UNAVAILABLE_ERROR" |) |) + M.deref (| mk_str (| "COPYLOC_UNAVAILABLE_ERROR" |) |) |) |))); fun γ => @@ -2748,7 +2707,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "COPYLOC_WITHOUT_COPY_ABILITY" |) |) + M.deref (| mk_str (| "COPYLOC_WITHOUT_COPY_ABILITY" |) |) |) |))); fun γ => @@ -2762,7 +2721,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "COPYLOC_EXISTS_BORROW_ERROR" |) |) + M.deref (| mk_str (| "COPYLOC_EXISTS_BORROW_ERROR" |) |) |) |))); fun γ => @@ -2776,7 +2735,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MOVELOC_UNAVAILABLE_ERROR" |) |) + M.deref (| mk_str (| "MOVELOC_UNAVAILABLE_ERROR" |) |) |) |))); fun γ => @@ -2790,7 +2749,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MOVELOC_EXISTS_BORROW_ERROR" |) |) + M.deref (| mk_str (| "MOVELOC_EXISTS_BORROW_ERROR" |) |) |) |))); fun γ => @@ -2804,7 +2763,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BORROWLOC_REFERENCE_ERROR" |) |) + M.deref (| mk_str (| "BORROWLOC_REFERENCE_ERROR" |) |) |) |))); fun γ => @@ -2818,7 +2777,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BORROWLOC_UNAVAILABLE_ERROR" |) |) + M.deref (| mk_str (| "BORROWLOC_UNAVAILABLE_ERROR" |) |) |) |))); fun γ => @@ -2832,7 +2791,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BORROWLOC_EXISTS_BORROW_ERROR" |) |) + M.deref (| mk_str (| "BORROWLOC_EXISTS_BORROW_ERROR" |) |) |) |))); fun γ => @@ -2846,7 +2805,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CALL_TYPE_MISMATCH_ERROR" |) |) + M.deref (| mk_str (| "CALL_TYPE_MISMATCH_ERROR" |) |) |) |))); fun γ => @@ -2860,9 +2819,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "CALL_BORROWED_MUTABLE_REFERENCE_ERROR" |) - |) + M.deref (| mk_str (| "CALL_BORROWED_MUTABLE_REFERENCE_ERROR" |) |) |) |))); fun γ => @@ -2876,7 +2833,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PACK_TYPE_MISMATCH_ERROR" |) |) + M.deref (| mk_str (| "PACK_TYPE_MISMATCH_ERROR" |) |) |) |))); fun γ => @@ -2890,7 +2847,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNPACK_TYPE_MISMATCH_ERROR" |) |) + M.deref (| mk_str (| "UNPACK_TYPE_MISMATCH_ERROR" |) |) |) |))); fun γ => @@ -2904,7 +2861,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "READREF_TYPE_MISMATCH_ERROR" |) |) + M.deref (| mk_str (| "READREF_TYPE_MISMATCH_ERROR" |) |) |) |))); fun γ => @@ -2918,7 +2875,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "READREF_WITHOUT_COPY_ABILITY" |) |) + M.deref (| mk_str (| "READREF_WITHOUT_COPY_ABILITY" |) |) |) |))); fun γ => @@ -2932,9 +2889,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "READREF_EXISTS_MUTABLE_BORROW_ERROR" |) - |) + M.deref (| mk_str (| "READREF_EXISTS_MUTABLE_BORROW_ERROR" |) |) |) |))); fun γ => @@ -2948,7 +2903,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "WRITEREF_TYPE_MISMATCH_ERROR" |) |) + M.deref (| mk_str (| "WRITEREF_TYPE_MISMATCH_ERROR" |) |) |) |))); fun γ => @@ -2962,7 +2917,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "WRITEREF_WITHOUT_DROP_ABILITY" |) |) + M.deref (| mk_str (| "WRITEREF_WITHOUT_DROP_ABILITY" |) |) |) |))); fun γ => @@ -2976,7 +2931,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "WRITEREF_EXISTS_BORROW_ERROR" |) |) + M.deref (| mk_str (| "WRITEREF_EXISTS_BORROW_ERROR" |) |) |) |))); fun γ => @@ -2990,9 +2945,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "WRITEREF_NO_MUTABLE_REFERENCE_ERROR" |) - |) + M.deref (| mk_str (| "WRITEREF_NO_MUTABLE_REFERENCE_ERROR" |) |) |) |))); fun γ => @@ -3006,7 +2959,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "INTEGER_OP_TYPE_MISMATCH_ERROR" |) |) + M.deref (| mk_str (| "INTEGER_OP_TYPE_MISMATCH_ERROR" |) |) |) |))); fun γ => @@ -3020,7 +2973,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BOOLEAN_OP_TYPE_MISMATCH_ERROR" |) |) + M.deref (| mk_str (| "BOOLEAN_OP_TYPE_MISMATCH_ERROR" |) |) |) |))); fun γ => @@ -3034,9 +2987,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "EQUALITY_OP_TYPE_MISMATCH_ERROR" |) - |) + M.deref (| mk_str (| "EQUALITY_OP_TYPE_MISMATCH_ERROR" |) |) |) |))); fun γ => @@ -3050,9 +3001,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "EXISTS_WITHOUT_KEY_ABILITY_OR_BAD_ARGUMENT" |) - |) + M.deref (| mk_str (| "EXISTS_WITHOUT_KEY_ABILITY_OR_BAD_ARGUMENT" |) |) |) |))); fun γ => @@ -3066,9 +3015,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "BORROWGLOBAL_TYPE_MISMATCH_ERROR" |) - |) + M.deref (| mk_str (| "BORROWGLOBAL_TYPE_MISMATCH_ERROR" |) |) |) |))); fun γ => @@ -3082,9 +3029,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "BORROWGLOBAL_WITHOUT_KEY_ABILITY" |) - |) + M.deref (| mk_str (| "BORROWGLOBAL_WITHOUT_KEY_ABILITY" |) |) |) |))); fun γ => @@ -3098,7 +3043,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MOVEFROM_TYPE_MISMATCH_ERROR" |) |) + M.deref (| mk_str (| "MOVEFROM_TYPE_MISMATCH_ERROR" |) |) |) |))); fun γ => @@ -3112,7 +3057,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MOVEFROM_WITHOUT_KEY_ABILITY" |) |) + M.deref (| mk_str (| "MOVEFROM_WITHOUT_KEY_ABILITY" |) |) |) |))); fun γ => @@ -3126,7 +3071,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MOVETO_TYPE_MISMATCH_ERROR" |) |) + M.deref (| mk_str (| "MOVETO_TYPE_MISMATCH_ERROR" |) |) |) |))); fun γ => @@ -3140,7 +3085,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MOVETO_WITHOUT_KEY_ABILITY" |) |) + M.deref (| mk_str (| "MOVETO_WITHOUT_KEY_ABILITY" |) |) |) |))); fun γ => @@ -3154,9 +3099,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "MODULE_ADDRESS_DOES_NOT_MATCH_SENDER" |) - |) + M.deref (| mk_str (| "MODULE_ADDRESS_DOES_NOT_MATCH_SENDER" |) |) |) |))); fun γ => @@ -3170,7 +3113,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NO_MODULE_HANDLES" |) |) + M.deref (| mk_str (| "NO_MODULE_HANDLES" |) |) |) |))); fun γ => @@ -3184,9 +3127,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "POSITIVE_STACK_SIZE_AT_BLOCK_END" |) - |) + M.deref (| mk_str (| "POSITIVE_STACK_SIZE_AT_BLOCK_END" |) |) |) |))); fun γ => @@ -3200,7 +3141,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MISSING_ACQUIRES_ANNOTATION" |) |) + M.deref (| mk_str (| "MISSING_ACQUIRES_ANNOTATION" |) |) |) |))); fun γ => @@ -3214,7 +3155,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EXTRANEOUS_ACQUIRES_ANNOTATION" |) |) + M.deref (| mk_str (| "EXTRANEOUS_ACQUIRES_ANNOTATION" |) |) |) |))); fun γ => @@ -3228,7 +3169,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DUPLICATE_ACQUIRES_ANNOTATION" |) |) + M.deref (| mk_str (| "DUPLICATE_ACQUIRES_ANNOTATION" |) |) |) |))); fun γ => @@ -3242,7 +3183,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "INVALID_ACQUIRES_ANNOTATION" |) |) + M.deref (| mk_str (| "INVALID_ACQUIRES_ANNOTATION" |) |) |) |))); fun γ => @@ -3256,7 +3197,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "GLOBAL_REFERENCE_ERROR" |) |) + M.deref (| mk_str (| "GLOBAL_REFERENCE_ERROR" |) |) |) |))); fun γ => @@ -3270,7 +3211,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CONSTRAINT_NOT_SATISFIED" |) |) + M.deref (| mk_str (| "CONSTRAINT_NOT_SATISFIED" |) |) |) |))); fun γ => @@ -3284,9 +3225,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "NUMBER_OF_TYPE_ARGUMENTS_MISMATCH" |) - |) + M.deref (| mk_str (| "NUMBER_OF_TYPE_ARGUMENTS_MISMATCH" |) |) |) |))); fun γ => @@ -3300,7 +3239,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LOOP_IN_INSTANTIATION_GRAPH" |) |) + M.deref (| mk_str (| "LOOP_IN_INSTANTIATION_GRAPH" |) |) |) |))); fun γ => @@ -3314,7 +3253,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ZERO_SIZED_STRUCT" |) |) + M.deref (| mk_str (| "ZERO_SIZED_STRUCT" |) |) |) |))); fun γ => @@ -3326,10 +3265,7 @@ Module vm_status. "move_core_types::vm_status::StatusCode::LINKER_ERROR" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LINKER_ERROR" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LINKER_ERROR" |) |) |) |))); fun γ => ltac:(M.monadic @@ -3342,7 +3278,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "INVALID_CONSTANT_TYPE" |) |) + M.deref (| mk_str (| "INVALID_CONSTANT_TYPE" |) |) |) |))); fun γ => @@ -3356,7 +3292,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MALFORMED_CONSTANT_DATA" |) |) + M.deref (| mk_str (| "MALFORMED_CONSTANT_DATA" |) |) |) |))); fun γ => @@ -3370,7 +3306,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EMPTY_CODE_UNIT" |) |) + M.deref (| mk_str (| "EMPTY_CODE_UNIT" |) |) |) |))); fun γ => @@ -3384,7 +3320,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "INVALID_LOOP_SPLIT" |) |) + M.deref (| mk_str (| "INVALID_LOOP_SPLIT" |) |) |) |))); fun γ => @@ -3398,7 +3334,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "INVALID_LOOP_BREAK" |) |) + M.deref (| mk_str (| "INVALID_LOOP_BREAK" |) |) |) |))); fun γ => @@ -3412,7 +3348,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "INVALID_LOOP_CONTINUE" |) |) + M.deref (| mk_str (| "INVALID_LOOP_CONTINUE" |) |) |) |))); fun γ => @@ -3426,9 +3362,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP" |) - |) + M.deref (| mk_str (| "UNSAFE_RET_UNUSED_VALUES_WITHOUT_DROP" |) |) |) |))); fun γ => @@ -3442,7 +3376,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TOO_MANY_LOCALS" |) |) + M.deref (| mk_str (| "TOO_MANY_LOCALS" |) |) |) |))); fun γ => @@ -3456,7 +3390,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "GENERIC_MEMBER_OPCODE_MISMATCH" |) |) + M.deref (| mk_str (| "GENERIC_MEMBER_OPCODE_MISMATCH" |) |) |) |))); fun γ => @@ -3470,7 +3404,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FUNCTION_RESOLUTION_FAILURE" |) |) + M.deref (| mk_str (| "FUNCTION_RESOLUTION_FAILURE" |) |) |) |))); fun γ => @@ -3484,7 +3418,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "INVALID_OPERATION_IN_SCRIPT" |) |) + M.deref (| mk_str (| "INVALID_OPERATION_IN_SCRIPT" |) |) |) |))); fun γ => @@ -3498,7 +3432,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DUPLICATE_MODULE_NAME" |) |) + M.deref (| mk_str (| "DUPLICATE_MODULE_NAME" |) |) |) |))); fun γ => @@ -3512,9 +3446,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "BACKWARD_INCOMPATIBLE_MODULE_UPDATE" |) - |) + M.deref (| mk_str (| "BACKWARD_INCOMPATIBLE_MODULE_UPDATE" |) |) |) |))); fun γ => @@ -3528,7 +3460,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CYCLIC_MODULE_DEPENDENCY" |) |) + M.deref (| mk_str (| "CYCLIC_MODULE_DEPENDENCY" |) |) |) |))); fun γ => @@ -3542,7 +3474,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NUMBER_OF_ARGUMENTS_MISMATCH" |) |) + M.deref (| mk_str (| "NUMBER_OF_ARGUMENTS_MISMATCH" |) |) |) |))); fun γ => @@ -3556,9 +3488,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "INVALID_PARAM_TYPE_FOR_DESERIALIZATION" |) - |) + M.deref (| mk_str (| "INVALID_PARAM_TYPE_FOR_DESERIALIZATION" |) |) |) |))); fun γ => @@ -3572,7 +3502,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FAILED_TO_DESERIALIZE_ARGUMENT" |) |) + M.deref (| mk_str (| "FAILED_TO_DESERIALIZE_ARGUMENT" |) |) |) |))); fun γ => @@ -3586,9 +3516,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "NUMBER_OF_SIGNER_ARGUMENTS_MISMATCH" |) - |) + M.deref (| mk_str (| "NUMBER_OF_SIGNER_ARGUMENTS_MISMATCH" |) |) |) |))); fun γ => @@ -3603,9 +3531,7 @@ Module vm_status. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "CALLED_SCRIPT_VISIBLE_FROM_NON_SCRIPT_VISIBLE" - |) + mk_str (| "CALLED_SCRIPT_VISIBLE_FROM_NON_SCRIPT_VISIBLE" |) |) |) |))); @@ -3621,9 +3547,7 @@ Module vm_status. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "EXECUTE_ENTRY_FUNCTION_CALLED_ON_NON_ENTRY_FUNCTION" - |) + mk_str (| "EXECUTE_ENTRY_FUNCTION_CALLED_ON_NON_ENTRY_FUNCTION" |) |) |) |))); @@ -3638,7 +3562,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "INVALID_FRIEND_DECL_WITH_SELF" |) |) + M.deref (| mk_str (| "INVALID_FRIEND_DECL_WITH_SELF" |) |) |) |))); fun γ => @@ -3653,9 +3577,8 @@ Module vm_status. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "INVALID_FRIEND_DECL_WITH_MODULES_OUTSIDE_ACCOUNT_ADDRESS" + mk_str (| + "INVALID_FRIEND_DECL_WITH_MODULES_OUTSIDE_ACCOUNT_ADDRESS" |) |) |) @@ -3672,9 +3595,7 @@ Module vm_status. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "INVALID_FRIEND_DECL_WITH_MODULES_IN_DEPENDENCIES" - |) + mk_str (| "INVALID_FRIEND_DECL_WITH_MODULES_IN_DEPENDENCIES" |) |) |) |))); @@ -3689,7 +3610,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CYCLIC_MODULE_FRIENDSHIP" |) |) + M.deref (| mk_str (| "CYCLIC_MODULE_FRIENDSHIP" |) |) |) |))); fun γ => @@ -3703,9 +3624,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "INVALID_PHANTOM_TYPE_PARAM_POSITION" |) - |) + M.deref (| mk_str (| "INVALID_PHANTOM_TYPE_PARAM_POSITION" |) |) |) |))); fun γ => @@ -3719,9 +3638,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR" |) - |) + M.deref (| mk_str (| "VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR" |) |) |) |))); fun γ => @@ -3736,9 +3653,7 @@ Module vm_status. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "VEC_BORROW_ELEMENT_EXISTS_MUTABLE_BORROW_ERROR" - |) + mk_str (| "VEC_BORROW_ELEMENT_EXISTS_MUTABLE_BORROW_ERROR" |) |) |) |))); @@ -3753,7 +3668,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LOOP_MAX_DEPTH_REACHED" |) |) + M.deref (| mk_str (| "LOOP_MAX_DEPTH_REACHED" |) |) |) |))); fun γ => @@ -3767,7 +3682,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TOO_MANY_TYPE_PARAMETERS" |) |) + M.deref (| mk_str (| "TOO_MANY_TYPE_PARAMETERS" |) |) |) |))); fun γ => @@ -3781,7 +3696,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TOO_MANY_PARAMETERS" |) |) + M.deref (| mk_str (| "TOO_MANY_PARAMETERS" |) |) |) |))); fun γ => @@ -3795,7 +3710,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TOO_MANY_BASIC_BLOCKS" |) |) + M.deref (| mk_str (| "TOO_MANY_BASIC_BLOCKS" |) |) |) |))); fun γ => @@ -3809,7 +3724,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VALUE_STACK_OVERFLOW" |) |) + M.deref (| mk_str (| "VALUE_STACK_OVERFLOW" |) |) |) |))); fun γ => @@ -3823,7 +3738,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TOO_MANY_TYPE_NODES" |) |) + M.deref (| mk_str (| "TOO_MANY_TYPE_NODES" |) |) |) |))); fun γ => @@ -3837,7 +3752,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VALUE_STACK_PUSH_OVERFLOW" |) |) + M.deref (| mk_str (| "VALUE_STACK_PUSH_OVERFLOW" |) |) |) |))); fun γ => @@ -3851,7 +3766,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MAX_DEPENDENCY_DEPTH_REACHED" |) |) + M.deref (| mk_str (| "MAX_DEPENDENCY_DEPTH_REACHED" |) |) |) |))); fun γ => @@ -3865,9 +3780,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "MAX_FUNCTION_DEFINITIONS_REACHED" |) - |) + M.deref (| mk_str (| "MAX_FUNCTION_DEFINITIONS_REACHED" |) |) |) |))); fun γ => @@ -3881,7 +3794,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MAX_STRUCT_DEFINITIONS_REACHED" |) |) + M.deref (| mk_str (| "MAX_STRUCT_DEFINITIONS_REACHED" |) |) |) |))); fun γ => @@ -3895,7 +3808,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MAX_FIELD_DEFINITIONS_REACHED" |) |) + M.deref (| mk_str (| "MAX_FIELD_DEFINITIONS_REACHED" |) |) |) |))); fun γ => @@ -3909,7 +3822,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TOO_MANY_BACK_EDGES" |) |) + M.deref (| mk_str (| "TOO_MANY_BACK_EDGES" |) |) |) |))); fun γ => @@ -3923,7 +3836,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RESERVED_VERIFICATION_ERROR_1" |) |) + M.deref (| mk_str (| "RESERVED_VERIFICATION_ERROR_1" |) |) |) |))); fun γ => @@ -3937,7 +3850,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RESERVED_VERIFICATION_ERROR_2" |) |) + M.deref (| mk_str (| "RESERVED_VERIFICATION_ERROR_2" |) |) |) |))); fun γ => @@ -3951,7 +3864,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RESERVED_VERIFICATION_ERROR_3" |) |) + M.deref (| mk_str (| "RESERVED_VERIFICATION_ERROR_3" |) |) |) |))); fun γ => @@ -3965,7 +3878,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RESERVED_VERIFICATION_ERROR_4" |) |) + M.deref (| mk_str (| "RESERVED_VERIFICATION_ERROR_4" |) |) |) |))); fun γ => @@ -3979,7 +3892,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RESERVED_VERIFICATION_ERROR_5" |) |) + M.deref (| mk_str (| "RESERVED_VERIFICATION_ERROR_5" |) |) |) |))); fun γ => @@ -3993,7 +3906,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TOO_MANY_VECTOR_ELEMENTS" |) |) + M.deref (| mk_str (| "TOO_MANY_VECTOR_ELEMENTS" |) |) |) |))); fun γ => @@ -4007,7 +3920,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "IDENTIFIER_TOO_LONG" |) |) + M.deref (| mk_str (| "IDENTIFIER_TOO_LONG" |) |) |) |))); fun γ => @@ -4021,7 +3934,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PROGRAM_TOO_COMPLEX" |) |) + M.deref (| mk_str (| "PROGRAM_TOO_COMPLEX" |) |) |) |))); fun γ => @@ -4035,9 +3948,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "UNKNOWN_INVARIANT_VIOLATION_ERROR" |) - |) + M.deref (| mk_str (| "UNKNOWN_INVARIANT_VIOLATION_ERROR" |) |) |) |))); fun γ => @@ -4051,7 +3962,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EMPTY_VALUE_STACK" |) |) + M.deref (| mk_str (| "EMPTY_VALUE_STACK" |) |) |) |))); fun γ => @@ -4063,10 +3974,7 @@ Module vm_status. "move_core_types::vm_status::StatusCode::PC_OVERFLOW" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PC_OVERFLOW" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "PC_OVERFLOW" |) |) |) |))); fun γ => ltac:(M.monadic @@ -4079,7 +3987,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VERIFICATION_ERROR" |) |) + M.deref (| mk_str (| "VERIFICATION_ERROR" |) |) |) |))); fun γ => @@ -4093,7 +4001,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "STORAGE_ERROR" |) |) + M.deref (| mk_str (| "STORAGE_ERROR" |) |) |) |))); fun γ => @@ -4107,7 +4015,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "INTERNAL_TYPE_ERROR" |) |) + M.deref (| mk_str (| "INTERNAL_TYPE_ERROR" |) |) |) |))); fun γ => @@ -4121,7 +4029,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EVENT_KEY_MISMATCH" |) |) + M.deref (| mk_str (| "EVENT_KEY_MISMATCH" |) |) |) |))); fun γ => @@ -4133,10 +4041,7 @@ Module vm_status. "move_core_types::vm_status::StatusCode::UNREACHABLE" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNREACHABLE" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "UNREACHABLE" |) |) |) |))); fun γ => ltac:(M.monadic @@ -4149,7 +4054,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VM_STARTUP_FAILURE" |) |) + M.deref (| mk_str (| "VM_STARTUP_FAILURE" |) |) |) |))); fun γ => @@ -4163,9 +4068,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION" |) - |) + M.deref (| mk_str (| "UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION" |) |) |) |))); fun γ => @@ -4179,7 +4082,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VERIFIER_INVARIANT_VIOLATION" |) |) + M.deref (| mk_str (| "VERIFIER_INVARIANT_VIOLATION" |) |) |) |))); fun γ => @@ -4193,7 +4096,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNEXPECTED_VERIFIER_ERROR" |) |) + M.deref (| mk_str (| "UNEXPECTED_VERIFIER_ERROR" |) |) |) |))); fun γ => @@ -4207,9 +4110,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "UNEXPECTED_DESERIALIZATION_ERROR" |) - |) + M.deref (| mk_str (| "UNEXPECTED_DESERIALIZATION_ERROR" |) |) |) |))); fun γ => @@ -4223,9 +4124,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "FAILED_TO_SERIALIZE_WRITE_SET_CHANGES" |) - |) + M.deref (| mk_str (| "FAILED_TO_SERIALIZE_WRITE_SET_CHANGES" |) |) |) |))); fun γ => @@ -4239,7 +4138,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FAILED_TO_DESERIALIZE_RESOURCE" |) |) + M.deref (| mk_str (| "FAILED_TO_DESERIALIZE_RESOURCE" |) |) |) |))); fun γ => @@ -4253,7 +4152,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TYPE_RESOLUTION_FAILURE" |) |) + M.deref (| mk_str (| "TYPE_RESOLUTION_FAILURE" |) |) |) |))); fun γ => @@ -4267,7 +4166,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DUPLICATE_NATIVE_FUNCTION" |) |) + M.deref (| mk_str (| "DUPLICATE_NATIVE_FUNCTION" |) |) |) |))); fun γ => @@ -4281,7 +4180,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ARITHMETIC_OVERFLOW" |) |) + M.deref (| mk_str (| "ARITHMETIC_OVERFLOW" |) |) |) |))); fun γ => @@ -4295,7 +4194,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNKNOWN_BINARY_ERROR" |) |) + M.deref (| mk_str (| "UNKNOWN_BINARY_ERROR" |) |) |) |))); fun γ => @@ -4307,10 +4206,7 @@ Module vm_status. "move_core_types::vm_status::StatusCode::MALFORMED" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MALFORMED" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MALFORMED" |) |) |) |))); fun γ => ltac:(M.monadic @@ -4321,10 +4217,7 @@ Module vm_status. "move_core_types::vm_status::StatusCode::BAD_MAGIC" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BAD_MAGIC" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BAD_MAGIC" |) |) |) |))); fun γ => ltac:(M.monadic @@ -4337,7 +4230,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNKNOWN_VERSION" |) |) + M.deref (| mk_str (| "UNKNOWN_VERSION" |) |) |) |))); fun γ => @@ -4351,7 +4244,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNKNOWN_TABLE_TYPE" |) |) + M.deref (| mk_str (| "UNKNOWN_TABLE_TYPE" |) |) |) |))); fun γ => @@ -4365,7 +4258,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNKNOWN_SIGNATURE_TYPE" |) |) + M.deref (| mk_str (| "UNKNOWN_SIGNATURE_TYPE" |) |) |) |))); fun γ => @@ -4379,7 +4272,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNKNOWN_SERIALIZED_TYPE" |) |) + M.deref (| mk_str (| "UNKNOWN_SERIALIZED_TYPE" |) |) |) |))); fun γ => @@ -4393,7 +4286,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNKNOWN_OPCODE" |) |) + M.deref (| mk_str (| "UNKNOWN_OPCODE" |) |) |) |))); fun γ => @@ -4407,7 +4300,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BAD_HEADER_TABLE" |) |) + M.deref (| mk_str (| "BAD_HEADER_TABLE" |) |) |) |))); fun γ => @@ -4421,7 +4314,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNEXPECTED_SIGNATURE_TYPE" |) |) + M.deref (| mk_str (| "UNEXPECTED_SIGNATURE_TYPE" |) |) |) |))); fun γ => @@ -4435,7 +4328,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DUPLICATE_TABLE" |) |) + M.deref (| mk_str (| "DUPLICATE_TABLE" |) |) |) |))); fun γ => @@ -4449,7 +4342,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNKNOWN_ABILITY" |) |) + M.deref (| mk_str (| "UNKNOWN_ABILITY" |) |) |) |))); fun γ => @@ -4463,7 +4356,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNKNOWN_NATIVE_STRUCT_FLAG" |) |) + M.deref (| mk_str (| "UNKNOWN_NATIVE_STRUCT_FLAG" |) |) |) |))); fun γ => @@ -4475,10 +4368,7 @@ Module vm_status. "move_core_types::vm_status::StatusCode::BAD_U16" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BAD_U16" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BAD_U16" |) |) |) |))); fun γ => ltac:(M.monadic @@ -4489,10 +4379,7 @@ Module vm_status. "move_core_types::vm_status::StatusCode::BAD_U32" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BAD_U32" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BAD_U32" |) |) |) |))); fun γ => ltac:(M.monadic @@ -4503,10 +4390,7 @@ Module vm_status. "move_core_types::vm_status::StatusCode::BAD_U64" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BAD_U64" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BAD_U64" |) |) |) |))); fun γ => ltac:(M.monadic @@ -4517,10 +4401,7 @@ Module vm_status. "move_core_types::vm_status::StatusCode::BAD_U128" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BAD_U128" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BAD_U128" |) |) |) |))); fun γ => ltac:(M.monadic @@ -4531,10 +4412,7 @@ Module vm_status. "move_core_types::vm_status::StatusCode::BAD_U256" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BAD_U256" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BAD_U256" |) |) |) |))); fun γ => ltac:(M.monadic @@ -4547,7 +4425,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VALUE_SERIALIZATION_ERROR" |) |) + M.deref (| mk_str (| "VALUE_SERIALIZATION_ERROR" |) |) |) |))); fun γ => @@ -4561,7 +4439,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VALUE_DESERIALIZATION_ERROR" |) |) + M.deref (| mk_str (| "VALUE_DESERIALIZATION_ERROR" |) |) |) |))); fun γ => @@ -4575,7 +4453,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CODE_DESERIALIZATION_ERROR" |) |) + M.deref (| mk_str (| "CODE_DESERIALIZATION_ERROR" |) |) |) |))); fun γ => @@ -4589,7 +4467,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "INVALID_FLAG_BITS" |) |) + M.deref (| mk_str (| "INVALID_FLAG_BITS" |) |) |) |))); fun γ => @@ -4603,7 +4481,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TRAILING_BYTES" |) |) + M.deref (| mk_str (| "TRAILING_BYTES" |) |) |) |))); fun γ => @@ -4617,7 +4495,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNKNOWN_RUNTIME_STATUS" |) |) + M.deref (| mk_str (| "UNKNOWN_RUNTIME_STATUS" |) |) |) |))); fun γ => @@ -4629,10 +4507,7 @@ Module vm_status. "move_core_types::vm_status::StatusCode::EXECUTED" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EXECUTED" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EXECUTED" |) |) |) |))); fun γ => ltac:(M.monadic @@ -4643,10 +4518,7 @@ Module vm_status. "move_core_types::vm_status::StatusCode::OUT_OF_GAS" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OUT_OF_GAS" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "OUT_OF_GAS" |) |) |) |))); fun γ => ltac:(M.monadic @@ -4659,7 +4531,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RESOURCE_DOES_NOT_EXIST" |) |) + M.deref (| mk_str (| "RESOURCE_DOES_NOT_EXIST" |) |) |) |))); fun γ => @@ -4673,7 +4545,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RESOURCE_ALREADY_EXISTS" |) |) + M.deref (| mk_str (| "RESOURCE_ALREADY_EXISTS" |) |) |) |))); fun γ => @@ -4685,10 +4557,7 @@ Module vm_status. "move_core_types::vm_status::StatusCode::MISSING_DATA" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MISSING_DATA" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MISSING_DATA" |) |) |) |))); fun γ => ltac:(M.monadic @@ -4701,7 +4570,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DATA_FORMAT_ERROR" |) |) + M.deref (| mk_str (| "DATA_FORMAT_ERROR" |) |) |) |))); fun γ => @@ -4713,10 +4582,7 @@ Module vm_status. "move_core_types::vm_status::StatusCode::ABORTED" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ABORTED" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ABORTED" |) |) |) |))); fun γ => ltac:(M.monadic @@ -4729,7 +4595,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ARITHMETIC_ERROR" |) |) + M.deref (| mk_str (| "ARITHMETIC_ERROR" |) |) |) |))); fun γ => @@ -4743,7 +4609,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VECTOR_OPERATION_ERROR" |) |) + M.deref (| mk_str (| "VECTOR_OPERATION_ERROR" |) |) |) |))); fun γ => @@ -4757,7 +4623,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EXECUTION_STACK_OVERFLOW" |) |) + M.deref (| mk_str (| "EXECUTION_STACK_OVERFLOW" |) |) |) |))); fun γ => @@ -4771,7 +4637,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CALL_STACK_OVERFLOW" |) |) + M.deref (| mk_str (| "CALL_STACK_OVERFLOW" |) |) |) |))); fun γ => @@ -4785,7 +4651,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VM_MAX_TYPE_DEPTH_REACHED" |) |) + M.deref (| mk_str (| "VM_MAX_TYPE_DEPTH_REACHED" |) |) |) |))); fun γ => @@ -4799,7 +4665,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VM_MAX_VALUE_DEPTH_REACHED" |) |) + M.deref (| mk_str (| "VM_MAX_VALUE_DEPTH_REACHED" |) |) |) |))); fun γ => @@ -4813,7 +4679,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VM_EXTENSION_ERROR" |) |) + M.deref (| mk_str (| "VM_EXTENSION_ERROR" |) |) |) |))); fun γ => @@ -4827,7 +4693,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "STORAGE_WRITE_LIMIT_REACHED" |) |) + M.deref (| mk_str (| "STORAGE_WRITE_LIMIT_REACHED" |) |) |) |))); fun γ => @@ -4841,7 +4707,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MEMORY_LIMIT_EXCEEDED" |) |) + M.deref (| mk_str (| "MEMORY_LIMIT_EXCEEDED" |) |) |) |))); fun γ => @@ -4855,7 +4721,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "VM_MAX_TYPE_NODES_REACHED" |) |) + M.deref (| mk_str (| "VM_MAX_TYPE_NODES_REACHED" |) |) |) |))); fun γ => @@ -4869,7 +4735,7 @@ Module vm_status. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UNKNOWN_STATUS" |) |) + M.deref (| mk_str (| "UNKNOWN_STATUS" |) |) |) |))) ] @@ -8478,7 +8344,7 @@ Module vm_status. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "invalid StatusCode" |) |) + M.deref (| mk_str (| "invalid StatusCode" |) |) |) ] |))) diff --git a/CoqOfRust/revm/revm_bytecode/bytecode.v b/CoqOfRust/revm/revm_bytecode/bytecode.v index a8352e641..a4200b98d 100644 --- a/CoqOfRust/revm/revm_bytecode/bytecode.v +++ b/CoqOfRust/revm/revm_bytecode/bytecode.v @@ -206,7 +206,7 @@ Module bytecode. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LegacyAnalyzed" |) |) + M.deref (| mk_str (| "LegacyAnalyzed" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -239,10 +239,7 @@ Module bytecode. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Eof" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Eof" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -274,10 +271,7 @@ Module bytecode. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Eip7702" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Eip7702" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -1638,7 +1632,7 @@ Module bytecode. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Expect correct EOF bytecode" |) |) + M.deref (| mk_str (| "Expect correct EOF bytecode" |) |) |) ] |))) diff --git a/CoqOfRust/revm/revm_bytecode/decode_errors.v b/CoqOfRust/revm/revm_bytecode/decode_errors.v index 1f08efb46..54267238e 100644 --- a/CoqOfRust/revm/revm_bytecode/decode_errors.v +++ b/CoqOfRust/revm/revm_bytecode/decode_errors.v @@ -117,10 +117,7 @@ Module decode_errors. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Eof" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Eof" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -152,10 +149,7 @@ Module decode_errors. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Eip7702" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Eip7702" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) diff --git a/CoqOfRust/revm/revm_bytecode/eip7702.v b/CoqOfRust/revm/revm_bytecode/eip7702.v index fa960302c..16f31eceb 100644 --- a/CoqOfRust/revm/revm_bytecode/eip7702.v +++ b/CoqOfRust/revm/revm_bytecode/eip7702.v @@ -187,14 +187,8 @@ Module eip7702. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Eip7702Bytecode" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "delegated_address" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Eip7702Bytecode" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "delegated_address" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -208,7 +202,7 @@ Module eip7702. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "version" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "version" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -222,7 +216,7 @@ Module eip7702. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "raw" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "raw" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1722,7 +1716,7 @@ Module eip7702. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidLength" |) |) + M.deref (| mk_str (| "InvalidLength" |) |) |) |))); fun γ => @@ -1734,10 +1728,7 @@ Module eip7702. "revm_bytecode::eip7702::Eip7702DecodeError::InvalidMagic" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidMagic" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "InvalidMagic" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1750,7 +1741,7 @@ Module eip7702. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UnsupportedVersion" |) |) + M.deref (| mk_str (| "UnsupportedVersion" |) |) |) |))) ] @@ -2085,7 +2076,7 @@ Module eip7702. γ, "revm_bytecode::eip7702::Eip7702DecodeError::InvalidLength" |) in - Value.String "Eip7702 is not 23 bytes long")); + M.alloc (| mk_str (| "Eip7702 is not 23 bytes long" |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in @@ -2097,9 +2088,7 @@ Module eip7702. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Bytecode is not starting with 0xEF01" |) - |) + M.deref (| mk_str (| "Bytecode is not starting with 0xEF01" |) |) |) |))); fun γ => @@ -2113,7 +2102,7 @@ Module eip7702. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Unsupported Eip7702 version." |) |) + M.deref (| mk_str (| "Unsupported Eip7702 version." |) |) |) |))) ] diff --git a/CoqOfRust/revm/revm_bytecode/eof.v b/CoqOfRust/revm/revm_bytecode/eof.v index 60f3b0535..a8d9c35ce 100644 --- a/CoqOfRust/revm/revm_bytecode/eof.v +++ b/CoqOfRust/revm/revm_bytecode/eof.v @@ -202,8 +202,8 @@ Module eof. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Eof" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "header" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Eof" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "header" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -217,7 +217,7 @@ Module eof. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "body" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "body" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -231,7 +231,7 @@ Module eof. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "raw" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "raw" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2891,10 +2891,7 @@ Module eof. "revm_bytecode::eof::EofDecodeError::MissingInput" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MissingInput" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MissingInput" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2907,7 +2904,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MissingBodyWithoutData" |) |) + M.deref (| mk_str (| "MissingBodyWithoutData" |) |) |) |))); fun γ => @@ -2919,10 +2916,7 @@ Module eof. "revm_bytecode::eof::EofDecodeError::DanglingData" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DanglingData" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "DanglingData" |) |) |) |))); fun γ => ltac:(M.monadic @@ -2935,7 +2929,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidTypesSection" |) |) + M.deref (| mk_str (| "InvalidTypesSection" |) |) |) |))); fun γ => @@ -2949,7 +2943,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidTypesSectionSize" |) |) + M.deref (| mk_str (| "InvalidTypesSectionSize" |) |) |) |))); fun γ => @@ -2963,7 +2957,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidEOFMagicNumber" |) |) + M.deref (| mk_str (| "InvalidEOFMagicNumber" |) |) |) |))); fun γ => @@ -2977,7 +2971,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidEOFVersion" |) |) + M.deref (| mk_str (| "InvalidEOFVersion" |) |) |) |))); fun γ => @@ -2991,7 +2985,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidTypesKind" |) |) + M.deref (| mk_str (| "InvalidTypesKind" |) |) |) |))); fun γ => @@ -3005,7 +2999,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidCodeKind" |) |) + M.deref (| mk_str (| "InvalidCodeKind" |) |) |) |))); fun γ => @@ -3019,7 +3013,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidTerminalByte" |) |) + M.deref (| mk_str (| "InvalidTerminalByte" |) |) |) |))); fun γ => @@ -3033,7 +3027,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidDataKind" |) |) + M.deref (| mk_str (| "InvalidDataKind" |) |) |) |))); fun γ => @@ -3047,7 +3041,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidKindAfterCode" |) |) + M.deref (| mk_str (| "InvalidKindAfterCode" |) |) |) |))); fun γ => @@ -3061,7 +3055,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MismatchCodeAndTypesSize" |) |) + M.deref (| mk_str (| "MismatchCodeAndTypesSize" |) |) |) |))); fun γ => @@ -3073,10 +3067,7 @@ Module eof. "revm_bytecode::eof::EofDecodeError::NonSizes" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NonSizes" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "NonSizes" |) |) |) |))); fun γ => ltac:(M.monadic @@ -3089,7 +3080,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ShortInputForSizes" |) |) + M.deref (| mk_str (| "ShortInputForSizes" |) |) |) |))); fun γ => @@ -3101,10 +3092,7 @@ Module eof. "revm_bytecode::eof::EofDecodeError::ZeroSize" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ZeroSize" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ZeroSize" |) |) |) |))); fun γ => ltac:(M.monadic @@ -3117,7 +3105,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TooManyCodeSections" |) |) + M.deref (| mk_str (| "TooManyCodeSections" |) |) |) |))); fun γ => @@ -3131,7 +3119,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ZeroCodeSections" |) |) + M.deref (| mk_str (| "ZeroCodeSections" |) |) |) |))); fun γ => @@ -3145,7 +3133,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TooManyContainerSections" |) |) + M.deref (| mk_str (| "TooManyContainerSections" |) |) |) |))); fun γ => @@ -3159,7 +3147,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidEOFSize" |) |) + M.deref (| mk_str (| "InvalidEOFSize" |) |) |) |))) ] @@ -3511,7 +3499,7 @@ Module eof. γ, "revm_bytecode::eof::EofDecodeError::MissingInput" |) in - Value.String "Short input while processing EOF")); + M.alloc (| mk_str (| "Short input while processing EOF" |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in @@ -3523,9 +3511,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Short body while processing EOF" |) - |) + M.deref (| mk_str (| "Short body while processing EOF" |) |) |) |))); fun γ => @@ -3540,9 +3526,7 @@ Module eof. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Body size is more than specified in the header" - |) + mk_str (| "Body size is more than specified in the header" |) |) |) |))); @@ -3557,7 +3541,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid types section data" |) |) + M.deref (| mk_str (| "Invalid types section data" |) |) |) |))); fun γ => @@ -3571,7 +3555,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid types section size" |) |) + M.deref (| mk_str (| "Invalid types section size" |) |) |) |))); fun γ => @@ -3585,7 +3569,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid EOF magic number" |) |) + M.deref (| mk_str (| "Invalid EOF magic number" |) |) |) |))); fun γ => @@ -3599,7 +3583,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid EOF version" |) |) + M.deref (| mk_str (| "Invalid EOF version" |) |) |) |))); fun γ => @@ -3613,7 +3597,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid number for types kind" |) |) + M.deref (| mk_str (| "Invalid number for types kind" |) |) |) |))); fun γ => @@ -3627,7 +3611,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid number for code kind" |) |) + M.deref (| mk_str (| "Invalid number for code kind" |) |) |) |))); fun γ => @@ -3641,7 +3625,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid terminal code" |) |) + M.deref (| mk_str (| "Invalid terminal code" |) |) |) |))); fun γ => @@ -3655,7 +3639,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid data kind" |) |) + M.deref (| mk_str (| "Invalid data kind" |) |) |) |))); fun γ => @@ -3669,7 +3653,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid kind after code" |) |) + M.deref (| mk_str (| "Invalid kind after code" |) |) |) |))); fun γ => @@ -3683,9 +3667,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Mismatch of code and types sizes" |) - |) + M.deref (| mk_str (| "Mismatch of code and types sizes" |) |) |) |))); fun γ => @@ -3699,9 +3681,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "There should be at least one size" |) - |) + M.deref (| mk_str (| "There should be at least one size" |) |) |) |))); fun γ => @@ -3713,10 +3693,7 @@ Module eof. "revm_bytecode::eof::EofDecodeError::ShortInputForSizes" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Missing size" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Missing size" |) |) |) |))); fun γ => ltac:(M.monadic @@ -3729,7 +3706,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Size cant be zero" |) |) + M.deref (| mk_str (| "Size cant be zero" |) |) |) |))); fun γ => @@ -3743,7 +3720,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid code number" |) |) + M.deref (| mk_str (| "Invalid code number" |) |) |) |))); fun γ => @@ -3757,9 +3734,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Invalid number of code sections" |) - |) + M.deref (| mk_str (| "Invalid number of code sections" |) |) |) |))); fun γ => @@ -3773,7 +3748,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid container number" |) |) + M.deref (| mk_str (| "Invalid container number" |) |) |) |))); fun γ => @@ -3787,7 +3762,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid initcode size" |) |) + M.deref (| mk_str (| "Invalid initcode size" |) |) |) |))) ] diff --git a/CoqOfRust/revm/revm_bytecode/eof/body.v b/CoqOfRust/revm/revm_bytecode/eof/body.v index 46708c3b7..c8c2caa93 100644 --- a/CoqOfRust/revm/revm_bytecode/eof/body.v +++ b/CoqOfRust/revm/revm_bytecode/eof/body.v @@ -282,26 +282,23 @@ Module eof. M.alloc (| Value.Array [ - M.read (| Value.String "types_section" |); + mk_str (| "types_section" |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "code_section" |) |) + M.deref (| mk_str (| "code_section" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "code" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "code" |) |) + M.deref (| mk_str (| "container_section" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "container_section" |) |) + M.deref (| mk_str (| "data_section" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "data_section" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "is_data_filled" |) |) + M.deref (| mk_str (| "is_data_filled" |) |) |) ] |) @@ -431,10 +428,7 @@ Module eof. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EofBody" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EofBody" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| names |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| values |) |) |) ] diff --git a/CoqOfRust/revm/revm_bytecode/eof/header.v b/CoqOfRust/revm/revm_bytecode/eof/header.v index 834223a67..c5bbf5307 100644 --- a/CoqOfRust/revm/revm_bytecode/eof/header.v +++ b/CoqOfRust/revm/revm_bytecode/eof/header.v @@ -262,26 +262,26 @@ Module eof. M.alloc (| Value.Array [ - M.read (| Value.String "types_size" |); + mk_str (| "types_size" |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "code_sizes" |) |) + M.deref (| mk_str (| "code_sizes" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "container_sizes" |) |) + M.deref (| mk_str (| "container_sizes" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "data_size" |) |) + M.deref (| mk_str (| "data_size" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "sum_code_sizes" |) |) + M.deref (| mk_str (| "sum_code_sizes" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "sum_container_sizes" |) |) + M.deref (| mk_str (| "sum_container_sizes" |) |) |) ] |) @@ -411,10 +411,7 @@ Module eof. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EofHeader" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EofHeader" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| names |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| values |) |) |) ] diff --git a/CoqOfRust/revm/revm_bytecode/eof/links/body.v b/CoqOfRust/revm/revm_bytecode/eof/links/body.v index 108c184e9..92b308817 100644 --- a/CoqOfRust/revm/revm_bytecode/eof/links/body.v +++ b/CoqOfRust/revm/revm_bytecode/eof/links/body.v @@ -233,12 +233,11 @@ Module Impl_EofBody. Run.Trait body.eof.body.Impl_revm_bytecode_eof_body_EofBody.code [] [] [φ self; φ index] (option alloy_primitives.links.bytes_.Bytes.t). Proof. constructor. - destruct (vec.links.mod.Impl_Index_for_Vec_T_A.run (T := Usize.t) (I := Usize.t) (A := Global.t)) as [index' [H_index' run_index']]. + destruct (vec.links.mod.Impl_Index_for_Vec_T_A.run Usize.t Usize.t Global.t Usize.t). destruct (vec.links.mod.Impl_Deref_for_Vec.run (T := Usize.t) (A := Global.t)). run_symbolic. Admitted. - (* pub fn encode(&self, buffer: &mut Vec) *) diff --git a/CoqOfRust/revm/revm_bytecode/eof/printer.v b/CoqOfRust/revm/revm_bytecode/eof/printer.v index 8001f698d..e63fe046e 100644 --- a/CoqOfRust/revm/revm_bytecode/eof/printer.v +++ b/CoqOfRust/revm/revm_bytecode/eof/printer.v @@ -248,9 +248,8 @@ Module eof. M.alloc (| Value.Array [ - M.read (| - Value.String - "Malformed code: immediate out of bounds + mk_str (| + "Malformed code: immediate out of bounds " |) ] @@ -299,9 +298,7 @@ Module eof. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); @@ -517,12 +514,7 @@ Module eof. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String " : 0x" - |) - ] + Value.Array [ mk_str (| " : 0x" |) ] |) |) |) @@ -666,12 +658,8 @@ Module eof. M.alloc (| Value.Array [ - M.read (| - Value.String " (" - |); - M.read (| - Value.String ")" - |) + mk_str (| " (" |); + mk_str (| ")" |) ] |) |) @@ -869,10 +857,8 @@ Module eof. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String " -" |) ] - |) + M.alloc (| Value.Array [ mk_str (| " +" |) ] |) |) |) |) diff --git a/CoqOfRust/revm/revm_bytecode/eof/types_section.v b/CoqOfRust/revm/revm_bytecode/eof/types_section.v index 65cc75765..714d16b87 100644 --- a/CoqOfRust/revm/revm_bytecode/eof/types_section.v +++ b/CoqOfRust/revm/revm_bytecode/eof/types_section.v @@ -44,11 +44,8 @@ Module eof. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TypesSection" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "inputs" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "TypesSection" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inputs" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -62,7 +59,7 @@ Module eof. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "outputs" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "outputs" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -76,10 +73,7 @@ Module eof. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "max_stack_size" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "max_stack_size" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/revm/revm_bytecode/eof/verification.v b/CoqOfRust/revm/revm_bytecode/eof/verification.v index 9dbe88ea4..ba02f4eb0 100644 --- a/CoqOfRust/revm/revm_bytecode/eof/verification.v +++ b/CoqOfRust/revm/revm_bytecode/eof/verification.v @@ -3130,10 +3130,7 @@ Module eof. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Decode" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Decode" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -3167,7 +3164,7 @@ Module eof. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Validation" |) |) + M.deref (| mk_str (| "Validation" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -4063,8 +4060,7 @@ Module eof. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Bytecode decode error: " |) ] + Value.Array [ mk_str (| "Bytecode decode error: " |) ] |) |) |) @@ -4149,9 +4145,7 @@ Module eof. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Bytecode validation error: " |) - ] + Value.Array [ mk_str (| "Bytecode validation error: " |) ] |) |) |) @@ -4518,7 +4512,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FalsePositive" |) |) + M.deref (| mk_str (| "FalsePositive" |) |) |) |))); fun γ => @@ -4532,7 +4526,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "UnknownOpcode" |) |) + M.deref (| mk_str (| "UnknownOpcode" |) |) |) |))); fun γ => @@ -4546,7 +4540,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OpcodeDisabled" |) |) + M.deref (| mk_str (| "OpcodeDisabled" |) |) |) |))); fun γ => @@ -4560,9 +4554,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "InstructionNotForwardAccessed" |) - |) + M.deref (| mk_str (| "InstructionNotForwardAccessed" |) |) |) |))); fun γ => @@ -4576,7 +4568,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MissingImmediateBytes" |) |) + M.deref (| mk_str (| "MissingImmediateBytes" |) |) |) |))); fun γ => @@ -4590,7 +4582,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MissingRJUMPVImmediateBytes" |) |) + M.deref (| mk_str (| "MissingRJUMPVImmediateBytes" |) |) |) |))); fun γ => @@ -4604,7 +4596,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "JumpToImmediateBytes" |) |) + M.deref (| mk_str (| "JumpToImmediateBytes" |) |) |) |))); fun γ => @@ -4618,7 +4610,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BackwardJumpToImmediateBytes" |) |) + M.deref (| mk_str (| "BackwardJumpToImmediateBytes" |) |) |) |))); fun γ => @@ -4632,7 +4624,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RJUMPVZeroMaxIndex" |) |) + M.deref (| mk_str (| "RJUMPVZeroMaxIndex" |) |) |) |))); fun γ => @@ -4646,7 +4638,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "JumpZeroOffset" |) |) + M.deref (| mk_str (| "JumpZeroOffset" |) |) |) |))); fun γ => @@ -4660,7 +4652,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EOFCREATEInvalidIndex" |) |) + M.deref (| mk_str (| "EOFCREATEInvalidIndex" |) |) |) |))); fun γ => @@ -4674,7 +4666,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CodeSectionOutOfBounds" |) |) + M.deref (| mk_str (| "CodeSectionOutOfBounds" |) |) |) |))); fun γ => @@ -4688,7 +4680,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CALLFNonReturningFunction" |) |) + M.deref (| mk_str (| "CALLFNonReturningFunction" |) |) |) |))); fun γ => @@ -4702,7 +4694,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "StackOverflow" |) |) + M.deref (| mk_str (| "StackOverflow" |) |) |) |))); fun γ => @@ -4716,7 +4708,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "JUMPFEnoughOutputs" |) |) + M.deref (| mk_str (| "JUMPFEnoughOutputs" |) |) |) |))); fun γ => @@ -4730,7 +4722,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "JUMPFStackHigherThanOutputs" |) |) + M.deref (| mk_str (| "JUMPFStackHigherThanOutputs" |) |) |) |))); fun γ => @@ -4744,7 +4736,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DataLoadOutOfBounds" |) |) + M.deref (| mk_str (| "DataLoadOutOfBounds" |) |) |) |))); fun γ => @@ -4758,9 +4750,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "RETFBiggestStackNumMoreThenOutputs" |) - |) + M.deref (| mk_str (| "RETFBiggestStackNumMoreThenOutputs" |) |) |) |))); fun γ => @@ -4774,7 +4764,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "StackUnderflow" |) |) + M.deref (| mk_str (| "StackUnderflow" |) |) |) |))); fun γ => @@ -4788,7 +4778,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TypesStackUnderflow" |) |) + M.deref (| mk_str (| "TypesStackUnderflow" |) |) |) |))); fun γ => @@ -4802,7 +4792,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "JumpUnderflow" |) |) + M.deref (| mk_str (| "JumpUnderflow" |) |) |) |))); fun γ => @@ -4816,7 +4806,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "JumpOverflow" |) |) + M.deref (| mk_str (| "JumpOverflow" |) |) |) |))); fun γ => @@ -4830,9 +4820,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "BackwardJumpBiggestNumMismatch" |) - |) + M.deref (| mk_str (| "BackwardJumpBiggestNumMismatch" |) |) |) |))); fun γ => @@ -4846,9 +4834,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "BackwardJumpSmallestNumMismatch" |) - |) + M.deref (| mk_str (| "BackwardJumpSmallestNumMismatch" |) |) |) |))); fun γ => @@ -4862,9 +4848,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "LastInstructionNotTerminating" |) - |) + M.deref (| mk_str (| "LastInstructionNotTerminating" |) |) |) |))); fun γ => @@ -4878,7 +4862,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CodeSectionNotAccessed" |) |) + M.deref (| mk_str (| "CodeSectionNotAccessed" |) |) |) |))); fun γ => @@ -4892,7 +4876,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidTypesSection" |) |) + M.deref (| mk_str (| "InvalidTypesSection" |) |) |) |))); fun γ => @@ -4906,7 +4890,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidFirstTypesSection" |) |) + M.deref (| mk_str (| "InvalidFirstTypesSection" |) |) |) |))); fun γ => @@ -4920,7 +4904,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MaxStackMismatch" |) |) + M.deref (| mk_str (| "MaxStackMismatch" |) |) |) |))); fun γ => @@ -4934,7 +4918,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NoCodeSections" |) |) + M.deref (| mk_str (| "NoCodeSections" |) |) |) |))); fun γ => @@ -4948,7 +4932,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SubContainerCalledInTwoModes" |) |) + M.deref (| mk_str (| "SubContainerCalledInTwoModes" |) |) |) |))); fun γ => @@ -4962,7 +4946,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SubContainerNotAccessed" |) |) + M.deref (| mk_str (| "SubContainerNotAccessed" |) |) |) |))); fun γ => @@ -4976,7 +4960,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DataNotFilled" |) |) + M.deref (| mk_str (| "DataNotFilled" |) |) |) |))); fun γ => @@ -4990,9 +4974,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "NonReturningSectionIsReturning" |) - |) + M.deref (| mk_str (| "NonReturningSectionIsReturning" |) |) |) |))) ] @@ -5561,13 +5543,10 @@ Module eof. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "AccessTracker" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AccessTracker" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "this_container_code_type" |) |) + M.deref (| mk_str (| "this_container_code_type" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -5582,7 +5561,7 @@ Module eof. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "codes" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "codes" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5596,10 +5575,7 @@ Module eof. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "processing_stack" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "processing_stack" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5613,10 +5589,7 @@ Module eof. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "subcontainers" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "subcontainers" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -5985,9 +5958,8 @@ Module eof. M.alloc (| Value.Array [ - M.read (| - Value.String - "There should be at least one code section" + mk_str (| + "There should be at least one code section" |) ] |) @@ -6549,7 +6521,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ReturnContract" |) |) + M.deref (| mk_str (| "ReturnContract" |) |) |) |))); fun γ => @@ -6563,7 +6535,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ReturnOrStop" |) |) + M.deref (| mk_str (| "ReturnOrStop" |) |) |) |))) ] @@ -6784,7 +6756,7 @@ Module eof. γ, "revm_bytecode::eof::verification::EofValidationError::FalsePositive" |) in - Value.String "False positive")); + M.alloc (| mk_str (| "False positive" |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in @@ -6796,7 +6768,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Opcode is not known" |) |) + M.deref (| mk_str (| "Opcode is not known" |) |) |) |))); fun γ => @@ -6810,7 +6782,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Opcode is disabled" |) |) + M.deref (| mk_str (| "Opcode is disabled" |) |) |) |))); fun γ => @@ -6824,7 +6796,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Should have forward jump" |) |) + M.deref (| mk_str (| "Should have forward jump" |) |) |) |))); fun γ => @@ -6838,7 +6810,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Bytecode is missing bytes" |) |) + M.deref (| mk_str (| "Bytecode is missing bytes" |) |) |) |))); fun γ => @@ -6853,9 +6825,7 @@ Module eof. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Bytecode is missing bytes after RJUMPV opcode" - |) + mk_str (| "Bytecode is missing bytes after RJUMPV opcode" |) |) |) |))); @@ -6870,7 +6840,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid jump" |) |) + M.deref (| mk_str (| "Invalid jump" |) |) |) |))); fun γ => @@ -6884,7 +6854,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid backward jump" |) |) + M.deref (| mk_str (| "Invalid backward jump" |) |) |) |))); fun γ => @@ -6898,9 +6868,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Used RJUMPV with zero as MaxIndex" |) - |) + M.deref (| mk_str (| "Used RJUMPV with zero as MaxIndex" |) |) |) |))); fun γ => @@ -6914,9 +6882,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Used JUMP with zero as offset" |) - |) + M.deref (| mk_str (| "Used JUMP with zero as offset" |) |) |) |))); fun γ => @@ -6930,9 +6896,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "EOFCREATE points to out of bound index" |) - |) + M.deref (| mk_str (| "EOFCREATE points to out of bound index" |) |) |) |))); fun γ => @@ -6946,7 +6910,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CALLF index is out of bounds" |) |) + M.deref (| mk_str (| "CALLF index is out of bounds" |) |) |) |))); fun γ => @@ -6960,9 +6924,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "CALLF was used on non-returning function" |) - |) + M.deref (| mk_str (| "CALLF was used on non-returning function" |) |) |) |))); fun γ => @@ -6976,7 +6938,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CALLF stack overflow" |) |) + M.deref (| mk_str (| "CALLF stack overflow" |) |) |) |))); fun γ => @@ -6990,7 +6952,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "JUMPF needs more outputs" |) |) + M.deref (| mk_str (| "JUMPF needs more outputs" |) |) |) |))); fun γ => @@ -7004,9 +6966,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "JUMPF stack is too high for outputs" |) - |) + M.deref (| mk_str (| "JUMPF stack is too high for outputs" |) |) |) |))); fun γ => @@ -7020,7 +6980,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DATALOAD is out of bounds" |) |) + M.deref (| mk_str (| "DATALOAD is out of bounds" |) |) |) |))); fun γ => @@ -7035,9 +6995,7 @@ Module eof. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "RETF biggest stack num is more than outputs" - |) + mk_str (| "RETF biggest stack num is more than outputs" |) |) |) |))); @@ -7053,9 +7011,7 @@ Module eof. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Stack requirement is above smallest stack items" - |) + mk_str (| "Stack requirement is above smallest stack items" |) |) |) |))); @@ -7071,9 +7027,7 @@ Module eof. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Smallest stack items is more than output type" - |) + mk_str (| "Smallest stack items is more than output type" |) |) |) |))); @@ -7088,7 +7042,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Jump destination is too low" |) |) + M.deref (| mk_str (| "Jump destination is too low" |) |) |) |))); fun γ => @@ -7102,7 +7056,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Jump destination is too high" |) |) + M.deref (| mk_str (| "Jump destination is too high" |) |) |) |))); fun γ => @@ -7117,9 +7071,7 @@ Module eof. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Backward jump has different biggest stack item" - |) + mk_str (| "Backward jump has different biggest stack item" |) |) |) |))); @@ -7135,9 +7087,7 @@ Module eof. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Backward jump has different smallest stack item" - |) + mk_str (| "Backward jump has different smallest stack item" |) |) |) |))); @@ -7153,9 +7103,7 @@ Module eof. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Last instruction of bytecode is not terminating" - |) + mk_str (| "Last instruction of bytecode is not terminating" |) |) |) |))); @@ -7170,9 +7118,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Code section was not accessed" |) - |) + M.deref (| mk_str (| "Code section was not accessed" |) |) |) |))); fun γ => @@ -7186,7 +7132,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid types section" |) |) + M.deref (| mk_str (| "Invalid types section" |) |) |) |))); fun γ => @@ -7200,7 +7146,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid first types section" |) |) + M.deref (| mk_str (| "Invalid first types section" |) |) |) |))); fun γ => @@ -7214,7 +7160,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Max stack element mismatches" |) |) + M.deref (| mk_str (| "Max stack element mismatches" |) |) |) |))); fun γ => @@ -7228,7 +7174,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "No code sections" |) |) + M.deref (| mk_str (| "No code sections" |) |) |) |))); fun γ => @@ -7242,9 +7188,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Sub container called in two modes" |) - |) + M.deref (| mk_str (| "Sub container called in two modes" |) |) |) |))); fun γ => @@ -7258,7 +7202,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Sub container not accessed" |) |) + M.deref (| mk_str (| "Sub container not accessed" |) |) |) |))); fun γ => @@ -7272,7 +7216,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Data not filled" |) |) + M.deref (| mk_str (| "Data not filled" |) |) |) |))); fun γ => @@ -7286,9 +7230,7 @@ Module eof. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Non returning section is returning" |) - |) + M.deref (| mk_str (| "Non returning section is returning" |) |) |) |))) ] @@ -9461,14 +9403,8 @@ Module eof. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InstructionInfo" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "is_immediate" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "InstructionInfo" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "is_immediate" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -9482,10 +9418,7 @@ Module eof. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "is_jumpdest" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "is_jumpdest" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -9499,10 +9432,7 @@ Module eof. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "smallest" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "smallest" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -9516,10 +9446,7 @@ Module eof. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "biggest" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "biggest" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/revm/revm_bytecode/legacy/analyzed.v b/CoqOfRust/revm/revm_bytecode/legacy/analyzed.v index 278ad6af6..c3da1365f 100644 --- a/CoqOfRust/revm/revm_bytecode/legacy/analyzed.v +++ b/CoqOfRust/revm/revm_bytecode/legacy/analyzed.v @@ -150,9 +150,9 @@ Module legacy. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LegacyAnalyzedBytecode" |) |) + M.deref (| mk_str (| "LegacyAnalyzedBytecode" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "bytecode" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "bytecode" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -166,10 +166,7 @@ Module legacy. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "original_len" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "original_len" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -183,10 +180,7 @@ Module legacy. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "jump_table" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "jump_table" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/revm/revm_bytecode/legacy/jump_map.v b/CoqOfRust/revm/revm_bytecode/legacy/jump_map.v index 46618da77..1c0f6b165 100644 --- a/CoqOfRust/revm/revm_bytecode/legacy/jump_map.v +++ b/CoqOfRust/revm/revm_bytecode/legacy/jump_map.v @@ -532,16 +532,13 @@ Module legacy. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "JumpTable" |) |) + M.deref (| mk_str (| "JumpTable" |) |) |) ] |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "map" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "map" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/revm/revm_bytecode/legacy/raw.v b/CoqOfRust/revm/revm_bytecode/legacy/raw.v index 5752dff48..ddecc2a9b 100644 --- a/CoqOfRust/revm/revm_bytecode/legacy/raw.v +++ b/CoqOfRust/revm/revm_bytecode/legacy/raw.v @@ -86,10 +86,7 @@ Module legacy. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LegacyRawBytecode" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LegacyRawBytecode" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/revm/revm_bytecode/opcode.v b/CoqOfRust/revm/revm_bytecode/opcode.v index 09e708a61..3857fb90a 100644 --- a/CoqOfRust/revm/revm_bytecode/opcode.v +++ b/CoqOfRust/revm/revm_bytecode/opcode.v @@ -73,7 +73,7 @@ Module opcode. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "OpCode" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "OpCode" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -502,11 +502,7 @@ Module opcode. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| Value.String "UNKNOWN(0x" |); - M.read (| Value.String ")" |) - ] + Value.Array [ mk_str (| "UNKNOWN(0x" |); mk_str (| ")" |) ] |) |) |) @@ -1038,7 +1034,7 @@ Module opcode. [ M.read (| opcode |) ] |) |))); - fun γ => ltac:(M.monadic (Value.String "Unknown")) + fun γ => ltac:(M.monadic (M.alloc (| mk_str (| "Unknown" |) |))) ] |) |))) @@ -1349,9 +1345,7 @@ Module opcode. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "opcode not found" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "opcode not found" |) ] |) |) |) |) @@ -3083,10 +3077,7 @@ Module opcode. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "OpCodeInfo" - |) + mk_str (| "OpCodeInfo" |) |) |) ] @@ -3095,9 +3086,7 @@ Module opcode. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "name" |) - |) + M.deref (| mk_str (| "name" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -3136,9 +3125,7 @@ Module opcode. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "inputs" |) - |) + M.deref (| mk_str (| "inputs" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -3172,7 +3159,7 @@ Module opcode. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "outputs" |) |) + M.deref (| mk_str (| "outputs" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -3206,7 +3193,7 @@ Module opcode. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "not_eof" |) |) + M.deref (| mk_str (| "not_eof" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -3239,7 +3226,7 @@ Module opcode. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "terminating" |) |) + M.deref (| mk_str (| "terminating" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -3270,10 +3257,7 @@ Module opcode. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "immediate_size" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "immediate_size" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3379,8 +3363,7 @@ Module opcode. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "opcode name is too long" |) ] + Value.Array [ mk_str (| "opcode name is too long" |) ] |) |) |) @@ -3914,11 +3897,7 @@ Module opcode. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "opcodes must be sorted in ascending order" - |) - ] + [ mk_str (| "opcodes must be sorted in ascending order" |) ] |) |) |) @@ -3943,7 +3922,7 @@ Module opcode. [], [] |), - [ M.read (| Value.String "STOP" |) ] + [ mk_str (| "STOP" |) ] |) |) in let~ info : Ty.path "revm_bytecode::opcode::OpCodeInfo" := @@ -4010,11 +3989,7 @@ Module opcode. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "opcodes must be sorted in ascending order" - |) - ] + [ mk_str (| "opcodes must be sorted in ascending order" |) ] |) |) |) @@ -4039,7 +4014,7 @@ Module opcode. [], [] |), - [ M.read (| Value.String "ADD" |) ] + [ mk_str (| "ADD" |) ] |) |) in let~ info : Ty.path "revm_bytecode::opcode::OpCodeInfo" := @@ -4098,11 +4073,7 @@ Module opcode. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "opcodes must be sorted in ascending order" - |) - ] + [ mk_str (| "opcodes must be sorted in ascending order" |) ] |) |) |) @@ -4127,7 +4098,7 @@ Module opcode. [], [] |), - [ M.read (| Value.String "BALANCE" |) ] + [ mk_str (| "BALANCE" |) ] |) |) in let~ info : Ty.path "revm_bytecode::opcode::OpCodeInfo" := @@ -4189,23 +4160,20 @@ Module opcode. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "STOP" |) |) + M.deref (| mk_str (| "STOP" |) |) |); M.read (| M.get_constant "revm_bytecode::opcode::STOP" |) ]; Value.Tuple [ - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ADD" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ADD" |) |) |); M.read (| M.get_constant "revm_bytecode::opcode::ADD" |) ]; Value.Tuple [ M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BALANCE" |) |) + M.deref (| mk_str (| "BALANCE" |) |) |); M.read (| M.get_constant "revm_bytecode::opcode::BALANCE" |) ] diff --git a/CoqOfRust/revm/revm_bytecode/opcode/parse.v b/CoqOfRust/revm/revm_bytecode/opcode/parse.v index 0e7994bd1..a82b1a8a2 100644 --- a/CoqOfRust/revm/revm_bytecode/opcode/parse.v +++ b/CoqOfRust/revm/revm_bytecode/opcode/parse.v @@ -34,10 +34,7 @@ Module opcode. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OpCodeError" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "OpCodeError" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -189,10 +186,7 @@ Module opcode. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "invalid opcode" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "invalid opcode" |) |) |) ] |))) | _, _, _ => 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 3b916c1ee..949a8f449 100644 --- a/CoqOfRust/revm/revm_context_interface/block/blob.v +++ b/CoqOfRust/revm/revm_context_interface/block/blob.v @@ -85,14 +85,8 @@ Module block. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BlobExcessGasAndPrice" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "excess_blob_gas" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BlobExcessGasAndPrice" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "excess_blob_gas" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -106,10 +100,7 @@ Module block. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "blob_gasprice" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "blob_gasprice" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -576,9 +567,8 @@ Module block. M.alloc (| Value.Array [ - M.read (| - Value.String - "attempt to divide by zero" + mk_str (| + "attempt to divide by zero" |) ] |) diff --git a/CoqOfRust/revm/revm_context_interface/cfg.v b/CoqOfRust/revm/revm_context_interface/cfg.v index d61b6325b..494337106 100644 --- a/CoqOfRust/revm/revm_context_interface/cfg.v +++ b/CoqOfRust/revm/revm_context_interface/cfg.v @@ -1785,10 +1785,7 @@ Module cfg. "revm_context_interface::cfg::AnalysisKind::Raw" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Raw" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Raw" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1799,10 +1796,7 @@ Module cfg. "revm_context_interface::cfg::AnalysisKind::Analyse" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Analyse" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Analyse" |) |) |) |))) ] |) @@ -2083,10 +2077,7 @@ Module cfg. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Create" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Create" |) |) |) ] |) |))); @@ -2114,14 +2105,8 @@ Module cfg. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Create2" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "salt" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Create2" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "salt" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) diff --git a/CoqOfRust/revm/revm_context_interface/host.v b/CoqOfRust/revm/revm_context_interface/host.v index b38e326cb..399ae2253 100644 --- a/CoqOfRust/revm/revm_context_interface/host.v +++ b/CoqOfRust/revm/revm_context_interface/host.v @@ -1097,14 +1097,8 @@ Module host. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SStoreResult" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "original_value" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SStoreResult" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "original_value" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1118,10 +1112,7 @@ Module host. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "present_value" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "present_value" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1135,7 +1126,7 @@ Module host. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "new_value" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "new_value" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1876,11 +1867,8 @@ Module host. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SelfDestructResult" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "had_value" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SelfDestructResult" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "had_value" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1894,10 +1882,7 @@ Module host. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "target_exists" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "target_exists" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1911,10 +1896,7 @@ Module host. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "previously_destroyed" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "previously_destroyed" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/revm/revm_context_interface/host/dummy.v b/CoqOfRust/revm/revm_context_interface/host/dummy.v index 0dfea02fd..2675272b5 100644 --- a/CoqOfRust/revm/revm_context_interface/host/dummy.v +++ b/CoqOfRust/revm/revm_context_interface/host/dummy.v @@ -351,27 +351,15 @@ Module host. M.alloc (| Value.Array [ - M.read (| Value.String "tx" |); + mk_str (| "tx" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "block" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "cfg" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "storage" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "block" |) |) + M.deref (| mk_str (| "transient_storage" |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "cfg" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "storage" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "transient_storage" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "log" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "log" |) |) |) ] |) |) @@ -500,10 +488,7 @@ Module host. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DummyHost" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "DummyHost" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| names |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| values |) |) |) ] diff --git a/CoqOfRust/revm/revm_context_interface/journaled_state.v b/CoqOfRust/revm/revm_context_interface/journaled_state.v index 90cf4aeee..bd32f4524 100644 --- a/CoqOfRust/revm/revm_context_interface/journaled_state.v +++ b/CoqOfRust/revm/revm_context_interface/journaled_state.v @@ -158,10 +158,7 @@ Module journaled_state. "revm_context_interface::journaled_state::TransferError::OutOfFunds" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OutOfFunds" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "OutOfFunds" |) |) |) |))); fun γ => ltac:(M.monadic @@ -174,7 +171,7 @@ Module journaled_state. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OverflowPayment" |) |) + M.deref (| mk_str (| "OverflowPayment" |) |) |) |))); fun γ => @@ -188,7 +185,7 @@ Module journaled_state. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CreateCollision" |) |) + M.deref (| mk_str (| "CreateCollision" |) |) |) |))) ] @@ -328,11 +325,8 @@ Module journaled_state. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "JournalCheckpoint" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "log_i" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "JournalCheckpoint" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "log_i" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -346,7 +340,7 @@ Module journaled_state. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "journal_i" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "journal_i" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -631,8 +625,8 @@ Module journaled_state. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "StateLoad" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "data" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "StateLoad" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "data" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -646,7 +640,7 @@ Module journaled_state. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "is_cold" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "is_cold" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1166,11 +1160,8 @@ Module journaled_state. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AccountLoad" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "load" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "AccountLoad" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "load" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1184,7 +1175,7 @@ Module journaled_state. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "is_empty" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "is_empty" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1623,11 +1614,8 @@ Module journaled_state. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Eip7702CodeLoad" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "state_load" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Eip7702CodeLoad" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "state_load" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1643,7 +1631,7 @@ Module journaled_state. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "is_delegate_account_cold" |) |) + M.deref (| mk_str (| "is_delegate_account_cold" |) |) |); M.borrow (| Pointer.Kind.Ref, diff --git a/CoqOfRust/revm/revm_context_interface/result.v b/CoqOfRust/revm/revm_context_interface/result.v index d7d5a27af..303dbcf6b 100644 --- a/CoqOfRust/revm/revm_context_interface/result.v +++ b/CoqOfRust/revm/revm_context_interface/result.v @@ -68,11 +68,8 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ResultAndState" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "result" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ResultAndState" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "result" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -86,7 +83,7 @@ Module result. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "state" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "state" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -816,34 +813,19 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Success" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "reason" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Success" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "reason" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_0 |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "gas_used" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "gas_used" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_1 |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "gas_refunded" |) |) + M.deref (| mk_str (| "gas_refunded" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_2 |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "logs" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "logs" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_3 |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "output" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "output" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_4 |) |) @@ -882,19 +864,10 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Revert" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "gas_used" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Revert" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "gas_used" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_0 |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "output" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "output" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_1 |) |) @@ -933,19 +906,10 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Halt" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "reason" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Halt" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "reason" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_0 |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "gas_used" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "gas_used" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_1 |) |) @@ -2570,10 +2534,7 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Call" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Call" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -2612,10 +2573,7 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Create" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Create" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_0 |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -3472,10 +3430,7 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Transaction" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Transaction" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -3507,10 +3462,7 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Header" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Header" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -3542,10 +3494,7 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Database" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Database" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -3577,10 +3526,7 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Custom" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Custom" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -3612,10 +3558,7 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Precompile" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Precompile" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -4669,9 +4612,7 @@ Module result. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "transaction validation error: " |) - ] + Value.Array [ mk_str (| "transaction validation error: " |) ] |) |) |) @@ -4754,8 +4695,7 @@ Module result. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "header validation error: " |) ] + Value.Array [ mk_str (| "header validation error: " |) ] |) |) |) @@ -4840,9 +4780,7 @@ Module result. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "database error: " |) ] - |) + M.alloc (| Value.Array [ mk_str (| "database error: " |) ] |) |) |) |); @@ -5304,7 +5242,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PriorityFeeGreaterThanMaxFee" |) |) + M.deref (| mk_str (| "PriorityFeeGreaterThanMaxFee" |) |) |) ] |) @@ -5333,7 +5271,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "GasPriceLessThanBasefee" |) |) + M.deref (| mk_str (| "GasPriceLessThanBasefee" |) |) |) ] |) @@ -5362,7 +5300,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CallerGasLimitMoreThanBlock" |) |) + M.deref (| mk_str (| "CallerGasLimitMoreThanBlock" |) |) |) ] |) @@ -5391,7 +5329,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CallGasCostMoreThanGasLimit" |) |) + M.deref (| mk_str (| "CallGasCostMoreThanGasLimit" |) |) |) ] |) @@ -5420,7 +5358,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RejectCallerWithCode" |) |) + M.deref (| mk_str (| "RejectCallerWithCode" |) |) |) ] |) @@ -5458,17 +5396,11 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LackOfFundForMaxFee" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "fee" |) |) + M.deref (| mk_str (| "LackOfFundForMaxFee" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "fee" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_0 |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "balance" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "balance" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_1 |) |) @@ -5500,7 +5432,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OverflowPaymentInTransaction" |) |) + M.deref (| mk_str (| "OverflowPaymentInTransaction" |) |) |) ] |) @@ -5529,7 +5461,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NonceOverflowInTransaction" |) |) + M.deref (| mk_str (| "NonceOverflowInTransaction" |) |) |) ] |) @@ -5567,17 +5499,11 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NonceTooHigh" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "tx" |) |) + M.deref (| mk_str (| "NonceTooHigh" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "tx" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_0 |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "state" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "state" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_1 |) |) @@ -5616,19 +5542,10 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NonceTooLow" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "tx" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "NonceTooLow" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "tx" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_0 |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "state" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "state" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_1 |) |) @@ -5660,7 +5577,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CreateInitCodeSizeLimit" |) |) + M.deref (| mk_str (| "CreateInitCodeSizeLimit" |) |) |) ] |) @@ -5689,7 +5606,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidChainId" |) |) + M.deref (| mk_str (| "InvalidChainId" |) |) |) ] |) @@ -5718,7 +5635,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AccessListNotSupported" |) |) + M.deref (| mk_str (| "AccessListNotSupported" |) |) |) ] |) @@ -5747,7 +5664,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MaxFeePerBlobGasNotSupported" |) |) + M.deref (| mk_str (| "MaxFeePerBlobGasNotSupported" |) |) |) ] |) @@ -5776,9 +5693,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "BlobVersionedHashesNotSupported" |) - |) + M.deref (| mk_str (| "BlobVersionedHashesNotSupported" |) |) |) ] |) @@ -5807,7 +5722,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BlobGasPriceGreaterThanMax" |) |) + M.deref (| mk_str (| "BlobGasPriceGreaterThanMax" |) |) |) ] |) @@ -5834,10 +5749,7 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EmptyBlobs" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EmptyBlobs" |) |) |) ] |) |))); @@ -5865,7 +5777,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BlobCreateTransaction" |) |) + M.deref (| mk_str (| "BlobCreateTransaction" |) |) |) ] |) @@ -5903,17 +5815,11 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TooManyBlobs" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "max" |) |) + M.deref (| mk_str (| "TooManyBlobs" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "max" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_0 |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "have" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "have" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_1 |) |) @@ -5945,7 +5851,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BlobVersionNotSupported" |) |) + M.deref (| mk_str (| "BlobVersionNotSupported" |) |) |) ] |) @@ -5974,7 +5880,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EofCrateShouldHaveToAddress" |) |) + M.deref (| mk_str (| "EofCrateShouldHaveToAddress" |) |) |) ] |) @@ -6003,7 +5909,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AuthorizationListNotSupported" |) |) + M.deref (| mk_str (| "AuthorizationListNotSupported" |) |) |) ] |) @@ -6032,7 +5938,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "AuthorizationListInvalidFields" |) |) + M.deref (| mk_str (| "AuthorizationListInvalidFields" |) |) |) ] |) @@ -6061,7 +5967,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EmptyAuthorizationList" |) |) + M.deref (| mk_str (| "EmptyAuthorizationList" |) |) |) ] |) @@ -6092,7 +5998,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidAuthorizationList" |) |) + M.deref (| mk_str (| "InvalidAuthorizationList" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -6125,7 +6031,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Eip2930NotSupported" |) |) + M.deref (| mk_str (| "Eip2930NotSupported" |) |) |) ] |) @@ -6154,7 +6060,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Eip1559NotSupported" |) |) + M.deref (| mk_str (| "Eip1559NotSupported" |) |) |) ] |) @@ -6183,7 +6089,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Eip4844NotSupported" |) |) + M.deref (| mk_str (| "Eip4844NotSupported" |) |) |) ] |) @@ -6212,7 +6118,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Eip7702NotSupported" |) |) + M.deref (| mk_str (| "Eip7702NotSupported" |) |) |) ] |) @@ -7926,11 +7832,7 @@ Module result. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "priority fee is greater than max fee" - |) - ] + [ mk_str (| "priority fee is greater than max fee" |) ] |) |) |) @@ -7977,9 +7879,7 @@ Module result. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "gas price is less than basefee" |) - ] + Value.Array [ mk_str (| "gas price is less than basefee" |) ] |) |) |) @@ -8028,9 +7928,8 @@ Module result. M.alloc (| Value.Array [ - M.read (| - Value.String - "caller gas limit exceeds the block gas limit" + mk_str (| + "caller gas limit exceeds the block gas limit" |) ] |) @@ -8080,11 +7979,7 @@ Module result. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "call gas cost exceeds the gas limit" - |) - ] + [ mk_str (| "call gas cost exceeds the gas limit" |) ] |) |) |) @@ -8133,9 +8028,8 @@ Module result. M.alloc (| Value.Array [ - M.read (| - Value.String - "reject transactions from senders with deployed code" + mk_str (| + "reject transactions from senders with deployed code" |) ] |) @@ -8196,9 +8090,9 @@ Module result. M.alloc (| Value.Array [ - M.read (| Value.String "lack of funds (" |); - M.read (| Value.String ") for max fee (" |); - M.read (| Value.String ")" |) + mk_str (| "lack of funds (" |); + mk_str (| ") for max fee (" |); + mk_str (| ")" |) ] |) |) @@ -8329,12 +8223,7 @@ Module result. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "overflow payment in transaction" - |) - ] + Value.Array [ mk_str (| "overflow payment in transaction" |) ] |) |) |) @@ -8381,9 +8270,7 @@ Module result. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "nonce overflow in transaction" |) - ] + Value.Array [ mk_str (| "nonce overflow in transaction" |) ] |) |) |) @@ -8441,9 +8328,7 @@ Module result. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "nonce " |); - M.read (| Value.String " too high, expected " |) + [ mk_str (| "nonce " |); mk_str (| " too high, expected " |) ] |) |) @@ -8545,9 +8430,7 @@ Module result. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| Value.String "nonce " |); - M.read (| Value.String " too low, expected " |) + [ mk_str (| "nonce " |); mk_str (| " too low, expected " |) ] |) |) @@ -8638,8 +8521,7 @@ Module result. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "create initcode size limit" |) ] + Value.Array [ mk_str (| "create initcode size limit" |) ] |) |) |) @@ -8685,9 +8567,7 @@ Module result. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "invalid chain ID" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "invalid chain ID" |) ] |) |) |) |) @@ -8733,8 +8613,7 @@ Module result. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "access list not supported" |) ] + Value.Array [ mk_str (| "access list not supported" |) ] |) |) |) @@ -8782,11 +8661,7 @@ Module result. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "max fee per blob gas not supported" - |) - ] + [ mk_str (| "max fee per blob gas not supported" |) ] |) |) |) @@ -8834,11 +8709,7 @@ Module result. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "blob versioned hashes not supported" - |) - ] + [ mk_str (| "blob versioned hashes not supported" |) ] |) |) |) @@ -8887,9 +8758,8 @@ Module result. M.alloc (| Value.Array [ - M.read (| - Value.String - "blob gas price is greater than max fee per blob gas" + mk_str (| + "blob gas price is greater than max fee per blob gas" |) ] |) @@ -8937,9 +8807,7 @@ Module result. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "empty blobs" |) ] - |) + M.alloc (| Value.Array [ mk_str (| "empty blobs" |) ] |) |) |) |) @@ -8985,8 +8853,7 @@ Module result. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "blob create transaction" |) ] + Value.Array [ mk_str (| "blob create transaction" |) ] |) |) |) @@ -9045,8 +8912,8 @@ Module result. M.alloc (| Value.Array [ - M.read (| Value.String "too many blobs, have " |); - M.read (| Value.String ", max " |) + mk_str (| "too many blobs, have " |); + mk_str (| ", max " |) ] |) |) @@ -9137,8 +9004,7 @@ Module result. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "blob version not supported" |) ] + Value.Array [ mk_str (| "blob version not supported" |) ] |) |) |) @@ -9186,11 +9052,7 @@ Module result. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "EOF crate should have `to` address" - |) - ] + [ mk_str (| "EOF crate should have `to` address" |) ] |) |) |) @@ -9238,11 +9100,7 @@ Module result. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "authorization list not supported" - |) - ] + [ mk_str (| "authorization list not supported" |) ] |) |) |) @@ -9290,11 +9148,7 @@ Module result. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "authorization list tx has invalid fields" - |) - ] + [ mk_str (| "authorization list tx has invalid fields" |) ] |) |) |) @@ -9341,8 +9195,7 @@ Module result. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "empty authorization list" |) ] + Value.Array [ mk_str (| "empty authorization list" |) ] |) |) |) @@ -9389,8 +9242,7 @@ Module result. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Eip2930 is not supported" |) ] + Value.Array [ mk_str (| "Eip2930 is not supported" |) ] |) |) |) @@ -9437,8 +9289,7 @@ Module result. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Eip1559 is not supported" |) ] + Value.Array [ mk_str (| "Eip1559 is not supported" |) ] |) |) |) @@ -9485,8 +9336,7 @@ Module result. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Eip4844 is not supported" |) ] + Value.Array [ mk_str (| "Eip4844 is not supported" |) ] |) |) |) @@ -9533,8 +9383,7 @@ Module result. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Eip7702 is not supported" |) ] + Value.Array [ mk_str (| "Eip7702 is not supported" |) ] |) |) |) @@ -9649,7 +9498,7 @@ Module result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PrevrandaoNotSet" |) |) + M.deref (| mk_str (| "PrevrandaoNotSet" |) |) |) |))); fun γ => @@ -9663,7 +9512,7 @@ Module result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ExcessBlobGasNotSet" |) |) + M.deref (| mk_str (| "ExcessBlobGasNotSet" |) |) |) |))) ] @@ -9937,8 +9786,7 @@ Module result. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "`prevrandao` not set" |) ] + Value.Array [ mk_str (| "`prevrandao` not set" |) ] |) |) |) @@ -9985,8 +9833,7 @@ Module result. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "`excess_blob_gas` not set" |) ] + Value.Array [ mk_str (| "`excess_blob_gas` not set" |) ] |) |) |) @@ -10079,10 +9926,7 @@ Module result. "revm_context_interface::result::SuccessReason::Stop" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Stop" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Stop" |) |) |) |))); fun γ => ltac:(M.monadic @@ -10093,10 +9937,7 @@ Module result. "revm_context_interface::result::SuccessReason::Return" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Return" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Return" |) |) |) |))); fun γ => ltac:(M.monadic @@ -10107,10 +9948,7 @@ Module result. "revm_context_interface::result::SuccessReason::SelfDestruct" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SelfDestruct" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SelfDestruct" |) |) |) |))); fun γ => ltac:(M.monadic @@ -10123,7 +9961,7 @@ Module result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EofReturnContract" |) |) + M.deref (| mk_str (| "EofReturnContract" |) |) |) |))) ] @@ -10515,10 +10353,7 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OutOfGas" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "OutOfGas" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -10550,7 +10385,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OpcodeNotFound" |) |) + M.deref (| mk_str (| "OpcodeNotFound" |) |) |) ] |) @@ -10579,7 +10414,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidFEOpcode" |) |) + M.deref (| mk_str (| "InvalidFEOpcode" |) |) |) ] |) @@ -10606,10 +10441,7 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidJump" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "InvalidJump" |) |) |) ] |) |))); @@ -10635,10 +10467,7 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NotActivated" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "NotActivated" |) |) |) ] |) |))); @@ -10666,7 +10495,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "StackUnderflow" |) |) + M.deref (| mk_str (| "StackUnderflow" |) |) |) ] |) @@ -10695,7 +10524,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "StackOverflow" |) |) + M.deref (| mk_str (| "StackOverflow" |) |) |) ] |) @@ -10722,10 +10551,7 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OutOfOffset" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "OutOfOffset" |) |) |) ] |) |))); @@ -10753,7 +10579,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CreateCollision" |) |) + M.deref (| mk_str (| "CreateCollision" |) |) |) ] |) @@ -10782,7 +10608,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PrecompileError" |) |) + M.deref (| mk_str (| "PrecompileError" |) |) |) ] |) @@ -10811,7 +10637,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NonceOverflow" |) |) + M.deref (| mk_str (| "NonceOverflow" |) |) |) ] |) @@ -10840,7 +10666,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CreateContractSizeLimit" |) |) + M.deref (| mk_str (| "CreateContractSizeLimit" |) |) |) ] |) @@ -10869,7 +10695,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CreateContractStartingWithEF" |) |) + M.deref (| mk_str (| "CreateContractStartingWithEF" |) |) |) ] |) @@ -10898,7 +10724,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CreateInitCodeSizeLimit" |) |) + M.deref (| mk_str (| "CreateInitCodeSizeLimit" |) |) |) ] |) @@ -10927,7 +10753,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OverflowPayment" |) |) + M.deref (| mk_str (| "OverflowPayment" |) |) |) ] |) @@ -10956,7 +10782,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "StateChangeDuringStaticCall" |) |) + M.deref (| mk_str (| "StateChangeDuringStaticCall" |) |) |) ] |) @@ -10985,7 +10811,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CallNotAllowedInsideStatic" |) |) + M.deref (| mk_str (| "CallNotAllowedInsideStatic" |) |) |) ] |) @@ -11012,10 +10838,7 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OutOfFunds" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "OutOfFunds" |) |) |) ] |) |))); @@ -11041,10 +10864,7 @@ Module result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CallTooDeep" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CallTooDeep" |) |) |) ] |) |))); @@ -11072,7 +10892,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EofAuxDataOverflow" |) |) + M.deref (| mk_str (| "EofAuxDataOverflow" |) |) |) ] |) @@ -11101,7 +10921,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EofAuxDataTooSmall" |) |) + M.deref (| mk_str (| "EofAuxDataTooSmall" |) |) |) ] |) @@ -11130,7 +10950,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SubRoutineStackOverflow" |) |) + M.deref (| mk_str (| "SubRoutineStackOverflow" |) |) |) ] |) @@ -11159,7 +10979,7 @@ Module result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidEXTCALLTarget" |) |) + M.deref (| mk_str (| "InvalidEXTCALLTarget" |) |) |) ] |) @@ -11546,10 +11366,7 @@ Module result. "revm_context_interface::result::OutOfGasError::Basic" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Basic" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Basic" |) |) |) |))); fun γ => ltac:(M.monadic @@ -11560,10 +11377,7 @@ Module result. "revm_context_interface::result::OutOfGasError::MemoryLimit" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MemoryLimit" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MemoryLimit" |) |) |) |))); fun γ => ltac:(M.monadic @@ -11574,10 +11388,7 @@ Module result. "revm_context_interface::result::OutOfGasError::Memory" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Memory" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Memory" |) |) |) |))); fun γ => ltac:(M.monadic @@ -11588,10 +11399,7 @@ Module result. "revm_context_interface::result::OutOfGasError::Precompile" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Precompile" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Precompile" |) |) |) |))); fun γ => ltac:(M.monadic @@ -11604,7 +11412,7 @@ Module result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidOperand" |) |) + M.deref (| mk_str (| "InvalidOperand" |) |) |) |))); fun γ => @@ -11618,7 +11426,7 @@ Module result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ReentrancySentry" |) |) + M.deref (| mk_str (| "ReentrancySentry" |) |) |) |))) ] diff --git a/CoqOfRust/revm/revm_context_interface/transaction.v b/CoqOfRust/revm/revm_context_interface/transaction.v index 97e0b2a8a..9b9798d71 100644 --- a/CoqOfRust/revm/revm_context_interface/transaction.v +++ b/CoqOfRust/revm/revm_context_interface/transaction.v @@ -32,9 +32,7 @@ Module transaction. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "not implemented: legacy tx not supported" |) - ] + Value.Array [ mk_str (| "not implemented: legacy tx not supported" |) ] |) |) |) @@ -97,12 +95,7 @@ Module transaction. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "not implemented: Eip2930 tx not supported" - |) - ] + Value.Array [ mk_str (| "not implemented: Eip2930 tx not supported" |) ] |) |) |) @@ -165,12 +158,7 @@ Module transaction. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "not implemented: Eip1559 tx not supported" - |) - ] + Value.Array [ mk_str (| "not implemented: Eip1559 tx not supported" |) ] |) |) |) @@ -233,12 +221,7 @@ Module transaction. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "not implemented: Eip4844 tx not supported" - |) - ] + Value.Array [ mk_str (| "not implemented: Eip4844 tx not supported" |) ] |) |) |) @@ -301,12 +284,7 @@ Module transaction. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ - M.read (| - Value.String "not implemented: Eip7702 tx not supported" - |) - ] + Value.Array [ mk_str (| "not implemented: Eip7702 tx not supported" |) ] |) |) |) @@ -660,9 +638,8 @@ Module transaction. M.alloc (| Value.Array [ - M.read (| - Value.String - "not implemented: Custom tx not supported" + mk_str (| + "not implemented: Custom tx not supported" |) ] |) @@ -1076,11 +1053,7 @@ Module transaction. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String - "not implemented: Custom tx not supported" - |) + [ mk_str (| "not implemented: Custom tx not supported" |) ] |) |) @@ -1704,9 +1677,8 @@ Module transaction. M.alloc (| Value.Array [ - M.read (| - Value.String - "not implemented: Custom tx not supported" + mk_str (| + "not implemented: Custom tx not supported" |) ] |) @@ -2166,11 +2138,7 @@ Module transaction. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String - "not implemented: Custom tx not supported" - |) + [ mk_str (| "not implemented: Custom tx not supported" |) ] |) |) @@ -2648,11 +2616,7 @@ Module transaction. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String - "not implemented: Custom tx not supported" - |) + [ mk_str (| "not implemented: Custom tx not supported" |) ] |) |) diff --git a/CoqOfRust/revm/revm_context_interface/transaction/transaction_type.v b/CoqOfRust/revm/revm_context_interface/transaction/transaction_type.v index 5d47de5e1..811222fba 100644 --- a/CoqOfRust/revm/revm_context_interface/transaction/transaction_type.v +++ b/CoqOfRust/revm/revm_context_interface/transaction/transaction_type.v @@ -132,10 +132,7 @@ Module transaction. "revm_context_interface::transaction::transaction_type::TransactionType::Legacy" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Legacy" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Legacy" |) |) |) |))); fun γ => ltac:(M.monadic @@ -146,10 +143,7 @@ Module transaction. "revm_context_interface::transaction::transaction_type::TransactionType::Eip2930" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Eip2930" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Eip2930" |) |) |) |))); fun γ => ltac:(M.monadic @@ -160,10 +154,7 @@ Module transaction. "revm_context_interface::transaction::transaction_type::TransactionType::Eip1559" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Eip1559" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Eip1559" |) |) |) |))); fun γ => ltac:(M.monadic @@ -174,10 +165,7 @@ Module transaction. "revm_context_interface::transaction::transaction_type::TransactionType::Eip4844" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Eip4844" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Eip4844" |) |) |) |))); fun γ => ltac:(M.monadic @@ -188,10 +176,7 @@ Module transaction. "revm_context_interface::transaction::transaction_type::TransactionType::Eip7702" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Eip7702" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Eip7702" |) |) |) |))); fun γ => ltac:(M.monadic @@ -202,10 +187,7 @@ Module transaction. "revm_context_interface::transaction::transaction_type::TransactionType::Custom" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Custom" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Custom" |) |) |) |))) ] |) diff --git a/CoqOfRust/revm/revm_interpreter/gas.v b/CoqOfRust/revm/revm_interpreter/gas.v index 8226ad18c..3e051a8e4 100644 --- a/CoqOfRust/revm/revm_interpreter/gas.v +++ b/CoqOfRust/revm/revm_interpreter/gas.v @@ -95,8 +95,8 @@ Module gas. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Gas" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "limit" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Gas" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "limit" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -110,7 +110,7 @@ Module gas. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "remaining" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "remaining" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -124,7 +124,7 @@ Module gas. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "refunded" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "refunded" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -138,7 +138,7 @@ Module gas. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "memory" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "memory" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1400,8 +1400,8 @@ Module gas. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "MemoryGas" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "words_num" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MemoryGas" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "words_num" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1415,10 +1415,7 @@ Module gas. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "expansion_cost" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "expansion_cost" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/revm/revm_interpreter/instruction_result.v b/CoqOfRust/revm/revm_interpreter/instruction_result.v index 3c3e91561..ff4607005 100644 --- a/CoqOfRust/revm/revm_interpreter/instruction_result.v +++ b/CoqOfRust/revm/revm_interpreter/instruction_result.v @@ -360,10 +360,7 @@ Module instruction_result. "revm_interpreter::instruction_result::InstructionResult::Continue" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Continue" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Continue" |) |) |) |))); fun γ => ltac:(M.monadic @@ -374,10 +371,7 @@ Module instruction_result. "revm_interpreter::instruction_result::InstructionResult::Stop" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Stop" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Stop" |) |) |) |))); fun γ => ltac:(M.monadic @@ -388,10 +382,7 @@ Module instruction_result. "revm_interpreter::instruction_result::InstructionResult::Return" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Return" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Return" |) |) |) |))); fun γ => ltac:(M.monadic @@ -402,10 +393,7 @@ Module instruction_result. "revm_interpreter::instruction_result::InstructionResult::SelfDestruct" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SelfDestruct" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SelfDestruct" |) |) |) |))); fun γ => ltac:(M.monadic @@ -418,7 +406,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ReturnContract" |) |) + M.deref (| mk_str (| "ReturnContract" |) |) |) |))); fun γ => @@ -430,10 +418,7 @@ Module instruction_result. "revm_interpreter::instruction_result::InstructionResult::Revert" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Revert" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Revert" |) |) |) |))); fun γ => ltac:(M.monadic @@ -444,10 +429,7 @@ Module instruction_result. "revm_interpreter::instruction_result::InstructionResult::CallTooDeep" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CallTooDeep" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CallTooDeep" |) |) |) |))); fun γ => ltac:(M.monadic @@ -458,10 +440,7 @@ Module instruction_result. "revm_interpreter::instruction_result::InstructionResult::OutOfFunds" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OutOfFunds" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "OutOfFunds" |) |) |) |))); fun γ => ltac:(M.monadic @@ -474,7 +453,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CreateInitCodeStartingEF00" |) |) + M.deref (| mk_str (| "CreateInitCodeStartingEF00" |) |) |) |))); fun γ => @@ -488,7 +467,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidEOFInitCode" |) |) + M.deref (| mk_str (| "InvalidEOFInitCode" |) |) |) |))); fun γ => @@ -502,7 +481,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidExtDelegateCallTarget" |) |) + M.deref (| mk_str (| "InvalidExtDelegateCallTarget" |) |) |) |))); fun γ => @@ -514,10 +493,7 @@ Module instruction_result. "revm_interpreter::instruction_result::InstructionResult::CallOrCreate" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CallOrCreate" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CallOrCreate" |) |) |) |))); fun γ => ltac:(M.monadic @@ -528,10 +504,7 @@ Module instruction_result. "revm_interpreter::instruction_result::InstructionResult::OutOfGas" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OutOfGas" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "OutOfGas" |) |) |) |))); fun γ => ltac:(M.monadic @@ -542,10 +515,7 @@ Module instruction_result. "revm_interpreter::instruction_result::InstructionResult::MemoryOOG" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MemoryOOG" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MemoryOOG" |) |) |) |))); fun γ => ltac:(M.monadic @@ -558,7 +528,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MemoryLimitOOG" |) |) + M.deref (| mk_str (| "MemoryLimitOOG" |) |) |) |))); fun γ => @@ -572,7 +542,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PrecompileOOG" |) |) + M.deref (| mk_str (| "PrecompileOOG" |) |) |) |))); fun γ => @@ -586,7 +556,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidOperandOOG" |) |) + M.deref (| mk_str (| "InvalidOperandOOG" |) |) |) |))); fun γ => @@ -600,7 +570,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ReentrancySentryOOG" |) |) + M.deref (| mk_str (| "ReentrancySentryOOG" |) |) |) |))); fun γ => @@ -614,7 +584,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OpcodeNotFound" |) |) + M.deref (| mk_str (| "OpcodeNotFound" |) |) |) |))); fun γ => @@ -628,7 +598,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CallNotAllowedInsideStatic" |) |) + M.deref (| mk_str (| "CallNotAllowedInsideStatic" |) |) |) |))); fun γ => @@ -642,7 +612,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "StateChangeDuringStaticCall" |) |) + M.deref (| mk_str (| "StateChangeDuringStaticCall" |) |) |) |))); fun γ => @@ -656,7 +626,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidFEOpcode" |) |) + M.deref (| mk_str (| "InvalidFEOpcode" |) |) |) |))); fun γ => @@ -668,10 +638,7 @@ Module instruction_result. "revm_interpreter::instruction_result::InstructionResult::InvalidJump" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidJump" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "InvalidJump" |) |) |) |))); fun γ => ltac:(M.monadic @@ -682,10 +649,7 @@ Module instruction_result. "revm_interpreter::instruction_result::InstructionResult::NotActivated" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NotActivated" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "NotActivated" |) |) |) |))); fun γ => ltac:(M.monadic @@ -698,7 +662,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "StackUnderflow" |) |) + M.deref (| mk_str (| "StackUnderflow" |) |) |) |))); fun γ => @@ -712,7 +676,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "StackOverflow" |) |) + M.deref (| mk_str (| "StackOverflow" |) |) |) |))); fun γ => @@ -724,10 +688,7 @@ Module instruction_result. "revm_interpreter::instruction_result::InstructionResult::OutOfOffset" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OutOfOffset" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "OutOfOffset" |) |) |) |))); fun γ => ltac:(M.monadic @@ -740,7 +701,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CreateCollision" |) |) + M.deref (| mk_str (| "CreateCollision" |) |) |) |))); fun γ => @@ -754,7 +715,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OverflowPayment" |) |) + M.deref (| mk_str (| "OverflowPayment" |) |) |) |))); fun γ => @@ -768,7 +729,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PrecompileError" |) |) + M.deref (| mk_str (| "PrecompileError" |) |) |) |))); fun γ => @@ -782,7 +743,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NonceOverflow" |) |) + M.deref (| mk_str (| "NonceOverflow" |) |) |) |))); fun γ => @@ -796,7 +757,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CreateContractSizeLimit" |) |) + M.deref (| mk_str (| "CreateContractSizeLimit" |) |) |) |))); fun γ => @@ -810,7 +771,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CreateContractStartingWithEF" |) |) + M.deref (| mk_str (| "CreateContractStartingWithEF" |) |) |) |))); fun γ => @@ -824,7 +785,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CreateInitCodeSizeLimit" |) |) + M.deref (| mk_str (| "CreateInitCodeSizeLimit" |) |) |) |))); fun γ => @@ -838,7 +799,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FatalExternalError" |) |) + M.deref (| mk_str (| "FatalExternalError" |) |) |) |))); fun γ => @@ -852,7 +813,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ReturnContractInNotInitEOF" |) |) + M.deref (| mk_str (| "ReturnContractInNotInitEOF" |) |) |) |))); fun γ => @@ -866,7 +827,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EOFOpcodeDisabledInLegacy" |) |) + M.deref (| mk_str (| "EOFOpcodeDisabledInLegacy" |) |) |) |))); fun γ => @@ -880,7 +841,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SubRoutineStackOverflow" |) |) + M.deref (| mk_str (| "SubRoutineStackOverflow" |) |) |) |))); fun γ => @@ -894,7 +855,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EofAuxDataOverflow" |) |) + M.deref (| mk_str (| "EofAuxDataOverflow" |) |) |) |))); fun γ => @@ -908,7 +869,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EofAuxDataTooSmall" |) |) + M.deref (| mk_str (| "EofAuxDataTooSmall" |) |) |) |))); fun γ => @@ -922,7 +883,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidEXTCALLTarget" |) |) + M.deref (| mk_str (| "InvalidEXTCALLTarget" |) |) |) |))) ] @@ -2392,7 +2353,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InternalContinue" |) |) + M.deref (| mk_str (| "InternalContinue" |) |) |) |))); fun γ => @@ -2406,7 +2367,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InternalCallOrCreate" |) |) + M.deref (| mk_str (| "InternalCallOrCreate" |) |) |) |))); fun γ => @@ -2420,7 +2381,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CreateInitCodeStartingEF00" |) |) + M.deref (| mk_str (| "CreateInitCodeStartingEF00" |) |) |) |))); fun γ => @@ -2434,7 +2395,7 @@ Module instruction_result. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidExtDelegateCallTarget" |) |) + M.deref (| mk_str (| "InvalidExtDelegateCallTarget" |) |) |) |))) ] @@ -2889,10 +2850,7 @@ Module instruction_result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Success" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Success" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -2922,10 +2880,7 @@ Module instruction_result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Revert" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Revert" |) |) |) ] |) |))); @@ -2953,10 +2908,7 @@ Module instruction_result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Halt" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Halt" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -2988,7 +2940,7 @@ Module instruction_result. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FatalExternalError" |) |) + M.deref (| mk_str (| "FatalExternalError" |) |) |) ] |) @@ -3017,10 +2969,7 @@ Module instruction_result. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Internal" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Internal" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) diff --git a/CoqOfRust/revm/revm_interpreter/instructions/contract.v b/CoqOfRust/revm/revm_interpreter/instructions/contract.v index 5347fd9bc..47d87beec 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/contract.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/contract.v @@ -523,7 +523,7 @@ Module instructions. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "valid container" |) |) + M.deref (| mk_str (| "valid container" |) |) |) ] |) @@ -789,9 +789,7 @@ Module instructions. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Subcontainer is verified" |) - |) + M.deref (| mk_str (| "Subcontainer is verified" |) |) |) ] |) @@ -852,9 +850,8 @@ Module instructions. M.alloc (| Value.Array [ - M.read (| - Value.String - "Panic if data section is not full" + mk_str (| + "Panic if data section is not full" |) ] |) @@ -1991,7 +1988,7 @@ Module instructions. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "valid container" |) |) + M.deref (| mk_str (| "valid container" |) |) |) ] |) @@ -2108,7 +2105,7 @@ Module instructions. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "valid EOF header" |) |) + M.deref (| mk_str (| "valid EOF header" |) |) |) ] |) diff --git a/CoqOfRust/revm/revm_interpreter/instructions/control.v b/CoqOfRust/revm/revm_interpreter/instructions/control.v index 9fa936fa7..435d8304f 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/control.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/control.v @@ -2759,9 +2759,7 @@ Module instructions. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Invalid code section index" |) - |) + M.deref (| mk_str (| "Invalid code section index" |) |) |) ] |) @@ -3440,7 +3438,7 @@ Module instructions. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid code section index" |) |) + M.deref (| mk_str (| "Invalid code section index" |) |) |) ] |) @@ -3625,7 +3623,7 @@ Module instructions. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid code section index" |) |) + M.deref (| mk_str (| "Invalid code section index" |) |) |) ] |) diff --git a/CoqOfRust/revm/revm_interpreter/instructions/host.v b/CoqOfRust/revm/revm_interpreter/instructions/host.v index 87f2f552a..d98dcb832 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/host.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/host.v @@ -7598,9 +7598,7 @@ Module instructions. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "LogData should have <=4 topics" - |) + mk_str (| "LogData should have <=4 topics" |) |) |) ] diff --git a/CoqOfRust/revm/revm_interpreter/instructions/i256.v b/CoqOfRust/revm/revm_interpreter/instructions/i256.v index 3c0e1e8b4..77571c7c7 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/i256.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/i256.v @@ -99,10 +99,7 @@ Module instructions. "revm_interpreter::instructions::i256::Sign::Minus" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Minus" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Minus" |) |) |) |))); fun γ => ltac:(M.monadic @@ -113,10 +110,7 @@ Module instructions. "revm_interpreter::instructions::i256::Sign::Zero" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Zero" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Zero" |) |) |) |))); fun γ => ltac:(M.monadic @@ -127,10 +121,7 @@ Module instructions. "revm_interpreter::instructions::i256::Sign::Plus" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Plus" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Plus" |) |) |) |))) ] |) diff --git a/CoqOfRust/revm/revm_interpreter/instructions/stack.v b/CoqOfRust/revm/revm_interpreter/instructions/stack.v index 85ca264d9..6eff8a34c 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/stack.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/stack.v @@ -1295,7 +1295,7 @@ Module instructions. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: N != 0" |) ] + [ mk_str (| "assertion failed: N != 0" |) ] |) |) |))); diff --git a/CoqOfRust/revm/revm_interpreter/instructions/system.v b/CoqOfRust/revm/revm_interpreter/instructions/system.v index 12c80898c..94918913b 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/system.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/system.v @@ -2874,9 +2874,8 @@ Module instructions. [] |), [ - M.read (| - Value.String - "assertion failed: count <= 32 && offset + count <= input_len" + mk_str (| + "assertion failed: count <= 32 && offset + count <= input_len" |) ] |) diff --git a/CoqOfRust/revm/revm_interpreter/instructions/utility.v b/CoqOfRust/revm/revm_interpreter/instructions/utility.v index d51a387a3..a9df2e343 100644 --- a/CoqOfRust/revm/revm_interpreter/instructions/utility.v +++ b/CoqOfRust/revm/revm_interpreter/instructions/utility.v @@ -159,8 +159,7 @@ Module instructions. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "slice too long" |) ] + Value.Array [ mk_str (| "slice too long" |) ] |) |) |) @@ -1215,9 +1214,8 @@ Module instructions. M.alloc (| Value.Array [ - M.read (| - Value.String - "wrote too much" + mk_str (| + "wrote too much" |) ] |) diff --git a/CoqOfRust/revm/revm_interpreter/interpreter.v b/CoqOfRust/revm/revm_interpreter/interpreter.v index 8e9759e9e..5d6682ffc 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter.v @@ -107,39 +107,24 @@ Module interpreter. M.alloc (| Value.Array [ - M.read (| Value.String "bytecode" |); + mk_str (| "bytecode" |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "stack" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "stack" |) |) + M.deref (| mk_str (| "return_data" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "memory" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "input" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "return_data" |) |) + M.deref (| mk_str (| "sub_routine" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "control" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "memory" |) |) + M.deref (| mk_str (| "runtime_flag" |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "input" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "sub_routine" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "control" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "runtime_flag" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "extend" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "extend" |) |) |) ] |) |) @@ -307,10 +292,7 @@ Module interpreter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Interpreter" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Interpreter" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| names |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| values |) |) |) ] @@ -2026,11 +2008,8 @@ Module interpreter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InterpreterResult" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "result" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "InterpreterResult" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "result" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2044,7 +2023,7 @@ Module interpreter. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "output" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "output" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2058,7 +2037,7 @@ Module interpreter. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "gas" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "gas" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/revm/revm_interpreter/interpreter/ext_bytecode.v b/CoqOfRust/revm/revm_interpreter/interpreter/ext_bytecode.v index 352c0e546..7ef7ccaaf 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter/ext_bytecode.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter/ext_bytecode.v @@ -38,11 +38,8 @@ Module interpreter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ExtBytecode" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "base" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ExtBytecode" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "base" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -56,10 +53,7 @@ Module interpreter. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "instruction_pointer" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "instruction_pointer" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -483,7 +477,7 @@ Module interpreter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Panic if not legacy" |) |) + M.deref (| mk_str (| "Panic if not legacy" |) |) |) ] |) @@ -1473,7 +1467,7 @@ Module interpreter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "eof" |) |) + M.deref (| mk_str (| "eof" |) |) |) ] |) @@ -1608,7 +1602,7 @@ Module interpreter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "eof" |) |) + M.deref (| mk_str (| "eof" |) |) |) ] |) @@ -1732,10 +1726,7 @@ Module interpreter. |) ] |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "eof" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "eof" |) |) |) ] |) |) @@ -2114,9 +2105,8 @@ Module interpreter. M.alloc (| Value.Array [ - M.read (| - Value.String - "internal error: entered unreachable code: !self.base.is_eof()" + mk_str (| + "internal error: entered unreachable code: !self.base.is_eof()" |) ] |) @@ -2306,9 +2296,8 @@ Module interpreter. M.alloc (| Value.Array [ - M.read (| - Value.String - "internal error: entered unreachable code: !self.base.is_eof()" + mk_str (| + "internal error: entered unreachable code: !self.base.is_eof()" |) ] |) diff --git a/CoqOfRust/revm/revm_interpreter/interpreter/input.v b/CoqOfRust/revm/revm_interpreter/interpreter/input.v index 59f921cf8..560323f67 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter/input.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter/input.v @@ -187,14 +187,8 @@ Module interpreter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InputsImpl" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "target_address" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "InputsImpl" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "target_address" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -208,10 +202,7 @@ Module interpreter. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "caller_address" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "caller_address" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -225,7 +216,7 @@ Module interpreter. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "input" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "input" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -239,10 +230,7 @@ Module interpreter. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "call_value" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "call_value" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/revm/revm_interpreter/interpreter/links/stack.v b/CoqOfRust/revm/revm_interpreter/interpreter/links/stack.v index 32857eaf7..b65e90766 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter/links/stack.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter/links/stack.v @@ -3,7 +3,9 @@ Require Import CoqOfRust.links.M. Require Import alloc.links.alloc. Require Import alloc.vec.links.mod. Require Import core.links.array. +Require Import core.links.hint. Require Import core.links.option. +Require Import core.links.panicking. Require Import core.links.result. Require Import core.slice.links.index. Require Import core.slice.links.mod. @@ -178,13 +180,31 @@ Module Impl_Stack. Defined. (* pub unsafe fn popn(&mut self) -> [U256; N] *) - Instance run_popn (self : Ref.t Pointer.Kind.MutRef Self) (N : Usize.t) : + Instance run_popn (N : Usize.t) (self : Ref.t Pointer.Kind.MutRef Self) : Run.Trait interpreter.stack.Impl_revm_interpreter_interpreter_stack_Stack.popn [φ N] [] [φ self] (array.t U256.t N). Proof. constructor. - run_symbolic. + assert (H_N_eq : + M.get_constant "revm_interpreter::interpreter::stack::popn::N" = + φ (Ref.immediate Pointer.Kind.Raw N) + ) by admit. + assert (H_ZERO_eq : + M.get_constant "ruint::ZERO" = + φ (Ref.immediate Pointer.Kind.Raw ( + Impl_Uint.ZERO {| Integer.value := 256 |} {| Integer.value := 4 |} + )) + ) by admit. + repeat ( + run_symbolic || + match goal with + | [ |- context[M.get_constant "revm_interpreter::interpreter::stack::popn::N"] ] => + eapply Run.Rewrite; [rewrite H_N_eq; reflexivity |] + | [ |- context[M.get_constant "ruint::ZERO"] ] => + eapply Run.Rewrite; [rewrite H_ZERO_eq; reflexivity |] + end + ). Admitted. (* pub unsafe fn popn_top(&mut self) -> ([U256; POPN], &mut U256) *) @@ -195,7 +215,7 @@ Module Impl_Stack. Proof. constructor. run_symbolic. - Admitted. + Defined. (* pub fn push(&mut self, value: U256) -> bool *) Instance run_push (self : Ref.t Pointer.Kind.MutRef Self) (value : U256.t) : @@ -215,6 +235,7 @@ Module Impl_Stack. (Result.t U256.t InstructionResult.t). Proof. constructor. + destruct (Impl_Index_for_Vec_T_A.run U256.t Usize.t Global.t U256.t). run_symbolic. Admitted. diff --git a/CoqOfRust/revm/revm_interpreter/interpreter/return_data.v b/CoqOfRust/revm/revm_interpreter/interpreter/return_data.v index 221432587..156d98d76 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter/return_data.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter/return_data.v @@ -88,10 +88,7 @@ Module interpreter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ReturnDataImpl" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ReturnDataImpl" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/revm/revm_interpreter/interpreter/shared_memory.v b/CoqOfRust/revm/revm_interpreter/interpreter/shared_memory.v index 4a389c243..733738bef 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter/shared_memory.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter/shared_memory.v @@ -579,7 +579,7 @@ Module interpreter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SharedMemory" |) |) + M.deref (| mk_str (| "SharedMemory" |) |) |) ] |) @@ -587,7 +587,7 @@ Module interpreter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "current_len" |) |) + M.deref (| mk_str (| "current_len" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -621,7 +621,7 @@ Module interpreter. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "context_memory" |) |) + M.deref (| mk_str (| "context_memory" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -2287,12 +2287,11 @@ Module interpreter. M.alloc (| Value.Array [ - M.read (| - Value.String - "internal error: entered unreachable code: slice OOB: " + mk_str (| + "internal error: entered unreachable code: slice OOB: " |); - M.read (| Value.String ".." |); - M.read (| Value.String "; len: " |) + mk_str (| ".." |); + mk_str (| "; len: " |) ] |) |) @@ -2628,11 +2627,10 @@ Module interpreter. M.alloc (| Value.Array [ - M.read (| - Value.String - "internal error: entered unreachable code: slice OOB: " + mk_str (| + "internal error: entered unreachable code: slice OOB: " |); - M.read (| Value.String ".." |) + mk_str (| ".." |) ] |) |) @@ -3446,9 +3444,8 @@ Module interpreter. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: data_offset < data.len() && data_end <= data.len()" + mk_str (| + "assertion failed: data_offset < data.len() && data_end <= data.len()" |) ] |) diff --git a/CoqOfRust/revm/revm_interpreter/interpreter/stack.v b/CoqOfRust/revm/revm_interpreter/interpreter/stack.v index e697bf5da..359ca6f79 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter/stack.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter/stack.v @@ -54,8 +54,8 @@ Module interpreter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Stack" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "data" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Stack" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "data" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -329,10 +329,7 @@ Module interpreter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "[" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "[" |) |) |) ] |) ] @@ -745,9 +742,7 @@ Module interpreter. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String ", " - |) + mk_str (| ", " |) |) |) ] @@ -898,11 +893,7 @@ Module interpreter. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "" - |) - ] + [ mk_str (| "" |) ] |) |) |) @@ -1053,7 +1044,7 @@ Module interpreter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "]" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "]" |) |) |) ] |) |) @@ -2644,9 +2635,8 @@ Module interpreter. M.alloc (| Value.Array [ - M.read (| - Value.String - "internal error: entered unreachable code: self.data.capacity() == STACK_LIMIT" + mk_str (| + "internal error: entered unreachable code: self.data.capacity() == STACK_LIMIT" |) ] |) @@ -3093,9 +3083,8 @@ Module interpreter. M.alloc (| Value.Array [ - M.read (| - Value.String - "internal error: entered unreachable code: attempted to dup 0" + mk_str (| + "internal error: entered unreachable code: attempted to dup 0" |) ] |) @@ -3548,9 +3537,8 @@ Module interpreter. M.alloc (| Value.Array [ - M.read (| - Value.String - "internal error: entered unreachable code: overlapping exchange" + mk_str (| + "internal error: entered unreachable code: overlapping exchange" |) ] |) @@ -5292,9 +5280,8 @@ Module interpreter. M.alloc (| Value.Array [ - M.read (| - Value.String - "wrote too much" + mk_str (| + "wrote too much" |) ] |) diff --git a/CoqOfRust/revm/revm_interpreter/interpreter/subroutine_stack.v b/CoqOfRust/revm/revm_interpreter/interpreter/subroutine_stack.v index aa061200c..877d41c5e 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter/subroutine_stack.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter/subroutine_stack.v @@ -35,11 +35,8 @@ Module interpreter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SubRoutineReturnFrame" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "idx" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SubRoutineReturnFrame" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "idx" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -53,7 +50,7 @@ Module interpreter. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "pc" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "pc" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -538,14 +535,8 @@ Module interpreter. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SubRoutineImpl" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "return_stack" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SubRoutineImpl" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "return_stack" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -559,10 +550,7 @@ Module interpreter. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "current_code_idx" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "current_code_idx" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/revm/revm_interpreter/interpreter_action.v b/CoqOfRust/revm/revm_interpreter/interpreter_action.v index 3e9b99ecf..84abd324c 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter_action.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter_action.v @@ -264,10 +264,7 @@ Module interpreter_action. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Call" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Call" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -299,10 +296,7 @@ Module interpreter_action. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Create" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Create" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -334,10 +328,7 @@ Module interpreter_action. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EOFCreate" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EOFCreate" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -891,10 +882,7 @@ Module interpreter_action. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NewFrame" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "NewFrame" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -926,14 +914,8 @@ Module interpreter_action. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Return" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "result" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Return" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "result" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -963,10 +945,7 @@ Module interpreter_action. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "None" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "None" |) |) |) ] |) |))) diff --git a/CoqOfRust/revm/revm_interpreter/interpreter_action/call_inputs.v b/CoqOfRust/revm/revm_interpreter/interpreter_action/call_inputs.v index 0839c266f..d56b0dc7b 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter_action/call_inputs.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter_action/call_inputs.v @@ -361,43 +361,31 @@ Module interpreter_action. M.alloc (| Value.Array [ - M.read (| Value.String "input" |); + mk_str (| "input" |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "return_memory_offset" |) |) + M.deref (| mk_str (| "return_memory_offset" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "gas_limit" |) |) + M.deref (| mk_str (| "gas_limit" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "bytecode_address" |) |) + M.deref (| mk_str (| "bytecode_address" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "target_address" |) |) + M.deref (| mk_str (| "target_address" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "caller" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "value" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "scheme" |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "caller" |) |) + M.deref (| mk_str (| "is_static" |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "value" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "scheme" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "is_static" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "is_eof" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "is_eof" |) |) |) ] |) |) @@ -578,10 +566,7 @@ Module interpreter_action. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CallInputs" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CallInputs" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| names |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| values |) |) |) ] @@ -1807,10 +1792,7 @@ Module interpreter_action. "revm_interpreter::interpreter_action::call_inputs::CallScheme::Call" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Call" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Call" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1821,10 +1803,7 @@ Module interpreter_action. "revm_interpreter::interpreter_action::call_inputs::CallScheme::CallCode" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CallCode" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CallCode" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1837,7 +1816,7 @@ Module interpreter_action. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DelegateCall" |) |) + M.deref (| mk_str (| "DelegateCall" |) |) |) |))); fun γ => @@ -1849,10 +1828,7 @@ Module interpreter_action. "revm_interpreter::interpreter_action::call_inputs::CallScheme::StaticCall" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "StaticCall" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "StaticCall" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1863,10 +1839,7 @@ Module interpreter_action. "revm_interpreter::interpreter_action::call_inputs::CallScheme::ExtCall" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ExtCall" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ExtCall" |) |) |) |))); fun γ => ltac:(M.monadic @@ -1879,7 +1852,7 @@ Module interpreter_action. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ExtStaticCall" |) |) + M.deref (| mk_str (| "ExtStaticCall" |) |) |) |))); fun γ => @@ -1893,7 +1866,7 @@ Module interpreter_action. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ExtDelegateCall" |) |) + M.deref (| mk_str (| "ExtDelegateCall" |) |) |) |))) ] @@ -2369,10 +2342,7 @@ Module interpreter_action. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Transfer" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Transfer" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -2404,10 +2374,7 @@ Module interpreter_action. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Apparent" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Apparent" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) diff --git a/CoqOfRust/revm/revm_interpreter/interpreter_action/call_outcome.v b/CoqOfRust/revm/revm_interpreter/interpreter_action/call_outcome.v index 10bc05073..5172c40f4 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter_action/call_outcome.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter_action/call_outcome.v @@ -121,11 +121,8 @@ Module interpreter_action. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CallOutcome" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "result" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CallOutcome" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "result" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -139,10 +136,7 @@ Module interpreter_action. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "memory_offset" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "memory_offset" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/revm/revm_interpreter/interpreter_action/create_inputs.v b/CoqOfRust/revm/revm_interpreter/interpreter_action/create_inputs.v index 32f8a2349..4b1d7ea9e 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter_action/create_inputs.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter_action/create_inputs.v @@ -218,11 +218,8 @@ Module interpreter_action. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CreateInputs" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "caller" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CreateInputs" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "caller" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -236,7 +233,7 @@ Module interpreter_action. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "scheme" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "scheme" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -250,7 +247,7 @@ Module interpreter_action. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "value" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "value" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -264,10 +261,7 @@ Module interpreter_action. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "init_code" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "init_code" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -281,10 +275,7 @@ Module interpreter_action. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "gas_limit" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "gas_limit" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/revm/revm_interpreter/interpreter_action/create_outcome.v b/CoqOfRust/revm/revm_interpreter/interpreter_action/create_outcome.v index 473bf921a..3e7c1fcb2 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter_action/create_outcome.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter_action/create_outcome.v @@ -43,11 +43,8 @@ Module interpreter_action. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CreateOutcome" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "result" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CreateOutcome" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "result" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -61,7 +58,7 @@ Module interpreter_action. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "address" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "address" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| 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 9b1d57450..87d2553a3 100644 --- a/CoqOfRust/revm/revm_interpreter/interpreter_action/eof_create_inputs.v +++ b/CoqOfRust/revm/revm_interpreter/interpreter_action/eof_create_inputs.v @@ -81,14 +81,8 @@ Module interpreter_action. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Tx" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "initdata" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Tx" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "initdata" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -134,23 +128,14 @@ Module interpreter_action. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Opcode" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "initcode" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Opcode" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "initcode" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_0 |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "input" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "input" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_1 |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "created_address" |) |) + M.deref (| mk_str (| "created_address" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -838,11 +823,8 @@ Module interpreter_action. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "EOFCreateInputs" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "caller" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "EOFCreateInputs" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "caller" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -856,7 +838,7 @@ Module interpreter_action. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "value" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "value" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -870,10 +852,7 @@ Module interpreter_action. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "gas_limit" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "gas_limit" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -887,7 +866,7 @@ Module interpreter_action. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "kind" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "kind" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/g1.v b/CoqOfRust/revm/revm_precompile/bls12_381/g1.v index aabb3e16f..470b0d968 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/g1.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/g1.v @@ -653,14 +653,10 @@ Module bls12_381. M.alloc (| Value.Array [ - M.read (| - Value.String - "Input should be " + mk_str (| + "Input should be " |); - M.read (| - Value.String - " bytes, was " - |) + mk_str (| " bytes, was " |) ] |) |) @@ -1417,9 +1413,7 @@ Module bls12_381. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Element not in G1" - |) + mk_str (| "Element not in G1" |) |) |) ] @@ -1491,9 +1485,7 @@ Module bls12_381. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Element not on G1 curve" - |) + mk_str (| "Element not on G1 curve" |) |) |) ] diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/g1_add.v b/CoqOfRust/revm/revm_precompile/bls12_381/g1_add.v index 99910938f..8172c0783 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/g1_add.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/g1_add.v @@ -262,13 +262,11 @@ Module bls12_381. M.alloc (| Value.Array [ - M.read (| - Value.String - "G1ADD input should be " + mk_str (| + "G1ADD input should be " |); - M.read (| - Value.String - " bytes, was " + mk_str (| + " bytes, was " |) ] |) diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/g1_msm.v b/CoqOfRust/revm/revm_precompile/bls12_381/g1_msm.v index fb4827fb1..4028fec8d 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/g1_msm.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/g1_msm.v @@ -225,13 +225,10 @@ Module bls12_381. M.alloc (| Value.Array [ - M.read (| - Value.String - "G1MSM input length should be multiple of " + mk_str (| + "G1MSM input length should be multiple of " |); - M.read (| - Value.String ", was " - |) + mk_str (| ", was " |) ] |) |) diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/g1_mul.v b/CoqOfRust/revm/revm_precompile/bls12_381/g1_mul.v index 0f303bafb..3a5d9c07e 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/g1_mul.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/g1_mul.v @@ -263,13 +263,11 @@ Module bls12_381. M.alloc (| Value.Array [ - M.read (| - Value.String - "G1MUL input should be " + mk_str (| + "G1MUL input should be " |); - M.read (| - Value.String - " bytes, was " + mk_str (| + " bytes, was " |) ] |) diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/g2.v b/CoqOfRust/revm/revm_precompile/bls12_381/g2.v index af8a63d9b..e416970c7 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/g2.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/g2.v @@ -1131,14 +1131,10 @@ Module bls12_381. M.alloc (| Value.Array [ - M.read (| - Value.String - "Input should be " + mk_str (| + "Input should be " |); - M.read (| - Value.String - " bytes, was " - |) + mk_str (| " bytes, was " |) ] |) |) @@ -1907,9 +1903,7 @@ Module bls12_381. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Element not in G2" - |) + mk_str (| "Element not in G2" |) |) |) ] @@ -1981,9 +1975,7 @@ Module bls12_381. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "Element not on G2 curve" - |) + mk_str (| "Element not on G2 curve" |) |) |) ] diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/g2_add.v b/CoqOfRust/revm/revm_precompile/bls12_381/g2_add.v index c25f565f2..6f489659e 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/g2_add.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/g2_add.v @@ -262,13 +262,11 @@ Module bls12_381. M.alloc (| Value.Array [ - M.read (| - Value.String - "G2ADD input should be " + mk_str (| + "G2ADD input should be " |); - M.read (| - Value.String - " bytes, was " + mk_str (| + " bytes, was " |) ] |) diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/g2_msm.v b/CoqOfRust/revm/revm_precompile/bls12_381/g2_msm.v index 72e726d27..47616d053 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/g2_msm.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/g2_msm.v @@ -225,13 +225,10 @@ Module bls12_381. M.alloc (| Value.Array [ - M.read (| - Value.String - "G2MSM input length should be multiple of " + mk_str (| + "G2MSM input length should be multiple of " |); - M.read (| - Value.String ", was " - |) + mk_str (| ", was " |) ] |) |) diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/g2_mul.v b/CoqOfRust/revm/revm_precompile/bls12_381/g2_mul.v index 9715ad824..1438772ff 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/g2_mul.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/g2_mul.v @@ -260,13 +260,11 @@ Module bls12_381. M.alloc (| Value.Array [ - M.read (| - Value.String - "G2MUL input should be " + mk_str (| + "G2MUL input should be " |); - M.read (| - Value.String - " bytes, was " + mk_str (| + " bytes, was " |) ] |) 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 3e453f221..33aad2403 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 @@ -256,13 +256,11 @@ Module bls12_381. M.alloc (| Value.Array [ - M.read (| - Value.String - "MAP_FP2_TO_G2 input should be " + mk_str (| + "MAP_FP2_TO_G2 input should be " |); - M.read (| - Value.String - " bytes, was " + mk_str (| + " bytes, was " |) ] |) 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 ed4e22542..bf7292020 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 @@ -255,13 +255,11 @@ Module bls12_381. M.alloc (| Value.Array [ - M.read (| - Value.String - "MAP_FP_TO_G1 input should be " + mk_str (| + "MAP_FP_TO_G1 input should be " |); - M.read (| - Value.String - " bytes, was " + mk_str (| + " bytes, was " |) ] |) diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/pairing.v b/CoqOfRust/revm/revm_precompile/bls12_381/pairing.v index 2c4e78f4f..e0fe3c80e 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/pairing.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/pairing.v @@ -260,13 +260,10 @@ Module bls12_381. M.alloc (| Value.Array [ - M.read (| - Value.String - "Pairing input length should be multiple of " + mk_str (| + "Pairing input length should be multiple of " |); - M.read (| - Value.String ", was " - |) + mk_str (| ", was " |) ] |) |) diff --git a/CoqOfRust/revm/revm_precompile/bls12_381/utils.v b/CoqOfRust/revm/revm_precompile/bls12_381/utils.v index 6a0695cec..1601c2583 100644 --- a/CoqOfRust/revm/revm_precompile/bls12_381/utils.v +++ b/CoqOfRust/revm/revm_precompile/bls12_381/utils.v @@ -369,14 +369,10 @@ Module bls12_381. M.alloc (| Value.Array [ - M.read (| - Value.String - "Padded input should be " + mk_str (| + "Padded input should be " |); - M.read (| - Value.String - " bytes, was " - |) + mk_str (| " bytes, was " |) ] |) |) @@ -717,12 +713,9 @@ Module bls12_381. M.alloc (| Value.Array [ - M.read (| - Value.String "" - |); - M.read (| - Value.String - " top bytes of input are not zero" + mk_str (| "" |); + mk_str (| + " top bytes of input are not zero" |) ] |) @@ -995,14 +988,10 @@ Module bls12_381. M.alloc (| Value.Array [ - M.read (| - Value.String - "Input should be " + mk_str (| + "Input should be " |); - M.read (| - Value.String - " bytes, was " - |) + mk_str (| " bytes, was " |) ] |) |) @@ -1540,9 +1529,7 @@ Module bls12_381. [ M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "non-canonical fp value" |) - |) + M.deref (| mk_str (| "non-canonical fp value" |) |) |) ] |) diff --git a/CoqOfRust/revm/revm_precompile/bn128.v b/CoqOfRust/revm/revm_precompile/bn128.v index 0450ac994..e7909d8ce 100644 --- a/CoqOfRust/revm/revm_precompile/bn128.v +++ b/CoqOfRust/revm/revm_precompile/bn128.v @@ -3718,9 +3718,8 @@ Module bn128. [] |), [ - M.read (| - Value.String - "assertion failed: n < PAIR_ELEMENT_LEN / 32" + mk_str (| + "assertion failed: n < PAIR_ELEMENT_LEN / 32" |) ] |) diff --git a/CoqOfRust/revm/revm_precompile/interface.v b/CoqOfRust/revm/revm_precompile/interface.v index 385fcd083..f3d44121d 100644 --- a/CoqOfRust/revm/revm_precompile/interface.v +++ b/CoqOfRust/revm/revm_precompile/interface.v @@ -125,11 +125,8 @@ Module interface. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PrecompileOutput" |) |) - |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "gas_used" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "PrecompileOutput" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "gas_used" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -143,7 +140,7 @@ Module interface. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "bytes" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "bytes" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -578,10 +575,7 @@ Module interface. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Error" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Error" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -613,14 +607,8 @@ Module interface. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Fatal" |) |) - |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "msg" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Fatal" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "msg" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -1490,10 +1478,7 @@ Module interface. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OutOfGas" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "OutOfGas" |) |) |) ] |) |))); @@ -1521,7 +1506,7 @@ Module interface. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Blake2WrongLength" |) |) + M.deref (| mk_str (| "Blake2WrongLength" |) |) |) ] |) @@ -1550,7 +1535,7 @@ Module interface. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Blake2WrongFinalIndicatorFlag" |) |) + M.deref (| mk_str (| "Blake2WrongFinalIndicatorFlag" |) |) |) ] |) @@ -1579,7 +1564,7 @@ Module interface. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ModexpExpOverflow" |) |) + M.deref (| mk_str (| "ModexpExpOverflow" |) |) |) ] |) @@ -1608,7 +1593,7 @@ Module interface. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ModexpBaseOverflow" |) |) + M.deref (| mk_str (| "ModexpBaseOverflow" |) |) |) ] |) @@ -1637,7 +1622,7 @@ Module interface. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ModexpModOverflow" |) |) + M.deref (| mk_str (| "ModexpModOverflow" |) |) |) ] |) @@ -1666,7 +1651,7 @@ Module interface. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Bn128FieldPointNotAMember" |) |) + M.deref (| mk_str (| "Bn128FieldPointNotAMember" |) |) |) ] |) @@ -1695,7 +1680,7 @@ Module interface. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Bn128AffineGFailedToCreate" |) |) + M.deref (| mk_str (| "Bn128AffineGFailedToCreate" |) |) |) ] |) @@ -1724,7 +1709,7 @@ Module interface. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Bn128PairLength" |) |) + M.deref (| mk_str (| "Bn128PairLength" |) |) |) ] |) @@ -1753,7 +1738,7 @@ Module interface. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BlobInvalidInputLength" |) |) + M.deref (| mk_str (| "BlobInvalidInputLength" |) |) |) ] |) @@ -1782,7 +1767,7 @@ Module interface. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BlobMismatchedVersion" |) |) + M.deref (| mk_str (| "BlobMismatchedVersion" |) |) |) ] |) @@ -1811,7 +1796,7 @@ Module interface. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BlobVerifyKzgProofFailed" |) |) + M.deref (| mk_str (| "BlobVerifyKzgProofFailed" |) |) |) ] |) @@ -1840,10 +1825,7 @@ Module interface. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Other" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Other" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -2262,7 +2244,7 @@ Module interface. γ, "revm_precompile::interface::PrecompileError::OutOfGas" |) in - Value.String "out of gas")); + M.alloc (| mk_str (| "out of gas" |) |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in @@ -2274,7 +2256,7 @@ Module interface. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "wrong input length for blake2" |) |) + M.deref (| mk_str (| "wrong input length for blake2" |) |) |) |))); fun γ => @@ -2288,9 +2270,7 @@ Module interface. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "wrong final indicator flag for blake2" |) - |) + M.deref (| mk_str (| "wrong final indicator flag for blake2" |) |) |) |))); fun γ => @@ -2304,7 +2284,7 @@ Module interface. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "modexp exp overflow" |) |) + M.deref (| mk_str (| "modexp exp overflow" |) |) |) |))); fun γ => @@ -2318,7 +2298,7 @@ Module interface. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "modexp base overflow" |) |) + M.deref (| mk_str (| "modexp base overflow" |) |) |) |))); fun γ => @@ -2332,7 +2312,7 @@ Module interface. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "modexp mod overflow" |) |) + M.deref (| mk_str (| "modexp mod overflow" |) |) |) |))); fun γ => @@ -2346,9 +2326,7 @@ Module interface. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "field point not a member of bn128 curve" |) - |) + M.deref (| mk_str (| "field point not a member of bn128 curve" |) |) |) |))); fun γ => @@ -2363,9 +2341,7 @@ Module interface. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "failed to create affine g point for bn128 curve" - |) + mk_str (| "failed to create affine g point for bn128 curve" |) |) |) |))); @@ -2380,7 +2356,7 @@ Module interface. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "bn128 invalid pair length" |) |) + M.deref (| mk_str (| "bn128 invalid pair length" |) |) |) |))); fun γ => @@ -2394,7 +2370,7 @@ Module interface. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "invalid blob input length" |) |) + M.deref (| mk_str (| "invalid blob input length" |) |) |) |))); fun γ => @@ -2408,7 +2384,7 @@ Module interface. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "mismatched blob version" |) |) + M.deref (| mk_str (| "mismatched blob version" |) |) |) |))); fun γ => @@ -2422,9 +2398,7 @@ Module interface. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "verifying blob kzg proof failed" |) - |) + M.deref (| mk_str (| "verifying blob kzg proof failed" |) |) |) |))); fun γ => diff --git a/CoqOfRust/revm/revm_precompile/kzg_point_evaluation.v b/CoqOfRust/revm/revm_precompile/kzg_point_evaluation.v index 098b5be34..90caad968 100644 --- a/CoqOfRust/revm/revm_precompile/kzg_point_evaluation.v +++ b/CoqOfRust/revm/revm_precompile/kzg_point_evaluation.v @@ -1249,7 +1249,7 @@ Module kzg_point_evaluation. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "slice with incorrect length" |) |) + M.deref (| mk_str (| "slice with incorrect length" |) |) |) ] |))) diff --git a/CoqOfRust/revm/revm_precompile/lib.v b/CoqOfRust/revm/revm_precompile/lib.v index 0009f043d..5a342c375 100644 --- a/CoqOfRust/revm/revm_precompile/lib.v +++ b/CoqOfRust/revm/revm_precompile/lib.v @@ -319,8 +319,8 @@ Module Impl_core_fmt_Debug_for_revm_precompile_Precompiles. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Precompiles" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "inner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Precompiles" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -334,7 +334,7 @@ Module Impl_core_fmt_Debug_for_revm_precompile_Precompiles. |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "addresses" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "addresses" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -2822,10 +2822,7 @@ Module Impl_core_fmt_Debug_for_revm_precompile_PrecompileWithAddress. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PrecompileWithAddress" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "PrecompileWithAddress" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -3154,10 +3151,7 @@ Module Impl_core_fmt_Debug_for_revm_precompile_PrecompileSpecId. let _ := M.is_struct_tuple (| γ, "revm_precompile::PrecompileSpecId::HOMESTEAD" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "HOMESTEAD" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "HOMESTEAD" |) |) |) |))); fun γ => ltac:(M.monadic @@ -3165,10 +3159,7 @@ Module Impl_core_fmt_Debug_for_revm_precompile_PrecompileSpecId. let _ := M.is_struct_tuple (| γ, "revm_precompile::PrecompileSpecId::BYZANTIUM" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BYZANTIUM" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BYZANTIUM" |) |) |) |))); fun γ => ltac:(M.monadic @@ -3176,10 +3167,7 @@ Module Impl_core_fmt_Debug_for_revm_precompile_PrecompileSpecId. let _ := M.is_struct_tuple (| γ, "revm_precompile::PrecompileSpecId::ISTANBUL" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ISTANBUL" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ISTANBUL" |) |) |) |))); fun γ => ltac:(M.monadic @@ -3187,10 +3175,7 @@ Module Impl_core_fmt_Debug_for_revm_precompile_PrecompileSpecId. let _ := M.is_struct_tuple (| γ, "revm_precompile::PrecompileSpecId::BERLIN" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BERLIN" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BERLIN" |) |) |) |))); fun γ => ltac:(M.monadic @@ -3198,10 +3183,7 @@ Module Impl_core_fmt_Debug_for_revm_precompile_PrecompileSpecId. let _ := M.is_struct_tuple (| γ, "revm_precompile::PrecompileSpecId::CANCUN" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CANCUN" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CANCUN" |) |) |) |))); fun γ => ltac:(M.monadic @@ -3209,10 +3191,7 @@ Module Impl_core_fmt_Debug_for_revm_precompile_PrecompileSpecId. let _ := M.is_struct_tuple (| γ, "revm_precompile::PrecompileSpecId::PRAGUE" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PRAGUE" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "PRAGUE" |) |) |) |))); fun γ => ltac:(M.monadic @@ -3220,10 +3199,7 @@ Module Impl_core_fmt_Debug_for_revm_precompile_PrecompileSpecId. let _ := M.is_struct_tuple (| γ, "revm_precompile::PrecompileSpecId::LATEST" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LATEST" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LATEST" |) |) |) |))) ] |) diff --git a/CoqOfRust/revm/revm_precompile/secp256k1.v b/CoqOfRust/revm/revm_precompile/secp256k1.v index 9b3d0d5d6..78b990e6b 100644 --- a/CoqOfRust/revm/revm_precompile/secp256k1.v +++ b/CoqOfRust/revm/revm_precompile/secp256k1.v @@ -83,7 +83,7 @@ Module secp256k1. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "recovery ID is valid" |) |) + M.deref (| mk_str (| "recovery ID is valid" |) |) |) ] |) diff --git a/CoqOfRust/revm/revm_specification/eip7702/authorization_list.v b/CoqOfRust/revm/revm_specification/eip7702/authorization_list.v index 48bcfff59..3074f3c66 100644 --- a/CoqOfRust/revm/revm_specification/eip7702/authorization_list.v +++ b/CoqOfRust/revm/revm_specification/eip7702/authorization_list.v @@ -212,10 +212,7 @@ Module eip7702. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Signed" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Signed" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -247,10 +244,7 @@ Module eip7702. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Recovered" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Recovered" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -1526,7 +1520,7 @@ Module eip7702. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidChainId" |) |) + M.deref (| mk_str (| "InvalidChainId" |) |) |) |))); fun γ => @@ -1540,7 +1534,7 @@ Module eip7702. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidYParity" |) |) + M.deref (| mk_str (| "InvalidYParity" |) |) |) |))); fun γ => @@ -1554,7 +1548,7 @@ Module eip7702. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Eip2InvalidSValue" |) |) + M.deref (| mk_str (| "Eip2InvalidSValue" |) |) |) |))) ] @@ -1838,7 +1832,9 @@ Module eip7702. γ, "revm_specification::eip7702::authorization_list::InvalidAuthorization::InvalidChainId" |) in - Value.String "Invalid chain_id, Expect chain's ID or zero")); + M.alloc (| + mk_str (| "Invalid chain_id, Expect chain's ID or zero" |) + |))); fun γ => ltac:(M.monadic (let γ := M.read (| γ |) in @@ -1850,9 +1846,7 @@ Module eip7702. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| - M.read (| Value.String "Invalid y_parity, Expect 0 or 1." |) - |) + M.deref (| mk_str (| "Invalid y_parity, Expect 0 or 1." |) |) |) |))); fun γ => @@ -1866,7 +1860,7 @@ Module eip7702. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Invalid signature s-value." |) |) + M.deref (| mk_str (| "Invalid signature s-value." |) |) |) |))) ] diff --git a/CoqOfRust/revm/revm_specification/eip7702/recovered_authorization.v b/CoqOfRust/revm/revm_specification/eip7702/recovered_authorization.v index 6e66474f4..a1c12eed5 100644 --- a/CoqOfRust/revm/revm_specification/eip7702/recovered_authorization.v +++ b/CoqOfRust/revm/revm_specification/eip7702/recovered_authorization.v @@ -45,9 +45,9 @@ Module eip7702. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "RecoveredAuthorization" |) |) + M.deref (| mk_str (| "RecoveredAuthorization" |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "inner" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "inner" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -61,10 +61,7 @@ Module eip7702. |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "authority" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "authority" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/revm/revm_specification/hardfork.v b/CoqOfRust/revm/revm_specification/hardfork.v index 8d28541a9..365fda4f1 100644 --- a/CoqOfRust/revm/revm_specification/hardfork.v +++ b/CoqOfRust/revm/revm_specification/hardfork.v @@ -206,10 +206,7 @@ Module hardfork. "revm_specification::hardfork::SpecId::FRONTIER" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FRONTIER" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "FRONTIER" |) |) |) |))); fun γ => ltac:(M.monadic @@ -222,7 +219,7 @@ Module hardfork. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "FRONTIER_THAWING" |) |) + M.deref (| mk_str (| "FRONTIER_THAWING" |) |) |) |))); fun γ => @@ -234,10 +231,7 @@ Module hardfork. "revm_specification::hardfork::SpecId::HOMESTEAD" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "HOMESTEAD" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "HOMESTEAD" |) |) |) |))); fun γ => ltac:(M.monadic @@ -248,10 +242,7 @@ Module hardfork. "revm_specification::hardfork::SpecId::DAO_FORK" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "DAO_FORK" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "DAO_FORK" |) |) |) |))); fun γ => ltac:(M.monadic @@ -262,10 +253,7 @@ Module hardfork. "revm_specification::hardfork::SpecId::TANGERINE" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "TANGERINE" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "TANGERINE" |) |) |) |))); fun γ => ltac:(M.monadic @@ -278,7 +266,7 @@ Module hardfork. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SPURIOUS_DRAGON" |) |) + M.deref (| mk_str (| "SPURIOUS_DRAGON" |) |) |) |))); fun γ => @@ -290,10 +278,7 @@ Module hardfork. "revm_specification::hardfork::SpecId::BYZANTIUM" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BYZANTIUM" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BYZANTIUM" |) |) |) |))); fun γ => ltac:(M.monadic @@ -306,7 +291,7 @@ Module hardfork. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CONSTANTINOPLE" |) |) + M.deref (| mk_str (| "CONSTANTINOPLE" |) |) |) |))); fun γ => @@ -318,10 +303,7 @@ Module hardfork. "revm_specification::hardfork::SpecId::PETERSBURG" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PETERSBURG" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "PETERSBURG" |) |) |) |))); fun γ => ltac:(M.monadic @@ -332,10 +314,7 @@ Module hardfork. "revm_specification::hardfork::SpecId::ISTANBUL" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ISTANBUL" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "ISTANBUL" |) |) |) |))); fun γ => ltac:(M.monadic @@ -346,10 +325,7 @@ Module hardfork. "revm_specification::hardfork::SpecId::MUIR_GLACIER" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MUIR_GLACIER" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MUIR_GLACIER" |) |) |) |))); fun γ => ltac:(M.monadic @@ -360,10 +336,7 @@ Module hardfork. "revm_specification::hardfork::SpecId::BERLIN" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BERLIN" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "BERLIN" |) |) |) |))); fun γ => ltac:(M.monadic @@ -374,10 +347,7 @@ Module hardfork. "revm_specification::hardfork::SpecId::LONDON" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LONDON" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LONDON" |) |) |) |))); fun γ => ltac:(M.monadic @@ -390,7 +360,7 @@ Module hardfork. M.alloc (| M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ARROW_GLACIER" |) |) + M.deref (| mk_str (| "ARROW_GLACIER" |) |) |) |))); fun γ => @@ -402,10 +372,7 @@ Module hardfork. "revm_specification::hardfork::SpecId::GRAY_GLACIER" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "GRAY_GLACIER" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "GRAY_GLACIER" |) |) |) |))); fun γ => ltac:(M.monadic @@ -416,10 +383,7 @@ Module hardfork. "revm_specification::hardfork::SpecId::MERGE" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "MERGE" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "MERGE" |) |) |) |))); fun γ => ltac:(M.monadic @@ -430,10 +394,7 @@ Module hardfork. "revm_specification::hardfork::SpecId::SHANGHAI" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "SHANGHAI" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "SHANGHAI" |) |) |) |))); fun γ => ltac:(M.monadic @@ -444,10 +405,7 @@ Module hardfork. "revm_specification::hardfork::SpecId::CANCUN" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "CANCUN" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "CANCUN" |) |) |) |))); fun γ => ltac:(M.monadic @@ -458,10 +416,7 @@ Module hardfork. "revm_specification::hardfork::SpecId::PRAGUE" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "PRAGUE" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "PRAGUE" |) |) |) |))); fun γ => ltac:(M.monadic @@ -472,10 +427,7 @@ Module hardfork. "revm_specification::hardfork::SpecId::OSAKA" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "OSAKA" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "OSAKA" |) |) |) |))); fun γ => ltac:(M.monadic @@ -486,10 +438,7 @@ Module hardfork. "revm_specification::hardfork::SpecId::LATEST" |) in M.alloc (| - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "LATEST" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "LATEST" |) |) |) |))) ] |) @@ -1163,14 +1112,14 @@ Module hardfork. Module name. Definition value_FRONTIER : Value.t := - M.run_constant ltac:(M.monadic (Value.String "Frontier")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "Frontier" |) |))). Axiom Constant_value_FRONTIER : (M.get_constant "revm_specification::hardfork::name::FRONTIER") = value_FRONTIER. Global Hint Rewrite Constant_value_FRONTIER : constant_rewrites. Definition value_FRONTIER_THAWING : Value.t := - M.run_constant ltac:(M.monadic (Value.String "Frontier Thawing")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "Frontier Thawing" |) |))). Axiom Constant_value_FRONTIER_THAWING : (M.get_constant "revm_specification::hardfork::name::FRONTIER_THAWING") = @@ -1178,28 +1127,28 @@ Module hardfork. Global Hint Rewrite Constant_value_FRONTIER_THAWING : constant_rewrites. Definition value_HOMESTEAD : Value.t := - M.run_constant ltac:(M.monadic (Value.String "Homestead")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "Homestead" |) |))). Axiom Constant_value_HOMESTEAD : (M.get_constant "revm_specification::hardfork::name::HOMESTEAD") = value_HOMESTEAD. Global Hint Rewrite Constant_value_HOMESTEAD : constant_rewrites. Definition value_DAO_FORK : Value.t := - M.run_constant ltac:(M.monadic (Value.String "DAO Fork")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "DAO Fork" |) |))). Axiom Constant_value_DAO_FORK : (M.get_constant "revm_specification::hardfork::name::DAO_FORK") = value_DAO_FORK. Global Hint Rewrite Constant_value_DAO_FORK : constant_rewrites. Definition value_TANGERINE : Value.t := - M.run_constant ltac:(M.monadic (Value.String "Tangerine")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "Tangerine" |) |))). Axiom Constant_value_TANGERINE : (M.get_constant "revm_specification::hardfork::name::TANGERINE") = value_TANGERINE. Global Hint Rewrite Constant_value_TANGERINE : constant_rewrites. Definition value_SPURIOUS_DRAGON : Value.t := - M.run_constant ltac:(M.monadic (Value.String "Spurious")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "Spurious" |) |))). Axiom Constant_value_SPURIOUS_DRAGON : (M.get_constant "revm_specification::hardfork::name::SPURIOUS_DRAGON") = @@ -1207,98 +1156,105 @@ Module hardfork. Global Hint Rewrite Constant_value_SPURIOUS_DRAGON : constant_rewrites. Definition value_BYZANTIUM : Value.t := - M.run_constant ltac:(M.monadic (Value.String "Byzantium")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "Byzantium" |) |))). Axiom Constant_value_BYZANTIUM : (M.get_constant "revm_specification::hardfork::name::BYZANTIUM") = value_BYZANTIUM. Global Hint Rewrite Constant_value_BYZANTIUM : constant_rewrites. Definition value_CONSTANTINOPLE : Value.t := - M.run_constant ltac:(M.monadic (Value.String "Constantinople")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "Constantinople" |) |))). Axiom Constant_value_CONSTANTINOPLE : (M.get_constant "revm_specification::hardfork::name::CONSTANTINOPLE") = value_CONSTANTINOPLE. Global Hint Rewrite Constant_value_CONSTANTINOPLE : constant_rewrites. Definition value_PETERSBURG : Value.t := - M.run_constant ltac:(M.monadic (Value.String "Petersburg")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "Petersburg" |) |))). Axiom Constant_value_PETERSBURG : (M.get_constant "revm_specification::hardfork::name::PETERSBURG") = value_PETERSBURG. Global Hint Rewrite Constant_value_PETERSBURG : constant_rewrites. Definition value_ISTANBUL : Value.t := - M.run_constant ltac:(M.monadic (Value.String "Istanbul")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "Istanbul" |) |))). Axiom Constant_value_ISTANBUL : (M.get_constant "revm_specification::hardfork::name::ISTANBUL") = value_ISTANBUL. Global Hint Rewrite Constant_value_ISTANBUL : constant_rewrites. Definition value_MUIR_GLACIER : Value.t := - M.run_constant ltac:(M.monadic (Value.String "MuirGlacier")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "MuirGlacier" |) |))). Axiom Constant_value_MUIR_GLACIER : (M.get_constant "revm_specification::hardfork::name::MUIR_GLACIER") = value_MUIR_GLACIER. Global Hint Rewrite Constant_value_MUIR_GLACIER : constant_rewrites. - Definition value_BERLIN : Value.t := M.run_constant ltac:(M.monadic (Value.String "Berlin")). + Definition value_BERLIN : Value.t := + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "Berlin" |) |))). Axiom Constant_value_BERLIN : (M.get_constant "revm_specification::hardfork::name::BERLIN") = value_BERLIN. Global Hint Rewrite Constant_value_BERLIN : constant_rewrites. - Definition value_LONDON : Value.t := M.run_constant ltac:(M.monadic (Value.String "London")). + Definition value_LONDON : Value.t := + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "London" |) |))). Axiom Constant_value_LONDON : (M.get_constant "revm_specification::hardfork::name::LONDON") = value_LONDON. Global Hint Rewrite Constant_value_LONDON : constant_rewrites. Definition value_ARROW_GLACIER : Value.t := - M.run_constant ltac:(M.monadic (Value.String "Arrow Glacier")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "Arrow Glacier" |) |))). Axiom Constant_value_ARROW_GLACIER : (M.get_constant "revm_specification::hardfork::name::ARROW_GLACIER") = value_ARROW_GLACIER. Global Hint Rewrite Constant_value_ARROW_GLACIER : constant_rewrites. Definition value_GRAY_GLACIER : Value.t := - M.run_constant ltac:(M.monadic (Value.String "Gray Glacier")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "Gray Glacier" |) |))). Axiom Constant_value_GRAY_GLACIER : (M.get_constant "revm_specification::hardfork::name::GRAY_GLACIER") = value_GRAY_GLACIER. Global Hint Rewrite Constant_value_GRAY_GLACIER : constant_rewrites. - Definition value_MERGE : Value.t := M.run_constant ltac:(M.monadic (Value.String "Merge")). + Definition value_MERGE : Value.t := + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "Merge" |) |))). Axiom Constant_value_MERGE : (M.get_constant "revm_specification::hardfork::name::MERGE") = value_MERGE. Global Hint Rewrite Constant_value_MERGE : constant_rewrites. Definition value_SHANGHAI : Value.t := - M.run_constant ltac:(M.monadic (Value.String "Shanghai")). + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "Shanghai" |) |))). Axiom Constant_value_SHANGHAI : (M.get_constant "revm_specification::hardfork::name::SHANGHAI") = value_SHANGHAI. Global Hint Rewrite Constant_value_SHANGHAI : constant_rewrites. - Definition value_CANCUN : Value.t := M.run_constant ltac:(M.monadic (Value.String "Cancun")). + Definition value_CANCUN : Value.t := + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "Cancun" |) |))). Axiom Constant_value_CANCUN : (M.get_constant "revm_specification::hardfork::name::CANCUN") = value_CANCUN. Global Hint Rewrite Constant_value_CANCUN : constant_rewrites. - Definition value_PRAGUE : Value.t := M.run_constant ltac:(M.monadic (Value.String "Prague")). + Definition value_PRAGUE : Value.t := + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "Prague" |) |))). Axiom Constant_value_PRAGUE : (M.get_constant "revm_specification::hardfork::name::PRAGUE") = value_PRAGUE. Global Hint Rewrite Constant_value_PRAGUE : constant_rewrites. - Definition value_OSAKA : Value.t := M.run_constant ltac:(M.monadic (Value.String "PragueEOF")). + Definition value_OSAKA : Value.t := + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "PragueEOF" |) |))). Axiom Constant_value_OSAKA : (M.get_constant "revm_specification::hardfork::name::OSAKA") = value_OSAKA. Global Hint Rewrite Constant_value_OSAKA : constant_rewrites. - Definition value_LATEST : Value.t := M.run_constant ltac:(M.monadic (Value.String "Latest")). + Definition value_LATEST : Value.t := + M.run_constant ltac:(M.monadic (M.alloc (| mk_str (| "Latest" |) |))). Axiom Constant_value_LATEST : (M.get_constant "revm_specification::hardfork::name::LATEST") = value_LATEST. @@ -1349,7 +1305,7 @@ Module hardfork. fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "Frontier" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "Frontier" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::FRONTIER" [] |))); @@ -1358,7 +1314,7 @@ Module hardfork. (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "Frontier Thawing" + mk_str (| "Frontier Thawing" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::FRONTIER_THAWING" [] @@ -1366,35 +1322,35 @@ Module hardfork. fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "Homestead" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "Homestead" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::HOMESTEAD" [] |))); fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "DAO Fork" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "DAO Fork" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::DAO_FORK" [] |))); fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "Tangerine" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "Tangerine" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::TANGERINE" [] |))); fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "Spurious" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "Spurious" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::SPURIOUS_DRAGON" [] |))); fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "Byzantium" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "Byzantium" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::BYZANTIUM" [] |))); @@ -1403,7 +1359,7 @@ Module hardfork. (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "Constantinople" + mk_str (| "Constantinople" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::CONSTANTINOPLE" [] @@ -1413,7 +1369,7 @@ Module hardfork. (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "Petersburg" + mk_str (| "Petersburg" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::PETERSBURG" [] @@ -1421,7 +1377,7 @@ Module hardfork. fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "Istanbul" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "Istanbul" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::ISTANBUL" [] |))); @@ -1430,7 +1386,7 @@ Module hardfork. (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "MuirGlacier" + mk_str (| "MuirGlacier" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::MUIR_GLACIER" [] @@ -1438,14 +1394,14 @@ Module hardfork. fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "Berlin" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "Berlin" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::BERLIN" [] |))); fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "London" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "London" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::LONDON" [] |))); @@ -1454,7 +1410,7 @@ Module hardfork. (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "Arrow Glacier" + mk_str (| "Arrow Glacier" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::ARROW_GLACIER" [] @@ -1464,7 +1420,7 @@ Module hardfork. (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "Gray Glacier" + mk_str (| "Gray Glacier" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::GRAY_GLACIER" [] @@ -1472,42 +1428,42 @@ Module hardfork. fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "Merge" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "Merge" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::MERGE" [] |))); fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "Shanghai" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "Shanghai" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::SHANGHAI" [] |))); fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "Cancun" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "Cancun" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::CANCUN" [] |))); fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "Prague" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "Prague" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::PRAGUE" [] |))); fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "PragueEOF" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "PragueEOF" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::OSAKA" [] |))); fun γ => ltac:(M.monadic (let _ := - M.is_constant_or_break_match (| M.read (| γ |), Value.String "Latest" |) in + M.is_constant_or_break_match (| M.read (| γ |), mk_str (| "Latest" |) |) in M.alloc (| Value.StructTuple "revm_specification::hardfork::SpecId::LATEST" [] |))); @@ -1755,10 +1711,7 @@ Module hardfork. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.borrow (| - Pointer.Kind.Ref, - M.alloc (| Value.Array [ M.read (| Value.String "" |) ] |) - |) + M.borrow (| Pointer.Kind.Ref, M.alloc (| Value.Array [ mk_str (| "" |) ] |) |) |) |); M.borrow (| diff --git a/CoqOfRust/ruint/algorithms/div/knuth.v b/CoqOfRust/ruint/algorithms/div/knuth.v index 2c39837c3..f2e8f83f8 100644 --- a/CoqOfRust/ruint/algorithms/div/knuth.v +++ b/CoqOfRust/ruint/algorithms/div/knuth.v @@ -118,11 +118,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: divisor.len() >= 2" - |) - ] + [ mk_str (| "assertion failed: divisor.len() >= 2" |) ] |) |) |))); @@ -199,9 +195,8 @@ Module algorithms. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: numerator.len() >= divisor.len()" + mk_str (| + "assertion failed: numerator.len() >= divisor.len()" |) ] |) @@ -299,9 +294,8 @@ Module algorithms. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: *divisor.last().unwrap() >= (1 << 63)" + mk_str (| + "assertion failed: *divisor.last().unwrap() >= (1 << 63)" |) ] |) @@ -614,9 +608,8 @@ Module algorithms. [] |), [ - M.read (| - Value.String - "assertion failed: n21 <= d" + mk_str (| + "assertion failed: n21 <= d" |) ] |) @@ -1611,11 +1604,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: divisor.len() >= 3" - |) - ] + [ mk_str (| "assertion failed: divisor.len() >= 3" |) ] |) |) |))); @@ -1692,9 +1681,8 @@ Module algorithms. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: numerator.len() >= divisor.len()" + mk_str (| + "assertion failed: numerator.len() >= divisor.len()" |) ] |) @@ -1789,9 +1777,8 @@ Module algorithms. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: *divisor.last().unwrap() >= 1" + mk_str (| + "assertion failed: *divisor.last().unwrap() >= 1" |) ] |) @@ -2005,11 +1992,7 @@ Module algorithms. [], [] |), - [ - M.read (| - Value.String "assertion failed: d >= 1 << 127" - |) - ] + [ mk_str (| "assertion failed: d >= 1 << 127" |) ] |) |) |))); @@ -2440,9 +2423,8 @@ Module algorithms. [] |), [ - M.read (| - Value.String - "assertion failed: n21 <= d" + mk_str (| + "assertion failed: n21 <= d" |) ] |) diff --git a/CoqOfRust/ruint/algorithms/div/mod.v b/CoqOfRust/ruint/algorithms/div/mod.v index 6a4f4dafb..8e1f0f4f0 100644 --- a/CoqOfRust/ruint/algorithms/div/mod.v +++ b/CoqOfRust/ruint/algorithms/div/mod.v @@ -145,7 +145,7 @@ Module algorithms. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Divisor is zero" |) |) + M.deref (| mk_str (| "Divisor is zero" |) |) |) ] |) @@ -238,11 +238,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: !divisor.is_empty()" - |) - ] + [ mk_str (| "assertion failed: !divisor.is_empty()" |) ] |) |) |))); @@ -360,9 +356,8 @@ Module algorithms. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: divisor.last() != Some(&0)" + mk_str (| + "assertion failed: divisor.last() != Some(&0)" |) ] |) @@ -595,11 +590,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: !numerator.is_empty()" - |) - ] + [ mk_str (| "assertion failed: !numerator.is_empty()" |) ] |) |) |))); @@ -696,9 +687,8 @@ Module algorithms. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: *numerator.last().unwrap() != 0" + mk_str (| + "assertion failed: *numerator.last().unwrap() != 0" |) ] |) @@ -945,9 +935,8 @@ Module algorithms. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: numerator.len() >= divisor.len()" + mk_str (| + "assertion failed: numerator.len() >= divisor.len()" |) ] |) diff --git a/CoqOfRust/ruint/algorithms/div/reciprocal.v b/CoqOfRust/ruint/algorithms/div/reciprocal.v index 54098005c..6f5b5057e 100644 --- a/CoqOfRust/ruint/algorithms/div/reciprocal.v +++ b/CoqOfRust/ruint/algorithms/div/reciprocal.v @@ -59,11 +59,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: d >= (1 << 63)" - |) - ] + [ mk_str (| "assertion failed: d >= (1 << 63)" |) ] |) |) |))); @@ -133,11 +129,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: r >= (1 << 64)" - |) - ] + [ mk_str (| "assertion failed: r >= (1 << 64)" |) ] |) |) |))); @@ -188,11 +180,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: r < (1 << 65)" - |) - ] + [ mk_str (| "assertion failed: r < (1 << 65)" |) ] |) |) |))); @@ -304,11 +292,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: d >= (1 << 63)" - |) - ] + [ mk_str (| "assertion failed: d >= (1 << 63)" |) ] |) |) |))); @@ -1311,11 +1295,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: d >= (1 << 127)" - |) - ] + [ mk_str (| "assertion failed: d >= (1 << 127)" |) ] |) |) |))); diff --git a/CoqOfRust/ruint/algorithms/div/small.v b/CoqOfRust/ruint/algorithms/div/small.v index 1a4ebd4d6..cb86bf181 100644 --- a/CoqOfRust/ruint/algorithms/div/small.v +++ b/CoqOfRust/ruint/algorithms/div/small.v @@ -67,11 +67,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: d >= (1 << 63)" - |) - ] + [ mk_str (| "assertion failed: d >= (1 << 63)" |) ] |) |) |))); @@ -366,11 +362,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: divisor != 0" - |) - ] + [ mk_str (| "assertion failed: divisor != 0" |) ] |) |) |))); @@ -431,11 +423,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: !limbs.is_empty()" - |) - ] + [ mk_str (| "assertion failed: !limbs.is_empty()" |) ] |) |) |))); @@ -532,9 +520,8 @@ Module algorithms. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: *limbs.last().unwrap() != 0" + mk_str (| + "assertion failed: *limbs.last().unwrap() != 0" |) ] |) @@ -1099,11 +1086,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: d >= (1 << 127)" - |) - ] + [ mk_str (| "assertion failed: d >= (1 << 127)" |) ] |) |) |))); @@ -1387,11 +1370,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: divisor >= 1 << 64" - |) - ] + [ mk_str (| "assertion failed: divisor >= 1 << 64" |) ] |) |) |))); @@ -1452,11 +1431,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: !limbs.is_empty()" - |) - ] + [ mk_str (| "assertion failed: !limbs.is_empty()" |) ] |) |) |))); @@ -1553,9 +1528,8 @@ Module algorithms. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: *limbs.last().unwrap() != 0" + mk_str (| + "assertion failed: *limbs.last().unwrap() != 0" |) ] |) @@ -2117,11 +2091,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: d >= (1 << 63)" - |) - ] + [ mk_str (| "assertion failed: d >= (1 << 63)" |) ] |) |) |))); @@ -2184,11 +2154,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "assertion failed: (u >> 64) < u128::from(d)" - |) + [ mk_str (| "assertion failed: (u >> 64) < u128::from(d)" |) ] |) |) @@ -2305,11 +2271,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: d >= (1 << 63)" - |) - ] + [ mk_str (| "assertion failed: d >= (1 << 63)" |) ] |) |) |))); @@ -2372,11 +2334,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "assertion failed: (u >> 64) < u128::from(d)" - |) + [ mk_str (| "assertion failed: (u >> 64) < u128::from(d)" |) ] |) |) @@ -2780,11 +2738,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: d >= (1 << 127)" - |) - ] + [ mk_str (| "assertion failed: d >= (1 << 127)" |) ] |) |) |))); @@ -2829,7 +2783,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: n21 < d" |) ] + [ mk_str (| "assertion failed: n21 < d" |) ] |) |) |))); @@ -2915,11 +2869,7 @@ Module algorithms. [], [] |), - [ - M.read (| - Value.String "assertion failed: n1 < d0" - |) - ] + [ mk_str (| "assertion failed: n1 < d0" |) ] |) |) |))); @@ -3345,11 +3295,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: d >= (1 << 127)" - |) - ] + [ mk_str (| "assertion failed: d >= (1 << 127)" |) ] |) |) |))); @@ -3394,7 +3340,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: u21 < d" |) ] + [ mk_str (| "assertion failed: u21 < d" |) ] |) |) |))); diff --git a/CoqOfRust/ruint/algorithms/gcd/matrix.v b/CoqOfRust/ruint/algorithms/gcd/matrix.v index d0658c654..b6a6a3de4 100644 --- a/CoqOfRust/ruint/algorithms/gcd/matrix.v +++ b/CoqOfRust/ruint/algorithms/gcd/matrix.v @@ -250,7 +250,7 @@ Module algorithms. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Matrix" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Matrix" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| @@ -1338,7 +1338,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: a >= b" |) ] + [ mk_str (| "assertion failed: a >= b" |) ] |) |) |))); @@ -1816,11 +1816,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: r0 >= r1" - |) - ] + [ mk_str (| "assertion failed: r0 >= r1" |) ] |) |) |))); @@ -2213,11 +2209,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: a0 >= 1_u64 << 63" - |) - ] + [ mk_str (| "assertion failed: a0 >= 1_u64 << 63" |) ] |) |) |))); @@ -2265,11 +2257,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: a0 >= a1" - |) - ] + [ mk_str (| "assertion failed: a0 >= a1" |) ] |) |) |))); @@ -2545,9 +2533,8 @@ Module algorithms. [] |), [ - M.read (| - Value.String - "assertion failed: a2 < a3" + mk_str (| + "assertion failed: a2 < a3" |) ] |) @@ -2606,9 +2593,8 @@ Module algorithms. [] |), [ - M.read (| - Value.String - "assertion failed: a2 > 0" + mk_str (| + "assertion failed: a2 > 0" |) ] |) @@ -2744,9 +2730,8 @@ Module algorithms. [] |), [ - M.read (| - Value.String - "assertion failed: a2 < a3" + mk_str (| + "assertion failed: a2 < a3" |) ] |) @@ -2805,9 +2790,8 @@ Module algorithms. [] |), [ - M.read (| - Value.String - "assertion failed: a2 > 0" + mk_str (| + "assertion failed: a2 > 0" |) ] |) @@ -2959,11 +2943,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: a2 >= LIMIT" - |) - ] + [ mk_str (| "assertion failed: a2 >= LIMIT" |) ] |) |) |))); @@ -3017,11 +2997,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: a3 < LIMIT" - |) - ] + [ mk_str (| "assertion failed: a3 < LIMIT" |) ] |) |) |))); @@ -3085,11 +3061,7 @@ Module algorithms. [], [] |), - [ - M.read (| - Value.String "assertion failed: a2 >= v2" - |) - ] + [ mk_str (| "assertion failed: a2 >= v2" |) ] |) |) |))); @@ -3235,11 +3207,7 @@ Module algorithms. [], [] |), - [ - M.read (| - Value.String "assertion failed: a2 >= u2" - |) - ] + [ mk_str (| "assertion failed: a2 >= u2" |) ] |) |) |))); @@ -3424,11 +3392,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: r0 >= r1" - |) - ] + [ mk_str (| "assertion failed: r0 >= r1" |) ] |) |) |))); diff --git a/CoqOfRust/ruint/algorithms/gcd/mod.v b/CoqOfRust/ruint/algorithms/gcd/mod.v index c9f848824..ab456e96f 100644 --- a/CoqOfRust/ruint/algorithms/gcd/mod.v +++ b/CoqOfRust/ruint/algorithms/gcd/mod.v @@ -183,11 +183,7 @@ Module algorithms. [], [] |), - [ - M.read (| - Value.String "assertion failed: a >= b" - |) - ] + [ mk_str (| "assertion failed: a >= b" |) ] |) |) |))); @@ -626,11 +622,7 @@ Module algorithms. [], [] |), - [ - M.read (| - Value.String "assertion failed: a >= b" - |) - ] + [ mk_str (| "assertion failed: a >= b" |) ] |) |) |))); @@ -1429,11 +1421,7 @@ Module algorithms. [], [] |), - [ - M.read (| - Value.String "assertion failed: a >= b" - |) - ] + [ mk_str (| "assertion failed: a >= b" |) ] |) |) |))); diff --git a/CoqOfRust/ruint/algorithms/mul_redc.v b/CoqOfRust/ruint/algorithms/mul_redc.v index a752aff13..17c2336db 100644 --- a/CoqOfRust/ruint/algorithms/mul_redc.v +++ b/CoqOfRust/ruint/algorithms/mul_redc.v @@ -128,8 +128,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: !m.is_empty()" |) - ] + [ mk_str (| "assertion failed: !m.is_empty()" |) ] |) |) |))); @@ -1487,9 +1486,8 @@ Module algorithms. [] |), [ - M.read (| - Value.String - "assertion failed: carry == 0" + mk_str (| + "assertion failed: carry == 0" |) ] |) @@ -1588,11 +1586,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: temp[temp.len() - 1] <= 1" - |) - ] + [ mk_str (| "assertion failed: temp[temp.len() - 1] <= 1" |) ] |) |) |))); @@ -2585,9 +2579,8 @@ Module algorithms. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: carry == 0 || temp[temp.len() - 1] == 1" + mk_str (| + "assertion failed: carry == 0 || temp[temp.len() - 1] == 1" |) ] |) diff --git a/CoqOfRust/ruint/algorithms/shift.v b/CoqOfRust/ruint/algorithms/shift.v index b62475437..be3338e8a 100644 --- a/CoqOfRust/ruint/algorithms/shift.v +++ b/CoqOfRust/ruint/algorithms/shift.v @@ -58,7 +58,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: amount < 64" |) ] + [ mk_str (| "assertion failed: amount < 64" |) ] |) |) |))); @@ -247,7 +247,7 @@ Module algorithms. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: amount < 64" |) ] + [ mk_str (| "assertion failed: amount < 64" |) ] |) |) |))); diff --git a/CoqOfRust/ruint/base_convert.v b/CoqOfRust/ruint/base_convert.v index 41192338c..06d7c9f04 100644 --- a/CoqOfRust/ruint/base_convert.v +++ b/CoqOfRust/ruint/base_convert.v @@ -113,10 +113,7 @@ Module base_convert. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Overflow" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Overflow" |) |) |) ] |) |))); @@ -144,10 +141,7 @@ Module base_convert. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidBase" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "InvalidBase" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -188,7 +182,7 @@ Module base_convert. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidDigit" |) |) + M.deref (| mk_str (| "InvalidDigit" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_0 |) |) |); M.borrow (| @@ -498,9 +492,7 @@ Module base_convert. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String "the value is too large to fit the target type" - |) + mk_str (| "the value is too large to fit the target type" |) |) |) ] @@ -548,8 +540,8 @@ Module base_convert. M.alloc (| Value.Array [ - M.read (| Value.String "the requested number base " |); - M.read (| Value.String " is less than two" |) + mk_str (| "the requested number base " |); + mk_str (| " is less than two" |) ] |) |) @@ -637,8 +629,8 @@ Module base_convert. M.alloc (| Value.Array [ - M.read (| Value.String "digit " |); - M.read (| Value.String " is out of range for base " |) + mk_str (| "digit " |); + mk_str (| " is out of range for base " |) ] |) |) @@ -753,7 +745,7 @@ Module base_convert. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: base > 1" |) ] + [ mk_str (| "assertion failed: base > 1" |) ] |) |) |))); @@ -839,7 +831,7 @@ Module base_convert. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: base > 1" |) ] + [ mk_str (| "assertion failed: base > 1" |) ] |) |) |))); diff --git a/CoqOfRust/ruint/bit_arr.v b/CoqOfRust/ruint/bit_arr.v index 956209146..0eea561d7 100644 --- a/CoqOfRust/ruint/bit_arr.v +++ b/CoqOfRust/ruint/bit_arr.v @@ -40,7 +40,7 @@ Module bit_arr. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "Bits" |) |) |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Bits" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| diff --git a/CoqOfRust/ruint/bits.v b/CoqOfRust/ruint/bits.v index 702eb980f..b47fba15b 100644 --- a/CoqOfRust/ruint/bits.v +++ b/CoqOfRust/ruint/bits.v @@ -2505,9 +2505,8 @@ Module bits. M.alloc (| Value.Array [ - M.read (| - Value.String - "internal error: entered unreachable code: i >= limbs && i - limbs < LIMBS" + mk_str (| + "internal error: entered unreachable code: i >= limbs && i - limbs < LIMBS" |) ] |) @@ -3177,9 +3176,8 @@ Module bits. M.alloc (| Value.Array [ - M.read (| - Value.String - "internal error: entered unreachable code: i - limbs < LIMBS && i - limbs - 1 < LIMBS" + mk_str (| + "internal error: entered unreachable code: i - limbs < LIMBS && i - limbs - 1 < LIMBS" |) ] |) @@ -4283,9 +4281,8 @@ Module bits. M.alloc (| Value.Array [ - M.read (| - Value.String - "internal error: entered unreachable code: i + limbs < LIMBS && i + limbs + 1 < LIMBS" + mk_str (| + "internal error: entered unreachable code: i + limbs < LIMBS && i + limbs + 1 < LIMBS" |) ] |) diff --git a/CoqOfRust/ruint/bytes.v b/CoqOfRust/ruint/bytes.v index 80d2eb793..281c64a32 100644 --- a/CoqOfRust/ruint/bytes.v +++ b/CoqOfRust/ruint/bytes.v @@ -463,9 +463,8 @@ Module bytes. M.alloc (| Value.Array [ - M.read (| - Value.String - "BYTES must be equal to Self::BYTES" + mk_str (| + "BYTES must be equal to Self::BYTES" |) ] |) @@ -1049,11 +1048,7 @@ Module bytes. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "BYTES must be equal to Self::BYTES" - |) - ] + [ mk_str (| "BYTES must be equal to Self::BYTES" |) ] |) |) |) @@ -1166,8 +1161,7 @@ Module bytes. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Value too large for Uint" |) ] + Value.Array [ mk_str (| "Value too large for Uint" |) ] |) |) |) @@ -1777,11 +1771,7 @@ Module bytes. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "BYTES must be equal to Self::BYTES" - |) - ] + [ mk_str (| "BYTES must be equal to Self::BYTES" |) ] |) |) |) @@ -1894,8 +1884,7 @@ Module bytes. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Value too large for Uint" |) ] + Value.Array [ mk_str (| "Value too large for Uint" |) ] |) |) |) diff --git a/CoqOfRust/ruint/div.v b/CoqOfRust/ruint/div.v index a577a9b0c..f38a48d6b 100644 --- a/CoqOfRust/ruint/div.v +++ b/CoqOfRust/ruint/div.v @@ -265,8 +265,7 @@ Module div. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Division by zero" |) ] + Value.Array [ mk_str (| "Division by zero" |) ] |) |) |) @@ -448,8 +447,7 @@ Module div. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Division by zero" |) ] + Value.Array [ mk_str (| "Division by zero" |) ] |) |) |) diff --git a/CoqOfRust/ruint/fmt.v b/CoqOfRust/ruint/fmt.v index 5bcf44529..45ba77731 100644 --- a/CoqOfRust/ruint/fmt.v +++ b/CoqOfRust/ruint/fmt.v @@ -33,7 +33,7 @@ Module fmt. (* const PREFIX: &'static str = "0b"; *) (* Ty.apply (Ty.path "&") [] [ Ty.path "str" ] *) - Definition value_PREFIX : Value.t := M.run ltac:(M.monadic (Value.String "0b")). + Definition value_PREFIX : Value.t := M.run ltac:(M.monadic (M.alloc (| mk_str (| "0b" |) |))). Axiom Implements : M.IsTraitInstance @@ -76,7 +76,7 @@ Module fmt. (* const PREFIX: &'static str = "0o"; *) (* Ty.apply (Ty.path "&") [] [ Ty.path "str" ] *) - Definition value_PREFIX : Value.t := M.run ltac:(M.monadic (Value.String "0o")). + Definition value_PREFIX : Value.t := M.run ltac:(M.monadic (M.alloc (| mk_str (| "0o" |) |))). Axiom Implements : M.IsTraitInstance @@ -115,7 +115,7 @@ Module fmt. (* const PREFIX: &'static str = ""; *) (* Ty.apply (Ty.path "&") [] [ Ty.path "str" ] *) - Definition value_PREFIX : Value.t := M.run ltac:(M.monadic (Value.String "")). + Definition value_PREFIX : Value.t := M.run ltac:(M.monadic (M.alloc (| mk_str (| "" |) |))). Axiom Implements : M.IsTraitInstance @@ -158,7 +158,7 @@ Module fmt. (* const PREFIX: &'static str = "0x"; *) (* Ty.apply (Ty.path "&") [] [ Ty.path "str" ] *) - Definition value_PREFIX : Value.t := M.run ltac:(M.monadic (Value.String "0x")). + Definition value_PREFIX : Value.t := M.run ltac:(M.monadic (M.alloc (| mk_str (| "0x" |) |))). Axiom Implements : M.IsTraitInstance @@ -266,7 +266,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "0" |) |) + M.deref (| mk_str (| "0" |) |) |) ] |) @@ -458,9 +458,7 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) - ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -829,7 +827,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "0" |) |) + M.deref (| mk_str (| "0" |) |) |) ] |) @@ -1021,9 +1019,7 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) - ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -1339,7 +1335,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "0" |) |) + M.deref (| mk_str (| "0" |) |) |) ] |) @@ -1531,9 +1527,7 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) - ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -1849,7 +1843,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "0" |) |) + M.deref (| mk_str (| "0" |) |) |) ] |) @@ -2041,9 +2035,7 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) - ] + Value.Array [ mk_str (| "" |) ] |) |) |) @@ -2359,7 +2351,7 @@ Module fmt. |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "0" |) |) + M.deref (| mk_str (| "0" |) |) |) ] |) @@ -2551,9 +2543,7 @@ Module fmt. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "" |) - ] + Value.Array [ mk_str (| "" |) ] |) |) |) diff --git a/CoqOfRust/ruint/from.v b/CoqOfRust/ruint/from.v index 4d64f1c33..4b72fad43 100644 --- a/CoqOfRust/ruint/from.v +++ b/CoqOfRust/ruint/from.v @@ -256,7 +256,7 @@ Module from. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ValueTooLarge" |) |) + M.deref (| mk_str (| "ValueTooLarge" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_0 |) |) |); M.borrow (| @@ -299,7 +299,7 @@ Module from. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "ValueNegative" |) |) + M.deref (| mk_str (| "ValueNegative" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_0 |) |) |); M.borrow (| @@ -333,10 +333,7 @@ Module from. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "NotANumber" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "NotANumber" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.borrow (| Pointer.Kind.Ref, __self_0 |) |) @@ -954,8 +951,8 @@ Module from. M.alloc (| Value.Array [ - M.read (| Value.String "Value is too large for Uint<" |); - M.read (| Value.String ">" |) + mk_str (| "Value is too large for Uint<" |); + mk_str (| ">" |) ] |) |) @@ -1042,11 +1039,10 @@ Module from. M.alloc (| Value.Array [ - M.read (| - Value.String - "Negative values cannot be represented as Uint<" + mk_str (| + "Negative values cannot be represented as Uint<" |); - M.read (| Value.String ">" |) + mk_str (| ">" |) ] |) |) @@ -1127,11 +1123,10 @@ Module from. M.alloc (| Value.Array [ - M.read (| - Value.String - "'Not a number' (NaN) cannot be represented as Uint<" + mk_str (| + "'Not a number' (NaN) cannot be represented as Uint<" |); - M.read (| Value.String ">" |) + mk_str (| ">" |) ] |) |) @@ -1375,10 +1370,7 @@ Module from. |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Overflow" |) |) - |); + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Overflow" |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_0 |) |) |); M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| __self_1 |) |) |); M.borrow (| @@ -1786,8 +1778,8 @@ Module from. M.alloc (| Value.Array [ - M.read (| Value.String "Uint<" |); - M.read (| Value.String "> value is too large for " |) + mk_str (| "Uint<" |); + mk_str (| "> value is too large for " |) ] |) |) @@ -1945,7 +1937,7 @@ Module from. M.get_associated_function (| Ty.path "core::fmt::Formatter", "write_str", [], [] |), [ M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); - M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| Value.String "NotInField" |) |) |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "NotInField" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -2054,9 +2046,8 @@ Module from. M.borrow (| Pointer.Kind.Ref, M.deref (| - M.read (| - Value.String - "Number is equal or larger than the target field modulus." + mk_str (| + "Number is equal or larger than the target field modulus." |) |) |) @@ -2167,8 +2158,7 @@ Module from. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Uint conversion error: " |) ] + Value.Array [ mk_str (| "Uint conversion error: " |) ] |) |) |) @@ -2532,10 +2522,7 @@ Module from. |), [ M.borrow (| Pointer.Kind.Ref, M.deref (| M.read (| self |) |) |) ] |); - M.borrow (| - Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "Uint conversion error" |) |) - |) + M.borrow (| Pointer.Kind.Ref, M.deref (| mk_str (| "Uint conversion error" |) |) |) ] |))) | _, _, _ => M.impossible "wrong number of arguments" @@ -4363,11 +4350,7 @@ Module from. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "internal error: entered unreachable code" - |) + [ mk_str (| "internal error: entered unreachable code" |) ] |) |) @@ -4583,11 +4566,7 @@ Module from. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "internal error: entered unreachable code" - |) + [ mk_str (| "internal error: entered unreachable code" |) ] |) |) @@ -4803,11 +4782,7 @@ Module from. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "internal error: entered unreachable code" - |) + [ mk_str (| "internal error: entered unreachable code" |) ] |) |) @@ -5023,11 +4998,7 @@ Module from. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "internal error: entered unreachable code" - |) + [ mk_str (| "internal error: entered unreachable code" |) ] |) |) @@ -5243,11 +5214,7 @@ Module from. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "internal error: entered unreachable code" - |) + [ mk_str (| "internal error: entered unreachable code" |) ] |) |) @@ -5463,11 +5430,7 @@ Module from. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String - "internal error: entered unreachable code" - |) + [ mk_str (| "internal error: entered unreachable code" |) ] |) |) @@ -5990,7 +5953,7 @@ Module from. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: value.is_normal()" |) ] + [ mk_str (| "assertion failed: value.is_normal()" |) ] |) |) |))); @@ -6034,7 +5997,7 @@ Module from. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: sign == 0" |) ] + [ mk_str (| "assertion failed: sign == 0" |) ] |) |) |))); @@ -6071,11 +6034,7 @@ Module from. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: biased_exponent >= 1023" - |) - ] + [ mk_str (| "assertion failed: biased_exponent >= 1023" |) ] |) |) |))); diff --git a/CoqOfRust/ruint/lib.v b/CoqOfRust/ruint/lib.v index d645dfeba..0ecb08cd2 100644 --- a/CoqOfRust/ruint/lib.v +++ b/CoqOfRust/ruint/lib.v @@ -294,9 +294,8 @@ Module Impl_ruint_Uint_BITS_LIMBS. M.alloc (| Value.Array [ - M.read (| - Value.String - "Can not construct Uint with incorrect LIMBS" + mk_str (| + "Can not construct Uint with incorrect LIMBS" |) ] |) @@ -665,11 +664,7 @@ Module Impl_ruint_Uint_BITS_LIMBS. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "Value too large for this Uint" - |) - ] + [ mk_str (| "Value too large for this Uint" |) ] |) |) |) @@ -766,9 +761,7 @@ Module Impl_ruint_Uint_BITS_LIMBS. M.borrow (| Pointer.Kind.Ref, M.alloc (| - Value.Array - [ M.read (| Value.String "Value too large for this Uint" |) - ] + Value.Array [ mk_str (| "Value too large for this Uint" |) ] |) |) |) diff --git a/CoqOfRust/ruint/links/lib.v b/CoqOfRust/ruint/links/lib.v index 112e65f30..0e2bf972f 100644 --- a/CoqOfRust/ruint/links/lib.v +++ b/CoqOfRust/ruint/links/lib.v @@ -18,3 +18,15 @@ Module Uint. Proof. intros. eapply OfTy.Make with (A := t BITS LIMBS). now subst. Defined. Smpl Add eapply of_ty : of_ty. End Uint. + +Module Impl_Uint. + Parameter ZERO : forall (BITS LIMBS : Usize.t), Uint.t BITS LIMBS. + + (* pub const ZERO: Self *) + Lemma ZERO_eq (BITS LIMBS : Usize.t) : + M.get_constant "ruint::ZERO" = + φ (Ref.immediate Pointer.Kind.Raw (ZERO BITS LIMBS)). + Proof. + Admitted. + Global Hint Rewrite ZERO_eq : run_constant. +End Impl_Uint. diff --git a/CoqOfRust/ruint/log.v b/CoqOfRust/ruint/log.v index 5dbe4fad5..3a70e0d31 100644 --- a/CoqOfRust/ruint/log.v +++ b/CoqOfRust/ruint/log.v @@ -323,7 +323,7 @@ Module log. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: self != Self::ZERO" |) ] + [ mk_str (| "assertion failed: self != Self::ZERO" |) ] |) |) |))); @@ -380,11 +380,7 @@ Module log. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: base >= Self::from(2)" - |) - ] + [ mk_str (| "assertion failed: base >= Self::from(2)" |) ] |) |) |))); @@ -550,7 +546,7 @@ Module log. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: result.is_normal()" |) ] + [ mk_str (| "assertion failed: result.is_normal()" |) ] |) |) |))); @@ -736,9 +732,8 @@ Module log. [] |), [ - M.read (| - Value.String - "assertion failed: result != Self::ZERO" + mk_str (| + "assertion failed: result != Self::ZERO" |) ] |) diff --git a/CoqOfRust/ruint/modular.v b/CoqOfRust/ruint/modular.v index 58f22e835..b70a8b758 100644 --- a/CoqOfRust/ruint/modular.v +++ b/CoqOfRust/ruint/modular.v @@ -430,9 +430,8 @@ Module modular. Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), [ - M.read (| - Value.String - "assertion failed: 2 * LIMBS >= product_len" + mk_str (| + "assertion failed: 2 * LIMBS >= product_len" |) ] |) @@ -594,8 +593,7 @@ Module modular. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "assertion failed: !overflow" |) - ] + [ mk_str (| "assertion failed: !overflow" |) ] |) |) |))); @@ -1260,11 +1258,7 @@ Module modular. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ - M.read (| - Value.String "assertion failed: result < modulus" - |) - ] + [ mk_str (| "assertion failed: result < modulus" |) ] |) |) |))); diff --git a/CoqOfRust/ruint/mul.v b/CoqOfRust/ruint/mul.v index 307392d21..603ff75a2 100644 --- a/CoqOfRust/ruint/mul.v +++ b/CoqOfRust/ruint/mul.v @@ -1553,9 +1553,8 @@ Module mul. [] |), [ - M.read (| - Value.String - "assertion failed: result.limbs[LIMBS_RES - 1] <= Uint::::MASK" + mk_str (| + "assertion failed: result.limbs[LIMBS_RES - 1] <= Uint::::MASK" |) ] |) diff --git a/CoqOfRust/ruint/root.v b/CoqOfRust/ruint/root.v index 7725b7ba1..c9869fb1e 100644 --- a/CoqOfRust/ruint/root.v +++ b/CoqOfRust/ruint/root.v @@ -125,11 +125,7 @@ Module root. Pointer.Kind.Ref, M.alloc (| Value.Array - [ - M.read (| - Value.String "degree must be greater than zero" - |) - ] + [ mk_str (| "degree must be greater than zero" |) ] |) |) |) diff --git a/CoqOfRust/ruint/special.v b/CoqOfRust/ruint/special.v index 50b998ba4..e77a9bcf2 100644 --- a/CoqOfRust/ruint/special.v +++ b/CoqOfRust/ruint/special.v @@ -300,7 +300,7 @@ Module special. M.call_closure (| Ty.path "never", M.get_function (| "core::panicking::panic", [], [] |), - [ M.read (| Value.String "not yet implemented" |) ] + [ mk_str (| "not yet implemented" |) ] |) |) |) diff --git a/CoqOfRust/ruint/string.v b/CoqOfRust/ruint/string.v index 65617470d..f934e0169 100644 --- a/CoqOfRust/ruint/string.v +++ b/CoqOfRust/ruint/string.v @@ -77,7 +77,7 @@ Module string. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidDigit" |) |) + M.deref (| mk_str (| "InvalidDigit" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -112,7 +112,7 @@ Module string. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "InvalidRadix" |) |) + M.deref (| mk_str (| "InvalidRadix" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -147,7 +147,7 @@ Module string. M.borrow (| Pointer.Kind.MutRef, M.deref (| M.read (| f |) |) |); M.borrow (| Pointer.Kind.Ref, - M.deref (| M.read (| Value.String "BaseConvertError" |) |) + M.deref (| mk_str (| "BaseConvertError" |) |) |); M.borrow (| Pointer.Kind.Ref, @@ -663,9 +663,7 @@ Module string. M.deref (| M.borrow (| Pointer.Kind.Ref, - M.alloc (| - Value.Array [ M.read (| Value.String "invalid digit: " |) ] - |) + M.alloc (| Value.Array [ mk_str (| "invalid digit: " |) ] |) |) |) |); @@ -744,8 +742,8 @@ Module string. M.alloc (| Value.Array [ - M.read (| Value.String "invalid radix " |); - M.read (| Value.String ", up to 64 is supported" |) + mk_str (| "invalid radix " |); + mk_str (| ", up to 64 is supported" |) ] |) |) @@ -1751,7 +1749,7 @@ Module string. (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "0x" + mk_str (| "0x" |) |) in Value.Tuple [])); fun γ => @@ -1759,7 +1757,7 @@ Module string. (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "0X" + mk_str (| "0X" |) |) in Value.Tuple [])) ], @@ -1788,7 +1786,7 @@ Module string. (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "0o" + mk_str (| "0o" |) |) in Value.Tuple [])); fun γ => @@ -1796,7 +1794,7 @@ Module string. (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "0O" + mk_str (| "0O" |) |) in Value.Tuple [])) ], @@ -1825,7 +1823,7 @@ Module string. (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "0b" + mk_str (| "0b" |) |) in Value.Tuple [])); fun γ => @@ -1833,7 +1831,7 @@ Module string. (let _ := M.is_constant_or_break_match (| M.read (| γ |), - Value.String "0B" + mk_str (| "0B" |) |) in Value.Tuple [])) ], diff --git a/lib/src/expression.rs b/lib/src/expression.rs index b1cf4734b..3a6bac755 100644 --- a/lib/src/expression.rs +++ b/lib/src/expression.rs @@ -381,7 +381,8 @@ fn string_pieces_to_coq(pieces: &[StringPiece]) -> Rc { if rest.is_empty() { head } else { - head.apply_many(&[coq::Expression::just_name("++"), string_pieces_to_coq(rest)]) + coq::Expression::just_name("String.append") + .apply_many(&[head, string_pieces_to_coq(rest)]) } } [StringPiece::UnicodeChar(c), rest @ ..] => coq::Expression::just_name("String.String") @@ -394,7 +395,7 @@ fn string_pieces_to_coq(pieces: &[StringPiece]) -> Rc { fn string_to_coq(message: &str) -> Rc { let pieces = cut_string_in_pieces_for_coq(message); - coq::Expression::just_name("Value.String").apply(string_pieces_to_coq(&pieces)) + coq::Expression::just_name("mk_str").monadic_apply(string_pieces_to_coq(&pieces)) } impl LoopControlFlow { diff --git a/lib/src/thir_expression.rs b/lib/src/thir_expression.rs index db9c8d1c5..e339734d4 100644 --- a/lib/src/thir_expression.rs +++ b/lib/src/thir_expression.rs @@ -958,7 +958,7 @@ pub(crate) fn compile_expr<'a>( } thir::ExprKind::Literal { lit, neg } => match lit.node { rustc_ast::LitKind::Str(symbol, _) => { - Rc::new(Expr::Literal(Rc::new(Literal::String(symbol.to_string())))) + Rc::new(Expr::Literal(Rc::new(Literal::String(symbol.to_string())))).alloc() } rustc_ast::LitKind::Char(c) => { Rc::new(Expr::Literal(Rc::new(Literal::Char(c)))).alloc()