Skip to content

Commit 9a04993

Browse files
committed
update examples
Signed-off-by: Michael X. Grey <[email protected]>
1 parent b465f6f commit 9a04993

File tree

8 files changed

+18
-6
lines changed

8 files changed

+18
-6
lines changed

examples/message_demo/src/message_demo.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ use std::convert::TryInto;
33
use anyhow::{Error, Result};
44
use rosidl_runtime_rs::{seq, BoundedSequence, Message, Sequence};
55

6+
use rclrs::RclrsErrorFilter;
7+
68
fn check_default_values() {
79
let msg = rclrs_example_msgs::msg::rmw::VariousTypes::default();
810
assert!(msg.bool_member);
@@ -166,10 +168,10 @@ fn demonstrate_pubsub() -> Result<(), Error> {
166168
)?;
167169
println!("Sending idiomatic message.");
168170
idiomatic_publisher.publish(rclrs_example_msgs::msg::VariousTypes::default())?;
169-
executor.spin(rclrs::SpinOptions::spin_once())?;
171+
executor.spin(rclrs::SpinOptions::spin_once()).first_error()?;
170172
println!("Sending RMW-native message.");
171173
direct_publisher.publish(rclrs_example_msgs::msg::rmw::VariousTypes::default())?;
172-
executor.spin(rclrs::SpinOptions::spin_once())?;
174+
executor.spin(rclrs::SpinOptions::spin_once()).first_error()?;
173175

174176
Ok(())
175177
}

examples/minimal_client_service/src/minimal_client.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use anyhow::{Error, Result};
2+
use rclrs::RclrsErrorFilter;
23

34
fn main() -> Result<(), Error> {
45
let mut executor = rclrs::Context::default_from_env()?.create_basic_executor();
@@ -30,5 +31,6 @@ fn main() -> Result<(), Error> {
3031
println!("Waiting for response");
3132
executor
3233
.spin(rclrs::SpinOptions::default())
34+
.first_error()
3335
.map_err(|err| err.into())
3436
}

examples/minimal_client_service/src/minimal_service.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use anyhow::{Error, Result};
2+
use rclrs::RclrsErrorFilter;
23

34
fn handle_service(
45
_request_header: &rclrs::rmw_request_id_t,
@@ -21,5 +22,6 @@ fn main() -> Result<(), Error> {
2122
println!("Starting server");
2223
executor
2324
.spin(rclrs::SpinOptions::default())
25+
.first_error()
2426
.map_err(|err| err.into())
2527
}

examples/minimal_pub_sub/src/minimal_subscriber.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use anyhow::{Error, Result};
2+
use rclrs::RclrsErrorFilter;
23

34
fn main() -> Result<(), Error> {
45
let context = rclrs::Context::default_from_env()?;
@@ -20,5 +21,6 @@ fn main() -> Result<(), Error> {
2021

2122
executor
2223
.spin(rclrs::SpinOptions::default())
24+
.first_error()
2325
.map_err(|err| err.into())
2426
}

examples/minimal_pub_sub/src/minimal_two_nodes.rs

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use std::sync::{
22
atomic::{AtomicU32, Ordering},
33
Arc, Mutex,
44
};
5+
use rclrs::RclrsErrorFilter;
56

67
use anyhow::{Error, Result};
78

@@ -75,5 +76,6 @@ fn main() -> Result<(), Error> {
7576

7677
executor
7778
.spin(rclrs::SpinOptions::default())
79+
.first_error()
7880
.map_err(|err| err.into())
7981
}

examples/minimal_pub_sub/src/zero_copy_subscriber.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use anyhow::{Error, Result};
2+
use rclrs::RclrsErrorFilter;
23

34
fn main() -> Result<(), Error> {
45
let mut executor = rclrs::Context::default_from_env()?.create_basic_executor();
@@ -19,5 +20,6 @@ fn main() -> Result<(), Error> {
1920

2021
executor
2122
.spin(rclrs::SpinOptions::default())
23+
.first_error()
2224
.map_err(|err| err.into())
2325
}

examples/rust_pubsub/src/simple_publisher.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use rclrs::{Context, Executor, Publisher, RclrsError, SpinOptions, QOS_PROFILE_DEFAULT};
1+
use rclrs::{Context, Executor, Publisher, RclrsError, SpinOptions, QOS_PROFILE_DEFAULT, RclrsErrorFilter};
22
use std::{sync::Arc, thread, time::Duration};
33
use std_msgs::msg::String as StringMsg;
44

@@ -33,5 +33,5 @@ fn main() -> Result<(), RclrsError> {
3333
thread::sleep(Duration::from_millis(1000));
3434
count = publisher_other_thread.publish_data(count).unwrap();
3535
});
36-
executor.spin(SpinOptions::default())
36+
executor.spin(SpinOptions::default()).first_error()
3737
}

examples/rust_pubsub/src/simple_subscriber.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use rclrs::{Context, Executor, RclrsError, SpinOptions, Subscription, QOS_PROFILE_DEFAULT};
1+
use rclrs::{Context, Executor, RclrsError, SpinOptions, Subscription, QOS_PROFILE_DEFAULT, RclrsErrorFilter};
22
use std::{
33
sync::{Arc, Mutex},
44
thread,
@@ -44,5 +44,5 @@ fn main() -> Result<(), RclrsError> {
4444
thread::sleep(Duration::from_millis(1000));
4545
subscription_other_thread.data_callback().unwrap()
4646
});
47-
executor.spin(SpinOptions::default())
47+
executor.spin(SpinOptions::default()).first_error()
4848
}

0 commit comments

Comments
 (0)