diff --git a/zenoh/src/publication.rs b/zenoh/src/publication.rs index 69715a0867..dd1818d842 100644 --- a/zenoh/src/publication.rs +++ b/zenoh/src/publication.rs @@ -71,8 +71,8 @@ pub struct PublicationBuilderDelete; /// ``` #[must_use = "Resolvables do nothing unless you resolve them using the `res` method from either `SyncResolve` or `AsyncResolve`"] #[derive(Debug, Clone)] -pub struct PublicationBuilder<'a, 'b, T> { - pub(crate) publisher: PublisherBuilder<'a, 'b>, +pub struct PublicationBuilder { + pub(crate) publisher: P, pub(crate) kind: T, pub(crate) timestamp: Option, #[cfg(feature = "unstable")] @@ -81,7 +81,7 @@ pub struct PublicationBuilder<'a, 'b, T> { pub(crate) attachment: Option, } -impl QoSBuilderTrait for PublicationBuilder<'_, '_, T> { +impl QoSBuilderTrait for PublicationBuilder, T> { #[inline] fn congestion_control(self, congestion_control: CongestionControl) -> Self { Self { @@ -105,7 +105,7 @@ impl QoSBuilderTrait for PublicationBuilder<'_, '_, T> { } } -impl TimestampBuilderTrait for PublicationBuilder<'_, '_, T> { +impl TimestampBuilderTrait for PublicationBuilder { fn timestamp>>(self, timestamp: TS) -> Self { Self { timestamp: timestamp.into(), @@ -114,7 +114,7 @@ impl TimestampBuilderTrait for PublicationBuilder<'_, '_, T> { } } -impl SampleBuilderTrait for PublicationBuilder<'_, '_, T> { +impl SampleBuilderTrait for PublicationBuilder { #[cfg(feature = "unstable")] fn source_info(self, source_info: SourceInfo) -> Self { Self { @@ -131,7 +131,7 @@ impl SampleBuilderTrait for PublicationBuilder<'_, '_, T> { } } -impl ValueBuilderTrait for PublicationBuilder<'_, '_, PublicationBuilderPut> { +impl

ValueBuilderTrait for PublicationBuilder { fn encoding>(self, encoding: T) -> Self { Self { kind: PublicationBuilderPut { @@ -163,7 +163,7 @@ impl ValueBuilderTrait for PublicationBuilder<'_, '_, PublicationBuilderPut> { } } -impl PublicationBuilder<'_, '_, T> { +impl PublicationBuilder, T> { /// Restrict the matching subscribers that will receive the published data /// to the ones that have the given [`Locality`](crate::prelude::Locality). #[zenoh_macros::unstable] @@ -174,11 +174,11 @@ impl PublicationBuilder<'_, '_, T> { } } -impl Resolvable for PublicationBuilder<'_, '_, T> { +impl Resolvable for PublicationBuilder { type To = ZResult<()>; } -impl SyncResolve for PublicationBuilder<'_, '_, PublicationBuilderPut> { +impl SyncResolve for PublicationBuilder, PublicationBuilderPut> { #[inline] fn res_sync(self) -> ::To { let publisher = self.publisher.create_one_shot_publisher()?; @@ -196,7 +196,7 @@ impl SyncResolve for PublicationBuilder<'_, '_, PublicationBuilderPut> { } } -impl SyncResolve for PublicationBuilder<'_, '_, PublicationBuilderDelete> { +impl SyncResolve for PublicationBuilder, PublicationBuilderDelete> { #[inline] fn res_sync(self) -> ::To { let publisher = self.publisher.create_one_shot_publisher()?; @@ -214,7 +214,7 @@ impl SyncResolve for PublicationBuilder<'_, '_, PublicationBuilderDelete> { } } -impl AsyncResolve for PublicationBuilder<'_, '_, PublicationBuilderPut> { +impl AsyncResolve for PublicationBuilder, PublicationBuilderPut> { type Future = Ready; fn res_async(self) -> Self::Future { @@ -222,7 +222,7 @@ impl AsyncResolve for PublicationBuilder<'_, '_, PublicationBuilderPut> { } } -impl AsyncResolve for PublicationBuilder<'_, '_, PublicationBuilderDelete> { +impl AsyncResolve for PublicationBuilder, PublicationBuilderDelete> { type Future = Ready; fn res_async(self) -> Self::Future { diff --git a/zenoh/src/session.rs b/zenoh/src/session.rs index b1b059d163..63cc0bb7fa 100644 --- a/zenoh/src/session.rs +++ b/zenoh/src/session.rs @@ -705,7 +705,7 @@ impl Session { &'a self, key_expr: TryIntoKeyExpr, payload: IntoPayload, - ) -> PublicationBuilder<'a, 'b, PublicationBuilderPut> + ) -> PublicationBuilder, PublicationBuilderPut> where TryIntoKeyExpr: TryInto>, >>::Error: Into, @@ -745,7 +745,7 @@ impl Session { pub fn delete<'a, 'b: 'a, TryIntoKeyExpr>( &'a self, key_expr: TryIntoKeyExpr, - ) -> PublicationBuilder<'a, 'b, PublicationBuilderDelete> + ) -> PublicationBuilder, PublicationBuilderDelete> where TryIntoKeyExpr: TryInto>, >>::Error: Into,