Skip to content

Commit 00ffd42

Browse files
committed
refactor: remove *MAX constants fitting #3131
This follows from #5118, where all these symbols were deprecated. @JohnTitor then advised for their removal in a separate PR that was not on track to a stable release. There have been a few more symbols that had to be altogether removed because they relied on the now non-existent constants. See the accompanying PR for details.
1 parent 38c6231 commit 00ffd42

45 files changed

Lines changed: 3 additions & 731 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

libc-test/build.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5192,7 +5192,7 @@ fn test_haiku(target: &str) {
51925192
"dirent" => true,
51935193
// The following structs contain function pointers, which cannot be initialized
51945194
// with mem::zeroed(), so skip the automated test
5195-
"image_info" | "thread_info" => true,
5195+
"thread_info" => true,
51965196

51975197
"Elf64_Phdr" => true,
51985198

@@ -5292,7 +5292,6 @@ fn test_haiku(target: &str) {
52925292

52935293
// skip these enum-type fields
52945294
("thread_info", "state") => true,
5295-
("image_info", "image_type") => true,
52965295
_ => false,
52975296
}
52985297
});
@@ -5323,7 +5322,6 @@ fn test_haiku(target: &str) {
53235322
| "cpu_info"
53245323
| "system_info"
53255324
| "object_wait_info"
5326-
| "image_info"
53275325
| "attr_info"
53285326
| "index_info"
53295327
| "fs_info"
@@ -5351,7 +5349,6 @@ fn test_haiku(target: &str) {
53515349
"type_" if struct_ == "attr_info" => Some("type".to_string()),
53525350
"type_" if struct_ == "index_info" => Some("type".to_string()),
53535351
"type_" if struct_ == "cpu_topology_node_info" => Some("type".to_string()),
5354-
"image_type" if struct_ == "image_info" => Some("type".to_string()),
53555352
_ => None,
53565353
}
53575354
});

libc-test/semver/aix.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1139,7 +1139,6 @@ RTAX_GATEWAY
11391139
RTAX_GENMASK
11401140
RTAX_IFA
11411141
RTAX_IFP
1142-
RTAX_MAX
11431142
RTAX_NETMASK
11441143
RTA_AUTHOR
11451144
RTA_BRD

