Skip to content

Commit 5a43dd2

Browse files
joshtripletttgross35
joshtriplett
authored and
tgross35
committed
Require rust >= 1.24 and drop libc_const_size_of conditional
[ resolve conflicts and remove a couple newer `cfg`s - Trevor ]
1 parent b9e4d80 commit 5a43dd2

File tree

26 files changed

+74
-306
lines changed

26 files changed

+74
-306
lines changed

‎build.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ const ALLOWED_CFGS: &'static [&'static str] = &[
1818
"libc_cfg_target_vendor",
1919
"libc_const_extern_fn",
2020
"libc_const_extern_fn_unstable",
21-
"libc_const_size_of",
2221
"libc_core_cvoid",
2322
"libc_deny_warnings",
2423
"libc_int128",
@@ -97,11 +96,6 @@ fn main() {
9796
set_cfg("libc_deny_warnings");
9897
}
9998

100-
// Rust >= 1.24 supports const mem::size_of:
101-
if rustc_minor_ver >= 24 || rustc_dep_of_std {
102-
set_cfg("libc_const_size_of");
103-
}
104-
10599
// Rust >= 1.25 supports repr(align):
106100
if rustc_minor_ver >= 25 || rustc_dep_of_std || align_cargo_feature {
107101
set_cfg("libc_align");

‎libc-test/build.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ fn do_ctest() {
6868
fn ctest_cfg() -> ctest::TestGenerator {
6969
let mut cfg = ctest::TestGenerator::new();
7070
let libc_cfgs = [
71-
"libc_const_size_of",
7271
"libc_align",
7372
"libc_core_cvoid",
7473
"libc_packedN",

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

Lines changed: 39 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -5484,76 +5484,52 @@ cfg_if! {
54845484
const __DARWIN_ALIGNBYTES32: usize = ::mem::size_of::<u32>() - 1;
54855485
p + __DARWIN_ALIGNBYTES32 & !__DARWIN_ALIGNBYTES32
54865486
}
5487-
} else if #[cfg(libc_const_size_of)] {
5488-
fn __DARWIN_ALIGN32(p: usize) -> usize {
5489-
const __DARWIN_ALIGNBYTES32: usize = ::mem::size_of::<u32>() - 1;
5490-
p + __DARWIN_ALIGNBYTES32 & !__DARWIN_ALIGNBYTES32
5491-
}
54925487
} else {
54935488
fn __DARWIN_ALIGN32(p: usize) -> usize {
5494-
let __DARWIN_ALIGNBYTES32: usize = ::mem::size_of::<u32>() - 1;
5489+
const __DARWIN_ALIGNBYTES32: usize = ::mem::size_of::<u32>() - 1;
54955490
p + __DARWIN_ALIGNBYTES32 & !__DARWIN_ALIGNBYTES32
54965491
}
54975492
}
54985493
}
54995494

5500-
cfg_if! {
5501-
if #[cfg(libc_const_size_of)] {
5502-
pub const THREAD_EXTENDED_POLICY_COUNT: mach_msg_type_number_t =
5503-
(::mem::size_of::<thread_extended_policy_data_t>() / ::mem::size_of::<integer_t>())
5504-
as mach_msg_type_number_t;
5505-
pub const THREAD_TIME_CONSTRAINT_POLICY_COUNT: mach_msg_type_number_t =
5506-
(::mem::size_of::<thread_time_constraint_policy_data_t>() /
5507-
::mem::size_of::<integer_t>()) as mach_msg_type_number_t;
5508-
pub const THREAD_PRECEDENCE_POLICY_COUNT: mach_msg_type_number_t =
5509-
(::mem::size_of::<thread_precedence_policy_data_t>() / ::mem::size_of::<integer_t>())
5510-
as mach_msg_type_number_t;
5511-
pub const THREAD_AFFINITY_POLICY_COUNT: mach_msg_type_number_t =
5512-
(::mem::size_of::<thread_affinity_policy_data_t>() / ::mem::size_of::<integer_t>())
5513-
as mach_msg_type_number_t;
5514-
pub const THREAD_BACKGROUND_POLICY_COUNT: mach_msg_type_number_t =
5515-
(::mem::size_of::<thread_background_policy_data_t>() / ::mem::size_of::<integer_t>())
5516-
as mach_msg_type_number_t;
5517-
pub const THREAD_LATENCY_QOS_POLICY_COUNT: mach_msg_type_number_t =
5518-
(::mem::size_of::<thread_latency_qos_policy_data_t>() / ::mem::size_of::<integer_t>())
5519-
as mach_msg_type_number_t;
5520-
pub const THREAD_THROUGHPUT_QOS_POLICY_COUNT: mach_msg_type_number_t =
5521-
(::mem::size_of::<thread_throughput_qos_policy_data_t>() /
5522-
::mem::size_of::<integer_t>()) as mach_msg_type_number_t;
5523-
pub const THREAD_BASIC_INFO_COUNT: mach_msg_type_number_t =
5524-
(::mem::size_of::<thread_basic_info_data_t>() / ::mem::size_of::<integer_t>())
5525-
as mach_msg_type_number_t;
5526-
pub const THREAD_IDENTIFIER_INFO_COUNT: mach_msg_type_number_t =
5527-
(::mem::size_of::<thread_identifier_info_data_t>() / ::mem::size_of::<integer_t>())
5528-
as mach_msg_type_number_t;
5529-
pub const THREAD_EXTENDED_INFO_COUNT: mach_msg_type_number_t =
5530-
(::mem::size_of::<thread_extended_info_data_t>() / ::mem::size_of::<integer_t>())
5531-
as mach_msg_type_number_t;
5532-
5533-
pub const TASK_THREAD_TIMES_INFO_COUNT: u32 =
5534-
(::mem::size_of::<task_thread_times_info_data_t>()
5535-
/ ::mem::size_of::<natural_t>()) as u32;
5536-
pub const MACH_TASK_BASIC_INFO_COUNT: u32 = (::mem::size_of::<mach_task_basic_info_data_t>()
5537-
/ ::mem::size_of::<natural_t>()) as u32;
5538-
pub const HOST_VM_INFO64_COUNT: mach_msg_type_number_t =
5539-
(::mem::size_of::<vm_statistics64_data_t>() / ::mem::size_of::<integer_t>())
5540-
as mach_msg_type_number_t;
5541-
} else {
5542-
pub const THREAD_EXTENDED_POLICY_COUNT: mach_msg_type_number_t = 1;
5543-
pub const THREAD_TIME_CONSTRAINT_POLICY_COUNT: mach_msg_type_number_t = 4;
5544-
pub const THREAD_PRECEDENCE_POLICY_COUNT: mach_msg_type_number_t = 1;
5545-
pub const THREAD_AFFINITY_POLICY_COUNT: mach_msg_type_number_t = 1;
5546-
pub const THREAD_BACKGROUND_POLICY_COUNT: mach_msg_type_number_t = 1;
5547-
pub const THREAD_LATENCY_QOS_POLICY_COUNT: mach_msg_type_number_t = 1;
5548-
pub const THREAD_THROUGHPUT_QOS_POLICY_COUNT: mach_msg_type_number_t = 1;
5549-
pub const THREAD_BASIC_INFO_COUNT: mach_msg_type_number_t = 10;
5550-
pub const THREAD_IDENTIFIER_INFO_COUNT: mach_msg_type_number_t = 6;
5551-
pub const THREAD_EXTENDED_INFO_COUNT: mach_msg_type_number_t = 28;
5552-
pub const TASK_THREAD_TIMES_INFO_COUNT: u32 = 4;
5553-
pub const MACH_TASK_BASIC_INFO_COUNT: u32 = 12;
5554-
pub const HOST_VM_INFO64_COUNT: mach_msg_type_number_t = 38;
5555-
}
5556-
}
5495+
pub const THREAD_EXTENDED_POLICY_COUNT: mach_msg_type_number_t =
5496+
(::mem::size_of::<thread_extended_policy_data_t>() / ::mem::size_of::<integer_t>())
5497+
as mach_msg_type_number_t;
5498+
pub const THREAD_TIME_CONSTRAINT_POLICY_COUNT: mach_msg_type_number_t =
5499+
(::mem::size_of::<thread_time_constraint_policy_data_t>() / ::mem::size_of::<integer_t>())
5500+
as mach_msg_type_number_t;
5501+
pub const THREAD_PRECEDENCE_POLICY_COUNT: mach_msg_type_number_t =
5502+
(::mem::size_of::<thread_precedence_policy_data_t>() / ::mem::size_of::<integer_t>())
5503+
as mach_msg_type_number_t;
5504+
pub const THREAD_AFFINITY_POLICY_COUNT: mach_msg_type_number_t =
5505+
(::mem::size_of::<thread_affinity_policy_data_t>() / ::mem::size_of::<integer_t>())
5506+
as mach_msg_type_number_t;
5507+
pub const THREAD_BACKGROUND_POLICY_COUNT: mach_msg_type_number_t =
5508+
(::mem::size_of::<thread_background_policy_data_t>() / ::mem::size_of::<integer_t>())
5509+
as mach_msg_type_number_t;
5510+
pub const THREAD_LATENCY_QOS_POLICY_COUNT: mach_msg_type_number_t =
5511+
(::mem::size_of::<thread_latency_qos_policy_data_t>() / ::mem::size_of::<integer_t>())
5512+
as mach_msg_type_number_t;
5513+
pub const THREAD_THROUGHPUT_QOS_POLICY_COUNT: mach_msg_type_number_t =
5514+
(::mem::size_of::<thread_throughput_qos_policy_data_t>() / ::mem::size_of::<integer_t>())
5515+
as mach_msg_type_number_t;
5516+
pub const THREAD_BASIC_INFO_COUNT: mach_msg_type_number_t =
5517+
(::mem::size_of::<thread_basic_info_data_t>() / ::mem::size_of::<integer_t>())
5518+
as mach_msg_type_number_t;
5519+
pub const THREAD_IDENTIFIER_INFO_COUNT: mach_msg_type_number_t =
5520+
(::mem::size_of::<thread_identifier_info_data_t>() / ::mem::size_of::<integer_t>())
5521+
as mach_msg_type_number_t;
5522+
pub const THREAD_EXTENDED_INFO_COUNT: mach_msg_type_number_t =
5523+
(::mem::size_of::<thread_extended_info_data_t>() / ::mem::size_of::<integer_t>())
5524+
as mach_msg_type_number_t;
5525+
5526+
pub const TASK_THREAD_TIMES_INFO_COUNT: u32 =
5527+
(::mem::size_of::<task_thread_times_info_data_t>() / ::mem::size_of::<natural_t>()) as u32;
5528+
pub const MACH_TASK_BASIC_INFO_COUNT: u32 =
5529+
(::mem::size_of::<mach_task_basic_info_data_t>() / ::mem::size_of::<natural_t>()) as u32;
5530+
pub const HOST_VM_INFO64_COUNT: mach_msg_type_number_t =
5531+
(::mem::size_of::<vm_statistics64_data_t>() / ::mem::size_of::<integer_t>())
5532+
as mach_msg_type_number_t;
55575533

55585534
f! {
55595535
pub fn CMSG_NXTHDR(mhdr: *const ::msghdr,

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,7 @@ s_no_extra_traits! {
3434
}
3535
}
3636

37-
// should be pub(crate), but that requires Rust 1.18.0
38-
cfg_if! {
39-
if #[cfg(libc_const_size_of)] {
40-
#[doc(hidden)]
41-
pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_longlong>() - 1;
42-
} else {
43-
#[doc(hidden)]
44-
pub const _ALIGNBYTES: usize = 8 - 1;
45-
}
46-
}
37+
pub(crate) const _ALIGNBYTES: usize = ::mem::size_of::<::c_longlong>() - 1;
4738

4839
cfg_if! {
4940
if #[cfg(feature = "extra_traits")] {

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,11 @@ cfg_if! {
5050
}
5151
}
5252

53-
// should be pub(crate), but that requires Rust 1.18.0
54-
cfg_if! {
55-
if #[cfg(libc_const_size_of)] {
56-
#[doc(hidden)]
57-
pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1;
58-
} else {
59-
#[doc(hidden)]
60-
pub const _ALIGNBYTES: usize = 4 - 1;
61-
}
62-
}
53+
pub(crate) const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1;
6354

