Skip to content

Commit 9e784e2

Browse files
author
Guy Bedford
authored
deps: update to latest Wasmtime@27 toolchain (#524)
1 parent 7b6e386 commit 9e784e2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+116
-118
lines changed

Cargo.lock

Lines changed: 93 additions & 87 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
@@ -41,19 +41,19 @@ log = "0.4.22"
4141
semver = "1.0.23"
4242
js-component-bindgen = { path = "./crates/js-component-bindgen" }
4343
structopt = "0.3.26"
44-
wasm-encoder = "0.218.0"
45-
wasm-metadata = "0.218.0"
46-
wasmparser = "0.218.0"
47-
wasmprinter = "0.218.0"
48-
wasmtime-environ = { version = "26.0.0", features = [
44+
wasm-encoder = "0.219.1"
45+
wasm-metadata = "0.219.1"
46+
wasmparser = "0.219.1"
47+
wasmprinter = "0.219.1"
48+
wasmtime-environ = { version = "27.0.0", features = [
4949
"component-model",
5050
"compile",
5151
] }
5252
wat = "1.218.0"
53-
wit-bindgen = "0.33.0"
54-
wit-bindgen-core = "0.33.0"
55-
wit-component = { version = "0.218.0", features = ["dummy-module"] }
56-
wit-parser = "0.218.0"
53+
wit-bindgen = "0.34.0"
54+
wit-bindgen-core = "0.34.0"
55+
wit-component = { version = "0.219.1", features = ["dummy-module"] }
56+
wit-parser = "0.219.1"
5757
xshell = "0.2.6"
5858

5959
[dev-dependencies]

crates/js-component-bindgen/src/core.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,6 @@ impl Augmenter<'_> {
218218
// records various bits of information about the module within `self`.
219219
for payload in Parser::new(0).parse_all(self.translation.wasm) {
220220
match payload? {
221-
Payload::Version { .. } => {}
222-
Payload::End(_) => {}
223-
224221
Payload::TypeSection(s) => {
225222
for grp in s.into_iter_err_on_gc_types() {
226223
self.types.push(grp?);
@@ -246,29 +243,22 @@ impl Augmenter<'_> {
246243
self.imports.push(i);
247244
}
248245
}
249-
250246
Payload::ExportSection(s) => {
251247
for e in s {
252248
let e = e?;
253249
self.exports.push(e);
254250
}
255251
}
256-
257252
Payload::FunctionSection(s) => {
258253
for ty in s {
259254
let ty = ty?;
260255
self.local_func_tys.push(ty);
261256
}
262257
}
263-
264-
Payload::CodeSectionStart { .. } => {}
265258
Payload::CodeSectionEntry(body) => {
266259
self.local_funcs.push(body);
267260
}
268261

269-
// Ignore all custom sections for now
270-
Payload::CustomSection(_) => {}
271-
272262
// NB: these sections are theoretically possible to handle but
273263
// are not required at this time.
274264
Payload::DataCountSection { .. }
@@ -297,6 +287,8 @@ impl Augmenter<'_> {
297287
| Payload::ComponentTypeSection(_) => {
298288
bail!("component section found in module using multiple memories")
299289
}
290+
291+
_ => {}
300292
}
301293
}
302294

crates/wasm-tools-component/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::path::PathBuf;
44
use wasm_encoder::{Encode, Section};
55
use wasm_metadata::Producers;
66
use wit_component::{ComponentEncoder, DecodedWasm, WitPrinter};
7-
use wit_parser::Resolve;
7+
use wit_parser::{Mangling, Resolve};
88

99
use exports::local::wasm_tools::tools::{
1010
EmbedOpts, EnabledFeatureSet, Guest, ModuleMetaType, ModuleMetadata, ProducersFields,
@@ -122,7 +122,7 @@ impl Guest for WasmToolsJs {
122122
..
123123
}
124124
) {
125-
wit_component::dummy_module(&resolve, world)
125+
wit_component::dummy_module(&resolve, world, Mangling::Standard32)
126126
} else {
127127
if binary.is_none() {
128128
return Err(
207 Bytes
Binary file not shown.
211 Bytes
Binary file not shown.

submodules/WASI-Virt

submodules/wasm-tools

Submodule wasm-tools updated 56 files

submodules/wasmtime

Submodule wasmtime updated 552 files

test/api.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,13 @@ export async function apiTest(_fixtures) {
148148
const meta = await metadataShow(newComponent);
149149
deepStrictEqual(meta[0].metaType, {
150150
tag: "component",
151-
val: 4,
151+
val: 5,
152152
});
153153
deepStrictEqual(meta[1].producers, [
154154
[
155155
"processed-by",
156156
[
157-
["wit-component", "0.218.0"],
157+
["wit-component", "0.219.1"],
158158
["dummy-gen", "test"],
159159
],
160160
],
@@ -189,13 +189,13 @@ export async function apiTest(_fixtures) {
189189
const meta = await metadataShow(newComponent);
190190
deepStrictEqual(meta[0].metaType, {
191191
tag: "component",
192-
val: 1,
192+
val: 2,
193193
});
194194
deepStrictEqual(meta[1].producers, [
195195
[
196196
"processed-by",
197197
[
198-
["wit-component", "0.218.0"],
198+
["wit-component", "0.219.1"],
199199
["dummy-gen", "test"],
200200
],
201201
],

test/cli.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,12 +455,12 @@ export async function cliTest(_fixtures) {
455455
);
456456
strictEqual(stderr, "");
457457
const meta = JSON.parse(stdout);
458-
deepStrictEqual(meta[0].metaType, { tag: "component", val: 4 });
458+
deepStrictEqual(meta[0].metaType, { tag: "component", val: 5 });
459459
deepStrictEqual(meta[1].producers, [
460460
[
461461
"processed-by",
462462
[
463-
["wit-component", "0.218.0"],
463+
["wit-component", "0.219.1"],
464464
["dummy-gen", "test"],
465465
],
466466
],
Binary file not shown.
Binary file not shown.
-38 Bytes
Binary file not shown.
-480 Bytes
Binary file not shown.
-38 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
-38 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
214 KB
Binary file not shown.
-38 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-78 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
-38 Bytes
Binary file not shown.
-38 Bytes
Binary file not shown.
Binary file not shown.
-38 Bytes
Binary file not shown.
Binary file not shown.

test/fixtures/env-allow.composed.wasm

0 Bytes
Binary file not shown.

test/fixtures/stdio.composed.wasm

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)