ctest: Add extraction of relevant types.

Author: mbyx

ctest-next/src/ast/constant.rs

@@ -14,7 +14,7 @@ pub struct Const {
 
 impl Const {
     /// Return the identifier of the constant as a string.
-    pub fn ident(&self) -> &BoxStr {
+    pub fn ident(&self) -> &str {
         &self.ident
     }
 }

ctest-next/src/ast/field.rs

@@ -12,7 +12,7 @@ pub struct Field {
 
 impl Field {
     /// Return the identifier of the field as a string if it exists.
-    pub fn ident(&self) -> &BoxStr {
+    pub fn ident(&self) -> &str {
         &self.ident
     }
 }

ctest-next/src/ast/function.rs

@@ -18,7 +18,7 @@ pub struct Fn {
 
 impl Fn {
     /// Return the identifier of the function as a string.
-    pub fn ident(&self) -> &BoxStr {
+    pub fn ident(&self) -> &str {
         &self.ident
     }
 }

ctest-next/src/ast/static_variable.rs

@@ -17,7 +17,7 @@ pub struct Static {
 
 impl Static {
     /// Return the identifier of the static variable as a string.
-    pub fn ident(&self) -> &BoxStr {
+    pub fn ident(&self) -> &str {
         &self.ident
     }
 }

ctest-next/src/ast/structure.rs

@@ -12,7 +12,7 @@ pub struct Struct {
 
 impl Struct {
     /// Return the identifier of the struct as a string.
-    pub fn ident(&self) -> &BoxStr {
+    pub fn ident(&self) -> &str {
         &self.ident
     }
 }

ctest-next/src/ast/type_alias.rs

@@ -12,7 +12,7 @@ pub struct Type {
 
 impl Type {
     /// Return the identifier of the type alias as a string.
-    pub fn ident(&self) -> &BoxStr {
+    pub fn ident(&self) -> &str {
         &self.ident
     }
 }

ctest-next/src/ast/union.rs

@@ -12,7 +12,7 @@ pub struct Union {
 
 impl Union {
     /// Return the identifier of the union as a string.
-    pub fn ident(&self) -> &BoxStr {
+    pub fn ident(&self) -> &str {
         &self.ident
     }
 }

ctest-next/src/ffi_items.rs

@@ -7,7 +7,7 @@ use crate::{Abi, Const, Field, Fn, Parameter, Static, Struct, Type, Union};
 /// Represents a collected set of top-level Rust items relevant to FFI generation or analysis.
 ///
 /// Includes foreign functions/statics, type aliases, structs, unions, and constants.
-#[derive(Default)]
+#[derive(Default, Clone, Debug)]
 pub struct FfiItems {
     aliases: Vec<Type>,
     structs: Vec<Struct>,
@@ -27,14 +27,12 @@ impl FfiItems {
     pub fn contains_struct(&self, ident: &str) -> bool {
         self.structs()
             .iter()
-            .any(|structure| structure.ident().as_ref() == ident)
+            .any(|structure| structure.ident() == ident)
     }
 
     /// Return whether the type has parsed a union with the given identifier.
     pub fn contains_union(&self, ident: &str) -> bool {
-        self.unions()
-            .iter()
-            .any(|union| union.ident().as_ref() == ident)
+        self.unions().iter().any(|union| union.ident() == ident)
     }
 
     /// Return a list of all type aliases found.

ctest-next/src/generator.rs

@@ -6,7 +6,7 @@ use crate::{expand, FfiItems, Result};
 
 /// A builder used to generate a test suite.
 #[non_exhaustive]
-#[derive(Default)]
+#[derive(Default, Debug, Clone)]
 pub struct TestGenerator {}
 
 impl TestGenerator {

ctest-next/src/lib.rs

@@ -1,5 +1,6 @@
 #![warn(missing_docs)]
 #![warn(unreachable_pub)]
+#![warn(missing_debug_implementations)]
 
 //! # ctest2 - an FFI binding validator
 //!
@@ -22,4 +23,4 @@ pub type Error = Box<dyn std::error::Error>;
 /// A type alias for `std::result::Result` that defaults to our error type.
 pub type Result<T, E = Error> = std::result::Result<T, E>;
 /// A boxed string for representing identifiers.
-pub type BoxStr = Box<str>;
+type BoxStr = Box<str>;

ctest-next/tests/extraction.rs

@@ -10,10 +10,57 @@ fn test_extraction_ffi_items() {
     let mut ffi_items = FfiItems::new();
     ffi_items.visit_file(&ast);
 
-    assert_eq!(ffi_items.aliases().len(), 1);
-    assert_eq!(ffi_items.constants().len(), 1);
-    assert_eq!(ffi_items.foreign_functions().len(), 1);
-    assert_eq!(ffi_items.foreign_statics().len(), 1);
-    assert_eq!(ffi_items.structs().len(), 1);
-    assert_eq!(ffi_items.unions().len(), 1);
+    assert_eq!(
+        ffi_items
+            .aliases()
+            .iter()
+            .map(|a| a.ident())
+            .collect::<Vec<_>>(),
+        ["Foo"]
+    );
+
+    assert_eq!(
+        ffi_items
+            .constants()
+            .iter()
+            .map(|a| a.ident())
+            .collect::<Vec<_>>(),
+        ["bar"]
+    );
+
+    assert_eq!(
+        ffi_items
+            .foreign_functions()
+            .iter()
+            .map(|a| a.ident())
+            .collect::<Vec<_>>(),
+        ["malloc"]
+    );
+
+    assert_eq!(
+        ffi_items
+            .foreign_statics()
+            .iter()
+            .map(|a| a.ident())
+            .collect::<Vec<_>>(),
+        ["baz"]
+    );
+
+    assert_eq!(
+        ffi_items
+            .structs()
+            .iter()
+            .map(|a| a.ident())
+            .collect::<Vec<_>>(),
+        ["Array"]
+    );
+
+    assert_eq!(
+        ffi_items
+            .unions()
+            .iter()
+            .map(|a| a.ident())
+            .collect::<Vec<_>>(),
+        ["Word"]
+    );
 }