A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Fix compile on latest Rust nightly (#14193)
Alex Crichton30dddb65568a
diff --git a/.github/actions/install-rust/action.yml b/.github/actions/install-rust/action.ymlindex ba79b3d8d4..10284df9d6 100644--- a/.github/actions/install-rust/action.yml+++ b/.github/actions/install-rust/action.yml@@ -32,7 +32,7 @@ runs:elif [ "${{ inputs.toolchain }}" = "msrv" ]; thenecho "version=1.$msrv.0" >> "$GITHUB_OUTPUT"elif [ "${{ inputs.toolchain }}" = "wasmtime-ci-pinned-nightly" ]; then- echo "version=nightly-2026-08-20" >> "$GITHUB_OUTPUT"+ echo "version=nightly-2026-08-24" >> "$GITHUB_OUTPUT"elif [ "${{ inputs.toolchain }}" = "wasmtime-ci-oss-fuzz-pin" ]; then# Do not change this number unless OSS-Fuzz has updated. If you update# this version and do not update OSS-Fuzz then you will break ourdiff --git a/crates/component-macro/tests/expanded/char_concurrent.rs b/crates/component-macro/tests/expanded/char_concurrent.rsindex 999e0a3ee7..52136ed0c8 100644--- a/crates/component-macro/tests/expanded/char_concurrent.rs+++ b/crates/component-macro/tests/expanded/char_concurrent.rs@@ -221,10 +221,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::take_char(host, arg0).await;Ok(r)})@@ -237,10 +237,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::return_char(host).await;Ok((r,))})diff --git a/crates/component-macro/tests/expanded/conventions_concurrent.rs b/crates/component-macro/tests/expanded/conventions_concurrent.rsindex 3634137dc4..be733fe5d1 100644--- a/crates/component-macro/tests/expanded/conventions_concurrent.rs+++ b/crates/component-macro/tests/expanded/conventions_concurrent.rs@@ -286,10 +286,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::kebab_case(host).await;Ok(r)})@@ -305,10 +305,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::foo(host, arg0).await;Ok(r)})@@ -321,10 +321,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::function_with_dashes(host).await;Ok(r)@@ -338,10 +338,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T,>>::function_with_no_weird_characters(host)@@ -357,10 +357,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::apple(host).await;Ok(r)})@@ -373,10 +373,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::apple_pear(host).await;Ok(r)})@@ -389,10 +389,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::apple_pear_grape(host).await;Ok(r)@@ -406,10 +406,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::a0(host).await;Ok(r)})@@ -422,10 +422,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::is_xml(host).await;Ok(r)})@@ -438,10 +438,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::explicit(host).await;Ok(r)})@@ -454,10 +454,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::explicit_kebab(host).await;Ok(r)})@@ -470,10 +470,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::bool(host).await;Ok(r)})diff --git a/crates/component-macro/tests/expanded/dead-code_concurrent.rs b/crates/component-macro/tests/expanded/dead-code_concurrent.rsindex 31a9723cab..6ddd1c2207 100644--- a/crates/component-macro/tests/expanded/dead-code_concurrent.rs+++ b/crates/component-macro/tests/expanded/dead-code_concurrent.rs@@ -228,10 +228,10 @@ pub mod a {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::f(host).await;Ok((r,))})diff --git a/crates/component-macro/tests/expanded/direct-import_concurrent.rs b/crates/component-macro/tests/expanded/direct-import_concurrent.rsindex 54be0cb145..f2a0738fa1 100644--- a/crates/component-macro/tests/expanded/direct-import_concurrent.rs+++ b/crates/component-macro/tests/expanded/direct-import_concurrent.rs@@ -185,10 +185,10 @@ const _: () = {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as FooImportsWithStore<T>>::foo(host).await;Ok(r)})diff --git a/crates/component-macro/tests/expanded/flags_concurrent.rs b/crates/component-macro/tests/expanded/flags_concurrent.rsindex 41452ddcf9..ff3eb8c6f6 100644--- a/crates/component-macro/tests/expanded/flags_concurrent.rs+++ b/crates/component-macro/tests/expanded/flags_concurrent.rs@@ -354,10 +354,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::roundtrip_flag1(host, arg0).await;Ok((r,))@@ -374,10 +374,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::roundtrip_flag2(host, arg0).await;Ok((r,))@@ -394,10 +394,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::roundtrip_flag4(host, arg0).await;Ok((r,))@@ -414,10 +414,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::roundtrip_flag8(host, arg0).await;Ok((r,))@@ -434,10 +434,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::roundtrip_flag16(host, arg0).await;Ok((r,))@@ -454,10 +454,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::roundtrip_flag32(host, arg0).await;Ok((r,))@@ -474,10 +474,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::roundtrip_flag64(host, arg0).await;Ok((r,))diff --git a/crates/component-macro/tests/expanded/floats_concurrent.rs b/crates/component-macro/tests/expanded/floats_concurrent.rsindex 6a2b8be8a4..add255684c 100644--- a/crates/component-macro/tests/expanded/floats_concurrent.rs+++ b/crates/component-macro/tests/expanded/floats_concurrent.rs@@ -225,10 +225,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::f32_param(host, arg0).await;Ok(r)})@@ -241,10 +241,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::f64_param(host, arg0).await;Ok(r)})@@ -257,10 +257,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::f32_result(host).await;Ok((r,))})@@ -273,10 +273,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::f64_result(host).await;Ok((r,))})diff --git a/crates/component-macro/tests/expanded/host-world_concurrent.rs b/crates/component-macro/tests/expanded/host-world_concurrent.rsindex bae345345a..6538cd0558 100644--- a/crates/component-macro/tests/expanded/host-world_concurrent.rs+++ b/crates/component-macro/tests/expanded/host-world_concurrent.rs@@ -185,10 +185,10 @@ const _: () = {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as Host_ImportsWithStore<T>>::foo(host).await;Ok(r)})diff --git a/crates/component-macro/tests/expanded/implements_concurrent.rs b/crates/component-macro/tests/expanded/implements_concurrent.rsindex 175d020e61..ca642374c0 100644--- a/crates/component-macro/tests/expanded/implements_concurrent.rs+++ b/crates/component-macro/tests/expanded/implements_concurrent.rs@@ -222,10 +222,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::get(host, arg0).await;Ok((r,))})@@ -247,10 +247,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::set(host, arg0, arg1).await;Ok(r)})diff --git a/crates/component-macro/tests/expanded/integers_concurrent.rs b/crates/component-macro/tests/expanded/integers_concurrent.rsindex 1c342b33a2..cd0cdf9726 100644--- a/crates/component-macro/tests/expanded/integers_concurrent.rs+++ b/crates/component-macro/tests/expanded/integers_concurrent.rs@@ -281,10 +281,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::a1(host, arg0).await;Ok(r)})@@ -297,10 +297,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::a2(host, arg0).await;Ok(r)})@@ -313,10 +313,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::a3(host, arg0).await;Ok(r)})@@ -329,10 +329,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::a4(host, arg0).await;Ok(r)})@@ -345,10 +345,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::a5(host, arg0).await;Ok(r)})@@ -361,10 +361,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::a6(host, arg0).await;Ok(r)})@@ -377,10 +377,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::a7(host, arg0).await;Ok(r)})@@ -393,10 +393,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::a8(host, arg0).await;Ok(r)})@@ -421,10 +421,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T,>>::a9(host, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7)@@ -440,10 +440,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::r1(host).await;Ok((r,))})@@ -456,10 +456,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::r2(host).await;Ok((r,))})@@ -472,10 +472,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::r3(host).await;Ok((r,))})@@ -488,10 +488,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::r4(host).await;Ok((r,))})@@ -504,10 +504,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::r5(host).await;Ok((r,))})@@ -520,10 +520,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::r6(host).await;Ok((r,))})@@ -536,10 +536,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::r7(host).await;Ok((r,))})@@ -552,10 +552,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::r8(host).await;Ok((r,))})@@ -568,10 +568,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::pair_ret(host).await;Ok((r,))})diff --git a/crates/component-macro/tests/expanded/lists_concurrent.rs b/crates/component-macro/tests/expanded/lists_concurrent.rsindex 1ffadfca08..44e7a6488a 100644--- a/crates/component-macro/tests/expanded/lists_concurrent.rs+++ b/crates/component-macro/tests/expanded/lists_concurrent.rs@@ -543,10 +543,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_u8_param(host, arg0).await;Ok(r)@@ -563,10 +563,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_u16_param(host, arg0).await;Ok(r)@@ -583,10 +583,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_u32_param(host, arg0).await;Ok(r)@@ -603,10 +603,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_u64_param(host, arg0).await;Ok(r)@@ -623,10 +623,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_s8_param(host, arg0).await;Ok(r)@@ -643,10 +643,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_s16_param(host, arg0).await;Ok(r)@@ -663,10 +663,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_s32_param(host, arg0).await;Ok(r)@@ -683,10 +683,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_s64_param(host, arg0).await;Ok(r)@@ -703,10 +703,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_f32_param(host, arg0).await;Ok(r)@@ -723,10 +723,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_f64_param(host, arg0).await;Ok(r)@@ -740,10 +740,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_u8_ret(host).await;Ok((r,))})@@ -756,10 +756,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_u16_ret(host).await;Ok((r,))})@@ -772,10 +772,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_u32_ret(host).await;Ok((r,))})@@ -788,10 +788,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_u64_ret(host).await;Ok((r,))})@@ -804,10 +804,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_s8_ret(host).await;Ok((r,))})@@ -820,10 +820,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_s16_ret(host).await;Ok((r,))})@@ -836,10 +836,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_s32_ret(host).await;Ok((r,))})@@ -852,10 +852,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_s64_ret(host).await;Ok((r,))})@@ -868,10 +868,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_f32_ret(host).await;Ok((r,))})@@ -884,10 +884,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_f64_ret(host).await;Ok((r,))})@@ -903,10 +903,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::tuple_list(host, arg0).await;Ok((r,))@@ -929,10 +929,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::string_list_arg(host, arg0).await;Ok(r)@@ -946,10 +946,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::string_list_ret(host).await;Ok((r,))})@@ -971,10 +971,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T,>>::tuple_string_list(host, arg0)@@ -999,10 +999,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::string_list(host, arg0).await;Ok((r,))@@ -1019,10 +1019,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::record_list(host, arg0).await;Ok((r,))@@ -1039,10 +1039,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T,>>::record_list_reverse(host, arg0)@@ -1061,10 +1061,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::variant_list(host, arg0).await;Ok((r,))@@ -1081,10 +1081,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T,>>::load_store_everything(host, arg0)diff --git a/crates/component-macro/tests/expanded/many-arguments_concurrent.rs b/crates/component-macro/tests/expanded/many-arguments_concurrent.rsindex 3bc59456f7..1cc0d09ba9 100644--- a/crates/component-macro/tests/expanded/many-arguments_concurrent.rs+++ b/crates/component-macro/tests/expanded/many-arguments_concurrent.rs@@ -352,10 +352,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T,>>::many_args(@@ -392,10 +392,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::big_argument(host, arg0).await;Ok(r)diff --git a/crates/component-macro/tests/expanded/multiversion_concurrent.rs b/crates/component-macro/tests/expanded/multiversion_concurrent.rsindex 08eeb156eb..29ce395f22 100644--- a/crates/component-macro/tests/expanded/multiversion_concurrent.rs+++ b/crates/component-macro/tests/expanded/multiversion_concurrent.rs@@ -224,10 +224,10 @@ pub mod my {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::x(host).await;Ok(r)})@@ -277,10 +277,10 @@ pub mod my {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::x(host).await;Ok(r)})diff --git a/crates/component-macro/tests/expanded/records_concurrent.rs b/crates/component-macro/tests/expanded/records_concurrent.rsindex ebaf81b5b3..3197ead3b6 100644--- a/crates/component-macro/tests/expanded/records_concurrent.rs+++ b/crates/component-macro/tests/expanded/records_concurrent.rs@@ -450,10 +450,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::tuple_arg(host, arg0).await;Ok(r)})@@ -466,10 +466,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::tuple_result(host).await;Ok((r,))})@@ -485,10 +485,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::empty_arg(host, arg0).await;Ok(r)})@@ -501,10 +501,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::empty_result(host).await;Ok((r,))})@@ -520,10 +520,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::scalar_arg(host, arg0).await;Ok(r)@@ -537,10 +537,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::scalar_result(host).await;Ok((r,))})@@ -556,10 +556,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::flags_arg(host, arg0).await;Ok(r)})@@ -572,10 +572,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::flags_result(host).await;Ok((r,))})@@ -591,10 +591,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::aggregate_arg(host, arg0).await;Ok(r)@@ -608,10 +608,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::aggregate_result(host).await;Ok((r,))@@ -628,10 +628,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::typedef_inout(host, arg0).await;Ok((r,))diff --git a/crates/component-macro/tests/expanded/rename_concurrent.rs b/crates/component-macro/tests/expanded/rename_concurrent.rsindex 188baee209..351ef26a80 100644--- a/crates/component-macro/tests/expanded/rename_concurrent.rs+++ b/crates/component-macro/tests/expanded/rename_concurrent.rs@@ -250,10 +250,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::foo(host).await;Ok((r,))})diff --git a/crates/component-macro/tests/expanded/resources-export_concurrent.rs b/crates/component-macro/tests/expanded/resources-export_concurrent.rsindex 2834aa19ea..23d1a162c3 100644--- a/crates/component-macro/tests/expanded/resources-export_concurrent.rs+++ b/crates/component-macro/tests/expanded/resources-export_concurrent.rs@@ -268,7 +268,7 @@ pub mod foo {wasmtime::component::ResourceType::host::<Y>(),move |caller: &wasmtime::component::Accessor<T>, rep| {wasmtime::component::__internal::Box::pin(async move {- let accessor = &caller.with_getter(host_getter);+ let accessor = &caller.with_getter::<D>(host_getter);wasmtime::ToWasmtimeResult::to_wasmtime_result(HostYWithStore::<T,diff --git a/crates/component-macro/tests/expanded/resources-import_concurrent.rs b/crates/component-macro/tests/expanded/resources-import_concurrent.rsindex 970878710c..03ba6bf80a 100644--- a/crates/component-macro/tests/expanded/resources-import_concurrent.rs+++ b/crates/component-macro/tests/expanded/resources-import_concurrent.rs@@ -259,7 +259,7 @@ const _: () = {wasmtime::component::ResourceType::host::<WorldResource>(),move |caller: &wasmtime::component::Accessor<T>, rep| {wasmtime::component::__internal::Box::pin(async move {- let accessor = &caller.with_getter(host_getter);+ let accessor = &caller.with_getter::<D>(host_getter);wasmtime::ToWasmtimeResult::to_wasmtime_result(HostWorldResourceWithStore::<T,@@ -280,10 +280,10 @@ const _: () = {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as TheWorldImportsWithStore<T,>>::some_world_func(host)@@ -300,10 +300,10 @@ const _: () = {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWorldResourceWithStore<T>>::new(host).await;Ok((r,))@@ -321,10 +321,10 @@ const _: () = {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWorldResourceWithStore<T>>::foo(host, arg0).await;Ok(r)@@ -339,10 +339,10 @@ const _: () = {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWorldResourceWithStore<T,>>::static_foo(host)@@ -629,7 +629,7 @@ pub mod foo {wasmtime::component::ResourceType::host::<Bar>(),move |caller: &wasmtime::component::Accessor<T>, rep| {wasmtime::component::__internal::Box::pin(async move {- let accessor = &caller.with_getter(host_getter);+ let accessor = &caller.with_getter::<D>(host_getter);wasmtime::ToWasmtimeResult::to_wasmtime_result(HostBarWithStore::<T,@@ -647,7 +647,7 @@ pub mod foo {wasmtime::component::ResourceType::host::<Fallible>(),move |caller: &wasmtime::component::Accessor<T>, rep| {wasmtime::component::__internal::Box::pin(async move {- let accessor = &caller.with_getter(host_getter);+ let accessor = &caller.with_getter::<D>(host_getter);wasmtime::ToWasmtimeResult::to_wasmtime_result(HostFallibleWithStore::<T,@@ -667,10 +667,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostBarWithStore<T>>::new(host).await;Ok((r,))})@@ -683,10 +683,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostBarWithStore<T>>::static_a(host).await;Ok((r,))})@@ -702,10 +702,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostBarWithStore<T>>::method_a(host, arg0).await;Ok((r,))@@ -722,10 +722,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::bar_own_arg(host, arg0).await;Ok(r)@@ -742,10 +742,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::bar_borrow_arg(host, arg0).await;Ok(r)@@ -759,10 +759,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::bar_result(host).await;Ok((r,))})@@ -778,10 +778,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::tuple_own_arg(host, arg0).await;Ok(r)@@ -798,10 +798,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::tuple_borrow_arg(host, arg0).await;Ok(r)@@ -815,10 +815,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::tuple_result(host).await;Ok((r,))})@@ -834,10 +834,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::option_own_arg(host, arg0).await;Ok(r)@@ -854,10 +854,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T,>>::option_borrow_arg(host, arg0)@@ -873,10 +873,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::option_result(host).await;Ok((r,))})@@ -892,10 +892,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::result_own_arg(host, arg0).await;Ok(r)@@ -912,10 +912,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T,>>::result_borrow_arg(host, arg0)@@ -931,10 +931,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::result_result(host).await;Ok((r,))})@@ -956,10 +956,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_own_arg(host, arg0).await;Ok(r)@@ -982,10 +982,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_borrow_arg(host, arg0).await;Ok(r)@@ -999,10 +999,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::list_result(host).await;Ok((r,))})@@ -1018,10 +1018,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::record_own_arg(host, arg0).await;Ok(r)@@ -1038,10 +1038,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T,>>::record_borrow_arg(host, arg0)@@ -1057,10 +1057,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::record_result(host).await;Ok((r,))})@@ -1076,10 +1076,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T,>>::func_with_handle_typedef(host, arg0)@@ -1095,10 +1095,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostFallibleWithStore<T>>::new(host).await;Ok((r,))})@@ -1157,7 +1157,7 @@ pub mod foo {wasmtime::component::ResourceType::host::<A>(),move |caller: &wasmtime::component::Accessor<T>, rep| {wasmtime::component::__internal::Box::pin(async move {- let accessor = &caller.with_getter(host_getter);+ let accessor = &caller.with_getter::<D>(host_getter);wasmtime::ToWasmtimeResult::to_wasmtime_result(HostAWithStore::<T,@@ -1287,10 +1287,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::foo(host).await;Ok((r,))})@@ -1349,7 +1349,7 @@ pub mod foo {wasmtime::component::ResourceType::host::<Foo>(),move |caller: &wasmtime::component::Accessor<T>, rep| {wasmtime::component::__internal::Box::pin(async move {- let accessor = &caller.with_getter(host_getter);+ let accessor = &caller.with_getter::<D>(host_getter);wasmtime::ToWasmtimeResult::to_wasmtime_result(HostFooWithStore::<T,diff --git a/crates/component-macro/tests/expanded/share-types_concurrent.rs b/crates/component-macro/tests/expanded/share-types_concurrent.rsindex 3cd2e410c9..46e347dbbb 100644--- a/crates/component-macro/tests/expanded/share-types_concurrent.rs+++ b/crates/component-macro/tests/expanded/share-types_concurrent.rs@@ -298,7 +298,10 @@ pub mod http_fetch {move |mut caller: wasmtime::StoreContextMut<'_, T>, (arg0,): (Request,)| {wasmtime::component::__internal::Box::new(async move {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller);- let host = wasmtime::component::Access::new(access_cx, host_getter);+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::fetch_request(host, arg0).await;Ok((r,))})diff --git a/crates/component-macro/tests/expanded/simple-functions_concurrent.rs b/crates/component-macro/tests/expanded/simple-functions_concurrent.rsindex 80abe5536e..b0acc5cc3e 100644--- a/crates/component-macro/tests/expanded/simple-functions_concurrent.rs+++ b/crates/component-macro/tests/expanded/simple-functions_concurrent.rs@@ -235,10 +235,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::f1(host).await;Ok(r)})@@ -251,10 +251,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::f2(host, arg0).await;Ok(r)})@@ -270,10 +270,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::f3(host, arg0, arg1).await;Ok(r)})@@ -286,10 +286,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::f4(host).await;Ok((r,))})@@ -302,10 +302,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::f5(host).await;Ok((r,))})@@ -321,10 +321,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::f6(host, arg0, arg1, arg2).await;Ok((r,))diff --git a/crates/component-macro/tests/expanded/simple-lists_concurrent.rs b/crates/component-macro/tests/expanded/simple-lists_concurrent.rsindex 8fcfe3ef4a..95816916d7 100644--- a/crates/component-macro/tests/expanded/simple-lists_concurrent.rs+++ b/crates/component-macro/tests/expanded/simple-lists_concurrent.rs@@ -243,10 +243,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::simple_list1(host, arg0).await;Ok(r)@@ -260,10 +260,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::simple_list2(host).await;Ok((r,))})@@ -285,10 +285,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T,>>::simple_list3(host, arg0, arg1)@@ -313,10 +313,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::simple_list4(host, arg0).await;Ok((r,))diff --git a/crates/component-macro/tests/expanded/simple-wasi_concurrent.rs b/crates/component-macro/tests/expanded/simple-wasi_concurrent.rsindex 32acfb61d1..09b38d9d53 100644--- a/crates/component-macro/tests/expanded/simple-wasi_concurrent.rs+++ b/crates/component-macro/tests/expanded/simple-wasi_concurrent.rs@@ -273,10 +273,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::create_directory_at(host).await;Ok((r,))@@ -290,10 +290,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::stat(host).await;Ok((r,))})diff --git a/crates/component-macro/tests/expanded/small-anonymous_concurrent.rs b/crates/component-macro/tests/expanded/small-anonymous_concurrent.rsindex 0675d61b94..120d68387b 100644--- a/crates/component-macro/tests/expanded/small-anonymous_concurrent.rs+++ b/crates/component-macro/tests/expanded/small-anonymous_concurrent.rs@@ -262,10 +262,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::option_test(host).await;Ok((r,))})diff --git a/crates/component-macro/tests/expanded/smoke_concurrent.rs b/crates/component-macro/tests/expanded/smoke_concurrent.rsindex 2fe651fdb9..ac593dca3f 100644--- a/crates/component-macro/tests/expanded/smoke_concurrent.rs+++ b/crates/component-macro/tests/expanded/smoke_concurrent.rs@@ -199,7 +199,10 @@ pub mod imports {move |mut caller: wasmtime::StoreContextMut<'_, T>, (): ()| {wasmtime::component::__internal::Box::new(async move {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller);- let host = wasmtime::component::Access::new(access_cx, host_getter);+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::y(host).await;Ok(r)})diff --git a/crates/component-macro/tests/expanded/strings_concurrent.rs b/crates/component-macro/tests/expanded/strings_concurrent.rsindex 75da32908b..76c1e3b6f0 100644--- a/crates/component-macro/tests/expanded/strings_concurrent.rs+++ b/crates/component-macro/tests/expanded/strings_concurrent.rs@@ -230,10 +230,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::a(host, arg0).await;Ok(r)})@@ -246,10 +246,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::b(host).await;Ok((r,))})@@ -271,10 +271,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::c(host, arg0, arg1).await;Ok((r,))})diff --git a/crates/component-macro/tests/expanded/unstable-features_concurrent.rs b/crates/component-macro/tests/expanded/unstable-features_concurrent.rsindex f3ce0bbd19..494e82ba28 100644--- a/crates/component-macro/tests/expanded/unstable-features_concurrent.rs+++ b/crates/component-macro/tests/expanded/unstable-features_concurrent.rs@@ -283,7 +283,7 @@ const _: () = {wasmtime::component::ResourceType::host::<Baz>(),move |caller: &wasmtime::component::Accessor<T>, rep| {wasmtime::component::__internal::Box::pin(async move {- let accessor = &caller.with_getter(host_getter);+ let accessor = &caller.with_getter::<D>(host_getter);wasmtime::ToWasmtimeResult::to_wasmtime_result(HostBazWithStore::<T,@@ -306,10 +306,10 @@ const _: () = {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as TheWorldImportsWithStore<T>>::foo(host).await;Ok(r)})@@ -328,10 +328,10 @@ const _: () = {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostBazWithStore<T>>::foo(host, arg0).await;Ok(r)})@@ -451,7 +451,7 @@ pub mod foo {wasmtime::component::ResourceType::host::<Bar>(),move |caller: &wasmtime::component::Accessor<T>, rep| {wasmtime::component::__internal::Box::pin(async move {- let accessor = &caller.with_getter(host_getter);+ let accessor = &caller.with_getter::<D>(host_getter);wasmtime::ToWasmtimeResult::to_wasmtime_result(HostBarWithStore::<T,@@ -473,10 +473,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::foo(host).await;Ok(r)})@@ -494,10 +494,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostBarWithStore<T>>::foo(host, arg0).await;Ok(r)})diff --git a/crates/component-macro/tests/expanded/unversioned-foo_concurrent.rs b/crates/component-macro/tests/expanded/unversioned-foo_concurrent.rsindex e025ddc67e..0d02215efd 100644--- a/crates/component-macro/tests/expanded/unversioned-foo_concurrent.rs+++ b/crates/component-macro/tests/expanded/unversioned-foo_concurrent.rs@@ -231,10 +231,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::g(host).await;Ok((r,))})diff --git a/crates/component-macro/tests/expanded/use-paths_concurrent.rs b/crates/component-macro/tests/expanded/use-paths_concurrent.rsindex 03fb0a6b73..4e370f224f 100644--- a/crates/component-macro/tests/expanded/use-paths_concurrent.rs+++ b/crates/component-macro/tests/expanded/use-paths_concurrent.rs@@ -225,10 +225,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::a(host).await;Ok((r,))})@@ -281,10 +281,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::a(host).await;Ok((r,))})@@ -337,10 +337,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::a(host).await;Ok((r,))})@@ -393,7 +393,10 @@ pub mod d {move |mut caller: wasmtime::StoreContextMut<'_, T>, (): ()| {wasmtime::component::__internal::Box::new(async move {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller);- let host = wasmtime::component::Access::new(access_cx, host_getter);+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::b(host).await;Ok((r,))})diff --git a/crates/component-macro/tests/expanded/variants_concurrent.rs b/crates/component-macro/tests/expanded/variants_concurrent.rsindex 3a4b32a141..acb52222c7 100644--- a/crates/component-macro/tests/expanded/variants_concurrent.rs+++ b/crates/component-macro/tests/expanded/variants_concurrent.rs@@ -595,10 +595,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::e1_arg(host, arg0).await;Ok(r)})@@ -611,10 +611,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::e1_result(host).await;Ok((r,))})@@ -627,10 +627,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::v1_arg(host, arg0).await;Ok(r)})@@ -643,10 +643,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::v1_result(host).await;Ok((r,))})@@ -662,10 +662,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::bool_arg(host, arg0).await;Ok(r)})@@ -678,10 +678,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::bool_result(host).await;Ok((r,))})@@ -711,10 +711,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T,>>::option_arg(host, arg0, arg1, arg2, arg3, arg4, arg5)@@ -730,10 +730,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::option_result(host).await;Ok((r,))})@@ -756,10 +756,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T,>>::casts(host, arg0, arg1, arg2, arg3, arg4, arg5)@@ -795,10 +795,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T,>>::result_arg(host, arg0, arg1, arg2, arg3, arg4, arg5)@@ -814,10 +814,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::result_result(host).await;Ok((r,))})@@ -830,10 +830,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::return_result_sugar(host).await;Ok((r,))@@ -847,10 +847,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::return_result_sugar2(host).await;Ok((r,))@@ -864,10 +864,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::return_result_sugar3(host).await;Ok((r,))@@ -881,10 +881,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::return_result_sugar4(host).await;Ok((r,))@@ -898,10 +898,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::return_option_sugar(host).await;Ok((r,))@@ -915,10 +915,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::return_option_sugar2(host).await;Ok((r,))@@ -932,10 +932,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::result_simple(host).await;Ok((r,))})@@ -951,10 +951,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::is_clone_arg(host, arg0).await;Ok(r)@@ -968,10 +968,10 @@ pub mod foo {let access_cx = wasmtime::AsContextMut::as_context_mut(&mut caller,);- let host = wasmtime::component::Access::new(- access_cx,- host_getter,- );+ let host = wasmtime::component::Access::<+ T,+ D,+ >::new(access_cx, host_getter);let r = <D as HostWithStore<T>>::is_clone_return(host).await;Ok((r,))})diff --git a/crates/wit-bindgen/src/lib.rs b/crates/wit-bindgen/src/lib.rsindex 9b16226f21..e512c7eb3e 100644--- a/crates/wit-bindgen/src/lib.rs+++ b/crates/wit-bindgen/src/lib.rs@@ -1720,7 +1720,7 @@ impl Wasmtime {{id_outer}move |caller: &{wt}::component::Accessor::<T>, rep| {{{id_inner}{wt}::component::__internal::Box::pin(async move {{- let accessor = &caller.with_getter(host_getter);+ let accessor = &caller.with_getter::<D>(host_getter);{wt}::ToWasmtimeResult::to_wasmtime_result(Host{camel}WithStore::<T>::drop(accessor, {id_arg}{wt}::component::Resource::new_own(rep)).await)@@ -1748,7 +1748,7 @@ impl Wasmtime {} else {let (first_arg, trait_suffix) = if flags.contains(FunctionFlags::STORE) {(- format!("{wt}::component::Access::new(store, host_getter)"),+ format!("{wt}::component::Access::<T, D>::new(store, host_getter)"),"WithStore::<T>",)} else {@@ -2856,7 +2856,10 @@ pub fn add_to_linker<T, D>(}if func.kind.is_async() {- uwriteln!(self.src, "let host = &caller.with_getter(host_getter);");+ uwriteln!(+ self.src,+ "let host = &caller.with_getter::<D>(host_getter);"+ );} else if flags.contains(FunctionFlags::STORE) {uwriteln!(self.src,@@ -2864,7 +2867,7 @@ pub fn add_to_linker<T, D>();uwriteln!(self.src,- "let host = {wt}::component::Access::new(access_cx, host_getter);"+ "let host = {wt}::component::Access::<T, D>::new(access_cx, host_getter);");} else {self.srcdiff --git a/src/commands/run.rs b/src/commands/run.rsindex 699241dffc..6e32df1541 100644--- a/src/commands/run.rs+++ b/src/commands/run.rs@@ -893,9 +893,7 @@ impl RunCommand {#[cfg(feature = "debug")]pub(crate) async fn invoke_debugger<T: Send + 'static,- F: for<'a> FnOnce(- &'a mut Store<T>,- ) -> Pin<Box<dyn Future<Output = Result<()>> + Send + 'a>>+ F: FnOnce(&mut Store<T>) -> Pin<Box<dyn Future<Output = Result<()>> + Send + '_>>+ Send+ 'static,>(diff --git a/src/commands/serve.rs b/src/commands/serve.rsindex 57e4f3368a..8df19dd39a 100644--- a/src/commands/serve.rs+++ b/src/commands/serve.rs@@ -721,7 +721,10 @@ impl ServeCommand {// task to handle this client.match &mut debuggee_store {Some(store) => {- handle_client(stream, &handler, Some(store)).await;+ // Boxed to avoid triggering rustc's recursion limit.+ let client: Pin<Box<dyn Future<Output = _> + Send + '_>> =+ Box::pin(handle_client(stream, &handler, Some(store)));+ client.await;}None => {let handler = handler.clone();