Rust 1.77 toolchain - Fix alignment and layout for z_owned_reply_t

include/zenoh_commons.h

@@ -346,8 +346,8 @@ typedef struct z_owned_closure_query_t {
  * To check if `val` is still valid, you may use `z_X_check(&val)` (or `z_check(val)` if your compiler supports `_Generic`), which will return `true` if `val` is valid.
  */
 #if defined(TARGET_ARCH_X86_64)
-typedef struct ALIGN(8) z_owned_reply_t {
-  uint64_t _0[28];
+typedef struct ALIGN(16) z_owned_reply_t {
+  uint64_t _0[30];
 } z_owned_reply_t;
 #endif
 #if defined(TARGET_ARCH_AARCH64)

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.72.0"
+channel = "1.77.0"

src/get.rs

@@ -49,8 +49,8 @@ type ReplyInner = Option<Reply>;
 ///
 /// To check if `val` is still valid, you may use `z_X_check(&val)` (or `z_check(val)` if your compiler supports `_Generic`), which will return `true` if `val` is valid.
 #[cfg(target_arch = "x86_64")]
-#[repr(C, align(8))]
-pub struct z_owned_reply_t([u64; 28]);
+#[repr(C, align(16))]
+pub struct z_owned_reply_t([u64; 30]);
 
 #[cfg(target_arch = "aarch64")]
 #[repr(C, align(16))]

src/liveliness.rs

@@ -173,7 +173,7 @@ pub extern "C" fn zc_liveliness_declare_subscriber(
         return z_owned_subscriber_t::null();
     };
     let callback = core::mem::replace(callback, z_owned_closure_sample_t::empty());
-    match session
+    let res = session
         .liveliness()
         .declare_subscriber(key)
         .callback(move |sample| {
@@ -185,8 +185,8 @@ pub extern "C" fn zc_liveliness_declare_subscriber(
             let sample = z_sample_t::new(&sample, &owner);
             z_closure_sample_call(&callback, &sample)
         })
-        .res()
-    {
+        .res();
+    match res {
         Ok(token) => z_owned_subscriber_t::new(token),
         Err(e) => {
             log::error!("Failed to subscribe to liveliness: {e}");

src/querying_subscriber.rs

@@ -202,7 +202,7 @@ pub unsafe extern "C" fn ze_declare_querying_subscriber(
                         .query_timeout(std::time::Duration::from_millis(options.query_timeout_ms));
                 }
             }
-            match sub
+            let res = sub
                 .callback(move |sample| {
                     let payload = sample.payload.contiguous();
                     let owner = match payload {
@@ -212,8 +212,8 @@ pub unsafe extern "C" fn ze_declare_querying_subscriber(
                     let sample = z_sample_t::new(&sample, &owner);
                     z_closure_sample_call(&closure, &sample)
                 })
-                .res()
-            {
+                .res();
+            match res {
                 Ok(sub) => ze_owned_querying_subscriber_t::new(sub, session),
                 Err(e) => {
                     log::debug!("{}", e);