Skip to content

Commit c9067b2

Browse files
committed
Merge branch 'worker' into worker_with_timers
2 parents 9f58194 + 3c256be commit c9067b2

File tree

4 files changed

+15
-21
lines changed

4 files changed

+15
-21
lines changed

examples/message_demo/Cargo.toml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,10 @@ path = "src/message_demo.rs"
1010

1111
[dependencies]
1212
anyhow = {version = "1", features = ["backtrace"]}
13+
rclrs = "0.4"
14+
rosidl_runtime_rs = "0.4"
15+
rclrs_example_msgs = { version = "0.4", features = ["serde"] }
16+
serde_json = "1.0"
1317

14-
[dependencies.rclrs]
15-
version = "0.4"
16-
17-
[dependencies.rosidl_runtime_rs]
18-
version = "0.4"
19-
20-
[dependencies.rclrs_example_msgs]
21-
version = "0.4"
22-
features = ["serde"]
23-
24-
[dependencies.serde_json]
25-
version = "1.0"
18+
# This specific version is compatible with Rust 1.75
19+
backtrace = "=0.3.74"

examples/minimal_client_service/Cargo.toml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,9 @@ path = "src/minimal_service.rs"
1919
[dependencies]
2020
anyhow = {version = "1", features = ["backtrace"]}
2121
tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread", "time"] }
22+
rclrs = "0.4"
23+
rosidl_runtime_rs = "0.4"
24+
example_interfaces = "*"
2225

23-
[dependencies.rclrs]
24-
version = "0.4"
25-
26-
[dependencies.rosidl_runtime_rs]
27-
version = "0.4"
28-
29-
[dependencies.example_interfaces]
30-
version = "*"
26+
# This specific version is compatible with Rust 1.75
27+
backtrace = "=0.3.74"

examples/minimal_pub_sub/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,8 @@ rclrs = "0.4"
3131
rosidl_runtime_rs = "0.4"
3232
example_interfaces = "*"
3333

34+
# This specific version is compatible with Rust 1.75
35+
backtrace = "=0.3.74"
36+
3437
[package.metadata.ros]
3538
install_to_share = ["launch"]

rclrs/src/wait_set/waitable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use crate::{
1414
/// used anymore.
1515
#[must_use = "If you do not give the Waiter to a WaitSet then it will never be useful"]
1616
pub struct Waitable {
17-
pub(super) primitive: Box<dyn RclPrimitive + Send + Sync>,
17+
pub(super) primitive: Box<dyn RclPrimitive>,
1818
in_use: Arc<AtomicBool>,
1919
index_in_wait_set: Option<usize>,
2020
}

0 commit comments

Comments
 (0)