address feedback

Author: nyurik

libc-test/Cargo.toml

@@ -107,8 +107,6 @@ harness = true
 #              once MSRV is above 1.64 and replaced with `[lints] workspace=true`
 
 [lints.rust]
-# FIXME(cleanup): make ident usage consistent in each file
-#   Switching this to "warn" causes issues with generated code
-unused_qualifications = "allow"
+unused_qualifications = "warn"
 
 [lints.clippy]

libc-test/build.rs

@@ -1,4 +1,5 @@
 #![deny(warnings)]
+#![allow(clippy::match_like_matches_macro)]
 
 use std::fs::File;
 use std::io::{BufRead, BufReader, BufWriter, Write};
@@ -435,7 +436,10 @@ fn test_apple(target: &str) {
 
     cfg.volatile_item(|i| {
         use ctest::VolatileItemKind::*;
-        matches!(i, StructField(ref n, ref f) if n == "aiocb" && f == "aio_buf")
+        match i {
+            StructField(ref n, ref f) if n == "aiocb" && f == "aio_buf" => true,
+            _ => false,
+        }
     });
 
     cfg.type_name(move |ty, is_struct, is_union| {
@@ -912,7 +916,10 @@ fn test_windows(target: &str) {
         }
     });
 
-    cfg.skip_field(|s, field| s == "CONTEXT" && field == "Fp");
+    cfg.skip_field(move |s, field| match s {
+        "CONTEXT" if field == "Fp" => true,
+        _ => false,
+    });
     // FIXME(windows): All functions point to the wrong addresses?
     cfg.skip_fn_ptrcheck(|_| true);
 
@@ -1098,7 +1105,10 @@ fn test_solarish(target: &str) {
         }
     }
 
-    cfg.skip_type(|ty| ty == "sighandler_t");
+    cfg.skip_type(move |ty| match ty {
+        "sighandler_t" => true,
+        _ => false,
+    });
 
     cfg.type_name(move |ty, is_struct, is_union| match ty {
         "FILE" => "__FILE".to_string(),
@@ -4824,7 +4834,10 @@ fn test_linux_like_apis(target: &str) {
         cfg.skip_type(|_| true).skip_static(|_| true);
 
         headers! { cfg: "string.h" }
-        cfg.skip_fn(|f| f != "strerror_r")
+        cfg.skip_fn(|f| match f {
+            "strerror_r" => false,
+            _ => true,
+        })
             .skip_const(|_| true)
             .skip_struct(|_| true);
         cfg.generate(src_hotfix_dir().join("lib.rs"), "linux_strerror_r.rs");
@@ -4870,11 +4883,10 @@ fn test_linux_like_apis(target: &str) {
         cfg.skip_type(|_| true)
             .skip_static(|_| true)
             .skip_fn(|_| true)
-            .skip_const(|c| {
-                !matches!(
-                    c,
-                    "BOTHER" | "IBSHIFT" | "TCGETS2" | "TCSETS2" | "TCSETSW2" | "TCSETSF2"
-                )
+            .skip_const(|c| match c {
+                "BOTHER" | "IBSHIFT" => false,
+                "TCGETS2" | "TCSETS2" | "TCSETSW2" | "TCSETSF2" => false,
+                _ => true,
             })
             .skip_struct(|s| s != "termios2")
             .type_name(move |ty, is_struct, is_union| match ty {
@@ -4900,15 +4912,13 @@ fn test_linux_like_apis(target: &str) {
             .skip_fn(|_| true)
             .skip_const(|_| true)
             .skip_struct(|_| true)
-            .skip_const(|name| {
-                !matches!(
-                    name,
+            .skip_const(move |name| match name {
                     "IPV6_FLOWINFO"
                         | "IPV6_FLOWLABEL_MGR"
                         | "IPV6_FLOWINFO_SEND"
                         | "IPV6_FLOWINFO_FLOWLABEL"
-                        | "IPV6_FLOWINFO_PRIORITY"
-                )
+                | "IPV6_FLOWINFO_PRIORITY" => false,
+                _ => true,
             })
             .type_name(move |ty, is_struct, is_union| match ty {
                 t if is_struct => format!("struct {t}"),
@@ -4930,8 +4940,14 @@ fn test_linux_like_apis(target: &str) {
             .skip_static(|_| true)
             .skip_const(|_| true)
             .type_name(move |ty, _is_struct, _is_union| ty.to_string())
-            .skip_struct(|ty| !matches!(ty, "Elf64_Phdr" | "Elf32_Phdr"))
-            .skip_type(|ty| !matches!(ty, "Elf64_Phdr" | "Elf32_Phdr"));
+            .skip_struct(move |ty| match ty {
+                "Elf64_Phdr" | "Elf32_Phdr" => false,
+                _ => true,
+            })
+            .skip_type(move |ty| match ty {
+                "Elf64_Phdr" | "Elf32_Phdr" => false,
+                _ => true,
+            });
         cfg.generate(src_hotfix_dir().join("lib.rs"), "linux_elf.rs");
     }
 
@@ -4942,7 +4958,10 @@ fn test_linux_like_apis(target: &str) {
         cfg.header("linux/if_arp.h");
         cfg.skip_fn(|_| true)
             .skip_static(|_| true)
-            .skip_const(|name| name != "ARPHRD_CAN")
+            .skip_const(move |name| match name {
+                "ARPHRD_CAN" => false,
+                _ => true,
+            })
             .skip_struct(|_| true)
             .skip_type(|_| true);
         cfg.generate(src_hotfix_dir().join("lib.rs"), "linux_if_arp.rs");