more moved in options, timestamp simplified

include/zenoh_commons.h

@@ -694,7 +694,7 @@ typedef struct z_query_reply_options_t {
   /**
    * The encoding of the reply payload.
    */
-  struct z_owned_encoding_t *encoding;
+  struct z_moved_encoding_t encoding;
   /**
    * The congestion control to apply when routing the reply.
    */
@@ -714,11 +714,11 @@ typedef struct z_query_reply_options_t {
   /**
    * The source info for the reply.
    */
-  struct z_owned_source_info_t *source_info;
+  struct z_moved_source_info_t source_info;
   /**
    * The attachment to this reply.
    */
-  struct z_owned_bytes_t *attachment;
+  struct z_moved_bytes_t attachment;
 } z_query_reply_options_t;
 /**
  * Represents the set of options that can be applied to a query delete reply,
@@ -744,11 +744,11 @@ typedef struct z_query_reply_del_options_t {
   /**
    * The source info for the reply.
    */
-  struct z_owned_source_info_t *source_info;
+  struct z_moved_source_info_t source_info;
   /**
    * The attachment to this reply.
    */
-  struct z_owned_bytes_t *attachment;
+  struct z_moved_bytes_t attachment;
 } z_query_reply_del_options_t;
 /**
  * Represents the set of options that can be applied to a query reply error,
@@ -758,7 +758,7 @@ typedef struct z_query_reply_err_options_t {
   /**
    * The encoding of the error payload.
    */
-  struct z_owned_encoding_t *encoding;
+  struct z_moved_encoding_t encoding;
 } z_query_reply_err_options_t;
 typedef struct z_moved_queryable_t {
   struct z_owned_queryable_t *ptr;

src/publisher.rs

@@ -39,9 +39,7 @@ use zenoh::sample::SampleBuilderTrait;
 use zenoh::sample::TimestampBuilderTrait;
 use zenoh::{core::Priority, publisher::MatchingListener, publisher::Publisher};
 
-use crate::{
-    z_congestion_control_t, z_loaned_keyexpr_t, z_loaned_session_t, z_priority_t,
-};
+use crate::{z_congestion_control_t, z_loaned_keyexpr_t, z_loaned_session_t, z_priority_t};
 
 /// Options passed to the `z_declare_publisher()` function.
 #[repr(C)]
@@ -216,7 +214,7 @@ pub unsafe extern "C" fn z_publisher_put(
             put = put.attachment(attachment);
         }
         if let Some(timestamp) = options.timestamp.as_ref() {
-            put = put.timestamp(Some(*timestamp.as_rust_type_ref()));
+            put = put.timestamp(Some(timestamp.into_rust_type()));
         }
     }
 
