Skip to content

Commit 51658d2

Browse files
nyuriknyurik
committed
chore: lint libc-test/build.rs
run `cargo clippy --all-targets` on `libc-test/build.rs`, and fix all default issues. ### Notes * `copy_dir_hotfix` had a `replace` parameter that was never used
1 parent 0fe1d45 commit 51658d2

File tree

3 files changed

+83
-123
lines changed

3 files changed

+83
-123
lines changed

‎libc-test/Cargo.toml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,18 +108,7 @@ harness = true
108108

109109
[lints.rust]
110110
# FIXME(cleanup): make ident usage consistent in each file
111+
# Switching this to "warn" causes issues with generated code
111112
unused_qualifications = "allow"
112113

113114
[lints.clippy]
114-
# FIXME(clippy): fix these
115-
needless_return = "allow"
116-
comparison_to_empty = "allow"
117-
unused_io_amount = "allow"
118-
write_with_newline = "allow"
119-
needless_borrows_for_generic_args = "allow"
120-
only_used_in_recursion = "allow"
121-
match_like_matches_macro = "allow"
122-
useless_format = "allow"
123-
wildcard_in_or_patterns = "allow"
124-
nonminimal_bool = "allow"
125-
match_single_binding = "allow"

‎libc-test/build.rs

Lines changed: 79 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,23 @@ fn do_cc() {
5050

5151
fn do_ctest() {
5252
match &env::var("TARGET").unwrap() {
53-
t if t.contains("android") => return test_android(t),
54-
t if t.contains("apple") => return test_apple(t),
55-
t if t.contains("dragonfly") => return test_dragonflybsd(t),
56-
t if t.contains("emscripten") => return test_emscripten(t),
57-
t if t.contains("freebsd") => return test_freebsd(t),
58-
t if t.contains("haiku") => return test_haiku(t),
59-
t if t.contains("linux") => return test_linux(t),
60-
t if t.contains("netbsd") => return test_netbsd(t),
61-
t if t.contains("openbsd") => return test_openbsd(t),
62-
t if t.contains("cygwin") => return test_cygwin(t),
63-
t if t.contains("redox") => return test_redox(t),
64-
t if t.contains("solaris") => return test_solarish(t),
65-
t if t.contains("illumos") => return test_solarish(t),
66-
t if t.contains("wasi") => return test_wasi(t),
67-
t if t.contains("windows") => return test_windows(t),
68-
t if t.contains("vxworks") => return test_vxworks(t),
69-
t if t.contains("nto-qnx") => return test_neutrino(t),
53+
t if t.contains("android") => test_android(t),
54+
t if t.contains("apple") => test_apple(t),
55+
t if t.contains("dragonfly") => test_dragonflybsd(t),
56+
t if t.contains("emscripten") => test_emscripten(t),
57+
t if t.contains("freebsd") => test_freebsd(t),
58+
t if t.contains("haiku") => test_haiku(t),
59+
t if t.contains("linux") => test_linux(t),
60+
t if t.contains("netbsd") => test_netbsd(t),
61+
t if t.contains("openbsd") => test_openbsd(t),
62+
t if t.contains("cygwin") => test_cygwin(t),
63+
t if t.contains("redox") => test_redox(t),
64+
t if t.contains("solaris") => test_solarish(t),
65+
t if t.contains("illumos") => test_solarish(t),
66+
t if t.contains("wasi") => test_wasi(t),
67+
t if t.contains("windows") => test_windows(t),
68+
t if t.contains("vxworks") => test_vxworks(t),
69+
t if t.contains("nto-qnx") => test_neutrino(t),
7070
t => panic!("unknown target {}", t),
7171
}
7272
}
@@ -104,7 +104,7 @@ fn do_semver() {
104104
process_semver_file(&mut output, &mut semver_root, &os);
105105
let os_arch = format!("{}-{}", os, arch);
106106
process_semver_file(&mut output, &mut semver_root, &os_arch);
107-
if target_env != "" {
107+
if !target_env.is_empty() {
108108
let os_env = format!("{}-{}", os, target_env);
109109
process_semver_file(&mut output, &mut semver_root, &os_env);
110110

@@ -129,21 +129,21 @@ fn process_semver_file<W: Write, P: AsRef<Path>>(output: &mut W, path: &mut Path
129129
};
130130
let input = BufReader::new(input_file);
131131

132-
write!(output, "// Source: {}.\n", path.display()).unwrap();
133-
output.write(b"use libc::{\n").unwrap();
132+
writeln!(output, "// Source: {}.", path.display()).unwrap();
133+
output.write_all(b"use libc::{\n").unwrap();
134134
for line in input.lines() {
135135
let line = line.unwrap().into_bytes();
136136
match line.first() {
137137
// Ignore comments and empty lines.
138138
Some(b'#') | None => continue,
139139
_ => {
140-
output.write(b" ").unwrap();
141-
output.write(&line).unwrap();
142-
output.write(b",\n").unwrap();
140+
output.write_all(b" ").unwrap();
141+
output.write_all(&line).unwrap();
142+
output.write_all(b",\n").unwrap();
143143
}
144144
}
145145
}
146-
output.write(b"};\n\n").unwrap();
146+
output.write_all(b"};\n\n").unwrap();
147147
path.pop();
148148
}
149149

@@ -158,21 +158,21 @@ fn main() {
158158

159159
// FIXME(ctest): ctest cannot parse `crate::` in paths, so replace them with `::`
160160
let re = regex::bytes::Regex::new(r"(?-u:\b)crate::").unwrap();
161-
copy_dir_hotfix(Path::new("../src"), &hotfix_dir, &re, b"::");
161+
copy_dir_hotfix(Path::new("../src"), &hotfix_dir, &re);
162162

163163
do_cc();
164164
do_ctest();
165165
do_semver();
166166
}
167167

168-
fn copy_dir_hotfix(src: &Path, dst: &Path, regex: &regex::bytes::Regex, replace: &[u8]) {
169-
std::fs::create_dir(&dst).unwrap();
168+
fn copy_dir_hotfix(src: &Path, dst: &Path, regex: &regex::bytes::Regex) {
169+
std::fs::create_dir(dst).unwrap();
170170
for entry in src.read_dir().unwrap() {
171171
let entry = entry.unwrap();
172172
let src_path = entry.path();
173173
let dst_path = dst.join(entry.file_name());
174174
if entry.file_type().unwrap().is_dir() {
175-
copy_dir_hotfix(&src_path, &dst_path, regex, replace);
175+
copy_dir_hotfix(&src_path, &dst_path, regex);
176176
} else {
177177
// Replace "crate::" with "::"
178178
let src_data = std::fs::read(&src_path).unwrap();
@@ -433,10 +433,7 @@ fn test_apple(target: &str) {
433433

434434
cfg.volatile_item(|i| {
435435
use ctest::VolatileItemKind::*;
436-
match i {
437-
StructField(ref n, ref f) if n == "aiocb" && f == "aio_buf" => true,
438-
_ => false,
439-
}
436+
matches!(i, StructField(ref n, ref f) if n == "aiocb" && f == "aio_buf")
440437
});
441438

442439
cfg.type_name(move |ty, is_struct, is_union| {
@@ -712,7 +709,7 @@ fn test_cygwin(target: &str) {
712709
t if t.ends_with("_t") => t.to_string(),
713710

714711
// sigval is a struct in Rust, but a union in C:
715-
"sigval" => format!("union sigval"),
712+
"sigval" => "union sigval".to_string(),
716713

717714
// put `struct` in front of all structs:.
718715
t if is_struct => format!("struct {}", t),
@@ -913,10 +910,7 @@ fn test_windows(target: &str) {
913910
}
914911
});
915912

916-
cfg.skip_field(move |s, field| match s {
917-
"CONTEXT" if field == "Fp" => true,
918-
_ => false,
919-
});
913+
cfg.skip_field(|s, field| s == "CONTEXT" && field == "Fp");
920914
// FIXME(windows): All functions point to the wrong addresses?
921915
cfg.skip_fn_ptrcheck(|_| true);
922916

@@ -1102,10 +1096,7 @@ fn test_solarish(target: &str) {
11021096
}
11031097
}
11041098

1105-
cfg.skip_type(move |ty| match ty {
1106-
"sighandler_t" => true,
1107-
_ => false,
1108-
});
1099+
cfg.skip_type(|ty| ty == "sighandler_t");
11091100

11101101
cfg.type_name(move |ty, is_struct, is_union| match ty {
11111102
"FILE" => "__FILE".to_string(),
@@ -1449,6 +1440,7 @@ fn test_netbsd(target: &str) {
14491440
});
14501441

14511442
cfg.skip_fn(move |name| {
1443+
#[expect(clippy::wildcard_in_or_patterns)]
14521444
match name {
14531445
// FIXME(netbsd): netbsd 10 minimum
14541446
"getentropy" | "getrandom" => true,
@@ -1597,7 +1589,7 @@ fn test_dragonflybsd(target: &str) {
15971589
t if t.ends_with("_t") => t.to_string(),
15981590

15991591
// sigval is a struct in Rust, but a union in C:
1600-
"sigval" => format!("union sigval"),
1592+
"sigval" => "union sigval".to_string(),
16011593

16021594
// put `struct` in front of all structs:.
16031595
t if is_struct => format!("struct {}", t),
@@ -1984,7 +1976,7 @@ fn test_android(target: &str) {
19841976
t if t.ends_with("_t") => t.to_string(),
19851977

19861978
// sigval is a struct in Rust, but a union in C:
1987-
"sigval" => format!("union sigval"),
1979+
"sigval" => "union sigval".to_string(),
19881980

19891981
// put `struct` in front of all structs:.
19901982
t if is_struct => format!("struct {}", t),
@@ -2346,18 +2338,9 @@ fn test_freebsd(target: &str) {
23462338
// Required for making freebsd11_stat available in the headers
23472339
cfg.define("_WANT_FREEBSD11_STAT", None);
23482340

2349-
let freebsd13 = match freebsd_ver {
2350-
Some(n) if n >= 13 => true,
2351-
_ => false,
2352-
};
2353-
let freebsd14 = match freebsd_ver {
2354-
Some(n) if n >= 14 => true,
2355-
_ => false,
2356-
};
2357-
let freebsd15 = match freebsd_ver {
2358-
Some(n) if n >= 15 => true,
2359-
_ => false,
2360-
};
2341+
let freebsd13 = matches!(freebsd_ver, Some(n) if n >= 13);
2342+
let freebsd14 = matches!(freebsd_ver, Some(n) if n >= 14);
2343+
let freebsd15 = matches!(freebsd_ver, Some(n) if n >= 15);
23612344

23622345
headers! { cfg:
23632346
"aio.h",
@@ -2500,7 +2483,7 @@ fn test_freebsd(target: &str) {
25002483
t if t.ends_with("_t") => t.to_string(),
25012484

25022485
// sigval is a struct in Rust, but a union in C:
2503-
"sigval" => format!("union sigval"),
2486+
"sigval" => "union sigval".to_string(),
25042487

25052488
// put `struct` in front of all structs:.
25062489
t if is_struct => format!("struct {}", t),
@@ -3237,7 +3220,7 @@ fn test_neutrino(target: &str) {
32373220

32383221
let mut cfg = ctest_cfg();
32393222
if target.ends_with("_iosock") {
3240-
let qnx_target_val = std::env::var("QNX_TARGET")
3223+
let qnx_target_val = env::var("QNX_TARGET")
32413224
.unwrap_or_else(|_| "QNX_TARGET_not_set_please_source_qnxsdp".into());
32423225

32433226
cfg.include(qnx_target_val + "/usr/include/io-sock");
@@ -3484,17 +3467,17 @@ fn test_neutrino(target: &str) {
34843467
struct_ == "_idle_hook" && field == "time"
34853468
});
34863469

3487-
cfg.skip_field(move |struct_, field| {
3488-
(struct_ == "__sched_param" && field == "reserved") ||
3489-
(struct_ == "sched_param" && field == "reserved") ||
3490-
(struct_ == "sigevent" && field == "__padding1") || // ensure alignment
3491-
(struct_ == "sigevent" && field == "__padding2") || // union
3492-
(struct_ == "sigevent" && field == "__sigev_un2") || // union
3493-
// sighandler_t type is super weird
3494-
(struct_ == "sigaction" && field == "sa_sigaction") ||
3495-
// does not exist
3496-
(struct_ == "syspage_entry" && field == "__reserved") ||
3497-
false // keep me for smaller diffs when something is added above
3470+
cfg.skip_field(|struct_, field| {
3471+
matches!(
3472+
(struct_, field),
3473+
("__sched_param", "reserved")
3474+
| ("sched_param", "reserved")
3475+
| ("sigevent", "__padding1") // ensure alignment
3476+
| ("sigevent", "__padding2") // union
3477+
| ("sigevent", "__sigev_un2") // union
3478+
| ("sigaction", "sa_sigaction") // sighandler_t type is super weird
3479+
| ("syspage_entry", "__reserved") // does not exist
3480+
)
34983481
});
34993482

35003483
cfg.skip_static(move |name| (name == "__dso_handle"));
@@ -3574,19 +3557,16 @@ fn test_vxworks(target: &str) {
35743557
_ => false,
35753558
});
35763559
// FIXME(vxworks)
3577-
cfg.skip_type(move |ty| match ty {
3578-
"stat64" | "sighandler_t" | "off64_t" => true,
3579-
_ => false,
3580-
});
3560+
cfg.skip_type(|ty| matches!(ty, "stat64" | "sighandler_t" | "off64_t"));
35813561

3582-
cfg.skip_field_type(move |struct_, field| match (struct_, field) {
3583-
("siginfo_t", "si_value") | ("stat", "st_size") | ("sigaction", "sa_u") => true,
3584-
_ => false,
3562+
cfg.skip_field_type(|struct_, field| {
3563+
matches!(
3564+
(struct_, field),
3565+
("siginfo_t", "si_value") | ("stat", "st_size") | ("sigaction", "sa_u")
3566+
)
35853567
});
35863568

3587-
cfg.skip_roundtrip(move |s| match s {
3588-
_ => false,
3589-
});
3569+
cfg.skip_roundtrip(|_| false);
35903570

35913571
cfg.type_name(move |ty, is_struct, is_union| match ty {
35923572
"DIR" | "FILE" | "Dl_info" | "RTP_DESC" => ty.to_string(),
@@ -4845,12 +4825,9 @@ fn test_linux_like_apis(target: &str) {
48454825
cfg.skip_type(|_| true).skip_static(|_| true);
48464826

48474827
headers! { cfg: "string.h" }
4848-
cfg.skip_fn(|f| match f {
4849-
"strerror_r" => false,
4850-
_ => true,
4851-
})
4852-
.skip_const(|_| true)
4853-
.skip_struct(|_| true);
4828+
cfg.skip_fn(|f| f != "strerror_r")
4829+
.skip_const(|_| true)
4830+
.skip_struct(|_| true);
48544831
cfg.generate(src_hotfix_dir().join("lib.rs"), "linux_strerror_r.rs");
48554832
}
48564833

@@ -4894,10 +4871,11 @@ fn test_linux_like_apis(target: &str) {
48944871
cfg.skip_type(|_| true)
48954872
.skip_static(|_| true)
48964873
.skip_fn(|_| true)
4897-
.skip_const(|c| match c {
4898-
"BOTHER" | "IBSHIFT" => false,
4899-
"TCGETS2" | "TCSETS2" | "TCSETSW2" | "TCSETSF2" => false,
4900-
_ => true,
4874+
.skip_const(|c| {
4875+
!matches!(
4876+
c,
4877+
"BOTHER" | "IBSHIFT" | "TCGETS2" | "TCSETS2" | "TCSETSW2" | "TCSETSF2"
4878+
)
49014879
})
49024880
.skip_struct(|s| s != "termios2")
49034881
.type_name(move |ty, is_struct, is_union| match ty {
@@ -4923,13 +4901,15 @@ fn test_linux_like_apis(target: &str) {
49234901
.skip_fn(|_| true)
49244902
.skip_const(|_| true)
49254903
.skip_struct(|_| true)
4926-
.skip_const(move |name| match name {
4927-
"IPV6_FLOWINFO"
4928-
| "IPV6_FLOWLABEL_MGR"
4929-
| "IPV6_FLOWINFO_SEND"
4930-
| "IPV6_FLOWINFO_FLOWLABEL"
4931-
| "IPV6_FLOWINFO_PRIORITY" => false,
4932-
_ => true,
4904+
.skip_const(|name| {
4905+
!matches!(
4906+
name,
4907+
"IPV6_FLOWINFO"
4908+
| "IPV6_FLOWLABEL_MGR"
4909+
| "IPV6_FLOWINFO_SEND"
4910+
| "IPV6_FLOWINFO_FLOWLABEL"
4911+
| "IPV6_FLOWINFO_PRIORITY"
4912+
)
49334913
})
49344914
.type_name(move |ty, is_struct, is_union| match ty {
49354915
t if is_struct => format!("struct {}", t),
@@ -4951,14 +4931,8 @@ fn test_linux_like_apis(target: &str) {
49514931
.skip_static(|_| true)
49524932
.skip_const(|_| true)
49534933
.type_name(move |ty, _is_struct, _is_union| ty.to_string())
4954-
.skip_struct(move |ty| match ty {
4955-
"Elf64_Phdr" | "Elf32_Phdr" => false,
4956-
_ => true,
4957-
})
4958-
.skip_type(move |ty| match ty {
4959-
"Elf64_Phdr" | "Elf32_Phdr" => false,
4960-
_ => true,
4961-
});
4934+
.skip_struct(|ty| !matches!(ty, "Elf64_Phdr" | "Elf32_Phdr"))
4935+
.skip_type(|ty| !matches!(ty, "Elf64_Phdr" | "Elf32_Phdr"));
49624936
cfg.generate(src_hotfix_dir().join("lib.rs"), "linux_elf.rs");
49634937
}
49644938

@@ -4969,10 +4943,7 @@ fn test_linux_like_apis(target: &str) {
49694943
cfg.header("linux/if_arp.h");
49704944
cfg.skip_fn(|_| true)
49714945
.skip_static(|_| true)
4972-
.skip_const(move |name| match name {
4973-
"ARPHRD_CAN" => false,
4974-
_ => true,
4975-
})
4946+
.skip_const(|name| name != "ARPHRD_CAN")
49764947
.skip_struct(|_| true)
49774948
.skip_type(|_| true);
49784949
cfg.generate(src_hotfix_dir().join("lib.rs"), "linux_if_arp.rs");
@@ -5317,7 +5288,7 @@ fn test_haiku(target: &str) {
53175288
}
53185289

53195290
// is actually a union
5320-
"sigval" => format!("union sigval"),
5291+
"sigval" => "union sigval".to_string(),
53215292
t if is_union => format!("union {}", t),
53225293
t if t.ends_with("_t") => t.to_string(),
53235294
t if is_struct => format!("struct {}", t),

0 commit comments

Comments
 (0)