Unrolled build for rust-lang#127996

rust-timer · web-flow · commit d463aede324f · 2024-07-22T07:23:29.000-04:00
Rollup merge of rust-lang#127996 - ian-h-chamberlain:fix/horizon-warnings-unsafe-in-unsafe, r=tgross35 Clean up warnings + `unsafe_op_in_unsafe_fn` when building std for armv6k-nintendo-3ds See rust-lang#127747 ping `@AzureMarker` `@Meziu` I could only find one instance needing an extra `unsafe` that was not also shared with many other `unix` targets (presumably these will get covered in larger sweeping changes, I didn't want to introduce churn that would potentially conflict with those). The one codepath I found is shared with `vita` however, so also pinging `@nikarh` `@pheki` `@zetanumbers` just to make sure they're aware of this change. Also removed one unused import from `process_unsupported` which should simply fix the warning for any target that uses it.
diff --git a/library/std/src/os/horizon/mod.rs b/library/std/src/os/horizon/mod.rs
@@ -1,5 +1,6 @@
 //! Definitions for Horizon OS
 
+#![forbid(unsafe_op_in_unsafe_fn)]
 #![stable(feature = "raw_ext", since = "1.1.0")]
 
 pub mod fs;
diff --git a/library/std/src/os/horizon/raw.rs b/library/std/src/os/horizon/raw.rs
@@ -38,6 +38,7 @@ pub type time_t = libc::time_t;
 #[repr(C)]
 #[derive(Clone)]
 #[stable(feature = "raw_ext", since = "1.1.0")]
+#[allow(dead_code)] // This exists for parity with other `raw` modules, but isn't actually used.
 pub struct stat {
     #[stable(feature = "raw_ext", since = "1.1.0")]
     pub st_dev: dev_t,
diff --git a/library/std/src/sys/pal/unix/alloc.rs b/library/std/src/sys/pal/unix/alloc.rs
@@ -67,7 +67,7 @@ cfg_if::cfg_if! {
     ))] {
         #[inline]
         unsafe fn aligned_malloc(layout: &Layout) -> *mut u8 {
-            libc::memalign(layout.align(), layout.size()) as *mut u8
+            unsafe { libc::memalign(layout.align(), layout.size()) as *mut u8 }
         }
     } else {
         #[inline]
diff --git a/library/std/src/sys/pal/unix/process/process_unsupported.rs b/library/std/src/sys/pal/unix/process/process_unsupported.rs
@@ -1,4 +1,3 @@
-use crate::fmt;
 use crate::io;
 use crate::num::NonZero;
 use crate::sys::pal::unix::unsupported::*;

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ cfg_if::cfg_if! {`
`67`	`67`	`))] {`
`68`	`68`	`#[inline]`
`69`	`69`	`unsafe fn aligned_malloc(layout: &Layout) -> *mut u8 {`
`70`		`- libc::memalign(layout.align(), layout.size()) as *mut u8`
	`70`	`+ unsafe { libc::memalign(layout.align(), layout.size()) as *mut u8 }`
`71`	`71`	`}`
`72`	`72`	`} else {`
`73`	`73`	`#[inline]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-use crate::fmt;`
`2`	`1`	`use crate::io;`
`3`	`2`	`use crate::num::NonZero;`
`4`	`3`	`use crate::sys::pal::unix::unsupported::*;`