From 645eb537dd76f5e2ca0baed4dfc9461c00a2eebc Mon Sep 17 00:00:00 2001 From: dybucc <149513579+dybucc@users.noreply.github.com> Date: Mon, 8 Jun 2026 12:17:11 +0200 Subject: [PATCH] refactor: remove *COUNT constants fitting rust-lang/libc#3131 This patch is a follow up from rust-lang/libc#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. --- libc-test/build.rs | 4 ---- libc-test/semver/android.txt | 1 - libc-test/semver/apple.txt | 12 ---------- libc-test/semver/linux.txt | 1 - src/unix/bsd/apple/mod.rs | 36 ------------------------------ src/unix/linux_like/android/mod.rs | 1 - src/unix/linux_like/linux/mod.rs | 1 - src/unix/solarish/illumos.rs | 1 - 8 files changed, 57 deletions(-) diff --git a/libc-test/build.rs b/libc-test/build.rs index 328bac6e56a6b..02b19d8018b34 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -353,9 +353,6 @@ fn test_apple(target: &str) { // https://github.com/apple-oss-distributions/xnu/commit/f6217f891ac0bb64f3d375211650a4c1ff8ca1ea "ELAST" => true, - // FIXME(macos): bumped up on macOS 26, it's sizeof `vm_statistics64_data_t` - "HOST_VM_INFO64_COUNT" => true, - _ => false, } }); @@ -2126,7 +2123,6 @@ fn test_android(target: &str) { // FIXME(android): Something has been changed on r26b: | "IPPROTO_MAX" - | "NFNL_SUBSYS_COUNT" | "NF_NETDEV_NUMHOOKS" | "NFT_MSG_MAX" | "SW_MAX" diff --git a/libc-test/semver/android.txt b/libc-test/semver/android.txt index 00d9bf08a0e86..873accaf89b2e 100644 --- a/libc-test/semver/android.txt +++ b/libc-test/semver/android.txt @@ -1416,7 +1416,6 @@ NFNLGRP_NONE NFNL_MSG_BATCH_BEGIN NFNL_MSG_BATCH_END NFNL_SUBSYS_ACCT -NFNL_SUBSYS_COUNT NFNL_SUBSYS_CTHELPER NFNL_SUBSYS_CTNETLINK NFNL_SUBSYS_CTNETLINK_EXP diff --git a/libc-test/semver/apple.txt b/libc-test/semver/apple.txt index cf1d92de132dc..9f153541d199f 100644 --- a/libc-test/semver/apple.txt +++ b/libc-test/semver/apple.txt @@ -71,7 +71,6 @@ ATF_COM ATF_PERM ATF_PUBL ATF_USETRAILERS -ATTR_BIT_MAP_COUNT ATTR_CMNEXT_CLONEID ATTR_CMNEXT_EXT_FLAGS ATTR_CMNEXT_LINKID @@ -1414,29 +1413,18 @@ TCP_NOOPT TCP_NOPUSH THOUSEP THREAD_AFFINITY_POLICY -THREAD_AFFINITY_POLICY_COUNT THREAD_AFFINITY_TAG_NULL THREAD_BACKGROUND_POLICY -THREAD_BACKGROUND_POLICY_COUNT THREAD_BACKGROUND_POLICY_DARWIN_BG THREAD_BASIC_INFO -THREAD_BASIC_INFO_COUNT THREAD_EXTENDED_INFO -THREAD_EXTENDED_INFO_COUNT THREAD_EXTENDED_POLICY -THREAD_EXTENDED_POLICY_COUNT THREAD_IDENTIFIER_INFO -THREAD_IDENTIFIER_INFO_COUNT THREAD_LATENCY_QOS_POLICY -THREAD_LATENCY_QOS_POLICY_COUNT THREAD_PRECEDENCE_POLICY -THREAD_PRECEDENCE_POLICY_COUNT THREAD_STANDARD_POLICY -THREAD_STANDARD_POLICY_COUNT THREAD_THROUGHPUT_QOS_POLICY -THREAD_THROUGHPUT_QOS_POLICY_COUNT THREAD_TIME_CONSTRAINT_POLICY -THREAD_TIME_CONSTRAINT_POLICY_COUNT TH_FLAGS_GLOBAL_FORCED_IDLE TH_FLAGS_IDLE TH_FLAGS_SWAPPED diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt index 3d1c73dca9ef0..a19d19dfe7dd7 100644 --- a/libc-test/semver/linux.txt +++ b/libc-test/semver/linux.txt @@ -1934,7 +1934,6 @@ NFNLGRP_NONE NFNL_MSG_BATCH_BEGIN NFNL_MSG_BATCH_END NFNL_SUBSYS_ACCT -NFNL_SUBSYS_COUNT NFNL_SUBSYS_CTHELPER NFNL_SUBSYS_CTNETLINK NFNL_SUBSYS_CTNETLINK_EXP diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs index 86fba1a2dc58f..26d3b15a08cea 100644 --- a/src/unix/bsd/apple/mod.rs +++ b/src/unix/bsd/apple/mod.rs @@ -3733,7 +3733,6 @@ pub const MNT_NOWAIT: c_int = 2; // pub const THREAD_STANDARD_POLICY: c_int = 1; -pub const THREAD_STANDARD_POLICY_COUNT: c_int = 0; pub const THREAD_EXTENDED_POLICY: c_int = 1; pub const THREAD_TIME_CONSTRAINT_POLICY: c_int = 2; pub const THREAD_PRECEDENCE_POLICY: c_int = 3; @@ -3795,7 +3794,6 @@ pub const VM_PAGE_QUERY_PAGE_CS_NX: i32 = 0x400; // mach/task_info.h pub const TASK_THREAD_TIMES_INFO: u32 = 3; -pub const HOST_CPU_LOAD_INFO_COUNT: u32 = 4; pub const MACH_TASK_BASIC_INFO: u32 = 20; pub const MACH_PORT_NULL: i32 = 0; @@ -3858,7 +3856,6 @@ pub const COPYFILE_STATE_DST_BSIZE: c_int = 12; pub const COPYFILE_STATE_BSIZE: c_int = 13; // -pub const ATTR_BIT_MAP_COUNT: c_ushort = 5; pub const FSOPT_NOFOLLOW: u32 = 0x1; pub const FSOPT_NOFOLLOW_ANY: u32 = 0x800; pub const FSOPT_REPORT_FULLSIZE: u32 = 0x4; @@ -4029,39 +4026,6 @@ const fn __DARWIN_ALIGN32(p: usize) -> usize { (p + __DARWIN_ALIGNBYTES32) & !__DARWIN_ALIGNBYTES32 } -pub const THREAD_EXTENDED_POLICY_COUNT: mach_msg_type_number_t = - (size_of::() / size_of::()) as mach_msg_type_number_t; -pub const THREAD_TIME_CONSTRAINT_POLICY_COUNT: mach_msg_type_number_t = - (size_of::() / size_of::()) - as mach_msg_type_number_t; -pub const THREAD_PRECEDENCE_POLICY_COUNT: mach_msg_type_number_t = - (size_of::() / size_of::()) - as mach_msg_type_number_t; -pub const THREAD_AFFINITY_POLICY_COUNT: mach_msg_type_number_t = - (size_of::() / size_of::()) as mach_msg_type_number_t; -pub const THREAD_BACKGROUND_POLICY_COUNT: mach_msg_type_number_t = - (size_of::() / size_of::()) - as mach_msg_type_number_t; -pub const THREAD_LATENCY_QOS_POLICY_COUNT: mach_msg_type_number_t = - (size_of::() / size_of::()) - as mach_msg_type_number_t; -pub const THREAD_THROUGHPUT_QOS_POLICY_COUNT: mach_msg_type_number_t = - (size_of::() / size_of::()) - as mach_msg_type_number_t; -pub const THREAD_BASIC_INFO_COUNT: mach_msg_type_number_t = - (size_of::() / size_of::()) as mach_msg_type_number_t; -pub const THREAD_IDENTIFIER_INFO_COUNT: mach_msg_type_number_t = - (size_of::() / size_of::()) as mach_msg_type_number_t; -pub const THREAD_EXTENDED_INFO_COUNT: mach_msg_type_number_t = - (size_of::() / size_of::()) as mach_msg_type_number_t; - -pub const TASK_THREAD_TIMES_INFO_COUNT: u32 = - (size_of::() / size_of::()) as u32; -pub const MACH_TASK_BASIC_INFO_COUNT: u32 = - (size_of::() / size_of::()) as u32; -pub const HOST_VM_INFO64_COUNT: mach_msg_type_number_t = - (size_of::() / size_of::()) as mach_msg_type_number_t; - // bsd/net/if_mib.h /// Non-interface-specific pub const IFMIB_SYSTEM: c_int = 1; diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs index 4e3f8a1f4b678..cf215a432b2f7 100644 --- a/src/unix/linux_like/android/mod.rs +++ b/src/unix/linux_like/android/mod.rs @@ -1569,7 +1569,6 @@ pub const NFNL_SUBSYS_CTNETLINK_TIMEOUT: c_int = 8; pub const NFNL_SUBSYS_CTHELPER: c_int = 9; pub const NFNL_SUBSYS_NFTABLES: c_int = 10; pub const NFNL_SUBSYS_NFT_COMPAT: c_int = 11; -pub const NFNL_SUBSYS_COUNT: c_int = 12; pub const NFNL_MSG_BATCH_BEGIN: c_int = NLMSG_MIN_TYPE; pub const NFNL_MSG_BATCH_END: c_int = NLMSG_MIN_TYPE + 1; diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs index 570ede87403a7..414b1cf7df133 100644 --- a/src/unix/linux_like/linux/mod.rs +++ b/src/unix/linux_like/linux/mod.rs @@ -1899,7 +1899,6 @@ pub const NFNL_SUBSYS_CTHELPER: c_int = 9; pub const NFNL_SUBSYS_NFTABLES: c_int = 10; pub const NFNL_SUBSYS_NFT_COMPAT: c_int = 11; pub const NFNL_SUBSYS_HOOK: c_int = 12; -pub const NFNL_SUBSYS_COUNT: c_int = 13; pub const NFNL_MSG_BATCH_BEGIN: c_int = crate::NLMSG_MIN_TYPE; pub const NFNL_MSG_BATCH_END: c_int = crate::NLMSG_MIN_TYPE + 1; diff --git a/src/unix/solarish/illumos.rs b/src/unix/solarish/illumos.rs index b31c31bd1f6c8..57851033c34e8 100644 --- a/src/unix/solarish/illumos.rs +++ b/src/unix/solarish/illumos.rs @@ -186,7 +186,6 @@ pub const PRIV_USER: c_uint = PRIV_DEBUG | PRIV_AWARE_RESET | PRIV_PFEXEC; -pub const LGRP_RSRC_COUNT: crate::lgrp_rsrc_t = 2; pub const LGRP_RSRC_CPU: crate::lgrp_rsrc_t = 0; pub const LGRP_RSRC_MEM: crate::lgrp_rsrc_t = 1;