notifications: log directly when removing components

Author: djc

src/dist/manifestation.rs

@@ -218,16 +218,31 @@ impl Manifestation {
 
         // Uninstall components
         for component in &update.components_to_uninstall {
-            let notification = if implicit_modify {
-                Notification::RemovingOldComponent
-            } else {
-                Notification::RemovingComponent
-            };
-            (download_cfg.notify_handler)(notification(
-                &component.short_name(new_manifest),
-                &self.target_triple,
-                component.target.as_ref(),
-            ));
+            match (implicit_modify, &component.target) {
+                (true, Some(t)) if t != &self.target_triple => {
+                    info!(
+                        "removing previous version of component {} for target {}",
+                        component.short_name(new_manifest),
+                        t
+                    );
+                }
+                (false, Some(t)) if t != &self.target_triple => {
+                    info!(
+                        "removing component {} for target {}",
+                        component.short_name(new_manifest),
+                        t
+                    );
+                }
+                (true, _) => {
+                    info!(
+                        "removing previous version of component {}",
+                        component.short_name(new_manifest),
+                    );
+                }
+                (false, _) => {
+                    info!("removing component {}", component.short_name(new_manifest));
+                }
+            }
 
             tx = self.uninstall_component(component, new_manifest, tx, download_cfg.process)?;
         }

src/notifications.rs

@@ -15,8 +15,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),
-    RemovingComponent(&'a str, &'a TargetTriple, Option<&'a TargetTriple>),
-    RemovingOldComponent(&'a str, &'a TargetTriple, Option<&'a TargetTriple>),
     DownloadingManifest(&'a str),
     DownloadedManifest(&'a str, Option<&'a str>),
     DownloadingLegacyManifest,
@@ -70,8 +68,6 @@ impl Notification<'_> {
         match self {
             FileAlreadyDownloaded | DownloadingLegacyManifest => NotificationLevel::Debug,
             DownloadingComponent(_, _, _, _)
-            | RemovingComponent(_, _, _)
-            | RemovingOldComponent(_, _, _)
             | DownloadingManifest(_)
             | SkippingNightlyMissingComponent(_, _, _)
             | RetryingDownload(_)
@@ -121,25 +117,6 @@ impl Display for Notification<'_> {
                     write!(f, "downloading component '{}' for '{}'", c, t.unwrap())
                 }
             }
-            RemovingComponent(c, h, t) => {
-                if Some(h) == t.as_ref() || t.is_none() {
-                    write!(f, "removing component '{c}'")
-                } else {
-                    write!(f, "removing component '{}' for '{}'", c, t.unwrap())
-                }
-            }
-            RemovingOldComponent(c, h, t) => {
-                if Some(h) == t.as_ref() || t.is_none() {
-                    write!(f, "removing previous version of component '{c}'")
-                } else {
-                    write!(
-                        f,
-                        "removing previous version of component '{}' for '{}'",
-                        c,
-                        t.unwrap()
-                    )
-                }
-            }
             DownloadingManifest(t) => write!(f, "syncing channel updates for '{t}'"),
             DownloadedManifest(date, Some(version)) => {
                 write!(f, "latest update on {date}, rust version {version}")