From b2b88e11bfcf92d429a6ee52d3ea06f84be9ba3d Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Mon, 13 Nov 2023 15:54:28 +0100
Subject: [PATCH] Bump clippy checks to 1.73.0

---
 .github/workflows/ci.yaml                      | 4 ++--
 crates/handlers/src/activity_tracker/mod.rs    | 8 ++++----
 crates/handlers/src/activity_tracker/worker.rs | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e9c5b897..fc3902ed 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -195,8 +195,8 @@ jobs:
 
       - name: Install toolchain
         run: |
-          rustup toolchain install 1.71.0
-          rustup default 1.71.0
+          rustup toolchain install 1.73.0
+          rustup default 1.73.0
           rustup component add clippy
 
       - name: Setup OPA
diff --git a/crates/handlers/src/activity_tracker/mod.rs b/crates/handlers/src/activity_tracker/mod.rs
index 702a1eb3..e4767021 100644
--- a/crates/handlers/src/activity_tracker/mod.rs
+++ b/crates/handlers/src/activity_tracker/mod.rs
@@ -154,7 +154,7 @@ impl ActivityTracker {
         let res = self.channel.send(Message::Flush(tx)).await;
 
         match res {
-            Ok(_) => {
+            Ok(()) => {
                 if let Err(e) = rx.await {
                     tracing::error!("Failed to flush activity tracker: {}", e);
                 }
@@ -172,12 +172,12 @@ impl ActivityTracker {
                 biased;
 
                 // First check if the channel is closed, then check if the timer expired
-                _ = self.channel.closed() => {
+                () = self.channel.closed() => {
                     // The channel was closed, so we should exit
                     break;
                 }
 
-                _ = tokio::time::sleep(interval) => {
+                () = tokio::time::sleep(interval) => {
                     self.flush().await;
                 }
             }
@@ -192,7 +192,7 @@ impl ActivityTracker {
         let res = self.channel.send(Message::Shutdown(tx)).await;
 
         match res {
-            Ok(_) => {
+            Ok(()) => {
                 if let Err(e) = rx.await {
                     tracing::error!("Failed to shutdown activity tracker: {}", e);
                 }
diff --git a/crates/handlers/src/activity_tracker/worker.rs b/crates/handlers/src/activity_tracker/worker.rs
index 978e7891..ef8e1f3e 100644
--- a/crates/handlers/src/activity_tracker/worker.rs
+++ b/crates/handlers/src/activity_tracker/worker.rs
@@ -185,7 +185,7 @@ impl Worker {
         let duration_ms = duration.as_millis().try_into().unwrap_or(u64::MAX);
 
         match res {
-            Ok(_) => {
+            Ok(()) => {
                 self.flush_time_histogram
                     .record(duration_ms, &[RESULT.string("success")]);
             }