Merge pull request #4499 from tgross35/backport-hungarian-wax

[0.2] Backports

Author: tgross35

src/fuchsia/mod.rs

@@ -292,6 +292,8 @@ s! {
         __dummy4: [c_char; 16],
     }
 
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_sigaction: crate::sighandler_t,
         pub sa_mask: crate::sigset_t,

src/psp.rs

@@ -1415,6 +1415,8 @@ s! {
         pub stack: [u32; 8],
     }
 
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct GeCallbackData {
         pub signal_func: Option<extern "C" fn(id: i32, arg: *mut c_void)>,
         pub signal_arg: *mut c_void,
@@ -1537,6 +1539,8 @@ s! {
         pub stack_mpid: SceUid,
     }
 
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct SceKernelThreadInfo {
         pub size: usize,
         pub name: [u8; 32],
@@ -1611,6 +1615,8 @@ s! {
         pub first_message: *mut c_void,
     }
 
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct SceKernelVTimerInfo {
         pub size: usize,
         pub name: [u8; 32],
@@ -1622,6 +1628,8 @@ s! {
         pub common: *mut c_void,
     }
 
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct SceKernelThreadEventHandlerInfo {
         pub size: usize,
         pub name: [u8; 32],
@@ -1631,6 +1639,8 @@ s! {
         pub common: *mut c_void,
     }
 
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct SceKernelAlarmInfo {
         pub size: usize,
         pub schedule: SceKernelSysClock,
@@ -1688,6 +1698,8 @@ s! {
         pub size: usize,
     }
 
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct SceKernelCallbackInfo {
         pub size: usize,
         pub name: [u8; 32usize],
@@ -1787,6 +1799,8 @@ s! {
         pub type_: UmdType,
     }
 
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct SceMpegRingbuffer {
         pub packets: i32,
         pub unk0: u32,

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

@@ -109,6 +109,8 @@ s! {
         _private: [crate::uintptr_t; 16], // FIXME(macos): keeping private for now
     }
 
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct malloc_zone_t {
         _reserved1: *mut c_void,
         _reserved2: *mut c_void,

src/unix/bsd/freebsdlike/dragonfly/mod.rs

@@ -520,6 +520,8 @@ s_no_extra_traits! {
         pub mc_fpregs: [[c_uint; 8]; 32],
     }
 
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct ucontext_t {
         pub uc_sigmask: crate::sigset_t,
         pub uc_mcontext: mcontext_t,

src/unix/bsd/freebsdlike/freebsd/mod.rs

@@ -4662,7 +4662,7 @@ f! {
     pub fn CMSG_NXTHDR(mhdr: *const crate::msghdr, cmsg: *const cmsghdr) -> *mut cmsghdr {
         if cmsg.is_null() {
             return crate::CMSG_FIRSTHDR(mhdr);
-        };
+        }
         let next =
             cmsg as usize + _ALIGN((*cmsg).cmsg_len as usize) + _ALIGN(mem::size_of::<cmsghdr>());
         let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize;

src/unix/bsd/netbsdlike/netbsd/mod.rs

@@ -2295,7 +2295,7 @@ f! {
     pub fn CMSG_NXTHDR(mhdr: *const crate::msghdr, cmsg: *const cmsghdr) -> *mut cmsghdr {
         if cmsg.is_null() {
             return crate::CMSG_FIRSTHDR(mhdr);
-        };
+        }
         let next =
             cmsg as usize + _ALIGN((*cmsg).cmsg_len as usize) + _ALIGN(mem::size_of::<cmsghdr>());
         let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize;

src/unix/bsd/netbsdlike/openbsd/mod.rs

@@ -630,7 +630,7 @@ impl siginfo_t {
             _pad: [c_int; SI_PAD],
             _pid: crate::pid_t,
         }
-        (*(self as *const siginfo_t as *const siginfo_timer))._pid
+        (*(self as *const siginfo_t).cast::<siginfo_timer>())._pid
     }
 
     pub unsafe fn si_uid(&self) -> crate::uid_t {
@@ -643,7 +643,7 @@ impl siginfo_t {
             _pid: crate::pid_t,
             _uid: crate::uid_t,
         }
-        (*(self as *const siginfo_t as *const siginfo_timer))._uid
+        (*(self as *const siginfo_t).cast::<siginfo_timer>())._uid
     }
 
     pub unsafe fn si_value(&self) -> crate::sigval {
@@ -657,7 +657,7 @@ impl siginfo_t {
             _uid: crate::uid_t,
             value: crate::sigval,
         }
-        (*(self as *const siginfo_t as *const siginfo_timer)).value
+        (*(self as *const siginfo_t).cast::<siginfo_timer>()).value
     }
 }
 
@@ -1869,7 +1869,7 @@ f! {
     pub fn CMSG_NXTHDR(mhdr: *const crate::msghdr, cmsg: *const cmsghdr) -> *mut cmsghdr {
         if cmsg.is_null() {
             return crate::CMSG_FIRSTHDR(mhdr);
-        };
+        }
         let next =
             cmsg as usize + _ALIGN((*cmsg).cmsg_len as usize) + _ALIGN(mem::size_of::<cmsghdr>());
         let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize;

src/unix/cygwin/mod.rs

@@ -351,6 +351,8 @@ s! {
         pub cr2: u64,
     }
 
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigevent {
         pub sigev_value: sigval,
         pub sigev_signo: c_int,

src/unix/haiku/mod.rs

@@ -1533,7 +1533,7 @@ f! {
     pub fn CMSG_NXTHDR(mhdr: *const msghdr, cmsg: *const cmsghdr) -> *mut cmsghdr {
         if cmsg.is_null() {
             return crate::CMSG_FIRSTHDR(mhdr);
-        };
+        }
         let next = cmsg as usize
             + CMSG_ALIGN((*cmsg).cmsg_len as usize)
             + CMSG_ALIGN(mem::size_of::<cmsghdr>());

src/unix/haiku/native.rs

@@ -403,11 +403,14 @@ s! {
     }
 
     // kernel/image.h
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct image_info {
         pub id: image_id,
         pub image_type: c_int,
         pub sequence: i32,
         pub init_order: i32,
+        // FIXME(1.0): these should be made optional
         pub init_routine: extern "C" fn(),
         pub term_routine: extern "C" fn(),
         pub device: crate::dev_t,

src/unix/hurd/mod.rs

@@ -3445,7 +3445,7 @@ f! {
     pub fn CMSG_NXTHDR(mhdr: *const msghdr, cmsg: *const cmsghdr) -> *mut cmsghdr {
         if ((*cmsg).cmsg_len as usize) < mem::size_of::<cmsghdr>() {
             return core::ptr::null_mut::<cmsghdr>();
-        };
+        }
         let next = (cmsg as usize + CMSG_ALIGN((*cmsg).cmsg_len as usize)) as *mut cmsghdr;
         let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize;
         if (next.offset(1)) as usize > max

src/unix/linux_like/android/b32/mod.rs

@@ -12,6 +12,8 @@ pub type __u64 = c_ulonglong;
 pub type __s64 = c_longlong;
 
 s! {
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_sigaction: crate::sighandler_t,
         pub sa_mask: crate::sigset_t,

src/unix/linux_like/android/b64/mod.rs

@@ -12,6 +12,8 @@ s! {
         __val: [c_ulong; 1],
     }
 
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_flags: c_int,
         pub sa_sigaction: crate::sighandler_t,

src/unix/linux_like/emscripten/mod.rs

@@ -158,6 +158,8 @@ s! {
         pub sem_flg: c_short,
     }
 
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_sigaction: crate::sighandler_t,
         pub sa_mask: crate::sigset_t,
@@ -1365,7 +1367,7 @@ f! {
     pub fn CMSG_NXTHDR(mhdr: *const msghdr, cmsg: *const cmsghdr) -> *mut cmsghdr {
         if ((*cmsg).cmsg_len as usize) < mem::size_of::<cmsghdr>() {
             return core::ptr::null_mut::<cmsghdr>();
-        };
+        }
         let next = (cmsg as usize + super::CMSG_ALIGN((*cmsg).cmsg_len as usize)) as *mut cmsghdr;
         let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen as usize;
         if (next.offset(1)) as usize > max {

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

@@ -4,6 +4,8 @@ use crate::{off64_t, off_t};
 pub type wchar_t = u32;
 
 s! {
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_sigaction: crate::sighandler_t,
         pub sa_mask: crate::sigset_t,

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

@@ -4,6 +4,8 @@ use crate::{off64_t, off_t};
 pub type wchar_t = u32;
 
 s! {
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_sigaction: crate::sighandler_t,
         pub sa_mask: crate::sigset_t,

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

@@ -4,6 +4,8 @@ use crate::{off64_t, off_t};
 pub type wchar_t = i32;
 
 s! {
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_sigaction: crate::sighandler_t,
         pub sa_mask: crate::sigset_t,

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

@@ -163,6 +163,8 @@ s! {
         __f_spare: [c_int; 6],
     }
 
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_flags: c_int,
         pub sa_sigaction: crate::sighandler_t,

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

@@ -4,6 +4,8 @@ use crate::{off64_t, off_t};
 pub type wchar_t = i32;
 
 s! {
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_sigaction: crate::sighandler_t,
         pub sa_mask: crate::sigset_t,

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

@@ -108,6 +108,8 @@ s! {
         pub ss_size: size_t,
     }
 
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_sigaction: crate::sighandler_t,
         pub sa_mask: crate::sigset_t,

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

@@ -6,6 +6,8 @@ use crate::{off64_t, off_t};
 pub type wchar_t = i32;
 
 s! {
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_sigaction: crate::sighandler_t,
         pub sa_mask: crate::sigset_t,

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

@@ -5,6 +5,8 @@ pub type wchar_t = i32;
 pub type greg_t = i32;
 
 s! {
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_sigaction: crate::sighandler_t,
         pub sa_mask: crate::sigset_t,

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

@@ -11,6 +11,8 @@ pub type __u64 = c_ulonglong;
 pub type __s64 = c_longlong;
 
 s! {
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_sigaction: crate::sighandler_t,
         pub sa_mask: crate::sigset_t,

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

@@ -134,6 +134,8 @@ s! {
         __size: [c_ulong; 7],
     }
 
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_sigaction: crate::sighandler_t,
         pub sa_mask: crate::sigset_t,

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

@@ -136,6 +136,8 @@ s! {
         __size: [c_ulong; 7],
     }
 
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_flags: c_int,
         pub sa_sigaction: crate::sighandler_t,

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

@@ -11,6 +11,8 @@ pub type __u64 = c_ulong;
 pub type __s64 = c_long;
 
 s! {
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_sigaction: crate::sighandler_t,
         pub sa_mask: crate::sigset_t,

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

@@ -143,6 +143,8 @@ s! {
         pub ss_size: size_t,
     }
 
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_sigaction: crate::sighandler_t,
         pub sa_mask: crate::sigset_t,

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

@@ -12,6 +12,8 @@ pub type __u64 = u64;
 pub type __s64 = i64;
 
 s! {
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_sigaction: crate::sighandler_t,
         __glibc_reserved0: c_int,

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

@@ -11,6 +11,8 @@ pub type __u64 = c_ulonglong;
 pub type __s64 = c_longlong;
 
 s! {
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_sigaction: crate::sighandler_t,
         pub sa_mask: crate::sigset_t,

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

@@ -12,6 +12,8 @@ pub type __u64 = c_ulonglong;
 pub type __s64 = c_longlong;
 
 s! {
+    // FIXME(1.0): This should not implement `PartialEq`
+    #[allow(unpredictable_function_pointer_comparisons)]
     pub struct sigaction {
         pub sa_sigaction: crate::sighandler_t,
         pub sa_mask: crate::sigset_t,

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

@@ -366,6 +366,8 @@ s! {
         __pad: i32,
         #[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))]
         pub tv_nsec: c_long,
+        #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))]
+        pub tv_nsec: i64,
         #[cfg(all(gnu_time_bits64, target_endian = "little"))]
         __pad: i32,
     }