Update to Rust 1.93 and 2024 edition & fix test_agent build

MODULE.bazel

@@ -106,9 +106,9 @@ git_override(
 )
 
 # Rust toolchain
-RUST_EDITION = "2021"
+RUST_EDITION = "2024"
 
-RUST_VERSION = "1.83.0"
+RUST_VERSION = "1.93.0"
 
 rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
 rust.toolchain(

examples/rust/cycle-benchmark/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "cycle-benchmark"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [[bin]]
 path = "src/bin/cycle_bench.rs"

examples/rust/cycle-benchmark/src/bin/cycle_bench.rs

@@ -208,7 +208,7 @@ mod direct_mpsc {
         _: ApplicationConfig,
         _: &TypeRegistry,
         _: RecordingRules,
-    ) -> RecorderConfig {
+    ) -> RecorderConfig<'_> {
         panic!("direct mpsc signalling does not support recorders");
     }
 }
@@ -283,7 +283,7 @@ mod direct_sockets {
         type_registry: &TypeRegistry,
         recording_rules: RecordingRules,
         signalling: SignallingType,
-    ) -> RecorderConfig {
+    ) -> RecorderConfig<'_> {
         let agent_id = params.agent_id;
         RecorderConfig {
             id: agent_id,
@@ -371,7 +371,7 @@ mod relayed_sockets {
         type_registry: &TypeRegistry,
         recording_rules: RecordingRules,
         signalling: SignallingType,
-    ) -> RecorderConfig {
+    ) -> RecorderConfig<'_> {
         let agent_id = params.agent_id;
         let endpoints = endpoints(&app_config, signalling);
         RecorderConfig {

examples/rust/cycle-benchmark/src/config.rs

@@ -377,10 +377,14 @@ fn check_consistency(
         .copied()
         .collect();
 
-    assert_eq!(all_activities_workers, depending_activities,
-               "Set of activities assigned to workers does not match set of activities listed as dependants in activity dependencies");
-    assert_eq!(all_activities_workers, all_activities_dependencies,
-               "Set of activities assigned to workers does not include all activities mentioned in activity dependencies");
+    assert_eq!(
+        all_activities_workers, depending_activities,
+        "Set of activities assigned to workers does not match set of activities listed as dependants in activity dependencies"
+    );
+    assert_eq!(
+        all_activities_workers, all_activities_dependencies,
+        "Set of activities assigned to workers does not include all activities mentioned in activity dependencies"
+    );
 }
 
 /// Configuration of the benchmark application

examples/rust/mini-adas/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "mini-adas"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [[bin]]
 path = "src/bin/adas_deserializer.rs"

examples/rust/mini-adas/src/activities/components.rs

@@ -396,13 +396,13 @@ impl Activity for BrakeController {
         debug!("Stepping BrakeController");
         sleep_random();
 
-        if let Ok(brake_instruction) = self.input_brake_instruction.read() {
-            if brake_instruction.active {
-                debug!(
-                    "BrakeController activating brakes with level {:.3}",
-                    brake_instruction.level
-                )
-            }
+        if let Ok(brake_instruction) = self.input_brake_instruction.read()
+            && brake_instruction.active
+        {
+            debug!(
+                "BrakeController activating brakes with level {:.3}",
+                brake_instruction.level
+            )
         }
         Ok(())
     }

examples/rust/mini-adas/src/bin/adas_primary.rs

@@ -13,10 +13,10 @@
 
 use feo::agent::com_init::initialize_com_primary;
 use feo::ids::AgentId;
-use feo_log::{info, LevelFilter};
+use feo_log::{LevelFilter, info};
 use feo_time::Duration;
 use mini_adas::config::{
-    agent_assignments_ids, topic_dependencies, COM_BACKEND, MAX_ADDITIONAL_SUBSCRIBERS,
+    COM_BACKEND, MAX_ADDITIONAL_SUBSCRIBERS, agent_assignments_ids, topic_dependencies,
 };
 use std::collections::HashSet;
 
@@ -92,7 +92,7 @@ impl Params {
 
 #[cfg(feature = "signalling_direct_mpsc")]
 mod cfg {
-    use super::{Duration, Params, AGENT_ID};
+    use super::{AGENT_ID, Duration, Params};
     use mini_adas::config::{activity_dependencies, agent_assignments};
 
     pub(super) use feo::agent::direct::primary_mpsc::{Primary, PrimaryConfig};
@@ -113,13 +113,13 @@ mod cfg {
 
 #[cfg(feature = "signalling_direct_tcp")]
 mod cfg {
-    use super::{check_ids, Duration, Params, AGENT_ID};
+    use super::{AGENT_ID, Duration, Params, check_ids};
     use feo::{
         agent::NodeAddress,
         ids::{ActivityId, AgentId, WorkerId},
     };
     use mini_adas::config::{
-        activity_dependencies, agent_assignments, worker_agent_map, BIND_ADDR,
+        BIND_ADDR, activity_dependencies, agent_assignments, worker_agent_map,
     };
     use std::collections::{HashMap, HashSet};
 
@@ -160,7 +160,7 @@ mod cfg {
 
 #[cfg(feature = "signalling_direct_unix")]
 mod cfg {
-    use super::{check_ids, Duration, Params, AGENT_ID};
+    use super::{AGENT_ID, Duration, Params, check_ids};
     use feo::{
         agent::NodeAddress,
         ids::{ActivityId, AgentId, WorkerId},
@@ -207,11 +207,11 @@ mod cfg {
 
 #[cfg(feature = "signalling_relayed_tcp")]
 mod cfg {
-    use super::{check_ids, Duration, Params, AGENT_ID};
+    use super::{AGENT_ID, Duration, Params, check_ids};
     use feo::agent::NodeAddress;
     use feo::ids::{ActivityId, AgentId, WorkerId};
     use mini_adas::config::{
-        activity_dependencies, agent_assignments, worker_agent_map, BIND_ADDR, BIND_ADDR2,
+        BIND_ADDR, BIND_ADDR2, activity_dependencies, agent_assignments, worker_agent_map,
     };
     use std::collections::{HashMap, HashSet};
 
@@ -248,7 +248,7 @@ mod cfg {
 
 #[cfg(feature = "signalling_relayed_unix")]
 mod cfg {
-    use super::{check_ids, Duration, Params, AGENT_ID};
+    use super::{AGENT_ID, Duration, Params, check_ids};
     use feo::agent::NodeAddress;
     use feo::ids::{ActivityId, AgentId, WorkerId};
     use mini_adas::config::{

examples/rust/mini-adas/src/bin/adas_recorder.rs

@@ -13,16 +13,16 @@
 
 use feo::ids::AgentId;
 use feo::recording::recorder::RecordingRules;
-use feo_log::{debug, LevelFilter};
+use feo_log::{LevelFilter, debug};
 use mini_adas::activities::messages::{
     self, BrakeInstruction, CameraImage, RadarScan, Scene, Steering,
 };
 
 use feo::agent::com_init::initialize_com_recorder;
 use feo::topicspec::TopicSpecification;
 use mini_adas::config::{
-    topic_dependencies, COM_BACKEND, TOPIC_CAMERA_FRONT, TOPIC_CONTROL_BRAKES,
-    TOPIC_CONTROL_STEERING, TOPIC_INFERRED_SCENE, TOPIC_RADAR_FRONT,
+    COM_BACKEND, TOPIC_CAMERA_FRONT, TOPIC_CONTROL_BRAKES, TOPIC_CONTROL_STEERING,
+    TOPIC_INFERRED_SCENE, TOPIC_RADAR_FRONT, topic_dependencies,
 };
 use std::collections::HashMap;
 
@@ -97,7 +97,7 @@ mod cfg {
         agent_id: AgentId,
         rules: RecordingRules,
         registry: &TypeRegistry,
-    ) -> RecorderConfig {
+    ) -> RecorderConfig<'_> {
         RecorderConfig {
             id: agent_id,
             record_file: "./rec.bin",

examples/rust/mini-adas/src/bin/adas_secondary.rs

@@ -14,17 +14,17 @@
 #[cfg(any(feature = "signalling_direct_tcp", feature = "signalling_direct_unix"))]
 fn main() {
     use core::time::Duration;
+    use feo::agent::NodeAddress;
     use feo::agent::com_init::initialize_com_secondary;
     use feo::agent::direct::secondary::{Secondary, SecondaryConfig};
-    use feo::agent::NodeAddress;
     use feo::ids::ActivityId;
-    use feo_log::{info, LevelFilter};
-    #[cfg(feature = "signalling_direct_unix")]
-    use mini_adas::config::socket_paths;
+    use feo_log::{LevelFilter, info};
     #[cfg(feature = "signalling_direct_tcp")]
     use mini_adas::config::BIND_ADDR;
+    #[cfg(feature = "signalling_direct_unix")]
+    use mini_adas::config::socket_paths;
+    use mini_adas::config::{COM_BACKEND, agent_assignments_ids};
     use mini_adas::config::{agent_assignments, topic_dependencies};
-    use mini_adas::config::{agent_assignments_ids, COM_BACKEND};
     use params::Params;
     use std::collections::HashSet;
 
@@ -64,14 +64,14 @@ fn main() {
 #[cfg(feature = "signalling_relayed_tcp")]
 fn main() {
     use core::time::Duration;
+    use feo::agent::NodeAddress;
     use feo::agent::com_init::initialize_com_secondary;
     use feo::agent::relayed::secondary::{Secondary, SecondaryConfig};
-    use feo::agent::NodeAddress;
     use feo::ids::ActivityId;
-    use feo_log::{info, LevelFilter};
-    use mini_adas::config::{agent_assignments, topic_dependencies};
-    use mini_adas::config::{agent_assignments_ids, COM_BACKEND};
+    use feo_log::{LevelFilter, info};
     use mini_adas::config::{BIND_ADDR, BIND_ADDR2};
+    use mini_adas::config::{COM_BACKEND, agent_assignments_ids};
+    use mini_adas::config::{agent_assignments, topic_dependencies};
     use params::Params;
     use std::collections::HashSet;
 
@@ -109,14 +109,14 @@ fn main() {
 #[cfg(feature = "signalling_relayed_unix")]
 fn main() {
     use core::time::Duration;
+    use feo::agent::NodeAddress;
     use feo::agent::com_init::initialize_com_secondary;
     use feo::agent::relayed::secondary::{Secondary, SecondaryConfig};
-    use feo::agent::NodeAddress;
     use feo::ids::ActivityId;
-    use feo_log::{info, LevelFilter};
+    use feo_log::{LevelFilter, info};
     use mini_adas::config::socket_paths;
+    use mini_adas::config::{COM_BACKEND, agent_assignments_ids};
     use mini_adas::config::{agent_assignments, topic_dependencies};
-    use mini_adas::config::{agent_assignments_ids, COM_BACKEND};
     use params::Params;
     use std::collections::HashSet;
 

feo-com/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "feo-com"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 feo-log = { workspace = true }

feo-com/src/linux_shm/mod.rs

@@ -48,17 +48,17 @@ use alloc::sync::Arc;
 use alloc::vec::Vec;
 use core::fmt::Debug;
 use core::marker::PhantomData;
-use core::mem::{size_of, MaybeUninit};
+use core::mem::{MaybeUninit, size_of};
 use core::ops::{Deref, DerefMut};
 use core::slice::from_raw_parts;
 use core::sync::atomic::Ordering;
 use feo_log::{debug, error, info};
 use nix::fcntl::OFlag;
-use nix::sys::mman::{mmap, shm_open, MapFlags, ProtFlags};
+use nix::sys::mman::{MapFlags, ProtFlags, mmap, shm_open};
 use nix::sys::stat::Mode;
 use nix::unistd;
 use std::collections::HashMap;
-use std::io::{read_to_string, Write};
+use std::io::{Write, read_to_string};
 use std::net::Shutdown;
 use std::os::fd::OwnedFd;
 use std::os::unix::net::{UnixListener, UnixStream};

feo-com/src/linux_shm/shared_memory.rs

@@ -17,7 +17,7 @@ use core::fmt::Debug;
 use core::marker::PhantomData;
 use core::ops::{Deref, DerefMut};
 use core::ptr;
-use core::sync::atomic::{fence, AtomicBool, AtomicPtr, AtomicU16, Ordering};
+use core::sync::atomic::{AtomicBool, AtomicPtr, AtomicU16, Ordering, fence};
 
 // Mode of shared memory mapping
 #[derive(Debug, Clone, Copy)]

feo-cpp-build/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "feo-cpp-build"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 cc = { workspace = true }

feo-cpp-macros/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "feo-cpp-macros"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 
 [lib]
-proc-macro = true
+proc-macro = true

feo-log/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "feo-log"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 # The `std` feature is currently required for the `set_boxed_logger` call.

feo-log/examples/hello.rs

@@ -12,7 +12,7 @@
  ********************************************************************************/
 
 use core::time;
-use feo_log::{error, log, warn, Level, LevelFilter};
+use feo_log::{Level, LevelFilter, error, log, warn};
 use std::thread;
 
 fn main() {

feo-log/src/ffi.rs

@@ -12,7 +12,7 @@
  ********************************************************************************/
 
 use log::{Level, LevelFilter, Record};
-use std::ffi::{c_char, c_int, CStr};
+use std::ffi::{CStr, c_char, c_int};
 
 #[allow(non_camel_case_types)]
 type feo_log_Level = ::std::os::raw::c_int;
@@ -33,7 +33,7 @@ const LEVEL_FILTER_INFO: feo_log_Level = 3;
 const LEVEL_FILTER_DEBUG: feo_log_Level = 4;
 const LEVEL_FILTER_TRACE: feo_log_Level = 5;
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn __log(
     file: *const c_char,
     line: c_int,
@@ -85,7 +85,7 @@ extern "C" fn __log(
 }
 
 /// Set the maximum log level
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn __set_max_level(level_filter: feo_log_Level_Filter) {
     let level_filter = match level_filter {
         LEVEL_FILTER_OFF => LevelFilter::Off,
@@ -99,7 +99,7 @@ extern "C" fn __set_max_level(level_filter: feo_log_Level_Filter) {
     log::set_max_level(level_filter);
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn __max_level() -> feo_log_Level_Filter {
     match log::max_level() {
         LevelFilter::Off => LEVEL_FILTER_OFF,

feo-logger/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "feo-logger"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 console = { workspace = true }

feo-logger/src/ffi.rs

@@ -13,7 +13,7 @@
 
 use std::ffi::c_int;
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn __init(level_filter: c_int, console: bool, logd: bool) {
     let level_filter = match level_filter {
         0 => feo_log::LevelFilter::Off,

feo-logger/src/fmt.rs

@@ -12,7 +12,7 @@
  ********************************************************************************/
 
 use crate::record::{OwnedRecord, Record};
-use console::{style, Color, StyledObject};
+use console::{Color, StyledObject, style};
 use core::str;
 use core::sync::atomic::{self, AtomicUsize, Ordering};
 use feo_log::Level;