Skip to content

Commit 5e47da4

Browse files
committed
automatic clippy --fix --lib corrections
1 parent 38a6a92 commit 5e47da4

File tree

14 files changed

+27
-28
lines changed

14 files changed

+27
-28
lines changed

rclrs/src/client.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ where
349349
let commands = node.commands().async_worker_commands();
350350
let handle = Arc::new(ClientHandle {
351351
rcl_client: Mutex::new(rcl_client),
352-
node: Arc::clone(&node),
352+
node: Arc::clone(node),
353353
});
354354

355355
let board = Arc::new(Mutex::new(ClientRequestBoard::new()));
@@ -359,7 +359,7 @@ where
359359
handle: Arc::clone(&handle),
360360
board: Arc::clone(&board),
361361
}),
362-
Some(Arc::clone(&commands.get_guard_condition())),
362+
Some(Arc::clone(commands.get_guard_condition())),
363363
);
364364
commands.add_to_wait_set(waitable);
365365

@@ -419,7 +419,7 @@ where
419419
self.board.lock().unwrap().execute(&self.handle)
420420
}
421421

422-
fn handle(&self) -> RclPrimitiveHandle {
422+
fn handle(&self) -> RclPrimitiveHandle<'_> {
423423
RclPrimitiveHandle::Client(self.handle.lock())
424424
}
425425

@@ -542,7 +542,7 @@ struct ClientHandle {
542542
}
543543

544544
impl ClientHandle {
545-
fn lock(&self) -> MutexGuard<rcl_client_t> {
545+
fn lock(&self) -> MutexGuard<'_, rcl_client_t> {
546546
self.rcl_client.lock().unwrap()
547547
}
548548
}

rclrs/src/executor/basic_executor.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use crate::{
2424
Waitable, WeakActivityListener, WorkerChannel,
2525
};
2626

27-
static FAILED_TO_SEND_WORKER: &'static str =
27+
static FAILED_TO_SEND_WORKER: &str =
2828
"Failed to send the new runner. This should never happen. \
2929
Please report this to the rclrs maintainers with a minimal reproducible example.";
3030

