notifications: log directly when using existing toolchains

Author: djc

src/config.rs

@@ -837,7 +837,7 @@ impl<'a> Cfg<'a> {
             }
             Ok(mut distributable) => {
                 if verbose {
-                    (self.notify_handler)(Notification::UsingExistingToolchain(toolchain));
+                    info!("using existing install for {toolchain}");
                 }
                 let status = if !distributable.components_exist(&components, &targets)? {
                     distributable.update(&components, &targets, profile).await?

src/notifications.rs

@@ -4,7 +4,7 @@ use std::path::{Path, PathBuf};
 use crate::dist::TargetTriple;
 use crate::settings::MetadataVersion;
 use crate::utils::units;
-use crate::{dist::ToolchainDesc, toolchain::ToolchainName, utils::notify::NotificationLevel};
+use crate::{toolchain::ToolchainName, utils::notify::NotificationLevel};
 
 #[derive(Debug)]
 pub(crate) enum Notification<'a> {
@@ -30,7 +30,6 @@ pub(crate) enum Notification<'a> {
     UpdatingToolchain(&'a str),
     InstallingToolchain(&'a str),
     InstalledToolchain(&'a str),
-    UsingExistingToolchain(&'a ToolchainDesc),
     UninstallingToolchain(&'a ToolchainName),
     UninstalledToolchain(&'a ToolchainName),
     UpdateHashMatches,
@@ -63,8 +62,7 @@ impl Notification<'_> {
             | ReadMetadataVersion(_)
             | InstalledToolchain(_)
             | UpdateHashMatches => NotificationLevel::Debug,
-            UsingExistingToolchain(_)
-            | UninstallingToolchain(_)
+            UninstallingToolchain(_)
             | UninstalledToolchain(_)
             | UpgradingMetadata(_, _)
             | MetadataUpgradeNotNeeded(_) => NotificationLevel::Info,
@@ -100,7 +98,6 @@ impl Display for Notification<'_> {
             UpdatingToolchain(name) => write!(f, "updating existing install for '{name}'"),
             InstallingToolchain(name) => write!(f, "installing toolchain '{name}'"),
             InstalledToolchain(name) => write!(f, "toolchain '{name}' installed"),
-            UsingExistingToolchain(name) => write!(f, "using existing install for '{name}'"),
             UninstallingToolchain(name) => write!(f, "uninstalling toolchain '{name}'"),
             UninstalledToolchain(name) => write!(f, "toolchain '{name}' uninstalled"),
             UpdateHashMatches => write!(f, "toolchain is already up to date"),

tests/suite/cli_exact.rs

@@ -355,7 +355,7 @@ async fn override_again() {
         .is_ok()
         .with_stdout(snapbox::str![[""]])
         .with_stderr(snapbox::str![[r#"
-info: override toolchain for '[CWD]' set to 'nightly-[HOST_TRIPLE]'
+info: override toolchain for [CWD] set to nightly-[HOST_TRIPLE]
 
 "#]]);
 }

tests/suite/cli_misc.rs

@@ -636,7 +636,7 @@ async fn toolchains_are_resolved_early() {
         .await
         .with_stderr(snapbox::str![[r#"
 ...
-info: using existing install for 'nightly-[HOST_TRIPLE]'
+info: using existing install for nightly-[HOST_TRIPLE]
 ...
 "#]])
         .is_ok();

tests/suite/cli_rustup.rs

@@ -322,7 +322,7 @@ async fn default_override() {
         .expect(["rustup", "default", "stable"])
         .await
         .with_stderr(snapbox::str![[r#"
-info: using existing install for 'stable-[HOST_TRIPLE]'
+info: using existing install for stable-[HOST_TRIPLE]
 info: default toolchain set to stable-[HOST_TRIPLE]
 info: note that the toolchain 'nightly-[HOST_TRIPLE]' is currently in use (directory override for '[..]')
 
@@ -1729,7 +1729,7 @@ rustc-[HOST_TRIPLE]
         .await
         .extend_redactions([("[TOOLCHAIN_FILE]", &toolchain_file)])
         .with_stderr(snapbox::str![[r#"
-info: using existing install for 'nightly-[HOST_TRIPLE]'
+info: using existing install for nightly-[HOST_TRIPLE]
 info: the active toolchain `nightly-[HOST_TRIPLE]` has been installed
 info: it's active because: overridden by '[TOOLCHAIN_FILE]'
 

tests/suite/cli_v1.rs

@@ -147,7 +147,7 @@ async fn default_existing_toolchain() {
         .await
         .with_stderr(snapbox::str![[r#"
 ...
-info: using existing install for 'nightly-[HOST_TRIPLE]'
+info: using existing install for nightly-[HOST_TRIPLE]
 ...
 "#]])
         .is_ok();

tests/suite/cli_v2.rs

@@ -196,7 +196,7 @@ async fn default_existing_toolchain() {
         .await
         .with_stderr(snapbox::str![[r#"
 ...
-info: using existing install for 'nightly-[HOST_TRIPLE]'
+info: using existing install for nightly-[HOST_TRIPLE]
 ...
 "#]])
         .is_ok();