Skip to content

Conversation

@Zalathar
Copy link
Member

This "cleanup" function is more than a decade old, and I can't find any evidence of modern-day bootstrap being able to pass any of these flags to --host-rustcflags or --target-rustcflags.

I thought about replacing the cleanup with an assertion, but I think it's better to delete it entirely for now, and re-add checks later if they're motivated by actual problems in practice.

In addition to deleting some old and confusing code, this also lets us remove three instances of duplicating TestCx, which is the biggest win.

r? jieyouxu

This "cleanup" function is more than a decade old, and I can't find any
evidence of modern-day bootstrap being able to pass any of these flags to
`--host-rustcflags` or `--target-rustcflags`.
@rustbot
Copy link
Collaborator

rustbot commented Oct 28, 2025

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@rustbot rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Oct 28, 2025
@rustbot
Copy link
Collaborator

rustbot commented Oct 28, 2025

jieyouxu is currently at their maximum review capacity.
They may take a while to respond.

@Zalathar
Copy link
Member Author

Some relevant ancient commits introducing the removed code:

@Zalathar
Copy link
Member Author

@bors try jobs=x86_64-msvc-1,i686-msvc-1,aarch64-msvc-1,x86_64-mingw-1,test-various,armhf-gnu,aarch64-apple

@rust-bors

This comment has been minimized.

rust-bors bot added a commit that referenced this pull request Oct 28, 2025
compiletest: Remove `cleanup_debug_info_options`

try-job: x86_64-msvc-1
try-job: i686-msvc-1
try-job: aarch64-msvc-1
try-job: x86_64-mingw-1
try-job: test-various
try-job: armhf-gnu
try-job: aarch64-apple
@Zalathar
Copy link
Member Author

jieyouxu is currently at their maximum review capacity.
They may take a while to respond.

I have a few more compiletest PRs that I plan to open (big and small), so I understand if it takes some time to get around to all of them. Thanks for your good work! 💖

@rust-bors
Copy link

rust-bors bot commented Oct 28, 2025

☀️ Try build successful (CI)
Build commit: 5bf34a8 (5bf34a8252ab0d62acaeddf7a02112f90f7d9dbc, parent: adaa838976ff99a4f0661136322f64cb466b58a0)

@jieyouxu
Copy link
Member

I have a few more compiletest PRs that I plan to open (big and small), so I understand if it takes some time to get around to all of them. Thanks for your good work! 💖

Yeah that is perfectly fine, it'll just take some time for me to get through them.

Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what this is used for (this predates my time), but I'm also in favor of yeeting this until someone complains with a solid use case.

View changes since this review

@jieyouxu
Copy link
Member

jieyouxu commented Nov 1, 2025

Thanks
@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Nov 1, 2025

📌 Commit 08b188c has been approved by jieyouxu

It is now in the queue for this repository.

@bors 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 added a commit to matthiaskrgr/rust that referenced this pull request Nov 1, 2025
compiletest: Remove `cleanup_debug_info_options`

This "cleanup" function is more than a decade old, and I can't find any evidence of modern-day bootstrap being able to pass any of these flags to `--host-rustcflags` or `--target-rustcflags`.

I thought about replacing the cleanup with an assertion, but I think it's better to delete it entirely for now, and re-add checks later if they're motivated by actual problems in practice.

In addition to deleting some old and confusing code, this also lets us remove three instances of duplicating `TestCx`, which is the biggest win.

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
@Zalathar
Copy link
Member Author

Zalathar commented Nov 2, 2025

Possibly failed in rollup: #148368 (comment)

@bors r-

@bors 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
@Zalathar
Copy link
Member Author

Zalathar commented Nov 2, 2025

@bors try jobs=arm-android

@rust-bors

This comment has been minimized.

rust-bors bot added a commit that referenced this pull request Nov 2, 2025
compiletest: Remove `cleanup_debug_info_options`

try-job: arm-android
@Zalathar
Copy link
Member Author

Zalathar commented Nov 2, 2025

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

