typedefs for complex builder types (#890)

zenoh/src/publication.rs

@@ -46,7 +46,8 @@ pub struct PublicationBuilderPut {
 #[derive(Debug, Clone)]
 pub struct PublicationBuilderDelete;
 
-/// A builder for initializing a [`put`](crate::Session::put) and [`delete`](crate::Session::delete) operations
+/// A builder for initializing  [`Session::put`](crate::Session::put), [`Session::delete`](crate::Session::delete),
+/// [`Publisher::put`](crate::Publisher::put), and [`Publisher::delete`](crate::Publisher::delete) operations.
 ///
 /// # Examples
 /// ```
@@ -78,6 +79,17 @@ pub struct PublicationBuilder<P, T> {
     pub(crate) attachment: Option<Attachment>,
 }
 
+pub type SessionPutBuilder<'a, 'b> =
+    PublicationBuilder<PublisherBuilder<'a, 'b>, PublicationBuilderPut>;
+
+pub type SessionDeleteBuilder<'a, 'b> =
+    PublicationBuilder<PublisherBuilder<'a, 'b>, PublicationBuilderDelete>;
+
+pub type PublisherPutBuilder<'a> = PublicationBuilder<&'a Publisher<'a>, PublicationBuilderPut>;
+
+pub type PublisherDeleteBuilder<'a> =
+    PublicationBuilder<&'a Publisher<'a>, PublicationBuilderDelete>;
+
 impl<T> QoSBuilderTrait for PublicationBuilder<PublisherBuilder<'_, '_>, T> {
     #[inline]
     fn congestion_control(self, congestion_control: CongestionControl) -> Self {
@@ -405,10 +417,7 @@ impl<'a> Publisher<'a> {
     /// # }
     /// ```
     #[inline]
-    pub fn put<IntoPayload>(
-        &self,
-        payload: IntoPayload,
-    ) -> PublicationBuilder<&Publisher<'_>, PublicationBuilderPut>
+    pub fn put<IntoPayload>(&self, payload: IntoPayload) -> PublisherPutBuilder<'_>
     where
         IntoPayload: Into<Payload>,
     {
@@ -439,7 +448,7 @@ impl<'a> Publisher<'a> {
     /// publisher.delete().res().await.unwrap();
     /// # }
     /// ```
-    pub fn delete(&self) -> PublicationBuilder<&Publisher<'_>, PublicationBuilderDelete> {
+    pub fn delete(&self) -> PublisherDeleteBuilder<'_> {
         PublicationBuilder {
             publisher: self,
             kind: PublicationBuilderDelete,

zenoh/src/queryable.rs

@@ -129,7 +129,7 @@ impl Query {
         &self,
         key_expr: TryIntoKeyExpr,
         payload: IntoPayload,
-    ) -> ReplyBuilder<'_, 'b, ReplyBuilderPut>
+    ) -> ReplyPutBuilder<'_, 'b>
     where
         TryIntoKeyExpr: TryInto<KeyExpr<'b>>,
         <TryIntoKeyExpr as TryInto<KeyExpr<'b>>>::Error: Into<zenoh_result::Error>,
@@ -171,7 +171,7 @@ impl Query {
     pub fn reply_del<'b, TryIntoKeyExpr>(
         &self,
         key_expr: TryIntoKeyExpr,
-    ) -> ReplyBuilder<'_, 'b, ReplyBuilderDelete>
+    ) -> ReplyDeleteBuilder<'_, 'b>
     where
         TryIntoKeyExpr: TryInto<KeyExpr<'b>>,
         <TryIntoKeyExpr as TryInto<KeyExpr<'b>>>::Error: Into<zenoh_result::Error>,
@@ -274,6 +274,10 @@ pub struct ReplyBuilder<'a, 'b, T> {
     attachment: Option<Attachment>,
 }
 
+pub type ReplyPutBuilder<'a, 'b> = ReplyBuilder<'a, 'b, ReplyBuilderPut>;
+
+pub type ReplyDeleteBuilder<'a, 'b> = ReplyBuilder<'a, 'b, ReplyBuilderDelete>;
+
 impl<T> TimestampBuilderTrait for ReplyBuilder<'_, '_, T> {
     fn timestamp<U: Into<Option<Timestamp>>>(self, timestamp: U) -> Self {
         Self {

zenoh/src/session.rs

@@ -705,7 +705,7 @@ impl Session {
         &'a self,
         key_expr: TryIntoKeyExpr,
         payload: IntoPayload,
-    ) -> PublicationBuilder<PublisherBuilder<'a, 'b>, PublicationBuilderPut>
+    ) -> SessionPutBuilder<'a, 'b>
     where
         TryIntoKeyExpr: TryInto<KeyExpr<'b>>,
         <TryIntoKeyExpr as TryInto<KeyExpr<'b>>>::Error: Into<zenoh_result::Error>,
@@ -745,7 +745,7 @@ impl Session {
     pub fn delete<'a, 'b: 'a, TryIntoKeyExpr>(
         &'a self,
         key_expr: TryIntoKeyExpr,
-    ) -> PublicationBuilder<PublisherBuilder<'a, 'b>, PublicationBuilderDelete>
+    ) -> SessionDeleteBuilder<'a, 'b>
     where
         TryIntoKeyExpr: TryInto<KeyExpr<'b>>,
         <TryIntoKeyExpr as TryInto<KeyExpr<'b>>>::Error: Into<zenoh_result::Error>,