Update wasm-tools/wasmtime dependencies (#823)

* Update wasm-tools/wasmtime dependencies

Bring them all up to their latest

* Fix some test code

* More test fixes

* Update wasi adapter

Author: alexcrichton

Cargo.lock

@@ -28,10 +28,10 @@ clap = { version = "4.3.19", features = ["derive"] }
 env_logger = "0.10.0"
 indexmap = "2.0.0"
 
-wasm-encoder = "0.39.0"
-wasm-metadata = "0.10.15"
+wasm-encoder = "0.40.0"
+wasm-metadata = "0.10.16"
 wit-parser = "0.13.1"
-wit-component = "0.19.1"
+wit-component = "0.20.0"
 
 wit-bindgen-core = { path = 'crates/core', version = '0.16.0' }
 wit-bindgen-c = { path = 'crates/c', version = '0.16.0' }
@@ -78,8 +78,8 @@ csharp-mono = ['csharp']
 
 [dev-dependencies]
 heck = { workspace = true }
-wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", features = ['component-model'] }
-wasmtime-wasi =  { git = "https://github.com/bytecodealliance/wasmtime"}
+wasmtime = { version = "17.0.0", features = ['component-model'] }
+wasmtime-wasi =  { version = "17.0.0" }
 test-artifacts = { path = 'crates/test-rust-wasm/artifacts' }
 wit-parser = { workspace = true }
 wasmparser = "0.118.0"

Cargo.toml

@@ -40,8 +40,7 @@ pub fn object(
         env!("CARGO_PKG_NAME"),
         env!("CARGO_PKG_VERSION"),
     );
-    let data =
-        wit_component::metadata::encode(resolve, world, encoding, Some(&producers), None).unwrap();
+    let data = wit_component::metadata::encode(resolve, world, encoding, Some(&producers)).unwrap();
 
     // The custom section name here must start with "component-type" but
     // otherwise is attempted to be unique here to ensure that this doesn't get

crates/c/src/component_type_object.rs

@@ -32,8 +32,7 @@ pub fn object(resolve: &Resolve, world: WorldId, encoding: StringEncoding) -> Re
         env!("CARGO_PKG_NAME"),
         env!("CARGO_PKG_VERSION"),
     );
-    let data =
-        wit_component::metadata::encode(resolve, world, encoding, Some(&producers), None).unwrap();
+    let data = wit_component::metadata::encode(resolve, world, encoding, Some(&producers)).unwrap();
 
     // The custom section name here must start with "component-type" but
     // otherwise is attempted to be unique here to ensure that this doesn't get

crates/csharp/src/component_type_object.rs

@@ -488,7 +488,6 @@ impl WorldGenerator for RustWasm {
             world,
             wit_component::StringEncoding::UTF8,
             Some(&producers),
-            None,
         )
         .unwrap();
 

crates/rust/src/lib.rs

@@ -218,7 +218,6 @@ impl WorldGenerator for TeaVmJava {
             id,
             wit_component::StringEncoding::UTF8,
             Some(&producers),
-            None,
         )
         .unwrap();
 

crates/teavm-java/src/lib.rs

@@ -91,7 +91,7 @@ pub fn run_component_codegen_test(
     let world_name = &resolve.worlds[world].name;
     let mut wasm = wit_component::dummy_module(&resolve, world);
     let encoded =
-        wit_component::metadata::encode(&resolve, world, StringEncoding::UTF8, None, None).unwrap();
+        wit_component::metadata::encode(&resolve, world, StringEncoding::UTF8, None).unwrap();
     let section = wasm_encoder::CustomSection {
         name: std::borrow::Cow::Borrowed("component-type"),
         data: std::borrow::Cow::Borrowed(&encoded),

crates/test-helpers/src/lib.rs

@@ -313,8 +313,7 @@ fn tests(name: &str, dir_name: &str) -> Result<Vec<PathBuf>> {
         // Translate the canonical ABI module into a component.
 
         let mut module = fs::read(&out_wasm).expect("failed to read wasm file");
-        let encoded =
-            wit_component::metadata::encode(&resolve, world, StringEncoding::UTF8, None, None)?;
+        let encoded = wit_component::metadata::encode(&resolve, world, StringEncoding::UTF8, None)?;
 
         let section = wasm_encoder::CustomSection {
             name: Cow::Borrowed("component-type"),