Fix `collapsible_if` clippy lint

3 files changed, 18 insertions, 19 deletions

diff --git a/talpid-core/src/firewall/linux.rs b/talpid-core/src/firewall/linux.rs
index 53dd63fe0b..1a418e8ca6 100644
--- a/talpid-core/src/firewall/linux.rs
+++ b/talpid-core/src/firewall/linux.rs
@@ -148,10 +148,10 @@ impl Firewall {
     fn apply_kernel_config(policy: &FirewallPolicy) {
         if *DONT_SET_SRC_VALID_MARK {
             log::debug!("Not setting src_valid_mark");
-        } else if let FirewallPolicy::Connecting { .. } = policy {
-            if let Err(err) = set_src_valid_mark_sysctl() {
-                log::error!("Failed to apply src_valid_mark: {}", err);
-            }
+        } else if let FirewallPolicy::Connecting { .. } = policy
+            && let Err(err) = set_src_valid_mark_sysctl()
+        {
+            log::error!("Failed to apply src_valid_mark: {}", err);
         }
 
         // When we have a tunnel with an IP configured, we configure the system
@@ -166,10 +166,9 @@ impl Firewall {
         if *DONT_SET_ARP_IGNORE {
             log::debug!("Not setting arp_ignore");
         } else if let FirewallPolicy::Connecting { .. } | FirewallPolicy::Connected { .. } = policy
+            && let Err(err) = lock_down_arp_ignore_sysctl()
         {
-            if let Err(err) = lock_down_arp_ignore_sysctl() {
-                log::error!("Failed to apply arp_ignore: {}", err);
-            }
+            log::error!("Failed to apply arp_ignore: {}", err);
         }
     }
 
diff --git a/talpid-core/src/logging/mod.rs b/talpid-core/src/logging/mod.rs
index 0e15054dd4..bd09c9dc03 100644
--- a/talpid-core/src/logging/mod.rs
+++ b/talpid-core/src/logging/mod.rs
@@ -11,14 +11,14 @@ pub struct RotateLogError(#[from] io::Error);
 /// it is backed up with the extension changed to `.old.log`.
 pub fn rotate_log(file: &Path) -> Result<(), RotateLogError> {
     let backup = file.with_extension("old.log");
-    if let Err(error) = fs::rename(file, &backup) {
-        if error.kind() != io::ErrorKind::NotFound {
-            log::warn!(
-                "Failed to rotate log file to {}: {}",
-                backup.display(),
-                error
-            );
-        }
+    if let Err(error) = fs::rename(file, &backup)
+        && error.kind() != io::ErrorKind::NotFound
+    {
+        log::warn!(
+            "Failed to rotate log file to {}: {}",
+            backup.display(),
+            error
+        );
     }
 
     fs::File::create(file).map(|_| ()).map_err(RotateLogError)
diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs
index 9ce22a6285..8f26c92b9d 100644
--- a/talpid-core/src/tunnel_state_machine/connecting_state.rs
+++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs
@@ -272,10 +272,10 @@ impl ConnectingState {
                 }
             };
 
-            if block_reason.is_none() {
-                if let Some(remaining_time) = MIN_TUNNEL_ALIVE_TIME.checked_sub(start.elapsed()) {
-                    thread::sleep(remaining_time);
-                }
+            if block_reason.is_none()
+                && let Some(remaining_time) = MIN_TUNNEL_ALIVE_TIME.checked_sub(start.elapsed())
+            {
+                thread::sleep(remaining_time);
             }
 
             if tunnel_close_event_tx.send(block_reason).is_err() {