From f78db80840c387f5f5fa6d1108db9791185450cd Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Fri, 11 Aug 2023 15:34:16 +0200 Subject: [PATCH] Update to wasm-bindgen 0.2.87 (#3237) * Update to wasm-bindgen 0.2.87 Required by the new `wgpu` version * Catch unknown arguments to build_demo_web.sh --- .github/workflows/rust.yml | 2 +- Cargo.lock | 20 ++++++++++---------- crates/eframe/Cargo.toml | 2 +- crates/egui_demo_app/Cargo.toml | 2 +- scripts/build_demo_web.sh | 3 ++- scripts/setup_web.sh | 2 +- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index cd73fd9d..b4920b3b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -112,7 +112,7 @@ jobs: - name: wasm-bindgen uses: jetli/wasm-bindgen-action@v0.1.0 with: - version: "0.2.86" + version: "0.2.87" - run: ./scripts/wasm_bindgen_check.sh --skip-setup diff --git a/Cargo.lock b/Cargo.lock index d7e47d1c..ff260433 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3854,9 +3854,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3864,9 +3864,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", @@ -3891,9 +3891,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3901,9 +3901,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", @@ -3914,9 +3914,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wayland-client" diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml index 8046394e..d89f92d3 100644 --- a/crates/eframe/Cargo.toml +++ b/crates/eframe/Cargo.toml @@ -150,7 +150,7 @@ winapi = "0.3.9" bytemuck = "1.7" js-sys = "0.3" percent-encoding = "2.1" -wasm-bindgen = "0.2.86" +wasm-bindgen = "0.2.87" wasm-bindgen-futures = "0.4" web-sys = { version = "0.3.58", features = [ "BinaryType", diff --git a/crates/egui_demo_app/Cargo.toml b/crates/egui_demo_app/Cargo.toml index 79ae4874..2f6b185f 100644 --- a/crates/egui_demo_app/Cargo.toml +++ b/crates/egui_demo_app/Cargo.toml @@ -65,6 +65,6 @@ env_logger = "0.10" # web: [target.'cfg(target_arch = "wasm32")'.dependencies] -wasm-bindgen = "=0.2.86" +wasm-bindgen = "=0.2.87" wasm-bindgen-futures = "0.4" web-sys = "0.3" diff --git a/scripts/build_demo_web.sh b/scripts/build_demo_web.sh index d77279b7..37abcffc 100755 --- a/scripts/build_demo_web.sh +++ b/scripts/build_demo_web.sh @@ -55,7 +55,8 @@ while test $# -gt 0; do ;; *) - break + echo "Unknown option: $1" + exit 1 ;; esac done diff --git a/scripts/setup_web.sh b/scripts/setup_web.sh index f8d3d08a..53896e98 100755 --- a/scripts/setup_web.sh +++ b/scripts/setup_web.sh @@ -7,4 +7,4 @@ cd "$script_path/.." rustup target add wasm32-unknown-unknown # For generating JS bindings: -cargo install wasm-bindgen-cli --version 0.2.86 +cargo install wasm-bindgen-cli --version 0.2.87