notifications: log directly when installing components

Author: djc

src/dist/manifestation.rs

@@ -242,11 +242,14 @@ impl Manifestation {
             let short_pkg_name = component.short_name_in_manifest();
             let short_name = component.short_name(new_manifest);
 
-            (download_cfg.notify_handler)(Notification::InstallingComponent(
-                &short_name,
-                &self.target_triple,
-                component.target.as_ref(),
-            ));
+            match &component.target {
+                Some(t) if t != &self.target_triple => {
+                    info!(component = short_name, "installing component");
+                }
+                _ => {
+                    info!(component = short_name, target = %self.target_triple, "installing component")
+                }
+            }
 
             let cx = PackageContext {
                 tmp_cx,
@@ -450,12 +453,7 @@ impl Manifestation {
         let (installer_file, installer_hash) = dl.unwrap();
 
         let prefix = self.installation.prefix();
-
-        notify_handler(Notification::InstallingComponent(
-            "rust",
-            &self.target_triple,
-            Some(&self.target_triple),
-        ));
+        info!(component = "rust", "installing component");
 
         // Begin transaction
         let mut tx = Transaction::new(prefix, tmp_cx, process);

src/notifications.rs

@@ -15,7 +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),
-    InstallingComponent(&'a str, &'a TargetTriple, Option<&'a TargetTriple>),
     RemovingComponent(&'a str, &'a TargetTriple, Option<&'a TargetTriple>),
     RemovingOldComponent(&'a str, &'a TargetTriple, Option<&'a TargetTriple>),
     DownloadingManifest(&'a str),
@@ -71,7 +70,6 @@ impl Notification<'_> {
         match self {
             FileAlreadyDownloaded | DownloadingLegacyManifest => NotificationLevel::Debug,
             DownloadingComponent(_, _, _, _)
-            | InstallingComponent(_, _, _)
             | RemovingComponent(_, _, _)
             | RemovingOldComponent(_, _, _)
             | DownloadingManifest(_)
@@ -123,13 +121,6 @@ impl Display for Notification<'_> {
                     write!(f, "downloading component '{}' for '{}'", c, t.unwrap())
                 }
             }
-            InstallingComponent(c, h, t) => {
-                if Some(h) == t.as_ref() || t.is_none() {
-                    write!(f, "installing component '{c}'")
-                } else {
-                    write!(f, "installing component '{}' for '{}'", c, t.unwrap())
-                }
-            }
             RemovingComponent(c, h, t) => {
                 if Some(h) == t.as_ref() || t.is_none() {
                     write!(f, "removing component '{c}'")