Skip to content

Commit 89d2bbf

Browse files
lvllvltgross35
authored andcommitted
chore: add labels to FIXMEs
(backport <rust-lang#4235>) (cherry picked from commit d1d9c2b)
1 parent 80adb61 commit 89d2bbf

File tree

1 file changed

+49
-49
lines changed

1 file changed

+49
-49
lines changed

libc-test/build.rs

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2662,8 +2662,8 @@ fn test_freebsd(target: &str) {
26622662

26632663
// These constants may change or disappear in future OS releases, and they probably
26642664
// have no legitimate use in applications anyway.
2665-
"CAP_UNUSED0_44" | "CAP_UNUSED0_57" | "CAP_UNUSED1_22" | "CAP_UNUSED1_57" |
2666-
"CAP_ALL0" | "CAP_ALL1" => true,
2665+
"CAP_UNUSED0_44" | "CAP_UNUSED0_57" | "CAP_UNUSED1_22" | "CAP_UNUSED1_57"
2666+
| "CAP_ALL0" | "CAP_ALL1" => true,
26672667

26682668
_ => false,
26692669
}
@@ -3036,11 +3036,11 @@ fn test_emscripten(target: &str) {
30363036

30373037
cfg.skip_const(move |name| {
30383038
match name {
3039-
// FIXME: deprecated - SIGNUNUSED was removed in glibc 2.26
3039+
// FIXME(deprecated): deprecated - SIGNUNUSED was removed in glibc 2.26
30403040
// users should use SIGSYS instead
30413041
"SIGUNUSED" => true,
30423042

3043-
// FIXME: emscripten uses different constants to constructs these
3043+
// FIXME(emscripten): emscripten uses different constants to constructs these
30443044
n if n.contains("__SIZEOF_PTHREAD") => true,
30453045

30463046
// No epoll support
@@ -3097,7 +3097,7 @@ fn test_emscripten(target: &str) {
30973097
(struct_ == "siginfo_t" && field == "_pad") ||
30983098
// musl names this __dummy1 but it's still there
30993099
(struct_ == "glob_t" && field == "gl_flags") ||
3100-
// FIXME: After musl 1.1.24, it have only one field `sched_priority`,
3100+
// FIXME(emscripten): After musl 1.1.24, it have only one field `sched_priority`,
31013101
// while other fields become reserved.
31023102
(struct_ == "sched_param" && [
31033103
"sched_ss_low_priority",
@@ -3264,7 +3264,7 @@ fn test_neutrino(target: &str) {
32643264

32653265
cfg.skip_type(move |ty| {
32663266
match ty {
3267-
// FIXME: `sighandler_t` type is incorrect, see:
3267+
// FIXME(sighandler): `sighandler_t` type is incorrect, see:
32683268
// https://github.com/rust-lang/libc/issues/1359
32693269
"sighandler_t" => true,
32703270

@@ -3282,7 +3282,7 @@ fn test_neutrino(target: &str) {
32823282
match ty {
32833283
"Elf64_Phdr" | "Elf32_Phdr" => true,
32843284

3285-
// FIXME: This is actually a union, not a struct
3285+
// FIXME(union): This is actually a union, not a struct
32863286
"sigval" => true,
32873287

32883288
// union
@@ -3316,7 +3316,7 @@ fn test_neutrino(target: &str) {
33163316
// wrong signature of callback ptr
33173317
"__cxa_atexit" => true,
33183318

3319-
// FIXME: Our API is unsound. The Rust API allows aliasing
3319+
// FIXME(ctest): Our API is unsound. The Rust API allows aliasing
33203320
// pointers, but the C API requires pointers not to alias.
33213321
// We should probably be at least using `&`/`&mut` here, see:
33223322
// https://github.com/gnzlbg/ctest/issues/68
@@ -3426,15 +3426,15 @@ fn test_vxworks(target: &str) {
34263426
"pathLib.h",
34273427
"mqueue.h",
34283428
}
3429-
// FIXME
3429+
// FIXME(vxworks)
34303430
cfg.skip_const(move |name| match name {
34313431
// sighandler_t weirdness
34323432
"SIG_DFL" | "SIG_ERR" | "SIG_IGN"
34333433
// This is not defined in vxWorks
34343434
| "RTLD_DEFAULT" => true,
34353435
_ => false,
34363436
});
3437-
// FIXME
3437+
// FIXME(vxworks)
34383438
cfg.skip_type(move |ty| match ty {
34393439
"stat64" | "sighandler_t" | "off64_t" => true,
34403440
_ => false,
@@ -3457,7 +3457,7 @@ fn test_vxworks(target: &str) {
34573457
t => t.to_string(),
34583458
});
34593459

3460-
// FIXME
3460+
// FIXME(vxworks)
34613461
cfg.skip_fn(move |name| match name {
34623462
// sigval
34633463
"sigqueue" | "_sigqueue"
@@ -3670,7 +3670,7 @@ fn test_linux(target: &str) {
36703670
"linux/netfilter_ipv6/ip6_tables.h",
36713671
"linux/netlink.h",
36723672
"linux/openat2.h",
3673-
// FIXME: some items require Linux >= 5.6:
3673+
// FIXME(linux): some items require Linux >= 5.6:
36743674
"linux/ptp_clock.h",
36753675
"linux/ptrace.h",
36763676
"linux/quota.h",
@@ -3733,7 +3733,7 @@ fn test_linux(target: &str) {
37333733
s if s.ends_with("_nsec") && struct_.starts_with("stat") => {
37343734
s.replace("e_nsec", ".tv_nsec")
37353735
}
3736-
// FIXME: epoll_event.data is actually a union in C, but in Rust
3736+
// FIXME(linux): epoll_event.data is actually a union in C, but in Rust
37373737
// it is only a u64 because we only expose one field
37383738
// http://man7.org/linux/man-pages/man2/epoll_wait.2.html
37393739
"u64" if struct_ == "epoll_event" => "data.u64".to_string(),
@@ -3753,7 +3753,7 @@ fn test_linux(target: &str) {
37533753
});
37543754

37553755
cfg.skip_type(move |ty| {
3756-
// FIXME: very recent additions to musl, not yet released.
3756+
// FIXME(musl): very recent additions to musl, not yet released.
37573757
// also apparently some glibc versions
37583758
if ty == "Elf32_Relr" || ty == "Elf64_Relr" {
37593759
return true;
@@ -3762,7 +3762,7 @@ fn test_linux(target: &str) {
37623762
return true;
37633763
}
37643764
match ty {
3765-
// FIXME: `sighandler_t` type is incorrect, see:
3765+
// FIXME(sighandler): `sighandler_t` type is incorrect, see:
37663766
// https://github.com/rust-lang/libc/issues/1359
37673767
"sighandler_t" => true,
37683768

@@ -3800,7 +3800,7 @@ fn test_linux(target: &str) {
38003800
return true;
38013801
}
38023802

3803-
// FIXME: CI has old headers
3803+
// FIXME(linux): CI has old headers
38043804
if ty == "ptp_sys_offset_extended" {
38053805
return true;
38063806
}
@@ -3810,7 +3810,7 @@ fn test_linux(target: &str) {
38103810
return true;
38113811
}
38123812

3813-
// FIXME: sparc64 CI has old headers
3813+
// FIXME(linux): sparc64 CI has old headers
38143814
if sparc64 && (ty == "uinput_ff_erase" || ty == "uinput_abs_setup") {
38153815
return true;
38163816
}
@@ -3833,7 +3833,7 @@ fn test_linux(target: &str) {
38333833
return true;
38343834
}
38353835

3836-
// FIXME: musl doesn't compile with `struct fanout_args` for unknown reasons.
3836+
// FIXME(musl): musl doesn't compile with `struct fanout_args` for unknown reasons.
38373837
if musl && ty == "fanout_args" {
38383838
return true;
38393839
}
@@ -3851,21 +3851,21 @@ fn test_linux(target: &str) {
38513851
// which is absent in glibc, has to be defined.
38523852
"__timeval" => true,
38533853

3854-
// FIXME: This is actually a union, not a struct
3854+
// FIXME(union): This is actually a union, not a struct
38553855
"sigval" => true,
38563856

38573857
// This type is tested in the `linux_termios.rs` file since there
38583858
// are header conflicts when including them with all the other
38593859
// structs.
38603860
"termios2" => true,
38613861

3862-
// FIXME: remove once we set minimum supported glibc version.
3862+
// FIXME(linux): remove once we set minimum supported glibc version.
38633863
// ucontext_t added a new field as of glibc 2.28; our struct definition is
38643864
// conservative and omits the field, but that means the size doesn't match for newer
38653865
// glibcs (see https://github.com/rust-lang/libc/issues/1410)
38663866
"ucontext_t" if gnu => true,
38673867

3868-
// FIXME: Somehow we cannot include headers correctly in glibc 2.30.
3868+
// FIXME(linux): Somehow we cannot include headers correctly in glibc 2.30.
38693869
// So let's ignore for now and re-visit later.
38703870
// Probably related: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085
38713871
"statx" => true,
@@ -3885,49 +3885,49 @@ fn test_linux(target: &str) {
38853885
"sctp_initmsg" | "sctp_sndrcvinfo" | "sctp_sndinfo" | "sctp_rcvinfo"
38863886
| "sctp_nxtinfo" | "sctp_prinfo" | "sctp_authinfo" => true,
38873887

3888-
// FIXME: requires >= 6.1 kernel headers
3888+
// FIXME(linux): requires >= 6.1 kernel headers
38893889
"canxl_frame" => true,
38903890

3891-
// FIXME: The size of `iv` has been changed since Linux v6.0
3891+
// FIXME(linux): The size of `iv` has been changed since Linux v6.0
38923892
// https://github.com/torvalds/linux/commit/94dfc73e7cf4a31da66b8843f0b9283ddd6b8381
38933893
"af_alg_iv" => true,
38943894

3895-
// FIXME: Requires >= 5.1 kernel headers.
3895+
// FIXME(linux): Requires >= 5.1 kernel headers.
38963896
// Everything that uses install-musl.sh has 4.19 kernel headers.
38973897
"tls12_crypto_info_aes_gcm_256"
38983898
if (aarch64 || arm || i686 || s390x || x86_64) && musl =>
38993899
{
39003900
true
39013901
}
39023902

3903-
// FIXME: Requires >= 5.11 kernel headers.
3903+
// FIXME(linux): Requires >= 5.11 kernel headers.
39043904
// Everything that uses install-musl.sh has 4.19 kernel headers.
39053905
"tls12_crypto_info_chacha20_poly1305"
39063906
if (aarch64 || arm || i686 || s390x || x86_64) && musl =>
39073907
{
39083908
true
39093909
}
39103910

3911-
// FIXME: Requires >= 5.3 kernel headers.
3911+
// FIXME(linux): Requires >= 5.3 kernel headers.
39123912
// Everything that uses install-musl.sh has 4.19 kernel headers.
39133913
"xdp_options" if musl => true,
39143914

3915-
// FIXME: Requires >= 5.4 kernel headers.
3915+
// FIXME(linux): Requires >= 5.4 kernel headers.
39163916
// Everything that uses install-musl.sh has 4.19 kernel headers.
39173917
"xdp_ring_offset" | "xdp_mmap_offsets" if musl => true,
39183918

3919-
// FIXME: Requires >= 6.8 kernel headers.
3919+
// FIXME(linux): Requires >= 6.8 kernel headers.
39203920
// A field was added in 6.8.
39213921
// https://github.com/torvalds/linux/commit/341ac980eab90ac1f6c22ee9f9da83ed9604d899
39223922
// The previous version of the struct was removed in 6.11 due to a bug.
39233923
// https://github.com/torvalds/linux/commit/32654bbd6313b4cfc82297e6634fa9725c3c900f
39243924
"xdp_umem_reg" => true,
39253925

3926-
// FIXME: Requires >= 5.9 kernel headers.
3926+
// FIXME(linux): Requires >= 5.9 kernel headers.
39273927
// Everything that uses install-musl.sh has 4.19 kernel headers.
39283928
"xdp_statistics" if musl => true,
39293929

3930-
// FIXME: Requires >= 6.8 kernel headers.
3930+
// FIXME(linux): Requires >= 6.8 kernel headers.
39313931
"xsk_tx_metadata"
39323932
| "__c_anonymous_xsk_tx_metadata_union"
39333933
| "xsk_tx_metadata_request"
@@ -3951,7 +3951,7 @@ fn test_linux(target: &str) {
39513951
// kernel so we can drop this and test the type once this new version is used in CI.
39523952
"sched_attr" => true,
39533953

3954-
// FIXME: Requires >= 6.9 kernel headers.
3954+
// FIXME(linux): Requires >= 6.9 kernel headers.
39553955
"epoll_params" => true,
39563956

39573957
_ => false,
@@ -3996,7 +3996,7 @@ fn test_linux(target: &str) {
39963996
}
39973997
}
39983998
if musl {
3999-
// FIXME: Requires >= 5.0 kernel headers
3999+
// FIXME(linux): Requires >= 5.0 kernel headers
40004000
if name == "SECCOMP_GET_NOTIF_SIZES"
40014001
|| name == "SECCOMP_FILTER_FLAG_NEW_LISTENER"
40024002
|| name == "SECCOMP_FILTER_FLAG_TSYNC_ESRCH"
@@ -4007,11 +4007,11 @@ fn test_linux(target: &str) {
40074007
{
40084008
return true;
40094009
}
4010-
// FIXME: Requires >= 4.20 kernel headers
4010+
// FIXME(linux): Requires >= 4.20 kernel headers
40114011
if name == "PTP_SYS_OFFSET_EXTENDED" {
40124012
return true;
40134013
}
4014-
// FIXME: Requires >= 5.4 kernel headers
4014+
// FIXME(linux): Requires >= 5.4 kernel headers
40154015
if name == "PTP_CLOCK_GETCAPS2"
40164016
|| name == "PTP_ENABLE_PPS2"
40174017
|| name == "PTP_EXTTS_REQUEST2"
@@ -4024,15 +4024,15 @@ fn test_linux(target: &str) {
40244024
{
40254025
return true;
40264026
}
4027-
// FIXME: Requires >= 5.4.1 kernel headers
4027+
// FIXME(linux): Requires >= 5.4.1 kernel headers
40284028
if name.starts_with("J1939")
40294029
|| name.starts_with("RTEXT_FILTER_")
40304030
|| name.starts_with("SO_J1939")
40314031
|| name.starts_with("SCM_J1939")
40324032
{
40334033
return true;
40344034
}
4035-
// FIXME: Requires >= 5.10 kernel headers
4035+
// FIXME(linux): Requires >= 5.10 kernel headers
40364036
if name.starts_with("MEMBARRIER_CMD_REGISTER")
40374037
|| name.starts_with("MEMBARRIER_CMD_PRIVATE")
40384038
{
@@ -4073,15 +4073,15 @@ fn test_linux(target: &str) {
40734073
// because including `linux/if_arp.h` causes some conflicts:
40744074
"ARPHRD_CAN" => true,
40754075

4076-
// FIXME: deprecated: not available in any header
4076+
// FIXME(deprecated): deprecated: not available in any header
40774077
// See: https://github.com/rust-lang/libc/issues/1356
40784078
"ENOATTR" => true,
40794079

4080-
// FIXME: SIGUNUSED was removed in glibc 2.26
4080+
// FIXME(deprecated): SIGUNUSED was removed in glibc 2.26
40814081
// Users should use SIGSYS instead.
40824082
"SIGUNUSED" => true,
40834083

4084-
// FIXME: conflicts with glibc headers and is tested in
4084+
// FIXME(linux): conflicts with glibc headers and is tested in
40854085
// `linux_termios.rs` below:
40864086
| "BOTHER"
40874087
| "IBSHIFT"
@@ -4090,11 +4090,11 @@ fn test_linux(target: &str) {
40904090
| "TCSETSW2"
40914091
| "TCSETSF2" => true,
40924092

4093-
// FIXME: on musl the pthread types are defined a little differently
4093+
// FIXME(musl): on musl the pthread types are defined a little differently
40944094
// - these constants are used by the glibc implementation.
40954095
n if musl && n.contains("__SIZEOF_PTHREAD") => true,
40964096

4097-
// FIXME: It was extended to 4096 since glibc 2.31 (Linux 5.4).
4097+
// FIXME(linux): It was extended to 4096 since glibc 2.31 (Linux 5.4).
40984098
// We should do so after a while.
40994099
"SOMAXCONN" if gnu => true,
41004100

@@ -4106,37 +4106,37 @@ fn test_linux(target: &str) {
41064106
| "IPPROTO_ETHERNET"
41074107
| "IPPROTO_MPTCP" => true,
41084108

4109-
// FIXME: Not yet implemented on sparc64
4109+
// FIXME(linux): Not yet implemented on sparc64
41104110
"SYS_clone3" if sparc64 => true,
41114111

4112-
// FIXME: Not defined on ARM, gnueabihf, musl, PowerPC, riscv64, s390x, and sparc64.
4112+
// FIXME(linux): Not defined on ARM, gnueabihf, musl, PowerPC, riscv64, s390x, and sparc64.
41134113
"SYS_memfd_secret" if arm | gnueabihf | musl | ppc | riscv64 | s390x | sparc64 => true,
41144114

4115-
// FIXME: Added in Linux 5.16
4115+
// FIXME(linux): Added in Linux 5.16
41164116
// https://github.com/torvalds/linux/commit/039c0ec9bb77446d7ada7f55f90af9299b28ca49
41174117
"SYS_futex_waitv" => true,
41184118

4119-
// FIXME: Added in Linux 5.17
4119+
// FIXME(linux): Added in Linux 5.17
41204120
// https://github.com/torvalds/linux/commit/c6018b4b254971863bd0ad36bb5e7d0fa0f0ddb0
41214121
"SYS_set_mempolicy_home_node" => true,
41224122

4123-
// FIXME: Added in Linux 5.18
4123+
// FIXME(linux): Added in Linux 5.18
41244124
// https://github.com/torvalds/linux/commit/8b5413647262dda8d8d0e07e14ea1de9ac7cf0b2
41254125
"NFQA_PRIORITY" => true,
41264126

4127-
// FIXME: requires more recent kernel headers on CI
4127+
// FIXME(linux): requires more recent kernel headers on CI
41284128
| "UINPUT_VERSION"
41294129
| "SW_MAX"
41304130
| "SW_CNT"
41314131
if ppc64 || riscv64 => true,
41324132

4133-
// FIXME: requires more recent kernel headers on CI
4133+
// FIXME(linux): requires more recent kernel headers on CI
41344134
| "MFD_EXEC"
41354135
| "MFD_NOEXEC_SEAL"
41364136
| "SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV"
41374137
if sparc64 => true,
41384138

4139-
// FIXME: Not currently available in headers on ARM and musl.
4139+
// FIXME(linux): Not currently available in headers on ARM and musl.
41404140
"NETLINK_GET_STRICT_CHK" if arm => true,
41414141

41424142
// Skip as this signal codes and trap reasons need newer headers

0 commit comments

Comments
 (0)