move input_header_contents to BindgenOptions

Author: pvdrz

bindgen/clang.rs

@@ -1823,7 +1823,7 @@ pub struct UnsavedFile {
 
 impl UnsavedFile {
     /// Construct a new unsaved file with the given `name` and `contents`.
-    pub fn new(name: &str, contents: &str) -> UnsavedFile {
+    pub fn new(name: String, contents: String) -> UnsavedFile {
         let name = CString::new(name).unwrap();
         let contents = CString::new(contents).unwrap();
         let x = CXUnsavedFile {

bindgen/lib.rs

@@ -225,8 +225,6 @@ impl Default for CodegenConfig {
 #[derive(Debug, Default)]
 pub struct Builder {
     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).
@@ -690,7 +688,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
     }
@@ -1572,11 +1571,11 @@ impl Builder {
                 .flat_map(|header| ["-include".into(), header.to_string()]),
         );
 
-        let input_unsaved_files = self
-            .input_header_contents
-            .into_iter()
-            .map(|(name, contents)| clang::UnsavedFile::new(&name, &contents))
-            .collect::<Vec<_>>();
+        let input_unsaved_files =
+            std::mem::take(&mut self.options.input_header_contents)
+                .into_iter()
+                .map(|(name, contents)| clang::UnsavedFile::new(name, contents))
+                .collect::<Vec<_>>();
 
         Bindings::generate(self.options, input_unsaved_files)
     }
@@ -1613,7 +1612,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 \"");
@@ -1970,6 +1969,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)>,
+
     /// A user-provided visitor to allow customizing different kinds of
     /// situations.
     parse_callbacks: Option<Rc<dyn callbacks::ParseCallbacks>>,
@@ -2219,6 +2221,7 @@ impl Default for BindgenOptions {
             module_lines: HashMap::default(),
             clang_args: vec![],
             input_headers: vec![],
+            input_header_contents: Default::default(),
             parse_callbacks: None,
             codegen_config: CodegenConfig::all(),
             conservative_inline_namespaces: false,