move input_header_contents to BindgenOPtions

Author: pvdrz

src/lib.rs

@@ -225,8 +225,6 @@ impl Default for CodegenConfig {
 pub struct Builder {
     parse_callbacks: Option<Box<dyn callbacks::ParseCallbacks>>,
     options: BindgenOptions,
-    // Tuples of unsaved file contents of the form (name, contents).
-    input_header_contents: Vec<(String, String)>,
 }
 
 /// Construct a new [`Builder`](./struct.Builder.html).
@@ -667,7 +665,8 @@ impl Builder {
             .to_str()
             .expect("Cannot convert current directory name to string")
             .to_owned();
-        self.input_header_contents
+        self.options
+            .input_header_contents
             .push((absolute_path, contents.into()));
         self
     }
@@ -1512,11 +1511,9 @@ impl Builder {
         );
 
         state.input_unsaved_files.extend(
-            self.input_header_contents
-                .drain(..)
-                .map(|(name, contents)| {
-                    clang::UnsavedFile::new(&name, &contents)
-                }),
+            self.options.input_header_contents.drain(..).map(
+                |(name, contents)| clang::UnsavedFile::new(&name, &contents),
+            ),
         );
 
         Bindings::generate(state, self.options)
@@ -1554,7 +1551,7 @@ impl Builder {
 
         // For each input header content, add a prefix line of `#line 0 "$name"`
         // followed by the contents.
-        for &(ref name, ref contents) in &self.input_header_contents {
+        for &(ref name, ref contents) in &self.options.input_header_contents {
             is_cpp |= file_is_cpp(name);
 
             wrapper_contents.push_str("#line 0 \"");
@@ -1895,6 +1892,9 @@ struct BindgenOptions {
     /// The input header files.
     input_headers: Vec<String>,
 
+    /// Tuples of unsaved file contents of the form (name, contents).
+    input_header_contents: Vec<(String, String)>,
+
     /// Which kind of items should we generate? By default, we'll generate all
     /// of them.
     codegen_config: CodegenConfig,
@@ -2077,6 +2077,7 @@ impl Default for BindgenOptions {
             module_lines: Default::default(),
             clang_args: Default::default(),
             input_headers: Default::default(),
+            input_header_contents: Default::default(),
             codegen_config: CodegenConfig::all(),
             conservative_inline_namespaces: Default::default(),
             generate_comments: true,