refactor: Use core FFI types instead of re-defining them

Author: pheki

src/fuchsia/mod.rs

@@ -7,16 +7,6 @@ use crate::prelude::*;
 
 // PUB_TYPE
 
-pub type c_schar = i8;
-pub type c_uchar = u8;
-pub type c_short = i16;
-pub type c_ushort = u16;
-pub type c_int = i32;
-pub type c_uint = u32;
-pub type c_float = f32;
-pub type c_double = f64;
-pub type c_longlong = i64;
-pub type c_ulonglong = u64;
 pub type intmax_t = i64;
 pub type uintmax_t = u64;
 
@@ -88,9 +78,6 @@ pub type fsblkcnt_t = c_ulonglong;
 pub type fsfilcnt_t = c_ulonglong;
 pub type rlim_t = c_ulonglong;
 
-pub type c_long = i64;
-pub type c_ulong = u64;
-
 // FIXME: why are these uninhabited types? that seems... wrong?
 // Presumably these should be `()` or an `extern type` (when that stabilizes).
 #[cfg_attr(feature = "extra_traits", derive(Debug))]

src/hermit.rs

@@ -2,24 +2,11 @@
 
 use crate::prelude::*;
 
-pub type c_schar = i8;
-pub type c_uchar = u8;
-pub type c_short = i16;
-pub type c_ushort = u16;
-pub type c_int = i32;
-pub type c_uint = u32;
-pub type c_long = i64;
-pub type c_ulong = u64;
-pub type c_longlong = i64;
-pub type c_ulonglong = u64;
 pub type intmax_t = i64;
 pub type uintmax_t = u64;
 pub type intptr_t = isize;
 pub type uintptr_t = usize;
 
-pub type c_float = f32;
-pub type c_double = f64;
-
 pub type size_t = usize;
 pub type ssize_t = isize;
 pub type ptrdiff_t = isize;

src/lib.rs

@@ -36,39 +36,10 @@ cfg_if! {
     }
 }
 
