Make #[cfg(version)] respect RUSTC_OVERRIDE_VERSION_STRING #141413

est31 · 2025-05-22T23:05:56Z

The #[cfg(version(...))] feature is currently under-tested. Part of it is the difficulty that it is hard to write a test that never changes, while the version of the Rust compiler indeed does change.

PR #81468 added the first and so far only test of #[cfg(version(...))]'s functionality (there is one other test for the syntax, that also acts as feature gate). But that test uses a proc macro that parses the version: the text of the test doesn't contain the actual #[cfg(version(...))].

This PR makes #[cfg(version(...))] respect RUSTC_OVERRIDE_VERSION_STRING, added by PR #124339, allowing us to virtually pin the rustc version and write tests from all directions against some specific version.

The PR also adds a functional test of #[cfg(version(...))] that leverages RUSTC_OVERRIDE_VERSION_STRING.

Pulled out of #141137.

Tracking issue: #64796

rustbot · 2025-05-22T23:05:59Z

r? @BoxyUwU

rustbot has assigned @BoxyUwU.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2025-05-22T23:06:01Z

Some changes occurred in compiler/rustc_attr_parsing

cc @jdonszelmann

Some changes occurred in compiler/rustc_attr_data_structures

cc @jdonszelmann

jieyouxu · 2025-05-23T07:59:20Z

r? jieyouxu

jieyouxu

Thanks. Two things:

A naming nit.
Can you squash the commits into one? The second test commit doesn't need to be its own commit IMO.

compiler/rustc_attr_data_structures/src/version.rs

tests/ui/feature-gates/cfg-version-expand.stderr

jieyouxu · 2025-05-23T08:40:20Z

@rustbot author

jieyouxu · 2025-05-23T08:41:01Z

(Also, feel free to r? me for cfg_version PRs since I was already looking at the previous stabilization PR)

est31 · 2025-05-23T12:12:33Z

@rustbot ready

compiler/rustc_attr_data_structures/src/version.rs

jieyouxu · 2025-05-23T12:21:40Z

Thanks, ~~feel free to r=me after the static naming nit.~~

EDIT: actually one sec

tests/ui/feature-gates/cfg-version-expand.rs

jieyouxu

Thanks

jieyouxu · 2025-05-23T15:00:51Z

@bors r+ rollup

bors · 2025-05-23T15:00:54Z

📌 Commit 8616237 has been approved by jieyouxu

It is now in the queue for this repository.

bors · 2025-05-23T15:00:54Z

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

Make #[cfg(version)] respect RUSTC_OVERRIDE_VERSION_STRING The `#[cfg(version(...))]` feature is currently under-tested. Part of it is the difficulty that it is hard to write a test that never changes, while the version of the Rust compiler indeed *does* change. PR rust-lang#81468 added the first and so far only test of `#[cfg(version(...))]`'s functionality (there is one other test for the *syntax*, that also acts as feature gate). But that test uses a proc macro that parses the version: the text of the test doesn't contain the actual `#[cfg(version(...))]`. This PR makes `#[cfg(version(...))]` respect `RUSTC_OVERRIDE_VERSION_STRING`, added by PR rust-lang#124339, allowing us to virtually pin the rustc version and write tests from all directions against some specific version. The PR also adds a functional test of `#[cfg(version(...))]` that leverages `RUSTC_OVERRIDE_VERSION_STRING`. Pulled out of rust-lang#141137. Tracking issue: rust-lang#64796

Rollup of 8 pull requests Successful merges: - #140790 (Enable xray support for Mac) - #141405 (GetUserProfileDirectoryW is now documented to always store the size) - #141413 (Make #[cfg(version)] respect RUSTC_OVERRIDE_VERSION_STRING) - #141427 (Disable `triagebot`'s `glacier` handler) - #141429 (Dont walk into unsafe binders when emiting error for non-structural type match) - #141438 (Do not try to confirm non-dyn compatible method) - #141444 (Improve CONTRIBUTING.md grammar and clarity) - #141446 (Add 2nd Solaris target maintainer) r? `@ghost` `@rustbot` modify labels: rollup

