cleanup: Also use s_no_extra_traits! for private structs

(backport <#4808>)
(cherry picked from commit b4cb730)

Author: tgross35

src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs

@@ -1,37 +1,29 @@
 use crate::off_t;
 use crate::prelude::*;
 
-#[repr(C)]
-#[derive(Debug)]
-#[cfg_attr(feature = "extra_traits", derive(Eq, Hash, PartialEq))]
-pub struct stat {
-    pub st_dev: crate::dev_t,
-    pub st_ino: crate::ino_t,
-    pub st_mode: crate::mode_t,
-    pub st_nlink: crate::nlink_t,
-    pub st_uid: crate::uid_t,
-    pub st_gid: crate::gid_t,
-    pub st_rdev: crate::dev_t,
-    pub st_atime: crate::time_t,
-    pub st_atime_nsec: c_long,
-    pub st_mtime: crate::time_t,
-    pub st_mtime_nsec: c_long,
-    pub st_ctime: crate::time_t,
-    pub st_ctime_nsec: c_long,
-    pub st_size: off_t,
-    pub st_blocks: crate::blkcnt_t,
-    pub st_blksize: crate::blksize_t,
-    pub st_flags: crate::fflags_t,
-    pub st_gen: u32,
-    pub st_lspare: i32,
-    pub st_birthtime: crate::time_t,
-    pub st_birthtime_nsec: c_long,
-    __unused: [u8; 8],
-}
-
-impl Copy for crate::stat {}
-impl Clone for crate::stat {
-    fn clone(&self) -> crate::stat {
-        *self
+s! {
+    pub struct stat {
+        pub st_dev: crate::dev_t,
+        pub st_ino: crate::ino_t,
+        pub st_mode: crate::mode_t,
+        pub st_nlink: crate::nlink_t,
+        pub st_uid: crate::uid_t,
+        pub st_gid: crate::gid_t,
+        pub st_rdev: crate::dev_t,
+        pub st_atime: crate::time_t,
+        pub st_atime_nsec: c_long,
+        pub st_mtime: crate::time_t,
+        pub st_mtime_nsec: c_long,
+        pub st_ctime: crate::time_t,
+        pub st_ctime_nsec: c_long,
+        pub st_size: off_t,
+        pub st_blocks: crate::blkcnt_t,
+        pub st_blksize: crate::blksize_t,
+        pub st_flags: crate::fflags_t,
+        pub st_gen: u32,
+        pub st_lspare: i32,
+        pub st_birthtime: crate::time_t,
+        pub st_birthtime_nsec: c_long,
+        __unused: [u8; 8],
     }
 }

src/unix/bsd/freebsdlike/freebsd/freebsd11/b64.rs

@@ -1,36 +1,28 @@
 use crate::off_t;
 use crate::prelude::*;
 
-#[repr(C)]
-#[derive(Debug)]
-#[cfg_attr(feature = "extra_traits", derive(Eq, Hash, PartialEq))]
-pub struct stat {
-    pub st_dev: crate::dev_t,
-    pub st_ino: crate::ino_t,
-    pub st_mode: crate::mode_t,
-    pub st_nlink: crate::nlink_t,
-    pub st_uid: crate::uid_t,
-    pub st_gid: crate::gid_t,
-    pub st_rdev: crate::dev_t,
-    pub st_atime: crate::time_t,
-    pub st_atime_nsec: c_long,
-    pub st_mtime: crate::time_t,
-    pub st_mtime_nsec: c_long,
-    pub st_ctime: crate::time_t,
-    pub st_ctime_nsec: c_long,
-    pub st_size: off_t,
-    pub st_blocks: crate::blkcnt_t,
-    pub st_blksize: crate::blksize_t,
-    pub st_flags: crate::fflags_t,
-    pub st_gen: u32,
-    pub st_lspare: i32,
-    pub st_birthtime: crate::time_t,
-    pub st_birthtime_nsec: c_long,
-}
-
-impl Copy for crate::stat {}
-impl Clone for crate::stat {
-    fn clone(&self) -> crate::stat {
-        *self
+s! {
+    pub struct stat {
+        pub st_dev: crate::dev_t,
+        pub st_ino: crate::ino_t,
+        pub st_mode: crate::mode_t,
+        pub st_nlink: crate::nlink_t,
+        pub st_uid: crate::uid_t,
+        pub st_gid: crate::gid_t,
+        pub st_rdev: crate::dev_t,
+        pub st_atime: crate::time_t,
+        pub st_atime_nsec: c_long,
+        pub st_mtime: crate::time_t,
+        pub st_mtime_nsec: c_long,
+        pub st_ctime: crate::time_t,
+        pub st_ctime_nsec: c_long,
+        pub st_size: off_t,
+        pub st_blocks: crate::blkcnt_t,
+        pub st_blksize: crate::blksize_t,
+        pub st_flags: crate::fflags_t,
+        pub st_gen: u32,
+        pub st_lspare: i32,
+        pub st_birthtime: crate::time_t,
+        pub st_birthtime_nsec: c_long,
     }
 }

src/unix/linux_like/android/mod.rs

@@ -630,6 +630,29 @@ s_no_extra_traits! {
         pub ifc_len: c_int, /* Size of buffer.  */
         pub ifc_ifcu: __c_anonymous_ifc_ifcu,
     }
+
+    // Internal, for casts to access union fields
+    struct sifields_sigchld {
+        si_pid: crate::pid_t,
+        si_uid: crate::uid_t,
+        si_status: c_int,
+        si_utime: c_long,
+        si_stime: c_long,
+    }
+
+    // Internal, for casts to access union fields
+    union sifields {
+        _align_pointer: *mut c_void,
+        sigchld: sifields_sigchld,
+    }
+
+    // Internal, for casts to access union fields. Note that some variants
+    // of sifields start with a pointer, which makes the alignment of
+    // sifields vary on 32-bit and 64-bit architectures.
+    struct siginfo_f {
+        _siginfo_base: [c_int; 3],
+        sifields: sifields,
+    }
 }
 
 cfg_if! {
@@ -3860,38 +3883,6 @@ impl siginfo_t {
     }
 }
 
-// Internal, for casts to access union fields
-#[repr(C)]
-struct sifields_sigchld {
-    si_pid: crate::pid_t,
-    si_uid: crate::uid_t,
-    si_status: c_int,
-    si_utime: c_long,
-    si_stime: c_long,
-}
-impl Copy for sifields_sigchld {}
-impl Clone for sifields_sigchld {
-    fn clone(&self) -> sifields_sigchld {
-        *self
-    }
-}
-
-// Internal, for casts to access union fields
-#[repr(C)]
-union sifields {
-    _align_pointer: *mut c_void,
-    sigchld: sifields_sigchld,
-}
-
-// Internal, for casts to access union fields. Note that some variants
-// of sifields start with a pointer, which makes the alignment of
-// sifields vary on 32-bit and 64-bit architectures.
-#[repr(C)]
-struct siginfo_f {
-    _siginfo_base: [c_int; 3],
-    sifields: sifields,
-}
-
 impl siginfo_t {
     unsafe fn sifields(&self) -> &sifields {
         &(*(self as *const siginfo_t as *const siginfo_f)).sifields

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

@@ -422,36 +422,29 @@ impl siginfo_t {
     }
 }
 
-// Internal, for casts to access union fields
-#[repr(C)]
-struct sifields_sigchld {
-    si_pid: crate::pid_t,
-    si_uid: crate::uid_t,
-    si_status: c_int,
-    si_utime: c_long,
-    si_stime: c_long,
-}
-impl Copy for sifields_sigchld {}
-impl Clone for sifields_sigchld {
-    fn clone(&self) -> sifields_sigchld {
-        *self
+s_no_extra_traits! {
+    // Internal, for casts to access union fields
+    struct sifields_sigchld {
+        si_pid: crate::pid_t,
+        si_uid: crate::uid_t,
+        si_status: c_int,
+        si_utime: c_long,
+        si_stime: c_long,
     }
-}
 
-// Internal, for casts to access union fields
-#[repr(C)]
-union sifields {
-    _align_pointer: *mut c_void,
-    sigchld: sifields_sigchld,
-}
+    // Internal, for casts to access union fields
+    union sifields {
+        _align_pointer: *mut c_void,
+        sigchld: sifields_sigchld,
+    }
 
-// Internal, for casts to access union fields. Note that some variants
-// of sifields start with a pointer, which makes the alignment of
-// sifields vary on 32-bit and 64-bit architectures.
-#[repr(C)]
-struct siginfo_f {
-    _siginfo_base: [c_int; 3],
-    sifields: sifields,
+    // Internal, for casts to access union fields. Note that some variants
+    // of sifields start with a pointer, which makes the alignment of
+    // sifields vary on 32-bit and 64-bit architectures.
+    struct siginfo_f {
+        _siginfo_base: [c_int; 3],
+        sifields: sifields,
+    }
 }
 
 impl siginfo_t {

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

@@ -63,36 +63,29 @@ impl siginfo_t {
     }
 }
 
-// Internal, for casts to access union fields
-#[repr(C)]
-struct sifields_sigchld {
-    si_pid: crate::pid_t,
-    si_uid: crate::uid_t,
-    si_status: c_int,
-    si_utime: c_long,
-    si_stime: c_long,
-}
-impl Copy for sifields_sigchld {}
-impl Clone for sifields_sigchld {
-    fn clone(&self) -> sifields_sigchld {
-        *self
+s_no_extra_traits! {
+    // Internal, for casts to access union fields
+    struct sifields_sigchld {
+        si_pid: crate::pid_t,
+        si_uid: crate::uid_t,
+        si_status: c_int,
+        si_utime: c_long,
+        si_stime: c_long,
     }
-}
 
-// Internal, for casts to access union fields
-#[repr(C)]
-union sifields {
-    _align_pointer: *mut c_void,
-    sigchld: sifields_sigchld,
-}
+    // Internal, for casts to access union fields
+    union sifields {
+        _align_pointer: *mut c_void,
+        sigchld: sifields_sigchld,
+    }
 
-// Internal, for casts to access union fields. Note that some variants
-// of sifields start with a pointer, which makes the alignment of
-// sifields vary on 32-bit and 64-bit architectures.
-#[repr(C)]
-struct siginfo_f {
-    _siginfo_base: [c_int; 3],
-    sifields: sifields,
+    // Internal, for casts to access union fields. Note that some variants
+    // of sifields start with a pointer, which makes the alignment of
+    // sifields vary on 32-bit and 64-bit architectures.
+    struct siginfo_f {
+        _siginfo_base: [c_int; 3],
+        sifields: sifields,
+    }
 }
 
 impl siginfo_t {

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

@@ -181,36 +181,29 @@ impl siginfo_t {
     }
 }
 
-// Internal, for casts to access union fields
-#[repr(C)]
-struct sifields_sigchld {
-    si_pid: crate::pid_t,
-    si_uid: crate::uid_t,
-    si_status: c_int,
-    si_utime: c_long,
-    si_stime: c_long,
-}
-impl Copy for sifields_sigchld {}
-impl Clone for sifields_sigchld {
-    fn clone(&self) -> sifields_sigchld {
-        *self
+s_no_extra_traits! {
+    // Internal, for casts to access union fields
+    struct sifields_sigchld {
+        si_pid: crate::pid_t,
+        si_uid: crate::uid_t,
+        si_status: c_int,
+        si_utime: c_long,
+        si_stime: c_long,
     }
-}
 
-// Internal, for casts to access union fields
-#[repr(C)]
-union sifields {
-    _align_pointer: *mut c_void,
-    sigchld: sifields_sigchld,
-}
+    // Internal, for casts to access union fields
+    union sifields {
+        _align_pointer: *mut c_void,
+        sigchld: sifields_sigchld,
+    }
 
-// Internal, for casts to access union fields. Note that some variants
-// of sifields start with a pointer, which makes the alignment of
-// sifields vary on 32-bit and 64-bit architectures.
-#[repr(C)]
-struct siginfo_f {
-    _siginfo_base: [c_int; 3],
-    sifields: sifields,
+    // Internal, for casts to access union fields. Note that some variants
+    // of sifields start with a pointer, which makes the alignment of
+    // sifields vary on 32-bit and 64-bit architectures.
+    struct siginfo_f {
+        _siginfo_base: [c_int; 3],
+        sifields: sifields,
+    }
 }
 
 impl siginfo_t {