A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
fix(bindgen): futures and stream are not `Clone` (#12155)
Roman Volosatovsce09e2acb5aa
diff --git a/crates/component-macro/tests/codegen/records.wit b/crates/component-macro/tests/codegen/records.witindex e47af0cbf6..ea85dabac9 100644--- a/crates/component-macro/tests/codegen/records.wit+++ b/crates/component-macro/tests/codegen/records.wit@@ -53,6 +53,13 @@ interface records {type int-typedef = s32;type tuple-typedef2 = tuple<int-typedef>;typedef-inout: func(e: tuple-typedef2) -> s32;++ record futures-and-streams {+ a: future<u8>,+ b: stream<u8>,+ c: stream<future<stream>>,+ d: future<stream<future>>,+ }}world the-world {diff --git a/crates/component-macro/tests/expanded/records.rs b/crates/component-macro/tests/expanded/records.rsindex fe82efb4a2..0096aad14f 100644--- a/crates/component-macro/tests/expanded/records.rs+++ b/crates/component-macro/tests/expanded/records.rs@@ -346,6 +346,48 @@ pub mod foo {4 == < TupleTypedef2 as wasmtime::component::ComponentType >::ALIGN32);};+ #[derive(wasmtime::component::ComponentType)]+ #[derive(wasmtime::component::Lift)]+ #[derive(wasmtime::component::Lower)]+ #[component(record)]+ pub struct FuturesAndStreams {+ #[component(name = "a")]+ pub a: wasmtime::component::FutureReader<u8>,+ #[component(name = "b")]+ pub b: wasmtime::component::StreamReader<u8>,+ #[component(name = "c")]+ pub c: wasmtime::component::StreamReader<+ wasmtime::component::FutureReader<+ wasmtime::component::StreamReader<()>,+ >,+ >,+ #[component(name = "d")]+ pub d: wasmtime::component::FutureReader<+ wasmtime::component::StreamReader<+ wasmtime::component::FutureReader<()>,+ >,+ >,+ }+ impl core::fmt::Debug for FuturesAndStreams {+ fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {+ f.debug_struct("FuturesAndStreams")+ .field("a", &self.a)+ .field("b", &self.b)+ .field("c", &self.c)+ .field("d", &self.d)+ .finish()+ }+ }+ const _: () = {+ assert!(+ 16 == < FuturesAndStreams as wasmtime::component::ComponentType+ >::SIZE32+ );+ assert!(+ 4 == < FuturesAndStreams as wasmtime::component::ComponentType+ >::ALIGN32+ );+ };pub trait HostWithStore: wasmtime::component::HasData {}impl<_T: ?Sized> HostWithStore for _Twhere@@ -711,6 +753,51 @@ pub mod exports {>::ALIGN32);};+ #[derive(wasmtime::component::ComponentType)]+ #[derive(wasmtime::component::Lift)]+ #[derive(wasmtime::component::Lower)]+ #[component(record)]+ pub struct FuturesAndStreams {+ #[component(name = "a")]+ pub a: wasmtime::component::FutureReader<u8>,+ #[component(name = "b")]+ pub b: wasmtime::component::StreamReader<u8>,+ #[component(name = "c")]+ pub c: wasmtime::component::StreamReader<+ wasmtime::component::FutureReader<+ wasmtime::component::StreamReader<()>,+ >,+ >,+ #[component(name = "d")]+ pub d: wasmtime::component::FutureReader<+ wasmtime::component::StreamReader<+ wasmtime::component::FutureReader<()>,+ >,+ >,+ }+ impl core::fmt::Debug for FuturesAndStreams {+ fn fmt(+ &self,+ f: &mut core::fmt::Formatter<'_>,+ ) -> core::fmt::Result {+ f.debug_struct("FuturesAndStreams")+ .field("a", &self.a)+ .field("b", &self.b)+ .field("c", &self.c)+ .field("d", &self.d)+ .finish()+ }+ }+ const _: () = {+ assert!(+ 16 == < FuturesAndStreams as wasmtime::component::ComponentType+ >::SIZE32+ );+ assert!(+ 4 == < FuturesAndStreams as wasmtime::component::ComponentType+ >::ALIGN32+ );+ };#[derive(Clone)]pub struct Guest {tuple_arg: wasmtime::component::Func,diff --git a/crates/component-macro/tests/expanded/records_async.rs b/crates/component-macro/tests/expanded/records_async.rsindex 4453813966..cdbc698678 100644--- a/crates/component-macro/tests/expanded/records_async.rs+++ b/crates/component-macro/tests/expanded/records_async.rs@@ -346,6 +346,48 @@ pub mod foo {4 == < TupleTypedef2 as wasmtime::component::ComponentType >::ALIGN32);};+ #[derive(wasmtime::component::ComponentType)]+ #[derive(wasmtime::component::Lift)]+ #[derive(wasmtime::component::Lower)]+ #[component(record)]+ pub struct FuturesAndStreams {+ #[component(name = "a")]+ pub a: wasmtime::component::FutureReader<u8>,+ #[component(name = "b")]+ pub b: wasmtime::component::StreamReader<u8>,+ #[component(name = "c")]+ pub c: wasmtime::component::StreamReader<+ wasmtime::component::FutureReader<+ wasmtime::component::StreamReader<()>,+ >,+ >,+ #[component(name = "d")]+ pub d: wasmtime::component::FutureReader<+ wasmtime::component::StreamReader<+ wasmtime::component::FutureReader<()>,+ >,+ >,+ }+ impl core::fmt::Debug for FuturesAndStreams {+ fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {+ f.debug_struct("FuturesAndStreams")+ .field("a", &self.a)+ .field("b", &self.b)+ .field("c", &self.c)+ .field("d", &self.d)+ .finish()+ }+ }+ const _: () = {+ assert!(+ 16 == < FuturesAndStreams as wasmtime::component::ComponentType+ >::SIZE32+ );+ assert!(+ 4 == < FuturesAndStreams as wasmtime::component::ComponentType+ >::ALIGN32+ );+ };pub trait HostWithStore: wasmtime::component::HasData + Send {}impl<_T: ?Sized> HostWithStore for _Twhere@@ -789,6 +831,51 @@ pub mod exports {>::ALIGN32);};+ #[derive(wasmtime::component::ComponentType)]+ #[derive(wasmtime::component::Lift)]+ #[derive(wasmtime::component::Lower)]+ #[component(record)]+ pub struct FuturesAndStreams {+ #[component(name = "a")]+ pub a: wasmtime::component::FutureReader<u8>,+ #[component(name = "b")]+ pub b: wasmtime::component::StreamReader<u8>,+ #[component(name = "c")]+ pub c: wasmtime::component::StreamReader<+ wasmtime::component::FutureReader<+ wasmtime::component::StreamReader<()>,+ >,+ >,+ #[component(name = "d")]+ pub d: wasmtime::component::FutureReader<+ wasmtime::component::StreamReader<+ wasmtime::component::FutureReader<()>,+ >,+ >,+ }+ impl core::fmt::Debug for FuturesAndStreams {+ fn fmt(+ &self,+ f: &mut core::fmt::Formatter<'_>,+ ) -> core::fmt::Result {+ f.debug_struct("FuturesAndStreams")+ .field("a", &self.a)+ .field("b", &self.b)+ .field("c", &self.c)+ .field("d", &self.d)+ .finish()+ }+ }+ const _: () = {+ assert!(+ 16 == < FuturesAndStreams as wasmtime::component::ComponentType+ >::SIZE32+ );+ assert!(+ 4 == < FuturesAndStreams as wasmtime::component::ComponentType+ >::ALIGN32+ );+ };#[derive(Clone)]pub struct Guest {tuple_arg: wasmtime::component::Func,diff --git a/crates/component-macro/tests/expanded/records_concurrent.rs b/crates/component-macro/tests/expanded/records_concurrent.rsindex dd97f8e22d..ced782224e 100644--- a/crates/component-macro/tests/expanded/records_concurrent.rs+++ b/crates/component-macro/tests/expanded/records_concurrent.rs@@ -346,6 +346,48 @@ pub mod foo {4 == < TupleTypedef2 as wasmtime::component::ComponentType >::ALIGN32);};+ #[derive(wasmtime::component::ComponentType)]+ #[derive(wasmtime::component::Lift)]+ #[derive(wasmtime::component::Lower)]+ #[component(record)]+ pub struct FuturesAndStreams {+ #[component(name = "a")]+ pub a: wasmtime::component::FutureReader<u8>,+ #[component(name = "b")]+ pub b: wasmtime::component::StreamReader<u8>,+ #[component(name = "c")]+ pub c: wasmtime::component::StreamReader<+ wasmtime::component::FutureReader<+ wasmtime::component::StreamReader<()>,+ >,+ >,+ #[component(name = "d")]+ pub d: wasmtime::component::FutureReader<+ wasmtime::component::StreamReader<+ wasmtime::component::FutureReader<()>,+ >,+ >,+ }+ impl core::fmt::Debug for FuturesAndStreams {+ fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {+ f.debug_struct("FuturesAndStreams")+ .field("a", &self.a)+ .field("b", &self.b)+ .field("c", &self.c)+ .field("d", &self.d)+ .finish()+ }+ }+ const _: () = {+ assert!(+ 16 == < FuturesAndStreams as wasmtime::component::ComponentType+ >::SIZE32+ );+ assert!(+ 4 == < FuturesAndStreams as wasmtime::component::ComponentType+ >::ALIGN32+ );+ };pub trait HostWithStore: wasmtime::component::HasData + Send {fn tuple_arg<T: Send>(accessor: &wasmtime::component::Accessor<T, Self>,@@ -722,6 +764,51 @@ pub mod exports {>::ALIGN32);};+ #[derive(wasmtime::component::ComponentType)]+ #[derive(wasmtime::component::Lift)]+ #[derive(wasmtime::component::Lower)]+ #[component(record)]+ pub struct FuturesAndStreams {+ #[component(name = "a")]+ pub a: wasmtime::component::FutureReader<u8>,+ #[component(name = "b")]+ pub b: wasmtime::component::StreamReader<u8>,+ #[component(name = "c")]+ pub c: wasmtime::component::StreamReader<+ wasmtime::component::FutureReader<+ wasmtime::component::StreamReader<()>,+ >,+ >,+ #[component(name = "d")]+ pub d: wasmtime::component::FutureReader<+ wasmtime::component::StreamReader<+ wasmtime::component::FutureReader<()>,+ >,+ >,+ }+ impl core::fmt::Debug for FuturesAndStreams {+ fn fmt(+ &self,+ f: &mut core::fmt::Formatter<'_>,+ ) -> core::fmt::Result {+ f.debug_struct("FuturesAndStreams")+ .field("a", &self.a)+ .field("b", &self.b)+ .field("c", &self.c)+ .field("d", &self.d)+ .finish()+ }+ }+ const _: () = {+ assert!(+ 16 == < FuturesAndStreams as wasmtime::component::ComponentType+ >::SIZE32+ );+ assert!(+ 4 == < FuturesAndStreams as wasmtime::component::ComponentType+ >::ALIGN32+ );+ };#[derive(Clone)]pub struct Guest {tuple_arg: wasmtime::component::Func,diff --git a/crates/component-macro/tests/expanded/records_tracing_async.rs b/crates/component-macro/tests/expanded/records_tracing_async.rsindex dd8846d8e9..f86158bbc6 100644--- a/crates/component-macro/tests/expanded/records_tracing_async.rs+++ b/crates/component-macro/tests/expanded/records_tracing_async.rs@@ -346,6 +346,48 @@ pub mod foo {4 == < TupleTypedef2 as wasmtime::component::ComponentType >::ALIGN32);};+ #[derive(wasmtime::component::ComponentType)]+ #[derive(wasmtime::component::Lift)]+ #[derive(wasmtime::component::Lower)]+ #[component(record)]+ pub struct FuturesAndStreams {+ #[component(name = "a")]+ pub a: wasmtime::component::FutureReader<u8>,+ #[component(name = "b")]+ pub b: wasmtime::component::StreamReader<u8>,+ #[component(name = "c")]+ pub c: wasmtime::component::StreamReader<+ wasmtime::component::FutureReader<+ wasmtime::component::StreamReader<()>,+ >,+ >,+ #[component(name = "d")]+ pub d: wasmtime::component::FutureReader<+ wasmtime::component::StreamReader<+ wasmtime::component::FutureReader<()>,+ >,+ >,+ }+ impl core::fmt::Debug for FuturesAndStreams {+ fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {+ f.debug_struct("FuturesAndStreams")+ .field("a", &self.a)+ .field("b", &self.b)+ .field("c", &self.c)+ .field("d", &self.d)+ .finish()+ }+ }+ const _: () = {+ assert!(+ 16 == < FuturesAndStreams as wasmtime::component::ComponentType+ >::SIZE32+ );+ assert!(+ 4 == < FuturesAndStreams as wasmtime::component::ComponentType+ >::ALIGN32+ );+ };pub trait HostWithStore: wasmtime::component::HasData + Send {}impl<_T: ?Sized> HostWithStore for _Twhere@@ -950,6 +992,51 @@ pub mod exports {>::ALIGN32);};+ #[derive(wasmtime::component::ComponentType)]+ #[derive(wasmtime::component::Lift)]+ #[derive(wasmtime::component::Lower)]+ #[component(record)]+ pub struct FuturesAndStreams {+ #[component(name = "a")]+ pub a: wasmtime::component::FutureReader<u8>,+ #[component(name = "b")]+ pub b: wasmtime::component::StreamReader<u8>,+ #[component(name = "c")]+ pub c: wasmtime::component::StreamReader<+ wasmtime::component::FutureReader<+ wasmtime::component::StreamReader<()>,+ >,+ >,+ #[component(name = "d")]+ pub d: wasmtime::component::FutureReader<+ wasmtime::component::StreamReader<+ wasmtime::component::FutureReader<()>,+ >,+ >,+ }+ impl core::fmt::Debug for FuturesAndStreams {+ fn fmt(+ &self,+ f: &mut core::fmt::Formatter<'_>,+ ) -> core::fmt::Result {+ f.debug_struct("FuturesAndStreams")+ .field("a", &self.a)+ .field("b", &self.b)+ .field("c", &self.c)+ .field("d", &self.d)+ .finish()+ }+ }+ const _: () = {+ assert!(+ 16 == < FuturesAndStreams as wasmtime::component::ComponentType+ >::SIZE32+ );+ assert!(+ 4 == < FuturesAndStreams as wasmtime::component::ComponentType+ >::ALIGN32+ );+ };#[derive(Clone)]pub struct Guest {tuple_arg: wasmtime::component::Func,diff --git a/crates/wit-bindgen/src/types.rs b/crates/wit-bindgen/src/types.rsindex b06c2950f7..200d13a82f 100644--- a/crates/wit-bindgen/src/types.rs+++ b/crates/wit-bindgen/src/types.rs@@ -26,6 +26,9 @@ pub struct TypeInfo {/// Whether or not this type (transitively) has a handle.pub has_handle: bool,++ /// Whether or not this type (transitively) has a future or a stream.+ pub has_future_or_stream: bool,}impl std::ops::BitOrAssign for TypeInfo {@@ -35,6 +38,7 @@ impl std::ops::BitOrAssign for TypeInfo {self.error |= rhs.error;self.has_list |= rhs.has_list;self.has_handle |= rhs.has_handle;+ self.has_future_or_stream |= rhs.has_future_or_stream;}}@@ -153,6 +157,7 @@ impl Types {}TypeDefKind::Future(ty) | TypeDefKind::Stream(ty) => {info = self.optional_type_info(resolve, ty.as_ref());+ info.has_future_or_stream = true;}TypeDefKind::Handle(_) => info.has_handle = true,TypeDefKind::Resource => {}@@ -184,10 +189,10 @@ impl Types {impl TypeInfo {pub fn is_copy(&self) -> bool {- !self.has_list && !self.has_handle+ !self.has_list && !self.has_handle && !self.has_future_or_stream}pub fn is_clone(&self) -> bool {- !self.has_handle+ !self.has_handle && !self.has_future_or_stream}}