Minor cleanup

Signed-off-by: Luca Della Vedova <[email protected]>

Author: luca-della-vedova

rclrs/src/dynamic_message/dynamic_publisher.rs

@@ -51,7 +51,7 @@ impl DynamicPublisher {
     /// Creates a new `DynamicPublisher`.
     ///
     /// Node and namespace changes are always applied _before_ topic remapping.
-    pub fn new(
+    pub(crate) fn new(
         node_handle: &Arc<NodeHandle>,
         topic: &str,
         topic_type: MessageTypeName,

rclrs/src/dynamic_message/dynamic_subscription.rs

@@ -2,7 +2,6 @@ use std::any::Any;
 use std::boxed::Box;
 use std::ffi::{CStr, CString};
 use std::ops::{Deref, DerefMut};
-use std::sync::atomic::AtomicBool;
 use std::sync::{Arc, Mutex};
 
 use futures::future::BoxFuture;
@@ -13,9 +12,9 @@ use super::{
 };
 use crate::rcl_bindings::*;
 use crate::{
-    MessageInfo, Node, NodeHandle, QoSProfile, RclPrimitive, RclPrimitiveHandle, RclPrimitiveKind,
-    RclReturnCode, RclrsError, SubscriptionHandle, ToResult, Waitable, WaitableLifecycle,
-    WorkScope, WorkerCommands, ENTITY_LIFECYCLE_MUTEX,
+    MessageInfo, NodeHandle, QoSProfile, RclPrimitive, RclPrimitiveHandle, RclPrimitiveKind,
+    RclrsError, SubscriptionHandle, ToResult, Waitable, WaitableLifecycle, WorkScope,
+    WorkerCommands, ENTITY_LIFECYCLE_MUTEX,
 };
 
 struct DynamicSubscriptionExecutable<Payload> {
@@ -85,7 +84,7 @@ impl<Payload> From<WorkerDynamicSubscriptionCallback<Payload>>
 }
 
 impl<Payload: 'static> DynamicSubscriptionCallback<Payload> {
-    pub(super) fn execute(
+    fn execute(
         &mut self,
         executable: &DynamicSubscriptionExecutable<Payload>,
         any_payload: &mut dyn Any,
@@ -266,15 +265,6 @@ where
             metadata,
             type_support_library,
         }))
-
-        /*
-        Ok(Self {
-            handle,
-            callback: Mutex::new(Box::new(callback)),
-            metadata,
-            type_support_library,
-        })
-        */
     }
 
     /// Returns the topic name of the subscription.

rclrs/src/node.rs

@@ -5,13 +5,6 @@ mod primitive_options;
 pub use primitive_options::*;
 
 mod graph;
-/*
-<<<<<<< HEAD
-
-pub use self::builder::*;
-pub use self::graph::*;
-=======
-*/
 #[cfg(feature = "dyn_msg")]
 use crate::dynamic_message::{DynamicMessage, DynamicSubscription};
 use crate::QoSProfile;
@@ -27,9 +20,8 @@ use std::{
     ffi::CStr,
     fmt,
     os::raw::c_char,
-    sync::{atomic::AtomicBool, Arc, Mutex, Weak},
+    sync::{atomic::AtomicBool, Arc, Mutex},
     time::Duration,
-    vec::Vec,
 };
 
 use futures::{

rclrs/src/subscription.rs

@@ -12,9 +12,6 @@ use crate::{
     WorkScope, Worker, WorkerCommands, ENTITY_LIFECYCLE_MUTEX,
 };
 
-#[cfg(feature = "dyn_msg")]
-use crate::dynamic_message::DynamicMessage;
-
 mod any_subscription_callback;
 pub use any_subscription_callback::*;