refactor(common): use early return in warn_if_host_is_incompatible()

rust-lang · Aug 5, 2024 · 32e3338 · 32e3338
1 parent 31c8a18
commit 32e3338
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/cli/common.rs b/src/cli/common.rs
@@ -642,11 +642,12 @@ pub(crate) fn warn_if_host_is_incompatible(
     target_triple: &TargetTriple,
     force_non_host: bool,
 ) -> Result<()> {
-    if !force_non_host && !host_arch.can_run(target_triple)? {
-        error!("DEPRECATED: future versions of rustup will require --force-non-host to install a non-host toolchain.");
-        warn!("toolchain '{toolchain}' may not be able to run on this system.");
-        warn!("If you meant to build software to target that platform, perhaps try `rustup target add {target_triple}` instead?");
+    if force_non_host || host_arch.can_run(target_triple)? {
+        return Ok(());
     }
+    error!("DEPRECATED: future versions of rustup will require --force-non-host to install a non-host toolchain.");
+    warn!("toolchain '{toolchain}' may not be able to run on this system.");
+    warn!("If you meant to build software to target that platform, perhaps try `rustup target add {target_triple}` instead?");
     Ok(())
 }