Auto merge of #891 - fitzgen:fix-test-expectations, r=photoszzt

Fix test expectations

r? @photoszzt

cc @tmfink: I had to revert the target features commit because there were a bunch of compilation failures in the test expectations (we had another, earlier regression that accidentally made it so that we weren't compiling and running the test expectations in CI, so we didn't catch the target features PR's regressions).

1 files changed, 5 insertions, 15 deletions

diff --git a/src/options.rs b/src/options.rs
index e2e1b277..f2ed5494 100644
--- a/src/options.rs
+++ b/src/options.rs
@@ -1,9 +1,7 @@
-use bindgen::{Builder, CodegenConfig, RUST_TARGET_STRINGS, RustTarget, builder};
+use bindgen::{Builder, CodegenConfig, builder};
 use clap::{App, Arg};
-// use super::features::RUST_TARGET_STRINGS;
 use std::fs::File;
 use std::io::{self, Error, ErrorKind};
-use std::str::FromStr;
 
 /// Construct a new [`Builder`](./struct.Builder.html) from command line flags.
 pub fn builder_from_flags<I>
@@ -11,10 +9,6 @@ pub fn builder_from_flags<I>
      -> Result<(Builder, Box<io::Write>, bool), io::Error>
     where I: Iterator<Item = String>,
 {
-    let rust_target_help = format!(
-        "Version of the Rust compiler to target. Valid options are: {:?}.",
-        RUST_TARGET_STRINGS);
-
     let matches = App::new("bindgen")
         .version(env!("CARGO_PKG_VERSION"))
         .about("Generates Rust bindings from C/C++ headers.")
@@ -167,10 +161,6 @@ pub fn builder_from_flags<I>
                 .takes_value(true)
                 .multiple(true)
                 .number_of_values(1),
-            Arg::with_name("rust-target")
-                .long("rust-target")
-                .help(&rust_target_help)
-                .takes_value(true),
             Arg::with_name("static")
                 .long("static-link")
                 .help("Link to static library.")
@@ -236,10 +226,6 @@ pub fn builder_from_flags<I>
         return Err(Error::new(ErrorKind::Other, "Header not found"));
     }
 
-    if let Some(rust_target) = matches.value_of("rust-target") {
-        builder = builder.rust_target(RustTarget::from_str(rust_target)?);
-    }
-
     if let Some(bitfields) = matches.values_of("bitfield-enum") {
         for regex in bitfields {
             builder = builder.bitfield_enum(regex);
@@ -351,6 +337,10 @@ pub fn builder_from_flags<I>
         builder = builder.ignore_methods();
     }
 
+    if matches.is_present("unstable-rust") {
+        builder = builder.unstable_rust(true);
+    }
+
     if matches.is_present("no-convert-floats") {
         builder = builder.no_convert_floats();
     }