Revert "refactor(cli): Lazily do first-pass config loading"

This reverts commit eda1652.

Author: epage

src/bin/cargo/cli.rs

@@ -1,5 +1,4 @@
 use anyhow::{anyhow, Context as _};
-use cargo::core::shell::Shell;
 use cargo::core::{features, CliUnstable};
 use cargo::{self, drop_print, drop_println, CargoResult, CliResult, Config};
 use clap::{builder::UnknownArgumentValueParser, Arg, ArgMatches};
@@ -15,7 +14,11 @@ use crate::command_prelude::*;
 use crate::util::is_rustup;
 use cargo::util::style;
 
-pub fn main(config: &mut LazyConfig) -> CliResult {
+pub fn main(config: &mut Config) -> CliResult {
+    // CAUTION: Be careful with using `config` until it is configured below.
+    // In general, try to avoid loading config values unless necessary (like
+    // the [alias] table).
+
     let args = cli().try_get_matches()?;
 
     // Update the process-level notion of cwd
@@ -38,14 +41,9 @@ pub fn main(config: &mut LazyConfig) -> CliResult {
             .into());
         }
         std::env::set_current_dir(&new_cwd).context("could not change to requested directory")?;
-        config.get_mut().reload_cwd();
+        config.reload_cwd()?;
     }
 
-    // CAUTION: Be careful with using `config` until it is configured below.
-    // In general, try to avoid loading config values unless necessary (like
-    // the [alias] table).
-    let config = config.get_mut();
-
     let (expanded_args, global_args) = expand_aliases(config, args, vec![])?;
 
     if expanded_args
@@ -645,42 +643,6 @@ See '<cyan,bold>cargo help</> <cyan><<command>></>' for more information on a sp
         .subcommands(commands::builtin())
 }
 
-/// Delay loading [`Config`] until access.
-///
-/// In the common path, the [`Config`] is dependent on CLI parsing and shouldn't be loaded until
-/// after that is done but some other paths (like fix or earlier errors) might need access to it,
-/// so this provides a way to share the instance and the implementation across these different
-/// accesses.
-pub struct LazyConfig {
-    config: Option<Config>,
-}
-
-impl LazyConfig {
-    pub fn new() -> Self {
-        Self { config: None }
-    }
-
-    /// Get the config, loading it if needed
-    ///
-    /// On error, the process is terminated
-    pub fn get(&mut self) -> &Config {
-        self.get_mut()
-    }
-
-    /// Get the config, loading it if needed
-    ///
-    /// On error, the process is terminated
-    pub fn get_mut(&mut self) -> &mut Config {
-        self.config.get_or_insert_with(|| match Config::default() {
-            Ok(cfg) => cfg,
-            Err(e) => {
-                let mut shell = Shell::new();
-                cargo::exit_with_error(e.into(), &mut shell)
-            }
-        })
-    }
-}
-
 #[test]
 fn verify_cli() {
     cli().debug_assert();

src/bin/cargo/main.rs

@@ -1,5 +1,6 @@
 #![allow(clippy::self_named_module_files)] // false positive in `commands/build.rs`
 
+use cargo::core::shell::Shell;
 use cargo::util::network::http::http_handle;
 use cargo::util::network::http::needs_custom_http_transport;
 use cargo::util::CliError;
@@ -20,18 +21,23 @@ use crate::command_prelude::*;
 fn main() {
     setup_logger();
 
-    let mut config = cli::LazyConfig::new();
-    config.get();
+    let mut config = match Config::default() {
+        Ok(cfg) => cfg,
+        Err(e) => {
+            let mut shell = Shell::new();
+            cargo::exit_with_error(e.into(), &mut shell)
+        }
+    };
 
     let result = if let Some(lock_addr) = cargo::ops::fix_get_proxy_lock_addr() {
-        cargo::ops::fix_exec_rustc(config.get(), &lock_addr).map_err(|e| CliError::from(e))
+        cargo::ops::fix_exec_rustc(&config, &lock_addr).map_err(|e| CliError::from(e))
     } else {
         let _token = cargo::util::job::setup();
         cli::main(&mut config)
     };
 
     match result {
-        Err(e) => cargo::exit_with_error(e, &mut config.get_mut().shell()),
+        Err(e) => cargo::exit_with_error(e, &mut *config.shell()),
         Ok(()) => {}
     }
 }