compiletest: Don't modify testpaths when creating aux contexts
#148199
+75
−68
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
There are probably plenty of tests that will check this incidentally, but it's convenient to have a dedicated self-test.
In particular, this eliminates the cryptic `of: &TestPaths` parameters.
This method no longer returns a `TestPaths`, so the old name is no longer appropriate.
|
Some changes occurred in src/tools/compiletest cc @jieyouxu |
rustbot
added
A-compiletest
|
Something very similar to this PR already had a number of successful try jobs at #148160 (comment). |
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Nov 1, 2025
compiletest: Don't modify `testpaths` when creating aux contexts Modifying `TestCx::testpaths` makes it vastly harder to reason about how compiletest is using test paths, and can be avoided without much trouble by simply passing explicit source-file paths into a small number of auxiliary-aware methods. --- This PR was originally based on a much larger change that split `TestPaths` into multiple structs and multiple `TestCx` fields (as seen in early revisions of rust-lang#148160), but after further cleanups it turned out that very few tweaks were actually needed to avoid changes to `testpaths`. r? jieyouxu
bors
added a commit
that referenced
this pull request
Nov 1, 2025
Rollup of 8 pull requests Successful merges: - #147137 (Mention crate being analyzed in query description) - #148099 (Prepare to move debugger discovery from compiletest to bootstrap) - #148194 (compiletest: Remove `cleanup_debug_info_options`) - #148199 (compiletest: Don't modify `testpaths` when creating aux contexts) - #148240 (rustc_codegen: fix musttail returns for cast/indirect ABIs) - #148247 (Remove two special cases from reachable_non_generics) - #148290 (Do not emit solver errors that contain error types) - #148362 (docs: makes a note about possible building `rustc 1.91.0 + host tools` for win7) r? `@ghost` `@rustbot` modify labels: rollup
|
Possibly failed in rollup: #148368 (comment) @bors r- |
bors
added
S-waiting-on-author
|
@bors try jobs=arm-android |
This comment has been minimized.
This comment has been minimized.
rust-bors bot
added a commit
that referenced
this pull request
Nov 2, 2025
compiletest: Don't modify `testpaths` when creating aux contexts try-job: arm-android
bors
added
S-waiting-on-bors
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Nov 2, 2025
compiletest: Don't modify `testpaths` when creating aux contexts Modifying `TestCx::testpaths` makes it vastly harder to reason about how compiletest is using test paths, and can be avoided without much trouble by simply passing explicit source-file paths into a small number of auxiliary-aware methods. --- This PR was originally based on a much larger change that split `TestPaths` into multiple structs and multiple `TestCx` fields (as seen in early revisions of rust-lang#148160), but after further cleanups it turned out that very few tweaks were actually needed to avoid changes to `testpaths`. r? jieyouxu
bors
added a commit
that referenced
this pull request
Nov 2, 2025
Rollup of 12 pull requests Successful merges: - #147137 (Mention crate being analyzed in query description) - #147642 (Miscellaneous const-generics-related fixes) - #147806 (Ignore test-dashboard related files) - #147947 (Implement `strip_circumfix` lib feature) - #148194 (compiletest: Remove `cleanup_debug_info_options`) - #148199 (compiletest: Don't modify `testpaths` when creating aux contexts) - #148247 (Remove two special cases from reachable_non_generics) - #148348 (dangling ptr lint cleanup) - #148357 (temporary-lifetime-extension.rs test works in all editions) - #148362 (docs: makes a note about possible building `rustc 1.91.0 + host tools` for win7) - #148367 (Use --print host-tuple to get the host) - #148374 (miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Modifying
TestCx::testpathsmakes it vastly harder to reason about how compiletest is using test paths, and can be avoided without much trouble by simply passing explicit source-file paths into a small number of auxiliary-aware methods.This PR was originally based on a much larger change that split
TestPathsinto multiple structs and multipleTestCxfields (as seen in early revisions of #148160), but after further cleanups it turned out that very few tweaks were actually needed to avoid changes totestpaths.r? jieyouxu