Update to Wasmtime 41.0.0

Cargo.toml

@@ -178,19 +178,24 @@ tracing = { version = "0.1.41", features = ["log"] }
 url = "2.5.7"
 walkdir = "2"
 wac-graph = "0.8.1"
-wasm-encoder = "0.243.0"
-wasm-metadata = "0.243.0"
+wasm-encoder = "0.244.0"
+wasm-metadata = "0.244.0"
 wasm-pkg-client = "0.11"
 wasm-pkg-common = "0.11"
-wasmparser = "0.243.0"
-wasmtime = { version = "40.0.0", features = ["component-model-async"] }
-wasmtime-wasi = { version = "40.0.0", features = ["p3"] }
-wasmtime-wasi-http = { version = "40.0.0", features = ["p3", "component-model-async"] }
-wit-component = "0.243.0"
-wit-parser = "0.243.0"
+wasmparser = "0.244.0"
+wasmtime = { version = "41.0.0", features = ["component-model-async"] }
+wasmtime-wasi = { version = "41.0.0", features = ["p3"] }
+wasmtime-wasi-http = { version = "41.0.0", features = ["p3", "component-model-async"] }
+wit-component = "0.244.0"
+wit-parser = "0.244.0"
 
 spin-componentize = { path = "crates/componentize" }
 
+[patch.crates-io]
+wasmtime = { git = 'https://github.com/alexcrichton/wasmtime', branch = 'another-backport' }
+wasmtime-wasi = { git = 'https://github.com/alexcrichton/wasmtime', branch = 'another-backport' }
+wasmtime-wasi-http = { git = 'https://github.com/alexcrichton/wasmtime', branch = 'another-backport' }
+
 [workspace.lints.clippy]
 # TODO: Remove this once https://github.com/rust-lang/rust-clippy/issues/12281 is resolved
 blocks_in_conditions = "allow"

crates/componentize/src/lib.rs

@@ -188,7 +188,7 @@ fn retarget_imports_and_get_exports(target: &str, module: &[u8]) -> Result<(Vec<
         match payload? {
             Payload::ImportSection(reader) => {
                 let mut imports = ImportSection::new();
-                for import in reader {
+                for import in reader.into_imports() {
                     let import = import?;
                     let (module, field) = if import.module == target {
                         (Cow::Borrowed(import.module), Cow::Borrowed(import.name))

crates/factor-outbound-http/src/wasi.rs

@@ -251,7 +251,7 @@ where
     }
 
     let get_http_p3 = get_http_p3::<C> as fn(&mut C::StoreData) -> p3::WasiHttpCtxView<'_>;
-    p3::bindings::http::handler::add_to_linker::<_, p3::WasiHttp>(linker, get_http_p3)?;
+    p3::bindings::http::client::add_to_linker::<_, p3::WasiHttp>(linker, get_http_p3)?;
     p3::bindings::http::types::add_to_linker::<_, p3::WasiHttp>(linker, get_http_p3)?;
 
     wasi_2023_10_18::add_to_linker(linker, get_http)?;

crates/factor-wasi/src/lib.rs

@@ -240,7 +240,9 @@ impl Factor for WasiFactor {
         use wasmtime_wasi::{p2, p3};
 
         ctx.link_clocks_bindings(p2::bindings::clocks::wall_clock::add_to_linker::<_, WasiClocks>)?;
-        ctx.link_clocks_bindings(p3::bindings::clocks::wall_clock::add_to_linker::<_, WasiClocks>)?;
+        ctx.link_clocks_bindings(
+            p3::bindings::clocks::system_clock::add_to_linker::<_, WasiClocks>,
+        )?;
         ctx.link_clocks_bindings(
             p2::bindings::clocks::monotonic_clock::add_to_linker::<_, WasiClocks>,
         )?;

crates/http/src/trigger.rs

@@ -5,7 +5,7 @@ use wasmtime::component::InstancePre;
 use wasmtime_wasi::p2::bindings::CommandIndices;
 use wasmtime_wasi_http::bindings::ProxyIndices;
 use wasmtime_wasi_http::handler::{HandlerState, ProxyHandler, ProxyPre};
-use wasmtime_wasi_http::p3::bindings::ProxyPre as P3ProxyPre;
+use wasmtime_wasi_http::p3::bindings::ServicePre as P3ProxyPre;
 
 use crate::config::HttpExecutorType;