compiletest: Don't modify `testpaths` when creating aux contexts by Zalathar · Pull Request #148199 · rust-lang/rust

Zalathar · 2025-10-28T07:09:01Z

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 #148160), but after further cleanups it turned out that very few tweaks were actually needed to avoid changes to testpaths.

r? jieyouxu

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.

rustbot · 2025-10-28T07:09:05Z

Some changes occurred in src/tools/compiletest

cc @jieyouxu

Zalathar · 2025-10-28T07:10:36Z

Something very similar to this PR already had a number of successful try jobs at #148160 (comment).

jieyouxu

Thanks

View changes since this review

jieyouxu · 2025-11-01T09:09:00Z

@bors r+ rollup

bors · 2025-11-01T09:09:02Z

📌 Commit 720bfff has been approved by jieyouxu

It is now in the queue for this repository.

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

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

Zalathar · 2025-11-02T01:01:51Z

Possibly failed in rollup: #148368 (comment)

@bors r-

Zalathar · 2025-11-02T01:02:19Z

@bors try jobs=arm-android

compiletest: Don't modify `testpaths` when creating aux contexts try-job: arm-android

Zalathar · 2025-11-02T01:11:09Z

After some investigation, I'm pretty sure the failure was from #148199, so putting this back in the queue.

@bors r=jieyouxu

bors · 2025-11-02T01:11:11Z

📌 Commit 720bfff has been approved by jieyouxu

It is now in the queue for this repository.

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

rust-bors · 2025-11-02T02:57:19Z

☀️ Try build successful (CI)
Build commit: 49b0cfb (49b0cfb6f25820c1a1e58471569b4eb97de54a49, parent: bd3ac0330018c23b111bbee176f32c377be7b319)

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

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

Rollup of 9 pull requests Successful merges: - #147947 (Implement `strip_circumfix` lib feature) - #148170 (split definition and use site hidden tys) - #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) - #148290 (Do not emit solver errors that contain error types) - #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) r? `@ghost` `@rustbot` modify labels: rollup

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

Rollup of 8 pull requests Successful merges: - #148170 (split definition and use site hidden tys) - #148194 (compiletest: Remove `cleanup_debug_info_options`) - #148199 (compiletest: Don't modify `testpaths` when creating aux contexts) - #148290 (Do not emit solver errors that contain error types) - #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

Rollup merge of #148199 - Zalathar:paths, r=jieyouxu 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 #148160), but after further cleanups it turned out that very few tweaks were actually needed to avoid changes to `testpaths`. r? jieyouxu

Zalathar · 2025-11-03T00:42:42Z

Bors, this was already merged.

@bors r-

Rollup of 8 pull requests Successful merges: - rust-lang/rust#148170 (split definition and use site hidden tys) - rust-lang/rust#148194 (compiletest: Remove `cleanup_debug_info_options`) - rust-lang/rust#148199 (compiletest: Don't modify `testpaths` when creating aux contexts) - rust-lang/rust#148290 (Do not emit solver errors that contain error types) - rust-lang/rust#148357 (temporary-lifetime-extension.rs test works in all editions) - rust-lang/rust#148362 (docs: makes a note about possible building `rustc 1.91.0 + host tools` for win7) - rust-lang/rust#148367 (Use --print host-tuple to get the host) - rust-lang/rust#148374 (miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#148170 (split definition and use site hidden tys) - rust-lang#148194 (compiletest: Remove `cleanup_debug_info_options`) - rust-lang#148199 (compiletest: Don't modify `testpaths` when creating aux contexts) - rust-lang#148290 (Do not emit solver errors that contain error types) - rust-lang#148357 (temporary-lifetime-extension.rs test works in all editions) - rust-lang#148362 (docs: makes a note about possible building `rustc 1.91.0 + host tools` for win7) - rust-lang#148367 (Use --print host-tuple to get the host) - rust-lang#148374 (miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup

