Update to Wasmtime 19 (bytecodealliance#901)

* Update to Wasmtime 19

* Remove drop that shouldn't be there

Author: alexcrichton

Cargo.lock

@@ -26,7 +26,6 @@ bitflags = "2.3.3"
 heck = { version = "0.4", features = ["unicode"] }
 pulldown-cmark = { version = "0.9", default-features = false }
 clap = { version = "4.3.19", features = ["derive"] }
-env_logger = "0.10.0"
 indexmap = "2.0.0"
 
 wasmparser = "0.201.0"
@@ -80,8 +79,8 @@ csharp-mono = ['csharp']
 
 [dev-dependencies]
 heck = { workspace = true }
-wasmtime = { version = "17.0.0", features = ['component-model'] }
-wasmtime-wasi =  { version = "17.0.0" }
+wasmtime = { version = "19.0.0", features = ['component-model'] }
+wasmtime-wasi =  { version = "19.0.0" }
 test-artifacts = { path = 'crates/test-rust-wasm/artifacts' }
 wit-parser = { workspace = true }
 wasmparser = { workspace = true }

Cargo.toml

@@ -9,7 +9,7 @@ use std::{env, fs};
 use wasm_encoder::{Encode, Section};
 use wasmtime::component::{Component, Instance, Linker, ResourceTable};
 use wasmtime::{Config, Engine, Store, Table};
-use wasmtime_wasi::preview2::{WasiCtx, WasiCtxBuilder, WasiView};
+use wasmtime_wasi::{WasiCtx, WasiCtxBuilder, WasiView};
 use wit_component::{ComponentEncoder, StringEncoding};
 use wit_parser::{Resolve, WorldId, WorldItem};
 
@@ -46,16 +46,10 @@ struct Wasi<T: Send>(T, MyCtx, ResourceTable, WasiCtx);
 
 // wasi trait
 impl<T: Send> WasiView for Wasi<T> {
-    fn table(&self) -> &ResourceTable {
-        &self.2
-    }
-    fn table_mut(&mut self) -> &mut ResourceTable {
+    fn table(&mut self) -> &mut ResourceTable {
         &mut self.2
     }
-    fn ctx(&self) -> &WasiCtx {
-        &self.3
-    }
-    fn ctx_mut(&mut self) -> &mut WasiCtx {
+    fn ctx(&mut self) -> &mut WasiCtx {
         &mut self.3
     }
 }
@@ -106,7 +100,7 @@ where
 
         let mut store = Store::new(&engine, data);
 
-        wasmtime_wasi::preview2::command::sync::add_to_linker(&mut linker)?;
+        wasmtime_wasi::command::sync::add_to_linker(&mut linker)?;
 
         let (exports, _) = instantiate(&mut store, &component, &linker)?;
 

tests/runtime/main.rs

@@ -2,7 +2,7 @@ use wasmtime::Store;
 
 wasmtime::component::bindgen!(in "tests/runtime/resource_borrow_export");
 
-use exports::test::resource_borrow_export::test::Test;
+use exports::test::resource_borrow_export::test::Guest;
 
 #[test]
 fn run() -> anyhow::Result<()> {
@@ -17,7 +17,7 @@ fn run() -> anyhow::Result<()> {
     )
 }
 
-fn run_test(instance: Test, store: &mut Store<crate::Wasi<()>>) -> anyhow::Result<()> {
+fn run_test(instance: Guest, store: &mut Store<crate::Wasi<()>>) -> anyhow::Result<()> {
     let thing = instance.thing().call_constructor(&mut *store, 42)?;
     let res = instance.call_foo(&mut *store, thing)?;
     assert_eq!(res, 42 + 1 + 2);

tests/runtime/resource_borrow_export.rs

@@ -5,7 +5,7 @@ use self::{
     exports::test::resource_borrow_in_record::test::Foo as ImportFoo,
     test::resource_borrow_in_record::test::{Foo as HostFoo, Host as TestHost, HostThing, Thing},
 };
-use crate::resource_borrow_in_record::exports::test::resource_borrow_in_record::test::Test;
+use crate::resource_borrow_in_record::exports::test::resource_borrow_in_record::test::Guest;
 
 wasmtime::component::bindgen!(in "tests/runtime/resource_borrow_in_record");
 
@@ -70,7 +70,7 @@ fn run() -> anyhow::Result<()> {
     )
 }
 
-fn run_test(instance: Test, store: &mut Store<crate::Wasi<MyHostThing>>) -> anyhow::Result<()> {
+fn run_test(instance: Guest, store: &mut Store<crate::Wasi<MyHostThing>>) -> anyhow::Result<()> {
     let thing1 = instance.thing().call_constructor(&mut *store, "Bonjour")?;
     let thing2 = instance.thing().call_constructor(&mut *store, "mon cher")?;
     let foo1 = ImportFoo { thing: thing1 };

tests/runtime/resource_borrow_in_record.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use wasmtime::{component::Resource, Result, Store};
 
 use self::test::resource_import_and_export::test::{Host, HostThing};
-use crate::resource_import_and_export::exports::test::resource_import_and_export::test::Test;
+use crate::resource_import_and_export::exports::test::resource_import_and_export::test::Guest;
 
 wasmtime::component::bindgen!(in "tests/runtime/resource_import_and_export");
 
@@ -65,7 +65,7 @@ fn run() -> anyhow::Result<()> {
     )
 }
 
-fn run_test(instance: Test, store: &mut Store<crate::Wasi<MyHostThing>>) -> anyhow::Result<()> {
+fn run_test(instance: Guest, store: &mut Store<crate::Wasi<MyHostThing>>) -> anyhow::Result<()> {
     let thing1 = instance.thing().call_constructor(&mut *store, 42)?;
 
     // 42 + 1 (constructor) + 1 (constructor) + 2 (foo) + 2 (foo)

tests/runtime/resource_import_and_export.rs

@@ -2,7 +2,7 @@ use wasmtime::Store;
 
 wasmtime::component::bindgen!(in "tests/runtime/resource_into_inner");
 
-use exports::test::resource_into_inner::test::Test;
+use exports::test::resource_into_inner::test::Guest;
 
 #[test]
 fn run() -> anyhow::Result<()> {
@@ -17,6 +17,6 @@ fn run() -> anyhow::Result<()> {
     )
 }
 
-fn run_test(instance: Test, store: &mut Store<crate::Wasi<()>>) -> anyhow::Result<()> {
+fn run_test(instance: Guest, store: &mut Store<crate::Wasi<()>>) -> anyhow::Result<()> {
     instance.call_test(&mut *store)
 }

tests/runtime/resource_into_inner.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use wasmtime::{component::Resource, Store};
 
 use self::test::resource_with_lists::test::{Host, HostThing, Thing};
-use crate::resource_with_lists::exports::test::resource_with_lists::test::Test;
+use crate::resource_with_lists::exports::test::resource_with_lists::test::Guest;
 
 wasmtime::component::bindgen!(in "tests/runtime/resource_with_lists");
 
@@ -65,7 +65,7 @@ fn run() -> anyhow::Result<()> {
     )
 }
 
-fn run_test(exports: Test, store: &mut Store<crate::Wasi<MyHostThing>>) -> anyhow::Result<()> {
+fn run_test(exports: Guest, store: &mut Store<crate::Wasi<MyHostThing>>) -> anyhow::Result<()> {
     let thing = exports.thing();
 
     let hi_encoded = "Hi".as_bytes().to_vec();

tests/runtime/resource_with_lists.rs

@@ -9,7 +9,7 @@ use imports::Y;
 use wasmtime::component::Resource;
 use wasmtime::Store;
 
-use self::exports::exports::Exports;
+use self::exports::exports::Guest;
 use self::imports::Host;
 
 #[derive(Default)]
@@ -71,7 +71,7 @@ fn run() -> Result<()> {
     )
 }
 
-fn run_test(exports: Exports, store: &mut Store<crate::Wasi<MyImports>>) -> Result<()> {
+fn run_test(exports: Guest, store: &mut Store<crate::Wasi<MyImports>>) -> Result<()> {
     let _ = exports.call_test_imports(&mut *store)?;
 
     let x = exports.x();
@@ -94,7 +94,6 @@ fn run_test(exports: Exports, store: &mut Store<crate::Wasi<MyImports>>) -> Resu
 
     let dropped_zs_start = z.call_num_dropped(&mut *store)?;
 
-    ResourceAny::resource_drop(x_instance, &mut *store)?;
     ResourceAny::resource_drop(z_instance_1, &mut *store)?;
     ResourceAny::resource_drop(z_instance_2, &mut *store)?;