From 436680426705696f4909a040f233105bc91eb538 Mon Sep 17 00:00:00 2001
From: Daniel Hofstetter <daniel.hofstetter@42dh.com>
Date: Fri, 8 Aug 2025 11:08:47 +0200
Subject: [PATCH 1/2] clippy: fix "hiding a lifetime" warning

from mismatched_lifetime_syntaxes lint
---
 src/uu/lsipc/src/display.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/uu/lsipc/src/display.rs b/src/uu/lsipc/src/display.rs
index 3daa3eb..db6ed81 100644
--- a/src/uu/lsipc/src/display.rs
+++ b/src/uu/lsipc/src/display.rs
@@ -246,7 +246,10 @@ pub(crate) fn describe_size(size: u64, in_bytes: bool) -> Option<Cow<'static, CS
     Some(Cow::Owned(CString::new(size_desc(size, in_bytes)).unwrap()))
 }
 
-pub(crate) fn describe_owner(users: &mut UserDbRecordRef, uid: libc::uid_t) -> Option<Cow<CStr>> {
+pub(crate) fn describe_owner(
+    users: &mut UserDbRecordRef,
+    uid: libc::uid_t,
+) -> Option<Cow<'_, CStr>> {
     if let Some(name) = users.for_id(uid).name() {
         Some(Cow::Borrowed(name))
     } else {

From cb25413e54e40a3206ea0a186e64966a4d6fe37f Mon Sep 17 00:00:00 2001
From: Daniel Hofstetter <daniel.hofstetter@42dh.com>
Date: Fri, 8 Aug 2025 11:14:04 +0200
Subject: [PATCH 2/2] clippy: fix warnings from collapsible_if lint

---
 src/uu/chcpu/src/sysfs.rs         | 10 ++++++----
 src/uu/lsipc/src/message_queue.rs | 10 +++++-----
 src/uu/lsipc/src/semaphore.rs     | 10 +++++-----
 src/uu/lsipc/src/shared_memory.rs | 10 +++++-----
 src/uu/lslocks/src/utils.rs       | 31 ++++++++++++++++---------------
 5 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/src/uu/chcpu/src/sysfs.rs b/src/uu/chcpu/src/sysfs.rs
index e06a268..c499f08 100644
--- a/src/uu/chcpu/src/sysfs.rs
+++ b/src/uu/chcpu/src/sysfs.rs
@@ -217,10 +217,12 @@ impl SysFSCpu {
                 .map_err(|err| ChCpuError::io0("write standard output", err));
         }
 
-        if let Some(enabled_cpu_list) = enabled_cpu_list {
-            if previous_config && !configure && enabled_cpu_list.0.contains(&cpu_index) {
-                return Err(ChCpuError::CpuIsEnabled(cpu_index));
-            }
+        if let Some(enabled_cpu_list) = enabled_cpu_list
+            && previous_config
+            && !configure
+            && enabled_cpu_list.0.contains(&cpu_index)
+        {
+            return Err(ChCpuError::CpuIsEnabled(cpu_index));
         }
 
         if let Err(err) = self.write_value(&configure_path, u8::from(configure)) {
diff --git a/src/uu/lsipc/src/message_queue.rs b/src/uu/lsipc/src/message_queue.rs
index a06b3d0..3d53b80 100644
--- a/src/uu/lsipc/src/message_queue.rs
+++ b/src/uu/lsipc/src/message_queue.rs
@@ -341,11 +341,11 @@ pub(crate) fn describe(
     let now = time_of_day()?;
     let sys_v_ipc = SysVIpc::new(id)?;
 
-    if let Some(id) = id {
-        if sys_v_ipc.0.len() != 1 {
-            eprintln!("id {id} not found");
-            return Ok(());
-        }
+    if let Some(id) = id
+        && sys_v_ipc.0.len() != 1
+    {
+        eprintln!("id {id} not found");
+        return Ok(());
     }
 
     table.set_name(c"messages")?;
diff --git a/src/uu/lsipc/src/semaphore.rs b/src/uu/lsipc/src/semaphore.rs
index 2eb59b4..3012159 100644
--- a/src/uu/lsipc/src/semaphore.rs
+++ b/src/uu/lsipc/src/semaphore.rs
@@ -410,11 +410,11 @@ pub(crate) fn describe(
     let now = time_of_day()?;
     let sys_v_ipc = SysVIpc::new(id)?;
 
-    if let Some(id) = id {
-        if sys_v_ipc.0.len() != 1 {
-            eprintln!("id {id} not found");
-            return Ok(());
-        }
+    if let Some(id) = id
+        && sys_v_ipc.0.len() != 1
+    {
+        eprintln!("id {id} not found");
+        return Ok(());
     }
 
     table.set_name(c"semaphores")?;
diff --git a/src/uu/lsipc/src/shared_memory.rs b/src/uu/lsipc/src/shared_memory.rs
index cd44d84..106a536 100644
--- a/src/uu/lsipc/src/shared_memory.rs
+++ b/src/uu/lsipc/src/shared_memory.rs
@@ -391,11 +391,11 @@ pub(crate) fn describe(
     let now = time_of_day()?;
     let sys_v_ipc = SysVIpc::new(id)?;
 
-    if let Some(id) = id {
-        if sys_v_ipc.0.len() != 1 {
-            eprintln!("id {id} not found");
-            return Ok(());
-        }
+    if let Some(id) = id
+        && sys_v_ipc.0.len() != 1
+    {
+        eprintln!("id {id} not found");
+        return Ok(());
     }
 
     table.set_name(c"sharedmemory")?;
diff --git a/src/uu/lslocks/src/utils.rs b/src/uu/lslocks/src/utils.rs
index 0645204..a9dd765 100644
--- a/src/uu/lslocks/src/utils.rs
+++ b/src/uu/lslocks/src/utils.rs
@@ -275,22 +275,23 @@ impl LockInfo {
 
         let range = start..end;
 
-        if let Some(pid_locks) = pid_locks {
-            if command_name.is_none() && !blocked {
-                let lock_compare = |lock: &&LockInfo| {
-                    lock.range == range
-                        && lock.inode == inode
-                        && lock.device_id == device_id
-                        && lock.mandatory == mandatory
-                        && lock.blocked == blocked
-                        && lock.kind == kind
-                        && lock.mode == mode
-                };
+        if let Some(pid_locks) = pid_locks
+            && command_name.is_none()
+            && !blocked
+        {
+            let lock_compare = |lock: &&LockInfo| {
+                lock.range == range
+                    && lock.inode == inode
+                    && lock.device_id == device_id
+                    && lock.mandatory == mandatory
+                    && lock.blocked == blocked
+                    && lock.kind == kind
+                    && lock.mode == mode
+            };
 
-                if let Some(found) = pid_locks.iter().find(lock_compare) {
-                    process_id = found.process_id;
-                    command_name = found.command_name.clone();
-                }
+            if let Some(found) = pid_locks.iter().find(lock_compare) {
+                process_id = found.process_id;
+                command_name = found.command_name.clone();
             }
         }