From df37258ed22f637ff875bac2ec5709a9d76036f6 Mon Sep 17 00:00:00 2001 From: auronandace Date: Sun, 8 Feb 2026 15:52:55 +0000 Subject: [PATCH] usused_unsafe follow-up for redox --- src/platform/redox/libredox.rs | 4 +--- src/platform/redox/mod.rs | 40 +++++++++++++++------------------- src/platform/redox/socket.rs | 4 ++-- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/src/platform/redox/libredox.rs b/src/platform/redox/libredox.rs index d64cf7b7c0..ceb9cc2feb 100644 --- a/src/platform/redox/libredox.rs +++ b/src/platform/redox/libredox.rs @@ -481,9 +481,7 @@ pub unsafe extern "C" fn redox_register_scheme_to_ns_v0( Error::mux( redox_rt::sys::register_scheme_to_ns( ns_fd, - unsafe { - str::from_utf8_unchecked(unsafe { slice::from_raw_parts(name_base, name_len) }) - }, + unsafe { str::from_utf8_unchecked(slice::from_raw_parts(name_base, name_len)) }, cap_fd, ) .map(|()| 0), diff --git a/src/platform/redox/mod.rs b/src/platform/redox/mod.rs index 225dde3f10..709eeda930 100644 --- a/src/platform/redox/mod.rs +++ b/src/platform/redox/mod.rs @@ -627,18 +627,16 @@ impl Pal for Sys { fn gettimeofday(mut tp: Out, tzp: Option>) -> Result<()> { let mut redox_tp = redox_timespec::default(); syscall::clock_gettime(syscall::CLOCK_REALTIME, &mut redox_tp)?; - unsafe { - tp.write(timeval { - tv_sec: redox_tp.tv_sec as time_t, - tv_usec: (redox_tp.tv_nsec / 1000) as suseconds_t, - }); + tp.write(timeval { + tv_sec: redox_tp.tv_sec as time_t, + tv_usec: (redox_tp.tv_nsec / 1000) as suseconds_t, + }); - if let Some(mut tzp) = tzp { - tzp.write(timezone { - tz_minuteswest: 0, - tz_dsttime: 0, - }); - } + if let Some(mut tzp) = tzp { + tzp.write(timezone { + tz_minuteswest: 0, + tz_dsttime: 0, + }); } Ok(()) } @@ -1222,7 +1220,7 @@ impl Pal for Sys { fn timer_delete(timerid: timer_t) -> Result<()> { unsafe { - let timer_st = unsafe { &mut *(timerid as *mut timer_internal_t) }; + let timer_st = &mut *(timerid as *mut timer_internal_t); let _ = syscall::close(timer_st.timerfd); let _ = syscall::close(timer_st.eventfd); if !timer_st.thread.is_null() { @@ -1391,18 +1389,16 @@ impl Pal for Sys { Ok(()) }; - unsafe { - read_line(sysname.as_slice_mut().cast_slice_to::())?; - read_line(release.as_slice_mut().cast_slice_to::())?; - read_line(machine.as_slice_mut().cast_slice_to::())?; + read_line(sysname.as_slice_mut().cast_slice_to::())?; + read_line(release.as_slice_mut().cast_slice_to::())?; + read_line(machine.as_slice_mut().cast_slice_to::())?; - // Version is not provided - version.as_slice_mut().zero(); + // Version is not provided + version.as_slice_mut().zero(); - // Redox doesn't provide domainname in sys:uname - //read_line(domainname.as_slice_mut())?; - domainname.as_slice_mut().zero(); - } + // Redox doesn't provide domainname in sys:uname + //read_line(domainname.as_slice_mut())?; + domainname.as_slice_mut().zero(); Ok(()) } diff --git a/src/platform/redox/socket.rs b/src/platform/redox/socket.rs index 2fd061915f..72ff905ffe 100644 --- a/src/platform/redox/socket.rs +++ b/src/platform/redox/socket.rs @@ -1142,7 +1142,7 @@ impl PalSocket for Sys { sv[1] = listener.take() as c_int; Ok(()) } - _ => unsafe { + _ => { todo_skip!( 0, "socketpair({}, {}, {}, {:p})", @@ -1152,7 +1152,7 @@ impl PalSocket for Sys { sv.as_mut_ptr() ); Err(Errno(EPROTONOSUPPORT)) - }, + } } } }