diff options
| author | bors <bors@rust-lang.org> | 2023-12-10 21:48:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-12-10 21:48:53 +0000 |
| commit | d86d65bbc19b928387f68427fcc3a0da498d8a19 (patch) | |
| tree | 4cb4a17ba1d40e64b5a126b044742176c49eace9 /compiler/rustc_session/src/options.rs | |
| parent | ec4176167b964debee77015d0c67720639f9d673 (diff) | |
| parent | dc2f77aad617400b68ba607ca59bbf0121000b1f (diff) | |
| download | rust-d86d65bbc19b928387f68427fcc3a0da498d8a19.tar.gz rust-d86d65bbc19b928387f68427fcc3a0da498d8a19.zip | |
Auto merge of #118368 - GuillaumeGomez:env-flag, r=Nilstrieb
Implement `--env` compiler flag (without `tracked_env` support)
Part of https://github.com/rust-lang/rust/issues/80792.
Implementation of https://github.com/rust-lang/compiler-team/issues/653.
Not an implementation of https://github.com/rust-lang/rfcs/pull/2794.
It adds the `--env` compiler flag option which allows to set environment values used by `env!` and `option_env!`.
Important to note: When trying to retrieve an environment variable value, it will first look into the ones defined with `--env`, and if there isn't one, then only it will look into the environment variables. So if you use `--env PATH=a`, then `env!("PATH")` will return `"a"` and not the actual `PATH` value.
As mentioned in the title, `tracked_env` support is not added here. I'll do it in a follow-up PR.
r? rust-lang/compiler
Diffstat (limited to 'compiler/rustc_session/src/options.rs')
| -rw-r--r-- | compiler/rustc_session/src/options.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/rustc_session/src/options.rs b/compiler/rustc_session/src/options.rs index b1cf43f471a..d666c5d4d70 100644 --- a/compiler/rustc_session/src/options.rs +++ b/compiler/rustc_session/src/options.rs @@ -3,6 +3,7 @@ use crate::config::*; use crate::search_paths::SearchPath; use crate::utils::NativeLib; use crate::{lint, EarlyErrorHandler}; +use rustc_data_structures::fx::FxIndexMap; use rustc_data_structures::profiling::TimePassesFormat; use rustc_data_structures::stable_hasher::Hash64; use rustc_errors::ColorConfig; @@ -150,6 +151,9 @@ top_level_options!( target_triple: TargetTriple [TRACKED], + /// Effective logical environment used by `env!`/`option_env!` macros + logical_env: FxIndexMap<String, String> [TRACKED], + test: bool [TRACKED], error_format: ErrorOutputType [UNTRACKED], diagnostic_width: Option<usize> [UNTRACKED], |