6455
pub const BIOCSRTIMEOUT: ::c_ulong = 0x8010426d;
6556
pub const BIOCGRTIMEOUT: ::c_ulong = 0x4010426e;
57+
6658
pub const MAP_32BIT: ::c_int = 0x00080000;
6759
pub const MINSIGSTKSZ: ::size_t = 4096; // 1024 * 4
6860
pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,7 @@ cfg_if! {
7373
}
7474
}
7575

76-
// should be pub(crate), but that requires Rust 1.18.0
77-
cfg_if! {
78-
if #[cfg(libc_const_size_of)] {
79-
#[doc(hidden)]
80-
pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1;
81-
} else {
82-
#[doc(hidden)]
83-
pub const _ALIGNBYTES: usize = 4 - 1;
84-
}
85-
}
76+
pub(crate) const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1;
8677

8778
pub const BIOCSRTIMEOUT: ::c_ulong = 0x8010426d;
8879
pub const BIOCGRTIMEOUT: ::c_ulong = 0x4010426e;

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,11 @@ cfg_if! {
7373
}
7474
}
7575

76-
// should be pub(crate), but that requires Rust 1.18.0
77-
cfg_if! {
78-
if #[cfg(libc_const_size_of)] {
79-
#[doc(hidden)]
80-
pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_long>() - 1;
81-
} else {
82-
#[doc(hidden)]
83-
pub const _ALIGNBYTES: usize = 8 - 1;
84-
}
85-
}
76+
pub(crate) const _ALIGNBYTES: usize = ::mem::size_of::<::c_long>() - 1;
8677

