Make common::self_update async

Author: rbtcollins

src/cli/common.rs

@@ -310,7 +310,7 @@ pub(crate) fn update_all_channels(
     };
 
     if do_self_update {
-        self_update(show_channel_updates)
+        utils::run_future(self_update(show_channel_updates))
     } else {
         show_channel_updates()
     }
@@ -350,7 +350,8 @@ pub(crate) fn self_update_permitted(explicit: bool) -> Result<SelfUpdatePermissi
     }
 }
 
-pub(crate) fn self_update<F>(before_restart: F) -> Result<utils::ExitCode>
+/// Performs all of a self-update: check policy, download, apply and exit.
+pub(crate) async fn self_update<F>(before_restart: F) -> Result<utils::ExitCode>
 where
     F: FnOnce() -> Result<utils::ExitCode>,
 {
@@ -363,7 +364,7 @@ where
         SelfUpdatePermission::Permit => {}
     }
 
-    let setup_path = utils::run_future(self_update::prepare_update())?;
+    let setup_path = self_update::prepare_update().await?;
 
     before_restart()?;
 

src/cli/rustup_mode.rs

@@ -860,7 +860,7 @@ fn update(cfg: &mut Cfg, opts: UpdateOpts) -> Result<utils::ExitCode> {
             }
         }
         if self_update {
-            common::self_update(|| Ok(utils::ExitCode(0)))?;
+            utils::run_future(common::self_update(|| Ok(utils::ExitCode(0))))?;
         }
     } else {
         common::update_all_channels(cfg, self_update, opts.force)?;