Make #[cfg(version)] respect RUSTC_OVERRIDE_VERSION_STRING The `#[cfg(version(...))]` feature is currently under-tested. Part of it is the difficulty that it is hard to write a test that never changes, while the version of the Rust compiler indeed *does* change. PR rust-lang#81468 added the first and so far only test of `#[cfg(version(...))]`'s functionality (there is one other test for the *syntax*, that also acts as feature gate). But that test uses a proc macro that parses the version: the text of the test doesn't contain the actual `#[cfg(version(...))]`. This PR makes `#[cfg(version(...))]` respect `RUSTC_OVERRIDE_VERSION_STRING`, added by PR rust-lang#124339, allowing us to virtually pin the rustc version and write tests from all directions against some specific version. The PR also adds a functional test of `#[cfg(version(...))]` that leverages `RUSTC_OVERRIDE_VERSION_STRING`. Pulled out of rust-lang#141137. Tracking issue: rust-lang#64796

matthiaskrgr · 2025-05-24T07:23:19Z

@bors r-
#141482 (comment)

est31 · 2025-05-24T21:54:52Z

fixed the build failure after a rebase.

jieyouxu · 2025-05-25T10:02:52Z

@bors r+

bors · 2025-05-25T10:02:55Z

📌 Commit f3245e4 has been approved by jieyouxu

It is now in the queue for this repository.

Rollup of 6 pull requests Successful merges: - #141413 (Make #[cfg(version)] respect RUSTC_OVERRIDE_VERSION_STRING) - #141443 (make teach_help message for cast-before-pass-to-variadic more precise) - #141508 (bootstrap: clippy: set TESTNAME based on given paths) - #141512 (Avoid extra path trimming in method not found error) - #141530 (Added unstable feature doc comments to unstable book) - #141541 (Random nits) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #141413 - est31:cfg_version_env_var, r=jieyouxu Make #[cfg(version)] respect RUSTC_OVERRIDE_VERSION_STRING The `#[cfg(version(...))]` feature is currently under-tested. Part of it is the difficulty that it is hard to write a test that never changes, while the version of the Rust compiler indeed *does* change. PR #81468 added the first and so far only test of `#[cfg(version(...))]`'s functionality (there is one other test for the *syntax*, that also acts as feature gate). But that test uses a proc macro that parses the version: the text of the test doesn't contain the actual `#[cfg(version(...))]`. This PR makes `#[cfg(version(...))]` respect `RUSTC_OVERRIDE_VERSION_STRING`, added by PR #124339, allowing us to virtually pin the rustc version and write tests from all directions against some specific version. The PR also adds a functional test of `#[cfg(version(...))]` that leverages `RUSTC_OVERRIDE_VERSION_STRING`. Pulled out of #141137. Tracking issue: #64796

Pull out dedicated `cfg_version` syntax test from feature gate test Tracking issue: rust-lang#64796. Closes rust-lang#141452, as a follow-up to rust-lang#141413 (comment) (point 3 of that is probably too pedantic). The feature gate test was dual-purposing causing feature gate errors to distract from syntax exercises. `@rustbot` label +F-cfg_version r? `@est31`

Pull out dedicated `cfg_version` syntax test from feature gate test Tracking issue: rust-lang#64796. Closes rust-lang#141452, as a follow-up to rust-lang#141413 (comment) (point 3 of that is probably too pedantic). The feature gate test was dual-purposing causing feature gate errors to distract from syntax exercises. ``@rustbot`` label +F-cfg_version r? ``@est31``

Rollup merge of #141552 - jieyouxu:cfg-version-tests, r=est31 Pull out dedicated `cfg_version` syntax test from feature gate test Tracking issue: #64796. Closes #141452, as a follow-up to #141413 (comment) (point 3 of that is probably too pedantic). The feature gate test was dual-purposing causing feature gate errors to distract from syntax exercises. ``@rustbot`` label +F-cfg_version r? ``@est31``

