cli: inline Cfg::resolve_toolchain()

Author: djc

src/cli/rustup_mode.rs

@@ -1048,7 +1048,13 @@ async fn which(
     binary: &str,
     toolchain: Option<ResolvableToolchainName>,
 ) -> Result<ExitCode> {
-    let toolchain = cfg.resolve_toolchain(toolchain).await?;
+    let toolchain = cfg
+        .local_toolchain(match toolchain {
+            Some(name) => Some(name.resolve(&cfg.get_default_host_triple()?)?.into()),
+            None => None,
+        })
+        .await?;
+
     let binary_path = toolchain.binary_file(binary);
     if utils::is_file(&binary_path) {
         writeln!(cfg.process.stdout().lock(), "{}", binary_path.display())?;

src/config.rs

@@ -706,16 +706,6 @@ impl<'a> Cfg<'a> {
         Ok(Some(Toolchain::new(self, name)?.rustc_version()))
     }
 
-    pub(crate) async fn resolve_toolchain(
-        &self,
-        name: Option<ResolvableToolchainName>,
-    ) -> Result<Toolchain<'_>> {
-        let toolchain = name
-            .map(|name| anyhow::Ok(name.resolve(&self.get_default_host_triple()?)?.into()))
-            .transpose()?;
-        self.local_toolchain(toolchain).await
-    }
-
     pub(crate) async fn resolve_local_toolchain(
         &self,
         name: Option<ResolvableLocalToolchainName>,
@@ -726,7 +716,10 @@ impl<'a> Cfg<'a> {
         self.local_toolchain(local).await
     }
 
-    async fn local_toolchain(&self, name: Option<LocalToolchainName>) -> Result<Toolchain<'_>> {
+    pub(crate) async fn local_toolchain(
+        &self,
+        name: Option<LocalToolchainName>,
+    ) -> Result<Toolchain<'_>> {
         match name {
             Some(tc) => {
                 let install_if_missing = self.should_auto_install()?;