notifications: remove unused Display impl

Author: djc

src/dist/download.rs

@@ -254,7 +254,7 @@ impl DownloadTracker {
                 self.download_failed(url);
                 debug!("download failed");
             }
-            Notification::DownloadingComponent(component, _, _, url) => {
+            Notification::DownloadingComponent(component, url) => {
                 self.create_progress_bar(component.to_owned(), url.to_owned());
             }
             Notification::RetryingDownload(url) => {

src/dist/manifestation.rs

@@ -182,8 +182,6 @@ impl Manifestation {
                 .notifier
                 .handle(Notification::DownloadingComponent(
                     &bin.component.short_name(new_manifest),
-                    &self.target_triple,
-                    bin.component.target.as_ref(),
                     &bin.binary.url,
                 ));
         }
@@ -452,12 +450,9 @@ impl Manifestation {
             .unwrap()
             .replace(DEFAULT_DIST_SERVER, dl_cfg.tmp_cx.dist_server.as_str());
 
-        dl_cfg.notifier.handle(Notification::DownloadingComponent(
-            "rust",
-            &self.target_triple,
-            Some(&self.target_triple),
-            &url,
-        ));
+        dl_cfg
+            .notifier
+            .handle(Notification::DownloadingComponent("rust", &url));
 
         let dl = dl_cfg
             .download_and_check(&url, update_hash, ".tar.gz")

src/notifications.rs

@@ -1,11 +1,7 @@
-use std::fmt::{self, Display};
-
-use crate::dist::TargetTriple;
-
 #[derive(Debug)]
 pub(crate) enum Notification<'a> {
     /// 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),
+    DownloadingComponent(&'a str, &'a str),
     RetryingDownload(&'a str),
     /// Received the Content-Length of the to-be downloaded data with
     /// the respective URL of the download (for tracking concurrent downloads).
@@ -17,23 +13,3 @@ pub(crate) enum Notification<'a> {
     /// Download has failed.
     DownloadFailed(&'a str),
 }
-
-impl Display for Notification<'_> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> std::result::Result<(), fmt::Error> {
-        use self::Notification::*;
-        match self {
-            DownloadingComponent(c, h, t, _) => {
-                if Some(h) == t.as_ref() || t.is_none() {
-                    write!(f, "downloading component '{c}'")
-                } else {
-                    write!(f, "downloading component '{}' for '{}'", c, t.unwrap())
-                }
-            }
-            RetryingDownload(url) => write!(f, "retrying download for '{url}'"),
-            DownloadContentLengthReceived(len, _) => write!(f, "download size is: '{len}'"),
-            DownloadDataReceived(data, _) => write!(f, "received some data of size {}", data.len()),
-            DownloadFinished(_) => write!(f, "download finished"),
-            DownloadFailed(_) => write!(f, "download failed"),
-        }
-    }
-}