refactor(cli): Switch '-C' to using 'reload_rooted_at'

Author: epage

src/bin/cargo/cli.rs

@@ -19,8 +19,6 @@ pub fn main(config: &mut LazyConfig) -> CliResult {
     let args = cli().try_get_matches()?;
 
     // Update the process-level notion of cwd
-    // This must be completed before config is initialized
-    assert_eq!(config.is_init(), false);
     if let Some(new_cwd) = args.get_one::<std::path::PathBuf>("directory") {
         // This is a temporary hack. This cannot access `Config`, so this is a bit messy.
         // This does not properly parse `-Z` flags that appear after the subcommand.
@@ -40,6 +38,7 @@ 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();
     }
 
     // CAUTION: Be careful with using `config` until it is configured below.
@@ -661,13 +660,6 @@ impl LazyConfig {
         Self { config: None }
     }
 
-    /// Check whether the config is loaded
-    ///
-    /// This is useful for asserts in case the environment needs to be setup before loading
-    pub fn is_init(&self) -> bool {
-        self.config.is_some()
-    }
-
     /// Get the config, loading it if needed
     ///
     /// On error, the process is terminated

src/bin/cargo/main.rs

@@ -21,6 +21,7 @@ fn main() {
     setup_logger();
 
     let mut config = cli::LazyConfig::new();
+    config.get();
 
     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))

src/cargo/util/config/mod.rs

@@ -565,6 +565,15 @@ impl Config {
         self.search_stop_path = Some(path);
     }
 
+    /// Run after calling [`std::env::set_current_dir`]
+    pub fn reload_cwd(&mut self) -> CargoResult<()> {
+        let cwd = env::current_dir()
+            .with_context(|| "couldn't get the current directory of the process")?;
+        self.cwd = cwd;
+        self.reload_rooted_at(self.cwd.clone())?;
+        Ok(())
+    }
+
     /// Reloads on-disk configuration values, starting at the given path and
     /// walking up its ancestors.
     pub fn reload_rooted_at<P: AsRef<Path>>(&mut self, path: P) -> CargoResult<()> {