Merge pull request #2291 from fermyon/wasmtime-18

Upgrade to wasmtime 18

Cargo.toml

@@ -115,11 +115,7 @@ llm-metal = ["llm", "spin-trigger-http/llm-metal"]
 llm-cublas = ["llm", "spin-trigger-http/llm-cublas"]
 
 [workspace]
-members = [
-  "crates/*",
-  "tests/runtime-tests",
-  "tests/testing-framework",
-]
+members = ["crates/*", "tests/runtime-tests", "tests/testing-framework"]
 
 [workspace.dependencies]
 anyhow = "1.0.75"
@@ -128,12 +124,10 @@ hyper = { version = "1.0.0", features = ["full"] }
 reqwest = { version = "0.11", features = ["stream", "blocking"] }
 tracing = { version = "0.1", features = ["log"] }
 
-wasi-common-preview1 = { version = "17.0.1", package = "wasi-common" }
-wasmtime = "17.0.1"
-wasmtime-wasi = { version = "17.0.1", features = [
-  "tokio",
-] }
-wasmtime-wasi-http = "17.0.1"
+wasi-common-preview1 = { version = "18.0.1", package = "wasi-common" }
+wasmtime = "18.0.1"
+wasmtime-wasi = { version = "18.0.1", features = ["tokio"] }
+wasmtime-wasi-http = "18.0.1"
 
 spin-componentize = { git = "https://github.com/fermyon/spin-componentize", rev = "191789170abde10cd55590466c0660dd6c7d472a" }
 

crates/core/src/lib.rs

@@ -171,22 +171,11 @@ impl<T> AsMut<T> for Data<T> {
 }
 
 impl<T: Send> wasmtime_wasi::preview2::WasiView for Data<T> {
-    fn table(&self) -> &ResourceTable {
-        &self.table
-    }
-
-    fn table_mut(&mut self) -> &mut ResourceTable {
+    fn table(&mut self) -> &mut ResourceTable {
         &mut self.table
     }
 
-    fn ctx(&self) -> &wasmtime_wasi::preview2::WasiCtx {
-        match &self.wasi {
-            Wasi::Preview1(_) => panic!("using WASI Preview 1 functions with Preview 2 store"),
-            Wasi::Preview2 { wasi_ctx, .. } => wasi_ctx,
-        }
-    }
-
-    fn ctx_mut(&mut self) -> &mut wasmtime_wasi::preview2::WasiCtx {
+    fn ctx(&mut self) -> &mut wasmtime_wasi::preview2::WasiCtx {
         match &mut self.wasi {
             Wasi::Preview1(_) => panic!("using WASI Preview 1 functions with Preview 2 store"),
             Wasi::Preview2 { wasi_ctx, .. } => wasi_ctx,

crates/core/src/wasi_2023_10_18.rs

@@ -1284,7 +1284,7 @@ impl UdpSocket {
         socket: &Resource<UdpSocket>,
         explicit: bool,
     ) -> wasmtime::Result<Result<(), SocketErrorCode>> {
-        let state = table.table_mut().get_mut(socket)?;
+        let state = table.table().get_mut(socket)?;
         let (new_socket, addr) = match mem::replace(state, UdpSocket::Dummy) {
             // Implicit finishes will call `stream` for sockets in the initial
             // state.
@@ -1305,7 +1305,7 @@ impl UdpSocket {
             Ok(pair) => pair,
             Err(e) => return Ok(Err(e)),
         };
-        *table.table_mut().get_mut(socket)? = UdpSocket::Connected {
+        *table.table().get_mut(socket)? = UdpSocket::Connected {
             socket: new_socket,
             incoming,
             outgoing,
@@ -1359,7 +1359,7 @@ where
         _network: Resource<Network>,
         remote_address: IpSocketAddress,
     ) -> wasmtime::Result<Result<(), SocketErrorCode>> {
-        let socket = self.table_mut().get_mut(&self_)?;
+        let socket = self.table().get_mut(&self_)?;
         let (new_state, result) = match mem::replace(socket, UdpSocket::Dummy) {
             UdpSocket::Initial(socket) => (UdpSocket::Connecting(socket, remote_address), Ok(())),
             other => (other, Err(SocketErrorCode::ConcurrencyConflict)),
@@ -1563,7 +1563,7 @@ where
     }
 
     fn drop(&mut self, rep: Resource<UdpSocket>) -> wasmtime::Result<()> {
-        let me = self.table_mut().delete(rep)?;
+        let me = self.table().delete(rep)?;
         let socket = match me {
             UdpSocket::Initial(s) => s,
             UdpSocket::Connecting(s, _) => s,
@@ -1600,7 +1600,7 @@ where
             Ok(socket) => socket,
             Err(e) => return Ok(Err(e)),
         };
-        let socket = self.table_mut().push(UdpSocket::Initial(socket))?;
+        let socket = self.table().push(UdpSocket::Initial(socket))?;
         Ok(Ok(socket))
     }
 }
@@ -2185,7 +2185,7 @@ where
         Ok(e) => Ok(Ok(e.into())),
         Err(wasmtime_wasi::preview2::StreamError::Closed) => Ok(Err(StreamError::Closed)),
         Err(wasmtime_wasi::preview2::StreamError::LastOperationFailed(e)) => {
-            let e = view.table_mut().push(e)?;
+            let e = view.table().push(e)?;
             Ok(Err(StreamError::LastOperationFailed(e)))
         }
         Err(wasmtime_wasi::preview2::StreamError::Trap(e)) => Err(e),

crates/core/src/wasi_2023_11_10.rs

@@ -665,7 +665,7 @@ where
         Ok(e) => Ok(Ok(e.into())),
         Err(wasmtime_wasi::preview2::StreamError::Closed) => Ok(Err(StreamError::Closed)),
         Err(wasmtime_wasi::preview2::StreamError::LastOperationFailed(e)) => {
-            let e = view.table_mut().push(e)?;
+            let e = view.table().push(e)?;
             Ok(Err(StreamError::LastOperationFailed(e)))
         }
         Err(wasmtime_wasi::preview2::StreamError::Trap(e)) => Err(e),

crates/trigger-http/src/handler.rs

@@ -9,8 +9,8 @@ use http_body_util::BodyExt;
 use hyper::{Request, Response};
 use outbound_http::OutboundHttpComponent;
 use spin_core::async_trait;
-use spin_core::wasi_2023_10_18::exports::wasi::http::incoming_handler::IncomingHandler as IncomingHandler2023_10_18;
-use spin_core::wasi_2023_11_10::exports::wasi::http::incoming_handler::IncomingHandler as IncomingHandler2023_11_10;
+use spin_core::wasi_2023_10_18::exports::wasi::http::incoming_handler::Guest as IncomingHandler2023_10_18;
+use spin_core::wasi_2023_11_10::exports::wasi::http::incoming_handler::Guest as IncomingHandler2023_11_10;
 use spin_core::Instance;
 use spin_http::body;
 use spin_trigger::{EitherInstance, TriggerAppEngine};