Make DistributableToolchain::remove_component async

Author: rbtcollins

src/cli/rustup_mode.rs

@@ -1185,7 +1185,7 @@ fn target_remove(
             warn!("after removing the last target, no build targets will be available");
         }
         let new_component = Component::new("rust-std".to_string(), Some(target), false);
-        distributable.remove_component(new_component)?;
+        utils::run_future(distributable.remove_component(new_component))?;
     }
 
     Ok(utils::ExitCode(0))
@@ -1239,7 +1239,7 @@ fn component_remove(
 
     for component in &components {
         let new_component = Component::try_new(component, &distributable, target.as_ref())?;
-        distributable.remove_component(new_component)?;
+        utils::run_future(distributable.remove_component(new_component))?;
     }
 
     Ok(utils::ExitCode(0))

src/toolchain/distributable.rs

@@ -16,7 +16,6 @@ use crate::{
     },
     install::{InstallMethod, UpdateStatus},
     notifications::Notification,
-    utils::utils,
     RustupError,
 };
 
@@ -469,7 +468,7 @@ impl<'a> DistributableToolchain<'a> {
         }
     }
 
-    pub(crate) fn remove_component(&self, mut component: Component) -> anyhow::Result<()> {
+    pub(crate) async fn remove_component(&self, mut component: Component) -> anyhow::Result<()> {
         // TODO: take multiple components?
         let manifestation = self.get_manifestation()?;
         let config = manifestation.read_config()?.unwrap_or_default();
@@ -518,14 +517,16 @@ impl<'a> DistributableToolchain<'a> {
             &|n: crate::dist::Notification<'_>| (self.cfg.notify_handler)(n.into());
         let download_cfg = self.cfg.download_cfg(&notify_handler);
 
-        utils::run_future(manifestation.update(
-            &manifest,
-            changes,
-            false,
-            &download_cfg,
-            &self.desc.manifest_name(),
-            false,
-        ))?;
+        manifestation
+            .update(
+                &manifest,
+                changes,
+                false,
+                &download_cfg,
+                &self.desc.manifest_name(),
+                false,
+            )
+            .await?;
 
         Ok(())
     }