notifications: log directly when removing stray hash files

Author: djc

src/dist/mod.rs

@@ -16,7 +16,6 @@ use tracing::{debug, info, warn};
 use crate::{
     config::{Cfg, dist_root_server},
     errors::RustupError,
-    notifications::Notification,
     process::Process,
     toolchain::ToolchainName,
     utils,
@@ -912,7 +911,10 @@ pub(crate) async fn update_from_dist(
     if let Some(hash) = opts.update_hash {
         // fresh_install means the toolchain isn't present, but hash_exists means there is a stray hash file
         if fresh_install && Path::exists(hash) {
-            (opts.dl_cfg.notify_handler)(Notification::StrayHash(hash));
+            warn!(
+                "removing stray hash file in order to continue: {}",
+                hash.display()
+            );
             std::fs::remove_file(hash)?;
         }
     }

src/notifications.rs

@@ -14,7 +14,6 @@ pub(crate) enum Notification<'a> {
     CachedFileChecksumFailed,
     /// The URL of the download is passed as the last argument, to allow us to track concurrent downloads.
     DownloadingComponent(&'a str, &'a TargetTriple, Option<&'a TargetTriple>, &'a str),
-    StrayHash(&'a Path),
     RetryingDownload(&'a str),
     DownloadingFile(&'a Url),
     /// Received the Content-Length of the to-be downloaded data with
@@ -62,7 +61,7 @@ impl Notification<'_> {
         match self {
             FileAlreadyDownloaded => NotificationLevel::Debug,
             DownloadingComponent(_, _, _, _) | RetryingDownload(_) => NotificationLevel::Info,
-            CachedFileChecksumFailed | StrayHash(_) => NotificationLevel::Warn,
+            CachedFileChecksumFailed => NotificationLevel::Warn,
             SetDefaultBufferSize(_) => NotificationLevel::Trace,
             DownloadingFile(_)
             | DownloadContentLengthReceived(_, _)
@@ -105,11 +104,6 @@ impl Display for Notification<'_> {
                     write!(f, "downloading component '{}' for '{}'", c, t.unwrap())
                 }
             }
-            StrayHash(path) => write!(
-                f,
-                "removing stray hash found at '{}' in order to continue",
-                path.display()
-            ),
             RetryingDownload(url) => write!(f, "retrying download for '{url}'"),
             SetDefaultBufferSize(size) => write!(
                 f,

tests/suite/cli_v2.rs

@@ -1914,7 +1914,7 @@ async fn warn_about_and_remove_stray_hash() {
         .await
         .with_stderr(snapbox::str![[r#"
 ...
-warn: removing stray hash found at '[..]/update-hashes/nightly-[HOST_TRIPLE]' in order to continue
+warn: removing stray hash file in order to continue: [..]/update-hashes/nightly-[HOST_TRIPLE]
 ...
 "#]])
         .is_ok();
@@ -1972,7 +1972,7 @@ async fn add_missing_component() {
         .with_stderr(snapbox::str![[r#"
 ...
 error: component 'rls' for target '[HOST_TRIPLE]' is unavailable for download for channel 'nightly'
-Sometimes not all components are available in any given nightly. 
+Sometimes not all components are available in any given nightly.
 ...
 "#]])
         .is_err();