moved type with into_rust_type trait, comiles without shm

Author: milyin

include/zenoh_commons.h

@@ -46,12 +46,13 @@ pub struct z_loaned_closure_hello_t {
 /// Moved closure.
 #[repr(C)]
 pub struct z_moved_closure_hello_t {
-    pub ptr: &'static mut z_owned_closure_hello_t,
+    pub ptr: Option<&'static mut z_owned_closure_hello_t>,
 }
 
 decl_c_type!(
-    owned(z_owned_closure_hello_t, z_moved_closure_hello_t),
-    loaned(z_loaned_closure_hello_t)
+    owned(z_owned_closure_hello_t),
+    loaned(z_loaned_closure_hello_t),
+    moved(z_moved_closure_hello_t)
 );
 
 impl Default for z_owned_closure_hello_t {

include/zenoh_macros.h

@@ -44,15 +44,13 @@ pub struct zcu_loaned_closure_matching_status_t {
 /// Moved closure.
 #[repr(C)]
 pub struct zcu_moved_closure_matching_status_t {
-    pub ptr: &'static mut zcu_owned_closure_matching_status_t,
+    pub ptr: Option<&'static mut zcu_owned_closure_matching_status_t>,
 }
 
 decl_c_type!(
-    owned(
-        zcu_owned_closure_matching_status_t,
-        zcu_moved_closure_matching_status_t
-    ),
-    loaned(zcu_loaned_closure_matching_status_t)
+    owned(zcu_owned_closure_matching_status_t),
+    loaned(zcu_loaned_closure_matching_status_t),
+    moved(zcu_moved_closure_matching_status_t)
 );
 
 impl Default for zcu_owned_closure_matching_status_t {

src/closures/hello_closure.rs

@@ -27,12 +27,9 @@ pub use crate::opaque_types::z_loaned_fifo_handler_query_t;
 pub use crate::opaque_types::z_moved_fifo_handler_query_t;
 pub use crate::opaque_types::z_owned_fifo_handler_query_t;
 decl_c_type!(
-    owned(
-        z_owned_fifo_handler_query_t,
-        Option<flume::Receiver<Query>>,
-    ),
+    owned(z_owned_fifo_handler_query_t, Option<flume::Receiver<Query>>),
     loaned(z_loaned_fifo_handler_query_t, flume::Receiver<Query>),
-moved(z_moved_fifo_handler_query_t)
+    moved(z_moved_fifo_handler_query_t)
 );
 
 /// Drops the handler and resets it to a gravestone state.
@@ -147,9 +144,9 @@ pub use crate::opaque_types::z_owned_ring_handler_query_t;
 decl_c_type!(
     owned(
         z_owned_ring_handler_query_t,
-        Option<RingChannelHandler<Query>>,
+        option RingChannelHandler<Query>,
     ),
-    loaned(z_loaned_ring_handler_query_t, RingChannelHandler<Query>),
+    loaned(z_loaned_ring_handler_query_t),
 moved(z_moved_ring_handler_query_t)
 );
 

src/closures/matching_status_closure.rs

@@ -45,12 +45,13 @@ pub struct z_loaned_closure_query_t {
 /// Moved closure.
 #[repr(C)]
 pub struct z_moved_closure_query_t {
-    pub ptr: &'static mut z_owned_closure_query_t,
+    pub ptr: Option<&'static mut z_owned_closure_query_t>,
 }
 
 decl_c_type!(
-    owned(z_owned_closure_query_t, z_moved_closure_query_t),
-    loaned(z_loaned_closure_query_t)
+    owned(z_owned_closure_query_t),
+    loaned(z_loaned_closure_query_t),
+    moved(z_moved_closure_query_t)
 );
 
 impl Default for z_owned_closure_query_t {
@@ -155,12 +156,13 @@ pub struct z_loaned_closure_owned_query_t {
 /// Moved closure.
 #[repr(C)]
 pub struct z_moved_closure_owned_query_t {
-    pub ptr: &'static mut z_owned_closure_owned_query_t,
+    pub ptr: Option<&'static mut z_owned_closure_owned_query_t>,
 }
 
 decl_c_type!(
-    owned(z_owned_closure_owned_query_t, z_moved_closure_owned_query_t),
-    loaned(z_loaned_closure_owned_query_t)
+    owned(z_owned_closure_owned_query_t),
+    loaned(z_loaned_closure_owned_query_t),
+    moved(z_moved_closure_owned_query_t)
 );
 
 impl Default for z_owned_closure_owned_query_t {

src/closures/query_channel.rs

@@ -45,12 +45,13 @@ pub struct z_loaned_closure_reply_t {
 /// Moved closure.
 #[repr(C)]
 pub struct z_moved_closure_reply_t {
-    pub ptr: &'static mut z_owned_closure_reply_t,
+    pub ptr: Option<&'static mut z_owned_closure_reply_t>,
 }
 
 decl_c_type!(
-    owned(z_owned_closure_reply_t, z_moved_closure_reply_t),
-    loaned(z_loaned_closure_reply_t)
+    owned(z_owned_closure_reply_t),
+    loaned(z_loaned_closure_reply_t),
+    moved(z_moved_closure_reply_t)
 );
 
 impl Default for z_owned_closure_reply_t {

src/closures/query_closure.rs

@@ -27,12 +27,9 @@ pub use crate::opaque_types::z_loaned_fifo_handler_sample_t;
 pub use crate::opaque_types::z_moved_fifo_handler_sample_t;
 pub use crate::opaque_types::z_owned_fifo_handler_sample_t;
 decl_c_type!(
-    owned(
-        z_owned_fifo_handler_sample_t,
-        Option<flume::Receiver<Sample>>,
-    ),
+    owned(z_owned_fifo_handler_sample_t, Option<flume::Receiver<Sample>>),
     loaned(z_loaned_fifo_handler_sample_t, flume::Receiver<Sample>),
-moved(z_moved_fifo_handler_sample_t)
+    moved(z_moved_fifo_handler_sample_t)
 );
 
 /// Drops the handler and resets it to a gravestone state.
@@ -149,9 +146,9 @@ pub use crate::opaque_types::z_owned_ring_handler_sample_t;
 decl_c_type!(
     owned(
         z_owned_ring_handler_sample_t,
-        Option<RingChannelHandler<Sample>>,
+        option RingChannelHandler<Sample>,
     ),
-    loaned(z_loaned_ring_handler_sample_t, RingChannelHandler<Sample>),
+    loaned(z_loaned_ring_handler_sample_t),
 moved(z_moved_ring_handler_sample_t)
 );
 

src/closures/reply_closure.rs

@@ -45,12 +45,13 @@ pub struct z_loaned_closure_sample_t {
 /// Moved closure.
 #[repr(C)]
 pub struct z_moved_closure_sample_t {
-    pub ptr: &'static mut z_owned_closure_sample_t,
+    pub ptr: Option<&'static mut z_owned_closure_sample_t>,
 }
 
 decl_c_type!(
-    owned(z_owned_closure_sample_t, z_moved_closure_sample_t),
-    loaned(z_loaned_closure_sample_t)
+    owned(z_owned_closure_sample_t),
+    loaned(z_loaned_closure_sample_t),
+    moved(z_moved_closure_sample_t)
 );
 
 impl Default for z_owned_closure_sample_t {

src/closures/sample_channel.rs

@@ -45,12 +45,13 @@ pub struct z_loaned_closure_zid_t {
 /// Moved closure.
 #[repr(C)]
 pub struct z_moved_closure_zid_t {
-    pub ptr: &'static mut z_owned_closure_zid_t,
+    pub ptr: Option<&'static mut z_owned_closure_zid_t>,
 }
 
 decl_c_type!(
-    owned(z_owned_closure_zid_t, z_moved_closure_zid_t),
-    loaned(z_loaned_closure_zid_t)
+    owned(z_owned_closure_zid_t),
+    loaned(z_loaned_closure_zid_t),
+    moved(z_moved_closure_zid_t)
 );
 
 impl Default for z_owned_closure_zid_t {