rustbot assigned BoxyUwU May 22, 2025

rustbot added the A-attributes Area: Attributes (`#[…]`, `#![…]`) label May 22, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 22, 2025

est31 mentioned this pull request May 22, 2025

Stabilize #[cfg(version(...))] #141137

Closed

3 tasks

rustbot assigned jieyouxu and unassigned BoxyUwU May 23, 2025

jieyouxu added the F-cfg_version `#![feature(cfg_version)]` label May 23, 2025

jieyouxu approved these changes May 23, 2025

View reviewed changes

compiler/rustc_attr_data_structures/src/version.rs Outdated Show resolved Hide resolved

tests/ui/feature-gates/cfg-version-expand.stderr Outdated Show resolved Hide resolved

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 23, 2025

est31 force-pushed the cfg_version_env_var branch from f294432 to fdaca73 Compare May 23, 2025 12:12

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 23, 2025

jieyouxu mentioned this pull request May 23, 2025

Unexpected cfg condition name diagnostic is sometimes confusing #141440

Closed

jieyouxu reviewed May 23, 2025

View reviewed changes

compiler/rustc_attr_data_structures/src/version.rs Outdated Show resolved Hide resolved

jieyouxu reviewed May 23, 2025

View reviewed changes

tests/ui/feature-gates/cfg-version-expand.rs Outdated Show resolved Hide resolved

est31 force-pushed the cfg_version_env_var branch from fdaca73 to 8616237 Compare May 23, 2025 12:56

jieyouxu mentioned this pull request May 23, 2025

Double-check cfg_version test coverage #141452

Closed

jieyouxu approved these changes May 23, 2025

View reviewed changes

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 23, 2025

matthiaskrgr mentioned this pull request May 23, 2025

Rollup of 8 pull requests #141473

Closed

matthiaskrgr mentioned this pull request May 24, 2025

Rollup of 8 pull requests #141482

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 24, 2025

Urgau mentioned this pull request May 24, 2025

Suggest correct version("..") predicate syntax in check-cfg #141456

Merged

Make #[cfg(version)] respect RUSTC_OVERRIDE_VERSION_STRING

f3245e4

est31 force-pushed the cfg_version_env_var branch from 8616237 to f3245e4 Compare May 24, 2025 21:54

est31 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 24, 2025

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 25, 2025

GuillaumeGomez mentioned this pull request May 25, 2025

Rollup of 6 pull requests #141545

Merged

jieyouxu mentioned this pull request May 25, 2025

Pull out dedicated cfg_version syntax test from feature gate test #141552

Merged

bors merged commit b0ae228 into rust-lang:master May 25, 2025
6 checks passed

rustbot added this to the 1.89.0 milestone May 25, 2025

This was referenced May 30, 2025

Stabilize #[cfg(version(...))], take 2 #141766

Open

Tracking issue for RFC 2523, #[cfg(version(..))] #64796

Open

Make #[cfg(version)] respect RUSTC_OVERRIDE_VERSION_STRING #141413

Make #[cfg(version)] respect RUSTC_OVERRIDE_VERSION_STRING #141413

Uh oh!

Conversation

est31 commented May 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented May 22, 2025

Uh oh!

rustbot commented May 22, 2025

Uh oh!

jieyouxu commented May 23, 2025

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jieyouxu commented May 23, 2025

Uh oh!

jieyouxu commented May 23, 2025

Uh oh!

est31 commented May 23, 2025

Uh oh!

Uh oh!

jieyouxu commented May 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented May 23, 2025

Uh oh!

bors commented May 23, 2025

Uh oh!

bors commented May 23, 2025

Uh oh!

matthiaskrgr commented May 24, 2025

Uh oh!

est31 commented May 24, 2025

Uh oh!

jieyouxu commented May 25, 2025

Uh oh!

bors commented May 25, 2025

Uh oh!

Uh oh!

Uh oh!

est31 commented May 22, 2025 •

edited

Loading

jieyouxu commented May 23, 2025 •

edited

Loading