From 4e2d85e3b0a54e5da544414c41061af317ea79fb Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Wed, 26 Jun 2024 18:25:23 +0200 Subject: [PATCH] Fix or silence clippy warnings --- binaries/cli/src/attach.rs | 8 ++++---- binaries/coordinator/src/lib.rs | 1 + binaries/daemon/src/lib.rs | 6 ++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/binaries/cli/src/attach.rs b/binaries/cli/src/attach.rs index a6a264d7..d5edeffd 100644 --- a/binaries/cli/src/attach.rs +++ b/binaries/cli/src/attach.rs @@ -157,13 +157,13 @@ pub fn attach_dataflow( Ok(AttachEvent::Control(control_request)) => control_request, Ok(AttachEvent::Log(Ok(log_message))) => { let LogMessage { - dataflow_id, + dataflow_id: _, node_id, level, target, - module_path, - file, - line, + module_path: _, + file: _, + line: _, message, } = log_message; let level = match level { diff --git a/binaries/coordinator/src/lib.rs b/binaries/coordinator/src/lib.rs index 01c7df1e..1c88d981 100644 --- a/binaries/coordinator/src/lib.rs +++ b/binaries/coordinator/src/lib.rs @@ -601,6 +601,7 @@ async fn start_inner( Ok(()) } +#[allow(clippy::too_many_arguments)] async fn stop_dataflow_by_uuid( running_dataflows: &mut HashMap, dataflow_results: &HashMap>, diff --git a/binaries/daemon/src/lib.rs b/binaries/daemon/src/lib.rs index 29d6a0c3..2ba349eb 100644 --- a/binaries/daemon/src/lib.rs +++ b/binaries/daemon/src/lib.rs @@ -87,6 +87,8 @@ pub struct Daemon { clock: Arc, } +type DaemonRunResult = BTreeMap>>; + impl Daemon { pub async fn run( coordinator_addr: SocketAddr, @@ -227,7 +229,7 @@ impl Daemon { machine_id: String, exit_when_done: Option>, clock: Arc, - ) -> eyre::Result>>> { + ) -> eyre::Result { let coordinator_connection = match coordinator_addr { Some(addr) => { let stream = TcpStream::connect(addr) @@ -272,7 +274,7 @@ impl Daemon { async fn run_inner( mut self, incoming_events: impl Stream> + Unpin, - ) -> eyre::Result>>> { + ) -> eyre::Result { let mut events = incoming_events; while let Some(event) = events.next().await {