From d3dca8add993a7fa4a987e28f4bda055faf326c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2026 19:55:27 +0000 Subject: [PATCH 1/2] Bump walrus from 0.24.4 to 0.26.0 Bumps [walrus](https://github.com/rustwasm/walrus) from 0.24.4 to 0.26.0. - [Release notes](https://github.com/rustwasm/walrus/releases) - [Changelog](https://github.com/wasm-bindgen/walrus/blob/main/CHANGELOG.md) - [Commits](https://github.com/rustwasm/walrus/compare/0.24.4...0.26.0) --- updated-dependencies: - dependency-name: walrus dependency-version: 0.26.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 104 ++++++++--------------------------- integration_tests/Cargo.toml | 2 +- trampoline/Cargo.toml | 2 +- 3 files changed, 26 insertions(+), 82 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3ac009a..60673ca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -698,12 +698,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - [[package]] name = "fallible-iterator" version = "0.3.0" @@ -889,17 +883,6 @@ dependencies = [ "wasip3", ] -[[package]] -name = "gimli" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" -dependencies = [ - "fallible-iterator 0.2.0", - "indexmap 1.9.3", - "stable_deref_trait", -] - [[package]] name = "gimli" version = "0.31.1" @@ -912,8 +895,8 @@ version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" dependencies = [ - "fallible-iterator 0.3.0", - "indexmap 2.13.0", + "fallible-iterator", + "indexmap", "stable_deref_trait", ] @@ -930,12 +913,6 @@ dependencies = [ "regex-syntax", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.15.2" @@ -1106,9 +1083,9 @@ dependencies = [ [[package]] name = "id-arena" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" [[package]] name = "idna" @@ -1131,16 +1108,6 @@ dependencies = [ "icu_properties", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - [[package]] name = "indexmap" version = "2.13.0" @@ -1405,7 +1372,7 @@ checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" dependencies = [ "crc32fast", "hashbrown 0.15.2", - "indexmap 2.13.0", + "indexmap", "memchr", ] @@ -2109,7 +2076,7 @@ version = "0.22.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" dependencies = [ - "indexmap 2.13.0", + "indexmap", "serde", "serde_spanned", "toml_datetime", @@ -2238,25 +2205,25 @@ dependencies = [ [[package]] name = "walrus" -version = "0.24.4" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff282e73d21b86a9d397f42570d158eb9e5c521d0ead4d13cd049fd7cb45c467" +checksum = "d5387fce247006749df1ba65c7c93d1d3f0e36259174f299a8f677e0c38e5091" dependencies = [ "anyhow", - "gimli 0.26.2", + "gimli 0.32.3", "id-arena", "leb128", "log", "walrus-macro", - "wasm-encoder 0.240.0", - "wasmparser 0.240.0", + "wasm-encoder 0.245.1", + "wasmparser 0.245.1", ] [[package]] name = "walrus-macro" -version = "0.24.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef06db404cbaed87cb25fd2ca3a62502af485f43383c9641ffcf1479d02fffd" +checksum = "1a9b0525d7ea6e5f906aca581a172e5c91b4c595290dfa8ad4a2bc9ffef33b44" dependencies = [ "heck", "proc-macro2", @@ -2365,16 +2332,6 @@ dependencies = [ "wasmparser 0.239.0", ] -[[package]] -name = "wasm-encoder" -version = "0.240.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06d642d8c5ecc083aafe9ceb32809276a304547a3a6eeecceb5d8152598bc71f" -dependencies = [ - "leb128fmt", - "wasmparser 0.240.0", -] - [[package]] name = "wasm-encoder" version = "0.244.0" @@ -2402,7 +2359,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" dependencies = [ "anyhow", - "indexmap 2.13.0", + "indexmap", "wasm-encoder 0.244.0", "wasmparser 0.244.0", ] @@ -2415,20 +2372,7 @@ checksum = "8c9d90bb93e764f6beabf1d02028c70a2156a6583e63ac4218dd07ef733368b0" dependencies = [ "bitflags", "hashbrown 0.15.2", - "indexmap 2.13.0", - "semver", - "serde", -] - -[[package]] -name = "wasmparser" -version = "0.240.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b722dcf61e0ea47440b53ff83ccb5df8efec57a69d150e4f24882e4eba7e24a4" -dependencies = [ - "bitflags", - "hashbrown 0.15.2", - "indexmap 2.13.0", + "indexmap", "semver", "serde", ] @@ -2441,7 +2385,7 @@ checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" dependencies = [ "bitflags", "hashbrown 0.15.2", - "indexmap 2.13.0", + "indexmap", "semver", ] @@ -2453,7 +2397,7 @@ checksum = "4f08c9adee0428b7bddf3890fc27e015ac4b761cc608c822667102b8bfd6995e" dependencies = [ "bitflags", "hashbrown 0.16.1", - "indexmap 2.13.0", + "indexmap", "semver", "serde", ] @@ -2497,7 +2441,7 @@ dependencies = [ "fxprof-processed-profile", "gimli 0.32.3", "hashbrown 0.15.2", - "indexmap 2.13.0", + "indexmap", "ittapi", "libc", "log", @@ -2545,7 +2489,7 @@ dependencies = [ "cranelift-bitset", "cranelift-entity", "gimli 0.32.3", - "indexmap 2.13.0", + "indexmap", "log", "object 0.37.3", "postcard", @@ -2735,7 +2679,7 @@ dependencies = [ "anyhow", "bitflags", "heck", - "indexmap 2.13.0", + "indexmap", "wit-parser 0.239.0", ] @@ -3142,7 +3086,7 @@ checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" dependencies = [ "anyhow", "heck", - "indexmap 2.13.0", + "indexmap", "prettyplease", "syn", "wasm-metadata", @@ -3173,7 +3117,7 @@ checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" dependencies = [ "anyhow", "bitflags", - "indexmap 2.13.0", + "indexmap", "log", "serde", "serde_derive", @@ -3192,7 +3136,7 @@ checksum = "55c92c939d667b7bf0c6bf2d1f67196529758f99a2a45a3355cc56964fd5315d" dependencies = [ "anyhow", "id-arena", - "indexmap 2.13.0", + "indexmap", "log", "semver", "serde", @@ -3210,7 +3154,7 @@ checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" dependencies = [ "anyhow", "id-arena", - "indexmap 2.13.0", + "indexmap", "log", "semver", "serde", diff --git a/integration_tests/Cargo.toml b/integration_tests/Cargo.toml index 70002fb..eebeb97 100644 --- a/integration_tests/Cargo.toml +++ b/integration_tests/Cargo.toml @@ -13,7 +13,7 @@ shopify_function_trampoline = { path = "../trampoline" } shopify_function_provider = { path = "../provider" } [dev-dependencies] -walrus = "0.24.4" +walrus = "0.26.0" anyhow = "1.0" wat = "1.245.1" insta = "1" diff --git a/trampoline/Cargo.toml b/trampoline/Cargo.toml index 95908a6..22f0541 100644 --- a/trampoline/Cargo.toml +++ b/trampoline/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://github.com/Shopify/shopify-function-wasm-api" description = "Tool for augmenting Wasm modules to be compatible with the Shopify Function Wasm API" [dependencies] -walrus = "0.24.4" +walrus = "0.26.0" anyhow = "1.0" clap = { version = "4.6.0", features = ["derive"] } wasmparser = "0.245.1" From 76f654183b381ec0a8dbe8d1285abef8f2701b96 Mon Sep 17 00:00:00 2001 From: Adam Petro Date: Mon, 30 Mar 2026 16:14:22 -0400 Subject: [PATCH 2/2] Update insta snapshots --- ...__disassemble_trampoline@consumer.wat.snap | 76 +++++++++---------- ...est__disassemble_trampoline@empty.wat.snap | 2 +- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/trampoline/src/snapshots/shopify_function_trampoline__test__disassemble_trampoline@consumer.wat.snap b/trampoline/src/snapshots/shopify_function_trampoline__test__disassemble_trampoline@consumer.wat.snap index d8f5887..42641df 100644 --- a/trampoline/src/snapshots/shopify_function_trampoline__test__disassemble_trampoline@consumer.wat.snap +++ b/trampoline/src/snapshots/shopify_function_trampoline__test__disassemble_trampoline@consumer.wat.snap @@ -4,41 +4,41 @@ expression: actual input_file: trampoline/src/test_data/consumer.wat --- (module - (type (;0;) (func (result i32))) + (type (;0;) (func (param i32 i32) (result i32))) (type (;1;) (func (result i64))) - (type (;2;) (func (param i32) (result i32))) - (type (;3;) (func (param i32) (result i64))) - (type (;4;) (func (param i32 i32))) - (type (;5;) (func (param i32 i32) (result i32))) - (type (;6;) (func (param i32 i32 i32))) - (type (;7;) (func (param i64) (result i32))) - (type (;8;) (func (param i64 i32) (result i64))) - (type (;9;) (func (param i64 i32 i32) (result i64))) - (type (;10;) (func (param f64) (result i32))) + (type (;2;) (func (param i64 i32 i32) (result i64))) + (type (;3;) (func (param i64 i32) (result i64))) + (type (;4;) (func (param i64) (result i32))) + (type (;5;) (func (param i32 i32 i32))) + (type (;6;) (func (param i32) (result i32))) + (type (;7;) (func (result i32))) + (type (;8;) (func (param f64) (result i32))) + (type (;9;) (func (param i32 i32))) + (type (;10;) (func (param i32) (result i64))) (import "shopify_function_v2" "_shopify_function_input_get" (func (;0;) (type 1))) - (import "shopify_function_v2" "_shopify_function_input_get_interned_obj_prop" (func (;1;) (type 8))) - (import "shopify_function_v2" "_shopify_function_input_get_at_index" (func (;2;) (type 8))) - (import "shopify_function_v2" "_shopify_function_input_get_obj_key_at_index" (func (;3;) (type 8))) - (import "shopify_function_v2" "_shopify_function_input_get_val_len" (func (;4;) (type 7))) - (import "shopify_function_v2" "_shopify_function_output_new_bool" (func (;5;) (type 2))) - (import "shopify_function_v2" "_shopify_function_output_new_null" (func (;6;) (type 0))) - (import "shopify_function_v2" "_shopify_function_output_new_i32" (func (;7;) (type 2))) - (import "shopify_function_v2" "_shopify_function_output_new_f64" (func (;8;) (type 10))) - (import "shopify_function_v2" "_shopify_function_output_new_object" (func (;9;) (type 2))) - (import "shopify_function_v2" "_shopify_function_output_finish_object" (func (;10;) (type 0))) - (import "shopify_function_v2" "_shopify_function_output_new_array" (func (;11;) (type 2))) - (import "shopify_function_v2" "_shopify_function_output_finish_array" (func (;12;) (type 0))) - (import "shopify_function_v2" "_shopify_function_output_new_interned_utf8_str" (func (;13;) (type 2))) - (import "shopify_function_v2" "_shopify_function_input_get_utf8_str_addr" (func (;14;) (type 2))) + (import "shopify_function_v2" "_shopify_function_input_get_interned_obj_prop" (func (;1;) (type 3))) + (import "shopify_function_v2" "_shopify_function_input_get_at_index" (func (;2;) (type 3))) + (import "shopify_function_v2" "_shopify_function_input_get_obj_key_at_index" (func (;3;) (type 3))) + (import "shopify_function_v2" "_shopify_function_input_get_val_len" (func (;4;) (type 4))) + (import "shopify_function_v2" "_shopify_function_output_new_bool" (func (;5;) (type 6))) + (import "shopify_function_v2" "_shopify_function_output_new_null" (func (;6;) (type 7))) + (import "shopify_function_v2" "_shopify_function_output_new_i32" (func (;7;) (type 6))) + (import "shopify_function_v2" "_shopify_function_output_new_f64" (func (;8;) (type 8))) + (import "shopify_function_v2" "_shopify_function_output_new_object" (func (;9;) (type 6))) + (import "shopify_function_v2" "_shopify_function_output_finish_object" (func (;10;) (type 7))) + (import "shopify_function_v2" "_shopify_function_output_new_array" (func (;11;) (type 6))) + (import "shopify_function_v2" "_shopify_function_output_finish_array" (func (;12;) (type 7))) + (import "shopify_function_v2" "_shopify_function_output_new_interned_utf8_str" (func (;13;) (type 6))) + (import "shopify_function_v2" "_shopify_function_input_get_utf8_str_addr" (func (;14;) (type 6))) (import "shopify_function_v2" "memory" (memory (;0;) 1)) - (import "shopify_function_v2" "_shopify_function_input_get_obj_prop" (func (;15;) (type 9))) - (import "shopify_function_v2" "_shopify_function_alloc" (func (;16;) (type 2))) - (import "shopify_function_v2" "_shopify_function_output_new_utf8_str" (func (;17;) (type 3))) - (import "shopify_function_v2" "_shopify_function_intern_utf8_str" (func (;18;) (type 3))) - (import "shopify_function_v2" "_shopify_function_log_new_utf8_str" (func (;19;) (type 2))) + (import "shopify_function_v2" "_shopify_function_input_get_obj_prop" (func (;15;) (type 2))) + (import "shopify_function_v2" "_shopify_function_alloc" (func (;16;) (type 6))) + (import "shopify_function_v2" "_shopify_function_output_new_utf8_str" (func (;17;) (type 10))) + (import "shopify_function_v2" "_shopify_function_intern_utf8_str" (func (;18;) (type 10))) + (import "shopify_function_v2" "_shopify_function_log_new_utf8_str" (func (;19;) (type 6))) (memory (;1;) 1) (export "memory" (memory 1)) - (func (;20;) (type 4) (param i32 i32) + (func (;20;) (type 9) (param i32 i32) (local i32 i32 i32 i32 i32 i32) local.get 1 call 19 @@ -77,7 +77,7 @@ input_file: trampoline/src/test_data/consumer.wat else end ) - (func (;21;) (type 5) (param i32 i32) (result i32) + (func (;21;) (type 0) (param i32 i32) (result i32) (local i64) local.get 1 call 18 @@ -91,7 +91,7 @@ input_file: trampoline/src/test_data/consumer.wat local.get 1 call 26 ) - (func (;22;) (type 5) (param i32 i32) (result i32) + (func (;22;) (type 0) (param i32 i32) (result i32) (local i64) local.get 1 call 17 @@ -105,7 +105,7 @@ input_file: trampoline/src/test_data/consumer.wat local.get 1 call 26 ) - (func (;23;) (type 9) (param i64 i32 i32) (result i64) + (func (;23;) (type 2) (param i64 i32 i32) (result i64) (local i32) local.get 2 call 27 @@ -118,30 +118,30 @@ input_file: trampoline/src/test_data/consumer.wat local.get 2 call 15 ) - (func (;24;) (type 6) (param i32 i32 i32) + (func (;24;) (type 5) (param i32 i32 i32) local.get 1 local.get 0 call 14 local.get 2 call 25 ) - (func (;25;) (type 6) (param i32 i32 i32) + (func (;25;) (type 5) (param i32 i32 i32) local.get 0 local.get 1 local.get 2 memory.copy 1 0 ) - (func (;26;) (type 6) (param i32 i32 i32) + (func (;26;) (type 5) (param i32 i32 i32) local.get 0 local.get 1 local.get 2 memory.copy 0 1 ) - (func (;27;) (type 2) (param i32) (result i32) + (func (;27;) (type 6) (param i32) (result i32) local.get 0 call 16 ) (@producers - (processed-by "walrus" "0.24.4") + (processed-by "walrus" "0.26.0") ) ) diff --git a/trampoline/src/snapshots/shopify_function_trampoline__test__disassemble_trampoline@empty.wat.snap b/trampoline/src/snapshots/shopify_function_trampoline__test__disassemble_trampoline@empty.wat.snap index 64159c0..2a81620 100644 --- a/trampoline/src/snapshots/shopify_function_trampoline__test__disassemble_trampoline@empty.wat.snap +++ b/trampoline/src/snapshots/shopify_function_trampoline__test__disassemble_trampoline@empty.wat.snap @@ -5,6 +5,6 @@ input_file: trampoline/src/test_data/empty.wat --- (module (@producers - (processed-by "walrus" "0.24.4") + (processed-by "walrus" "0.26.0") ) )