8778
pub const BIOCSRTIMEOUT: ::c_ulong = 0x8010426d;
8879
pub const BIOCGRTIMEOUT: ::c_ulong = 0x4010426e;
80+
8981
pub const MAP_32BIT: ::c_int = 0x00080000;
9082
pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4
9183
pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,6 @@ s_no_extra_traits! {
3636
}
3737
}
3838

39-
// should be pub(crate), but that requires Rust 1.18.0
40-
cfg_if! {
41-
if #[cfg(libc_const_size_of)] {
42-
#[doc(hidden)]
43-
pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_longlong>() - 1;
44-
} else {
45-
#[doc(hidden)]
46-
pub const _ALIGNBYTES: usize = 8 - 1;
47-
}
48-
}
49-
5039
cfg_if! {
5140
if #[cfg(feature = "extra_traits")] {
5241
impl PartialEq for gpregs {
@@ -151,6 +140,8 @@ cfg_if! {
151140
}
152141
}
153142

143+
pub(crate) const _ALIGNBYTES: usize = ::mem::size_of::<::c_longlong>() - 1;
144+
154145
pub const BIOCSRTIMEOUT: ::c_ulong = 0x8010426d;
155146
pub const BIOCGRTIMEOUT: ::c_ulong = 0x4010426e;
156147
pub const MAP_32BIT: ::c_int = 0x00080000;

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,6 @@ cfg_if! {
4747
}
4848
}
4949