@@ -78,8 +78,7 @@ impl AllGuardConditions {
7878
let mut inner = self.inner.lock().unwrap();
7979
if inner
8080
.iter()
81-
.find(|other| guard_condition.ptr_eq(other))
82-
.is_some()
81+
.any(|other| guard_condition.ptr_eq(other))
8382
{
8483
// This guard condition is already known
8584
return;

rclrs/src/logging/log_params.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ impl<'a> LogParams<'a> {
3636
}
3737

3838
/// Get the logger name
39-
pub fn get_logger_name(&self) -> &LoggerName {
39+
pub fn get_logger_name(&self) -> &LoggerName<'_> {
4040
&self.logger_name
4141
}
4242

rclrs/src/node.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,7 @@ impl NodeState {
965965
/// Enables usage of undeclared parameters for this node.
966966
///
967967
/// Returns a [`Parameters`] struct that can be used to get and set all parameters.
968-
pub fn use_undeclared_parameters(&self) -> Parameters {
968+
pub fn use_undeclared_parameters(&self) -> Parameters<'_> {
969969
self.parameter.allow_undeclared();
970970
Parameters {
971971
interface: &self.parameter,

rclrs/src/node/node_options.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ impl<'a> NodeOptions<'a> {
396396
parameter,
397397
logger: Logger::new(logger_name)?,
398398
graph_change_action,
399-
commands: Arc::clone(&commands),
399+
commands: Arc::clone(commands),
400400
handle,
401401
});
402402
node.time_source.attach_node(&node);

rclrs/src/parameter/service.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ fn list_parameters(req: ListParameters_Request, map: &ParameterMap) -> ListParam
134134
.keys()
135135
.filter_map(|name| {
136136
let name: rosidl_runtime_rs::String = name.clone().into();
137-
if req.prefixes.len() == 0 && check_parameter_name_depth(&name[..]) {
137+
if req.prefixes.is_empty() && check_parameter_name_depth(&name[..]) {
138138
return Some(name);
139139
}
140140
req.prefixes

rclrs/src/service.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,14 +143,14 @@ where
143143

144144
let handle = Arc::new(ServiceHandle {
145145
rcl_service: Mutex::new(rcl_service),
146-
node_handle: Arc::clone(&node_handle),
146+
node_handle: Arc::clone(node_handle),
147147
});
148148

149149
let (waitable, lifecycle) = Waitable::new(
150150
Box::new(ServiceExecutable::<T, Scope> {
151151
handle: Arc::clone(&handle),
152152
callback: Arc::clone(&callback),
153-
commands: Arc::clone(&commands),
153+
commands: Arc::clone(commands),
154154
}),
155155
Some(Arc::clone(commands.get_guard_condition())),
156156
);
@@ -260,7 +260,7 @@ where
260260
RclPrimitiveKind::Service
261261
}
262262

263-
fn handle(&self) -> RclPrimitiveHandle {
263+
fn handle(&self) -> RclPrimitiveHandle<'_> {
264264
RclPrimitiveHandle::Service(self.handle.lock())
265265
}
266266
}
@@ -280,7 +280,7 @@ pub struct ServiceHandle {
280280
}
281281

282282
impl ServiceHandle {
283-
fn lock(&self) -> MutexGuard<rcl_service_t> {
283+
fn lock(&self) -> MutexGuard<'_, rcl_service_t> {
284284
self.rcl_service.lock().unwrap()
285285
}
286286

rclrs/src/service/any_service_callback.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ where
3030
commands: &Arc<WorkerCommands>,
3131
) -> Result<(), RclrsError> {
3232
match self {
33-
Self::Node(node) => node.execute(Arc::clone(&handle), commands),
33+
Self::Node(node) => node.execute(Arc::clone(handle), commands),
3434
Self::Worker(worker) => worker.execute(handle, payload),
3535
}
3636
}

rclrs/src/service/node_service_callback.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ impl<T: Service> NodeServiceCallback<T> {
3737
if let Err(err) =
3838
handle.send_response::<T>(&mut rmw_request_id, response.await)
3939
{
40-
log_service_send_error(&*handle, rmw_request_id, err);
40+
log_service_send_error(&handle, rmw_request_id, err);
4141
}
4242
});
4343
}
@@ -49,7 +49,7 @@ impl<T: Service> NodeServiceCallback<T> {
4949
if let Err(err) =
5050
handle.send_response::<T>(&mut rmw_request_id, response.await)
5151
{
52-
log_service_send_error(&*handle, rmw_request_id, err);
52+
log_service_send_error(&handle, rmw_request_id, err);
5353
}
5454
});
5555
}
@@ -62,7 +62,7 @@ impl<T: Service> NodeServiceCallback<T> {
6262
if let Err(err) =
6363
handle.send_response::<T>(&mut rmw_request_id, response.await)
6464
{
65-
log_service_send_error(&*handle, rmw_request_id, err);
65+
log_service_send_error(&handle, rmw_request_id, err);
6666
}
6767
});
6868
}

rclrs/src/subscription.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ where
272272
RclPrimitiveKind::Subscription
273273
}
274274

275-
fn handle(&self) -> RclPrimitiveHandle {
275+
fn handle(&self) -> RclPrimitiveHandle<'_> {
276276
RclPrimitiveHandle::Subscription(self.handle.lock())
277277
}
278278
}
@@ -292,7 +292,7 @@ struct SubscriptionHandle {
292292
}
293293

294294
impl SubscriptionHandle {
295-
fn lock(&self) -> MutexGuard<rcl_subscription_t> {
295+
fn lock(&self) -> MutexGuard<'_, rcl_subscription_t> {
296296
self.rcl_subscription.lock().unwrap()
297297
}
298298

0 commit comments

Comments
 (0)