notifications: log directly when linking directories

Author: djc

src/install.rs

@@ -101,7 +101,7 @@ impl InstallMethod<'_> {
                 Ok(true)
             }
             InstallMethod::Link { src, .. } => {
-                utils::symlink_dir(src, path, notify_handler)?;
+                utils::symlink_dir(src, path)?;
                 Ok(true)
             }
             InstallMethod::Dist(opts) => {

src/notifications.rs

@@ -37,7 +37,6 @@ pub enum Notification<'a> {
     StrayHash(&'a Path),
     SignatureInvalid(&'a str),
     RetryingDownload(&'a str),
-    LinkingDirectory(&'a Path, &'a Path),
     CopyingDirectory(&'a Path, &'a Path),
     RemovingDirectory(&'a str, &'a Path),
     DownloadingFile(&'a Url, &'a Path),
@@ -123,7 +122,6 @@ impl Notification<'_> {
             SignatureInvalid(_) => NotificationLevel::Warn,
             SetDefaultBufferSize(_) => NotificationLevel::Trace,
             RemovingDirectory(_, _)
-            | LinkingDirectory(_, _)
             | CopyingDirectory(_, _)
             | DownloadingFile(_, _)
             | DownloadContentLengthReceived(_, _)
@@ -258,7 +256,6 @@ impl Display for Notification<'_> {
             SignatureInvalid(url) => write!(f, "Signature verification failed for '{url}'"),
             RetryingDownload(url) => write!(f, "retrying download for '{url}'"),
             Error(e) => write!(f, "error: '{e}'"),
-            LinkingDirectory(_, dest) => write!(f, "linking directory from: '{}'", dest.display()),
             CopyingDirectory(src, _) => write!(f, "copying directory from: '{}'", src.display()),
             RemovingDirectory(name, path) => {
                 write!(f, "removing {} directory: '{}'", name, path.display())

src/utils/mod.rs

@@ -154,15 +154,8 @@ pub(crate) fn assert_is_directory(path: &Path) -> Result<()> {
     }
 }
 
-pub(crate) fn symlink_dir<'a, N>(
-    src: &'a Path,
-    dest: &'a Path,
-    notify_handler: &dyn Fn(N),
-) -> Result<()>
-where
-    N: From<Notification<'a>>,
-{
-    notify_handler(Notification::LinkingDirectory(src, dest).into());
+pub(crate) fn symlink_dir(src: &Path, dest: &Path) -> Result<()> {
+    debug!(source = %src.display(), destination = %dest.display(), "linking directory");
     raw::symlink_dir(src, dest).with_context(|| {
         format!(
             "could not create link from '{}' to '{}'",