notifications: log directly when component is already installed

Author: djc

src/dist/manifestation.rs

@@ -122,13 +122,7 @@ impl Manifestation {
 
         // Create the lists of components needed for installation
         let config = self.read_config()?;
-        let mut update = Update::build_update(
-            self,
-            new_manifest,
-            &changes,
-            &config,
-            &download_cfg.notify_handler,
-        )?;
+        let mut update = Update::build_update(self, new_manifest, &changes, &config)?;
 
         if update.nothing_changes() {
             return Ok(UpdateStatus::Unchanged);
@@ -539,7 +533,6 @@ impl Update {
         new_manifest: &Manifest,
         changes: &Changes,
         config: &Option<Config>,
-        notify_handler: &dyn Fn(Notification<'_>),
     ) -> Result<Self> {
         // The package to install.
         let rust_package = new_manifest.get_package("rust")?;
@@ -601,9 +594,17 @@ impl Update {
                 if !starting_list.contains(component) {
                     result.components_to_install.push(component.clone());
                 } else if changes.explicit_add_components.contains(component) {
-                    notify_handler(Notification::ComponentAlreadyInstalled(
-                        &component.description(new_manifest),
-                    ));
+                    match &component.target {
+                        Some(t) if t != &manifestation.target_triple => info!(
+                            "component {} for target {} is up to date",
+                            component.short_name(new_manifest),
+                            t,
+                        ),
+                        _ => info!(
+                            "component {} is up to date",
+                            component.short_name(new_manifest)
+                        ),
+                    }
                 }
             }
         } else {

src/notifications.rs

@@ -11,7 +11,6 @@ use crate::{dist::ToolchainDesc, toolchain::ToolchainName, utils::notify::Notifi
 
 #[derive(Debug)]
 pub(crate) enum Notification<'a> {
-    ComponentAlreadyInstalled(&'a str),
     CantReadUpdateHash(&'a Path),
     NoUpdateHash(&'a Path),
     FileAlreadyDownloaded,
@@ -81,7 +80,6 @@ impl Notification<'_> {
             | InstallingComponent(_, _, _)
             | RemovingComponent(_, _, _)
             | RemovingOldComponent(_, _, _)
-            | ComponentAlreadyInstalled(_)
             | DownloadingManifest(_)
             | SkippingNightlyMissingComponent(_, _, _)
             | RetryingDownload(_)
@@ -125,7 +123,6 @@ impl Display for Notification<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> std::result::Result<(), fmt::Error> {
         use self::Notification::*;
         match self {
-            ComponentAlreadyInstalled(c) => write!(f, "component {c} is up to date"),
             CantReadUpdateHash(path) => write!(
                 f,
                 "can't read update hash file: '{}', can't skip update...",

tests/suite/cli_v2.rs

@@ -1630,7 +1630,7 @@ async fn add_target_again() {
         .expect(["rustup", "target", "add", CROSS_ARCH1])
         .await
         .with_stderr(snapbox::str![[r#"
-info: component 'rust-std' for target '[CROSS_ARCH_I]' is up to date
+info: component rust-std for target [CROSS_ARCH_I] is up to date
 
 "#]])
         .is_ok();
@@ -2563,7 +2563,7 @@ async fn regression_2601() {
         .expect(["rustup", "component", "add", "rust-src"])
         .await
         .with_stderr(snapbox::str![[r#"
-info: component 'rust-src' is up to date
+info: component rust-src is up to date
 
 "#]])
         .is_ok();