Skip to content

Commit 8f69e05

Browse files
committed
Fix formatting
Signed-off-by: Michael X. Grey <[email protected]>
1 parent c46e2ab commit 8f69e05

File tree

23 files changed

+136
-135
lines changed

23 files changed

+136
-135
lines changed

examples/message_demo/src/message_demo.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,10 @@ fn demonstrate_pubsub() -> Result<(), Error> {
141141
let mut executor = rclrs::Context::default_from_env()?.create_basic_executor();
142142
let node = executor.create_node("message_demo")?;
143143

144-
let idiomatic_publisher = node.create_publisher::<rclrs_example_msgs::msg::VariousTypes>("topic")?;
145-
let direct_publisher = node.create_publisher::<rclrs_example_msgs::msg::rmw::VariousTypes>("topic")?;
144+
let idiomatic_publisher =
145+
node.create_publisher::<rclrs_example_msgs::msg::VariousTypes>("topic")?;
146+
let direct_publisher =
147+
node.create_publisher::<rclrs_example_msgs::msg::rmw::VariousTypes>("topic")?;
146148

147149
let _idiomatic_subscription = node
148150
.create_subscription::<rclrs_example_msgs::msg::VariousTypes, _>(

examples/minimal_client_service/src/minimal_client.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,7 @@ fn main() -> Result<(), Error> {
2828
std::thread::sleep(std::time::Duration::from_millis(500));
2929

3030
println!("Waiting for response");
31-
executor.spin(rclrs::SpinOptions::default()).map_err(|err| err.into())
31+
executor
32+
.spin(rclrs::SpinOptions::default())
33+
.map_err(|err| err.into())
3234
}

examples/minimal_client_service/src/minimal_client_async.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ async fn main() -> Result<(), Error> {
2020

2121
println!("Waiting for response");
2222

23-
let rclrs_spin = tokio::task::spawn_blocking(move || executor.spin(rclrs::SpinOptions::default()));
23+
let rclrs_spin =
24+
tokio::task::spawn_blocking(move || executor.spin(rclrs::SpinOptions::default()));
2425

2526
let response = future.await?;
2627
println!(

examples/minimal_client_service/src/minimal_service.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,7 @@ fn main() -> Result<(), Error> {
1919
.create_service::<example_interfaces::srv::AddTwoInts, _>("add_two_ints", handle_service)?;
2020

2121
println!("Starting server");
22-
executor.spin(rclrs::SpinOptions::default()).map_err(|err| err.into())
22+
executor
23+
.spin(rclrs::SpinOptions::default())
24+
.map_err(|err| err.into())
2325
}

examples/minimal_pub_sub/src/minimal_subscriber.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,7 @@ fn main() -> Result<(), Error> {
1717
},
1818
)?;
1919

20-
executor.spin(rclrs::SpinOptions::default()).map_err(|err| err.into())
20+
executor
21+
.spin(rclrs::SpinOptions::default())
22+
.map_err(|err| err.into())
2123
}

examples/minimal_pub_sub/src/minimal_two_nodes.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ struct MinimalSubscriber {
1212
}
1313

1414
impl MinimalSubscriber {
15-
pub fn new(executor: &rclrs::Executor, name: &str, topic: &str) -> Result<Arc<Self>, rclrs::RclrsError> {
15+
pub fn new(
16+
executor: &rclrs::Executor,
17+
name: &str,
18+
topic: &str,
19+
) -> Result<Arc<Self>, rclrs::RclrsError> {
1620
let node = executor.create_node(name)?;
1721
let minimal_subscriber = Arc::new(MinimalSubscriber {
1822
num_messages: 0.into(),
@@ -48,8 +52,10 @@ fn main() -> Result<(), Error> {
4852
let mut executor = rclrs::Context::default_from_env()?.create_basic_executor();
4953
let publisher_node = executor.create_node("minimal_publisher")?;
5054

51-
let _subscriber_node_one = MinimalSubscriber::new(&executor, "minimal_subscriber_one", "topic")?;
52-
let _subscriber_node_two = MinimalSubscriber::new(&executor, "minimal_subscriber_two", "topic")?;
55+
let _subscriber_node_one =
56+
MinimalSubscriber::new(&executor, "minimal_subscriber_one", "topic")?;
57+
let _subscriber_node_two =
58+
MinimalSubscriber::new(&executor, "minimal_subscriber_two", "topic")?;
5359

5460
let publisher = publisher_node.create_publisher::<std_msgs::msg::String>("topic")?;
5561

@@ -65,5 +71,7 @@ fn main() -> Result<(), Error> {
6571
}
6672
});
6773

68-
executor.spin(rclrs::SpinOptions::default()).map_err(|err| err.into())
74+
executor
75+
.spin(rclrs::SpinOptions::default())
76+
.map_err(|err| err.into())
6977
}

examples/minimal_pub_sub/src/zero_copy_subscriber.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@ fn main() -> Result<(), Error> {
1616
},
1717
)?;
1818

19-
executor.spin(rclrs::SpinOptions::default()).map_err(|err| err.into())
19+
executor
20+
.spin(rclrs::SpinOptions::default())
21+
.map_err(|err| err.into())
2022
}

examples/rust_pubsub/src/simple_subscriber.rs

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,11 @@ impl SimpleSubscriptionNode {
1717
let data: Arc<Mutex<Option<StringMsg>>> = Arc::new(Mutex::new(None));
1818
let data_mut: Arc<Mutex<Option<StringMsg>>> = Arc::clone(&data);
1919
let _subscriber = node
20-
.create_subscription::<StringMsg, _>(
21-
"publish_hello",
22-
move |msg: StringMsg| {
23-
*data_mut.lock().unwrap() = Some(msg);
24-
},
25-
)
20+
.create_subscription::<StringMsg, _>("publish_hello", move |msg: StringMsg| {
21+
*data_mut.lock().unwrap() = Some(msg);
22+
})
2623
.unwrap();
27-
Ok(Self {
28-
_subscriber,
29-
data,
30-
})
24+
Ok(Self { _subscriber, data })
3125
}
3226
fn data_callback(&self) -> Result<(), RclrsError> {
3327
if let Some(data) = self.data.lock().unwrap().as_ref() {

rclrs/src/client.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use rosidl_runtime_rs::Message;
1111
use crate::{
1212
error::{RclReturnCode, ToResult},
1313
rcl_bindings::*,
14-
IntoPrimitiveOptions, MessageCow, NodeHandle, RclrsError, ENTITY_LIFECYCLE_MUTEX, QoSProfile,
14+
IntoPrimitiveOptions, MessageCow, NodeHandle, QoSProfile, RclrsError, ENTITY_LIFECYCLE_MUTEX,
1515
};
1616

1717
// SAFETY: The functions accessing this type, including drop(), shouldn't care about the thread
@@ -97,10 +97,11 @@ where
9797
let mut rcl_client = unsafe { rcl_get_zero_initialized_client() };
9898
let type_support = <T as rosidl_runtime_rs::Service>::get_type_support()
9999
as *const rosidl_service_type_support_t;
100-
let topic_c_string = CString::new(service_name).map_err(|err| RclrsError::StringContainsNul {
101-
err,
102-
s: service_name.into(),
103-
})?;
100+
let topic_c_string =
101+
CString::new(service_name).map_err(|err| RclrsError::StringContainsNul {
102+
err,
103+
s: service_name.into(),
104+
})?;
104105

105106
// SAFETY: No preconditions for this function.
106107
let mut client_options = unsafe { rcl_client_get_default_options() };
@@ -296,7 +297,10 @@ pub struct ClientOptions<'a> {
296297
impl<'a> ClientOptions<'a> {
297298
/// Initialize a new [`ClientOptions`] with default settings.
298299
pub fn new(service_name: &'a str) -> Self {
299-
Self { service_name, qos: QoSProfile::services_default() }
300+
Self {
301+
service_name,
302+
qos: QoSProfile::services_default(),
303+
}
300304
}
301305
}
302306

rclrs/src/context.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::{
66
vec::Vec,
77
};
88

9-
use crate::{rcl_bindings::*, RclrsError, ToResult, Executor};
9+
use crate::{rcl_bindings::*, Executor, RclrsError, ToResult};
1010

1111
/// This is locked whenever initializing or dropping any middleware entity
1212
/// because we have found issues in RCL and some RMW implementations that
@@ -74,8 +74,7 @@ impl Default for Context {
7474
fn default() -> Self {
7575
// SAFETY: It should always be valid to instantiate a context with no
7676
// arguments, no parameters, no options, etc.
77-
Self::new([], InitOptions::default())
78-
.expect("Failed to instantiate a default context")
77+
Self::new([], InitOptions::default()).expect("Failed to instantiate a default context")
7978
}
8079
}
8180

0 commit comments

Comments
 (0)