From 80ab1000204231e81ba80979101f94ba5f70038f Mon Sep 17 00:00:00 2001 From: Joshua Groves Date: Mon, 30 Nov 2020 22:26:40 -0330 Subject: [PATCH] [rs] Use web-sys release instead of patch --- wgpu/Cargo.toml | 12 ++++-------- wgpu/README.md | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index 4db17fe8d6..7640bad1e1 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -96,18 +96,14 @@ test = true #gfx-backend-dx12 = { version = "0.6", path = "../gfx/src/backend/dx12" } #gfx-backend-dx11 = { version = "0.6", path = "../gfx/src/backend/dx11" } #gfx-backend-metal = { version = "0.6", path = "../gfx/src/backend/metal" } -wasm-bindgen = { git = "https://github.com/rustwasm/wasm-bindgen", rev = "316c5a70fdc4a052fb65ef82bf02d52107b5671b" } -wasm-bindgen-futures = { git = "https://github.com/rustwasm/wasm-bindgen", rev = "316c5a70fdc4a052fb65ef82bf02d52107b5671b" } -web-sys = { git = "https://github.com/rustwasm/wasm-bindgen", rev = "316c5a70fdc4a052fb65ef82bf02d52107b5671b" } -js-sys = { git = "https://github.com/rustwasm/wasm-bindgen", rev = "316c5a70fdc4a052fb65ef82bf02d52107b5671b" } [target.'cfg(target_os = "macos")'.dependencies] objc = "0.2.7" gfx-backend-vulkan = { version = "0.6", optional = true } [target.'cfg(target_arch = "wasm32")'.dependencies] -wasm-bindgen = "=0.2.68" # remember to change version in readme as well -web-sys = { version = "=0.3.45", features = [ +wasm-bindgen = "=0.2.69" # remember to change version in readme as well +web-sys = { version = "=0.3.46", features = [ "Document", "Navigator", "Node", @@ -200,8 +196,8 @@ web-sys = { version = "=0.3.45", features = [ "HtmlCanvasElement", "Window", ]} -js-sys = "0.3.45" -wasm-bindgen-futures = "0.4.18" +js-sys = "0.3.46" +wasm-bindgen-futures = "0.4.19" [target.'cfg(target_arch = "wasm32")'.dev-dependencies] console_error_panic_hook = "0.1.6" diff --git a/wgpu/README.md b/wgpu/README.md index b68e6b1a8d..2fffd55308 100644 --- a/wgpu/README.md +++ b/wgpu/README.md @@ -58,7 +58,7 @@ To run examples on the `wasm32-unknown-unknown` target, first build the example # Checkout `gecko` branch that matches the state of Firefox git checkout upstream/gecko # Install or update wasm-bindgen-cli -cargo install -f wasm-bindgen-cli --version 0.2.68 +cargo install -f wasm-bindgen-cli --version 0.2.69 # Build with the wasm target RUSTFLAGS=--cfg=web_sys_unstable_apis cargo build --target wasm32-unknown-unknown --example hello-triangle # Generate bindings in a `target/generated` directory