notifications: log directly when setting overrides

Author: djc

src/config.rs

@@ -919,7 +919,7 @@ impl<'a> Cfg<'a> {
     /// Create an override for a toolchain
     pub(crate) fn make_override(&self, path: &Path, toolchain: &ToolchainName) -> Result<()> {
         self.settings_file.with_mut(|s| {
-            s.add_override(path, toolchain.to_string(), self.notify_handler.as_ref());
+            s.add_override(path, toolchain.to_string());
             Ok(())
         })
     }

src/notifications.rs

@@ -26,7 +26,6 @@ pub(crate) enum Notification<'a> {
     /// member, but the notification callback is already narrowed to
     /// utils::notifications by the time tar unpacking is called.
     SetDefaultBufferSize(usize),
-    SetOverrideToolchain(&'a Path, &'a str),
     SetProfile(&'a str),
     SetSelfUpdate(&'a str),
     LookingForToolchain(&'a ToolchainDesc),
@@ -68,8 +67,7 @@ impl Notification<'_> {
             | ReadMetadataVersion(_)
             | InstalledToolchain(_)
             | UpdateHashMatches => NotificationLevel::Debug,
-            SetOverrideToolchain(_, _)
-            | SetProfile(_)
+            SetProfile(_)
             | SetSelfUpdate(_)
             | UsingExistingToolchain(_)
             | UninstallingToolchain(_)
@@ -104,12 +102,6 @@ impl Display for Notification<'_> {
             DownloadDataReceived(data, _) => write!(f, "received some data of size {}", data.len()),
             DownloadFinished(_) => write!(f, "download finished"),
             DownloadFailed(_) => write!(f, "download failed"),
-            SetOverrideToolchain(path, name) => write!(
-                f,
-                "override toolchain for '{}' set to '{}'",
-                path.display(),
-                name
-            ),
             SetProfile(name) => write!(f, "profile set to '{name}'"),
             SetSelfUpdate(mode) => write!(f, "auto-self-update mode set to '{mode}'"),
             LookingForToolchain(name) => write!(f, "looking for installed toolchain '{name}'"),

src/settings.rs

@@ -6,11 +6,11 @@ use std::str::FromStr;
 
 use anyhow::{Context, Result};
 use serde::{Deserialize, Serialize};
+use tracing::info;
 
 use crate::cli::self_update::SelfUpdateMode;
 use crate::dist::{AutoInstallMode, Profile};
 use crate::errors::*;
-use crate::notifications::*;
 use crate::utils;
 
 #[derive(Clone, Debug, Eq, PartialEq)]
@@ -111,14 +111,12 @@ impl Settings {
         self.overrides.remove(&key).is_some()
     }
 
-    pub(crate) fn add_override(
-        &mut self,
-        path: &Path,
-        toolchain: String,
-        notify_handler: &dyn Fn(Notification<'_>),
-    ) {
+    pub(crate) fn add_override(&mut self, path: &Path, toolchain: String) {
         let key = Self::path_to_key(path);
-        notify_handler(Notification::SetOverrideToolchain(path, &toolchain));
+        info!(
+            "override toolchain for {} set to {toolchain}",
+            path.display(),
+        );
         self.overrides.insert(key, toolchain);
     }