libc-test/semver/android.txt

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
ABS_CNT
2-
ABS_MAX
31
ADDR_COMPAT_LAYOUT
42
ADDR_LIMIT_32BIT
53
ADDR_LIMIT_3GB
@@ -581,8 +579,6 @@ ETXTBSY
581579
EUCLEAN
582580
EUNATCH
583581
EUSERS
584-
EV_CNT
585-
EV_MAX
586582
EWOULDBLOCK
587583
EXDEV
588584
EXFULL
@@ -612,8 +608,6 @@ FD_ZERO
612608
FF0
613609
FF1
614610
FFDLY
615-
FF_CNT
616-
FF_MAX
617611
FICLONE
618612
FICLONERANGE
619613
FILE
@@ -839,8 +833,6 @@ INADDR_LOOPBACK
839833
INADDR_NONE
840834
INLCR
841835
INPCK
842-
INPUT_PROP_CNT
843-
INPUT_PROP_MAX
844836
INT_MAX
845837
INT_MIN
846838
IN_ACCESS
@@ -1085,8 +1077,6 @@ KEXEC_FILE_ON_CRASH
10851077
KEXEC_FILE_UNLOAD
10861078
KEXEC_ON_CRASH
10871079
KEXEC_PRESERVE_CONTEXT
1088-
KEY_CNT
1089-
KEY_MAX
10901080
KLOG_CLEAR
10911081
KLOG_CLOSE
10921082
KLOG_CONSOLE_LEVEL
@@ -1124,8 +1114,6 @@ LC_TELEPHONE
11241114
LC_TELEPHONE_MASK
11251115
LC_TIME
11261116
LC_TIME_MASK
1127-
LED_CNT
1128-
LED_MAX
11291117
LINUX_REBOOT_CMD_CAD_OFF
11301118
LINUX_REBOOT_CMD_CAD_ON
11311119
LINUX_REBOOT_CMD_HALT
@@ -1263,8 +1251,6 @@ MPOL_F_STATIC_NODES
12631251
MPOL_INTERLEAVE
12641252
MPOL_LOCAL
12651253
MPOL_PREFERRED
1266-
MSC_CNT
1267-
MSC_MAX
12681254
MSDOS_SUPER_MAGIC
12691255
MSG_CMSG_CLOEXEC
12701256
MSG_CONFIRM
@@ -1443,7 +1429,6 @@ NFQA_CFG_FLAGS
14431429
NFQA_CFG_F_CONNTRACK
14441430
NFQA_CFG_F_FAIL_OPEN
14451431
NFQA_CFG_F_GSO
1446-
NFQA_CFG_F_MAX
14471432
NFQA_CFG_F_SECCTX
14481433
NFQA_CFG_F_UID_GID
14491434
NFQA_CFG_MASK
@@ -1571,7 +1556,6 @@ NFT_MSG_GETRULE
15711556
NFT_MSG_GETSET
15721557
NFT_MSG_GETSETELEM
15731558
NFT_MSG_GETTABLE
1574-
NFT_MSG_MAX
15751559
NFT_MSG_NEWCHAIN
15761560
NFT_MSG_NEWGEN
15771561
NFT_MSG_NEWOBJ
@@ -1861,7 +1845,6 @@ O_WRONLY
18611845
PARENB
18621846
PARMRK
18631847
PARODD
1864-
PATH_MAX
18651848
PENDIN
18661849
PF_ALG
18671850
PF_APPLETALK
@@ -2030,7 +2013,6 @@ PR_RISCV_V_VSTATE_CTRL_ON
20302013
PR_SCHED_CORE
20312014
PR_SCHED_CORE_CREATE
20322015
PR_SCHED_CORE_GET
2033-
PR_SCHED_CORE_MAX
20342016
PR_SCHED_CORE_SCOPE_PROCESS_GROUP
20352017
PR_SCHED_CORE_SCOPE_THREAD
20362018
PR_SCHED_CORE_SCOPE_THREAD_GROUP
@@ -2231,13 +2213,9 @@ REG_PEND
22312213
REG_STARTEND
22322214
REG_TRACE
22332215
REISERFS_SUPER_MAGIC
2234-
REL_CNT
2235-
REL_MAX
22362216
RENAME_EXCHANGE
22372217
RENAME_NOREPLACE
22382218
RENAME_WHITEOUT
2239-
REP_CNT
2240-
REP_MAX
22412219
RLIMIT_AS
22422220
RLIMIT_CORE
22432221
RLIMIT_CPU
@@ -2545,8 +2523,6 @@ SIOCWANDEV
25452523
SIOGIFINDEX
25462524
SI_LOAD_SHIFT
25472525
SMB_SUPER_MAGIC
2548-
SND_CNT
2549-
SND_MAX
25502526
SOCK_CLOEXEC
25512527
SOCK_DCCP
25522528
SOCK_DGRAM
@@ -2663,10 +2639,6 @@ ST_NOSUID
26632639
ST_RDONLY
26642640
ST_RELATIME
26652641
ST_SYNCHRONOUS
2666-
SW_CNT
2667-
SW_MAX
2668-
SYN_CNT
2669-
SYN_MAX
26702642
SYSCALL_DISPATCH_FILTER_ALLOW
26712643
SYSCALL_DISPATCH_FILTER_BLOCK
26722644
SYS_accept4
@@ -3331,7 +3303,6 @@ _SC_XOPEN_VERSION
33313303
_SC_XOPEN_XCU_VERSION
33323304
__CPU_BITS
33333305
__CPU_BITTYPE
3334-
__NFT_REG_MAX
33353306
__WALL
33363307
__WCLONE
33373308
__WNOTHREAD
@@ -4114,7 +4085,6 @@ uinput_abs_setup
41144085
uinput_ff_erase
41154086
uinput_ff_upload
41164087
uinput_setup
4117-
uinput_user_dev
41184088
uint16_t
41194089
uint32_t
41204090
uint64_t

