cleanup: Declare more padding fields as private Padding's

src/new/apple/xnu/mach/i386/_structs.rs

@@ -46,7 +46,7 @@ s! {
     }
 
     pub struct __darwin_x86_float_state64 {
-        pub __fpu_reserved: [c_int; 2],
+        __fpu_reserved: Padding<[c_int; 2]>,
         __fpu_fcw: c_short,
         __fpu_fsw: c_short,
         pub __fpu_ftw: u8,
@@ -87,6 +87,6 @@ s! {
         // FIXME(apple): this field is actually [u8; 96], but defining it with a bigger type allows
         // us to auto-implement traits for it since the length of the array is less than 32
         __fpu_rsrv4: [u32; 24],
-        pub __fpu_reserved1: c_int,
+        __fpu_reserved1: Padding<c_int>,
     }
 }

src/unix/bsd/apple/b32/mod.rs

@@ -13,7 +13,7 @@ s! {
         pub ifi_hdrlen: c_uchar,
         pub ifi_recvquota: c_uchar,
         pub ifi_xmitquota: c_uchar,
-        pub ifi_unused1: c_uchar,
+        ifi_unused1: Padding<c_uchar>,
         pub ifi_mtu: u32,
         pub ifi_metric: u32,
         pub ifi_baudrate: u32,
@@ -31,10 +31,10 @@ s! {
         pub ifi_recvtiming: u32,
         pub ifi_xmittiming: u32,
         pub ifi_lastchange: crate::timeval,
-        pub ifi_unused2: u32,
+        ifi_unused2: Padding<u32>,
         pub ifi_hwassist: u32,
-        pub ifi_reserved1: u32,
-        pub ifi_reserved2: u32,
+        ifi_reserved1: Padding<u32>,
+        ifi_reserved2: Padding<u32>,
     }
 
     pub struct bpf_hdr {

src/unix/bsd/apple/b64/mod.rs

@@ -16,7 +16,7 @@ s! {
         pub ifi_hdrlen: c_uchar,
         pub ifi_recvquota: c_uchar,
         pub ifi_xmitquota: c_uchar,
-        pub ifi_unused1: c_uchar,
+        ifi_unused1: Padding<c_uchar>,
         pub ifi_mtu: u32,
         pub ifi_metric: u32,
         pub ifi_baudrate: u32,
@@ -34,10 +34,10 @@ s! {
         pub ifi_recvtiming: u32,
         pub ifi_xmittiming: u32,
         pub ifi_lastchange: timeval32,
-        pub ifi_unused2: u32,
+        ifi_unused2: Padding<u32>,
         pub ifi_hwassist: u32,
-        pub ifi_reserved1: u32,
-        pub ifi_reserved2: u32,
+        ifi_reserved1: Padding<u32>,
+        ifi_reserved2: Padding<u32>,
     }
 
     pub struct bpf_hdr {

src/unix/bsd/apple/mod.rs

@@ -333,10 +333,10 @@ s! {
     }
 
     pub struct fpunchhole_t {
-        pub fp_flags: c_uint, /* unused */
-        pub reserved: c_uint, /* (to maintain 8-byte alignment) */
-        pub fp_offset: off_t, /* IN: start of the region */
-        pub fp_length: off_t, /* IN: size of the region */
+        pub fp_flags: c_uint,      /* unused */
+        reserved: Padding<c_uint>, /* (to maintain 8-byte alignment) */
+        pub fp_offset: off_t,      /* IN: start of the region */
+        pub fp_length: off_t,      /* IN: size of the region */
     }
 
     pub struct ftrimactivefile_t {
@@ -346,7 +346,7 @@ s! {
 
     pub struct fspecread_t {
         pub fsr_flags: c_uint,
-        pub reserved: c_uint,
+        reserved: Padding<c_uint>,
         pub fsr_offset: off_t,
         pub fsr_length: off_t,
     }
@@ -485,7 +485,7 @@ s! {
         pub rtm_addrs: c_int,
         pub rtm_refcnt: i32,
         pub rtm_parentflags: c_int,
-        pub rtm_reserved: c_int,
+        rtm_reserved: Padding<c_int>,
         pub rtm_use: c_int,
         pub rtm_inits: u32,
         pub rtm_rmx: rt_metrics,
@@ -669,7 +669,7 @@ s! {
         pub ss_sysaddr: u16,
         pub sc_id: u32,
         pub sc_unit: u32,
-        pub sc_reserved: [u32; 5],
+        sc_reserved: Padding<[u32; 5]>,
     }
 
     pub struct in_pktinfo {
@@ -1015,7 +1015,7 @@ s! {
 
     pub struct attrlist {
         pub bitmapcount: c_ushort,
-        pub reserved: u16,
+        reserved: Padding<u16>,
         pub commonattr: attrgroup_t,
         pub volattr: attrgroup_t,
         pub dirattr: attrgroup_t,
@@ -1285,7 +1285,7 @@ s! {
         pub f_mntonname: [c_char; 1024],
         pub f_mntfromname: [c_char; 1024],
         pub f_flags_ext: u32,
-        pub f_reserved: [u32; 7],
+        f_reserved: Padding<[u32; 7]>,
     }
 
     pub struct dirent {
@@ -1392,7 +1392,7 @@ s! {
         pub ifi_hdrlen: c_uchar,
         pub ifi_recvquota: c_uchar,
         pub ifi_xmitquota: c_uchar,
-        pub ifi_unused1: c_uchar,
+        ifi_unused1: Padding<c_uchar>,
         pub ifi_mtu: u32,
         pub ifi_metric: u32,
         pub ifi_baudrate: u64,
@@ -1484,7 +1484,7 @@ s! {
     pub struct sockaddr_vm {
         pub svm_len: c_uchar,
         pub svm_family: crate::sa_family_t,
-        pub svm_reserved1: c_ushort,
+        svm_reserved1: Padding<c_ushort>,
         pub svm_port: c_uint,
         pub svm_cid: c_uint,
     }

src/unix/linux_like/android/mod.rs

@@ -193,7 +193,7 @@ s! {
     pub struct genlmsghdr {
         pub cmd: u8,
         pub version: u8,
-        pub reserved: u16,
+        reserved: Padding<u16>,
     }
 
     pub struct nlmsghdr {
@@ -270,7 +270,7 @@ s! {
 
     pub struct sockaddr_vm {
         pub svm_family: crate::sa_family_t,
-        pub svm_reserved1: c_ushort,
+        svm_reserved1: Padding<c_ushort>,
         pub svm_port: c_uint,
         pub svm_cid: c_uint,
         pub svm_zero: [u8; 4],

src/unix/linux_like/emscripten/mod.rs

@@ -351,7 +351,7 @@ s! {
         pub totalhigh: c_ulong,
         pub freehigh: c_ulong,
         pub mem_unit: c_uint,
-        pub __reserved: [c_char; 256],
+        __reserved: Padding<[c_char; 256]>,
     }
 
     pub struct mq_attr {

src/unix/linux_like/linux/gnu/b32/mod.rs

@@ -236,17 +236,17 @@ s! {
         pub errcnt: c_longlong,
         pub stbcnt: c_longlong,
         pub tai: c_int,
-        pub __unused1: i32,
-        pub __unused2: i32,
-        pub __unused3: i32,
-        pub __unused4: i32,
-        pub __unused5: i32,
-        pub __unused6: i32,
-        pub __unused7: i32,
-        pub __unused8: i32,
-        pub __unused9: i32,
-        pub __unused10: i32,
-        pub __unused11: i32,
+        __unused1: Padding<i32>,
+        __unused2: Padding<i32>,
+        __unused3: Padding<i32>,
+        __unused4: Padding<i32>,
+        __unused5: Padding<i32>,
+        __unused6: Padding<i32>,
+        __unused7: Padding<i32>,
+        __unused8: Padding<i32>,
+        __unused9: Padding<i32>,
+        __unused10: Padding<i32>,
+        __unused11: Padding<i32>,
     }
 
     #[cfg(not(gnu_time_bits64))]
@@ -271,17 +271,17 @@ s! {
         pub errcnt: c_long,
         pub stbcnt: c_long,
         pub tai: c_int,
-        pub __unused1: i32,
-        pub __unused2: i32,
-        pub __unused3: i32,
-        pub __unused4: i32,
-        pub __unused5: i32,
-        pub __unused6: i32,
-        pub __unused7: i32,
-        pub __unused8: i32,
-        pub __unused9: i32,
-        pub __unused10: i32,
-        pub __unused11: i32,
+        __unused1: Padding<i32>,
+        __unused2: Padding<i32>,
+        __unused3: Padding<i32>,
+        __unused4: Padding<i32>,
+        __unused5: Padding<i32>,
+        __unused6: Padding<i32>,
+        __unused7: Padding<i32>,
+        __unused8: Padding<i32>,
+        __unused9: Padding<i32>,
+        __unused10: Padding<i32>,
+        __unused11: Padding<i32>,
     }
 }
 

src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs

@@ -234,7 +234,7 @@ s_no_extra_traits! {
     pub struct __riscv_mc_q_ext_state {
         pub __f: [c_ulonglong; 64],
         pub __fcsr: c_uint,
-        pub __glibc_reserved: [c_uint; 3],
+        __glibc_reserved: Padding<[c_uint; 3]>,
     }
 }
 

src/unix/linux_like/linux/gnu/b64/loongarch64/mod.rs

@@ -199,7 +199,7 @@ s! {
         pub orig_a0: u64,
         pub csr_era: u64,
         pub csr_badv: u64,
-        pub reserved: [u64; 10],
+        reserved: Padding<[u64; 10]>,
     }
 
     pub struct user_fp_struct {

src/unix/linux_like/linux/gnu/b64/mod.rs

@@ -164,17 +164,17 @@ s! {
         #[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))]
         pub stbcnt: c_long,
         pub tai: c_int,
-        pub __unused1: i32,
-        pub __unused2: i32,
-        pub __unused3: i32,
-        pub __unused4: i32,
-        pub __unused5: i32,
-        pub __unused6: i32,
-        pub __unused7: i32,
-        pub __unused8: i32,
-        pub __unused9: i32,
-        pub __unused10: i32,
-        pub __unused11: i32,
+        __unused1: Padding<i32>,
+        __unused2: Padding<i32>,
+        __unused3: Padding<i32>,
+        __unused4: Padding<i32>,
+        __unused5: Padding<i32>,
+        __unused6: Padding<i32>,
+        __unused7: Padding<i32>,
+        __unused8: Padding<i32>,
+        __unused9: Padding<i32>,
+        __unused10: Padding<i32>,
+        __unused11: Padding<i32>,
     }
 }
 

src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs

@@ -254,7 +254,7 @@ s_no_extra_traits! {
         pub gp_regs: crate::gregset_t,
         pub fp_regs: crate::fpregset_t,
         pub v_regs: *mut vrregset_t,
-        pub vmx_reserve: [c_long; __NVRREG + __NVRREG + 1],
+        vmx_reserve: Padding<[c_long; __NVRREG + __NVRREG + 1]>,
     }
 
     #[repr(align(16))]

src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs

@@ -284,7 +284,7 @@ s_no_extra_traits! {
     pub struct __riscv_mc_q_ext_state {
         pub __f: [c_ulonglong; 64],
         pub __fcsr: c_uint,
-        pub __glibc_reserved: [c_uint; 3],
+        __glibc_reserved: Padding<[c_uint; 3]>,
     }
 }
 

src/unix/linux_like/linux/gnu/mod.rs

@@ -116,10 +116,10 @@ s! {
         pub maxerror: c_long,
         pub esterror: c_long,
         pub tai: c_long,
-        pub __glibc_reserved1: c_long,
-        pub __glibc_reserved2: c_long,
-        pub __glibc_reserved3: c_long,
-        pub __glibc_reserved4: c_long,
+        __glibc_reserved1: Padding<c_long>,
+        __glibc_reserved2: Padding<c_long>,
+        __glibc_reserved3: Padding<c_long>,
+        __glibc_reserved4: Padding<c_long>,
     }
 
     pub struct regex_t {
@@ -135,7 +135,7 @@ s! {
 
     pub struct Elf64_Chdr {
         pub ch_type: crate::Elf64_Word,
-        pub ch_reserved: crate::Elf64_Word,
+        ch_reserved: Padding<crate::Elf64_Word>,
         pub ch_size: crate::Elf64_Xword,
         pub ch_addralign: crate::Elf64_Xword,
     }

src/unix/linux_like/linux/mod.rs

@@ -131,7 +131,7 @@ s! {
         pub tp_rxhash: __u32,
         pub tp_vlan_tci: __u32,
         pub tp_vlan_tpid: __u16,
-        pub tp_padding: __u16,
+        tp_padding: Padding<__u16>,
     }
 
     pub struct tpacket2_hdr {
@@ -144,7 +144,7 @@ s! {
         pub tp_nsec: __u32,
         pub tp_vlan_tci: __u16,
         pub tp_vlan_tpid: __u16,
-        pub tp_padding: [__u8; 4],
+        tp_padding: Padding<[__u8; 4]>,
     }
 
     pub struct tpacket_req {
@@ -192,7 +192,7 @@ s! {
         pub tp_mac: __u16,
         pub tp_net: __u16,
         pub hv1: crate::tpacket_hdr_variant1,
-        pub tp_padding: [__u8; 8],
+        tp_padding: Padding<[__u8; 8]>,
     }
 
     pub struct tpacket_bd_ts {
@@ -390,7 +390,7 @@ s! {
     pub struct genlmsghdr {
         pub cmd: u8,
         pub version: u8,
-        pub reserved: u16,
+        reserved: Padding<u16>,
     }
 
     pub struct inotify_event {
@@ -419,7 +419,7 @@ s! {
 
     pub struct sockaddr_vm {
         pub svm_family: crate::sa_family_t,
-        pub svm_reserved1: c_ushort,
+        svm_reserved1: Padding<c_ushort>,
         pub svm_port: c_uint,
         pub svm_cid: c_uint,
         pub svm_flags: u8,
@@ -490,7 +490,7 @@ s! {
     pub struct ptp_clock_time {
         pub sec: crate::__s64,
         pub nsec: __u32,
-        pub reserved: __u32,
+        reserved: Padding<__u32>,
     }
 
     pub struct ptp_extts_request {
@@ -869,7 +869,7 @@ s! {
     pub struct fanotify_event_metadata {
         pub event_len: __u32,
         pub vers: __u8,
-        pub reserved: __u8,
+        reserved: Padding<__u8>,
         pub metadata_len: __u16,
         pub mask: __u64,
         pub fd: c_int,

src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs

@@ -67,7 +67,7 @@ s! {
         pub orig_a0: u64,
         pub csr_era: u64,
         pub csr_badv: u64,
-        pub reserved: [u64; 10],
+        reserved: Padding<[u64; 10]>,
     }
 
     pub struct user_fp_struct {

src/unix/linux_like/linux/musl/b64/riscv64/mod.rs

@@ -115,7 +115,7 @@ s_no_extra_traits! {
     pub struct __riscv_mc_q_ext_state {
         pub __f: [c_ulonglong; 64],
         pub __fcsr: c_uint,
-        pub __glibc_reserved: [c_uint; 3],
+        __glibc_reserved: Padding<[c_uint; 3]>,
     }
 }