From 715ee0286b3c9b071638de1799e89c5cf92ef600 Mon Sep 17 00:00:00 2001 From: Chrislearn Young Date: Thu, 17 Jul 2025 05:55:48 +0800 Subject: [PATCH] Fix many `cargo clippy` warning --- apis/c/node/src/lib.rs | 10 +++++----- apis/rust/node/src/event_stream/event.rs | 1 + apis/rust/node/src/event_stream/thread.rs | 1 + apis/rust/node/src/node/mod.rs | 4 ++-- binaries/daemon/src/log.rs | 2 +- binaries/runtime/src/operator/shared_lib.rs | 4 ++-- libraries/core/src/build/build_command.rs | 4 ++-- libraries/core/src/build/mod.rs | 2 -- libraries/core/src/descriptor/validate.rs | 2 +- libraries/core/src/descriptor/visualize.rs | 2 +- .../ros2-bridge/python/src/typed/deserialize/mod.rs | 2 +- .../python/src/typed/deserialize/primitive.rs | 2 +- .../ros2-bridge/python/src/typed/deserialize/string.rs | 2 +- .../ros2-bridge/python/src/typed/serialize/mod.rs | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/apis/c/node/src/lib.rs b/apis/c/node/src/lib.rs index 8720c795..8a6ba88d 100644 --- a/apis/c/node/src/lib.rs +++ b/apis/c/node/src/lib.rs @@ -118,13 +118,13 @@ pub enum EventType { /// ## Safety /// /// - The `event` argument must be a dora event received through -/// [`dora_next_event`]. The event must be still valid, i.e., not -/// freed yet. The returned `out_ptr` must not be used after -/// freeing the `event`, since it points directly into the event's -/// memory. +/// [`dora_next_event`]. The event must be still valid, i.e., not +/// freed yet. The returned `out_ptr` must not be used after +/// freeing the `event`, since it points directly into the event's +/// memory. /// /// - Note: `Out_ptr` is not a null-terminated string. The length of the string -/// is given by `out_len`. +/// is given by `out_len`. #[no_mangle] pub unsafe extern "C" fn read_dora_input_id( event: *const (), diff --git a/apis/rust/node/src/event_stream/event.rs b/apis/rust/node/src/event_stream/event.rs index 22997f4b..534d7c3d 100644 --- a/apis/rust/node/src/event_stream/event.rs +++ b/apis/rust/node/src/event_stream/event.rs @@ -9,6 +9,7 @@ use shared_memory_extended::{Shmem, ShmemConf}; #[derive(Debug)] #[non_exhaustive] +#[allow(clippy::large_enum_variant)] pub enum Event { Stop(StopCause), Reload { diff --git a/apis/rust/node/src/event_stream/thread.rs b/apis/rust/node/src/event_stream/thread.rs index a9dbba27..dfca33e7 100644 --- a/apis/rust/node/src/event_stream/thread.rs +++ b/apis/rust/node/src/event_stream/thread.rs @@ -27,6 +27,7 @@ pub fn init( } #[derive(Debug)] +#[allow(clippy::large_enum_variant)] pub enum EventItem { NodeEvent { event: NodeEvent, diff --git a/apis/rust/node/src/node/mod.rs b/apis/rust/node/src/node/mod.rs index 0c986ad5..9a07e37b 100644 --- a/apis/rust/node/src/node/mod.rs +++ b/apis/rust/node/src/node/mod.rs @@ -161,7 +161,7 @@ impl DoraNode { #[cfg(feature = "metrics")] { - let id = format!("{}/{}", dataflow_id, node_id); + let id = format!("{dataflow_id}/{node_id}"); let monitor_task = async move { if let Err(e) = run_metrics_monitor(id.clone()) .await @@ -478,7 +478,7 @@ impl Drop for DoraNode { } while !self.sent_out_shared_memory.is_empty() { - if self.drop_stream.len() == 0 { + if self.drop_stream.is_empty() { tracing::trace!( "waiting for {} remaining drop tokens", self.sent_out_shared_memory.len() diff --git a/binaries/daemon/src/log.rs b/binaries/daemon/src/log.rs index 283213c8..12deadbf 100644 --- a/binaries/daemon/src/log.rs +++ b/binaries/daemon/src/log.rs @@ -374,7 +374,7 @@ impl Logger { .await .wrap_err("failed to send log message to dora-coordinator") { - Ok(()) => return, + Ok(()) => (), Err(err) => tracing::warn!("{err:?}"), } } diff --git a/binaries/runtime/src/operator/shared_lib.rs b/binaries/runtime/src/operator/shared_lib.rs index e2920a2a..021243b6 100644 --- a/binaries/runtime/src/operator/shared_lib.rs +++ b/binaries/runtime/src/operator/shared_lib.rs @@ -84,7 +84,7 @@ struct SharedLibraryOperator<'lib> { bindings: Bindings<'lib>, } -impl<'lib> SharedLibraryOperator<'lib> { +impl SharedLibraryOperator<'_> { fn run(self, init_done: oneshot::Sender>) -> eyre::Result { let operator_context = { let DoraInitResult { @@ -263,7 +263,7 @@ struct OperatorContext<'lib> { drop_fn: Symbol<'lib, DoraDropOperator>, } -impl<'lib> Drop for OperatorContext<'lib> { +impl Drop for OperatorContext<'_> { fn drop(&mut self) { unsafe { (self.drop_fn.drop_operator)(self.raw) }; } diff --git a/libraries/core/src/build/build_command.rs b/libraries/core/src/build/build_command.rs index ef31a6fd..a6fc35e3 100644 --- a/libraries/core/src/build/build_command.rs +++ b/libraries/core/src/build/build_command.rs @@ -50,7 +50,7 @@ pub fn run_build_command( let mut child = cmd .spawn() - .wrap_err_with(|| format!("failed to spawn `{}`", build))?; + .wrap_err_with(|| format!("failed to spawn `{build}`"))?; let child_stdout = BufReader::new(child.stdout.take().expect("failed to take stdout")); let child_stderr = BufReader::new(child.stderr.take().expect("failed to take stderr")); @@ -74,7 +74,7 @@ pub fn run_build_command( let exit_status = cmd .status() - .wrap_err_with(|| format!("failed to run `{}`", build))?; + .wrap_err_with(|| format!("failed to run `{build}`"))?; if !exit_status.success() { return Err(eyre!("build command `{build_line}` returned {exit_status}")); } diff --git a/libraries/core/src/build/mod.rs b/libraries/core/src/build/mod.rs index 5e7193d5..873ab0e3 100644 --- a/libraries/core/src/build/mod.rs +++ b/libraries/core/src/build/mod.rs @@ -1,8 +1,6 @@ pub use git::GitManager; pub use logger::{BuildLogger, LogLevelOrStdout}; -use url::Url; - use std::{collections::BTreeMap, future::Future, path::PathBuf}; use crate::descriptor::ResolvedNode; diff --git a/libraries/core/src/descriptor/validate.rs b/libraries/core/src/descriptor/validate.rs index da4a3798..e2453c54 100644 --- a/libraries/core/src/descriptor/validate.rs +++ b/libraries/core/src/descriptor/validate.rs @@ -49,7 +49,7 @@ pub fn check_dataflow( info!("skipping path check for node with build command"); } else { resolve_path(source, working_dir).wrap_err_with(|| { - format!("Could not find source path `{}`", source) + format!("Could not find source path `{source}`") })?; }; } diff --git a/libraries/core/src/descriptor/visualize.rs b/libraries/core/src/descriptor/visualize.rs index 02415e40..890958f0 100644 --- a/libraries/core/src/descriptor/visualize.rs +++ b/libraries/core/src/descriptor/visualize.rs @@ -174,7 +174,7 @@ fn visualize_inputs( for (input_id, input) in inputs { match &input.mapping { mapping @ InputMapping::Timer { .. } => { - writeln!(flowchart, " {} -- {input_id} --> {target}", mapping).unwrap(); + writeln!(flowchart, " {mapping} -- {input_id} --> {target}").unwrap(); } InputMapping::User(mapping) => { visualize_user_mapping(mapping, target, nodes, input_id, flowchart) diff --git a/libraries/extensions/ros2-bridge/python/src/typed/deserialize/mod.rs b/libraries/extensions/ros2-bridge/python/src/typed/deserialize/mod.rs index db9249d1..715431cc 100644 --- a/libraries/extensions/ros2-bridge/python/src/typed/deserialize/mod.rs +++ b/libraries/extensions/ros2-bridge/python/src/typed/deserialize/mod.rs @@ -55,7 +55,7 @@ struct StructVisitor<'a> { type_info: &'a TypeInfo<'a>, } -impl<'a, 'de> serde::de::Visitor<'de> for StructVisitor<'a> { +impl<'de> serde::de::Visitor<'de> for StructVisitor<'_> { type Value = ArrayData; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { diff --git a/libraries/extensions/ros2-bridge/python/src/typed/deserialize/primitive.rs b/libraries/extensions/ros2-bridge/python/src/typed/deserialize/primitive.rs index 7f13b575..1765546a 100644 --- a/libraries/extensions/ros2-bridge/python/src/typed/deserialize/primitive.rs +++ b/libraries/extensions/ros2-bridge/python/src/typed/deserialize/primitive.rs @@ -36,7 +36,7 @@ impl<'de> serde::de::DeserializeSeed<'de> for PrimitiveDeserializer<'_> { /// Based on https://docs.rs/serde_yaml/0.9.22/src/serde_yaml/value/de.rs.html#14-121 struct PrimitiveValueVisitor; -impl<'de> serde::de::Visitor<'de> for PrimitiveValueVisitor { +impl serde::de::Visitor<'_> for PrimitiveValueVisitor { type Value = ArrayData; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { diff --git a/libraries/extensions/ros2-bridge/python/src/typed/deserialize/string.rs b/libraries/extensions/ros2-bridge/python/src/typed/deserialize/string.rs index 646ea38d..7fb7f2c0 100644 --- a/libraries/extensions/ros2-bridge/python/src/typed/deserialize/string.rs +++ b/libraries/extensions/ros2-bridge/python/src/typed/deserialize/string.rs @@ -17,7 +17,7 @@ impl<'de> serde::de::DeserializeSeed<'de> for StringDeserializer { /// Based on https://docs.rs/serde_yaml/0.9.22/src/serde_yaml/value/de.rs.html#14-121 struct StringVisitor; -impl<'de> serde::de::Visitor<'de> for StringVisitor { +impl serde::de::Visitor<'_> for StringVisitor { type Value = ArrayData; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { diff --git a/libraries/extensions/ros2-bridge/python/src/typed/serialize/mod.rs b/libraries/extensions/ros2-bridge/python/src/typed/serialize/mod.rs index 8420f14f..6bebe463 100644 --- a/libraries/extensions/ros2-bridge/python/src/typed/serialize/mod.rs +++ b/libraries/extensions/ros2-bridge/python/src/typed/serialize/mod.rs @@ -100,7 +100,7 @@ impl serde::Serialize for TypedValue<'_> { } } -impl<'a> TypedValue<'a> { +impl TypedValue<'_> { fn serialize_field( &self, field: &dora_ros2_bridge_msg_gen::types::Member,