derive Clone on Builder and all its fields

Author: jrandall

Cargo.lock

@@ -51,6 +51,7 @@ cexpr = "0.6"
 # This kinda sucks: https://github.com/rust-lang/cargo/issues/1982
 clap = { version = "2", optional = true }
 clang-sys = { version = "1", features = ["clang_6_0"] }
+dyn-clone = "1"
 lazycell = "1"
 lazy_static = "1"
 peeking_take_while = "0.1.2"

Cargo.toml

@@ -25,7 +25,7 @@ impl Default for MacroParsingBehavior {
 
 /// A trait to allow configuring different kinds of types in different
 /// situations.
-pub trait ParseCallbacks: fmt::Debug + UnwindSafe {
+pub trait ParseCallbacks: fmt::Debug + UnwindSafe + dyn_clone::DynClone {
     /// This function will be run on every macro that is identified.
     fn will_parse_macro(&self, _name: &str) -> MacroParsingBehavior {
         MacroParsingBehavior::Default
@@ -104,3 +104,5 @@ pub trait ParseCallbacks: fmt::Debug + UnwindSafe {
         vec![]
     }
 }
+
+dyn_clone::clone_trait_object!(ParseCallbacks);

src/callbacks.rs

@@ -1687,6 +1687,7 @@ impl Drop for Diagnostic {
 }
 
 /// A file which has not been saved to disk.
+#[derive(Clone)]
 pub struct UnsavedFile {
     x: CXUnsavedFile,
     /// The name of the unsaved file. Kept here to avoid leaving dangling pointers in

src/clang.rs

@@ -1,7 +1,7 @@
 /// Generating build depfiles from parsed bindings.
 use std::{collections::BTreeSet, path::PathBuf};
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub(crate) struct DepfileSpec {
     pub output_module: String,
     pub depfile_path: PathBuf,

src/deps.rs

@@ -219,7 +219,7 @@ impl Default for CodegenConfig {
 /// End-users of the crate may need to set the `BINDGEN_EXTRA_CLANG_ARGS` environment variable to
 /// add additional arguments. For example, to build against a different sysroot a user could set
 /// `BINDGEN_EXTRA_CLANG_ARGS` to `--sysroot=/path/to/sysroot`.
-#[derive(Debug, Default)]
+#[derive(Clone, Debug, Default)]
 pub struct Builder {
     options: BindgenOptions,
     input_headers: Vec<String>,
@@ -1663,7 +1663,7 @@ impl Builder {
 }
 
 /// Configuration options for generated bindings.
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 struct BindgenOptions {
     /// The set of types that have been blocklisted and should not appear
     /// anywhere in the generated code.
@@ -2656,7 +2656,7 @@ fn get_target_dependent_env_var(var: &str) -> Option<String> {
 ///     .parse_callbacks(Box::new(bindgen::CargoCallbacks))
 ///     .generate();
 /// ```
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub struct CargoCallbacks;
 
 impl callbacks::ParseCallbacks for CargoCallbacks {

src/lib.rs

@@ -4,7 +4,7 @@ use regex::RegexSet as RxSet;
 use std::cell::Cell;
 
 /// A dynamic set of regular expressions.
-#[derive(Debug, Default)]
+#[derive(Clone, Debug, Default)]
 pub struct RegexSet {
     items: Vec<String>,
     /// Whether any of the items in the set was ever matched. The length of this