From ca732015fb59855751841f7e3ddfcea9836231a5 Mon Sep 17 00:00:00 2001
From: Lorenz Leutgeb <lorenz.leutgeb@radicle.xyz>
Date: Wed, 15 Apr 2026 00:40:20 +0200
Subject: [PATCH] clippy: Disallow lints `collapsible_*`

The three lints `collapsible_{if,else_if,match}` are disallowed.
---
 crates/radicle-cli-test/src/lib.rs            | 1 -
 crates/radicle-cli/src/commands/init.rs       | 1 -
 crates/radicle-cli/src/commands/patch/list.rs | 6 ++----
 crates/radicle-cli/src/lib.rs                 | 1 -
 crates/radicle-node/src/test/simulator.rs     | 7 ++-----
 crates/radicle-protocol/src/service.rs        | 2 --
 crates/radicle/src/node.rs                    | 1 -
 7 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/crates/radicle-cli-test/src/lib.rs b/crates/radicle-cli-test/src/lib.rs
index 9e66a67d..118dccdc 100644
--- a/crates/radicle-cli-test/src/lib.rs
+++ b/crates/radicle-cli-test/src/lib.rs
@@ -1,4 +1,3 @@
-#![allow(clippy::collapsible_else_if)]
 use std::borrow::Cow;
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
diff --git a/crates/radicle-cli/src/commands/init.rs b/crates/radicle-cli/src/commands/init.rs
index de22c245..a3c1fbd1 100644
--- a/crates/radicle-cli/src/commands/init.rs
+++ b/crates/radicle-cli/src/commands/init.rs
@@ -1,5 +1,4 @@
 #![allow(clippy::or_fun_call)]
-#![allow(clippy::collapsible_else_if)]
 
 mod args;
 
diff --git a/crates/radicle-cli/src/commands/patch/list.rs b/crates/radicle-cli/src/commands/patch/list.rs
index e3caca44..a2cb2113 100644
--- a/crates/radicle-cli/src/commands/patch/list.rs
+++ b/crates/radicle-cli/src/commands/patch/list.rs
@@ -39,10 +39,8 @@ pub fn run(
                 continue;
             }
         };
-        if !authors.is_empty() {
-            if !authors.contains(patch.author().id()) {
-                continue;
-            }
+        if !authors.is_empty() && !authors.contains(patch.author().id()) {
+            continue;
         }
         all.push((id, patch));
     }
diff --git a/crates/radicle-cli/src/lib.rs b/crates/radicle-cli/src/lib.rs
index f6bd66d0..0fee9aab 100644
--- a/crates/radicle-cli/src/lib.rs
+++ b/crates/radicle-cli/src/lib.rs
@@ -1,4 +1,3 @@
-#![allow(clippy::collapsible_if)]
 #![allow(clippy::or_fun_call)]
 #![allow(clippy::too_many_arguments)]
 pub mod commands;
diff --git a/crates/radicle-node/src/test/simulator.rs b/crates/radicle-node/src/test/simulator.rs
index 0d537dd9..0ddef12b 100644
--- a/crates/radicle-node/src/test/simulator.rs
+++ b/crates/radicle-node/src/test/simulator.rs
@@ -1,5 +1,4 @@
 //! A simple P2P network simulator. Acts as the _reactor_, but without doing any I/O.
-#![allow(clippy::collapsible_if)]
 #![allow(dead_code)]
 
 use std::cell::RefCell;
@@ -387,10 +386,8 @@ where
                         let conn = (node, id);
 
                         let attempted = link.is_outbound() && self.attempts.remove(&conn);
-                        if attempted || link.is_inbound() {
-                            if self.connections.insert(conn) {
-                                p.connected(id, addr, link);
-                            }
+                        if (attempted || link.is_inbound()) && self.connections.insert(conn) {
+                            p.connected(id, addr, link);
                         }
                     }
                     Input::Disconnected(id, reason) => {
diff --git a/crates/radicle-protocol/src/service.rs b/crates/radicle-protocol/src/service.rs
index 4bade888..d2bf0a10 100644
--- a/crates/radicle-protocol/src/service.rs
+++ b/crates/radicle-protocol/src/service.rs
@@ -1,6 +1,4 @@
 #![allow(clippy::too_many_arguments)]
-#![allow(clippy::collapsible_match)]
-#![allow(clippy::collapsible_if)]
 #![warn(clippy::unwrap_used)]
 pub mod command;
 pub use command::{Command, QueryState};
diff --git a/crates/radicle/src/node.rs b/crates/radicle/src/node.rs
index f2efc0ef..e7fb2e6b 100644
--- a/crates/radicle/src/node.rs
+++ b/crates/radicle/src/node.rs
@@ -1,4 +1,3 @@
-#![allow(clippy::collapsible_if)]
 mod features;
 
 pub mod address;