diff options
| author | bors <bors@rust-lang.org> | 2024-02-19 06:59:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-19 06:59:32 +0000 |
| commit | 010f029c905ffeb01ad88288b2cf50efe65b23ae (patch) | |
| tree | cf3e5436c033a6b38daa21eb498b7f53d417936c /compiler/rustc_parse/src/errors.rs | |
| parent | 90fccaad801a929fc482dbbeca0231aa197de7c7 (diff) | |
| parent | e118c3e8af2ee5c0d20d21e8bf08c1a254a317fb (diff) | |
| download | rust-010f029c905ffeb01ad88288b2cf50efe65b23ae.tar.gz rust-010f029c905ffeb01ad88288b2cf50efe65b23ae.zip | |
Auto merge of #3306 - rust-lang:rustup-2024-02-19, r=RalfJung
Automatic Rustup
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 } |