dist: inline trivial wrapper function

Author: djc

src/cli/common.rs

@@ -219,7 +219,7 @@ pub(crate) async fn update_all_channels(
     let mut toolchains = Vec::new();
     for (desc, mut distributable) in cfg.list_channels()? {
         let result = distributable
-            .update_extra(&[], &[], profile, force_update, false)
+            .update(&[], &[], profile, force_update, false)
             .await;
 
         if let Err(e) = &result {

src/cli/rustup_mode.rs

@@ -966,7 +966,8 @@ async fn update(
             let profile = cfg.get_profile()?;
             let status = match DistributableToolchain::new(cfg, desc.clone()) {
                 Ok(mut d) => {
-                    d.update_extra(&components, &targets, profile, force, allow_downgrade)
+                    let profile = cfg.get_profile()?;
+                    d.update(&components, &targets, profile, force, allow_downgrade)
                         .await?
                 }
                 Err(RustupError::ToolchainNotInstalled { .. }) => {

src/cli/self_update.rs

@@ -1005,7 +1005,7 @@ async fn maybe_install_rust(opts: InstallOpts<'_>, cfg: &mut Cfg<'_>) -> Result<
             // For now, we error.
             let mut toolchain = DistributableToolchain::new(cfg, desc.clone())?;
             toolchain
-                .update(components, targets, cfg.get_profile()?)
+                .update(components, targets, cfg.get_profile()?, true, false)
                 .await?
         } else {
             DistributableToolchain::install(

src/config.rs

@@ -808,7 +808,9 @@ impl<'a> Cfg<'a> {
                     info!("using existing install for {toolchain}");
                 }
                 let status = if !distributable.components_exist(&components, &targets)? {
-                    distributable.update(&components, &targets, profile).await?
+                    distributable
+                        .update(&components, &targets, profile, true, false)
+                        .await?
                 } else {
                     UpdateStatus::Unchanged
                 };

src/toolchain/distributable.rs

@@ -350,20 +350,9 @@ impl<'a> DistributableToolchain<'a> {
         InstallPrefix::from(self.toolchain.path().to_owned()).guess_v1_manifest()
     }
 
-    #[tracing::instrument(level = "trace", err(level = "trace"), skip_all)]
-    pub(crate) async fn update(
-        &mut self,
-        components: &[&str],
-        targets: &[&str],
-        profile: Profile,
-    ) -> anyhow::Result<UpdateStatus> {
-        self.update_extra(components, targets, profile, true, false)
-            .await
-    }
-
     /// Update a toolchain with control over the channel behaviour
     #[tracing::instrument(level = "trace", err(level = "trace"), skip_all)]
-    pub(crate) async fn update_extra(
+    pub(crate) async fn update(
         &mut self,
         components: &[&str],
         targets: &[&str],