is this more readable?

Author: workingjubilee

compiler/rustc_hir_analysis/src/lib.rs

@@ -130,19 +130,31 @@ fn require_c_abi_if_c_variadic(
     let extern_system_varargs = tcx.features().extern_system_varargs();
     let conventions = if extended_abi_support { CONVENTIONS_UNSTABLE } else { CONVENTIONS_STABLE };
     match abi {
-        // User enabled additional ABI support for varargs and function ABI matches those ones.
-        ExternAbi::System { .. } if extern_system_varargs => return,
-        abi if abi.supports_varargs() && extended_abi_support => return,
-
-        // Using this ABI would be ok, if the feature for additional ABI support was enabled.
         ExternAbi::System { .. } => {
-            feature_err(&tcx.sess, sym::extern_system_varargs, span, UNSTABLE_EXPLAIN).emit();
+            // User enabled additional ABI support for varargs and function ABI matches those ones.
+            if extern_system_varargs {
+                return;
+            } else {
+                // Using this ABI would be ok, if the feature for additional ABI support was enabled.
+                feature_err(&tcx.sess, sym::extern_system_varargs, span, UNSTABLE_EXPLAIN).emit();
+            }
         }
         abi => {
-            if abi.supports_varargs() && !extended_abi_support {
-                feature_err(&tcx.sess, sym::extended_varargs_abi_support, span, UNSTABLE_EXPLAIN)
+            if abi.supports_varargs() {
+                // User enabled additional ABI support for varargs and function ABI matches those ones.
+                if extended_abi_support {
+                    return;
+                } else {
+                    // Using this ABI would be ok, if the feature for additional ABI support was enabled.
+                    feature_err(
+                        &tcx.sess,
+                        sym::extended_varargs_abi_support,
+                        span,
+                        UNSTABLE_EXPLAIN,
+                    )
                     .emit();
-            };
+                };
+            }
         }
     };