diff options
| author | bors <bors@rust-lang.org> | 2025-05-25 14:46:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-05-25 14:46:28 +0000 |
| commit | 283db70ace62a0ae704a624e43b68c2ee44b87a6 (patch) | |
| tree | 7e88d24a7189f00dc3fabd256df143c7438ea784 /compiler/rustc_attr_parsing/src | |
| parent | 88b3b520e852e01970c3f519339ba64ed3e7db6d (diff) | |
| parent | 43cb506383b0aa98924305804547f461653650f8 (diff) | |
| download | rust-283db70ace62a0ae704a624e43b68c2ee44b87a6.tar.gz rust-283db70ace62a0ae704a624e43b68c2ee44b87a6.zip | |
Auto merge of #141545 - GuillaumeGomez:rollup-myrvuqq, r=GuillaumeGomez
Rollup of 6 pull requests Successful merges: - rust-lang/rust#141413 (Make #[cfg(version)] respect RUSTC_OVERRIDE_VERSION_STRING) - rust-lang/rust#141443 (make teach_help message for cast-before-pass-to-variadic more precise) - rust-lang/rust#141508 (bootstrap: clippy: set TESTNAME based on given paths) - rust-lang/rust#141512 (Avoid extra path trimming in method not found error) - rust-lang/rust#141530 (Added unstable feature doc comments to unstable book) - rust-lang/rust#141541 (Random nits) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_attr_parsing/src')
| -rw-r--r-- | compiler/rustc_attr_parsing/src/attributes/cfg.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_attr_parsing/src/attributes/cfg.rs b/compiler/rustc_attr_parsing/src/attributes/cfg.rs index 7cb1fede174..528f56dfac7 100644 --- a/compiler/rustc_attr_parsing/src/attributes/cfg.rs +++ b/compiler/rustc_attr_parsing/src/attributes/cfg.rs @@ -129,9 +129,9 @@ pub fn eval_condition( // See https://github.com/rust-lang/rust/issues/64796#issuecomment-640851454 for details if sess.psess.assume_incomplete_release { - RustcVersion::CURRENT > min_version + RustcVersion::current_overridable() > min_version } else { - RustcVersion::CURRENT >= min_version + RustcVersion::current_overridable() >= min_version } } MetaItemKind::List(mis) => { |