Check settings version on Cfg construction

Author: djc

src/cli/proxy_mode.rs

@@ -32,7 +32,6 @@ pub async fn main(arg0: &str, current_dir: PathBuf, process: &Process) -> Result
         .collect();
 
     let cfg = set_globals(current_dir, false, true, process)?;
-    cfg.check_metadata_version()?;
     let cmd = cfg.local_toolchain(toolchain).await?.command(arg0)?;
     run_command_for_dir(cmd, arg0, &cmd_args)
 }

src/cli/rustup_mode.rs

@@ -573,8 +573,6 @@ pub async fn main(current_dir: PathBuf, process: &Process) -> Result<utils::Exit
         cfg.set_toolchain_override(t);
     }
 
-    cfg.check_metadata_version()?;
-
     let Some(subcmd) = matches.subcmd else {
         eprintln!("{}", Rustup::command().render_long_help());
         return Ok(utils::ExitCode(1));

src/config.rs

@@ -259,6 +259,16 @@ impl<'a> Cfg<'a> {
         utils::ensure_dir_exists("home", &rustup_dir, notify_handler.as_ref())?;
 
         let settings_file = SettingsFile::new(rustup_dir.join("settings.toml"));
+        settings_file.with(|s| {
+            (notify_handler)(Notification::ReadMetadataVersion(s.version));
+            if s.version == MetadataVersion::default() {
+                Ok(())
+            } else {
+                Err(anyhow!(
+                    "rustup's metadata is out of date. run `rustup self upgrade-data`"
+                ))
+            }
+        })?;
 
         // Centralised file for multi-user systems to provide admin/distributor set initial values.
         let fallback_settings = if cfg!(not(windows)) {
@@ -916,22 +926,6 @@ impl<'a> Cfg<'a> {
         Ok(channels.collect().await)
     }
 
-    #[cfg_attr(feature = "otel", tracing::instrument(skip_all))]
-    pub(crate) fn check_metadata_version(&self) -> Result<()> {
-        utils::assert_is_directory(&self.rustup_dir)?;
-
-        self.settings_file.with(|s| {
-            (self.notify_handler)(Notification::ReadMetadataVersion(s.version));
-            if s.version == MetadataVersion::default() {
-                Ok(())
-            } else {
-                Err(anyhow!(
-                    "rustup's metadata is out of date. run `rustup self upgrade-data`"
-                ))
-            }
-        })
-    }
-
     pub(crate) fn set_default_host_triple(&self, host_triple: String) -> Result<()> {
         // Ensure that the provided host_triple is capable of resolving
         // against the 'stable' toolchain.  This provides early errors