notifications: log directly on missing components

Author: djc

src/dist/mod.rs

@@ -990,11 +990,21 @@ pub(crate) async fn update_from_dist(
         let cause = e.downcast_ref::<DistError>();
         match cause {
             Some(DistError::ToolchainComponentsMissing(components, manifest, ..)) => {
-                (opts.dl_cfg.notify_handler)(Notification::SkippingNightlyMissingComponent(
-                    &toolchain,
-                    current_manifest.as_ref().unwrap_or(manifest),
+                let plural = if components.len() > 1 { "s" } else { "" };
+                let manifest = current_manifest.as_ref().unwrap_or(manifest);
+                let components = components
+                    .iter()
+                    .map(
+                        |component| match component.target.as_ref() == Some(&toolchain.target) {
+                            true => component.short_name(manifest),
+                            false => component.name(manifest),
+                        },
+                    )
+                    .join(", ");
+                info!(
                     components,
-                ));
+                    "skipping nightly with missing component{plural}"
+                );
 
                 if first_err.is_none() {
                     first_err = Some(e);

src/notifications.rs

@@ -4,7 +4,6 @@ use std::path::{Path, PathBuf};
 use url::Url;
 
 use crate::dist::TargetTriple;
-use crate::dist::manifest::{Component, Manifest};
 use crate::settings::MetadataVersion;
 use crate::utils::units;
 use crate::{dist::ToolchainDesc, toolchain::ToolchainName, utils::notify::NotificationLevel};
@@ -15,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),
-    SkippingNightlyMissingComponent(&'a ToolchainDesc, &'a Manifest, &'a [Component]),
     ForcingUnavailableComponent(&'a str),
     StrayHash(&'a Path),
     RetryingDownload(&'a str),
@@ -64,9 +62,7 @@ impl Notification<'_> {
         use self::Notification::*;
         match self {
             FileAlreadyDownloaded => NotificationLevel::Debug,
-            DownloadingComponent(_, _, _, _)
-            | SkippingNightlyMissingComponent(_, _, _)
-            | RetryingDownload(_) => NotificationLevel::Info,
+            DownloadingComponent(_, _, _, _) | RetryingDownload(_) => NotificationLevel::Info,
             CachedFileChecksumFailed | ForcingUnavailableComponent(_) | StrayHash(_) => {
                 NotificationLevel::Warn
             }
@@ -117,22 +113,6 @@ impl Display for Notification<'_> {
                 "removing stray hash found at '{}' in order to continue",
                 path.display()
             ),
-            SkippingNightlyMissingComponent(toolchain, manifest, components) => write!(
-                f,
-                "skipping nightly which is missing installed component{} '{}'",
-                if components.len() > 1 { "s" } else { "" },
-                components
-                    .iter()
-                    .map(|component| {
-                        if component.target.as_ref() != Some(&toolchain.target) {
-                            component.name(manifest)
-                        } else {
-                            component.short_name(manifest)
-                        }
-                    })
-                    .collect::<Vec<_>>()
-                    .join("', '")
-            ),
             ForcingUnavailableComponent(component) => {
                 write!(f, "Force-skipping unavailable component '{component}'")
             }

tests/suite/cli_exact.rs

@@ -869,7 +869,7 @@ async fn install_unreleased_component() {
         .with_stderr(snapbox::str![[r#"
 info: syncing channel updates toolchain=nightly-[HOST_TRIPLE]
 info: latest update updated=2019-09-13 version=1.37.0 (hash-nightly-2)
-info: skipping nightly which is missing installed component 'rust-std-[MULTI_ARCH_I]'
+info: skipping nightly with missing component components="rust-std-[MULTI_ARCH_I]"
 info: syncing channel updates toolchain=nightly-2019-09-12-[HOST_TRIPLE]
 
 "#]]);
@@ -889,10 +889,10 @@ info: syncing channel updates toolchain=nightly-2019-09-12-[HOST_TRIPLE]
         .with_stderr(snapbox::str![[r#"
 info: syncing channel updates toolchain=nightly-[HOST_TRIPLE]
 info: latest update updated=2019-09-14 version=1.37.0 (hash-nightly-3)
-info: skipping nightly which is missing installed component 'rls'
+info: skipping nightly with missing component components="rls"
 info: syncing channel updates toolchain=nightly-2019-09-13-[HOST_TRIPLE]
 info: latest update updated=2019-09-13 version=1.37.0 (hash-nightly-2)
-info: skipping nightly which is missing installed component 'rust-std-[MULTI_ARCH_I]'
+info: skipping nightly with missing component components="rust-std-[MULTI_ARCH_I]"
 info: syncing channel updates toolchain=nightly-2019-09-12-[HOST_TRIPLE]
 
 "#]]);