Move Cfg::get_self_update_mode() to SelfUpdateMode::from_cfg()

Author: djc

src/cli/rustup_mode.rs

@@ -829,7 +829,7 @@ async fn check_updates(cfg: &Cfg<'_>, opts: CheckOpts) -> Result<utils::ExitCode
         }
     }
 
-    let self_update_mode = cfg.get_self_update_mode()?;
+    let self_update_mode = SelfUpdateMode::from_cfg(cfg)?;
     // Priority: no-self-update feature > self_update_mode > no-self-update args.
     // Check for update only if rustup does **not** have the no-self-update feature,
     // and auto-self-update is configured to **enable**
@@ -854,7 +854,7 @@ async fn update(
     let mut exit_code = utils::ExitCode(0);
 
     common::warn_if_host_is_emulated(cfg.process);
-    let self_update_mode = cfg.get_self_update_mode()?;
+    let self_update_mode = SelfUpdateMode::from_cfg(cfg)?;
     // Priority: no-self-update feature > self_update_mode > no-self-update args.
     // Update only if rustup does **not** have the no-self-update feature,
     // and auto-self-update is configured to **enable**

src/cli/self_update.rs

@@ -261,6 +261,21 @@ pub enum SelfUpdateMode {
 }
 
 impl SelfUpdateMode {
+    pub(crate) fn from_cfg(cfg: &Cfg<'_>) -> anyhow::Result<Self> {
+        if cfg.process.var("CI").is_ok() && cfg.process.var("RUSTUP_CI").is_err() {
+            // If we're in CI (but not rustup's own CI, which wants to test this stuff!),
+            // disable automatic self updates.
+            return Ok(SelfUpdateMode::Disable);
+        }
+
+        cfg.settings_file.with(|s| {
+            Ok(match s.auto_self_update {
+                Some(mode) => mode,
+                None => SelfUpdateMode::Enable,
+            })
+        })
+    }
+
     pub(crate) fn as_str(&self) -> &'static str {
         match self {
             Self::Enable => "enable",

src/config.rs

@@ -409,21 +409,6 @@ impl<'a> Cfg<'a> {
             .with(|s| Ok(s.profile.unwrap_or_default()))
     }
 
-    pub(crate) fn get_self_update_mode(&self) -> Result<SelfUpdateMode> {
-        if self.process.var("CI").is_ok() && self.process.var("RUSTUP_CI").is_err() {
-            // If we're in CI (but not rustup's own CI, which wants to test this stuff!),
-            // disable automatic self updates.
-            return Ok(SelfUpdateMode::Disable);
-        }
-
-        self.settings_file.with(|s| {
-            Ok(match s.auto_self_update {
-                Some(mode) => mode,
-                None => SelfUpdateMode::Enable,
-            })
-        })
-    }
-
     pub(crate) fn ensure_toolchains_dir(&self) -> Result<(), anyhow::Error> {
         utils::ensure_dir_exists("toolchains", &self.toolchains_dir, &|n| {
             (self.notify_handler)(n)