libc-test/semver/apple.txt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,7 +1237,6 @@ RTAX_GATEWAY
12371237
RTAX_GENMASK
12381238
RTAX_IFA
12391239
RTAX_IFP
1240-
RTAX_MAX
12411240
RTAX_NETMASK
12421241
RTA_AUTHOR
12431242
RTA_BRD
@@ -1529,14 +1528,7 @@ UF_NODUMP
15291528
UF_OPAQUE
15301529
UF_SETTABLE
15311530
UF_TRACKED
1532-
USER_BC_BASE_MAX
1533-
USER_BC_DIM_MAX
1534-
USER_BC_SCALE_MAX
1535-
USER_BC_STRING_MAX
1536-
USER_COLL_WEIGHTS_MAX
15371531
USER_CS_PATH
1538-
USER_EXPR_NEST_MAX
1539-
USER_LINE_MAX
15401532
USER_MAXID
15411533
USER_POSIX2_CHAR_TERM
15421534
USER_POSIX2_C_BIND
@@ -1548,7 +1540,6 @@ USER_POSIX2_SW_DEV
15481540
USER_POSIX2_UPE
15491541
USER_POSIX2_VERSION
15501542
USER_PROCESS
1551-
USER_RE_DUP_MAX
15521543
USER_STREAM_MAX
15531544
USER_TZNAME_MAX
15541545
UTIME_NOW
@@ -1925,9 +1916,6 @@ getxattr
19251916
glob
19261917
glob_t
19271918
globfree
1928-
host_cpu_load_info
1929-
host_cpu_load_info_data_t
1930-
host_cpu_load_info_t
19311919
icmp6_ifstat
19321920
iconv_t
19331921
id_t

libc-test/semver/cygwin.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,6 @@ MSG_BCAST
281281
MSG_CMSG_CLOEXEC
282282
MSG_DONTWAIT
283283
MSG_MCAST
284-
NGROUPS_MAX
285284
NI_DGRAM
286285
NI_MAXSERV
287286
NI_NAMEREQD

libc-test/semver/dragonfly.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,6 @@ RLIMIT_STACK
882882
RLIMIT_VMEM
883883
RLIM_INFINITY
884884
RLIM_NLIMITS
885-
RTAX_MAX
886885
RTAX_MPLS1
887886
RTAX_MPLS2
888887
RTAX_MPLS3
@@ -1087,14 +1086,7 @@ UF_NOUNLINK
10871086
UF_OPAQUE
10881087
UF_SETTABLE
10891088
UF_XLINK
1090-
USER_BC_BASE_MAX
1091-
USER_BC_DIM_MAX
1092-
USER_BC_SCALE_MAX
1093-
USER_BC_STRING_MAX
1094-
USER_COLL_WEIGHTS_MAX
10951089
USER_CS_PATH
1096-
USER_EXPR_NEST_MAX
1097-
USER_LINE_MAX
10981090
USER_MAXID
10991091
USER_POSIX2_CHAR_TERM
11001092
USER_POSIX2_C_BIND
@@ -1106,7 +1098,6 @@ USER_POSIX2_SW_DEV
11061098
USER_POSIX2_UPE
11071099
USER_POSIX2_VERSION
11081100
USER_PROCESS
1109-
USER_RE_DUP_MAX
11101101
USER_STREAM_MAX
11111102
USER_TZNAME_MAX
11121103
UTIME_NOW

