Update wasm-tools crates (#1117)

* Update wasm-tools crates Bringing then up-to-date with latest * Fix compile of tests
bytecodealliance · Jan 8, 2025 · e067c16 · e067c16
1 parent 3f6096b
commit e067c16
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 53 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,11 +33,11 @@ prettyplease = "0.2.20"
 syn = { version = "2.0.89", features = ["printing"] }
 futures = "0.3.31"
 
-wasmparser = "0.222.0"
-wasm-encoder = "0.222.0"
-wasm-metadata = "0.222.0"
-wit-parser = "0.222.0"
-wit-component = "0.222.0"
+wasmparser = "0.223.0"
+wasm-encoder = "0.223.0"
+wasm-metadata = "0.223.0"
+wit-parser = "0.223.0"
+wit-component = "0.223.0"
 
 wit-bindgen-core = { path = 'crates/core', version = '0.36.0' }
 wit-bindgen-c = { path = 'crates/c', version = '0.36.0' }

diff --git a/crates/csharp/src/world_generator.rs b/crates/csharp/src/world_generator.rs
@@ -702,20 +702,20 @@ impl WorldGenerator for CSharp {
                     )?)?;
                 let pkg = resolve.worlds[world].package.unwrap();
 
+                let mut printer = WitPrinter::default();
+                printer.emit_docs(false);
+                printer.print(
+                    &resolve,
+                    pkg,
+                    &resolve
+                        .packages
+                        .iter()
+                        .filter_map(|(id, _)| if id == pkg { None } else { Some(id) })
+                        .collect::<Vec<_>>(),
+                )?;
                 files.push(
                     &format!("{world_namespace}_component_type.wit"),
-                    WitPrinter::default()
-                        .emit_docs(false)
-                        .print(
-                            &resolve,
-                            pkg,
-                            &resolve
-                                .packages
-                                .iter()
-                                .filter_map(|(id, _)| if id == pkg { None } else { Some(id) })
-                                .collect::<Vec<_>>(),
-                        )?
-                        .as_bytes(),
+                    String::from(printer.output).as_bytes(),
                 );
             }
 

diff --git a/crates/test-helpers/src/lib.rs b/crates/test-helpers/src/lib.rs
@@ -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::{Mangling, Resolve, WorldId};
+use wit_parser::{ManglingAndAbi, Resolve, WorldId};
 
 /// Returns a suitable directory to place output for tests within.
 ///
@@ -97,7 +97,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, Mangling::Standard32);
+    let mut wasm = wit_component::dummy_module(&resolve, world, ManglingAndAbi::Standard32);
     let encoded =
         wit_component::metadata::encode(&resolve, world, StringEncoding::UTF8, None).unwrap();
     let section = wasm_encoder::CustomSection {