dist: move Notification into dist::download

Author: djc

src/diskio/threaded.rs

@@ -15,8 +15,7 @@ use sharded_slab::pool::{OwnedRef, OwnedRefMut};
 use tracing::debug;
 
 use super::{CompletedIo, Executor, Item, perform};
-use crate::dist::download::Notifier;
-use crate::notifications::Notification;
+use crate::dist::download::{Notification, Notifier};
 
 #[derive(Copy, Clone, Debug, Enum)]
 pub(crate) enum Bucket {

src/dist/download.rs

@@ -15,7 +15,6 @@ use crate::config::Cfg;
 use crate::dist::temp;
 use crate::download::{download_file, download_file_with_resume};
 use crate::errors::*;
-use crate::notifications::Notification;
 use crate::process::Process;
 use crate::utils;
 
@@ -339,9 +338,25 @@ impl DownloadTracker {
     }
 }
 
-fn file_hash(path: &Path, notify_handler: &Notifier) -> Result<String> {
+#[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 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).
+    DownloadContentLengthReceived(u64, Option<&'a str>),
+    /// Received some data.
+    DownloadDataReceived(&'a [u8], Option<&'a str>),
+    /// Download has finished.
+    DownloadFinished(Option<&'a str>),
+    /// Download has failed.
+    DownloadFailed(&'a str),
+}
+
+fn file_hash(path: &Path, notifier: &Notifier) -> Result<String> {
     let mut hasher = Sha256::new();
-    let mut downloaded = utils::FileReaderWithProgress::new_file(path, notify_handler)?;
+    let mut downloaded = utils::FileReaderWithProgress::new_file(path, notifier)?;
     use std::io::Read;
     let mut buf = vec![0; 32768];
     while let Ok(n) = downloaded.read(&mut buf) {

src/dist/manifestation.rs

@@ -17,14 +17,13 @@ use crate::dist::component::{
     Components, Package, PackageContext, TarGzPackage, TarXzPackage, TarZStdPackage, Transaction,
 };
 use crate::dist::config::Config;
-use crate::dist::download::{DownloadCfg, File};
+use crate::dist::download::{DownloadCfg, File, Notification};
 use crate::dist::manifest::{Component, CompressionKind, HashedBinary, Manifest, TargetedPackage};
 use crate::dist::prefix::InstallPrefix;
 #[cfg(test)]
 use crate::dist::temp;
 use crate::dist::{DEFAULT_DIST_SERVER, Profile, TargetTriple};
 use crate::errors::RustupError;
-use crate::notifications::Notification;
 use crate::process::Process;
 use crate::utils;
 

src/download/mod.rs

@@ -27,7 +27,9 @@ use tracing::warn;
 use url::Url;
 
 use crate::{
-    dist::download::Notifier, errors::RustupError, notifications::Notification, process::Process,
+    dist::download::{Notification, Notifier},
+    errors::RustupError,
+    process::Process,
 };
 
 #[cfg(test)]

src/lib.rs

@@ -79,7 +79,6 @@ pub mod env_var;
 pub mod errors;
 mod fallback_settings;
 mod install;
-pub mod notifications;
 pub mod process;
 mod settings;
 #[cfg(feature = "test")]

src/notifications.rs

@@ -14,11 +14,10 @@ use retry::{OperationResult, retry};
 use tracing::{debug, info, warn};
 use url::Url;
 
-use crate::dist::download::Notifier;
+use crate::dist::download::{Notification, Notifier};
 use crate::errors::*;
 use crate::process::Process;
 
-use crate::notifications::Notification;
 #[cfg(not(windows))]
 pub(crate) use crate::utils::raw::find_cmd;
 pub(crate) use crate::utils::raw::is_directory;