-pub use core::ffi::c_void;
-
-cfg_if! {
-    // This configuration comes from `rust-lang/rust` in `library/core/src/ffi/mod.rs`.
-    if #[cfg(all(
-        not(windows),
-        // FIXME(ctest): just use `target_vendor` = "apple"` once `ctest` supports it
-        not(any(
-            target_os = "macos",
-            target_os = "ios",
-            target_os = "tvos",
-            target_os = "watchos",
-            target_os = "visionos",
-        )),
-        any(
-            target_arch = "aarch64",
-            target_arch = "arm",
-            target_arch = "csky",
-            target_arch = "hexagon",
-            target_arch = "msp430",
-            target_arch = "powerpc",
-            target_arch = "powerpc64",
-            target_arch = "riscv64",
-            target_arch = "riscv32",
-            target_arch = "s390x",
-            target_arch = "xtensa",
-        )
-    ))] {
-        pub type c_char = u8;
-    } else {
-        pub type c_char = i8;
-    }
-}
+pub use core::ffi::{
+    c_char, c_double, c_float, c_int, c_long, c_longlong, c_schar, c_short, c_uchar, c_uint,
+    c_ulong, c_ulonglong, c_ushort, c_void,
+};
 
 cfg_if! {
     if #[cfg(windows)] {

src/sgx.rs

@@ -1,15 +1,5 @@
 //! SGX C types definition
 
-pub type c_schar = i8;
-pub type c_uchar = u8;
-pub type c_short = i16;
-pub type c_ushort = u16;
-pub type c_int = i32;
-pub type c_uint = u32;
-pub type c_float = f32;
-pub type c_double = f64;
-pub type c_longlong = i64;
-pub type c_ulonglong = u64;
 pub type intmax_t = i64;
 pub type uintmax_t = u64;
 
@@ -19,8 +9,5 @@ pub type intptr_t = isize;
 pub type uintptr_t = usize;
 pub type ssize_t = isize;
 
-pub type c_long = i64;
-pub type c_ulong = u64;
-
 pub const INT_MIN: c_int = -2147483648;
 pub const INT_MAX: c_int = 2147483647;

src/solid/aarch64.rs

@@ -1,3 +1 @@
 pub type wchar_t = u32;
-pub type c_long = i64;
-pub type c_ulong = u64;

src/solid/arm.rs

@@ -1,3 +1 @@
 pub type wchar_t = u32;
-pub type c_long = i32;
-pub type c_ulong = u32;

src/solid/mod.rs

@@ -4,16 +4,6 @@
 
 use crate::prelude::*;
 
-pub type c_schar = i8;
-pub type c_uchar = u8;
-pub type c_short = i16;
-pub type c_ushort = u16;
-pub type c_int = i32;
-pub type c_uint = u32;
-pub type c_float = f32;
-pub type c_double = f64;
-pub type c_longlong = i64;
-pub type c_ulonglong = u64;
 pub type intmax_t = i64;
 pub type uintmax_t = u64;
 

src/switch.rs

@@ -1,15 +1,5 @@
 //! Switch C type definitions
 
-pub type c_schar = i8;
-pub type c_uchar = u8;
-pub type c_short = i16;
-pub type c_ushort = u16;
-pub type c_int = i32;
-pub type c_uint = u32;
-pub type c_float = f32;
-pub type c_double = f64;
-pub type c_longlong = i64;
-pub type c_ulonglong = u64;
 pub type intmax_t = i64;
 pub type uintmax_t = u64;
 
@@ -20,8 +10,6 @@ pub type uintptr_t = usize;
 pub type ssize_t = isize;
 
 pub type off_t = i64;
-pub type c_long = i64;
-pub type c_ulong = u64;
 pub type wchar_t = u32;
 
 pub const INT_MIN: c_int = -2147483648;

src/teeos/mod.rs

@@ -7,28 +7,8 @@
 
 use crate::prelude::*;
 
-pub type c_schar = i8;
-
-pub type c_uchar = u8;
-
-pub type c_short = i16;
-
-pub type c_ushort = u16;
-
-pub type c_int = i32;
-
-pub type c_uint = u32;
-
 pub type c_bool = i32;
 
-pub type c_float = f32;
-
-pub type c_double = f64;
-
-pub type c_longlong = i64;
-
-pub type c_ulonglong = u64;
-
 pub type intmax_t = i64;
 
 pub type uintmax_t = u64;
@@ -47,10 +27,6 @@ pub type pid_t = c_int;
 
 pub type wchar_t = u32;
 
-pub type c_long = i64;
-
-pub type c_ulong = u64;
-
 // long double in C means A float point value, which has 128bit length.
 // but some bit maybe not used, so the real length of long double could be 80(x86) or 128(power pc/IEEE)
 // this is different from f128(not stable and not included default) in Rust, so we use u128 for FFI(Rust to C).

src/trusty.rs

@@ -4,26 +4,6 @@ pub type ssize_t = isize;
 
 pub type off_t = i64;
 
-pub type c_schar = i8;
-pub type c_uchar = u8;
-pub type c_short = i16;
-pub type c_ushort = u16;
-pub type c_int = i32;
-pub type c_uint = u32;
-
-cfg_if! {
-    if #[cfg(target_pointer_width = "32")] {
-        pub type c_long = i32;
-        pub type c_ulong = u32;
-    } else if #[cfg(target_pointer_width = "64")] {
-        pub type c_long = i64;
-        pub type c_ulong = u64;
-    }
-}
-
-pub type c_longlong = i64;
-pub type c_ulonglong = u64;
-
 pub type c_uint8_t = u8;
 pub type c_uint16_t = u16;
 pub type c_uint32_t = u32;
@@ -37,9 +17,6 @@ pub type c_int64_t = i64;
 pub type intptr_t = isize;
 pub type uintptr_t = usize;
 
-pub type c_float = f32;
-pub type c_double = f64;
-
 pub type time_t = c_long;
 
 pub type clockid_t = c_int;

src/unix/aix/powerpc64.rs

@@ -1,9 +1,6 @@
 use crate::off_t;
 use crate::prelude::*;
 
