From 26974b4e7e9d9d505d5cfbbab4deb47b18b5ecb7 Mon Sep 17 00:00:00 2001
From: oech3 <>
Date: Sun, 31 May 2026 16:01:23 +0900
Subject: [PATCH 1/2] remove some collapsible_if

---
 src/uu/unexpand/src/unexpand.rs   | 8 +++-----
 src/uucore/src/lib/features/fs.rs | 7 +------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/uu/unexpand/src/unexpand.rs b/src/uu/unexpand/src/unexpand.rs
index 840858c6519..b817dcdff93 100644
--- a/src/uu/unexpand/src/unexpand.rs
+++ b/src/uu/unexpand/src/unexpand.rs
@@ -115,11 +115,9 @@ fn parse_tabstops(s: &str) -> Result<TabConfig, ParseError> {
 
     // Handle the increment if specified
     // Only add an extra tab stop if increment is non-zero
-    if let Some(inc) = increment_size {
-        if inc > 0 {
-            let last = *nums.last().unwrap();
-            nums.push(last + inc);
-        }
+    if let Some(inc) = increment_size.filter(|&i| i > 0) {
+        let last = *nums.last().unwrap();
+        nums.push(last + inc);
     }
 
     if let (false, _) = nums
diff --git a/src/uucore/src/lib/features/fs.rs b/src/uucore/src/lib/features/fs.rs
index aece06bd604..6f7a6545255 100644
--- a/src/uucore/src/lib/features/fs.rs
+++ b/src/uucore/src/lib/features/fs.rs
@@ -633,12 +633,7 @@ pub fn infos_refer_to_same_file(
     info1: IOResult<FileInformation>,
     info2: IOResult<FileInformation>,
 ) -> bool {
-    if let Ok(info1) = info1 {
-        if let Ok(info2) = info2 {
-            return info1 == info2;
-        }
-    }
-    false
+    info1.is_ok_and(|i1| info2.is_ok_and(|i2| i1 == i2))
 }
 
 /// Converts absolute `path` to be relative to absolute `to` path.

From a0cf9a6ad3c635e035e96c1c97e77d8092985a14 Mon Sep 17 00:00:00 2001
From: oech3 <79379754+oech3@users.noreply.github.com>
Date: Sun, 31 May 2026 21:41:15 +0900
Subject: [PATCH 2/2] Use .ok() == .ok()

Co-authored-by: Daniel Hofstetter <daniel.hofstetter@42dh.com>
---
 src/uucore/src/lib/features/fs.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/uucore/src/lib/features/fs.rs b/src/uucore/src/lib/features/fs.rs
index 6f7a6545255..351a29f9df8 100644
--- a/src/uucore/src/lib/features/fs.rs
+++ b/src/uucore/src/lib/features/fs.rs
@@ -633,7 +633,7 @@ pub fn infos_refer_to_same_file(
     info1: IOResult<FileInformation>,
     info2: IOResult<FileInformation>,
 ) -> bool {
-    info1.is_ok_and(|i1| info2.is_ok_and(|i2| i1 == i2))
+    info1.is_ok() && info1.ok() == info2.ok()
 }
 
 /// Converts absolute `path` to be relative to absolute `to` path.