cleanup: Declare more private padding fields Padding's

3v1n0 · 3v1n0 · commit 7387dd6def8f · 2025-12-03T03:09:32.000+01:00
We have more private fields that are padding areas that are currently
not marked as Padding, which is causing the generated Hash
and PartialEq implementations to take care of them wrongly.

Fix them
diff --git a/src/fuchsia/mod.rs b/src/fuchsia/mod.rs
@@ -520,7 +520,7 @@ s! {
         pub ssi_syscall: i32,
         pub ssi_call_addr: u64,
         pub ssi_arch: u32,
-        _pad: [u8; 28],
+        _pad: Padding<[u8; 28]>,
     }
 
     pub struct itimerspec {
diff --git a/src/new/musl/sys/socket.rs b/src/new/musl/sys/socket.rs
@@ -10,16 +10,16 @@ s! {
         pub msg_namelen: crate::socklen_t,
         pub msg_iov: *mut crate::iovec,
         #[cfg(all(target_pointer_width = "64", target_endian = "big"))]
-        __pad1: c_int,
+        __pad1: Padding<c_int>,
         pub msg_iovlen: c_int,
         #[cfg(all(target_pointer_width = "64", target_endian = "little"))]
-        __pad1: c_int,
+        __pad1: Padding<c_int>,
         pub msg_control: *mut c_void,
         #[cfg(all(target_pointer_width = "64", target_endian = "big"))]
-        __pad2: c_int,
+        __pad2: Padding<c_int>,
         pub msg_controllen: crate::socklen_t,
         #[cfg(all(target_pointer_width = "64", target_endian = "little"))]
-        __pad2: c_int,
+        __pad2: Padding<c_int>,
         pub msg_flags: c_int,
     }
 
diff --git a/src/new/netbsd/utmpx_.rs b/src/new/netbsd/utmpx_.rs
@@ -46,7 +46,7 @@ s! {
         pub ut_exit: __exit_status, // FIXME(netbsd): when anonymous struct are supported
         pub ut_ss: crate::sockaddr_storage,
         pub ut_tv: crate::timeval,
-        ut_pad: [u8; _UTX_PADSIZE],
+        ut_pad: Padding<[u8; _UTX_PADSIZE]>,
     }
 
     pub struct __exit_status {
diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs
@@ -1313,7 +1313,7 @@ s! {
         pub ut_type: c_short,
         pub ut_tv: crate::timeval,
         pub ut_host: [c_char; _UTX_HOSTSIZE],
-        ut_pad: [u32; 16],
+        ut_pad: Padding<[u32; 16]>,
     }
 
     pub struct sigevent {
diff --git a/src/unix/bsd/freebsdlike/freebsd/mod.rs b/src/unix/bsd/freebsdlike/freebsd/mod.rs
@@ -346,7 +346,7 @@ s! {
         m_ceilings: [u32; 2],
         m_rb_link: crate::uintptr_t,
         #[cfg(target_pointer_width = "32")]
-        m_pad: u32,
+        m_pad: Padding<u32>,
         m_spare: [u32; 2],
     }
 
@@ -1684,7 +1684,7 @@ s_no_extra_traits! {
     }
 
     pub struct in_addr_4in6 {
-        _ia46_pad32: [u32; 3],
+        _ia46_pad32: Padding<[u32; 3]>,
         pub ia46_addr4: crate::in_addr,
     }
 
diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs
@@ -230,7 +230,7 @@ s! {
             target_arch = "x86",
             target_arch = "x86_64"
         ))]
-        ptm_pad1: [u8; 3],
+        ptm_pad1: Padding<[u8; 3]>,
         // actually a union with a non-unused, 0-initialized field
         ptm_unused: __pthread_spin_t,
         #[cfg(any(
@@ -239,7 +239,7 @@ s! {
             target_arch = "x86",
             target_arch = "x86_64"
         ))]
-        ptm_pad2: [u8; 3],
+        ptm_pad2: Padding<[u8; 3]>,
         ptm_owner: crate::pthread_t,
         ptm_waiters: *mut u8,
         ptm_recursed: c_uint,
