Skip to content

Commit 475eab2

Browse files
committed
chore: Reformat imports for consistency and clarity
1 parent 069f461 commit 475eab2

10 files changed

Lines changed: 60 additions & 55 deletions

File tree

rclrs/src/dynamic_message/dynamic_publisher.rs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
use std::ffi::CString;
2-
use std::sync::{Arc, Mutex};
1+
use std::{
2+
ffi::CString,
3+
sync::{Arc, Mutex},
4+
};
35

46
use super::{
57
get_type_support_handle, get_type_support_library, DynamicMessage, DynamicMessageError,
68
DynamicMessageMetadata, MessageTypeName,
79
};
8-
use crate::error::{RclrsError, ToResult};
9-
use crate::rcl_bindings::*;
10-
use crate::{Node, PublisherHandle, PublisherOptions, ENTITY_LIFECYCLE_MUTEX};
10+
use crate::{
11+
error::{RclrsError, ToResult},
12+
rcl_bindings::*,
13+
Node, PublisherHandle, PublisherOptions, ENTITY_LIFECYCLE_MUTEX,
14+
};
1115

1216
/// Struct for sending dynamic messages.
1317
///
@@ -150,8 +154,7 @@ mod tests {
150154

151155
#[test]
152156
fn test_dynamic_publishers() -> Result<(), RclrsError> {
153-
use crate::vendor::test_msgs::msg;
154-
use crate::TopicEndpointInfo;
157+
use crate::{vendor::test_msgs::msg, TopicEndpointInfo};
155158

156159
let namespace = "/test_dynamic_publishers_graph";
157160
let graph = construct_test_graph(namespace)?;

rclrs/src/dynamic_message/dynamic_subscription.rs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1-
use std::any::Any;
2-
use std::boxed::Box;
3-
use std::ffi::CString;
4-
use std::ops::{Deref, DerefMut};
5-
use std::sync::{Arc, Mutex};
1+
use std::{
2+
any::Any,
3+
boxed::Box,
4+
ffi::CString,
5+
ops::{Deref, DerefMut},
6+
sync::{Arc, Mutex},
7+
};
68

79
use futures::future::BoxFuture;
810

911
use super::{
1012
get_type_support_handle, get_type_support_library, DynamicMessage, DynamicMessageMetadata,
1113
MessageStructure, MessageTypeName,
1214
};
13-
use crate::rcl_bindings::*;
1415
use crate::{
15-
MessageInfo, Node, NodeHandle, RclPrimitive, RclPrimitiveHandle, RclPrimitiveKind, RclrsError,
16-
RclrsErrorFilter, ReadyKind, SubscriptionHandle, SubscriptionOptions, ToResult, Waitable,
17-
WaitableLifecycle, WorkScope, Worker, WorkerCommands, ENTITY_LIFECYCLE_MUTEX,
16+
rcl_bindings::*, MessageInfo, Node, NodeHandle, RclPrimitive, RclPrimitiveHandle,
17+
RclPrimitiveKind, RclrsError, RclrsErrorFilter, ReadyKind, SubscriptionHandle,
18+
SubscriptionOptions, ToResult, Waitable, WaitableLifecycle, WorkScope, Worker, WorkerCommands,
19+
ENTITY_LIFECYCLE_MUTEX,
1820
};
1921

2022
/// Struct for receiving messages whose type is not known at compile time.

rclrs/src/dynamic_message/field_access.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -889,10 +889,7 @@ mod immutable {
889889
define_value_types!(select_immutable);
890890
}
891891

892-
pub use immutable::ArrayValue;
893-
pub use immutable::BoundedSequenceValue;
894-
pub use immutable::SequenceValue;
895-
pub use immutable::SimpleValue;
892+
pub use immutable::{ArrayValue, BoundedSequenceValue, SequenceValue, SimpleValue};
896893

897894
/// The value of a field in a [`DynamicMessage`][1].
898895
///
@@ -944,10 +941,10 @@ mod mutable {
944941
define_value_types!(select_mutable);
945942
}
946943

947-
pub use mutable::ArrayValue as ArrayValueMut;
948-
pub use mutable::BoundedSequenceValue as BoundedSequenceValueMut;
949-
pub use mutable::SequenceValue as SequenceValueMut;
950-
pub use mutable::SimpleValue as SimpleValueMut;
944+
pub use mutable::{
945+
ArrayValue as ArrayValueMut, BoundedSequenceValue as BoundedSequenceValueMut,
946+
SequenceValue as SequenceValueMut, SimpleValue as SimpleValueMut,
947+
};
951948

952949
/// The value of a field in a [`DynamicMessage`][1].
953950
///

rclrs/src/dynamic_message/field_access/dynamic_bounded_string.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
use std::convert::AsMut;
2-
use std::fmt::{self, Display};
3-
use std::num::NonZeroUsize;
4-
use std::ops::{Deref, DerefMut};
1+
use std::{
2+
convert::AsMut,
3+
fmt::{self, Display},
4+
num::NonZeroUsize,
5+
ops::{Deref, DerefMut},
6+
};
57

68
use rosidl_runtime_rs::StringExceedsBoundsError;
79

rclrs/src/dynamic_message/field_access/dynamic_message_view.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
use std::fmt::{self, Debug};
2-
use std::ops::Deref;
3-
4-
use super::super::MessageStructure;
5-
use super::{DynamicSequenceElementMut, Proxy, ProxyMut, ProxySequence, Value, ValueMut};
1+
use std::{
2+
fmt::{self, Debug},
3+
ops::Deref,
4+
};
5+
6+
use super::{
7+
super::MessageStructure, DynamicSequenceElementMut, Proxy, ProxyMut, ProxySequence, Value,
8+
ValueMut,
9+
};
610

711
/// A view of a single message. Used for nested messages.
812
///

rclrs/src/dynamic_message/field_access/dynamic_sequence.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
use std::fmt::{self, Debug};
2-
use std::marker::PhantomData;
3-
use std::ops::{Deref, DerefMut};
1+
use std::{
2+
fmt::{self, Debug},
3+
marker::PhantomData,
4+
ops::{Deref, DerefMut},
5+
};
46

57
use rosidl_runtime_rs::{Sequence, SequenceAlloc, SequenceExceedsBoundsError};
68

rclrs/src/dynamic_message/message_structure.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
use std::ffi::CStr;
2-
use std::num::NonZeroUsize;
1+
use std::{ffi::CStr, num::NonZeroUsize};
32

43
use super::TypeErasedSequence;
5-
use crate::rcl_bindings::rosidl_typesupport_introspection_c__MessageMember as rosidl_message_member_t;
6-
use crate::rcl_bindings::rosidl_typesupport_introspection_c__MessageMembers as rosidl_message_members_t;
7-
use crate::rcl_bindings::*;
4+
use crate::rcl_bindings::{
5+
rosidl_typesupport_introspection_c__MessageMember as rosidl_message_member_t,
6+
rosidl_typesupport_introspection_c__MessageMembers as rosidl_message_members_t, *,
7+
};
88

99
/// Possible base types for fields in a message.
1010
// The field variants are self-explaining, no need to add redundant documentation.
@@ -298,8 +298,7 @@ impl MessageStructure {
298298
#[cfg(test)]
299299
mod tests {
300300
use super::*;
301-
use crate::dynamic_message::*;
302-
use crate::vendor::test_msgs::msg;
301+
use crate::{dynamic_message::*, vendor::test_msgs::msg};
303302

304303
use std::num::NonZeroUsize;
305304

rclrs/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,10 @@ mod node;
192192
mod parameter;
193193
mod publisher;
194194
mod qos;
195-
mod service;
196195
mod serialized_message;
197196
mod serialized_publisher;
198197
mod serialized_subscription;
198+
mod service;
199199
mod subscription;
200200
mod time;
201201
mod time_source;
@@ -223,10 +223,10 @@ pub use node::*;
223223
pub use parameter::*;
224224
pub use publisher::*;
225225
pub use qos::*;
226+
pub use rcl_bindings::rmw_request_id_t;
226227
pub use serialized_message::*;
227228
pub use serialized_publisher::*;
228229
pub use serialized_subscription::*;
229-
pub use rcl_bindings::rmw_request_id_t;
230230
pub use service::*;
231231
pub use subscription::*;
232232
pub use time::*;

rclrs/src/node.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,11 @@ use crate::{
4343
IntoAsyncSubscriptionCallback, IntoNodeServiceCallback, IntoNodeSubscriptionCallback,
4444
IntoNodeTimerOneshotCallback, IntoNodeTimerRepeatingCallback, IntoTimerOptions, LogParams,
4545
Logger, MessageInfo, ParameterBuilder, ParameterInterface, ParameterVariant, Parameters,
46-
Promise, Publisher, PublisherOptions, PublisherState, RclrsError, RequestedGoal, Service,
47-
ServiceOptions, ServiceState, SerializedPublisher, SerializedSubscription, Subscription,
48-
SubscriptionOptions, SubscriptionState,
49-
TerminatedGoal, TimeSource, Timer, TimerState, ToLogParams, Worker, WorkerOptions, WorkerState,
50-
ENTITY_LIFECYCLE_MUTEX,
46+
Promise, Publisher, PublisherOptions, PublisherState, RclrsError, RequestedGoal,
47+
SerializedPublisher, SerializedSubscription, Service, ServiceOptions, ServiceState,
48+
Subscription, SubscriptionOptions, SubscriptionState, TerminatedGoal, TimeSource, Timer,
49+
TimerState, ToLogParams, ToResult, Worker, WorkerOptions, WorkerState, ENTITY_LIFECYCLE_MUTEX,
5150
};
52-
use crate::ToResult;
5351

5452
/// A processing unit that can communicate with other nodes. See the API of
5553
/// [`NodeState`] to find out what methods you can call on a [`Node`].

rclrs/src/subscription.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -620,8 +620,7 @@ mod tests {
620620

621621
#[test]
622622
fn test_subscription_qos_settings() {
623-
use crate::vendor::example_interfaces::msg::Empty;
624-
use crate::*;
623+
use crate::{vendor::example_interfaces::msg::Empty, *};
625624

626625
let executor = Context::default().create_basic_executor();
627626

@@ -672,8 +671,7 @@ mod tests {
672671

673672
#[test]
674673
fn test_setting_qos_from_parameters() {
675-
use crate::vendor::example_interfaces::msg::Empty;
676-
use crate::*;
674+
use crate::{vendor::example_interfaces::msg::Empty, *};
677675

678676
let args = ["--ros-args", "-p", "qos_reliability:=best_effort"].map(ToString::to_string);
679677

0 commit comments

Comments
 (0)