Auto merge of rust-lang#636 - servo:clang_args, r=emilio

Add Builder::clang_args (plural)

Use `AsRef<str>` rather than `Into<String>` because `&&str` (what you get when iterating `&[&str]`) does not implement the latter.

Author: bors-servo

Cargo.lock

@@ -13,7 +13,7 @@ name = "bindgen"
 readme = "README.md"
 repository = "https://github.com/servo/rust-bindgen"
 documentation = "https://docs.rs/bindgen"
-version = "0.23.0"
+version = "0.23.1"
 build = "build.rs"
 
 exclude = [

Cargo.toml

@@ -32,9 +32,7 @@ fn main() {
         .enable_cxx_namespaces()
         .raw_line("pub use self::root::*;")
         .header("cpp/Test.h")
-        .clang_arg("-x")
-        .clang_arg("c++")
-        .clang_arg("-std=c++11")
+        .clang_args(&["-x", "c++", "-std=c++11"])
         .parse_callbacks(Box::new(MacroCallback {macros: macros.clone()}))
         .generate()
         .expect("Unable to generate bindings");

bindgen-integration/build.rs

@@ -555,6 +555,16 @@ impl Builder {
         self
     }
 
+    /// Add arguments to be passed straight through to clang.
+    pub fn clang_args<I>(mut self, iter: I) -> Builder
+        where I: IntoIterator,
+              I::Item: AsRef<str> {
+        for arg in iter {
+            self = self.clang_arg(arg.as_ref())
+        }
+        self
+    }
+
     /// Make the generated bindings link the given shared library.
     pub fn link<T: Into<String>>(mut self, library: T) -> Builder {
         self.options.links.push((library.into(), LinkType::Default));