Inline dist::temp::Notification variants into top-level Notification

Author: djc

src/config.rs

@@ -295,7 +295,7 @@ impl<'a> Cfg<'a> {
         let tmp_cx = temp::Context::new(
             rustup_dir.join("tmp"),
             dist_root_server.as_str(),
-            Box::new(move |n| (notify_clone)(n.into())),
+            Box::new(move |n| (notify_clone)(n)),
         );
         let dist_root = dist_root_server + "/dist";
 

src/dist/temp.rs

@@ -1,13 +1,11 @@
-use std::fmt::{self, Display};
-use std::fs;
-use std::io;
-use std::ops;
 use std::path::{Path, PathBuf};
+use std::{fmt, fs, ops};
 
 pub(crate) use anyhow::{Context as _, Result};
 use thiserror::Error as ThisError;
 
-use crate::utils::{self, notify::NotificationLevel, raw};
+use crate::notifications::Notification;
+use crate::utils::{self, raw};
 
 #[derive(Debug, ThisError)]
 pub(crate) enum CreatingError {
@@ -68,56 +66,6 @@ impl Drop for File<'_> {
     }
 }
 
-#[derive(Debug)]
-pub enum Notification<'a> {
-    CreatingRoot(&'a Path),
-    CreatingFile(&'a Path),
-    CreatingDirectory(&'a Path),
-    FileDeletion(&'a Path, io::Result<()>),
-    DirectoryDeletion(&'a Path, io::Result<()>),
-}
-
-impl Notification<'_> {
-    pub(crate) fn level(&self) -> NotificationLevel {
-        use self::Notification::*;
-        match self {
-            CreatingRoot(_) | CreatingFile(_) | CreatingDirectory(_) => NotificationLevel::Debug,
-            FileDeletion(_, result) | DirectoryDeletion(_, result) => {
-                if result.is_ok() {
-                    NotificationLevel::Debug
-                } else {
-                    NotificationLevel::Warn
-                }
-            }
-        }
-    }
-}
-
-impl Display for Notification<'_> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> std::result::Result<(), fmt::Error> {
-        use self::Notification::*;
-        match self {
-            CreatingRoot(path) => write!(f, "creating temp root: {}", path.display()),
-            CreatingFile(path) => write!(f, "creating temp file: {}", path.display()),
-            CreatingDirectory(path) => write!(f, "creating temp directory: {}", path.display()),
-            FileDeletion(path, result) => {
-                if result.is_ok() {
-                    write!(f, "deleted temp file: {}", path.display())
-                } else {
-                    write!(f, "could not delete temp file: {}", path.display())
-                }
-            }
-            DirectoryDeletion(path, result) => {
-                if result.is_ok() {
-                    write!(f, "deleted temp directory: {}", path.display())
-                } else {
-                    write!(f, "could not delete temp directory: {}", path.display())
-                }
-            }
-        }
-    }
-}
-
 pub struct Context {
     root_directory: PathBuf,
     pub dist_server: String,

src/notifications.rs

@@ -1,19 +1,19 @@
 use std::fmt::{self, Display};
+use std::io;
 use std::path::{Path, PathBuf};
 
 use crate::settings::MetadataVersion;
-use crate::{
-    dist::{ToolchainDesc, temp},
-    toolchain::ToolchainName,
-    utils::notify::NotificationLevel,
-};
+use crate::{dist::ToolchainDesc, toolchain::ToolchainName, utils::notify::NotificationLevel};
 
 #[derive(Debug)]
-pub(crate) enum Notification<'a> {
+pub enum Notification<'a> {
     Install(crate::dist::Notification<'a>),
     Utils(crate::utils::Notification<'a>),
-    Temp(temp::Notification<'a>),
-
+    CreatingRoot(&'a Path),
+    CreatingFile(&'a Path),
+    CreatingDirectory(&'a Path),
+    FileDeletion(&'a Path, io::Result<()>),
+    DirectoryDeletion(&'a Path, io::Result<()>),
     SetAutoInstall(&'a str),
     SetDefaultToolchain(Option<&'a ToolchainName>),
     SetOverrideToolchain(&'a Path, &'a str),
@@ -50,19 +50,21 @@ impl<'a> From<crate::utils::Notification<'a>> for Notification<'a> {
         Notification::Utils(n)
     }
 }
-impl<'a> From<temp::Notification<'a>> for Notification<'a> {
-    fn from(n: temp::Notification<'a>) -> Self {
-        Notification::Temp(n)
-    }
-}
 
 impl Notification<'_> {
     pub(crate) fn level(&self) -> NotificationLevel {
         use self::Notification::*;
         match self {
             Install(n) => n.level(),
             Utils(n) => n.level(),
-            Temp(n) => n.level(),
+            CreatingRoot(_) | CreatingFile(_) | CreatingDirectory(_) => NotificationLevel::Debug,
+            FileDeletion(_, result) | DirectoryDeletion(_, result) => {
+                if result.is_ok() {
+                    NotificationLevel::Debug
+                } else {
+                    NotificationLevel::Warn
+                }
+            }
             ToolchainDirectory(_)
             | LookingForToolchain(_)
             | InstallingToolchain(_)
@@ -92,7 +94,23 @@ impl Display for Notification<'_> {
         match self {
             Install(n) => n.fmt(f),
             Utils(n) => n.fmt(f),
-            Temp(n) => n.fmt(f),
+            CreatingRoot(path) => write!(f, "creating temp root: {}", path.display()),
+            CreatingFile(path) => write!(f, "creating temp file: {}", path.display()),
+            CreatingDirectory(path) => write!(f, "creating temp directory: {}", path.display()),
+            FileDeletion(path, result) => {
+                if result.is_ok() {
+                    write!(f, "deleted temp file: {}", path.display())
+                } else {
+                    write!(f, "could not delete temp file: {}", path.display())
+                }
+            }
+            DirectoryDeletion(path, result) => {
+                if result.is_ok() {
+                    write!(f, "deleted temp directory: {}", path.display())
+                } else {
+                    write!(f, "could not delete temp directory: {}", 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/settings.rs

@@ -147,7 +147,7 @@ impl Settings {
 }
 
 #[derive(Clone, Copy, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
-pub(crate) enum MetadataVersion {
+pub enum MetadataVersion {
     #[serde(rename = "2")]
     V2,
     #[serde(rename = "12")]