Move Toolchain::from_partial() to Cfg

Author: djc

src/cli/rustup_mode.rs

@@ -1446,7 +1446,7 @@ async fn doc(
     mut topic: Option<&str>,
     doc_page: &DocPage,
 ) -> Result<utils::ExitCode> {
-    let toolchain = Toolchain::from_partial(toolchain, cfg).await?;
+    let toolchain = cfg.toolchain_from_partial(toolchain).await?;
 
     if let Ok(distributable) = DistributableToolchain::try_from(&toolchain) {
         if let [_] = distributable
@@ -1507,7 +1507,7 @@ async fn man(
     command: &str,
     toolchain: Option<PartialToolchainDesc>,
 ) -> Result<utils::ExitCode> {
-    let toolchain = Toolchain::from_partial(toolchain, cfg).await?;
+    let toolchain = cfg.toolchain_from_partial(toolchain).await?;
     let mut path = toolchain.path().to_path_buf();
     path.push("share");
     path.push("man");

src/config.rs

@@ -14,7 +14,7 @@ use tracing::trace;
 use crate::{
     cli::self_update::SelfUpdateMode,
     currentprocess::Process,
-    dist::{self, download::DownloadCfg, temp, Profile, ToolchainDesc},
+    dist::{self, download::DownloadCfg, temp, PartialToolchainDesc, Profile, ToolchainDesc},
     errors::RustupError,
     fallback_settings::FallbackSettings,
     install::UpdateStatus,
@@ -490,6 +490,19 @@ impl<'a> Cfg<'a> {
             .transpose()?)
     }
 
+    pub(crate) async fn toolchain_from_partial(
+        &self,
+        toolchain: Option<PartialToolchainDesc>,
+    ) -> anyhow::Result<Toolchain<'_>> {
+        match toolchain.map(|it| ResolvableToolchainName::from(&it)) {
+            Some(toolchain) => {
+                let desc = toolchain.resolve(&self.get_default_host_triple()?)?;
+                Ok(Toolchain::new(self, desc.into())?)
+            }
+            None => Ok(self.find_or_install_active_toolchain().await?.0),
+        }
+    }
+
     pub(crate) fn find_active_toolchain(
         &self,
     ) -> Result<Option<(LocalToolchainName, ActiveReason)>> {

src/toolchain/distributable.rs

@@ -38,7 +38,7 @@ impl<'a> DistributableToolchain<'a> {
         cfg: &'a Cfg<'a>,
     ) -> anyhow::Result<Self> {
         Ok(Self::try_from(
-            &Toolchain::from_partial(toolchain, cfg).await?,
+            &cfg.toolchain_from_partial(toolchain).await?,
         )?)
     }
 

src/toolchain/toolchain.rs

@@ -26,7 +26,7 @@ use crate::{
 
 use super::{
     distributable::DistributableToolchain,
-    names::{LocalToolchainName, ResolvableToolchainName, ToolchainName},
+    names::{LocalToolchainName, ToolchainName},
 };
 
 /// A toolchain installed on the local disk
@@ -59,19 +59,6 @@ impl<'a> Toolchain<'a> {
         }
     }
 
-    pub(crate) async fn from_partial(
-        toolchain: Option<PartialToolchainDesc>,
-        cfg: &'a Cfg<'a>,
-    ) -> anyhow::Result<Self> {
-        match toolchain.map(|it| ResolvableToolchainName::from(&it)) {
-            Some(toolchain) => {
-                let desc = toolchain.resolve(&cfg.get_default_host_triple()?)?;
-                Ok(Toolchain::new(cfg, desc.into())?)
-            }
-            None => Ok(cfg.find_or_install_active_toolchain().await?.0),
-        }
-    }
-
     /// Calls Toolchain::new(), but augments the error message with more context
     /// from the ActiveReason if the toolchain isn't installed.
     pub(crate) fn with_reason(