cli: inline Cfg::active_rustc_version()

Author: djc

src/cli/rustup_mode.rs

@@ -1889,10 +1889,16 @@ async fn display_version(current_dir: PathBuf, process: &Process) -> Result<()>
         .find_map(|arg| arg.strip_prefix('+').map(ResolvableToolchainName::try_from))
         .transpose()?;
 
-    match cfg.active_rustc_version().await {
-        Ok(Some(version)) => info!("The currently active `rustc` version is `{version}`"),
-        Ok(None) => info!("No `rustc` is currently active"),
-        Err(err) => trace!("Failed to display the current `rustc` version: {err}"),
+    match cfg.maybe_ensure_active_toolchain(None).await {
+        Ok(Some((name, _))) => match Toolchain::new(&cfg, name) {
+            Ok(tc) => info!(
+                "the currently active `rustc` version is `{}`",
+                tc.rustc_version()
+            ),
+            Err(err) => trace!("failed to display the current `rustc` version: {err}"),
+        },
+        Ok(None) => info!("no `rustc` is currently active"),
+        Err(err) => trace!("failed to display the current `rustc` version: {err}"),
     }
 
     Ok(())

src/config.rs

@@ -698,14 +698,6 @@ impl<'a> Cfg<'a> {
         }
     }
 
-    #[tracing::instrument(level = "trace")]
-    pub(crate) async fn active_rustc_version(&mut self) -> Result<Option<String>> {
-        let Some((name, _)) = self.maybe_ensure_active_toolchain(None).await? else {
-            return Ok(None);
-        };
-        Ok(Some(Toolchain::new(self, name)?.rustc_version()))
-    }
-
     pub(crate) async fn local_toolchain(
         &self,
         name: Option<LocalToolchainName>,