Skip to content

Commit d3bba11

Browse files
committed
notifications: log directly when installing toolchains
1 parent 0ca4ca2 commit d3bba11

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

src/install.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ impl InstallMethod<'_> {
5252
| InstallMethod::Dist(DistOptions {
5353
old_date_version: None,
5454
..
55-
}) => nh(Notification::InstallingToolchain(&self.dest_basename())),
56-
_ => nh(Notification::UpdatingToolchain(&self.dest_basename())),
55+
}) => debug!("installing toolchain {}", self.dest_basename()),
56+
_ => debug!("updating existing install for '{}'", self.dest_basename()),
5757
}
5858

5959
debug!("toolchain directory: {}", self.dest_path().display());

src/notifications.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ pub(crate) enum Notification<'a> {
2626
/// member, but the notification callback is already narrowed to
2727
/// utils::notifications by the time tar unpacking is called.
2828
SetDefaultBufferSize(usize),
29-
UpdatingToolchain(&'a str),
30-
InstallingToolchain(&'a str),
3129
InstalledToolchain(&'a str),
3230
UninstallingToolchain(&'a ToolchainName),
3331
UninstalledToolchain(&'a ToolchainName),
@@ -55,11 +53,9 @@ impl Notification<'_> {
5553
| DownloadDataReceived(_, _)
5654
| DownloadFinished(_)
5755
| DownloadFailed(_) => NotificationLevel::Debug,
58-
InstallingToolchain(_)
59-
| UpdatingToolchain(_)
60-
| ReadMetadataVersion(_)
61-
| InstalledToolchain(_)
62-
| UpdateHashMatches => NotificationLevel::Debug,
56+
ReadMetadataVersion(_) | InstalledToolchain(_) | UpdateHashMatches => {
57+
NotificationLevel::Debug
58+
}
6359
UninstallingToolchain(_)
6460
| UninstalledToolchain(_)
6561
| UpgradingMetadata(_, _)
@@ -92,8 +88,6 @@ impl Display for Notification<'_> {
9288
DownloadDataReceived(data, _) => write!(f, "received some data of size {}", data.len()),
9389
DownloadFinished(_) => write!(f, "download finished"),
9490
DownloadFailed(_) => write!(f, "download failed"),
95-
UpdatingToolchain(name) => write!(f, "updating existing install for '{name}'"),
96-
InstallingToolchain(name) => write!(f, "installing toolchain '{name}'"),
9791
InstalledToolchain(name) => write!(f, "toolchain '{name}' installed"),
9892
UninstallingToolchain(name) => write!(f, "uninstalling toolchain '{name}'"),
9993
UninstalledToolchain(name) => write!(f, "toolchain '{name}' uninstalled"),

0 commit comments

Comments
 (0)