-pub type c_long = i64;
-pub type c_ulong = u64;
-
 s! {
     pub struct sigset_t {
         pub ss_set: [c_ulong; 4],

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

@@ -2,8 +2,6 @@
 
 use crate::prelude::*;
 
-pub type c_long = i32;
-pub type c_ulong = u32;
 pub type boolean_t = c_int;
 
 s! {

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

@@ -2,9 +2,6 @@
 
 use crate::prelude::*;
 
-pub type c_long = i64;
-pub type c_ulong = u64;
-
 s! {
     pub struct timeval32 {
         pub tv_sec: i32,

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

@@ -10,8 +10,6 @@ pub type nlink_t = u32;
 pub type blksize_t = i64;
 pub type clockid_t = c_ulong;
 
-pub type c_long = i64;
-pub type c_ulong = u64;
 pub type time_t = i64;
 pub type suseconds_t = i64;
 

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

@@ -1,7 +1,5 @@
 use crate::prelude::*;
 
-pub type c_long = i64;
-pub type c_ulong = u64;
 pub type clock_t = i32;
 pub type wchar_t = u32;
 pub type time_t = i64;

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

@@ -1,7 +1,5 @@
 use crate::prelude::*;
 
-pub type c_long = i32;
-pub type c_ulong = u32;
 pub type clock_t = u32;
 pub type wchar_t = u32;
 pub type time_t = i64;

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

@@ -1,7 +1,5 @@
 use crate::prelude::*;
 
-pub type c_long = i32;
-pub type c_ulong = u32;
 pub type clock_t = u32;
 pub type wchar_t = i32;
 pub type time_t = i64;

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

@@ -1,7 +1,5 @@
 use crate::prelude::*;
 
-pub type c_long = i64;
-pub type c_ulong = u64;
 pub type clock_t = u32;
 pub type wchar_t = i32;
 pub type time_t = i64;

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

@@ -1,7 +1,5 @@
 use crate::prelude::*;
 
-pub type c_long = i64;
-pub type c_ulong = u64;
 pub type clock_t = i32;
 pub type wchar_t = c_int;
 pub type time_t = i64;

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

@@ -1,7 +1,5 @@
 use crate::prelude::*;
 
-pub type c_long = i32;
-pub type c_ulong = u32;
 pub type clock_t = c_ulong;
 pub type wchar_t = i32;
 pub type time_t = i32;

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

@@ -1,7 +1,5 @@
 use crate::prelude::*;
 
-pub type c_long = i64;
-pub type c_ulong = u64;
 pub type clock_t = i32;
 pub type wchar_t = i32;
 pub type time_t = i64;

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

@@ -1,8 +1,6 @@
 use crate::prelude::*;
 use crate::PT_FIRSTMACH;
 
-pub type c_long = i64;
-pub type c_ulong = u64;
 pub type greg_t = u64;
 pub type __cpu_simple_lock_nv_t = c_uchar;
 

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

@@ -1,8 +1,6 @@
 use crate::prelude::*;
 use crate::PT_FIRSTMACH;
 
-pub type c_long = i32;
-pub type c_ulong = u32;
 pub type __cpu_simple_lock_nv_t = c_int;
 
 pub(crate) const _ALIGNBYTES: usize = mem::size_of::<c_longlong>() - 1;

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

@@ -1,8 +1,6 @@
 use crate::prelude::*;
 use crate::PT_FIRSTMACH;
 
-pub type c_long = i32;
-pub type c_ulong = u32;
 pub type __cpu_simple_lock_nv_t = c_int;
 
 pub(crate) const _ALIGNBYTES: usize = mem::size_of::<c_longlong>() - 1;

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

@@ -1,8 +1,6 @@
 use crate::prelude::*;
 use crate::PT_FIRSTMACH;
 
-pub type c_long = i32;
-pub type c_ulong = u32;
 pub type __cpu_simple_lock_nv_t = c_int;
 
 pub(crate) const _ALIGNBYTES: usize = mem::size_of::<c_double>() - 1;

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

@@ -2,8 +2,6 @@ use PT_FIRSTMACH;
 
 use crate::prelude::*;
 
-pub type c_long = i64;
-pub type c_ulong = u64;
 pub type __greg_t = u64;
 pub type __cpu_simple_lock_nv_t = c_int;
 pub type __gregset = [__greg_t; _NGREG];

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

@@ -1,7 +1,5 @@
 use crate::prelude::*;
 
-pub type c_long = i64;
-pub type c_ulong = u64;
 pub type __cpu_simple_lock_nv_t = c_uchar;
 
 // should be pub(crate), but that requires Rust 1.18.0