Revert formatting changes

Author: rdelfin

bindgen-cli/options.rs

@@ -1089,8 +1089,8 @@ where
             &self,
             info: &bindgen::callbacks::DeriveInfo<'_>,
         ) -> Vec<String> {
-            if self.kind.map(|kind| kind == info.kind).unwrap_or(true)
-                && self.regex_set.matches(info.name)
+            if self.kind.map(|kind| kind == info.kind).unwrap_or(true) &&
+                self.regex_set.matches(info.name)
             {
                 return self.derives.clone();
             }

bindgen/lib.rs

@@ -87,10 +87,10 @@ pub const DEFAULT_ANON_FIELDS_PREFIX: &str = "__bindgen_anon_";
 const DEFAULT_NON_EXTERN_FNS_SUFFIX: &str = "__extern";
 
 fn file_is_cpp(name_file: &str) -> bool {
-    name_file.ends_with(".hpp")
-        || name_file.ends_with(".hxx")
-        || name_file.ends_with(".hh")
-        || name_file.ends_with(".h++")
+    name_file.ends_with(".hpp") ||
+        name_file.ends_with(".hxx") ||
+        name_file.ends_with(".hh") ||
+        name_file.ends_with(".h++")
 }
 
 fn args_are_cpp(clang_args: &[Box<str>]) -> bool {
@@ -799,8 +799,8 @@ impl Bindings {
                             return false;
                         }
 
-                        if arg.starts_with("-I")
-                            || arg.starts_with("--include-directory=")
+                        if arg.starts_with("-I") ||
+                            arg.starts_with("--include-directory=")
                         {
                             return false;
                         }
@@ -827,8 +827,8 @@ impl Bindings {
             debug!("Found clang: {:?}", clang);
 
             // Whether we are working with C or C++ inputs.
-            let is_cpp = args_are_cpp(&options.clang_args)
-                || options.input_headers.iter().any(|h| file_is_cpp(h));
+            let is_cpp = args_are_cpp(&options.clang_args) ||
+                options.input_headers.iter().any(|h| file_is_cpp(h));
 
             let search_paths = if is_cpp {
                 clang.cpp_search_paths