issue 1723 [WIP] fixed merge conflicts

Author: smurfd

src/lib.rs

@@ -1336,7 +1336,7 @@ impl Builder {
     }
 
     /// Generate the Rust bindings options
-    pub fn generate_options(mut self) -> Self {
+    pub fn generate_options(&mut self) -> &mut Self {
         // Add any extra arguments from the environment to the clang command line.
         if let Some(extra_clang_args) =
             env::var("BINDGEN_EXTRA_CLANG_ARGS").ok()
@@ -1366,27 +1366,25 @@ impl Builder {
         );
         self
     }
-
     /// Generate the Rust bindings using the options built up thus far.
-    pub fn generate(self) -> Result<Bindings, ()> {
-        Bindings::generate(Builder::generate_options(self).options)
+    pub fn generate(mut self) -> Result<Bindings, ()> {
+        Bindings::generate(&Builder::generate_options(&mut self).options)
     }
 
     /// Preprocess and dump the input header files to disk.
     ///
     /// This is useful when debugging bindgen, using C-Reduce, or when filing
     /// issues. The resulting file will be named something like `__bindgen.i` or
     /// `__bindgen.ii`
-    pub fn dump_preprocessed_input(&self) -> io::Result<()> {
+    pub fn dump_preprocessed_input(&mut self) -> io::Result<()> {
         let clang =
             clang_sys::support::Clang::find(None, &[]).ok_or_else(|| {
                 io::Error::new(
                     io::ErrorKind::Other,
                     "Cannot find clang executable",
                 )
             })?;
-        //Builder::generate_options(self);
-
+        Builder::generate_options(self);
         // The contents of a wrapper file that includes all the input header
         // files.
         let mut wrapper_contents = String::new();
@@ -2099,7 +2097,7 @@ impl Bindings {
 
     /// Generate bindings for the given options.
     pub(crate) fn generate(
-        mut options: BindgenOptions,
+        mut options: &BindgenOptions,
     ) -> Result<Bindings, ()> {
         ensure_libclang_is_loaded();