compiletest: Store the selected edition in TestProps
#147903
Merged
+21
−11
Conversation
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
|
Some changes occurred in src/tools/compiletest cc @jieyouxu
|
rustbot
added
A-testsuite
This comment has been minimized.
This comment has been minimized.
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Oct 20, 2025
Rollup of 4 pull requests Successful merges: - #147734 (Further tighten up relaxed bounds) - #147888 (enzyme/autodiff is compatible with download-ci=true) - #147898 (compiletest: Move `AuxProps` out of `EarlyProps`) - #147903 (compiletest: Store the selected edition in `TestProps`) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Oct 20, 2025
Rollup merge of #147903 - Zalathar:edition, r=jieyouxu compiletest: Store the selected edition in `TestProps` While working on a larger overhaul of directive processing, I ran into difficulty with the `has_edition` local variable. Storing the selected edition in `TestProps` should make it easier to extract parts of directive processing into independent handler functions, because the `//@ edition` handler won't need access to additional mutable state outside of `TestProps`. We still automatically add the edition to `compile_flags`, because there is too much existing compiletest code relying on that behaviour. r? jieyouxu
github-actions bot
pushed a commit
to rust-lang/rustc-dev-guide
that referenced
this pull request
Oct 20, 2025
Rollup of 4 pull requests Successful merges: - rust-lang/rust#147734 (Further tighten up relaxed bounds) - rust-lang/rust#147888 (enzyme/autodiff is compatible with download-ci=true) - rust-lang/rust#147898 (compiletest: Move `AuxProps` out of `EarlyProps`) - rust-lang/rust#147903 (compiletest: Store the selected edition in `TestProps`) r? `@ghost` `@rustbot` modify labels: rollup
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Oct 21, 2025
compiletest: More directive handling tweaks - Follow-up to rust-lang#147903. --- These are some more preparatory changes that were extracted from a larger overhaul of directive handling that I'm still working on. --- The revision check was introduced by rust-lang#61778, and later modified by rust-lang#113603. It doesn't appear to be doing anything particularly load-bearing (since a bogus mode seems to cause a panic later anyway), and getting rid of it avoids the need to pass the current test revision to directive-handling code. - rust-lang#61778 - rust-lang#113603 r? jieyouxu
rust-timer
added a commit
that referenced
this pull request
Oct 21, 2025
Rollup merge of #147934 - Zalathar:directive, r=jieyouxu compiletest: More directive handling tweaks - Follow-up to #147903. --- These are some more preparatory changes that were extracted from a larger overhaul of directive handling that I'm still working on. --- The revision check was introduced by #61778, and later modified by #113603. It doesn't appear to be doing anything particularly load-bearing (since a bogus mode seems to cause a panic later anyway), and getting rid of it avoids the need to pass the current test revision to directive-handling code. - #61778 - #113603 r? jieyouxu
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
While working on a larger overhaul of directive processing, I ran into difficulty with the
has_editionlocal variable.Storing the selected edition in
TestPropsshould make it easier to extract parts of directive processing into independent handler functions, because the//@ editionhandler won't need access to additional mutable state outside ofTestProps.We still automatically add the edition to
compile_flags, because there is too much existing compiletest code relying on that behaviour.r? jieyouxu