Emit CLI flags for callbacks

Author: pvdrz

bindgen-cli/Cargo.toml

@@ -21,7 +21,7 @@ path = "main.rs"
 name = "bindgen"
 
 [dependencies]
-bindgen = { path = "../bindgen", version = "=0.63.0" }
+bindgen = { path = "../bindgen", version = "=0.63.0", features = ["cli"] }
 shlex = "1"
 clap = { version = "4", features = ["derive"] }
 env_logger = { version = "0.9.0", optional = true }

bindgen-cli/options.rs

@@ -919,14 +919,36 @@ where
     }
 
     impl bindgen::callbacks::ParseCallbacks for CustomDeriveCallback {
+        fn cli_args(&self) -> Vec<String> {
+            let mut args = vec![];
+
+            let flag = match &self.kind {
+                None => "--with-derive-custom",
+                Some(TypeKind::Struct) => "--with-derive-custom-struct",
+                Some(TypeKind::Enum) => "--with-derive-custom-enum",
+                Some(TypeKind::Union) => "--with-derive-custom-union",
+            };
+
+            let derives = self.derives.join(",");
+
+            for item in self.regex_set.get_items() {
+                args.extend_from_slice(&[
+                    flag.to_owned(),
+                    format!("{}={}", item, derives),
+                ]);
+            }
+
+            args
+        }
+
         fn add_derives(
             &self,
             info: &bindgen::callbacks::DeriveInfo<'_>,
         ) -> Vec<String> {
-            if self.kind.map(|kind| kind == info.kind).unwrap_or(true) {
-                if self.regex_set.matches(info.name) {
-                    return self.derives.clone();
-                }
+            if self.kind.map(|kind| kind == info.kind).unwrap_or(true)
+                && self.regex_set.matches(info.name)
+            {
+                return self.derives.clone();
             }
             vec![]
         }
@@ -940,9 +962,9 @@ where
     ] {
         for custom_derive in custom_derives {
             let (regex, derives) = custom_derive
-                .rsplit_once("=")
+                .rsplit_once('=')
                 .expect("Invalid custom derive argument: Missing `=`");
-            let derives = derives.split(",").map(|s| s.to_owned()).collect();
+            let derives = derives.split(',').map(|s| s.to_owned()).collect();
 
             let mut regex_set = RegexSet::new();
             regex_set.insert(regex);

bindgen/Cargo.toml

@@ -47,6 +47,7 @@ static = ["clang-sys/static"]
 runtime = ["clang-sys/runtime"]
 # Dynamically discover a `rustfmt` binary using the `which` crate
 which-rustfmt = ["which"]
+cli = []
 
 # These features only exist for CI testing -- don't use them if you're not hacking
 # on bindgen!

bindgen/callbacks.rs

@@ -25,6 +25,12 @@ impl Default for MacroParsingBehavior {
 /// A trait to allow configuring different kinds of types in different
 /// situations.
 pub trait ParseCallbacks: fmt::Debug {
+    #[cfg(feature = "cli")]
+    #[doc(hidden)]
+    fn cli_args(&self) -> Vec<String> {
+        vec![]
+    }
+
     /// This function will be run on every macro that is identified.
     fn will_parse_macro(&self, _name: &str) -> MacroParsingBehavior {
         MacroParsingBehavior::Default

bindgen/lib.rs

@@ -653,6 +653,11 @@ impl Builder {
             output_vector.push("--wrap-unsafe-ops".into());
         }
 
+        #[cfg(feature = "cli")]
+        for callbacks in &self.options.parse_callbacks {
+            output_vector.extend(callbacks.cli_args());
+        }
+
         // Add clang arguments
 
         output_vector.push("--".into());

bindgen/regex_set.rs

@@ -18,7 +18,9 @@ pub struct RegexSet {
 impl RegexSet {
     /// Create a new RegexSet
     pub fn new() -> RegexSet {
-        RegexSet { ..Default::default() }
+        RegexSet {
+            ..Default::default()
+        }
     }
 
     /// Is this set empty?