50-
// should be pub(crate), but that requires Rust 1.18.0
51-
cfg_if! {
52-
if #[cfg(libc_const_size_of)] {
53-
#[doc(hidden)]
54-
pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_long>() - 1;
55-
} else {
56-
#[doc(hidden)]
57-
pub const _ALIGNBYTES: usize = 4 - 1;
58-
}
59-
}
60-
6150
cfg_if! {
6251
if #[cfg(all(libc_align, feature = "extra_traits"))] {
6352
impl PartialEq for mcontext_t {
@@ -169,6 +158,8 @@ cfg_if! {
169158
}
170159
}
171160

161+
pub(crate) const _ALIGNBYTES: usize = ::mem::size_of::<::c_long>() - 1;
162+
172163
pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4
173164

174165
pub const BIOCSRTIMEOUT: ::c_ulong = 0x8008426d;

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -219,16 +219,7 @@ cfg_if! {
219219
}
220220
}
221221

222-
// should be pub(crate), but that requires Rust 1.18.0
223-
cfg_if! {
224-
if #[cfg(libc_const_size_of)] {
225-
#[doc(hidden)]
226-
pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_long>() - 1;
227-
} else {
228-
#[doc(hidden)]
229-
pub const _ALIGNBYTES: usize = 8 - 1;
230-
}
231-
}
222+
pub(crate) const _ALIGNBYTES: usize = ::mem::size_of::<::c_long>() - 1;
232223

