From 52e2105df7fdf9041e0b1b936de668d24d198ddd Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 1 May 2020 21:21:40 +0200
Subject: [PATCH] silence some clippy warnings

It looks like the current version of rustc/clippy seems the include expanded
macros (like tracing) in the complexity.  None of these warnings show up
with rust 1.42.0.
---
 ofborg/src/asynccmd.rs           | 2 ++
 ofborg/src/bin/builder.rs        | 2 ++
 ofborg/src/bin/mass-rebuilder.rs | 2 ++
 ofborg/src/tasks/build.rs        | 2 ++
 ofborg/src/tasks/evaluate.rs     | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/ofborg/src/asynccmd.rs b/ofborg/src/asynccmd.rs
index b457d4a..8184ac6 100644
--- a/ofborg/src/asynccmd.rs
+++ b/ofborg/src/asynccmd.rs
@@ -149,6 +149,8 @@ impl SpawnedAsyncCmd {
     }
 }
 
+// FIXME: remove with rust/cargo update
+#[allow(clippy::cognitive_complexity)]
 fn block_on_waiters(
     monitor_rx: mpsc::Receiver<(WaitTarget, WaitResult<()>)>,
     mut waiters: HashMap<WaitTarget, thread::JoinHandle<()>>,
diff --git a/ofborg/src/bin/builder.rs b/ofborg/src/bin/builder.rs
index 7b4a9b3..2a22c79 100644
--- a/ofborg/src/bin/builder.rs
+++ b/ofborg/src/bin/builder.rs
@@ -9,6 +9,8 @@ use ofborg::easyamqp::{self, ChannelExt, ConsumerExt};
 use ofborg::easylapin;
 use ofborg::{checkout, config, tasks};
 
+// FIXME: remove with rust/cargo update
+#[allow(clippy::cognitive_complexity)]
 fn main() -> Result<(), Box<dyn Error>> {
     ofborg::setup_log();
 
diff --git a/ofborg/src/bin/mass-rebuilder.rs b/ofborg/src/bin/mass-rebuilder.rs
index 7c098b6..8db5be9 100644
--- a/ofborg/src/bin/mass-rebuilder.rs
+++ b/ofborg/src/bin/mass-rebuilder.rs
@@ -12,6 +12,8 @@ use std::process;
 use amqp::Basic;
 use tracing::{error, info};
 
+// FIXME: remove with rust/cargo update
+#[allow(clippy::cognitive_complexity)]
 fn main() {
     let memory_info = sys_info::mem_info().expect("Unable to get memory information from OS");
 
diff --git a/ofborg/src/tasks/build.rs b/ofborg/src/tasks/build.rs
index cce1925..4ab29c1 100644
--- a/ofborg/src/tasks/build.rs
+++ b/ofborg/src/tasks/build.rs
@@ -271,6 +271,8 @@ impl notifyworker::SimpleNotifyWorker for BuildWorker {
         }
     }
 
+    // FIXME: remove with rust/cargo update
+    #[allow(clippy::cognitive_complexity)]
     fn consumer(
         &self,
         job: &buildjob::BuildJob,
diff --git a/ofborg/src/tasks/evaluate.rs b/ofborg/src/tasks/evaluate.rs
index a5bf6ad..4422f3f 100644
--- a/ofborg/src/tasks/evaluate.rs
+++ b/ofborg/src/tasks/evaluate.rs
@@ -246,6 +246,8 @@ impl<'a, E: stats::SysEvents + 'static> OneEval<'a, E> {
         }
     }
 
+    // FIXME: remove with rust/cargo update
+    #[allow(clippy::cognitive_complexity)]
     fn evaluate_job(&mut self) -> Result<worker::Actions, EvalWorkerError> {
         let job = self.job;
         let repo = self