cli: inline single-use update_all_channels() helper

Author: djc

src/cli/common.rs

@@ -215,7 +215,20 @@ pub(crate) async fn update_all_channels(
     cfg: &Cfg<'_>,
     force_update: bool,
 ) -> Result<utils::ExitCode> {
-    let toolchains = cfg.update_all_channels(force_update).await?;
+    let profile = cfg.get_profile()?;
+    let mut toolchains = Vec::new();
+    for (desc, mut distributable) in cfg.list_channels()? {
+        let result = distributable
+            .update_extra(&[], &[], profile, force_update, false)
+            .await;
+
+        if let Err(e) = &result {
+            error!("{e}");
+        }
+
+        toolchains.push((desc, result));
+    }
+
     let has_update_error = toolchains.iter().any(|(_, r)| r.is_err());
     let exit_code = utils::ExitCode(if has_update_error { 1 } else { 0 });
 

src/config.rs

@@ -892,29 +892,6 @@ impl<'a> Cfg<'a> {
         })
     }
 
-    pub(crate) async fn update_all_channels(
-        &self,
-        force_update: bool,
-    ) -> Result<Vec<(ToolchainDesc, Result<UpdateStatus>)>> {
-        let profile = self.get_profile()?;
-
-        // Update toolchains and collect the results
-        let mut channels = Vec::new();
-        for (desc, mut distributable) in self.list_channels()? {
-            let result = distributable
-                .update_extra(&[], &[], profile, force_update, false)
-                .await;
-
-            if let Err(e) = &result {
-                error!("{e}");
-            }
-
-            channels.push((desc, result));
-        }
-
-        Ok(channels)
-    }
-
     pub(crate) fn set_default_host_triple(&self, host_triple: String) -> Result<()> {
         // Ensure that the provided host_triple is capable of resolving
         // against the 'stable' toolchain.  This provides early errors