github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge #295

Browse Source 
295: Remove wasm-bindgen patches r=grovesNL a=rukai

A new release occurred with the required fixes, so we no longer need to patch it.

Co-authored-by: Rukai <rubickent@gmail.com>
This commit is contained in:
bors[bot]
2020-05-02 12:44:45 +00:00
committed by GitHub
parent 449924bb42 a1ef4c499a
commit f79ee512eb
2 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Cargo.toml
View File

@@ -67,11 +67,6 @@ test = true
#gfx-backend-dx11 = { version = "0.5.0", path = "../gfx/src/backend/dx11" }
#gfx-descriptor = { version = "0.1.0", path = "../gfx-extras/gfx-descriptor" }
#gfx-memory = { version = "0.1.0", path = "../gfx-extras/gfx-memory" }
# Make sure to remove these patches from the README.md when they are are no longer needed
wasm-bindgen = { git = "https://github.com/rustwasm/wasm-bindgen" }
wasm-bindgen-futures = { git = "https://github.com/rustwasm/wasm-bindgen" }
web-sys = { git = "https://github.com/rustwasm/wasm-bindgen" }
js-sys = { git = "https://github.com/rustwasm/wasm-bindgen" }
[target.'cfg(target_os = "macos")'.dependencies]
objc = "0.2.7"
@@ -80,8 +75,8 @@ objc = "0.2.7"
env_logger = "0.7"
[target.'cfg(target_arch = "wasm32")'.dependencies]
wasm-bindgen = "0.2.60"
web-sys = { version = "0.3.37", features = [
wasm-bindgen = "0.2.62"
web-sys = { version = "0.3.39", features = [
"Document",
"Navigator",
"Node",
@@ -168,8 +163,8 @@ web-sys = { version = "0.3.37", features = [
"HtmlCanvasElement",
"Window",
]}
js-sys = "0.3.37"
wasm-bindgen-futures = "0.4.10"
js-sys = "0.3.39"
wasm-bindgen-futures = "0.4.12"
[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
console_error_panic_hook = "0.1.6"

10
README.md
View File

@@ -66,15 +66,7 @@ Create an `index.html` file into `target/generated` directory and add the follow
```
Now run a web server locally inside the `target/generated` directory to see the `hello-triangle` in the browser.
If you want to adapt the above to run your own crate on the web you will also need to add the following to your Cargo.toml:
```toml
[patch.crates-io]
wasm-bindgen = { git = "https://github.com/rustwasm/wasm-bindgen" }
wasm-bindgen-futures = { git = "https://github.com/rustwasm/wasm-bindgen" }
web-sys = { git = "https://github.com/rustwasm/wasm-bindgen" }
js-sys = { git = "https://github.com/rustwasm/wasm-bindgen" }
```
e.g. `python -m http.server`
## Friends