aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2022-08-23 18:41:34 +0000
committerGitHub <[email protected]>2022-08-23 18:41:34 +0000
commit9947e27ee172302bde54bdeeb291328aa93f6fa0 (patch)
treeab9aaab342dd7a6b32ae0ee2679836ffba9e9638
parent6530c179b2efffa19fe5d7e336837692e0365af4 (diff)
parentbd4ae2e9526cb66c15b7335cfbc803106637c7e1 (diff)
Merge #925
925: Enable 'std' feature on critical-section for WASM r=Dirbaio a=lulf This fixes the WASM support which was failing due to missing critical-section implementation. This also upgrades the bindgen dependency and ensures that tooling works. Co-authored-by: Ulf Lilleengen <[email protected]>
-rw-r--r--embassy-executor/Cargo.toml4
-rw-r--r--embassy-time/Cargo.toml2
-rw-r--r--examples/wasm/Cargo.toml2
-rw-r--r--examples/wasm/README.md2
4 files changed, 5 insertions, 5 deletions
diff --git a/embassy-executor/Cargo.toml b/embassy-executor/Cargo.toml
index 184e770cd..1a611720c 100644
--- a/embassy-executor/Cargo.toml
+++ b/embassy-executor/Cargo.toml
@@ -47,5 +47,5 @@ cfg-if = "1.0.0"
47static_cell = "1.0" 47static_cell = "1.0"
48 48
49# WASM dependencies 49# WASM dependencies
50wasm-bindgen = { version = "0.2.76", features = ["nightly"], optional = true } 50wasm-bindgen = { version = "0.2.82", optional = true }
51js-sys = { version = "0.3", optional = true } \ No newline at end of file 51js-sys = { version = "0.3", optional = true }
diff --git a/embassy-time/Cargo.toml b/embassy-time/Cargo.toml
index 161c101fe..f0f622aba 100644
--- a/embassy-time/Cargo.toml
+++ b/embassy-time/Cargo.toml
@@ -49,6 +49,6 @@ critical-section = "1.1"
49cfg-if = "1.0.0" 49cfg-if = "1.0.0"
50 50
51# WASM dependencies 51# WASM dependencies
52wasm-bindgen = { version = "0.2.76", features = ["nightly"], optional = true } 52wasm-bindgen = { version = "0.2.81", optional = true }
53js-sys = { version = "0.3", optional = true } 53js-sys = { version = "0.3", optional = true }
54wasm-timer = { version = "0.2.5", optional = true } \ No newline at end of file 54wasm-timer = { version = "0.2.5", optional = true } \ No newline at end of file
diff --git a/examples/wasm/Cargo.toml b/examples/wasm/Cargo.toml
index 194e8f4b8..ea61fb921 100644
--- a/examples/wasm/Cargo.toml
+++ b/examples/wasm/Cargo.toml
@@ -15,4 +15,4 @@ wasm-logger = "0.2.0"
15wasm-bindgen = "0.2" 15wasm-bindgen = "0.2"
16web-sys = { version = "0.3", features = ["Document", "Element", "HtmlElement", "Node", "Window" ] } 16web-sys = { version = "0.3", features = ["Document", "Element", "HtmlElement", "Node", "Window" ] }
17log = "0.4.11" 17log = "0.4.11"
18critical-section = "1.1" 18critical-section = { version = "1.1", features = ["std"] }
diff --git a/examples/wasm/README.md b/examples/wasm/README.md
index 4bed4a797..b7fee2dc8 100644
--- a/examples/wasm/README.md
+++ b/examples/wasm/README.md
@@ -3,7 +3,7 @@
3Examples use a CLI tool named `wasm-pack` to build this example: 3Examples use a CLI tool named `wasm-pack` to build this example:
4 4
5``` 5```
6cargo install wasm-pack 6cargo install wasm-pack --version 0.9.1
7``` 7```
8 8
9## Building 9## Building