cli: inline Cfg::resolve_local_toolchain()

Author: djc

src/cli/proxy_mode.rs

@@ -34,7 +34,13 @@ pub async fn main(arg0: &str, current_dir: PathBuf, process: &Process) -> Result
         .collect();
 
     let cfg = Cfg::from_env(current_dir, true, process)?;
-    let toolchain = cfg.resolve_local_toolchain(toolchain).await?;
+    let toolchain = cfg
+        .local_toolchain(match toolchain {
+            Some(name) => Some(name.resolve(&cfg.get_default_host_triple()?)?),
+            None => None,
+        })
+        .await?;
+
     let mut cmd = toolchain.command(arg0)?;
     if toolchain_specified {
         cmd.env(

src/config.rs

@@ -706,16 +706,6 @@ impl<'a> Cfg<'a> {
         Ok(Some(Toolchain::new(self, name)?.rustc_version()))
     }
 
-    pub(crate) async fn resolve_local_toolchain(
-        &self,
-        name: Option<ResolvableLocalToolchainName>,
-    ) -> Result<Toolchain<'_>> {
-        let local = name
-            .map(|name| name.resolve(&self.get_default_host_triple()?))
-            .transpose()?;
-        self.local_toolchain(local).await
-    }
-
     pub(crate) async fn local_toolchain(
         &self,
         name: Option<LocalToolchainName>,