notifications: log directly when setting the default toolchain

Author: djc

src/config.rs

@@ -344,7 +344,12 @@ impl<'a> Cfg<'a> {
             s.default_toolchain = toolchain.map(|t| t.to_string());
             Ok(())
         })?;
-        (self.notify_handler)(Notification::SetDefaultToolchain(toolchain));
+
+        match toolchain {
+            Some(t) => info!(new = %t, "default toolchain set"),
+            None => info!("default toolchain unset"),
+        }
+
         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),
-    SetDefaultToolchain(Option<&'a ToolchainName>),
     SetOverrideToolchain(&'a Path, &'a str),
     SetProfile(&'a str),
     SetSelfUpdate(&'a str),
@@ -69,8 +68,7 @@ impl Notification<'_> {
             | ReadMetadataVersion(_)
             | InstalledToolchain(_)
             | UpdateHashMatches => NotificationLevel::Debug,
-            SetDefaultToolchain(_)
-            | SetOverrideToolchain(_, _)
+            SetOverrideToolchain(_, _)
             | SetProfile(_)
             | SetSelfUpdate(_)
             | UsingExistingToolchain(_)
@@ -106,8 +104,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"),
-            SetDefaultToolchain(None) => write!(f, "default toolchain unset"),
-            SetDefaultToolchain(Some(name)) => write!(f, "default toolchain set to '{name}'"),
             SetOverrideToolchain(path, name) => write!(
                 f,
                 "override toolchain for '{}' set to '{}'",

tests/suite/cli_exact.rs

@@ -24,7 +24,7 @@ info: syncing channel updates toolchain=nightly-[HOST_TRIPLE]
 info: latest update updated=2015-01-02 version=1.3.0 (hash-nightly-2)
 info: downloading component[..]
 ...
-info: default toolchain set to 'nightly-[HOST_TRIPLE]'
+info: default toolchain set new=nightly-[HOST_TRIPLE]
 
 "#]]);
     cx.config
@@ -325,7 +325,7 @@ info: syncing channel updates toolchain=nightly-[HOST_TRIPLE]
 info: latest update updated=2015-01-02 version=1.3.0 (hash-nightly-2)
 info: downloading component[..]
 ...
-info: default toolchain set to 'nightly-[HOST_TRIPLE]'
+info: default toolchain set new=nightly-[HOST_TRIPLE]
 
 "#]]);
     cx.config

tests/suite/cli_rustup.rs

@@ -286,7 +286,7 @@ info: syncing channel updates toolchain=nightly-[HOST_TRIPLE]
 info: latest update updated=2015-01-02 version=1.3.0 (hash-nightly-2)
 info: downloading component[..]
 ...
-info: default toolchain set to 'nightly-[HOST_TRIPLE]'
+info: default toolchain set new=nightly-[HOST_TRIPLE]
 
 "#]])
         .is_ok();
@@ -323,7 +323,7 @@ async fn default_override() {
         .await
         .with_stderr(snapbox::str![[r#"
 info: using existing install for 'stable-[HOST_TRIPLE]'
-info: default toolchain set to 'stable-[HOST_TRIPLE]'
+info: default toolchain set new=stable-[HOST_TRIPLE]
 info: note that the toolchain 'nightly-[HOST_TRIPLE]' is currently in use (directory override for '[..]')
 
 "#]])
@@ -3721,7 +3721,7 @@ info: syncing channel updates toolchain=nightly-[HOST_TRIPLE]
 info: latest update updated=2015-01-02 version=1.3.0 (hash-nightly-2)
 info: downloading component[..]
 ...
-info: default toolchain set to 'nightly-[HOST_TRIPLE]'
+info: default toolchain set new=nightly-[HOST_TRIPLE]
 
 "#]])
         .is_ok();

tests/suite/cli_self_upd.rs

@@ -74,7 +74,7 @@ info: syncing channel updates toolchain=stable-[HOST_TRIPLE]
 info: latest update updated=2015-01-02 version=1.1.0 (hash-stable-1.1.0)
 info: downloading component[..]
 ...
-info: default toolchain set to 'stable-[HOST_TRIPLE]'
+info: default toolchain set new=stable-[HOST_TRIPLE]
 
 "#]])
         .is_ok();
@@ -119,7 +119,7 @@ info: syncing channel updates toolchain=stable-[HOST_TRIPLE]
 info: latest update updated=2015-01-02 version=1.1.0 (hash-stable-1.1.0)
 info: downloading component[..]
 ...
-info: default toolchain set to 'stable-[HOST_TRIPLE]'
+info: default toolchain set new=stable-[HOST_TRIPLE]
 ...
 "#]])
         .is_ok();
@@ -899,7 +899,7 @@ async fn reinstall_specifying_different_toolchain() {
         .await
         .with_stderr(snapbox::str![[r#"
 ...
-info: default toolchain set to 'nightly-[HOST_TRIPLE]'
+info: default toolchain set new=nightly-[HOST_TRIPLE]
 ...
 "#]])
         .is_ok();