From f473c856c1a0ef433b482522fe20170369e00d33 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Thu, 8 Sep 2022 14:21:49 +0200 Subject: [PATCH] Fix clippy warnings across whole projects --- apis/python/node/src/lib.rs | 2 ++ apis/rust/node/src/communication.rs | 9 +++++---- apis/rust/node/src/config.rs | 4 ++-- apis/rust/operator/src/raw.rs | 2 +- binaries/coordinator/src/lib.rs | 2 +- binaries/runtime/src/operator/python.rs | 2 ++ examples/iceoryx/sink/src/main.rs | 7 +------ examples/rust-dataflow/sink/src/main.rs | 7 +------ 8 files changed, 15 insertions(+), 20 deletions(-) diff --git a/apis/python/node/src/lib.rs b/apis/python/node/src/lib.rs index a3433ec9..64118a78 100644 --- a/apis/python/node/src/lib.rs +++ b/apis/python/node/src/lib.rs @@ -1,3 +1,5 @@ +#![allow(clippy::borrow_deref_ref)] // clippy warns about code generated by #[pymethods] + use dora_node_api::{config::NodeId, DoraNode, Input}; use eyre::{Context, Result}; use flume::Receiver; diff --git a/apis/rust/node/src/communication.rs b/apis/rust/node/src/communication.rs index d1dec44c..b63ee9b3 100644 --- a/apis/rust/node/src/communication.rs +++ b/apis/rust/node/src/communication.rs @@ -7,9 +7,10 @@ use crate::{ use eyre::Context; use std::{ collections::{BTreeMap, HashSet}, - mem, thread, + mem, + ops::Deref, + thread, }; -use uuid::Uuid; #[doc(hidden)] pub const STOP_TOPIC: &str = "__dora_rs_internal__operator_stopped"; @@ -24,7 +25,7 @@ pub fn init( prefix: zenoh_prefix, } => { let layer = communication_layer_pub_sub::zenoh::ZenohCommunicationLayer::init( - zenoh_config.clone(), + zenoh_config.deref().clone(), zenoh_prefix.clone(), ) .map_err(|err| eyre::eyre!(err))?; @@ -44,7 +45,7 @@ pub fn init( topic_prefix, } => { let app_name_prefix = app_name_prefix.clone(); - let app_name = format!("{app_name_prefix}-{}", Uuid::new_v4()); + let app_name = format!("{app_name_prefix}-{}", uuid::Uuid::new_v4()); let instance_name = topic_prefix.clone(); let layer = communication_layer_pub_sub::iceoryx::IceoryxCommunicationLayer::init( app_name, diff --git a/apis/rust/node/src/config.rs b/apis/rust/node/src/config.rs index 697910f7..201d6341 100644 --- a/apis/rust/node/src/config.rs +++ b/apis/rust/node/src/config.rs @@ -267,7 +267,7 @@ pub struct UserInputMapping { pub enum CommunicationConfig { Zenoh { #[serde(default)] - config: zenoh_config::Config, + config: Box, prefix: String, }, Iceoryx { @@ -288,7 +288,7 @@ impl CommunicationConfig { } CommunicationConfig::Iceoryx { topic_prefix, .. } => { if !topic_prefix.is_empty() { - topic_prefix.push_str("-"); + topic_prefix.push('-'); } topic_prefix.push_str(prefix); } diff --git a/apis/rust/operator/src/raw.rs b/apis/rust/operator/src/raw.rs index 6e561041..79c6e8d2 100644 --- a/apis/rust/operator/src/raw.rs +++ b/apis/rust/operator/src/raw.rs @@ -35,7 +35,7 @@ pub unsafe fn dora_on_input( let operator: &mut O = unsafe { &mut *operator_context.cast() }; let data = input.data.as_ref().as_slice(); - match operator.on_input(&input.id, &data, &mut output_sender) { + match operator.on_input(&input.id, data, &mut output_sender) { Ok(status) => OnInputResult { result: DoraResult { error: None }, status, diff --git a/binaries/coordinator/src/lib.rs b/binaries/coordinator/src/lib.rs index 09d092b3..a91f522e 100644 --- a/binaries/coordinator/src/lib.rs +++ b/binaries/coordinator/src/lib.rs @@ -116,7 +116,7 @@ async fn run_dataflow(dataflow_path: PathBuf, runtime: &Path) -> eyre::Result<() format!("dora/timer/{duration}") }; let mut stream = IntervalStream::new(tokio::time::interval(interval)); - while let Some(_) = stream.next().await { + while (stream.next().await).is_some() { communication .publisher(&topic) .unwrap() diff --git a/binaries/runtime/src/operator/python.rs b/binaries/runtime/src/operator/python.rs index 1dd47c24..0e94ae5f 100644 --- a/binaries/runtime/src/operator/python.rs +++ b/binaries/runtime/src/operator/python.rs @@ -1,3 +1,5 @@ +#![allow(clippy::borrow_deref_ref)] // clippy warns about code generated by #[pymethods] + use super::OperatorEvent; use dora_node_api::{communication::Publisher, config::DataId}; use eyre::{bail, eyre, Context}; diff --git a/examples/iceoryx/sink/src/main.rs b/examples/iceoryx/sink/src/main.rs index 0fd5099b..32a1277d 100644 --- a/examples/iceoryx/sink/src/main.rs +++ b/examples/iceoryx/sink/src/main.rs @@ -6,12 +6,7 @@ fn main() -> eyre::Result<()> { let inputs = operator.inputs()?; - loop { - let input = match inputs.recv() { - Ok(input) => input, - Err(_) => break, - }; - + while let Ok(input) = inputs.recv() { match input.id.as_str() { "message" => { let received_string = String::from_utf8(input.data) diff --git a/examples/rust-dataflow/sink/src/main.rs b/examples/rust-dataflow/sink/src/main.rs index 0fd5099b..32a1277d 100644 --- a/examples/rust-dataflow/sink/src/main.rs +++ b/examples/rust-dataflow/sink/src/main.rs @@ -6,12 +6,7 @@ fn main() -> eyre::Result<()> { let inputs = operator.inputs()?; - loop { - let input = match inputs.recv() { - Ok(input) => input, - Err(_) => break, - }; - + while let Ok(input) = inputs.recv() { match input.id.as_str() { "message" => { let received_string = String::from_utf8(input.data)