config: drop trivial Cfg setters

Author: djc

src/cli/rustup_mode.rs

@@ -612,10 +612,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)?;
-
-    if let Some(t) = &matches.plus_toolchain {
-        cfg.set_toolchain_override(t);
-    }
+    cfg.toolchain_override = matches.plus_toolchain;
 
     let Some(subcmd) = matches.subcmd else {
         let help = Rustup::command().render_long_help();
@@ -939,9 +936,7 @@ async fn update(
         && self_update_mode == SelfUpdateMode::Enable
         && !opts.no_self_update;
     let force_non_host = opts.force_non_host;
-    if let Some(p) = opts.profile {
-        cfg.set_profile_override(p);
-    }
+    cfg.profile_override = opts.profile;
 
     let cfg = &cfg;
     if cfg.get_profile()? == Profile::Complete {

src/config.rs

@@ -231,7 +231,7 @@ impl From<LocalToolchainName> for OverrideCfg {
 pub(crate) const UNIX_FALLBACK_SETTINGS: &str = "/etc/rustup/settings.toml";
 
 pub(crate) struct Cfg<'a> {
-    profile_override: Option<Profile>,
+    pub profile_override: Option<Profile>,
     pub rustup_dir: PathBuf,
     pub settings_file: SettingsFile,
     pub fallback_settings: Option<FallbackSettings>,
@@ -330,10 +330,6 @@ impl<'a> Cfg<'a> {
         Ok(cfg)
     }
 
-    pub(crate) fn set_profile_override(&mut self, profile: Profile) {
-        self.profile_override = Some(profile);
-    }
-
     pub(crate) fn set_default(&self, toolchain: Option<&ToolchainName>) -> Result<()> {
         self.settings_file.with_mut(|s| {
             s.default_toolchain = toolchain.map(|t| t.to_string());
@@ -367,10 +363,6 @@ impl<'a> Cfg<'a> {
         Ok(())
     }
 
-    pub(crate) fn set_toolchain_override(&mut self, toolchain_override: &ResolvableToolchainName) {
-        self.toolchain_override = Some(toolchain_override.to_owned());
-    }
-
     pub(crate) fn set_auto_install(&mut self, mode: AutoInstallMode) -> Result<()> {
         self.settings_file.with_mut(|s| {
             s.auto_install = Some(mode);
@@ -710,7 +702,7 @@ impl<'a> Cfg<'a> {
     pub(crate) async fn active_rustc_version(&mut self) -> Result<Option<String>> {
         if let Some(t) = self.process.args().find(|x| x.starts_with('+')) {
             trace!("Fetching rustc version from toolchain `{}`", t);
-            self.set_toolchain_override(&ResolvableToolchainName::try_from(&t[1..])?);
+            self.toolchain_override = Some(ResolvableToolchainName::try_from(&t[1..])?);
         }
 
         let Some((name, _)) = self.maybe_ensure_active_toolchain(None).await? else {