Zalathar added 4 commits October 28, 2025 17:58

Test that auxiliaries are built against their own directives
bd57886
There are probably plenty of tests that will check this incidentally, but it's convenient to have a dedicated self-test.

Don't modify testpaths when creating aux contexts
c627945

Remove some parameters that are always self.testpaths
6dfc82b
In particular, this eliminates the cryptic `of: &TestPaths` parameters.

Rename compute_aux_paths to resolve_aux_path
720bfff
This method no longer returns a `TestPaths`, so the old name is no longer appropriate.

rustbot assigned jieyouxu Oct 28, 2025

jieyouxu approved these changes Nov 1, 2025
View reviewed changes

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 Nov 1, 2025

matthiaskrgr mentioned this pull request Nov 1, 2025
Rollup of 8 pull requests #148368
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 Nov 2, 2025

This comment has been minimized.
Sign in to view

rust-borsBot added a commit that referenced this pull request Nov 2, 2025
Auto merge of#148199- Zalathar:paths, r=<try>
49b0cfb
compiletest: Don't modify `testpaths` when creating aux contexts try-job: arm-android

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 2, 2025

Zalathar mentioned this pull request Nov 2, 2025
compiletest: Remove cleanup_debug_info_options#148194
Merged

jhpratt mentioned this pull request Nov 2, 2025
Rollup of 12 pull requests #148376
Closed

Zalathar mentioned this pull request Nov 2, 2025
Rollup of 6 pull requests #148381
Closed

Zalathar mentioned this pull request Nov 2, 2025
Rollup of 9 pull requests #148382
Closed

This was referenced Nov 2, 2025
Rollup of 8 pull requests #148388
Closed
Rollup of 8 pull requests #148390
Merged

bors merged commit c6b9df8 into rust-lang:masterNov 2, 2025
12 checks passed

rustbot added this to the 1.93.0 milestone Nov 2, 2025

matthiaskrgr mentioned this pull request Nov 2, 2025
Rollup of 9 pull requests #148411
Closed

Zalathar deleted the paths branch November 2, 2025 23:55

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 Nov 3, 2025

Navigation Menu

Uh oh!

Uh oh!

compiletest: Don't modify `testpaths` when creating aux contexts - #148199

compiletest: Don't modify `testpaths` when creating aux contexts#148199
bors merged 4 commits into
rust-lang:masterfrom
Zalathar:paths

Zalathar commented Oct 28, 2025

Uh oh!

rustbot commented Oct 28, 2025

Uh oh!

Zalathar commented Oct 28, 2025

Uh oh!

jieyouxu left a comment •
edited by rustbot
Loading

Uh oh!

jieyouxu commented Nov 1, 2025

Uh oh!

bors commented Nov 1, 2025

Uh oh!

Zalathar commented Nov 2, 2025

Uh oh!

Zalathar commented Nov 2, 2025

Uh oh!

This comment has been minimized.

Zalathar commented Nov 2, 2025

Uh oh!

bors commented Nov 2, 2025

Uh oh!

rust-borsBot commented Nov 2, 2025

Uh oh!

Uh oh!

Zalathar commented Nov 3, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Uh oh!

Conversation

Zalathar commented Oct 28, 2025

Uh oh!

rustbot commented Oct 28, 2025

Uh oh!

Zalathar commented Oct 28, 2025

Uh oh!

jieyouxu left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Nov 1, 2025

Uh oh!

bors commented Nov 1, 2025

Uh oh!

Zalathar commented Nov 2, 2025

Uh oh!

Zalathar commented Nov 2, 2025

Uh oh!

This comment has been minimized.

Zalathar commented Nov 2, 2025

Uh oh!

bors commented Nov 2, 2025

Uh oh!

rust-borsBot commented Nov 2, 2025

Uh oh!

Uh oh!

Zalathar commented Nov 3, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jieyouxu left a comment •
edited by rustbot
Loading