233224
pub const BIOCSRTIMEOUT: ::c_ulong = 0x8010426d;
234225
pub const BIOCGRTIMEOUT: ::c_ulong = 0x4010426e;

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -432,15 +432,7 @@ cfg_if! {
432432
}
433433

434434
// Non-public helper constant
435-
cfg_if! {
436-
if #[cfg(all(not(libc_const_size_of), target_pointer_width = "32"))] {
437-
const SIZEOF_LONG: usize = 4;
438-
} else if #[cfg(all(not(libc_const_size_of), target_pointer_width = "64"))] {
439-
const SIZEOF_LONG: usize = 8;
440-
} else if #[cfg(libc_const_size_of)] {
441-
const SIZEOF_LONG: usize = ::mem::size_of::<::c_long>();
442-
}
443-
}
435+
const SIZEOF_LONG: usize = ::mem::size_of::<::c_long>();
444436

445437
#[deprecated(
446438
since = "0.2.64",

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,7 @@ cfg_if! {
8080
}
8181
}
8282

83-
// should be pub(crate), but that requires Rust 1.18.0
84-
cfg_if! {
85-
if #[cfg(libc_const_size_of)] {
86-
#[doc(hidden)]
87-
pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1;
88-
} else {
89-
#[doc(hidden)]
90-
pub const _ALIGNBYTES: usize = 4 - 1;
91-
}
92-
}
93-
83+
pub(crate) const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1;
9484
pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 0;
9585
pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 1;
9686
pub const PT_GETFPREGS: ::c_int = PT_FIRSTMACH + 2;

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@ pub type c_ulong = u32;
55
pub type c_char = u8;
66
pub type __cpu_simple_lock_nv_t = ::c_int;
77

8-
// should be pub(crate), but that requires Rust 1.18.0
9-
cfg_if! {
10-
if #[cfg(libc_const_size_of)] {
11-
#[doc(hidden)]
12-
pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_longlong>() - 1;
13-
} else {
14-
#[doc(hidden)]
15-
pub const _ALIGNBYTES: usize = 8 - 1;
16-
}
17-
}
8+
pub(crate) const _ALIGNBYTES: usize = ::mem::size_of::<::c_longlong>() - 1;
189

1910
pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 1;
2011
pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 2;

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,7 @@ pub type c_ulong = u32;
55
pub type c_char = i8;
66
pub type __cpu_simple_lock_nv_t = ::c_int;
77

8-
cfg_if! {
9-
if #[cfg(libc_const_size_of)] {
10-
#[doc(hidden)]
11-
pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_longlong>() - 1;
12-
} else {
13-
#[doc(hidden)]
14-
pub const _ALIGNBYTES: usize = 8 - 1;
15-
}
16-
}
8+
pub(crate) const _ALIGNBYTES: usize = ::mem::size_of::<::c_longlong>() - 1;
179

1810
pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 1;
1911
pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 2;

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@ pub type c_ulong = u32;
55
pub type c_char = u8;
66
pub type __cpu_simple_lock_nv_t = ::c_int;
77

8-
// should be pub(crate), but that requires Rust 1.18.0
9-
cfg_if! {
10-
if #[cfg(libc_const_size_of)] {
11-
#[doc(hidden)]
12-
pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_double>() - 1;
13-
} else {
14-
#[doc(hidden)]
15-
pub const _ALIGNBYTES: usize = 8 - 1;
16-
}
17-
}
8+
pub(crate) const _ALIGNBYTES: usize = ::mem::size_of::<::c_double>() - 1;
189

1910
pub const PT_STEP: ::c_int = PT_FIRSTMACH + 0;
2011
pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 1;

0 commit comments

Comments
 (0)