[WIP] Normalize rust version string centrally in compiletest#142940
Closed
jieyouxu wants to merge 5 commits intorust-lang:masterfrom
Closed
[WIP] Normalize rust version string centrally in compiletest#142940jieyouxu wants to merge 5 commits intorust-lang:masterfrom
jieyouxu wants to merge 5 commits intorust-lang:masterfrom
Conversation
Several UI tests have a `normalize-stderr` for "you are using x.y.z" rustc versions, and that regex is flexible enough for suffixes like "-nightly" and "-dev", but not for "-beta.N". We can just add '.' to that trailing pattern to include this.
rustbot
added
A-compiletest
Member
Author
|
I believe this normalization can technically fail if you try to run these ui tests against a stage 0 beta compiler (which has a different version string than stage 1+ compiler that uses the "current" version string). However I don't think ui test suite supports being run against stage 0 compiler, surely quite a few ui tests will fail due to compiler differences themselves. |
This comment has been minimized.
This comment has been minimized.
Member
|
There is a test that tests |
jieyouxu
force-pushed
the
normalize-rustc-version
branch
from
002c00b to
477627d
Compare
Member
Author
Hm, good point, let me double-check. |
Member
Author
|
You're right. We can't naively do the normalization like in this PR. Some options:
Honestly, I'm leaning towards option (3). |
Member
|
option 3 seems like the thing to do, yes. |
Member
Author
|
I'm going to close this PR, and instead go with option (3) in another PR. IMO it's not a huge loss, because you can just |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jun 24, 2025
…ler-errors Don't include current rustc version string in feature removed help The version string is difficult to properly normalize out, and removing it isn't a huge deal (the user can query version info easily through `rustc --version` or `cargo --version`). The normalization options were all non-ideal (see rust-lang#142940 (comment)): - Per-test version string normalization is nasty to maintain, and we need to maintain `n` copies of it. See rust-lang#142930 where the regex wasn't robust against different release channels. - Centralized compiletest normalization (with a directive opt-out) is also not ideal, because `cfg(version(..))` tests can't have those accidentally normalized out (and you'd have to remember to opt-out). r? `@workingjubilee` (discussed in rust-lang#142940)
rust-timer
added a commit
that referenced
this pull request
Jun 25, 2025
Rollup merge of #142943 - jieyouxu:no-rustc-version, r=compiler-errors Don't include current rustc version string in feature removed help The version string is difficult to properly normalize out, and removing it isn't a huge deal (the user can query version info easily through `rustc --version` or `cargo --version`). The normalization options were all non-ideal (see #142940 (comment)): - Per-test version string normalization is nasty to maintain, and we need to maintain `n` copies of it. See #142930 where the regex wasn't robust against different release channels. - Centralized compiletest normalization (with a directive opt-out) is also not ideal, because `cfg(version(..))` tests can't have those accidentally normalized out (and you'd have to remember to opt-out). r? `@workingjubilee` (discussed in #142940)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Caution
Stacked on top of #142930, that needs to merge first then this PR needs to be rebased.
Instead of maintaining
ncopies ofNormalize this consistently and centrally in compiletest instead.
cc @cuviper
r? @Kobzol