libc-test/semver/freebsd.txt

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,7 +1221,6 @@ RLIMIT_UMTXP
12211221
RLIMIT_VMEM
12221222
RLIM_INFINITY
12231223
RLIM_NLIMITS
1224-
RTAX_MAX
12251224
RTF_BROADCAST
12261225
RTF_FIXEDMTU
12271226
RTF_LLDATA
@@ -1285,7 +1284,6 @@ SCTP_ASSOC_RESET_FAILED
12851284
SCTP_ASSOC_SUPPORTS_ASCONF
12861285
SCTP_ASSOC_SUPPORTS_AUTH
12871286
SCTP_ASSOC_SUPPORTS_INTERLEAVING
1288-
SCTP_ASSOC_SUPPORTS_MAX
12891287
SCTP_ASSOC_SUPPORTS_MULTIBUF
12901288
SCTP_ASSOC_SUPPORTS_PR
12911289
SCTP_ASSOC_SUPPORTS_RE_CONFIG
@@ -1359,7 +1357,6 @@ SCTP_PRINFO
13591357
SCTP_PR_ASSOC_STATUS
13601358
SCTP_PR_SCTP_ALL
13611359
SCTP_PR_SCTP_BUF
1362-
SCTP_PR_SCTP_MAX
13631360
SCTP_PR_SCTP_NONE
13641361
SCTP_PR_SCTP_PRIO
13651362
SCTP_PR_SCTP_RTX
@@ -1465,7 +1462,6 @@ SO_SPLICE
14651462
SO_TIMESTAMP
14661463
SO_TS_BINTIME
14671464
SO_TS_CLOCK
1468-
SO_TS_CLOCK_MAX
14691465
SO_TS_DEFAULT
14701466
SO_TS_MONOTONIC
14711467
SO_TS_REALTIME
@@ -1539,7 +1535,6 @@ TCP_FASTOPEN_PSK_LEN
15391535
TCP_FIN_IS_RST
15401536
TCP_FUNCTION_ALIAS
15411537
TCP_FUNCTION_BLK
1542-
TCP_FUNCTION_NAME_LEN_MAX
15431538
TCP_IDLE_REDUCE
15441539
TCP_INFO
15451540
TCP_KEEPCNT
@@ -1676,14 +1671,7 @@ UMTX_OP_WAIT_UINT
16761671
UMTX_OP_WAIT_UINT_PRIVATE
16771672
UMTX_OP_WAKE
16781673
UMTX_OP_WAKE_PRIVATE
1679-
USER_BC_BASE_MAX
1680-
USER_BC_DIM_MAX
1681-
USER_BC_SCALE_MAX
1682-
USER_BC_STRING_MAX
1683-
USER_COLL_WEIGHTS_MAX
16841674
USER_CS_PATH
1685-
USER_EXPR_NEST_MAX
1686-
USER_LINE_MAX
16871675
USER_POSIX2_CHAR_TERM
16881676
USER_POSIX2_C_BIND
16891677
USER_POSIX2_C_DEV
@@ -1694,7 +1682,6 @@ USER_POSIX2_SW_DEV
16941682
USER_POSIX2_UPE
16951683
USER_POSIX2_VERSION
16961684
USER_PROCESS
1697-
USER_RE_DUP_MAX
16981685
USER_STREAM_MAX
16991686
USER_TZNAME_MAX
17001687
UTIME_NOW
@@ -2057,10 +2044,7 @@ kcmp
20572044
kevent
20582045
key_t
20592046
killpg
2060-
kinfo_file
2061-
kinfo_getvmmap
20622047
kinfo_proc
2063-
kinfo_vmentry
20642048
kld_isloaded
20652049
kld_load
20662050
kqueue
@@ -2180,10 +2164,8 @@ procstat
21802164
procstat_close
21812165
procstat_freefiles
21822166
procstat_freeprocs
2183-
procstat_freevmmap
21842167
procstat_getfiles
21852168
procstat_getprocs
2186-
procstat_getvmmap
21872169
procstat_open_sysctl
21882170
pseudo_AF_HDRCMPLT
21892171
pseudo_AF_KEY
@@ -2398,7 +2380,6 @@ sysctl
23982380
sysctlbyname
23992381
sysctlnametomib
24002382
tcp_fastopen
2401-
tcp_function_set
24022383
tcp_info
24032384
telldir
24042385
thr_kill

libc-test/semver/l4re.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,7 +1269,6 @@ PR_MPX_ENABLE_MANAGEMENT
12691269
PR_SCHED_CORE
12701270
PR_SCHED_CORE_CREATE
12711271
PR_SCHED_CORE_GET
1272-
PR_SCHED_CORE_MAX
12731272
PR_SCHED_CORE_SCOPE_PROCESS_GROUP
12741273
PR_SCHED_CORE_SCOPE_THREAD
12751274
PR_SCHED_CORE_SCOPE_THREAD_GROUP
@@ -1448,7 +1447,6 @@ RT_ADDRCLASS
14481447
RT_CLASS_DEFAULT
14491448
RT_CLASS_LOCAL
14501449
RT_CLASS_MAIN
1451-
RT_CLASS_MAX
14521450
RT_CLASS_UNSPEC
14531451
RT_LOCALADDR
14541452
RT_TOS
@@ -2300,7 +2298,7 @@ mntent
23002298
mode_t
23012299
mount
23022300
mprotect
2303-
msghdr
2301+
msghdr
23042302
msync
23052303
munlock
23062304
munlockall

libc-test/semver/linux-aarch64.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ SKF_AD_ALU_XOR_X
5858
SKF_AD_CPU
5959
SKF_AD_HATYPE
6060
SKF_AD_MARK
61-
SKF_AD_MAX
6261
SKF_AD_NLATTR
6362
SKF_AD_NLATTR_NEST
6463
SKF_AD_OFF

0 commit comments

Comments
 (0)