diff --git a/Cargo.toml b/Cargo.toml
index f172bc54..c04bb52c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,6 +37,7 @@ format_push_string = "warn"
 get_unwrap = "warn"
 if_not_else = "warn"
 if_then_some_else_none = "warn"
+ignored_unit_patterns = "warn"
 impl_trait_in_params = "warn"
 let_underscore_must_use = "warn"
 lossy_float_literal = "warn"
diff --git a/src/database/key_value/pusher.rs b/src/database/key_value/pusher.rs
index 50a6faca..cf61a4a0 100644
--- a/src/database/key_value/pusher.rs
+++ b/src/database/key_value/pusher.rs
@@ -22,10 +22,7 @@ impl service::pusher::Data for KeyValueDatabase {
                 let mut key = sender.as_bytes().to_vec();
                 key.push(0xff);
                 key.extend_from_slice(ids.pushkey.as_bytes());
-                self.senderkey_pusher
-                    .remove(&key)
-                    .map(|_| ())
-                    .map_err(Into::into)
+                self.senderkey_pusher.remove(&key).map_err(Into::into)
             }
         }
     }
diff --git a/src/main.rs b/src/main.rs
index 91588c88..90248e11 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -486,8 +486,8 @@ async fn shutdown_signal(handle: ServerHandle) {
     let sig: &str;
 
     tokio::select! {
-        _ = ctrl_c => { sig = "Ctrl+C"; },
-        _ = terminate => { sig = "SIGTERM"; },
+        () = ctrl_c => { sig = "Ctrl+C"; },
+        () = terminate => { sig = "SIGTERM"; },
     }
 
     warn!("Received {}, shutting down...", sig);
diff --git a/src/service/admin.rs b/src/service/admin.rs
index cad796c0..d692c809 100644
--- a/src/service/admin.rs
+++ b/src/service/admin.rs
@@ -842,7 +842,7 @@ impl Service {
 
                             let pub_key_map = pub_key_map.read().await;
                             match ruma::signatures::verify_json(&pub_key_map, &value) {
-                                Ok(_) => RoomMessageEventContent::text_plain("Signature correct"),
+                                Ok(()) => RoomMessageEventContent::text_plain("Signature correct"),
                                 Err(e) => RoomMessageEventContent::text_plain(format!(
                                     "Signature verification failed: {e}"
                                 )),
diff --git a/src/service/rooms/timeline.rs b/src/service/rooms/timeline.rs
index a8577f5a..7be88ecb 100644
--- a/src/service/rooms/timeline.rs
+++ b/src/service/rooms/timeline.rs
@@ -763,7 +763,7 @@ impl Service {
             &mut pdu_json,
             &room_version_id,
         ) {
-            Ok(_) => {}
+            Ok(()) => {}
             Err(e) => {
                 return match e {
                     ruma::signatures::Error::PduSize => Err(Error::BadRequest(