Skip to content

Commit 218d347

Browse files
authored
Update wasm-tools to 219 (bytecodealliance#1063)
* Update wasm-tools to 219 Keeping up-to-date * Fix compile * Use crates.io-based versions
1 parent 66bfda3 commit 218d347

File tree

8 files changed

+106
-100
lines changed

8 files changed

+106
-100
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ indexmap = "2.0.0"
3232
prettyplease = "0.2.20"
3333
syn = { version = "2.0", features = ["printing"] }
3434

35-
wasmparser = "0.218.0"
36-
wasm-encoder = "0.218.0"
37-
wasm-metadata = "0.218.0"
38-
wit-parser = "0.218.0"
39-
wit-component = "0.218.0"
35+
wasmparser = "0.219.0"
36+
wasm-encoder = "0.219.0"
37+
wasm-metadata = "0.219.0"
38+
wit-parser = "0.219.0"
39+
wit-component = "0.219.0"
4040

4141
wit-bindgen-core = { path = 'crates/core', version = '0.33.0' }
4242
wit-bindgen-c = { path = 'crates/c', version = '0.33.0' }

crates/c/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1778,7 +1778,7 @@ impl InterfaceGenerator<'_> {
17781778
self.src.c_fns("\n");
17791779

17801780
let core_module_name = interface_name.map(|s| self.resolve.name_world_key(s));
1781-
let export_name = func.core_export_name(core_module_name.as_deref());
1781+
let export_name = func.legacy_core_export_name(core_module_name.as_deref());
17821782

17831783
// Print the actual header for this function into the header file, and
17841784
// it's what we'll be calling.

crates/csharp/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1226,7 +1226,7 @@ impl InterfaceGenerator<'_> {
12261226

12271227
let interop_name = format!("wasmExport{}", func.name.to_upper_camel_case());
12281228
let core_module_name = interface_name.map(|s| self.resolve.name_world_key(s));
1229-
let export_name = func.core_export_name(core_module_name.as_deref());
1229+
let export_name = func.legacy_core_export_name(core_module_name.as_deref());
12301230
let access = self.gen.access_modifier();
12311231

12321232
uwrite!(

crates/moonbit/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,7 @@ impl InterfaceGenerator<'_> {
828828

829829
let func_sig = self.sig_string(func, true);
830830

831-
let export_name = func.core_export_name(interface_name);
831+
let export_name = func.legacy_core_export_name(interface_name);
832832

833833
let mut toplevel_generator =
834834
self.gen

crates/rust/src/interface.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ macro_rules! {macro_name} {{
608608
Identifier::World(_) => None,
609609
};
610610
let export_prefix = self.gen.opts.export_prefix.as_deref().unwrap_or("");
611-
let export_name = func.core_export_name(wasm_module_export_name.as_deref());
611+
let export_name = func.legacy_core_export_name(wasm_module_export_name.as_deref());
612612
uwrite!(
613613
self.src,
614614
"\

crates/teavm-java/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ impl InterfaceGenerator<'_> {
556556
fn export(&mut self, interface_name: Option<&str>, func: &Function) {
557557
let sig = self.resolve.wasm_signature(AbiVariant::GuestExport, func);
558558

559-
let export_name = func.core_export_name(interface_name);
559+
let export_name = func.legacy_core_export_name(interface_name);
560560

561561
let mut bindgen = FunctionBindgen::new(
562562
self,

crates/test-helpers/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::process::Command;
66
use wasm_encoder::{Encode, Section};
77
use wit_bindgen_core::Files;
88
use wit_component::StringEncoding;
9-
use wit_parser::{Resolve, WorldId};
9+
use wit_parser::{Mangling, Resolve, WorldId};
1010

1111
/// Returns a suitable directory to place output for tests within.
1212
///
@@ -96,7 +96,7 @@ pub fn run_component_codegen_test(
9696
) {
9797
let (resolve, world) = parse_wit(wit_path);
9898
let world_name = &resolve.worlds[world].name;
99-
let mut wasm = wit_component::dummy_module(&resolve, world);
99+
let mut wasm = wit_component::dummy_module(&resolve, world, Mangling::Standard32);
100100
let encoded =
101101
wit_component::metadata::encode(&resolve, world, StringEncoding::UTF8, None).unwrap();
102102
let section = wasm_encoder::CustomSection {

0 commit comments

Comments
 (0)