Skip to content

Commit bcaa8a3

Browse files
dybuccdybucc
committed
refactor: remove *COUNT constants fitting #3131
This patch is a follow up from #5121. That PR deprecated the symbols for a stable release, while this patch ensures the symbols are altogether removed. See the accompanying PR for more details.
1 parent 022b324 commit bcaa8a3

8 files changed

Lines changed: 0 additions & 57 deletions

File tree

‎libc-test/build.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,6 @@ fn test_apple(target: &str) {
353353
// https://github.com/apple-oss-distributions/xnu/commit/f6217f891ac0bb64f3d375211650a4c1ff8ca1ea
354354
"ELAST" => true,
355355

356-
// FIXME(macos): bumped up on macOS 26, it's sizeof `vm_statistics64_data_t`
357-
"HOST_VM_INFO64_COUNT" => true,
358-
359356
_ => false,
360357
}
361358
});
@@ -2126,7 +2123,6 @@ fn test_android(target: &str) {
21262123

21272124
// FIXME(android): Something has been changed on r26b:
21282125
| "IPPROTO_MAX"
2129-
| "NFNL_SUBSYS_COUNT"
21302126
| "NF_NETDEV_NUMHOOKS"
21312127
| "NFT_MSG_MAX"
21322128
| "SW_MAX"

‎libc-test/semver/android.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1407,7 +1407,6 @@ NFNLGRP_NONE
14071407
NFNL_MSG_BATCH_BEGIN
14081408
NFNL_MSG_BATCH_END
14091409
NFNL_SUBSYS_ACCT
1410-
NFNL_SUBSYS_COUNT
14111410
NFNL_SUBSYS_CTHELPER
14121411
NFNL_SUBSYS_CTNETLINK
14131412
NFNL_SUBSYS_CTNETLINK_EXP

‎libc-test/semver/apple.txt‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ ATF_COM
7171
ATF_PERM
7272
ATF_PUBL
7373
ATF_USETRAILERS
74-
ATTR_BIT_MAP_COUNT
7574
ATTR_CMNEXT_CLONEID
7675
ATTR_CMNEXT_EXT_FLAGS
7776
ATTR_CMNEXT_LINKID
@@ -1414,29 +1413,18 @@ TCP_NOOPT
14141413
TCP_NOPUSH
14151414
THOUSEP
14161415
THREAD_AFFINITY_POLICY
1417-
THREAD_AFFINITY_POLICY_COUNT
14181416
THREAD_AFFINITY_TAG_NULL
14191417
THREAD_BACKGROUND_POLICY
1420-
THREAD_BACKGROUND_POLICY_COUNT
14211418
THREAD_BACKGROUND_POLICY_DARWIN_BG
14221419
THREAD_BASIC_INFO
1423-
THREAD_BASIC_INFO_COUNT
14241420
THREAD_EXTENDED_INFO
1425-
THREAD_EXTENDED_INFO_COUNT
14261421
THREAD_EXTENDED_POLICY
1427-
THREAD_EXTENDED_POLICY_COUNT
14281422
THREAD_IDENTIFIER_INFO
1429-
THREAD_IDENTIFIER_INFO_COUNT
14301423
THREAD_LATENCY_QOS_POLICY
1431-
THREAD_LATENCY_QOS_POLICY_COUNT
14321424
THREAD_PRECEDENCE_POLICY
1433-
THREAD_PRECEDENCE_POLICY_COUNT
14341425
THREAD_STANDARD_POLICY
1435-
THREAD_STANDARD_POLICY_COUNT
14361426
THREAD_THROUGHPUT_QOS_POLICY
1437-
THREAD_THROUGHPUT_QOS_POLICY_COUNT
14381427
THREAD_TIME_CONSTRAINT_POLICY
1439-
THREAD_TIME_CONSTRAINT_POLICY_COUNT
14401428
TH_FLAGS_GLOBAL_FORCED_IDLE
14411429
TH_FLAGS_IDLE
14421430
TH_FLAGS_SWAPPED

‎libc-test/semver/linux.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1925,7 +1925,6 @@ NFNLGRP_NONE
19251925
NFNL_MSG_BATCH_BEGIN
19261926
NFNL_MSG_BATCH_END
19271927
NFNL_SUBSYS_ACCT
1928-
NFNL_SUBSYS_COUNT
19291928
NFNL_SUBSYS_CTHELPER
19301929
NFNL_SUBSYS_CTNETLINK
19311930
NFNL_SUBSYS_CTNETLINK_EXP

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

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3733,7 +3733,6 @@ pub const MNT_NOWAIT: c_int = 2;
37333733

37343734
// <mach/thread_policy.h>
37353735
pub const THREAD_STANDARD_POLICY: c_int = 1;
3736-
pub const THREAD_STANDARD_POLICY_COUNT: c_int = 0;
37373736
pub const THREAD_EXTENDED_POLICY: c_int = 1;
37383737
pub const THREAD_TIME_CONSTRAINT_POLICY: c_int = 2;
37393738
pub const THREAD_PRECEDENCE_POLICY: c_int = 3;
@@ -3795,7 +3794,6 @@ pub const VM_PAGE_QUERY_PAGE_CS_NX: i32 = 0x400;
37953794

37963795
// mach/task_info.h
37973796
pub const TASK_THREAD_TIMES_INFO: u32 = 3;
3798-
pub const HOST_CPU_LOAD_INFO_COUNT: u32 = 4;
37993797
pub const MACH_TASK_BASIC_INFO: u32 = 20;
38003798

38013799
pub const MACH_PORT_NULL: i32 = 0;
@@ -3858,7 +3856,6 @@ pub const COPYFILE_STATE_DST_BSIZE: c_int = 12;
38583856
pub const COPYFILE_STATE_BSIZE: c_int = 13;
38593857

38603858
// <sys/attr.h>
3861-
pub const ATTR_BIT_MAP_COUNT: c_ushort = 5;
38623859
pub const FSOPT_NOFOLLOW: u32 = 0x1;
38633860
pub const FSOPT_NOFOLLOW_ANY: u32 = 0x800;
38643861
pub const FSOPT_REPORT_FULLSIZE: u32 = 0x4;
@@ -4029,39 +4026,6 @@ const fn __DARWIN_ALIGN32(p: usize) -> usize {
40294026
(p + __DARWIN_ALIGNBYTES32) & !__DARWIN_ALIGNBYTES32
40304027
}
40314028

4032-
pub const THREAD_EXTENDED_POLICY_COUNT: mach_msg_type_number_t =
4033-
(size_of::<thread_extended_policy_data_t>() / size_of::<integer_t>()) as mach_msg_type_number_t;
4034-
pub const THREAD_TIME_CONSTRAINT_POLICY_COUNT: mach_msg_type_number_t =
4035-
(size_of::<thread_time_constraint_policy_data_t>() / size_of::<integer_t>())
4036-
as mach_msg_type_number_t;
4037-
pub const THREAD_PRECEDENCE_POLICY_COUNT: mach_msg_type_number_t =
4038-
(size_of::<thread_precedence_policy_data_t>() / size_of::<integer_t>())
4039-
as mach_msg_type_number_t;
4040-
pub const THREAD_AFFINITY_POLICY_COUNT: mach_msg_type_number_t =
4041-
(size_of::<thread_affinity_policy_data_t>() / size_of::<integer_t>()) as mach_msg_type_number_t;
4042-
pub const THREAD_BACKGROUND_POLICY_COUNT: mach_msg_type_number_t =
4043-
(size_of::<thread_background_policy_data_t>() / size_of::<integer_t>())
4044-
as mach_msg_type_number_t;
4045-
pub const THREAD_LATENCY_QOS_POLICY_COUNT: mach_msg_type_number_t =
4046-
(size_of::<thread_latency_qos_policy_data_t>() / size_of::<integer_t>())
4047-
as mach_msg_type_number_t;
4048-
pub const THREAD_THROUGHPUT_QOS_POLICY_COUNT: mach_msg_type_number_t =
4049-
(size_of::<thread_throughput_qos_policy_data_t>() / size_of::<integer_t>())
4050-
as mach_msg_type_number_t;
4051-
pub const THREAD_BASIC_INFO_COUNT: mach_msg_type_number_t =
4052-
(size_of::<thread_basic_info_data_t>() / size_of::<integer_t>()) as mach_msg_type_number_t;
4053-
pub const THREAD_IDENTIFIER_INFO_COUNT: mach_msg_type_number_t =
4054-
(size_of::<thread_identifier_info_data_t>() / size_of::<integer_t>()) as mach_msg_type_number_t;
4055-
pub const THREAD_EXTENDED_INFO_COUNT: mach_msg_type_number_t =
4056-
(size_of::<thread_extended_info_data_t>() / size_of::<integer_t>()) as mach_msg_type_number_t;
4057-
4058-
pub const TASK_THREAD_TIMES_INFO_COUNT: u32 =
4059-
(size_of::<task_thread_times_info_data_t>() / size_of::<natural_t>()) as u32;
4060-
pub const MACH_TASK_BASIC_INFO_COUNT: u32 =
4061-
(size_of::<mach_task_basic_info_data_t>() / size_of::<natural_t>()) as u32;
4062-
pub const HOST_VM_INFO64_COUNT: mach_msg_type_number_t =
4063-
(size_of::<vm_statistics64_data_t>() / size_of::<integer_t>()) as mach_msg_type_number_t;
4064-
40654029
// bsd/net/if_mib.h
40664030
/// Non-interface-specific
40674031
pub const IFMIB_SYSTEM: c_int = 1;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1569,7 +1569,6 @@ pub const NFNL_SUBSYS_CTNETLINK_TIMEOUT: c_int = 8;
15691569
pub const NFNL_SUBSYS_CTHELPER: c_int = 9;
15701570
pub const NFNL_SUBSYS_NFTABLES: c_int = 10;
15711571
pub const NFNL_SUBSYS_NFT_COMPAT: c_int = 11;
1572-
pub const NFNL_SUBSYS_COUNT: c_int = 12;
15731572

15741573
pub const NFNL_MSG_BATCH_BEGIN: c_int = NLMSG_MIN_TYPE;
15751574
pub const NFNL_MSG_BATCH_END: c_int = NLMSG_MIN_TYPE + 1;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1899,7 +1899,6 @@ pub const NFNL_SUBSYS_CTHELPER: c_int = 9;
18991899
pub const NFNL_SUBSYS_NFTABLES: c_int = 10;
19001900
pub const NFNL_SUBSYS_NFT_COMPAT: c_int = 11;
19011901
pub const NFNL_SUBSYS_HOOK: c_int = 12;
1902-
pub const NFNL_SUBSYS_COUNT: c_int = 13;
19031902

19041903
pub const NFNL_MSG_BATCH_BEGIN: c_int = crate::NLMSG_MIN_TYPE;
19051904
pub const NFNL_MSG_BATCH_END: c_int = crate::NLMSG_MIN_TYPE + 1;

‎src/unix/solarish/illumos.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ pub const PRIV_USER: c_uint = PRIV_DEBUG
186186
| PRIV_AWARE_RESET
187187
| PRIV_PFEXEC;
188188

189-
pub const LGRP_RSRC_COUNT: crate::lgrp_rsrc_t = 2;
190189
pub const LGRP_RSRC_CPU: crate::lgrp_rsrc_t = 0;
191190
pub const LGRP_RSRC_MEM: crate::lgrp_rsrc_t = 1;
192191

0 commit comments

Comments
 (0)