Skip to content

Commit b697553

Browse files
rbtcollinsdjc
authored andcommitted
Make show_dist_version async
1 parent fa1d7f7 commit b697553

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

src/cli/rustup_mode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ fn check_updates(cfg: &Cfg) -> Result<utils::ExitCode> {
750750
for channel in channels {
751751
let (name, distributable) = channel;
752752
let current_version = distributable.show_version()?;
753-
let dist_version = distributable.show_dist_version()?;
753+
let dist_version = utils::run_future(distributable.show_dist_version())?;
754754
let _ = t.attr(terminalsource::Attr::Bold);
755755
write!(t.lock(), "{name} - ")?;
756756
match (current_version, dist_version) {

src/toolchain/distributable.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -525,17 +525,15 @@ impl<'a> DistributableToolchain<'a> {
525525
Ok(())
526526
}
527527

528-
pub fn show_dist_version(&self) -> anyhow::Result<Option<String>> {
528+
pub async fn show_dist_version(&self) -> anyhow::Result<Option<String>> {
529529
let update_hash = self.cfg.get_hash_file(&self.desc, false)?;
530530
let notify_handler =
531531
&|n: crate::dist::Notification<'_>| (self.cfg.notify_handler)(n.into());
532532
let download_cfg = self.cfg.download_cfg(&notify_handler);
533533

534-
match utils::run_future(crate::dist::dist::dl_v2_manifest(
535-
download_cfg,
536-
Some(&update_hash),
537-
&self.desc,
538-
))? {
534+
match crate::dist::dist::dl_v2_manifest(download_cfg, Some(&update_hash), &self.desc)
535+
.await?
536+
{
539537
Some((manifest, _)) => Ok(Some(manifest.get_rust_version()?.to_string())),
540538
None => Ok(None),
541539
}

0 commit comments

Comments
 (0)