@@ -240,9 +238,7 @@ pub struct z_publisher_delete_options_t {
 #[no_mangle]
 #[allow(clippy::missing_safety_doc)]
 pub extern "C" fn z_publisher_delete_options_default(this: &mut z_publisher_delete_options_t) {
-    *this = z_publisher_delete_options_t {
-        timestamp: None,
-    }
+    *this = z_publisher_delete_options_t { timestamp: None }
 }
 /// Sends a `DELETE` message onto the publisher's key expression.
 ///
@@ -257,7 +253,7 @@ pub extern "C" fn z_publisher_delete(
     let mut del = publisher.delete();
     if let Some(options) = options {
         if let Some(timestamp) = options.timestamp.as_ref() {
-            del = del.timestamp(Some(*timestamp.as_rust_type_ref()));
+            del = del.timestamp(Some(timestamp.into_rust_type()));
         }
     }
     if let Err(e) = del.wait() {

src/put.rs

@@ -100,7 +100,7 @@ pub extern "C" fn z_put(
             put = put.attachment(attachment);
         }
         if let Some(timestamp) = options.timestamp.as_ref() {
-            put = put.timestamp(Some(*timestamp.as_rust_type_ref()));
+            put = put.timestamp(Some(timestamp.into_rust_type()));
         }
         put = put.priority(options.priority.into());
         put = put.congestion_control(options.congestion_control.into());
@@ -164,7 +164,7 @@ pub extern "C" fn z_delete(
     let mut del = session.delete(key_expr);
     if let Some(options) = options {
         if let Some(timestamp) = options.timestamp.as_ref() {
-            del = del.timestamp(Some(*timestamp.as_rust_type_ref()));
+            del = del.timestamp(Some(timestamp.into_rust_type()));
         }
         del = del
             .congestion_control(options.congestion_control.into())

src/queryable.rs

@@ -11,15 +11,16 @@
 // Contributors:
 //   ZettaScale Zenoh team, <[email protected]>
 //
-use crate::transmute::{IntoRustType, LoanedCTypeRef, RustTypeRef, RustTypeRefUninit};
+use crate::transmute::{
+    IntoRustType, LoanedCTypeRef, RustTypeRef, RustTypeRefUninit, TakeRustType,
+};
 use crate::{
     errors, z_closure_query_call, z_closure_query_loan, z_congestion_control_t, z_loaned_bytes_t,
     z_loaned_encoding_t, z_loaned_keyexpr_t, z_loaned_session_t, z_moved_bytes_t,
-    z_moved_closure_query_t, z_owned_bytes_t, z_owned_encoding_t, z_owned_source_info_t,
-    z_priority_t, z_timestamp_t, z_view_string_from_substr, z_view_string_t,
+    z_moved_closure_query_t, z_moved_encoding_t, z_moved_source_info_t, z_priority_t,
+    z_timestamp_t, z_view_string_from_substr, z_view_string_t,
 };
 use std::mem::MaybeUninit;
-use std::ptr::null_mut;
 use zenoh::core::Priority;
 use zenoh::core::Wait;
 use zenoh::encoding::Encoding;
@@ -117,33 +118,33 @@ pub extern "C" fn z_queryable_options_default(this: &mut z_queryable_options_t)
 #[repr(C)]
 pub struct z_query_reply_options_t {
     /// The encoding of the reply payload.
-    pub encoding: *mut z_owned_encoding_t,
+    pub encoding: z_moved_encoding_t,
     /// The congestion control to apply when routing the reply.
     pub congestion_control: z_congestion_control_t,
     /// The priority of the reply.
     pub priority: z_priority_t,
     /// If true, Zenoh will not wait to batch this operation with others to reduce the bandwith.
     pub is_express: bool,
     /// The timestamp of the reply.
-    pub timestamp: *mut z_timestamp_t,
+    pub timestamp: Option<&'static mut z_timestamp_t>,
     /// The source info for the reply.
-    pub source_info: *mut z_owned_source_info_t,
+    pub source_info: z_moved_source_info_t,
     /// The attachment to this reply.
-    pub attachment: *mut z_owned_bytes_t,
+    pub attachment: z_moved_bytes_t,
 }
 
 /// Constructs the default value for `z_query_reply_options_t`.
 #[no_mangle]
 #[allow(clippy::missing_safety_doc)]
 pub extern "C" fn z_query_reply_options_default(this: &mut z_query_reply_options_t) {
     *this = z_query_reply_options_t {
-        encoding: null_mut(),
+        encoding: None.into(),
         congestion_control: CongestionControl::Block.into(),
         priority: Priority::default().into(),
         is_express: false,
-        timestamp: null_mut(),
-        source_info: null_mut(),
-        attachment: null_mut(),
+        timestamp: None,
+        source_info: None.into(),
+        attachment: None.into(),
     };
 }
 
@@ -153,15 +154,15 @@ pub extern "C" fn z_query_reply_options_default(this: &mut z_query_reply_options
 #[repr(C)]
 pub struct z_query_reply_err_options_t {
     /// The encoding of the error payload.
-    pub encoding: *mut z_owned_encoding_t,
+    pub encoding: z_moved_encoding_t,
 }
 
 /// Constructs the default value for `z_query_reply_err_options_t`.
 #[no_mangle]
 #[allow(clippy::missing_safety_doc)]
 pub extern "C" fn z_query_reply_err_options_default(this: &mut z_query_reply_err_options_t) {
     *this = z_query_reply_err_options_t {
-        encoding: null_mut(),
+        encoding: None.into(),
     };
 }
 
@@ -177,11 +178,11 @@ pub struct z_query_reply_del_options_t {
     /// If true, Zenoh will not wait to batch this operation with others to reduce the bandwith.
     pub is_express: bool,
     /// The timestamp of the reply.
-    pub timestamp: *mut z_timestamp_t,
+    pub timestamp: Option<&'static mut z_timestamp_t>,
     /// The source info for the reply.
-    pub source_info: *mut z_owned_source_info_t,
+    pub source_info: z_moved_source_info_t,
     /// The attachment to this reply.
-    pub attachment: *mut z_owned_bytes_t,
+    pub attachment: z_moved_bytes_t,
 }
 
 /// Constructs the default value for `z_query_reply_del_options_t`.
@@ -192,9 +193,9 @@ pub extern "C" fn z_query_reply_del_options_default(this: &mut z_query_reply_del
         congestion_control: CongestionControl::Block.into(),
         priority: Priority::default().into(),
         is_express: false,
-        timestamp: null_mut(),
-        source_info: null_mut(),
-        attachment: null_mut(),
+        timestamp: None,
+        source_info: None.into(),
+        attachment: None.into(),
     };
 }
 
@@ -304,23 +305,17 @@ pub extern "C" fn z_query_reply(
 
     let mut reply = query.reply(key_expr, payload);
     if let Some(options) = options {
-        if let Some(encoding) = unsafe { options.encoding.as_mut() } {
-            let encoding = std::mem::take(encoding.as_rust_type_mut());
+        if let Some(encoding) = options.encoding.take_rust_type() {
             reply = reply.encoding(encoding);
         };
-        if let Some(source_info) = unsafe { options.source_info.as_mut() } {
-            let source_info = std::mem::take(source_info.as_rust_type_mut());
+        if let Some(source_info) = options.source_info.take_rust_type() {
             reply = reply.source_info(source_info);
         };
-        if let Some(attachment) = unsafe { options.attachment.as_mut() } {
-            let attachment = std::mem::take(attachment.as_rust_type_mut());
+        if let Some(attachment) = options.attachment.take_rust_type() {
             reply = reply.attachment(attachment);
         }
-        if !options.timestamp.is_null() {
-            let timestamp = *unsafe { options.timestamp.as_mut() }
-                .unwrap()
-                .as_rust_type_ref();
-            reply = reply.timestamp(Some(timestamp));
+        if let Some(timestamp) = options.timestamp.as_ref() {
+            reply = reply.timestamp(Some(timestamp.into_rust_type()));
         }
         reply = reply.priority(options.priority.into());
         reply = reply.congestion_control(options.congestion_control.into());
@@ -360,11 +355,7 @@ pub unsafe extern "C" fn z_query_reply_err(
 
     let reply = query.reply_err(payload).encoding(
         options
-            .and_then(|o| {
-                o.encoding
-                    .as_mut()
-                    .map(|e| std::mem::take(e.as_rust_type_mut()))
-            })
+            .and_then(|o| o.encoding.take_rust_type())
             .unwrap_or(Encoding::default()),
     );
 
@@ -399,19 +390,14 @@ pub unsafe extern "C" fn z_query_reply_del(
 
     let mut reply = query.reply_del(key_expr);
     if let Some(options) = options {
-        if let Some(source_info) = unsafe { options.source_info.as_mut() } {
-            let source_info = std::mem::take(source_info.as_rust_type_mut());
+        if let Some(source_info) = options.source_info.take_rust_type() {
             reply = reply.source_info(source_info);
         };
-        if let Some(attachment) = unsafe { options.attachment.as_mut() } {
-            let attachment = std::mem::take(attachment.as_rust_type_mut());
+        if let Some(attachment) = options.attachment.take_rust_type() {
             reply = reply.attachment(attachment);
         }
-        if !options.timestamp.is_null() {
-            let timestamp = *unsafe { options.timestamp.as_mut() }
-                .unwrap()
-                .as_rust_type_ref();
-            reply = reply.timestamp(Some(timestamp));
+        if let Some(timestamp) = options.timestamp.as_ref() {
+            reply = reply.timestamp(Some(timestamp.into_rust_type()));
         }
         reply = reply.priority(options.priority.into());
         reply = reply.congestion_control(options.congestion_control.into());