@@ -1281,9 +1281,9 @@ cfg_if! {
         pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
             ptm_magic: 0x33330003,
             ptm_errorcheck: 0,
-            ptm_pad1: [0; 3],
+            ptm_pad1: Padding::uninit(),
             ptm_unused: 0,
-            ptm_pad2: [0; 3],
+            ptm_pad2: Padding::uninit(),
             ptm_waiters: 0 as *mut _,
             ptm_owner: 0,
             ptm_recursed: 0,
diff --git a/src/unix/bsd/netbsdlike/openbsd/mod.rs b/src/unix/bsd/netbsdlike/openbsd/mod.rs
@@ -623,9 +623,9 @@ s! {
     pub struct sockaddr_storage {
         pub ss_len: u8,
         pub ss_family: crate::sa_family_t,
-        __ss_pad1: [u8; 6],
-        __ss_pad2: i64,
-        __ss_pad3: [u8; 240],
+        __ss_pad1: Padding<[u8; 6]>,
+        __ss_pad2: Padding<i64>,
+        __ss_pad3: Padding<[u8; 240]>,
     }
 
     pub struct siginfo_t {
@@ -634,9 +634,9 @@ s! {
         pub si_errno: c_int,
         pub si_addr: *mut c_char,
         #[cfg(target_pointer_width = "32")]
-        __pad: [u8; 112],
+        __pad: Padding<[u8; 112]>,
         #[cfg(target_pointer_width = "64")]
-        __pad: [u8; 108],
+        __pad: Padding<[u8; 108]>,
     }
 
     pub struct lastlog {
diff --git a/src/unix/linux_like/linux/gnu/b32/arm/mod.rs b/src/unix/linux_like/linux/gnu/b32/arm/mod.rs
@@ -84,15 +84,15 @@ s! {
         pub st_atime: crate::time_t,
         pub st_atime_nsec: c_long,
         #[cfg(gnu_time_bits64)]
-        _atime_pad: c_int,
+        _atime_pad: Padding<c_int>,
         pub st_mtime: crate::time_t,
         pub st_mtime_nsec: c_long,
         #[cfg(gnu_time_bits64)]
-        _mtime_pad: c_int,
+        _mtime_pad: Padding<c_int>,
         pub st_ctime: crate::time_t,
         pub st_ctime_nsec: c_long,
         #[cfg(gnu_time_bits64)]
-        _ctime_pad: c_int,
+        _ctime_pad: Padding<c_int>,
         #[cfg(not(gnu_time_bits64))]
         pub st_ino: crate::ino64_t,
     }
diff --git a/src/unix/linux_like/linux/gnu/b32/mips/mod.rs b/src/unix/linux_like/linux/gnu/b32/mips/mod.rs
@@ -45,15 +45,15 @@ s! {
 
         pub st_atime: crate::time_t,
         #[cfg(gnu_time_bits64)]
-        _atime_pad: c_int,
+        _atime_pad: Padding<c_int>,
         pub st_atime_nsec: c_long,
         pub st_mtime: crate::time_t,
         #[cfg(gnu_time_bits64)]
-        _mtime_pad: c_int,
+        _mtime_pad: Padding<c_int>,
         pub st_mtime_nsec: c_long,
         pub st_ctime: crate::time_t,
         #[cfg(gnu_time_bits64)]
-        _ctime_pad: c_int,
+        _ctime_pad: Padding<c_int>,
         pub st_ctime_nsec: c_long,
 
         #[cfg(not(gnu_time_bits64))]
@@ -98,15 +98,15 @@ s! {
 
         pub st_atime: crate::time_t,
         #[cfg(gnu_time_bits64)]
-        _atime_pad: c_int,
+        _atime_pad: Padding<c_int>,
         pub st_atime_nsec: c_long,
         pub st_mtime: crate::time_t,
         #[cfg(gnu_time_bits64)]
-        _mtime_pad: c_int,
+        _mtime_pad: Padding<c_int>,
         pub st_mtime_nsec: c_long,
         pub st_ctime: crate::time_t,
         #[cfg(gnu_time_bits64)]
-        _ctime_pad: c_int,
+        _ctime_pad: Padding<c_int>,
         pub st_ctime_nsec: c_long,
 
         #[cfg(not(gnu_time_bits64))]
diff --git a/src/unix/linux_like/linux/gnu/b32/mod.rs b/src/unix/linux_like/linux/gnu/b32/mod.rs
@@ -106,15 +106,15 @@ cfg_if! {
                 pub st_atime: crate::time_t,
                 pub st_atime_nsec: c_long,
                 #[cfg(gnu_time_bits64)]
-                _atime_pad: c_int,
+                _atime_pad: Padding<c_int>,
                 pub st_mtime: crate::time_t,
                 pub st_mtime_nsec: c_long,
                 #[cfg(gnu_time_bits64)]
-                _mtime_pad: c_int,
+                _mtime_pad: Padding<c_int>,
                 pub st_ctime: crate::time_t,
                 pub st_ctime_nsec: c_long,
                 #[cfg(gnu_time_bits64)]
-                _ctime_pad: c_int,
+                _ctime_pad: Padding<c_int>,
 
                 #[cfg(not(gnu_file_offset_bits64))]
                 __glibc_reserved4: c_long,
diff --git a/src/unix/linux_like/linux/gnu/b32/powerpc.rs b/src/unix/linux_like/linux/gnu/b32/powerpc.rs
@@ -79,15 +79,15 @@ s! {
         pub st_blocks: crate::blkcnt_t,
         pub st_atime: crate::time_t,
         #[cfg(gnu_time_bits64)]
-        _atime_pad: c_int,
+        _atime_pad: Padding<c_int>,
         pub st_atime_nsec: c_long,
         pub st_mtime: crate::time_t,
         #[cfg(gnu_time_bits64)]
-        _mtime_pad: c_int,
+        _mtime_pad: Padding<c_int>,
         pub st_mtime_nsec: c_long,
         pub st_ctime: crate::time_t,
         #[cfg(gnu_time_bits64)]
-        _ctime_pad: c_int,
+        _ctime_pad: Padding<c_int>,
         pub st_ctime_nsec: c_long,
         #[cfg(not(gnu_time_bits64))]
         __glibc_reserved4: c_ulong,
@@ -110,15 +110,15 @@ s! {
         pub st_blocks: crate::blkcnt64_t,
         pub st_atime: crate::time_t,
         #[cfg(gnu_time_bits64)]
-        _atime_pad: c_int,
+        _atime_pad: Padding<c_int>,
         pub st_atime_nsec: c_long,
         pub st_mtime: crate::time_t,
         #[cfg(gnu_time_bits64)]
-        _mtime_pad: c_int,
+        _mtime_pad: Padding<c_int>,
         pub st_mtime_nsec: c_long,
         pub st_ctime: crate::time_t,
         #[cfg(gnu_time_bits64)]
-        _ctime_pad: c_int,
+        _ctime_pad: Padding<c_int>,
         pub st_ctime_nsec: c_long,
         #[cfg(not(gnu_time_bits64))]
         __glibc_reserved4: c_ulong,
diff --git a/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs b/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs
@@ -247,7 +247,7 @@ s_no_extra_traits! {
     pub struct mcontext_t {
         __glibc_reserved: [c_ulong; 4],
         pub signal: c_int,
-        __pad0: c_int,
+        __pad0: Padding<c_int>,
         pub handler: c_ulong,
         pub oldmask: c_ulong,
         pub regs: *mut pt_regs,
@@ -262,20 +262,20 @@ s_no_extra_traits! {
         pub vrregs: [[c_uint; 4]; 32],
         pub vscr: vscr_t,
         pub vrsave: c_uint,
-        __pad: [c_uint; 3],
+        __pad: Padding<[c_uint; 3]>,
     }
 
     #[repr(align(4))]
     pub struct vscr_t {
         #[cfg(target_endian = "big")]
-        __pad: [c_uint; 3],
+        __pad: Padding<[c_uint; 3]>,
         #[cfg(target_endian = "big")]
         pub vscr_word: c_uint,
 
         #[cfg(target_endian = "little")]
         pub vscr_word: c_uint,
         #[cfg(target_endian = "little")]
-        __pad: [c_uint; 3],
+        __pad: Padding<[c_uint; 3]>,
     }
 }
 
diff --git a/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs b/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs
@@ -235,7 +235,7 @@ s! {
         pub l_len: off_t,
         pub l_sysid: c_long,
         pub l_pid: crate::pid_t,
-        pad: [c_long; 4],
+        pad: Padding<[c_long; 4]>,
     }
 
     pub struct sysinfo {
diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs
@@ -220,9 +220,9 @@ s! {
     pub struct sockaddr_storage {
         pub ss_family: sa_family_t,
         #[cfg(target_pointer_width = "32")]
-        __ss_pad2: [u8; 128 - 2 - 4],
+        __ss_pad2: Padding<[u8; 128 - 2 - 4]>,
         #[cfg(target_pointer_width = "64")]
-        __ss_pad2: [u8; 128 - 2 - 8],
+        __ss_pad2: Padding<[u8; 128 - 2 - 8]>,
         __ss_align: size_t,
     }
 
diff --git a/src/unix/solarish/mod.rs b/src/unix/solarish/mod.rs
@@ -252,7 +252,7 @@ s! {
         pub ai_socktype: c_int,
         pub ai_protocol: c_int,
         #[cfg(target_arch = "sparc64")]
-        __sparcv9_pad: c_int,
+        __sparcv9_pad: Padding<c_int>,
         pub ai_addrlen: crate::socklen_t,
         pub ai_canonname: *mut c_char,
         pub ai_addr: *mut crate::sockaddr,

Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ s! {`
`520`	`520`	`pub ssi_syscall: i32,`
`521`	`521`	`pub ssi_call_addr: u64,`
`522`	`522`	`pub ssi_arch: u32,`
`523`		`- _pad: [u8; 28],`
	`523`	`+ _pad: Padding<[u8; 28]>,`
`524`	`524`	`}`
`525`	`525`
`526`	`526`	`pub struct itimerspec {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ s! {`
`46`	`46`	`pub ut_exit: __exit_status, // FIXME(netbsd): when anonymous struct are supported`
`47`	`47`	`pub ut_ss: crate::sockaddr_storage,`
`48`	`48`	`pub ut_tv: crate::timeval,`
`49`		`- ut_pad: [u8; _UTX_PADSIZE],`
	`49`	`+ ut_pad: Padding<[u8; _UTX_PADSIZE]>,`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`pub struct __exit_status {`
Original file line number	Diff line number	Diff line change
`@@ -1313,7 +1313,7 @@ s! {`
`1313`	`1313`	`pub ut_type: c_short,`
`1314`	`1314`	`pub ut_tv: crate::timeval,`
`1315`	`1315`	`pub ut_host: [c_char; _UTX_HOSTSIZE],`
`1316`		`- ut_pad: [u32; 16],`
	`1316`	`+ ut_pad: Padding<[u32; 16]>,`
`1317`	`1317`	`}`
`1318`	`1318`
`1319`	`1319`	`pub struct sigevent {`
Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ s! {`
`346`	`346`	`m_ceilings: [u32; 2],`
`347`	`347`	`m_rb_link: crate::uintptr_t,`
`348`	`348`	`#[cfg(target_pointer_width = "32")]`
`349`		`- m_pad: u32,`
	`349`	`+ m_pad: Padding<u32>,`
`350`	`350`	`m_spare: [u32; 2],`
`351`	`351`	`}`
`352`	`352`
`@@ -1684,7 +1684,7 @@ s_no_extra_traits! {`
`1684`	`1684`	`}`
`1685`	`1685`
`1686`	`1686`	`pub struct in_addr_4in6 {`
`1687`		`- _ia46_pad32: [u32; 3],`
	`1687`	`+ _ia46_pad32: Padding<[u32; 3]>,`
`1688`	`1688`	`pub ia46_addr4: crate::in_addr,`
`1689`	`1689`	`}`
`1690`	`1690`