notifications: log directly when uninstalling toolchains

Author: djc

src/notifications.rs

@@ -3,8 +3,8 @@ use std::path::{Path, PathBuf};
 
 use crate::dist::TargetTriple;
 use crate::settings::MetadataVersion;
+use crate::utils::notify::NotificationLevel;
 use crate::utils::units;
-use crate::{toolchain::ToolchainName, utils::notify::NotificationLevel};
 
 #[derive(Debug)]
 pub(crate) enum Notification<'a> {
@@ -26,8 +26,6 @@ pub(crate) enum Notification<'a> {
     /// member, but the notification callback is already narrowed to
     /// utils::notifications by the time tar unpacking is called.
     SetDefaultBufferSize(usize),
-    UninstallingToolchain(&'a ToolchainName),
-    UninstalledToolchain(&'a ToolchainName),
     UpgradingMetadata(MetadataVersion, MetadataVersion),
     MetadataUpgradeNotNeeded(MetadataVersion),
     ReadMetadataVersion(MetadataVersion),
@@ -52,10 +50,7 @@ impl Notification<'_> {
             | DownloadFinished(_)
             | DownloadFailed(_) => NotificationLevel::Debug,
             ReadMetadataVersion(_) => NotificationLevel::Debug,
-            UninstallingToolchain(_)
-            | UninstalledToolchain(_)
-            | UpgradingMetadata(_, _)
-            | MetadataUpgradeNotNeeded(_) => NotificationLevel::Info,
+            UpgradingMetadata(_, _) | MetadataUpgradeNotNeeded(_) => NotificationLevel::Info,
             UpgradeRemovesToolchains | DuplicateToolchainFile { .. } => NotificationLevel::Warn,
         }
     }
@@ -84,8 +79,6 @@ impl Display for Notification<'_> {
             DownloadDataReceived(data, _) => write!(f, "received some data of size {}", data.len()),
             DownloadFinished(_) => write!(f, "download finished"),
             DownloadFailed(_) => write!(f, "download failed"),
-            UninstallingToolchain(name) => write!(f, "uninstalling toolchain '{name}'"),
-            UninstalledToolchain(name) => write!(f, "toolchain '{name}' uninstalled"),
             UpgradingMetadata(from_ver, to_ver) => write!(
                 f,
                 "upgrading metadata version from '{from_ver}' to '{to_ver}'"

src/toolchain.rs

@@ -28,7 +28,6 @@ use crate::{
         prefix::InstallPrefix,
     },
     env_var, install,
-    notifications::Notification,
     utils::{self, raw::open_dir_following_links},
 };
 
@@ -544,7 +543,7 @@ impl<'a> Toolchain<'a> {
         };
         let fs_modified = match Self::exists(cfg, &(&name).into())? {
             true => {
-                (cfg.notify_handler)(Notification::UninstallingToolchain(&name));
+                info!("uninstalling toolchain {name}");
                 let installed_paths = match &name {
                     ToolchainName::Custom(_) => Ok(vec![InstalledPath::Dir { path: &path }]),
                     ToolchainName::Official(desc) => cfg.installed_paths(desc, &path),
@@ -562,7 +561,7 @@ impl<'a> Toolchain<'a> {
             false => {
                 // Might be a dangling symlink
                 if path.is_symlink() {
-                    (cfg.notify_handler)(Notification::UninstallingToolchain(&name));
+                    info!("uninstalling toolchain {name}");
                     fs::remove_dir_all(&path)?;
                     true
                 } else {
@@ -579,7 +578,7 @@ impl<'a> Toolchain<'a> {
         };
 
         if !path.is_symlink() && !path.exists() && fs_modified {
-            (cfg.notify_handler)(Notification::UninstalledToolchain(&name));
+            info!("toolchain {name} uninstalled");
         }
         Ok(())
     }

tests/suite/cli_misc.rs

@@ -1028,8 +1028,8 @@ test
         .expect(["rustup", "toolchain", "uninstall", "test"])
         .await
         .with_stderr(snapbox::str![[r#"
-info: uninstalling toolchain 'test'
-info: toolchain 'test' uninstalled
+info: uninstalling toolchain test
+info: toolchain test uninstalled
 
 "#]])
         .is_ok();

tests/suite/cli_v2.rs

@@ -375,7 +375,7 @@ async fn remove_toolchain_ignore_trailing_slash() {
         .await
         .with_stderr(snapbox::str![[r#"
 ...
-info: toolchain 'dev' uninstalled
+info: toolchain dev uninstalled
 ...
 "#]])
         .is_ok();
@@ -397,7 +397,7 @@ info: toolchain 'dev' uninstalled
         .await
         .with_stderr(snapbox::str![[r#"
 ...
-info: toolchain 'nightly-[HOST_TRIPLE]' uninstalled
+info: toolchain nightly-[HOST_TRIPLE] uninstalled
 ...
 "#]])
         .is_ok();