notifications: log directly when skipping components

Author: djc

src/dist/manifestation.rs

@@ -137,9 +137,17 @@ impl Manifestation {
                 e.downcast::<RustupError>()
             {
                 for component in &components {
-                    (download_cfg.notify_handler)(Notification::ForcingUnavailableComponent(
-                        &component.name(new_manifest),
-                    ));
+                    match &component.target {
+                        Some(t) if t != &self.target_triple => warn!(
+                            "skipping unavailable component {} for target {}",
+                            component.short_name(new_manifest),
+                            t
+                        ),
+                        _ => warn!(
+                            "skipping unavailable component {}",
+                            component.short_name(new_manifest)
+                        ),
+                    }
                 }
                 update.drop_components_to_install(&components);
             }

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),
-    ForcingUnavailableComponent(&'a str),
     StrayHash(&'a Path),
     RetryingDownload(&'a str),
     DownloadingFile(&'a Url),
@@ -63,9 +62,7 @@ impl Notification<'_> {
         match self {
             FileAlreadyDownloaded => NotificationLevel::Debug,
             DownloadingComponent(_, _, _, _) | RetryingDownload(_) => NotificationLevel::Info,
-            CachedFileChecksumFailed | ForcingUnavailableComponent(_) | StrayHash(_) => {
-                NotificationLevel::Warn
-            }
+            CachedFileChecksumFailed | StrayHash(_) => NotificationLevel::Warn,
             SetDefaultBufferSize(_) => NotificationLevel::Trace,
             DownloadingFile(_)
             | DownloadContentLengthReceived(_, _)
@@ -113,9 +110,6 @@ impl Display for Notification<'_> {
                 "removing stray hash found at '{}' in order to continue",
                 path.display()
             ),
-            ForcingUnavailableComponent(component) => {
-                write!(f, "Force-skipping unavailable component '{component}'")
-            }
             RetryingDownload(url) => write!(f, "retrying download for '{url}'"),
             SetDefaultBufferSize(size) => write!(
                 f,

tests/suite/cli_inst_interactive.rs

@@ -478,7 +478,7 @@ async fn install_forces_and_skips_rls() {
     .is_ok()
     .with_stderr(snapbox::str![[r#"
 ...
-warn: Force-skipping unavailable component 'rls-[HOST_TRIPLE]'
+warn: skipping unavailable component rls
 ...
 "#]]);
 }

tests/suite/cli_rustup.rs

@@ -2770,7 +2770,7 @@ components = [ "rust-bongo" ]
         .await
         .with_stderr(snapbox::str![[r#"
 ...
-warn: Force-skipping unavailable component 'rust-bongo-[HOST_TRIPLE]'
+warn: skipping unavailable component rust-bongo
 ...
 "#]])
         .is_ok();

tests/suite/cli_v2.rs

@@ -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();
@@ -2419,7 +2419,7 @@ error: component 'rls' for target '[HOST_TRIPLE]' is unavailable for download fo
         .await
         .with_stderr(snapbox::str![[r#"
 ...
-warn: Force-skipping unavailable component 'rls-[HOST_TRIPLE]'
+warn: skipping unavailable component rls
 ...
 "#]])
         .is_ok();
@@ -2460,7 +2460,7 @@ async fn run_with_install_flag_against_unavailable_component() {
         .with_stderr(snapbox::str![[r#"
 info: syncing channel updates for nightly-[HOST_TRIPLE]
 info: latest update on 2015-01-02 for version 1.3.0 (hash-nightly-2)
-warn: Force-skipping unavailable component 'rust-std-[HOST_TRIPLE]'
+warn: skipping unavailable component rust-std
 info: downloading component[..]
 ...
 "#]])