From ce28b8786a2d1c0d487ea806fc869c75189f522c Mon Sep 17 00:00:00 2001
From: auronandace <auronandace@googlemail.com>
Date: Wed, 15 Jul 2026 10:54:26 +0100
Subject: [PATCH] follow-up eliminating more as casts

---
 src/header/pwd/redox.rs           | 2 +-
 src/header/sys_ioctl/redox/mod.rs | 7 ++++---
 src/ld_so/linker.rs               | 4 ++--
 src/platform/redox/libcscheme.rs  | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/header/pwd/redox.rs b/src/header/pwd/redox.rs
index 28019cc25b..ce50b77165 100644
--- a/src/header/pwd/redox.rs
+++ b/src/header/pwd/redox.rs
@@ -5,7 +5,7 @@ pub fn split(line: &mut [u8]) -> Option<passwd> {
     let mut parts = line.split_mut(|&c| c == b'\0');
     Some(passwd {
         pw_name: parts.next()?.as_mut_ptr().cast::<c_char>(),
-        pw_passwd: c"x".as_ptr().cast::<c_char>() as *mut c_char,
+        pw_passwd: c"x".as_ptr().cast::<c_char>().cast_mut(),
         pw_uid: parsed(parts.next())?,
         pw_gid: parsed(parts.next())?,
         pw_gecos: parts.next()?.as_mut_ptr().cast::<c_char>(),
diff --git a/src/header/sys_ioctl/redox/mod.rs b/src/header/sys_ioctl/redox/mod.rs
index 8602afac26..d66aba4d77 100644
--- a/src/header/sys_ioctl/redox/mod.rs
+++ b/src/header/sys_ioctl/redox/mod.rs
@@ -22,8 +22,9 @@ fn dup_read<T>(fd: c_int, name: &str, t: &mut T) -> syscall::Result<usize> {
 
     let size = mem::size_of::<T>();
 
-    let bytes = dup
-        .read(unsafe { slice::from_raw_parts_mut(core::ptr::from_mut::<T>(t) as *mut u8, size) })?;
+    let bytes = dup.read(unsafe {
+        slice::from_raw_parts_mut(core::ptr::from_mut::<T>(t).cast::<u8>(), size)
+    })?;
 
     Ok(bytes / size)
 }
@@ -35,7 +36,7 @@ fn dup_write<T>(fd: c_int, name: &str, t: &T) -> Result<usize> {
     let size = mem::size_of::<T>();
 
     let bytes = dup
-        .write(unsafe { slice::from_raw_parts(core::ptr::from_ref::<T>(t) as *const u8, size) })?;
+        .write(unsafe { slice::from_raw_parts(core::ptr::from_ref::<T>(t).cast::<u8>(), size) })?;
 
     Ok(bytes / size)
 }
diff --git a/src/ld_so/linker.rs b/src/ld_so/linker.rs
index 8fc3f2d71f..cf63902a0a 100644
--- a/src/ld_so/linker.rs
+++ b/src/ld_so/linker.rs
@@ -665,7 +665,7 @@ impl Linker {
 
                     // Unmap just the TCB page.
                     Sys::munmap(
-                        core::ptr::from_mut::<Tcb>(new_tcb) as *mut c_void,
+                        core::ptr::from_mut::<Tcb>(new_tcb).cast::<c_void>(),
                         syscall::PAGE_SIZE,
                     )
                     .unwrap();
@@ -698,7 +698,7 @@ impl Linker {
                     drop(_guard);
                     (
                         new_tcb,
-                        core::ptr::from_mut::<Tcb>(old_tcb) as *mut c_void,
+                        core::ptr::from_mut::<Tcb>(old_tcb).cast::<c_void>(),
                         thr_fd,
                     )
                 };
diff --git a/src/platform/redox/libcscheme.rs b/src/platform/redox/libcscheme.rs
index 7624307375..8d4863e478 100644
--- a/src/platform/redox/libcscheme.rs
+++ b/src/platform/redox/libcscheme.rs
@@ -1,7 +1,7 @@
 use crate::{c_str::CStr, header::stdlib::getenv, platform::types::c_char};
 use syscall::{EIO, ENOENT, Error, Result, flag::*};
 
-pub const LIBC_SCHEME: &'static str = "libc:";
+pub const LIBC_SCHEME: &str = "libc:";
 
 const ENV_MAX_LEN: i32 = i32::MAX;