refactor(cli/common)!: take in toolchain: String in `warn_if_host_i…

…s_incompatible()`
rust-lang · Sep 22, 2024 · d28e306 · d28e306
1 parent 6c53684
commit d28e306
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/cli/common.rs b/src/cli/common.rs
@@ -629,7 +629,7 @@ 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(
-    toolchain: impl Display,
+    toolchain: String,
     host_arch: &TargetTriple,
     target_triple: &TargetTriple,
     force_non_host: bool,

diff --git a/src/cli/rustup_mode.rs b/src/cli/rustup_mode.rs
@@ -838,7 +838,7 @@ async fn update(
                 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,
+                    name.to_string(),
                     &host_arch,
                     &target_triple,
                     force_non_host,

diff --git a/src/config.rs b/src/config.rs
@@ -794,7 +794,7 @@ impl<'a> Cfg<'a> {
         verbose: bool,
     ) -> Result<(UpdateStatus, Toolchain<'_>)> {
         common::warn_if_host_is_incompatible(
-            toolchain,
+            toolchain.to_string(),
             &TargetTriple::from_host_or_build(self.process),
             &toolchain.target,
             force_non_host,