Skip to content

refactor: remove *COUNT constants fitting #3131 #5149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dybucc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: remove *COUNT constants fitting #3131 #5149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions libc-test/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
});
Expand Down Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion libc-test/semver/android.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions libc-test/semver/apple.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion libc-test/semver/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 0 additions & 36 deletions src/unix/bsd/apple/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3733,7 +3733,6 @@ pub const MNT_NOWAIT: c_int = 2;

// <mach/thread_policy.h>
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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -3858,7 +3856,6 @@ pub const COPYFILE_STATE_DST_BSIZE: c_int = 12;
pub const COPYFILE_STATE_BSIZE: c_int = 13;

// <sys/attr.h>
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;
Expand Down Expand Up @@ -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::<thread_extended_policy_data_t>() / size_of::<integer_t>()) as mach_msg_type_number_t;
pub const THREAD_TIME_CONSTRAINT_POLICY_COUNT: mach_msg_type_number_t =
(size_of::<thread_time_constraint_policy_data_t>() / size_of::<integer_t>())
as mach_msg_type_number_t;
pub const THREAD_PRECEDENCE_POLICY_COUNT: mach_msg_type_number_t =
(size_of::<thread_precedence_policy_data_t>() / size_of::<integer_t>())
as mach_msg_type_number_t;
pub const THREAD_AFFINITY_POLICY_COUNT: mach_msg_type_number_t =
(size_of::<thread_affinity_policy_data_t>() / size_of::<integer_t>()) as mach_msg_type_number_t;
pub const THREAD_BACKGROUND_POLICY_COUNT: mach_msg_type_number_t =
(size_of::<thread_background_policy_data_t>() / size_of::<integer_t>())
as mach_msg_type_number_t;
pub const THREAD_LATENCY_QOS_POLICY_COUNT: mach_msg_type_number_t =
(size_of::<thread_latency_qos_policy_data_t>() / size_of::<integer_t>())
as mach_msg_type_number_t;
pub const THREAD_THROUGHPUT_QOS_POLICY_COUNT: mach_msg_type_number_t =
(size_of::<thread_throughput_qos_policy_data_t>() / size_of::<integer_t>())
as mach_msg_type_number_t;
pub const THREAD_BASIC_INFO_COUNT: mach_msg_type_number_t =
(size_of::<thread_basic_info_data_t>() / size_of::<integer_t>()) as mach_msg_type_number_t;
pub const THREAD_IDENTIFIER_INFO_COUNT: mach_msg_type_number_t =
(size_of::<thread_identifier_info_data_t>() / size_of::<integer_t>()) as mach_msg_type_number_t;
pub const THREAD_EXTENDED_INFO_COUNT: mach_msg_type_number_t =
(size_of::<thread_extended_info_data_t>() / size_of::<integer_t>()) as mach_msg_type_number_t;

pub const TASK_THREAD_TIMES_INFO_COUNT: u32 =
(size_of::<task_thread_times_info_data_t>() / size_of::<natural_t>()) as u32;
pub const MACH_TASK_BASIC_INFO_COUNT: u32 =
(size_of::<mach_task_basic_info_data_t>() / size_of::<natural_t>()) as u32;
pub const HOST_VM_INFO64_COUNT: mach_msg_type_number_t =
(size_of::<vm_statistics64_data_t>() / size_of::<integer_t>()) as mach_msg_type_number_t;

// bsd/net/if_mib.h
/// Non-interface-specific
pub const IFMIB_SYSTEM: c_int = 1;
Expand Down
1 change: 0 additions & 1 deletion src/unix/linux_like/android/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/unix/linux_like/linux/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/unix/solarish/illumos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down