diff options
| author | The Miri Conjob Bot <miri@cron.bot> | 2024-02-19 05:12:20 +0000 |
|---|---|---|
| committer | The Miri Conjob Bot <miri@cron.bot> | 2024-02-19 05:12:20 +0000 |
| commit | e118c3e8af2ee5c0d20d21e8bf08c1a254a317fb (patch) | |
| tree | cf3e5436c033a6b38daa21eb498b7f53d417936c /compiler/rustc_parse/src/errors.rs | |
| parent | 6b6da93e51851d098574b5e6f39b6d187e78f34a (diff) | |
| parent | d5735645753e990a72446094f703df9b5e421555 (diff) | |
| download | rust-e118c3e8af2ee5c0d20d21e8bf08c1a254a317fb.tar.gz rust-e118c3e8af2ee5c0d20d21e8bf08c1a254a317fb.zip | |
Merge from rustc
Diffstat (limited to 'compiler/rustc_parse/src/errors.rs')
| -rw-r--r-- | compiler/rustc_parse/src/errors.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_parse/src/errors.rs b/compiler/rustc_parse/src/errors.rs index 3c3a8d6fbb9..674f7218ea6 100644 --- a/compiler/rustc_parse/src/errors.rs +++ b/compiler/rustc_parse/src/errors.rs @@ -2545,7 +2545,7 @@ pub enum HelpUseLatestEdition { impl HelpUseLatestEdition { pub fn new() -> Self { let edition = LATEST_STABLE_EDITION; - if std::env::var_os("CARGO").is_some() { + if rustc_session::utils::was_invoked_from_cargo() { Self::Cargo { edition } } else { Self::Standalone { edition } |