Merge pull request #4514 from mbyx/ctest-frontend

ctest: Add skips and mappings.

Author: tgross35

ctest-next/Cargo.toml

@@ -2,7 +2,7 @@
 name = "ctest-next"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.77"
+rust-version = "1.87"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/libc"
 publish = false

ctest-next/src/ast/field.rs

@@ -6,12 +6,11 @@ pub struct Field {
     #[expect(unused)]
     pub(crate) public: bool,
     pub(crate) ident: BoxStr,
-    #[expect(unused)]
     pub(crate) ty: syn::Type,
 }
 
 impl Field {
-    /// Return the identifier of the field as a string if it exists.
+    /// Return the identifier of the field as a string.
     pub fn ident(&self) -> &str {
         &self.ident
     }

ctest-next/src/ast/parameter.rs

@@ -1,8 +1,16 @@
+use crate::BoxStr;
+
 /// Represents a parameter in a function signature defined in Rust.
 #[derive(Debug, Clone)]
 pub struct Parameter {
-    #[expect(unused)]
-    pub(crate) pattern: syn::Pat,
+    pub(crate) ident: BoxStr,
     #[expect(unused)]
     pub(crate) ty: syn::Type,
 }
+
+impl Parameter {
+    /// Return the identifier of the parameter as a string.
+    pub fn ident(&self) -> &str {
+        &self.ident
+    }
+}

ctest-next/src/ast/static_variable.rs

@@ -11,7 +11,6 @@ pub struct Static {
     #[expect(unused)]
     pub(crate) abi: Abi,
     pub(crate) ident: BoxStr,
-    #[expect(unused)]
     pub(crate) ty: syn::Type,
 }
 

ctest-next/src/ast/type_alias.rs

@@ -6,7 +6,6 @@ pub struct Type {
     #[expect(unused)]
     pub(crate) public: bool,
     pub(crate) ident: BoxStr,
-    #[expect(unused)]
     pub(crate) ty: syn::Type,
 }
 

ctest-next/src/ffi_items.rs

@@ -9,12 +9,12 @@ use crate::{Abi, Const, Field, Fn, Parameter, Static, Struct, Type, Union};
 /// Includes foreign functions/statics, type aliases, structs, unions, and constants.
 #[derive(Default, Clone, Debug)]
 pub(crate) struct FfiItems {
-    aliases: Vec<Type>,
-    structs: Vec<Struct>,
-    unions: Vec<Union>,
-    constants: Vec<Const>,
-    foreign_functions: Vec<Fn>,
-    foreign_statics: Vec<Static>,
+    pub(crate) aliases: Vec<Type>,
+    pub(crate) structs: Vec<Struct>,
+    pub(crate) unions: Vec<Union>,
+    pub(crate) constants: Vec<Const>,
+    pub(crate) foreign_functions: Vec<Fn>,
+    pub(crate) foreign_statics: Vec<Static>,
 }
 
 impl FfiItems {
@@ -24,15 +24,13 @@ impl FfiItems {
     }
 
     /// Return whether the type has parsed a struct with the given identifier.
-    #[expect(unused)]
     pub(crate) fn contains_struct(&self, ident: &str) -> bool {
         self.structs()
             .iter()
             .any(|structure| structure.ident() == ident)
     }
 
     /// Return whether the type has parsed a union with the given identifier.
-    #[expect(unused)]
     pub(crate) fn contains_union(&self, ident: &str) -> bool {
         self.unions().iter().any(|union| union.ident() == ident)
     }
@@ -106,7 +104,12 @@ fn visit_foreign_item_fn(table: &mut FfiItems, i: &syn::ForeignItemFn, abi: &Abi
         .iter()
         .map(|arg| match arg {
             syn::FnArg::Typed(arg) => Parameter {
-                pattern: arg.pat.deref().clone(),
+                ident: match arg.pat.deref() {
+                    syn::Pat::Ident(i) => i.ident.to_string().into_boxed_str(),
+                    _ => {
+                        unimplemented!("Foreign functions are unlikely to have any other pattern.")
+                    }
+                },
                 ty: arg.ty.deref().clone(),
             },
             syn::FnArg::Receiver(_) => {