Skip to content

Commit 100b002

Browse files
Avishay Yagodapyros82
Avishay Yagoda
authored andcommitted
Fixing wasm tests which were broken by using serde-wasm-bindgen. We use gloo-utils instead now.
1 parent 7d74193 commit 100b002

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

Cargo.toml

+4-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ required-features = ["cmdline"]
2727
cmdline = ["anyhow", "clap"]
2828
default = []
2929
python = ["cpython"]
30-
wasm = ["serde-wasm-bindgen", "wasm-bindgen"]
30+
wasm = ["wasm-bindgen", "gloo-utils"]
3131

3232
[dependencies]
3333
phf = { version = "~0.8.0", features = ["macros"] }
@@ -39,10 +39,11 @@ features = ["serde-serialize"]
3939
optional = true
4040
version = "~0.2.62"
4141

42-
[dependencies.serde-wasm-bindgen]
42+
[dependencies.gloo-utils]
4343
features = []
4444
optional = true
45-
version = "~0.6.5"
45+
version = "~0.2.0"
46+
4647

4748
[dependencies.serde]
4849
features = ["derive"]

src/lib.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ trait Parser<'a>: Sized + Into<Value> {
1818

1919
#[cfg(feature = "wasm")]
2020
pub mod javascript_iface {
21+
use gloo_utils::format::JsValueSerdeExt;
2122
use serde_json::Value;
2223
use wasm_bindgen::prelude::*;
2324

@@ -33,7 +34,8 @@ pub mod javascript_iface {
3334
serde_json::from_str(&js_string).or(Ok(Value::String(js_string)))
3435
} else {
3536
// If we're passed anything else, convert it directly to a serde Value.
36-
serde_wasm_bindgen::from_value(js_value)
37+
38+
JsValueSerdeExt::into_serde::<Value>(&js_value)
3739
.map_err(|err| format!("{}", err))
3840
.map_err(JsValue::from)
3941
}
@@ -48,7 +50,7 @@ pub mod javascript_iface {
4850
.map_err(|err| format!("{}", err))
4951
.map_err(JsValue::from)?;
5052

51-
serde_wasm_bindgen::to_value(&res)
53+
<wasm_bindgen::JsValue as JsValueSerdeExt>::from_serde(&res)
5254
.map_err(|err| format!("{}", err))
5355
.map_err(JsValue::from)
5456
}

0 commit comments

Comments
 (0)