From 6aa28260769daf92d616bea6d3fc49dfdfed9ce3 Mon Sep 17 00:00:00 2001 From: Jubilee Young Date: Sat, 24 Aug 2024 10:42:44 -0700 Subject: [PATCH 1/2] Depend on wasm-bindgen 0.2.89 or higher wasm-bindgen 0.2.83 is not compatible for a wasm ABI change that rustc wishes to enable by default for wasm, currently gated behind passing the -Zwasm-c-abi flag to rustc. wasm-bindgen 0.2.89 should exhibit seamless behavior before and after the ABI change matches the C ABI, so depend on that. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 043be24..4ec0ed8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ png = "0.16" walkdir = "2.0" criterion = "0.3" wasm-bindgen-test = "0.3" -wasm-bindgen = "=0.2.83" +wasm-bindgen = "0.2.89" [features] default = ["rayon"] From 53d85ee9bc52bc042e463d556984b87ab693e182 Mon Sep 17 00:00:00 2001 From: Jubilee Young Date: Sat, 24 Aug 2024 11:10:58 -0700 Subject: [PATCH 2/2] Fix tests depending on wasm-bindgen 0.2.83 --- .github/workflows/rust.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 7132a28..cb98898 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -81,10 +81,10 @@ jobs: - name: Install wasm-bindgen run: > curl -L "$WASMBINDGEN_UPSTREAM" - | tar xzf - --strip-components=1 wasm-bindgen-0.2.83-x86_64-unknown-linux-musl/wasm-bindgen-test-runner + | tar xzf - --strip-components=1 wasm-bindgen-0.2.89-x86_64-unknown-linux-musl/wasm-bindgen-test-runner && sudo mv wasm-bindgen-test-runner /usr/bin/wasm-bindgen-test-runner env: - WASMBINDGEN_UPSTREAM: https://github.com/rustwasm/wasm-bindgen/releases/download/0.2.83/wasm-bindgen-0.2.83-x86_64-unknown-linux-musl.tar.gz + WASMBINDGEN_UPSTREAM: https://github.com/rustwasm/wasm-bindgen/releases/download/0.2.89/wasm-bindgen-0.2.89-x86_64-unknown-linux-musl.tar.gz - name: Installing Rust toolchain uses: actions-rs/toolchain@v1 with: @@ -95,7 +95,8 @@ jobs: - name: Test run: | cargo update - cargo update -p wasm-bindgen --precise 0.2.83 + # update wasm-bindgen to the version we want and bring -test along for the ride + cargo update -p wasm-bindgen --precise 0.2.89 -p wasm-bindgen-test cargo test -vv --target wasm32-unknown-unknown env: CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER: wasm-bindgen-test-runner