Merge remote-tracking branch 'origin/main' into pr/AlexErrant/4

RReverser · Dec 22, 2024 · 31d0468 · 31d0468
2 parents 8474d7e + 79c5850
commit 31d0468
Show file tree

Hide file tree

Showing 15 changed files with 2,197 additions and 1,579 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasm-bindgen-rayon"
-version = "1.2.2"
+version = "1.3.0"
 authors = ["Ingvar Stepanyan <me@rreverser.com>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -12,7 +12,7 @@ exclude = [".github"]
 repository = "https://github.com/RReverser/wasm-bindgen-rayon"
 
 [workspace.dependencies]
-wasm-bindgen = "0.2.93"
+wasm-bindgen = "0.2.99"
 rayon = { version = "1.8.1", features = ["web_spin_lock"] }
 
 [dependencies]

diff --git a/README.md b/README.md
@@ -114,6 +114,7 @@ In order to reduce risk of breakages, it's strongly recommended to use a fixed n
 The easiest way to configure those flags is:
 
 1. Put the following in a `rust-toolchain.toml` file in your project directory:
+
   ```toml
   [toolchain]
   channel = "nightly-2024-08-02"
@@ -126,7 +127,7 @@ The easiest way to configure those flags is:
 
    ```toml
    [target.wasm32-unknown-unknown]
-   rustflags = ["-C", "target-feature=+atomics,+bulk-memory,+mutable-globals"]
+   rustflags = ["-C", "target-feature=+atomics,+bulk-memory"]
 
    [unstable]
    build-std = ["panic_abort", "std"]
@@ -147,7 +148,7 @@ If you prefer not to configure those parameters by default, you can pass them as
 In that case, the whole command looks like this:
 
 ```sh
-RUSTFLAGS='-C target-feature=+atomics,+bulk-memory,+mutable-globals' \
+RUSTFLAGS='-C target-feature=+atomics,+bulk-memory' \
   rustup run nightly-2024-08-02 \
   wasm-pack build --target web [...] \
   -- -Z build-std=panic_abort,std

diff --git a/.cargo/config.toml → demo/.cargo/config.toml b/.cargo/config.toml → demo/.cargo/config.toml