cli: avoid Cfg construction indirection

Author: djc

src/cli/common.rs

@@ -3,7 +3,7 @@
 use std::fmt::Display;
 use std::fs;
 use std::io::{BufRead, Write};
-use std::path::{Path, PathBuf};
+use std::path::Path;
 use std::sync::LazyLock;
 use std::{cmp, env};
 
@@ -119,11 +119,6 @@ pub(crate) fn read_line(process: &Process) -> Result<String> {
     .context("unable to read from stdin for confirmation")
 }
 
-#[tracing::instrument(level = "trace", skip(process))]
-pub(crate) fn set_globals(current_dir: PathBuf, quiet: bool, process: &Process) -> Result<Cfg<'_>> {
-    Cfg::from_env(current_dir, quiet, process)
-}
-
 pub(crate) fn show_channel_update(
     cfg: &Cfg<'_>,
     name: PackageUpdate,

src/cli/proxy_mode.rs

@@ -3,9 +3,9 @@ use std::{path::PathBuf, process::ExitStatus};
 use anyhow::Result;
 
 use crate::{
-    cli::{common::set_globals, job, self_update},
+    cli::{job, self_update},
     command::run_command_for_dir,
-    config::ActiveSource,
+    config::{ActiveSource, Cfg},
     process::Process,
     toolchain::ResolvableLocalToolchainName,
 };
@@ -33,7 +33,7 @@ pub async fn main(arg0: &str, current_dir: PathBuf, process: &Process) -> Result
         .skip(1 + toolchain.is_some() as usize)
         .collect();
 
-    let cfg = set_globals(current_dir, true, process)?;
+    let cfg = Cfg::from_env(current_dir, true, process)?;
     let toolchain = cfg.resolve_local_toolchain(toolchain).await?;
     let mut cmd = toolchain.command(arg0)?;
     if toolchain_specified {

src/cli/rustup_mode.rs

@@ -584,7 +584,7 @@ pub async fn main(
         Err(err) if err.kind() == DisplayVersion => {
             write!(process.stdout().lock(), "{err}")?;
             info!("This is the version for the rustup toolchain manager, not the rustc compiler.");
-            let mut cfg = common::set_globals(current_dir, true, process)?;
+            let mut cfg = Cfg::from_env(current_dir, true, process)?;
             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"),
@@ -611,7 +611,7 @@ pub async fn main(
 
     update_console_filter(process, &console_filter, matches.quiet, matches.verbose);
 
-    let cfg = &mut common::set_globals(current_dir, matches.quiet, process)?;
+    let cfg = &mut Cfg::from_env(current_dir, matches.quiet, process)?;
     cfg.toolchain_override = matches.plus_toolchain;
 
     let Some(subcmd) = matches.subcmd else {

src/cli/self_update.rs

@@ -1385,8 +1385,8 @@ pub(crate) fn cleanup_self_updater(process: &Process) -> Result<()> {
 mod tests {
     use std::collections::HashMap;
 
-    use crate::cli::common;
     use crate::cli::self_update::InstallOpts;
+    use crate::config::Cfg;
     use crate::dist::{PartialToolchainDesc, Profile};
     use crate::test::{Env, test_dir, with_rustup_home};
     use crate::{for_host, process::TestProcess};
@@ -1398,7 +1398,7 @@ mod tests {
             home.apply(&mut vars);
             let tp = TestProcess::with_vars(vars);
             let mut cfg =
-                common::set_globals(tp.process.current_dir().unwrap(), false, &tp.process).unwrap();
+                Cfg::from_env(tp.process.current_dir().unwrap(), false, &tp.process).unwrap();
 
             let opts = InstallOpts {
                 default_host_triple: None,

src/cli/setup_mode.rs

@@ -10,6 +10,7 @@ use crate::{
         common::{self, update_console_filter},
         self_update::{self, InstallOpts},
     },
+    config::Cfg,
     dist::Profile,
     process::Process,
     toolchain::MaybeOfficialToolchainName,
@@ -128,6 +129,6 @@ pub async fn main(
         targets: &target.iter().map(|s| &**s).collect::<Vec<_>>(),
     };
 
-    let mut cfg = common::set_globals(current_dir, quiet, process)?;
+    let mut cfg = Cfg::from_env(current_dir, quiet, process)?;
     self_update::install(no_prompt, opts, &mut cfg).await
 }