@bors r=jieyouxu

@bors
Copy link
Collaborator

bors commented Nov 2, 2025

📌 Commit 08b188c has been approved by jieyouxu

It is now in the queue for this repository.

@bors 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
jhpratt added a commit to jhpratt/rust that referenced this pull request Nov 2, 2025
compiletest: Remove `cleanup_debug_info_options`

This "cleanup" function is more than a decade old, and I can't find any evidence of modern-day bootstrap being able to pass any of these flags to `--host-rustcflags` or `--target-rustcflags`.

I thought about replacing the cleanup with an assertion, but I think it's better to delete it entirely for now, and re-add checks later if they're motivated by actual problems in practice.

In addition to deleting some old and confusing code, this also lets us remove three instances of duplicating `TestCx`, which is the biggest win.

r? jieyouxu
@rust-bors
Copy link

rust-bors bot commented Nov 2, 2025

☀️ Try build successful (CI)
Build commit: 96fa94d (96fa94df7159b4407163fdbc00fc69fb3df021df, parent: bd3ac0330018c23b111bbee176f32c377be7b319)

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
Zalathar added a commit to Zalathar/rust that referenced this pull request Nov 2, 2025
compiletest: Remove `cleanup_debug_info_options`

This "cleanup" function is more than a decade old, and I can't find any evidence of modern-day bootstrap being able to pass any of these flags to `--host-rustcflags` or `--target-rustcflags`.

I thought about replacing the cleanup with an assertion, but I think it's better to delete it entirely for now, and re-add checks later if they're motivated by actual problems in practice.

In addition to deleting some old and confusing code, this also lets us remove three instances of duplicating `TestCx`, which is the biggest win.

r? jieyouxu
Zalathar added a commit to Zalathar/rust that referenced this pull request Nov 2, 2025
compiletest: Remove `cleanup_debug_info_options`

This "cleanup" function is more than a decade old, and I can't find any evidence of modern-day bootstrap being able to pass any of these flags to `--host-rustcflags` or `--target-rustcflags`.

I thought about replacing the cleanup with an assertion, but I think it's better to delete it entirely for now, and re-add checks later if they're motivated by actual problems in practice.

In addition to deleting some old and confusing code, this also lets us remove three instances of duplicating `TestCx`, which is the biggest win.

r? jieyouxu
bors added a commit that referenced this pull request Nov 2, 2025
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
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 2, 2025
compiletest: Remove `cleanup_debug_info_options`

This "cleanup" function is more than a decade old, and I can't find any evidence of modern-day bootstrap being able to pass any of these flags to `--host-rustcflags` or `--target-rustcflags`.

I thought about replacing the cleanup with an assertion, but I think it's better to delete it entirely for now, and re-add checks later if they're motivated by actual problems in practice.

In addition to deleting some old and confusing code, this also lets us remove three instances of duplicating `TestCx`, which is the biggest win.

r? jieyouxu
bors added a commit that referenced this pull request Nov 2, 2025
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
@bors bors merged commit 7920626 into rust-lang:master Nov 2, 2025
12 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Nov 2, 2025
rust-timer added a commit that referenced this pull request Nov 2, 2025
Rollup merge of #148194 - Zalathar:no-cleanup, r=jieyouxu

compiletest: Remove `cleanup_debug_info_options`

This "cleanup" function is more than a decade old, and I can't find any evidence of modern-day bootstrap being able to pass any of these flags to `--host-rustcflags` or `--target-rustcflags`.

I thought about replacing the cleanup with an assertion, but I think it's better to delete it entirely for now, and re-add checks later if they're motivated by actual problems in practice.

In addition to deleting some old and confusing code, this also lets us remove three instances of duplicating `TestCx`, which is the biggest win.

r? jieyouxu
@Zalathar Zalathar deleted the no-cleanup branch November 2, 2025 23:50
@Zalathar
Copy link
Member Author

Zalathar commented Nov 3, 2025

Bors, this was already merged.

@bors r-

@bors 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
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Nov 3, 2025
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants