Auto merge of #1404 - auscompgeek:fix-args-are-cpp, r=emilio

bors-servo · web-flow · commit c77f8c797551 · 2018-09-30T05:58:41.000-04:00
Fix args_are_cpp to look for -x without =

Clang doesn't allow `=` between `-x` and the language name.
diff --git a/src/lib.rs b/src/lib.rs
@@ -99,7 +99,7 @@ use std::sync::Arc;
 fn args_are_cpp(clang_args: &[String]) -> bool {
     return clang_args
         .windows(2)
-        .any(|w| w[0] == "-x=c++" || w[1] == "-x=c++" || w == &["-x", "c++"]);
+        .any(|w| w[0] == "-xc++" || w[1] == "-xc++" || w == &["-x", "c++"]);
 }
 
 bitflags! {

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ use std::sync::Arc;`
`99`	`99`	`fn args_are_cpp(clang_args: &[String]) -> bool {`
`100`	`100`	`return clang_args`
`101`	`101`	`.windows(2)`
`102`		`- .any(\|w\| w[0] == "-x=c++" \|\| w[1] == "-x=c++" \|\| w == &["-x", "c++"]);`
	`102`	`+ .any(\|w\| w[0] == "-xc++" \|\| w[1] == "-xc++" \|\| w == &["-x", "c++"]);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`bitflags! {`