simplify the use of CiEnv

src/bootstrap/src/core/build_steps/test.rs

@@ -2087,7 +2087,7 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
  let git_config = builder.config.git_config();
  cmd.arg("--git-repository").arg(git_config.git_repository);
  cmd.arg("--nightly-branch").arg(git_config.nightly_branch);
- cmd.force_coloring_in_ci(builder.ci_env);
+ cmd.force_coloring_in_ci();
 
  #[cfg(feature = "build-metrics")]
  builder.metrics.begin_test_suite(

src/bootstrap/src/core/builder.rs

@@ -2157,7 +2157,7 @@ impl<'a> Builder<'a> {
  // Try to use a sysroot-relative bindir, in case it was configured absolutely.
  cargo.env("RUSTC_INSTALL_BINDIR", self.config.bindir_relative());
 
- cargo.force_coloring_in_ci(self.ci_env);
+ cargo.force_coloring_in_ci();
 
  // When we build Rust dylibs they're all intended for intermediate
  // usage, so make sure we pass the -Cprefer-dynamic flag instead of

src/bootstrap/src/core/config/config.rs

@@ -2092,7 +2092,7 @@ impl Config {
 
  // CI should always run stage 2 builds, unless it specifically states otherwise
  #[cfg(not(test))]
- if flags.stage.is_none() && crate::CiEnv::current() != crate::CiEnv::None {
+ if flags.stage.is_none() && build_helper::ci::CiEnv::is_ci() {
  match config.cmd {
  Subcommand::Test { .. }
  | Subcommand::Miri { .. }

src/bootstrap/src/lib.rs

@@ -26,7 +26,7 @@ use std::sync::OnceLock;
 use std::time::SystemTime;
 use std::{env, io, str};
 
-use build_helper::ci::{gha, CiEnv};
+use build_helper::ci::gha;
 use build_helper::exit;
 use sha2::digest::Digest;
 use termcolor::{ColorChoice, StandardStream, WriteColor};
@@ -168,7 +168,6 @@ pub struct Build {
  crates: HashMap<String, Crate>,
  crate_paths: HashMap<PathBuf, String>,
  is_sudo: bool,
- ci_env: CiEnv,
  delayed_failures: RefCell<Vec<String>>,
  prerelease_version: Cell<Option<u32>>,
 
@@ -400,7 +399,6 @@ impl Build {
  crates: HashMap::new(),
  crate_paths: HashMap::new(),
  is_sudo,
- ci_env: CiEnv::current(),
  delayed_failures: RefCell::new(Vec::new()),
  prerelease_version: Cell::new(None),
 

src/bootstrap/src/utils/exec.rs

@@ -175,8 +175,8 @@ impl BootstrapCommand {
  }
 
  /// If in a CI environment, forces the command to run with colors.
- pub fn force_coloring_in_ci(&mut self, ci_env: CiEnv) {
- if ci_env != CiEnv::None {
+ pub fn force_coloring_in_ci(&mut self) {
+ if CiEnv::is_ci() {
  // Due to use of stamp/docker, the output stream of bootstrap is not
  // a TTY in CI, so coloring is by-default turned off.
  // The explicit `TERM=xterm` environment is needed for