Migrate to Rust Edition 2024 (#76)

* update dependencies
* update edition to 2024 across all Cargo.toml files
* cargo fmt with edition 2024
* use unsafe blocks in unsafe extern "C" functions

Author: LeWimbes

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "3"
 members = [
     "rustecal",
     "rustecal-core",
@@ -23,5 +24,5 @@ members = [
     "rustecal-samples/pubsub/serde_receive",
     "rustecal-samples/service/mirror_client",
     "rustecal-samples/service/mirror_client_instances",
-    "rustecal-samples/service/mirror_server"
-    ]
+    "rustecal-samples/service/mirror_server",
+]

rustecal-core/Cargo.toml

@@ -2,7 +2,7 @@
 name          = "rustecal-core"
 version       = "0.1.6"
 authors       = ["Rex Schilasky"]
-edition       = "2021"
+edition       = "2024"
 description   = "Core API for Eclipse eCAL"
 license       = "Apache-2.0"
 repository    = "https://github.com/eclipse-ecal/rustecal"

rustecal-core/src/core.rs

@@ -18,7 +18,7 @@ use std::ptr;
 
 use crate::components::EcalComponents;
 use crate::configuration::Configuration;
-use crate::error::{check, RustecalError};
+use crate::error::{RustecalError, check};
 use crate::types::Version;
 
 /// Provides access to the core initialization, shutdown, and state‑checking functions of eCAL.

rustecal-pubsub/Cargo.toml

@@ -2,7 +2,7 @@
 name          = "rustecal-pubsub"
 version       = "0.1.7"
 authors       = ["Rex Schilasky"]
-edition       = "2021"
+edition       = "2024"
 description   = "Publish/Subscribe API for Eclipse eCAL"
 license       = "Apache-2.0"
 repository    = "https://github.com/eclipse-ecal/rustecal"

rustecal-pubsub/src/payload_writer.rs

@@ -33,13 +33,9 @@ thread_local! {
 pub(crate) unsafe extern "C" fn write_full_cb(buffer: *mut c_void, size: usize) -> c_int {
     CURRENT_WRITER.with(|cell| {
         if let Some(writer_ptr) = *cell.borrow() {
-            let writer: &mut dyn PayloadWriter = &mut *writer_ptr;
-            let buf = std::slice::from_raw_parts_mut(buffer as *mut u8, size);
-            if writer.write_full(buf) {
-                0
-            } else {
-                -1
-            }
+            let writer: &mut dyn PayloadWriter = unsafe { &mut *writer_ptr };
+            let buf = unsafe { std::slice::from_raw_parts_mut(buffer as *mut u8, size) };
+            if writer.write_full(buf) { 0 } else { -1 }
         } else {
             -1
         }
@@ -50,13 +46,9 @@ pub(crate) unsafe extern "C" fn write_full_cb(buffer: *mut c_void, size: usize)
 pub(crate) unsafe extern "C" fn write_mod_cb(buffer: *mut c_void, size: usize) -> c_int {
     CURRENT_WRITER.with(|cell| {
         if let Some(writer_ptr) = *cell.borrow() {
-            let writer: &mut dyn PayloadWriter = &mut *writer_ptr;
-            let buf = std::slice::from_raw_parts_mut(buffer as *mut u8, size);
-            if writer.write_modified(buf) {
-                0
-            } else {
-                -1
-            }
+            let writer: &mut dyn PayloadWriter = unsafe { &mut *writer_ptr };
+            let buf = unsafe { std::slice::from_raw_parts_mut(buffer as *mut u8, size) };
+            if writer.write_modified(buf) { 0 } else { -1 }
         } else {
             -1
         }
@@ -67,7 +59,7 @@ pub(crate) unsafe extern "C" fn write_mod_cb(buffer: *mut c_void, size: usize) -
 pub(crate) unsafe extern "C" fn get_size_cb() -> usize {
     CURRENT_WRITER.with(|cell| {
         if let Some(writer_ptr) = *cell.borrow() {
-            let writer: &mut dyn PayloadWriter = &mut *writer_ptr;
+            let writer: &mut dyn PayloadWriter = unsafe { &mut *writer_ptr };
             writer.get_size()
         } else {
             0

rustecal-pubsub/src/publisher.rs

@@ -1,5 +1,5 @@
 use crate::payload_writer::{
-    get_size_cb, write_full_cb, write_mod_cb, PayloadWriter, CURRENT_WRITER,
+    CURRENT_WRITER, PayloadWriter, get_size_cb, write_full_cb, write_mod_cb,
 };
 use crate::types::TopicId;
 use rustecal_core::types::DataTypeInfo;

rustecal-pubsub/src/typed_subscriber.rs

@@ -3,7 +3,7 @@ use crate::types::TopicId;
 use rustecal_core::types::DataTypeInfo;
 use rustecal_sys::{eCAL_SDataTypeInformation, eCAL_SReceiveCallbackData, eCAL_STopicId};
 use std::{
-    ffi::{c_void, CStr},
+    ffi::{CStr, c_void},
     marker::PhantomData,
     slice,
 };

rustecal-samples/benchmarks/performance_receive/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "performance_receive"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 rustecal = { path = "../../../rustecal", features = ["pubsub"] }

rustecal-samples/benchmarks/performance_receive/src/main.rs

@@ -6,7 +6,7 @@ use rustecal::{Ecal, EcalComponents, TypedSubscriber};
 use rustecal_types_bytes::BytesMessage;
 use std::thread::sleep;
 use std::{
-    sync::{atomic::Ordering, Arc, Mutex},
+    sync::{Arc, Mutex, atomic::Ordering},
     thread,
     time::{Duration, Instant},
 };

rustecal-samples/benchmarks/performance_send/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "performance_send"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 rustecal = { path = "../../../rustecal", features = ["pubsub"] }