notifications: log directly on creating temp files

Author: djc

src/config.rs

@@ -290,13 +290,7 @@ impl<'a> Cfg<'a> {
         };
 
         let dist_root_server = dist_root_server(process)?;
-
-        let notify_clone = notify_handler.clone();
-        let tmp_cx = temp::Context::new(
-            rustup_dir.join("tmp"),
-            dist_root_server.as_str(),
-            Box::new(move |n| (notify_clone)(n)),
-        );
+        let tmp_cx = temp::Context::new(rustup_dir.join("tmp"), dist_root_server.as_str());
         let dist_root = dist_root_server + "/dist";
 
         let cfg = Self {

src/dist/manifestation/tests.rs

@@ -454,11 +454,7 @@ impl TestContext {
         let prefix_tempdir = tempfile::Builder::new().prefix("rustup").tempdir().unwrap();
 
         let work_tempdir = tempfile::Builder::new().prefix("rustup").tempdir().unwrap();
-        let tmp_cx = temp::Context::new(
-            work_tempdir.path().to_owned(),
-            DEFAULT_DIST_SERVER,
-            Box::new(|_| ()),
-        );
+        let tmp_cx = temp::Context::new(work_tempdir.path().to_owned(), DEFAULT_DIST_SERVER);
 
         let toolchain = ToolchainDesc::from_str("nightly-x86_64-apple-darwin").unwrap();
         let prefix = InstallPrefix::from(prefix_tempdir.path());

src/dist/temp.rs

@@ -5,7 +5,6 @@ pub(crate) use anyhow::{Context as _, Result};
 use thiserror::Error as ThisError;
 use tracing::{debug, warn};
 
-use crate::notifications::Notification;
 use crate::utils::{self, raw};
 
 #[derive(Debug, ThisError)]
@@ -73,19 +72,13 @@ impl Drop for File {
 pub struct Context {
     root_directory: PathBuf,
     pub dist_server: String,
-    notify_handler: Box<dyn Fn(Notification<'_>)>,
 }
 
 impl Context {
-    pub fn new(
-        root_directory: PathBuf,
-        dist_server: &str,
-        notify_handler: Box<dyn Fn(Notification<'_>)>,
-    ) -> Self {
+    pub fn new(root_directory: PathBuf, dist_server: &str) -> Self {
         Self {
             root_directory,
             dist_server: dist_server.to_owned(),
-            notify_handler,
         }
     }
 
@@ -130,7 +123,7 @@ impl Context {
             // This is technically racey, but the probability of getting the same
             // random names at exactly the same time is... low.
             if !raw::path_exists(&temp_file) {
-                (self.notify_handler)(Notification::CreatingFile(&temp_file));
+                debug!(path = %temp_file.display(), "creating temp file");
                 fs::File::create(&temp_file)
                     .with_context(|| CreatingError::File(PathBuf::from(&temp_file)))?;
                 return Ok(File { path: temp_file });

src/notifications.rs

@@ -52,7 +52,6 @@ pub enum Notification<'a> {
     Error(String),
     UsingCurl,
     UsingReqwest,
-    CreatingFile(&'a Path),
     SetAutoInstall(&'a str),
     SetDefaultToolchain(Option<&'a ToolchainName>),
     SetOverrideToolchain(&'a Path, &'a str),
@@ -114,7 +113,6 @@ impl Notification<'_> {
             | UsingCurl
             | UsingReqwest => NotificationLevel::Debug,
             Error(_) => NotificationLevel::Error,
-            CreatingFile(_) => NotificationLevel::Debug,
             ToolchainDirectory(_)
             | LookingForToolchain(_)
             | InstallingToolchain(_)
@@ -244,7 +242,6 @@ impl Display for Notification<'_> {
             ResumingPartialDownload => write!(f, "resuming partial download"),
             UsingCurl => write!(f, "downloading with curl"),
             UsingReqwest => write!(f, "downloading with reqwest"),
-            CreatingFile(path) => write!(f, "creating temp file: {}", path.display()),
             SetAutoInstall(auto) => write!(f, "auto install set to '{auto}'"),
             SetDefaultToolchain(None) => write!(f, "default toolchain unset"),
             SetDefaultToolchain(Some(name)) => write!(f, "default toolchain set to '{name}'"),

src/test/dist.rs

@@ -48,11 +48,7 @@ impl DistContext {
             pkg_dir,
             inst_dir,
             prefix,
-            cx: temp::Context::new(
-                tmp_dir.path().to_owned(),
-                DEFAULT_DIST_SERVER,
-                Box::new(|_| ()),
-            ),
+            cx: temp::Context::new(tmp_dir.path().to_owned(), DEFAULT_DIST_SERVER),
             tp: TestProcess::default(),
             _tmp_dir: tmp_dir,
         })