refactor(distributable)!: replace install_if_not_installed() with ensure_installed()

Author: rami3l

src/cli/rustup_mode.rs

@@ -717,7 +717,10 @@ async fn default_(
             }
             MaybeResolvableToolchainName::Some(ResolvableToolchainName::Official(toolchain)) => {
                 let desc = toolchain.resolve(&cfg.get_default_host_triple()?)?;
-                let status = DistributableToolchain::install_if_not_installed(cfg, &desc).await?;
+                let status = cfg
+                    .ensure_installed(desc.clone(), vec![], vec![], None, true)
+                    .await?
+                    .0;
 
                 cfg.set_default(Some(&(&desc).into()))?;
 

src/config.rs

@@ -780,7 +780,7 @@ impl<'a> Cfg<'a> {
     // Returns a Toolchain matching the given ToolchainDesc, installing it and
     // the given components and targets if they aren't already installed.
     #[tracing::instrument(level = "trace", err(level = "trace"), skip_all)]
-    async fn ensure_installed(
+    pub(crate) async fn ensure_installed(
         &self,
         toolchain: ToolchainDesc,
         components: Vec<String>,

src/toolchain/distributable.rs

@@ -17,7 +17,6 @@ use crate::{
         DistOptions, PartialToolchainDesc, Profile, ToolchainDesc,
     },
     install::{InstallMethod, UpdateStatus},
-    notifications::Notification,
     RustupError,
 };
 
@@ -358,24 +357,6 @@ impl<'a> DistributableToolchain<'a> {
         Ok((status, Self::new(cfg, toolchain.clone())?))
     }
 
-    #[tracing::instrument(level = "trace", err(level = "trace"), skip_all)]
-    pub async fn install_if_not_installed(
-        cfg: &'a Cfg<'a>,
-        desc: &ToolchainDesc,
-    ) -> anyhow::Result<UpdateStatus> {
-        (cfg.notify_handler)(Notification::LookingForToolchain(desc));
-        if Toolchain::exists(cfg, &desc.into())? {
-            (cfg.notify_handler)(Notification::UsingExistingToolchain(desc));
-            Ok(UpdateStatus::Unchanged)
-        } else {
-            Ok(
-                Self::install(cfg, desc, &[], &[], cfg.get_profile()?, false)
-                    .await?
-                    .0,
-            )
-        }
-    }
-
     #[tracing::instrument(level = "trace", err(level = "trace"), skip_all)]
     pub(crate) async fn update(
         &mut self,