Skip to content

Commit

Permalink
Remove array size hacks for Rust < 1.47
Browse files Browse the repository at this point in the history
Rust >= 1.47 supports traits for arrays of arbitrary size, so remove the
various hacks using nested arrays when the native platform definition
uses a single array.
  • Loading branch information
joshtriplett committed Jul 12, 2022
1 parent c7bc6a8 commit 3154cac
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 29 deletions.
8 changes: 0 additions & 8 deletions libc-test/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,6 @@ fn test_apple(target: &str) {
// FIXME: the array size has been changed since macOS 10.15 ([8] -> [7]).
("statfs", "f_reserved") => true,
("__darwin_arm_neon_state64", "__v") => true,
// MAXPATHLEN is too big for auto-derive traits on arrays.
("vnode_info_path", "vip_path") => true,
_ => false,
}
});
Expand Down Expand Up @@ -2242,8 +2240,6 @@ fn test_freebsd(target: &str) {
("umutex", "m_owner") => true,
// c_has_waiters field is a volatile int32_t
("ucond", "c_has_waiters") => true,
// is PATH_MAX long but tests can't accept multi array as equivalent.
("kinfo_vmentry", "kve_path") => true,

// a_un field is a union
("Elf32_Auxinfo", "a_un") => true,
Expand Down Expand Up @@ -2272,10 +2268,6 @@ fn test_freebsd(target: &str) {
// Anonymous type.
("filestat", "next") => true,

// We ignore this field because we needed to use a hack in order to make rust 1.19
// happy...
("kinfo_proc", "ki_sparestrings") => true,

// `__sem_base` is a private struct field
("semid_ds", "__sem_base") => true,

Expand Down
4 changes: 1 addition & 3 deletions src/unix/bsd/apple/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -818,9 +818,7 @@ s! {

pub struct vnode_info_path {
pub vip_vi: vnode_info,
// Normally it's `vip_path: [::c_char; MAXPATHLEN]` but because libc supports an old rustc
// version, we go around this limitation like this.
pub vip_path: [[::c_char; 32]; 32],
pub vip_path: [::c_char; ::MAXPATHLEN as usize],
}

pub struct proc_vnodepathinfo {
Expand Down
5 changes: 2 additions & 3 deletions src/unix/bsd/freebsdlike/dragonfly/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ s_no_extra_traits! {
pub mc_ownedfp: ::c_uint,
__reserved: ::c_uint,
__unused: [::c_uint; 8],
pub mc_fpregs: [[::c_uint; 8]; 32],
pub mc_fpregs: [::c_uint; 256],
}

pub struct ucontext_t {
Expand Down Expand Up @@ -786,8 +786,7 @@ cfg_if! {
self.mc_len == other.mc_len &&
self.mc_fpformat == other.mc_fpformat &&
self.mc_ownedfp == other.mc_ownedfp &&
self.mc_fpregs.iter().zip(other.mc_fpregs.iter()).
all(|(a, b)| a == b)
self.mc_fpregs == other.mc_fpregs
}
}
impl Eq for mcontext_t {}
Expand Down
2 changes: 1 addition & 1 deletion src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ s! {
/// More thread name.
pub ki_moretdname: [::c_char; ::MAXCOMLEN - ::TDNAMLEN + 1],
/// Spare string space.
pub ki_sparestrings: [[::c_char; 23]; 2], // little hack to allow PartialEq
pub ki_sparestrings: [::c_char; 46],
/// Spare room for growth.
pub ki_spareints: [::c_int; ::KI_NSPARE_INT],
/// Which cpu we are on.
Expand Down
2 changes: 1 addition & 1 deletion src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ s! {
/// More thread name.
pub ki_moretdname: [::c_char; ::MAXCOMLEN - ::TDNAMLEN + 1],
/// Spare string space.
pub ki_sparestrings: [[::c_char; 23]; 2], // little hack to allow PartialEq
pub ki_sparestrings: [::c_char; 46],
/// Spare room for growth.
pub ki_spareints: [::c_int; ::KI_NSPARE_INT],
/// Controlling tty dev.
Expand Down
2 changes: 1 addition & 1 deletion src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ s! {
/// More thread name.
pub ki_moretdname: [::c_char; ::MAXCOMLEN - ::TDNAMLEN + 1],
/// Spare string space.
pub ki_sparestrings: [[::c_char; 23]; 2], // little hack to allow PartialEq
pub ki_sparestrings: [::c_char; 46],
/// Spare room for growth.
pub ki_spareints: [::c_int; ::KI_NSPARE_INT],
/// Controlling tty dev.
Expand Down
2 changes: 1 addition & 1 deletion src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ s! {
/// More thread name.
pub ki_moretdname: [::c_char; ::MAXCOMLEN - ::TDNAMLEN + 1],
/// Spare string space.
pub ki_sparestrings: [[::c_char; 23]; 2], // little hack to allow PartialEq
pub ki_sparestrings: [::c_char; 46],
/// Spare room for growth.
pub ki_spareints: [::c_int; ::KI_NSPARE_INT],
/// Controlling tty dev.
Expand Down
2 changes: 1 addition & 1 deletion src/unix/bsd/freebsdlike/freebsd/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ s! {
_kve_is_spare: [::c_int; 8],
#[cfg(freebsd11)]
_kve_is_spare: [::c_int; 12],
pub kve_path: [[::c_char; 32]; 32],
pub kve_path: [::c_char; ::PATH_MAX as usize],
}

pub struct __c_anonymous_filestat {
Expand Down
2 changes: 1 addition & 1 deletion src/unix/bsd/freebsdlike/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ s! {

pub struct accept_filter_arg {
pub af_name: [::c_char; 16],
af_arg: [[::c_char; 10]; 24],
af_arg: [::c_char; 240],
}

pub struct ptrace_io_desc {
Expand Down
2 changes: 1 addition & 1 deletion src/unix/bsd/netbsdlike/netbsd/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ s! {
pub kve_vn_rdev: u64,
pub kve_vn_type: u32,
pub kve_vn_mode: u32,
pub kve_path: [[::c_char; 32]; 32],
pub kve_path: [::c_char; ::PATH_MAX as usize],
}

pub struct __c_anonymous_posix_spawn_fae_open {
Expand Down
4 changes: 1 addition & 3 deletions src/unix/linux_like/android/b64/aarch64/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@ s! {
pub sp: ::c_ulonglong,
pub pc: ::c_ulonglong,
pub pstate: ::c_ulonglong,
// nested arrays to get the right size/length while being able to
// auto-derive traits like Debug
__reserved: [[u64; 32]; 16],
__reserved: [u64; 512],
}

pub struct user_fpsimd_struct {
Expand Down
2 changes: 1 addition & 1 deletion src/unix/linux_like/android/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ s_no_extra_traits! {
pub struct prop_info {
__name: [::c_char; 32],
__serial: ::c_uint,
__value: [[::c_char; 4]; 23],
__value: [::c_char; 92],
}
}

Expand Down
4 changes: 1 addition & 3 deletions src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,7 @@ s! {
pub sp: ::c_ulonglong,
pub pc: ::c_ulonglong,
pub pstate: ::c_ulonglong,
// nested arrays to get the right size/length while being able to
// auto-derive traits like Debug
__reserved: [[u64; 32]; 16],
__reserved: [u64; 512],
}

pub struct user_fpsimd_struct {
Expand Down
2 changes: 1 addition & 1 deletion src/unix/linux_like/linux/musl/b64/aarch64/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ s! {
pub sp: ::c_ulong,
pub pc: ::c_ulong,
pub pstate: ::c_ulong,
__reserved: [[u64; 32]; 16],
__reserved: [u64; 512],
}

#[repr(align(8))]
Expand Down

0 comments on commit 3154cac

Please sign in to comment.