Skip to content

Commit 2e4101e

Browse files
author
Guy Bedford
authored
deps: latest js-component-bindgen (#130)
1 parent bf7b7a8 commit 2e4101e

4 files changed

Lines changed: 71 additions & 80 deletions

File tree

Cargo.lock

Lines changed: 51 additions & 60 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ version = "0.1.0"
1111
anyhow = "1.0.86"
1212
base64 = "0.22.1"
1313
heck = "0.5"
14-
js-component-bindgen = "1.4.3"
14+
js-component-bindgen = "1.4.4"
1515
pulldown-cmark = { version = "0.10", default-features = false }
1616
rand = "0.8"
1717
walrus = "0.20.3"
18-
wasm-encoder = "0.212.0"
19-
wasmparser = "0.212.0"
20-
wasmprinter = "0.212.0"
21-
wat = "1.212.0"
22-
wit-bindgen = "0.27.0"
23-
wit-bindgen-core = "0.27.0"
24-
wit-component = { version = "0.212.0", features = ["dummy-module"] }
25-
wit-parser = "0.212.0"
18+
wasm-encoder = "0.215.0"
19+
wasmparser = "0.215.0"
20+
wasmprinter = "0.215.0"
21+
wat = "1.215.0"
22+
wit-bindgen = "0.30.0"
23+
wit-bindgen-core = "0.30.0"
24+
wit-component = { version = "0.215.0", features = ["dummy-module"] }
25+
wit-parser = "0.215.0"

crates/spidermonkey-embedding-splicer/src/lib.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ fn map_core_fn(cfn: &bindgen::CoreFn) -> CoreFn {
7979
}
8080
}
8181

82-
fn parse_wit(path: &Path) -> Result<(Resolve, Vec<PackageId>)> {
82+
fn parse_wit(path: &Path) -> Result<(Resolve, PackageId)> {
8383
let mut resolve = Resolve::default();
84-
let ids = if path.is_dir() {
84+
let id = if path.is_dir() {
8585
resolve.push_dir(&path)?.0
8686
} else {
8787
let contents =
@@ -92,7 +92,7 @@ fn parse_wit(path: &Path) -> Result<(Resolve, Vec<PackageId>)> {
9292
};
9393
resolve.push_str(&path, text)?
9494
};
95-
Ok((resolve, ids))
95+
Ok((resolve, id))
9696
}
9797

9898
impl Guest for SpidermonkeyEmbeddingSplicerComponent {
@@ -119,19 +119,19 @@ impl Guest for SpidermonkeyEmbeddingSplicerComponent {
119119
) -> Result<SpliceResult, String> {
120120
let source_name = source_name.unwrap_or("source.js".to_string());
121121

122-
let (mut resolve, ids) = if let Some(wit_source) = wit_source {
122+
let (mut resolve, id) = if let Some(wit_source) = wit_source {
123123
let mut resolve = Resolve::default();
124124
let path = PathBuf::from("component.wit");
125-
let ids = resolve
125+
let id = resolve
126126
.push_str(&path, &wit_source)
127127
.map_err(|e| e.to_string())?;
128-
(resolve, ids)
128+
(resolve, id)
129129
} else {
130130
parse_wit(&PathBuf::from(wit_path.unwrap())).map_err(|e| format!("{:?}", e))?
131131
};
132132

133133
let world = resolve
134-
.select_world(&ids, world_name.as_deref())
134+
.select_world(id, world_name.as_deref())
135135
.map_err(|e| e.to_string())?;
136136

137137
let mut wasm_bytes = wit_component::dummy_module(&resolve, world);

0 commit comments

Comments
 (0)