Skip to content

Account for concurrent resource destructors #11350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexcrichton merged 2 commits into from
Jul 30, 2025
Merged

Account for concurrent resource destructors #11350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89612da
Account for concurrent resource destructors
alexcrichton Jul 30, 2025
01038c1
Update expanded test expectations
alexcrichton Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 14 additions & 22 deletions crates/component-macro/tests/expanded/resources-export_concurrent.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,25 +237,16 @@ pub mod foo {
#[allow(unused_imports)]
use wasmtime::component::__internal::{anyhow, Box};
pub enum Y {}
pub trait HostYWithStore: wasmtime::component::HasData {}
impl<_T: ?Sized> HostYWithStore for _T
where
_T: wasmtime::component::HasData,
{}
pub trait HostY {
fn drop(
&mut self,
pub trait HostYWithStore: wasmtime::component::HasData {
fn drop<T: 'static>(
accessor: &wasmtime::component::Accessor<T, Self>,
rep: wasmtime::component::Resource<Y>,
) -> impl ::core::future::Future<Output = wasmtime::Result<()>> + Send;
}
impl<_T: HostY + ?Sized + Send> HostY for &mut _T {
async fn drop(
&mut self,
rep: wasmtime::component::Resource<Y>,
) -> wasmtime::Result<()> {
HostY::drop(*self, rep).await
}
) -> impl ::core::future::Future<Output = wasmtime::Result<()>> + Send
where
Self: Sized;
}
pub trait HostY {}
impl<_T: HostY + ?Sized + Send> HostY for &mut _T {}
pub trait HostWithStore: wasmtime::component::HasData + HostYWithStore + Send {}
impl<_T: ?Sized> HostWithStore for _T
where
Expand All @@ -273,13 +264,14 @@ pub mod foo {
T: 'static + Send,
{
let mut inst = linker.instance("foo:foo/transitive-import")?;
inst.resource_async(
inst.resource_concurrent(
"y",
wasmtime::component::ResourceType::host::<Y>(),
move |mut store, rep| {
wasmtime::component::__internal::Box::new(async move {
HostY::drop(
&mut host_getter(store.data_mut()),
move |caller: &wasmtime::component::Accessor<T>, rep| {
wasmtime::component::__internal::Box::pin(async move {
let accessor = &caller.with_data(host_getter);
HostYWithStore::drop(
accessor,
wasmtime::component::Resource::new_own(rep),
)
.await
Expand Down
140 changes: 57 additions & 83 deletions crates/component-macro/tests/expanded/resources-import_concurrent.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
pub enum WorldResource {}
pub trait HostWorldResourceWithStore: wasmtime::component::HasData + Send {
fn drop<T: 'static>(
accessor: &wasmtime::component::Accessor<T, Self>,
rep: wasmtime::component::Resource<WorldResource>,
) -> impl ::core::future::Future<Output = wasmtime::Result<()>> + Send
where
Self: Sized;
fn new<T: 'static>(
accessor: &wasmtime::component::Accessor<T, Self>,
) -> impl ::core::future::Future<
Expand All @@ -13,20 +19,8 @@ pub trait HostWorldResourceWithStore: wasmtime::component::HasData + Send {
accessor: &wasmtime::component::Accessor<T, Self>,
) -> impl ::core::future::Future<Output = ()> + Send;
}
pub trait HostWorldResource: Send {
fn drop(
&mut self,
rep: wasmtime::component::Resource<WorldResource>,
) -> impl ::core::future::Future<Output = wasmtime::Result<()>> + Send;
}
impl<_T: HostWorldResource + ?Sized + Send> HostWorldResource for &mut _T {
async fn drop(
&mut self,
rep: wasmtime::component::Resource<WorldResource>,
) -> wasmtime::Result<()> {
HostWorldResource::drop(*self, rep).await
}
}
pub trait HostWorldResource: Send {}
impl<_T: HostWorldResource + ?Sized + Send> HostWorldResource for &mut _T {}
/// Auto-generated bindings for a pre-instantiated version of a
/// component which implements the world `the-world`.
///
Expand Down Expand Up @@ -260,13 +254,14 @@ const _: () = {
{
let mut linker = linker.root();
linker
.resource_async(
.resource_concurrent(
"world-resource",
wasmtime::component::ResourceType::host::<WorldResource>(),
move |mut store, rep| {
wasmtime::component::__internal::Box::new(async move {
HostWorldResource::drop(
&mut host_getter(store.data_mut()),
move |caller: &wasmtime::component::Accessor<T>, rep| {
wasmtime::component::__internal::Box::pin(async move {
let accessor = &caller.with_data(host_getter);
HostWorldResourceWithStore::drop(
accessor,
wasmtime::component::Resource::new_own(rep),
)
.await
Expand Down Expand Up @@ -398,6 +393,12 @@ pub mod foo {
use wasmtime::component::__internal::{anyhow, Box};
pub enum Bar {}
pub trait HostBarWithStore: wasmtime::component::HasData + Send {
fn drop<T: 'static>(
accessor: &wasmtime::component::Accessor<T, Self>,
rep: wasmtime::component::Resource<Bar>,
) -> impl ::core::future::Future<Output = wasmtime::Result<()>> + Send
where
Self: Sized;
fn new<T: 'static>(
accessor: &wasmtime::component::Accessor<T, Self>,
) -> impl ::core::future::Future<
Expand All @@ -411,20 +412,8 @@ pub mod foo {
self_: wasmtime::component::Resource<Bar>,
) -> impl ::core::future::Future<Output = u32> + Send;
}
pub trait HostBar: Send {
fn drop(
&mut self,
rep: wasmtime::component::Resource<Bar>,
) -> impl ::core::future::Future<Output = wasmtime::Result<()>> + Send;
}
impl<_T: HostBar + ?Sized + Send> HostBar for &mut _T {
async fn drop(
&mut self,
rep: wasmtime::component::Resource<Bar>,
) -> wasmtime::Result<()> {
HostBar::drop(*self, rep).await
}
}
pub trait HostBar: Send {}
impl<_T: HostBar + ?Sized + Send> HostBar for &mut _T {}
#[derive(wasmtime::component::ComponentType)]
#[derive(wasmtime::component::Lift)]
#[derive(wasmtime::component::Lower)]
Expand Down Expand Up @@ -580,13 +569,14 @@ pub mod foo {
T: 'static + Send,
{
let mut inst = linker.instance("foo:foo/resources")?;
inst.resource_async(
inst.resource_concurrent(
"bar",
wasmtime::component::ResourceType::host::<Bar>(),
move |mut store, rep| {
wasmtime::component::__internal::Box::new(async move {
HostBar::drop(
&mut host_getter(store.data_mut()),
move |caller: &wasmtime::component::Accessor<T>, rep| {
wasmtime::component::__internal::Box::pin(async move {
let accessor = &caller.with_data(host_getter);
HostBarWithStore::drop(
accessor,
wasmtime::component::Resource::new_own(rep),
)
.await
Expand Down Expand Up @@ -904,25 +894,16 @@ pub mod foo {
#[allow(unused_imports)]
use wasmtime::component::__internal::{anyhow, Box};
pub enum A {}
pub trait HostAWithStore: wasmtime::component::HasData {}
impl<_T: ?Sized> HostAWithStore for _T
where
_T: wasmtime::component::HasData,
{}
pub trait HostA {
fn drop(
&mut self,
rep: wasmtime::component::Resource<A>,
) -> impl ::core::future::Future<Output = wasmtime::Result<()>> + Send;
}
impl<_T: HostA + ?Sized + Send> HostA for &mut _T {
async fn drop(
&mut self,
pub trait HostAWithStore: wasmtime::component::HasData {
fn drop<T: 'static>(
accessor: &wasmtime::component::Accessor<T, Self>,
rep: wasmtime::component::Resource<A>,
) -> wasmtime::Result<()> {
HostA::drop(*self, rep).await
}
) -> impl ::core::future::Future<Output = wasmtime::Result<()>> + Send
where
Self: Sized;
}
pub trait HostA {}
impl<_T: HostA + ?Sized + Send> HostA for &mut _T {}
pub trait HostWithStore: wasmtime::component::HasData + HostAWithStore + Send {}
impl<_T: ?Sized> HostWithStore for _T
where
Expand All @@ -940,13 +921,14 @@ pub mod foo {
T: 'static + Send,
{
let mut inst = linker.instance("foo:foo/long-use-chain1")?;
inst.resource_async(
inst.resource_concurrent(
"a",
wasmtime::component::ResourceType::host::<A>(),
move |mut store, rep| {
wasmtime::component::__internal::Box::new(async move {
HostA::drop(
&mut host_getter(store.data_mut()),
move |caller: &wasmtime::component::Accessor<T>, rep| {
wasmtime::component::__internal::Box::pin(async move {
let accessor = &caller.with_data(host_getter);
HostAWithStore::drop(
accessor,
wasmtime::component::Resource::new_own(rep),
)
.await
Expand Down Expand Up @@ -1048,25 +1030,16 @@ pub mod foo {
#[allow(unused_imports)]
use wasmtime::component::__internal::{anyhow, Box};
pub enum Foo {}
pub trait HostFooWithStore: wasmtime::component::HasData {}
impl<_T: ?Sized> HostFooWithStore for _T
where
_T: wasmtime::component::HasData,
{}
pub trait HostFoo {
fn drop(
&mut self,
rep: wasmtime::component::Resource<Foo>,
) -> impl ::core::future::Future<Output = wasmtime::Result<()>> + Send;
}
impl<_T: HostFoo + ?Sized + Send> HostFoo for &mut _T {
async fn drop(
&mut self,
pub trait HostFooWithStore: wasmtime::component::HasData {
fn drop<T: 'static>(
accessor: &wasmtime::component::Accessor<T, Self>,
rep: wasmtime::component::Resource<Foo>,
) -> wasmtime::Result<()> {
HostFoo::drop(*self, rep).await
}
) -> impl ::core::future::Future<Output = wasmtime::Result<()>> + Send
where
Self: Sized;
}
pub trait HostFoo {}
impl<_T: HostFoo + ?Sized + Send> HostFoo for &mut _T {}
pub trait HostWithStore: wasmtime::component::HasData + HostFooWithStore + Send {}
impl<_T: ?Sized> HostWithStore for _T
where
Expand All @@ -1085,13 +1058,14 @@ pub mod foo {
{
let mut inst = linker
.instance("foo:foo/transitive-interface-with-resource")?;
inst.resource_async(
inst.resource_concurrent(
"foo",
wasmtime::component::ResourceType::host::<Foo>(),
move |mut store, rep| {
wasmtime::component::__internal::Box::new(async move {
HostFoo::drop(
&mut host_getter(store.data_mut()),
move |caller: &wasmtime::component::Accessor<T>, rep| {
wasmtime::component::__internal::Box::pin(async move {
let accessor = &caller.with_data(host_getter);
HostFooWithStore::drop(
accessor,
wasmtime::component::Resource::new_own(rep),
)
.await
Expand Down Expand Up @@ -1143,7 +1117,7 @@ pub mod exports {
.ok_or_else(|| {
anyhow::anyhow!(
"instance export `foo:foo/uses-resource-transitively` does \
not have export `{name}`"
not have export `{name}`"
)
})
};
Expand Down
66 changes: 28 additions & 38 deletions crates/component-macro/tests/expanded/unstable-features_concurrent.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,25 +80,19 @@ impl core::convert::From<&LinkOptions> for foo::foo::the_interface::LinkOptions
}
pub enum Baz {}
pub trait HostBazWithStore: wasmtime::component::HasData + Send {
fn drop<T: 'static>(
accessor: &wasmtime::component::Accessor<T, Self>,
rep: wasmtime::component::Resource<Baz>,
) -> impl ::core::future::Future<Output = wasmtime::Result<()>> + Send
where
Self: Sized;
fn foo<T: 'static>(
accessor: &wasmtime::component::Accessor<T, Self>,
self_: wasmtime::component::Resource<Baz>,
) -> impl ::core::future::Future<Output = ()> + Send;
}
pub trait HostBaz: Send {
fn drop(
&mut self,
rep: wasmtime::component::Resource<Baz>,
) -> impl ::core::future::Future<Output = wasmtime::Result<()>> + Send;
}
impl<_T: HostBaz + ?Sized + Send> HostBaz for &mut _T {
async fn drop(
&mut self,
rep: wasmtime::component::Resource<Baz>,
) -> wasmtime::Result<()> {
HostBaz::drop(*self, rep).await
}
}
pub trait HostBaz: Send {}
impl<_T: HostBaz + ?Sized + Send> HostBaz for &mut _T {}
/// Auto-generated bindings for a pre-instantiated version of a
/// component which implements the world `the-world`.
///
Expand Down Expand Up @@ -284,13 +278,14 @@ const _: () = {
if options.experimental_world {
if options.experimental_world_resource {
linker
.resource_async(
.resource_concurrent(
"baz",
wasmtime::component::ResourceType::host::<Baz>(),
move |mut store, rep| {
wasmtime::component::__internal::Box::new(async move {
HostBaz::drop(
&mut host_getter(store.data_mut()),
move |caller: &wasmtime::component::Accessor<T>, rep| {
wasmtime::component::__internal::Box::pin(async move {
let accessor = &caller.with_data(host_getter);
HostBazWithStore::drop(
accessor,
wasmtime::component::Resource::new_own(rep),
)
.await
Expand Down Expand Up @@ -401,25 +396,19 @@ pub mod foo {
}
pub enum Bar {}
pub trait HostBarWithStore: wasmtime::component::HasData + Send {
fn drop<T: 'static>(
accessor: &wasmtime::component::Accessor<T, Self>,
rep: wasmtime::component::Resource<Bar>,
) -> impl ::core::future::Future<Output = wasmtime::Result<()>> + Send
where
Self: Sized;
fn foo<T: 'static>(
accessor: &wasmtime::component::Accessor<T, Self>,
self_: wasmtime::component::Resource<Bar>,
) -> impl ::core::future::Future<Output = ()> + Send;
}
pub trait HostBar: Send {
fn drop(
&mut self,
rep: wasmtime::component::Resource<Bar>,
) -> impl ::core::future::Future<Output = wasmtime::Result<()>> + Send;
}
impl<_T: HostBar + ?Sized + Send> HostBar for &mut _T {
async fn drop(
&mut self,
rep: wasmtime::component::Resource<Bar>,
) -> wasmtime::Result<()> {
HostBar::drop(*self, rep).await
}
}
pub trait HostBar: Send {}
impl<_T: HostBar + ?Sized + Send> HostBar for &mut _T {}
pub trait HostWithStore: wasmtime::component::HasData + HostBarWithStore + Send {
fn foo<T: 'static>(
accessor: &wasmtime::component::Accessor<T, Self>,
Expand All @@ -440,13 +429,14 @@ pub mod foo {
if options.experimental_interface {
let mut inst = linker.instance("foo:foo/the-interface")?;
if options.experimental_interface_resource {
inst.resource_async(
inst.resource_concurrent(
"bar",
wasmtime::component::ResourceType::host::<Bar>(),
move |mut store, rep| {
wasmtime::component::__internal::Box::new(async move {
HostBar::drop(
&mut host_getter(store.data_mut()),
move |caller: &wasmtime::component::Accessor<T>, rep| {
wasmtime::component::__internal::Box::pin(async move {
let accessor = &caller.with_data(host_getter);
HostBarWithStore::drop(
accessor,
wasmtime::component::Resource::new_own(rep),
)
.await
Expand Down
Loading