Skip to content

tests/ui: A New Order [3/N] #141965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jun 5, 2025
Merged

tests/ui: A New Order [3/N] #141965

merged 1 commit into from
Jun 5, 2025

Conversation

Kivooeo
Copy link
Contributor

@Kivooeo Kivooeo commented Jun 3, 2025 •
edited by rustbot
Loading

Some tests/ui/ housekeeping, to trim down number of tests directly under tests/ui/. Part of #133895.

r? @jieyouxu

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 3, 2025
bjorn3
bjorn3 reviewed Jun 3, 2025
View reviewed changes
bjorn3
bjorn3 reviewed Jun 3, 2025
View reviewed changes
bjorn3
bjorn3 reviewed Jun 3, 2025
View reviewed changes
@jieyouxu
Copy link
Member

jieyouxu commented Jun 3, 2025 •
edited
Loading

(If you find this too much friction, squashing and thus using just one single commit from the very beginning is also fine with me. You do not have to do the following at all!)

To make review easier for these kinds of test changes, I usually try to keep the commits atomic by reblessing the one modified test (since we're not modifying compiler/std), so that the reviewer can immediately tell that no unexpected stderr is changed, instead of only doing reblesses in the end. (Of course, this takes more rebase effort and is more annoying on merge conflicts.)

(Don't bother doing that for this PR ofc.)

@Kivooeo
Copy link
Contributor Author

Kivooeo commented Jun 3, 2025 •
edited
Loading

@jieyouxu honestly, reblessing each test (if needed) when it's changed is acutally easier than doing it all in a final commit, im not sure why i initially thought doing it at the end would make the review simpler, but it's good to know that hadling it per-commit is not only better for review but also easier to manage overall

jieyouxu
jieyouxu approved these changes Jun 4, 2025
View reviewed changes
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.

Thanks, minor nits, and please squash.

@jieyouxu
Copy link
Member

jieyouxu commented Jun 4, 2025

@rustbot author

@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 4, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 4, 2025

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@Kivooeo
Copy link
Contributor Author

Kivooeo commented Jun 4, 2025

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 4, 2025
jieyouxu
jieyouxu reviewed Jun 4, 2025
View reviewed changes
@jieyouxu
Copy link
Member

jieyouxu commented Jun 4, 2025

Sorry, one more nit because I mistyped the path (#141965 (comment)).

@rustbot author

@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 4, 2025
@Kivooeo
Copy link
Contributor Author

Kivooeo commented Jun 4, 2025

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 4, 2025
@jieyouxu
Copy link
Member

jieyouxu commented Jun 4, 2025

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 4, 2025

📌 Commit ff00561 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 Jun 4, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 5, 2025
@matthiaskrgr
Rollup merge of rust-lang#141965 - Kivooeo:test-reform, r=jieyouxu
ab1c2c9 
`tests/ui`: A New Order [3/N]

Some `tests/ui/` housekeeping, to trim down number of tests directly under `tests/ui/`. Part of rust-lang#133895.

r? `@jieyouxu`
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 5, 2025
Closed
bors added a commit that referenced this pull request Jun 5, 2025
@bors
Auto merge of #142059 - matthiaskrgr:rollup-w4jw2de, r=matthiaskrgr
a3e7853 
Rollup of 8 pull requests

Successful merges:

 - #140638 (UnsafePinned: also include the effects of UnsafeCell)
 - #141272 (modularize the config module bootstrap)
 - #141777 (Do not run PGO/BOLT in x64 Linux alt builds)
 - #141870 (Fix broken link to rustc_type_ir module in serialization docs)
 - #141938 (update rust offload bootstrap)
 - #141962 (rustc-dev-guide subtree update)
 - #141965 (`tests/ui`: A New Order [3/N])
 - #141970 (implement new `x` flag: `--skip-std-check-if-no-download-rustc`)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 5, 2025
Merged
bors added a commit that referenced this pull request Jun 5, 2025
@bors
Auto merge of #142070 - matthiaskrgr:rollup-e7lxtuo, r=matthiaskrgr
0b20963 
Rollup of 6 pull requests

Successful merges:

 - #140638 (UnsafePinned: also include the effects of UnsafeCell)
 - #141777 (Do not run PGO/BOLT in x64 Linux alt builds)
 - #141938 (update rust offload bootstrap)
 - #141962 (rustc-dev-guide subtree update)
 - #141965 (`tests/ui`: A New Order [3/N])
 - #141970 (implement new `x` flag: `--skip-std-check-if-no-download-rustc`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0ea49dc into rust-lang:master Jun 5, 2025
10 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 5, 2025
rust-timer added a commit that referenced this pull request Jun 5, 2025
@rust-timer
Unrolled build for #141965
5d5a572 
Rollup merge of #141965 - Kivooeo:test-reform, r=jieyouxu

`tests/ui`: A New Order [3/N]

Some `tests/ui/` housekeeping, to trim down number of tests directly under `tests/ui/`. Part of #133895.

r? ``@jieyouxu``
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Jun 6, 2025
@bors
Auto merge of #142070 - matthiaskrgr:rollup-e7lxtuo, r=matthiaskrgr
385a82a 
Rollup of 6 pull requests

Successful merges:

 - rust-lang/rust#140638 (UnsafePinned: also include the effects of UnsafeCell)
 - rust-lang/rust#141777 (Do not run PGO/BOLT in x64 Linux alt builds)
 - rust-lang/rust#141938 (update rust offload bootstrap)
 - rust-lang/rust#141962 (rustc-dev-guide subtree update)
 - rust-lang/rust#141965 (`tests/ui`: A New Order [3/N])
 - rust-lang/rust#141970 (implement new `x` flag: `--skip-std-check-if-no-download-rustc`)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjorn3 bjorn3 bjorn3 left review comments

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.89.0
Development

Successfully merging this pull request may close these issues.
5 participants
@Kivooeo @jieyouxu @rustbot @bors @bjorn3