refactor(rustup-mode): extract warn_if_host_is_incompatible()

Author: rami3l

src/cli/common.rs

@@ -15,17 +15,19 @@ use git_testament::{git_testament, render_testament};
 use tracing::{debug, error, info, trace, warn};
 
 use super::self_update;
-use crate::cli::download_tracker::DownloadTracker;
-use crate::dist::{
-    manifest::ComponentStatus, notifications as dist_notifications, TargetTriple, ToolchainDesc,
+use crate::{
+    cli::download_tracker::DownloadTracker,
+    config::Cfg,
+    dist::{
+        manifest::ComponentStatus, notifications as dist_notifications, PartialToolchainDesc,
+        TargetTriple, ToolchainDesc,
+    },
+    install::UpdateStatus,
+    notifications::Notification,
+    process::{terminalsource, Process},
+    toolchain::{DistributableToolchain, LocalToolchainName, Toolchain, ToolchainName},
+    utils::{notifications as util_notifications, notify::NotificationLevel, utils},
 };
-use crate::install::UpdateStatus;
-use crate::process::{terminalsource, Process};
-use crate::toolchain::{DistributableToolchain, LocalToolchainName, Toolchain, ToolchainName};
-use crate::utils::notifications as util_notifications;
-use crate::utils::notify::NotificationLevel;
-use crate::utils::utils;
-use crate::{config::Cfg, notifications::Notification};
 
 pub(crate) const WARN_COMPLETE_PROFILE: &str = "downloading with complete profile isn't recommended unless you are a developer of the rust language";
 
@@ -633,6 +635,25 @@ pub(crate) fn ignorable_error(
     }
 }
 
+/// Warns if rustup is trying to install a toolchain that might not be
+/// able to run on the host system.
+pub(crate) fn warn_if_host_is_incompatible(
+    process: &Process,
+    name: &PartialToolchainDesc,
+    force_non_host: bool,
+) -> Result<()> {
+    if name.has_triple() {
+        let host_arch = TargetTriple::from_host_or_build(process);
+        let target_triple = name.clone().resolve(&host_arch)?.target;
+        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 '{name}' 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(())
+}
+
 /// Warns if rustup is running under emulation, such as macOS Rosetta
 pub(crate) fn warn_if_host_is_emulated(process: &Process) {
     if TargetTriple::is_host_emulated() {

src/cli/rustup_mode.rs

@@ -9,7 +9,7 @@ use anyhow::{anyhow, Error, Result};
 use clap::{builder::PossibleValue, Args, CommandFactory, Parser, Subcommand, ValueEnum};
 use clap_complete::Shell;
 use itertools::Itertools;
-use tracing::{error, info, trace, warn};
+use tracing::{info, trace, warn};
 
 use crate::{
     cli::{
@@ -815,19 +815,7 @@ async fn update(cfg: &mut Cfg<'_>, opts: UpdateOpts) -> Result<utils::ExitCode>
     if !names.is_empty() {
         for name in names {
             // This needs another pass to fix it all up
-            if name.has_triple() {
-                let host_arch = TargetTriple::from_host_or_build(cfg.process);
-
-                let target_triple = name.clone().resolve(&host_arch)?.target;
-                if !forced && !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 '{name}' 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 {}` instead?",
-                            target_triple.to_string()
-                        );
-                }
-            }
+            common::warn_if_host_is_incompatible(cfg.process, &name, forced)?;
             let desc = name.resolve(&cfg.get_default_host_triple()?)?;
 
             let components = opts.component.iter().map(|s| &**s).collect::<Vec<_>>();