Auto merge of #863 - fitzgen:rm-used, r=emilio

Remove the incomplete `--dummy-uses` feature

This would generate dummy uses of all the whitelisted types, which we were planning on eventually using to generate DWARF for more layout testing of our types, but we decided that isn't worth the trouble. Kill it!

r? @emilio

Author: bors-servo

src/lib.rs

@@ -65,7 +65,6 @@ mod clang;
 mod ir;
 mod parse;
 mod regex_set;
-mod uses;
 
 pub mod callbacks;
 
@@ -76,7 +75,6 @@ doc_mod!(clang, clang_docs);
 doc_mod!(ir, ir_docs);
 doc_mod!(parse, parse_docs);
 doc_mod!(regex_set, regex_set_docs);
-doc_mod!(uses, uses_docs);
 
 mod codegen {
     include!(concat!(env!("OUT_DIR"), "/codegen.rs"));
@@ -265,11 +263,6 @@ impl Builder {
             output_vector.push(prefix.clone());
         }
 
-        if let Some(ref dummy) = self.options.dummy_uses {
-            output_vector.push("--dummy-uses".into());
-            output_vector.push(dummy.clone());
-        }
-
         if self.options.emit_ast {
             output_vector.push("--emit-clang-ast".into());
         }
@@ -519,13 +512,6 @@ impl Builder {
         self
     }
 
-    /// Generate a C/C++ file that includes the header and has dummy uses of
-    /// every type defined in the header.
-    pub fn dummy_uses<T: Into<String>>(mut self, dummy_uses: T) -> Builder {
-        self.options.dummy_uses = Some(dummy_uses.into());
-        self
-    }
-
     /// Hide the given type from the generated bindings. Regular expressions are
     /// supported.
     pub fn hide_type<T: AsRef<str>>(mut self, arg: T) -> Builder {
@@ -1001,10 +987,6 @@ pub struct BindgenOptions {
     /// Unsaved files for input.
     pub input_unsaved_files: Vec<clang::UnsavedFile>,
 
-    /// Generate a dummy C/C++ file that includes the header and has dummy uses
-    /// of all types defined therein. See the `uses` module for more.
-    pub dummy_uses: Option<String>,
-
     /// A user-provided visitor to allow customizing different kinds of
     /// situations.
     pub parse_callbacks: Option<Box<callbacks::ParseCallbacks>>,
@@ -1094,7 +1076,6 @@ impl Default for BindgenOptions {
             clang_args: vec![],
             input_header: None,
             input_unsaved_files: vec![],
-            dummy_uses: None,
             parse_callbacks: None,
             codegen_config: CodegenConfig::all(),
             conservative_inline_namespaces: false,
@@ -1277,29 +1258,6 @@ impl<'ctx> Bindings<'ctx> {
         try!(eof(&mut ps.s));
         ps.s.out.flush()
     }
-
-    /// Generate and write dummy uses of all the types we parsed, if we've been
-    /// requested to do so in the options.
-    ///
-    /// See the `uses` module for more information.
-    pub fn write_dummy_uses(&mut self) -> io::Result<()> {
-        let file = if let Some(ref dummy_path) =
-            self.context.options().dummy_uses {
-            Some(try!(OpenOptions::new()
-                .write(true)
-                .truncate(true)
-                .create(true)
-                .open(dummy_path)))
-        } else {
-            None
-        };
-
-        if let Some(file) = file {
-            try!(uses::generate_dummy_uses(&mut self.context, file));
-        }
-
-        Ok(())
-    }
 }
 
 /// Determines whether the given cursor is in any of the files matched by the

src/main.rs

@@ -64,11 +64,9 @@ pub fn main() {
                 std::process::exit(1);
             }
 
-            let mut bindings = builder_result.unwrap();
+            let bindings = builder_result.unwrap();
             bindings.write(output)
                 .expect("Unable to write output");
-            bindings.write_dummy_uses()
-                .expect("Unable to write dummy uses to file.");
         }
         Err(error) => {
             println!("{}", error);

src/options.rs

@@ -88,11 +88,6 @@ pub fn builder_from_flags<I>
             // All positional arguments after the end of options marker, `--`
             Arg::with_name("clang-args")
                 .multiple(true),
-            Arg::with_name("dummy-uses")
-                .long("dummy-uses")
-                .help("For testing purposes, generate a C/C++ file containing \
-                       dummy uses of all types defined in the input header.")
-                .takes_value(true),
             Arg::with_name("emit-clang-ast")
                 .long("emit-clang-ast")
                 .help("Output the Clang AST for debugging purposes."),
@@ -282,10 +277,6 @@ pub fn builder_from_flags<I>
         builder = builder.ctypes_prefix(prefix);
     }
 
-    if let Some(dummy) = matches.value_of("dummy-uses") {
-        builder = builder.dummy_uses(dummy);
-    }
-
     if let Some(links) = matches.values_of("dynamic") {
         for library in links {
             builder = builder.link(library);