Tweaks to match CI rustfmt

Author: adetaylor

bindgen-tests/tests/parse_callbacks/item_discovery_callback/mod.rs

@@ -845,11 +845,11 @@ pub fn compare_method_info(
         unreachable!()
     };
 
-    if expected_parent != generated_parent
-        || expected_cpp_explicit != generated_cpp_explicit
-        || expected_cpp_special_member != generated_cpp_special_member
-        || expected_cpp_virtual != generated_cpp_virtual
-        || expected_cpp_visibility != generated_cpp_visibility
+    if expected_parent != generated_parent ||
+        expected_cpp_explicit != generated_cpp_explicit ||
+        expected_cpp_special_member != generated_cpp_special_member ||
+        expected_cpp_virtual != generated_cpp_virtual ||
+        expected_cpp_visibility != generated_cpp_visibility
     {
         return false;
     }

bindgen/codegen/mod.rs

@@ -3077,12 +3077,14 @@ impl Method {
         utils::call_discovered_item_callback(ctx, function_item, || {
             let cpp_virtual = match function.kind() {
                 FunctionKind::Function => None,
-                FunctionKind::Method(method_kind) => if method_kind.is_pure_virtual() {
-                    Some(Virtualness::PureVirtual)
-                } else if method_kind.is_virtual() {
-                    Some(Virtualness::Virtual)
-                } else {
-                    None
+                FunctionKind::Method(method_kind) => {
+                    if method_kind.is_pure_virtual() {
+                        Some(Virtualness::PureVirtual)
+                    } else if method_kind.is_virtual() {
+                        Some(Virtualness::Virtual)
+                    } else {
+                        None
+                    }
                 }
             };
             DiscoveredItem::Method {