Merge pull request #3005 from alexcrichton/update-wasmtime

Update Wasmtime to 29.0.1

Author: lann

Cargo.lock

@@ -151,9 +151,9 @@ wasi-common-preview1 = { version = "25.0.0", package = "wasi-common", features =
 ] }
 wasm-pkg-common = "0.8"
 wasm-pkg-client = "0.8"
-wasmtime = "25.0.3"
-wasmtime-wasi = "25.0.0"
-wasmtime-wasi-http = "25.0.0"
+wasmtime = "29.0.1"
+wasmtime-wasi = "29.0.1"
+wasmtime-wasi-http = "29.0.1"
 
 spin-componentize = { path = "crates/componentize" }
 

Cargo.toml

@@ -1,17 +1,13 @@
 use super::{config, Context, TestConfig};
 use anyhow::{ensure, Result};
 use std::collections::HashMap;
-use wasmtime::{
-    component::{InstancePre, __internal::async_trait},
-    Engine,
-};
+use wasmtime::{component::InstancePre, Engine};
 
 #[derive(Default)]
 pub(super) struct Config {
     map: HashMap<String, String>,
 }
 
-#[async_trait]
 impl config::Host for Config {
     async fn get_config(&mut self, key: String) -> Result<Result<String, config::Error>> {
         Ok(self

crates/componentize/src/abi_conformance/test_config.rs

@@ -4,7 +4,6 @@ use super::{
     Context, TestConfig,
 };
 use anyhow::{ensure, Result};
-use async_trait::async_trait;
 use std::collections::HashMap;
 use wasmtime::{component::InstancePre, Engine};
 
@@ -13,7 +12,6 @@ pub(crate) struct Http {
     map: HashMap<String, String>,
 }
 
-#[async_trait]
 impl http::Host for Http {
     async fn send_request(&mut self, req: Request) -> Result<Result<Response, HttpError>> {
         Ok(self

crates/componentize/src/abi_conformance/test_http.rs

@@ -3,7 +3,6 @@ use super::{
     Context, TestConfig,
 };
 use anyhow::{anyhow, ensure, Result};
-use async_trait::async_trait;
 use serde::Serialize;
 use std::{
     collections::{HashMap, HashSet},
@@ -34,7 +33,6 @@ pub(crate) struct KeyValue {
     close_set: HashSet<KvStore>,
 }
 
-#[async_trait]
 impl key_value::Host for KeyValue {
     async fn open(&mut self, name: String) -> Result<Result<KvStore, Error>> {
         Ok(self.open_map.remove(&name).ok_or_else(|| {

crates/componentize/src/abi_conformance/test_key_value.rs

@@ -1,7 +1,6 @@
 use std::collections::HashMap;
 
 use anyhow::{ensure, Result};
-use async_trait::async_trait;
 use serde::Serialize;
 
 use super::llm;
@@ -18,7 +17,6 @@ pub struct Llm {
     embeddings: HashMap<(String, Vec<String>), Vec<Vec<f32>>>,
 }
 
-#[async_trait]
 impl llm::Host for Llm {
     async fn infer(
         &mut self,

crates/componentize/src/abi_conformance/test_llm.rs

@@ -4,7 +4,6 @@ use super::{
     Context, TestConfig,
 };
 use anyhow::{ensure, Result};
-use async_trait::async_trait;
 use serde::Serialize;
 use std::{
     collections::{HashMap, HashSet},
@@ -40,7 +39,6 @@ pub(crate) struct Mysql {
     query_map: HashMap<(String, String, String), RowSet>,
 }
 
-#[async_trait]
 impl mysql::Host for Mysql {
     async fn execute(
         &mut self,

crates/componentize/src/abi_conformance/test_mysql.rs

@@ -4,7 +4,6 @@ use super::{
     Context, TestConfig,
 };
 use anyhow::{ensure, Result};
-use async_trait::async_trait;
 use serde::Serialize;
 use std::{collections::HashMap, iter};
 use wasmtime::{component::InstancePre, Engine};
@@ -37,7 +36,6 @@ pub(crate) struct Postgres {
     query_map: HashMap<(String, String, String), RowSet>,
 }
 
-#[async_trait]
 impl postgres::Host for Postgres {
     async fn execute(
         &mut self,

crates/componentize/src/abi_conformance/test_postgres.rs

@@ -3,7 +3,6 @@ use super::{
     Context, TestConfig,
 };
 use anyhow::{ensure, Result};
-use async_trait::async_trait;
 use serde::Serialize;
 use std::collections::{HashMap, HashSet};
 use wasmtime::{component::InstancePre, Engine};
@@ -103,7 +102,6 @@ pub(crate) struct Redis {
     execute_map: HashMap<(String, String, Vec<Vec<u8>>), Vec<RedisResult>>,
 }
 
-#[async_trait]
 impl redis::Host for Redis {
     async fn publish(
         &mut self,

crates/componentize/src/abi_conformance/test_redis.rs

@@ -108,7 +108,7 @@ impl Default for Config {
                 )
                 .max_core_instances_per_component(env("SPIN_WASMTIME_CORE_INSTANCE_COUNT", 200))
                 .max_tables_per_component(env("SPIN_WASMTIME_INSTANCE_TABLES", 20))
-                .table_elements(env("SPIN_WASMTIME_INSTANCE_TABLE_ELEMENTS", 100_000))
+                .table_elements(env("SPIN_WASMTIME_INSTANCE_TABLE_ELEMENTS", 100_000) as usize)
                 // The number of memories an instance can have effectively limits the number of inner components
                 // a composed component can have (since each inner component has its own memory). We default to 32 for now, and
                 // we'll see how often this limit gets reached.
@@ -175,7 +175,7 @@ fn use_pooling_allocator_by_default() -> bool {
         // If the env var isn't set then perform the dynamic runtime probe
         let mut config = wasmtime::Config::new();
         config.wasm_memory64(true);
-        config.static_memory_maximum_size(1 << BITS_TO_TEST);
+        config.memory_reservation(1 << BITS_TO_TEST);
 
         match wasmtime::Engine::new(&config) {
             Ok(engine) => {