Clap *does* support the end of options marker!

Author: jdub

src/lib.rs

@@ -128,20 +128,6 @@ pub fn builder() -> Builder {
 pub fn builder_from_flags<I>(args: I) -> Result<Builder, io::Error>
     where I: Iterator<Item=String>
 {
-    // clap doesn't support the end of options marker, --
-    // https://github.com/kbknapp/clap-rs/issues/735
-    let mut terminated = false;
-    let (bindgen_args, clang_args): (Vec<_>, Vec<_>) = args.partition(|arg| {
-        if terminated { // clang arg
-            false
-        } else if arg == "--" {
-            terminated = true; // end of bindgen args, start of clang args
-            false
-        } else { // bindgen arg
-            true
-        }
-    });
-
     let matches = App::new("bindgen")
         .version(env!("CARGO_PKG_VERSION"))
         .about("Generates Rust bindings from C/C++ headers.")
@@ -170,6 +156,8 @@ pub fn builder_from_flags<I>(args: I) -> Result<Builder, io::Error>
                 .help("Use the given prefix before raw types instead of ::std::os::raw.")
                 .value_name("prefix")
                 .takes_value(true),
+            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.")
@@ -246,7 +234,7 @@ pub fn builder_from_flags<I>(args: I) -> Result<Builder, io::Error>
                 .takes_value(true)
                 .multiple(true),
         ]) // .args()
-        .get_matches_from(bindgen_args);
+        .get_matches_from(args);
 
     let mut builder = builder();
 
@@ -258,7 +246,7 @@ pub fn builder_from_flags<I>(args: I) -> Result<Builder, io::Error>
 
     if let Some(bitfields) = matches.values_of("bitfield-enum") {
         for regex in bitfields {
-            builder = builder.bitfield_enum(bitfields);
+            builder = builder.bitfield_enum(regex);
         }
     }
 
@@ -352,8 +340,10 @@ pub fn builder_from_flags<I>(args: I) -> Result<Builder, io::Error>
         }
     }
 
-    for arg in clang_args.into_iter().skip(1) {
-        builder = builder.clang_arg(arg);
+    if let Some(args) = matches.values_of("clang-args") {
+        for arg in args {
+            builder = builder.clang_arg(arg);
+        }
     }
 
     // FIXME: hrrrmmm