From b4009544a8eab90b8c24ef99dd34d0cbfab2c195 Mon Sep 17 00:00:00 2001
From: auronandace <auronandace@googlemail.com>
Date: Fri, 3 Apr 2026 14:39:56 +0100
Subject: [PATCH] minor code cleanups

---
 src/header/stdio/mod.rs    |  3 +--
 src/header/stdio/printf.rs |  3 +--
 src/header/wchar/mod.rs    |  4 ++--
 src/ld_so/linker.rs        | 13 +++++--------
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/header/stdio/mod.rs b/src/header/stdio/mod.rs
index b22696ff61..087c989935 100644
--- a/src/header/stdio/mod.rs
+++ b/src/header/stdio/mod.rs
@@ -578,10 +578,9 @@ pub unsafe extern "C" fn fopen(filename: *const c_char, mode: *const c_char) ->
 
     helpers::_fdopen(fd, unsafe { CStr::from_ptr(mode) })
         .map(Box::into_raw)
-        .map_err(|err| {
+        .inspect_err(|err| {
             // TODO: guard type
             if let Ok(()) = Sys::close(fd) {}; // TODO handle error
-            err
         })
         .or_errno_null_mut()
 }
diff --git a/src/header/stdio/printf.rs b/src/header/stdio/printf.rs
index 442c4d4c64..d5057d3934 100644
--- a/src/header/stdio/printf.rs
+++ b/src/header/stdio/printf.rs
@@ -610,9 +610,8 @@ impl<'a, T: c_str::Kind> Iterator for PrintfIter<'a, T> {
         self.format = first_percent.split_first().expect("must be %").1;
 
         let mut peekahead = self.format;
-        let index = pop_index(&mut peekahead).map(|i| {
+        let index = pop_index(&mut peekahead).inspect(|i| {
             self.format = peekahead;
-            i
         });
 
         // Flags:
diff --git a/src/header/wchar/mod.rs b/src/header/wchar/mod.rs
index 4ae63172f4..4a1db8ce88 100644
--- a/src/header/wchar/mod.rs
+++ b/src/header/wchar/mod.rs
@@ -130,11 +130,11 @@ pub unsafe extern "C" fn fgetws(ws: *mut wchar_t, n: c_int, stream: *mut FILE) -
     }
     // NUL-terminate result
     unsafe { *ws.add(i) = 0 };
-    return if i == 0 || unsafe { ferror(&raw mut *stream) != 0 } {
+    if i == 0 || unsafe { ferror(&raw mut *stream) != 0 } {
         core::ptr::null_mut()
     } else {
         ws
-    };
+    }
 }
 
 /// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fputwc.html>.
diff --git a/src/ld_so/linker.rs b/src/ld_so/linker.rs
index a3e10b5a07..96b79ed1c1 100644
--- a/src/ld_so/linker.rs
+++ b/src/ld_so/linker.rs
@@ -1024,14 +1024,11 @@ impl Linker {
             })?;
 
             if !shm_exists {
-                let _ = Sys::open(shm_path, fcntl::O_CREAT | fcntl::O_RDWR, 0o600)
-                    .map(|fd| Sys::close(fd));
-            } else {
-                if let Ok(shm_fd) = Sys::open(shm_path, fcntl::O_RDWR, 0o600) {
-                    let _ = Sys::ftruncate(shm_fd, source_size as i64);
-                    let _ = Sys::write(shm_fd, file.data());
-                    let _ = Sys::close(shm_fd);
-                }
+                let _ = Sys::open(shm_path, fcntl::O_CREAT | fcntl::O_RDWR, 0o600).map(Sys::close);
+            } else if let Ok(shm_fd) = Sys::open(shm_path, fcntl::O_RDWR, 0o600) {
+                let _ = Sys::ftruncate(shm_fd, source_size as i64);
+                let _ = Sys::write(shm_fd, file.data());
+                let _ = Sys::close(shm_fd);
             }
 
             file