notifications: log directly on missing components

Author: djc

src/dist/manifestation.rs

@@ -10,7 +10,7 @@ use anyhow::{Context, Result, anyhow, bail};
 use futures_util::stream::StreamExt;
 use std::sync::Arc;
 use tokio::sync::Semaphore;
-use tracing::info;
+use tracing::{info, warn};
 use url::Url;
 
 use crate::dist::component::{
@@ -229,13 +229,7 @@ impl Manifestation {
                 component.target.as_ref(),
             ));
 
-            tx = self.uninstall_component(
-                component,
-                new_manifest,
-                tx,
-                &download_cfg.notify_handler,
-                download_cfg.process,
-            )?;
+            tx = self.uninstall_component(component, new_manifest, tx, download_cfg.process)?;
         }
 
         // Install components
@@ -313,7 +307,6 @@ impl Manifestation {
         &self,
         manifest: &Manifest,
         tmp_cx: &temp::Context,
-        notify_handler: &dyn Fn(Notification<'_>),
         process: &Process,
     ) -> Result<()> {
         let prefix = self.installation.prefix();
@@ -331,7 +324,7 @@ impl Manifestation {
         tx.remove_file("dist config", rel_config_path)?;
 
         for component in config.components {
-            tx = self.uninstall_component(&component, manifest, tx, notify_handler, process)?;
+            tx = self.uninstall_component(&component, manifest, tx, process)?;
         }
         tx.commit();
 
@@ -343,7 +336,6 @@ impl Manifestation {
         component: &Component,
         manifest: &Manifest,
         mut tx: Transaction<'a>,
-        notify_handler: &dyn Fn(Notification<'_>),
         process: &Process,
     ) -> Result<Transaction<'a>> {
         // For historical reasons, the rust-installer component
@@ -357,9 +349,10 @@ impl Manifestation {
         } else if let Some(c) = self.installation.find(short_name)? {
             tx = c.uninstall(tx, process)?;
         } else {
-            notify_handler(Notification::MissingInstalledComponent(
-                &component.short_name(manifest),
-            ));
+            warn!(
+                component = %component.short_name(manifest),
+                "component not found during uninstall"
+            );
         }
 
         Ok(tx)

src/dist/manifestation/tests.rs

@@ -540,7 +540,7 @@ impl TestContext {
         let manifestation = Manifestation::open(self.prefix.clone(), trip)?;
         let manifest = manifestation.load_manifest()?.unwrap();
 
-        manifestation.uninstall(&manifest, &self.tmp_cx, &|_| (), &self.tp.process)?;
+        manifestation.uninstall(&manifest, &self.tmp_cx, &self.tp.process)?;
 
         Ok(())
     }

src/notifications.rs

@@ -13,7 +13,6 @@ use crate::{dist::ToolchainDesc, toolchain::ToolchainName, utils::notify::Notifi
 pub(crate) enum Notification<'a> {
     FileAlreadyDownloaded,
     CachedFileChecksumFailed,
-    MissingInstalledComponent(&'a str),
     /// 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>),
@@ -79,10 +78,9 @@ impl Notification<'_> {
             | SkippingNightlyMissingComponent(_, _, _)
             | RetryingDownload(_)
             | DownloadedManifest(_, _) => NotificationLevel::Info,
-            MissingInstalledComponent(_)
-            | CachedFileChecksumFailed
-            | ForcingUnavailableComponent(_)
-            | StrayHash(_) => NotificationLevel::Warn,
+            CachedFileChecksumFailed | ForcingUnavailableComponent(_) | StrayHash(_) => {
+                NotificationLevel::Warn
+            }
             SetDefaultBufferSize(_) => NotificationLevel::Trace,
             DownloadingFile(_)
             | DownloadContentLengthReceived(_, _)
@@ -118,9 +116,6 @@ impl Display for Notification<'_> {
         match self {
             FileAlreadyDownloaded => write!(f, "reusing previously downloaded file"),
             CachedFileChecksumFailed => write!(f, "bad checksum for cached download"),
-            MissingInstalledComponent(c) => {
-                write!(f, "during uninstall component {c} was not found")
-            }
             DownloadingComponent(c, h, t, _) => {
                 if Some(h) == t.as_ref() || t.is_none() {
                     write!(f, "downloading component '{c}'")