Eliminate overlap with RUSTUP_TOOLCHAIN

Author: smoelius

src/cli/proxy_mode.rs

@@ -7,7 +7,7 @@ use crate::{
     command::run_command_for_dir,
     config::ActiveReason,
     process::Process,
-    toolchain::ResolvableLocalToolchainName,
+    toolchain::{ResolvableLocalToolchainName, maybe_set_env_source},
 };
 
 #[tracing::instrument(level = "trace", skip(process))]
@@ -37,7 +37,7 @@ pub async fn main(arg0: &str, current_dir: PathBuf, process: &Process) -> Result
     let toolchain = cfg.resolve_local_toolchain(toolchain).await?;
     let mut cmd = toolchain.command(arg0)?;
     if toolchain_specified {
-        toolchain.maybe_set_env_source(&mut cmd, || Some(ActiveReason::CommandLine));
+        maybe_set_env_source(&mut cmd, || Some(ActiveReason::CommandLine));
     }
     run_command_for_dir(cmd, arg0, &cmd_args)
 }

src/config.rs

@@ -104,16 +104,13 @@ pub(crate) enum ActiveReason {
 
 impl ActiveReason {
     /// Format `ActiveReason` for setting the `RUSTUP_TOOLCHAIN_SOURCE` environment variable.
-    ///
-    /// The format of the variable's content is `source toolchain`. Neither component should
-    /// contain spaces.
-    pub fn to_source(&self, name: &LocalToolchainName) -> String {
+    pub fn to_source(&self) -> &str {
         match self {
-            Self::Default => format!("default {name}"),
-            Self::Environment => format!("env {name}"),
-            Self::CommandLine => format!("cli {name}"),
-            Self::OverrideDB(_) => format!("override {name}"),
-            Self::ToolchainFile(_) => format!("config {name}"),
+            Self::Default => "default",
+            Self::Environment => "env",
+            Self::CommandLine => "cli",
+            Self::OverrideDB(_) => "override",
+            Self::ToolchainFile(_) => "config",
         }
     }
 }

src/toolchain.rs

@@ -181,7 +181,7 @@ impl<'a> Toolchain<'a> {
 
         env_var::inc("RUST_RECURSION_COUNT", cmd, self.cfg.process);
 
-        self.maybe_set_env_source(cmd, || {
+        maybe_set_env_source(cmd, || {
             if let Ok(Some((_, reason))) = self.cfg.active_toolchain() {
                 Some(reason)
             } else {
@@ -193,23 +193,6 @@ impl<'a> Toolchain<'a> {
         cmd.env("RUSTUP_HOME", &self.cfg.rustup_dir);
     }
 
-    /// Set the `RUSTUP_TOOLCHAIN_SOURCE` environment variable if not already set.
-    ///
-    /// `RUSTUP_TOOLCHAIN_SOURCE` indicates how the toolchain was determined. The environment
-    /// variable could have been set in proxy_mode.rs, in which case it should not be changed.
-    pub(crate) fn maybe_set_env_source(
-        &self,
-        cmd: &mut Command,
-        f: impl FnOnce() -> Option<ActiveReason>,
-    ) {
-        if env::var_os("RUSTUP_TOOLCHAIN_SOURCE").is_some() {
-            return;
-        }
-        if let Some(reason) = f() {
-            cmd.env("RUSTUP_TOOLCHAIN_SOURCE", reason.to_source(&self.name));
-        }
-    }
-
     /// Apply the appropriate LD path for a command being run from a toolchain.
     fn set_ldpath(&self, cmd: &mut Command) {
         #[cfg_attr(not(target_os = "macos"), allow(unused_mut))]
@@ -630,3 +613,16 @@ impl<'a> Toolchain<'a> {
             .collect())
     }
 }
+
+/// Set the `RUSTUP_TOOLCHAIN_SOURCE` environment variable if not already set.
+///
+/// `RUSTUP_TOOLCHAIN_SOURCE` indicates how the toolchain was determined. The environment
+/// variable could have been set in proxy_mode.rs, in which case it should not be changed.
+pub(crate) fn maybe_set_env_source(cmd: &mut Command, f: impl FnOnce() -> Option<ActiveReason>) {
+    if env::var_os("RUSTUP_TOOLCHAIN_SOURCE").is_some() {
+        return;
+    }
+    if let Some(reason) = f() {
+        cmd.env("RUSTUP_TOOLCHAIN_SOURCE", reason.to_source());
+    }
+}

tests/suite/cli_rustup.rs

@@ -3050,7 +3050,7 @@ async fn rustup_toolchain_source_cli() {
         .await
         .with_stderr(snapbox::str![[r#"
 ...
-cli nightly-[HOST_TRIPLE]
+cli
 
 "#]]);
 }
@@ -3066,7 +3066,7 @@ async fn rustup_toolchain_source_env() {
         .await
         .with_stderr(snapbox::str![[r#"
 ...
-env nightly-[HOST_TRIPLE]
+env
 
 "#]]);
 }
@@ -3083,7 +3083,7 @@ async fn rustup_toolchain_source_override() {
         .await
         .with_stderr(snapbox::str![[r#"
 ...
-override nightly-[HOST_TRIPLE]
+override
 
 "#]]);
 }
@@ -3098,7 +3098,7 @@ async fn rustup_toolchain_source_config() {
         .await
         .with_stderr(snapbox::str![[r#"
 ...
-config nightly-[HOST_TRIPLE]
+config
 
 "#]]);
 }
@@ -3115,7 +3115,7 @@ async fn rustup_toolchain_source_default() {
         .await
         .with_stderr(snapbox::str![[r#"
 ...
-default stable-[HOST_TRIPLE]
+default
 
 "#]]);
 }