Skip to content

Commit

Permalink
Update wasm-tools to 219 (#1063)
Browse files Browse the repository at this point in the history
* Update wasm-tools to 219

Keeping up-to-date

* Fix compile

* Use crates.io-based versions
  • Loading branch information
alexcrichton authored Oct 8, 2024
1 parent 66bfda3 commit 218d347
Show file tree
Hide file tree
Showing 8 changed files with 106 additions and 100 deletions.
182 changes: 94 additions & 88 deletions Cargo.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ indexmap = "2.0.0"
prettyplease = "0.2.20"
syn = { version = "2.0", features = ["printing"] }

wasmparser = "0.218.0"
wasm-encoder = "0.218.0"
wasm-metadata = "0.218.0"
wit-parser = "0.218.0"
wit-component = "0.218.0"
wasmparser = "0.219.0"
wasm-encoder = "0.219.0"
wasm-metadata = "0.219.0"
wit-parser = "0.219.0"
wit-component = "0.219.0"

wit-bindgen-core = { path = 'crates/core', version = '0.33.0' }
wit-bindgen-c = { path = 'crates/c', version = '0.33.0' }
Expand Down
2 changes: 1 addition & 1 deletion crates/c/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1778,7 +1778,7 @@ impl InterfaceGenerator<'_> {
self.src.c_fns("\n");

let core_module_name = interface_name.map(|s| self.resolve.name_world_key(s));
let export_name = func.core_export_name(core_module_name.as_deref());
let export_name = func.legacy_core_export_name(core_module_name.as_deref());

// Print the actual header for this function into the header file, and
// it's what we'll be calling.
Expand Down
2 changes: 1 addition & 1 deletion crates/csharp/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1226,7 +1226,7 @@ impl InterfaceGenerator<'_> {

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

uwrite!(
Expand Down
2 changes: 1 addition & 1 deletion crates/moonbit/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ impl InterfaceGenerator<'_> {

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

let export_name = func.core_export_name(interface_name);
let export_name = func.legacy_core_export_name(interface_name);

let mut toplevel_generator =
self.gen
Expand Down
2 changes: 1 addition & 1 deletion crates/rust/src/interface.rs
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ macro_rules! {macro_name} {{
Identifier::World(_) => None,
};
let export_prefix = self.gen.opts.export_prefix.as_deref().unwrap_or("");
let export_name = func.core_export_name(wasm_module_export_name.as_deref());
let export_name = func.legacy_core_export_name(wasm_module_export_name.as_deref());
uwrite!(
self.src,
"\
Expand Down
2 changes: 1 addition & 1 deletion crates/teavm-java/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ impl InterfaceGenerator<'_> {
fn export(&mut self, interface_name: Option<&str>, func: &Function) {
let sig = self.resolve.wasm_signature(AbiVariant::GuestExport, func);

let export_name = func.core_export_name(interface_name);
let export_name = func.legacy_core_export_name(interface_name);

let mut bindgen = FunctionBindgen::new(
self,
Expand Down
4 changes: 2 additions & 2 deletions crates/test-helpers/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::process::Command;
use wasm_encoder::{Encode, Section};
use wit_bindgen_core::Files;
use wit_component::StringEncoding;
use wit_parser::{Resolve, WorldId};
use wit_parser::{Mangling, Resolve, WorldId};

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

0 comments on commit 218d347

Please sign in to comment.