Skip to content

Commit 575cd40

Browse files
committed
Address clippy feedback
1 parent 9880fdc commit 575cd40

File tree

7 files changed

+8
-13
lines changed

7 files changed

+8
-13
lines changed

examples/minimal_client_service/src/minimal_client.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ fn main() -> Result<(), Error> {
88

99
let client = node.create_client::<example_interfaces::srv::AddTwoInts>("add_two_ints")?;
1010

11-
let mut request = example_interfaces::srv::AddTwoInts_Request::default();
12-
request.a = 41;
13-
request.b = 1;
11+
let request = example_interfaces::srv::AddTwoInts_Request { a: 41, b: 1 };
1412

1513
println!("Starting client");
1614

examples/minimal_client_service/src/minimal_client_async.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ fn main() -> Result<(), Error> {
88

99
let client = node.create_client::<example_interfaces::srv::AddTwoInts>("add_two_ints")?;
1010

11-
let mut request = example_interfaces::srv::AddTwoInts_Request::default();
12-
request.a = 41;
13-
request.b = 1;
11+
let request = example_interfaces::srv::AddTwoInts_Request {a: 41, b: 1};
1412

1513
println!("Starting client");
1614

@@ -19,7 +17,7 @@ fn main() -> Result<(), Error> {
1917
let future = client.call_async(&request)?;
2018

2119
println!("Waiting for response");
22-
let response = rclrs::spin_until_future_complete(&node, future.clone())?;
20+
let response = rclrs::spin_until_future_complete(&node, future)?;
2321

2422
println!(
2523
"Result of {} + {} is: {}",

rclrs/src/future.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/// Based on https://www.viget.com/articles/understanding-futures-in-rust-part-1/
22
use std::future::Future;
3-
use std::marker::PhantomData;
43
use std::pin::Pin;
54
use std::sync::Arc;
65
use std::task::Context;
@@ -9,8 +8,6 @@ use std::task::RawWaker;
98
use std::task::RawWakerVTable;
109
use std::task::Waker;
1110

12-
use parking_lot::Mutex;
13-
1411
#[derive(Default)]
1512
pub struct RclFuture<T> {
1613
value: Option<T>,

rclrs/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ pub fn spin(node: &Node) -> Result<(), RclrsError> {
115115

116116
pub fn spin_until_future_complete<T: Unpin + Clone>(
117117
node: &node::Node,
118-
mut future: Arc<Mutex<Box<crate::future::RclFuture<T>>>>,
118+
future: Arc<Mutex<Box<crate::future::RclFuture<T>>>>,
119119
) -> Result<<future::RclFuture<T> as Future>::Output, RclrsError> {
120120
let rclwaker = Arc::new(crate::future::RclWaker {});
121121
let waker = crate::future::rclwaker_into_waker(Arc::into_raw(rclwaker));

rclrs/src/node/client.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#![warn(missing_docs)]
12
use std::borrow::Borrow;
23
use std::boxed::Box;
34
use std::collections::HashMap;
@@ -229,7 +230,7 @@ where
229230
let futures = &mut *self.futures.lock();
230231
if requests.contains_key(&req_id.sequence_number) {
231232
let callback = requests.remove(&req_id.sequence_number).unwrap();
232-
(&mut *callback.lock())(&res);
233+
(*callback.lock())(&res);
233234
} else if futures.contains_key(&req_id.sequence_number) {
234235
let future = futures.remove(&req_id.sequence_number).unwrap();
235236
(&mut *future.lock()).set_value(res);

rclrs/src/node/service.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ where
148148
Err(e) => return Err(e),
149149
};
150150
let mut res = T::Response::default();
151-
(&mut *self.callback.lock())(&req_id, &req, &mut res);
151+
(*self.callback.lock())(&req_id, &req, &mut res);
152152
let rmw_message = <T::Response as Message>::into_rmw_message(res.into_cow());
153153
let handle = &mut *self.handle.lock();
154154
let ret = unsafe {

rosidl_runtime_rs/src/traits.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#![warn(missing_docs)]
12
// Copyright 2020 DCS Corporation, All Rights Reserved.
23

34
// Licensed under the Apache License, Version 2.0 (the "License");

0 commit comments

Comments
 (0)