Extract self_update() from update_all_channels()

Author: djc

src/cli/common.rs

@@ -280,12 +280,11 @@ fn show_channel_updates(
 
 pub(crate) async fn update_all_channels(
     cfg: &Cfg<'_>,
-    do_self_update: bool,
     force_update: bool,
 ) -> Result<utils::ExitCode> {
     let toolchains = cfg.update_all_channels(force_update).await?;
     let has_update_error = toolchains.iter().any(|(_, r)| r.is_err());
-    let mut exit_code = utils::ExitCode(if has_update_error { 1 } else { 0 });
+    let exit_code = utils::ExitCode(if has_update_error { 1 } else { 0 });
 
     if toolchains.is_empty() {
         info!("no updatable toolchains installed");
@@ -301,10 +300,6 @@ pub(crate) async fn update_all_channels(
         show_channel_updates(cfg, t)?;
     }
 
-    if do_self_update {
-        exit_code &= self_update(cfg.process).await?;
-    }
-
     Ok(exit_code)
 }
 

src/cli/rustup_mode.rs

@@ -991,7 +991,11 @@ async fn update(
         info!("the active toolchain `{toolchain}` has been installed");
         info!("it's active because: {reason}");
     } else {
-        exit_code &= common::update_all_channels(cfg, self_update, opts.force).await?;
+        exit_code &= common::update_all_channels(cfg, opts.force).await?;
+        if self_update {
+            exit_code &= common::self_update(cfg.process).await?;
+        }
+
         info!("cleaning up downloads & tmp directories");
         utils::delete_dir_contents_following_links(&cfg.download_dir);
         cfg.tmp_cx.clean();