Linting fixes after logging lifecycle improvements

Author: geoff-imdex

rclrs/src/logging.rs

@@ -3,7 +3,7 @@
 // Adapted from https://github.com/sequenceplanner/r2r/blob/89cec03d07a1496a225751159cbc7bfb529d9dd1/r2r/src/utils.rs
 // Further adapted from https://github.com/mvukov/rules_ros2/pull/371
 
-use std::{ffi::CString, sync::Mutex, time::Duration};
+use std::{ffi::CString, time::Duration};
 
 use crate::{rcl_bindings::*, ENTITY_LIFECYCLE_MUTEX};
 

rclrs/src/logging/logging_configuration.rs

@@ -1,14 +1,13 @@
-use std::sync::{Mutex, Weak, LazyLock, Arc};
+use std::sync::{Arc, LazyLock, Mutex, Weak};
 
 use crate::{
-    RclrsError, ENTITY_LIFECYCLE_MUTEX, ToResult,
     rcl_bindings::{
-        rcl_context_t, rcl_arguments_t, rcutils_get_default_allocator,
-        rcl_logging_configure, rcl_logging_fini,
+        rcl_arguments_t, rcl_context_t, rcl_logging_configure, rcl_logging_fini,
+        rcutils_get_default_allocator,
     },
+    RclrsError, ToResult, ENTITY_LIFECYCLE_MUTEX,
 };
 
-
 struct LoggingConfiguration {
     lifecycle: Mutex<Weak<LoggingLifecycle>>,
 }
@@ -30,10 +29,13 @@ impl LoggingLifecycle {
     }
 
     /// SAFETY: Ensure rcl_context_t is valid before passing it in.
-    pub(crate) unsafe fn configure(context: &rcl_context_t) -> Result<Arc<LoggingLifecycle>, RclrsError> {
-        static CONFIGURATION: LazyLock<LoggingConfiguration> = LazyLock::new(
-            || LoggingConfiguration { lifecycle: Mutex::new(Weak::new())}
-        );
+    pub(crate) unsafe fn configure(
+        context: &rcl_context_t,
+    ) -> Result<Arc<LoggingLifecycle>, RclrsError> {
+        static CONFIGURATION: LazyLock<LoggingConfiguration> =
+            LazyLock::new(|| LoggingConfiguration {
+                lifecycle: Mutex::new(Weak::new()),
+            });
 
         let mut lifecycle = CONFIGURATION.lifecycle.lock().unwrap();
         if let Some(arc_lifecycle) = lifecycle.upgrade() {
@@ -48,6 +50,8 @@ impl LoggingLifecycle {
 impl Drop for LoggingLifecycle {
     fn drop(&mut self) {
         let _lock = ENTITY_LIFECYCLE_MUTEX.lock().unwrap();
-        unsafe { rcl_logging_fini(); }
+        unsafe {
+            rcl_logging_fini();
+        }
     }
 }

rclrs/src/node/graph.rs

@@ -493,7 +493,10 @@ mod tests {
             .unwrap();
 
         assert_eq!(names_and_topics.len(), 1);
-        assert_eq!(names_and_topics.get("/rosout").unwrap().first().unwrap(), "rcl_interfaces/msg/Log");
+        assert_eq!(
+            names_and_topics.get("/rosout").unwrap().first().unwrap(),
+            "rcl_interfaces/msg/Log"
+        );
 
         let num_publishers = node.count_publishers("/test").unwrap();
 
@@ -540,7 +543,10 @@ mod tests {
         let names_and_topics = node.get_topic_names_and_types().unwrap();
 
         assert_eq!(names_and_topics.len(), 1);
-        assert_eq!(names_and_topics.get("/rosout").unwrap().first().unwrap(), "rcl_interfaces/msg/Log");
+        assert_eq!(
+            names_and_topics.get("/rosout").unwrap().first().unwrap(),
+            "rcl_interfaces/msg/Log"
+        );
     }
 
     #[test]

rclrs/src/time_source.rs

@@ -149,7 +149,11 @@ mod tests {
 
     #[test]
     fn time_source_default_clock() {
-        let node = create_node(&Context::new([]).unwrap(), &format!("time_source_test_node_{}", line!())).unwrap();
+        let node = create_node(
+            &Context::new([]).unwrap(),
+            &format!("time_source_test_node_{}", line!()),
+        )
+        .unwrap();
         // Default clock should be above 0 (use_sim_time is default false)
         assert!(node.get_clock().now().nsec > 0);
     }