fixup! refactor(rustup-mode): extract warn_if_host_is_incompatible()

Author: rami3l

src/cli/common.rs

@@ -638,18 +638,15 @@ 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,
+    toolchain: impl Display,
+    host_arch: &TargetTriple,
+    target_triple: &TargetTriple,
     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?");
-        }
+    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?");
     }
     Ok(())
 }

src/cli/rustup_mode.rs

@@ -815,7 +815,11 @@ 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
-            common::warn_if_host_is_incompatible(cfg.process, &name, forced)?;
+            if name.has_triple() {
+                let host_arch = TargetTriple::from_host_or_build(cfg.process);
+                let target_triple = name.clone().resolve(&host_arch)?.target;
+                common::warn_if_host_is_incompatible(&name, &host_arch, &target_triple, forced)?;
+            }
             let desc = name.resolve(&cfg.get_default_host_triple()?)?;
 
             let components = opts.component.iter().map(|s| &**s).collect::<Vec<_>>();