tests/ui: A New Order [14/N]

[Kivooeo]

Note

Intermediate commits are intended to help review, but will be squashed prior to merge.

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

r? @jieyouxu

[rustbot]

r? @lcnr

rustbot has assigned @lcnr.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

[speedy-lex]

@Kivooeo, Why is this refactor split up into 14 pr’s? Wouldn’t it be better for it to be in 1 pr?

[Kivooeo]

@speedy-lex

This is part of a long-term cleanup initiative tracked in #133895

The PRs are intentionally small — around 5–7 tests each — to make them easier to review and avoid overwhelming maintainers

[Kivooeo]

question: i mistakenly deleted issue-15924.rs (#15924) thinking it didn't reproduce the original problem. Should I restore it?

[Kivooeo]

the only reason i'm asking is because of this comment #15924 (comment), seems like there is no way to reproduce this anymore because of "new interface scheme", making the regression test potentially obsolete

[tgross35]

In general, regression tests should err on the side of sticking around. Not being able to reproduce is a good thing - but just because the code is refactored doesn't mean a new design can't hit the same problems.

[Kivooeo]

so preferably to keep this test?

[tgross35]

IMO a solid choice when in doubt :)

[Kivooeo]

sure! thanks for the answer ;)

[jieyouxu]

Am I missing something, or is this supposed to be kept?

[Kivooeo]

No :) You don't I was too lazy to add it in-place and then forget, I will return it now with squash

[rustbot]

There are changes to the tidy tool.

cc @jieyouxu

[jieyouxu]

Thanks, some minor nits, and a licensing problem for a test

[jieyouxu]

Am I missing something, or is this supposed to be kept?

[Kivooeo]

@rustbot ready

here is deleted test

https://github.com/rust-lang/rust/pull/142440/files#diff-80795699fb190e9f72b5c8ab000a3d7f2c7d464e04ba4265ca41dc82b0b0790f

[tgross35]

Please split the renames to a separate commit as discussed in #143118; six tests are losing their history here :(

(happy to do it for you if you get in a rebase rut)

[jieyouxu]

I'm going to focus on some bootstrap/compiletest changes, so
r? @tgross35 (since you're looking at this :D)

[bors]

☔ The latest upstream changes (presumably #143233) made this pull request unmergeable. Please resolve the merge conflicts.

[Kivooeo]

@tgross35 may I ask you to make the same thing as you do for 15th part

[tgross35]

How I did this, for reference

# Check out your branch
git switch tf14

# Save this commit for later
old_tf14="$(git rev-parse tf14)"

# Make your branch exactly like `master` it branched from
git reset --hard $(git merge-base tf14 master)

# Do all the renames (this was the trickiest part, figuring out how they match up)
git mv tests/ui/kinds-in-metadata.rs tests/ui/cross-crate/metadata-trait-serialization.rs
git mv tests/ui/issue-15924.rs tests/ui/higher-ranked/higher-ranked-encoding.rs
git mv tests/ui/issues-71798.rs tests/ui/async-await/impl-future-escaping-bound-vars-ice.rs
git mv tests/ui/issues-71798.stderr tests/ui/async-await/impl-future-escaping-bound-vars-ice.stderr
git mv tests/ui/auxiliary/issue-16822.rs tests/ui/cross-crate/auxiliary/cross-crate-refcell-match.rs
git mv tests/ui/auxiliary/kinds_in_metadata.rs tests/ui/cross-crate/auxiliary/kinds_in_metadata.rs
git mv tests/ui/issue-16822.rs tests/ui/cross-crate/cross-crate-refcell-match.rs
git mv tests/ui/item-name-overload.rs tests/ui/modules/mod-same-item-names.rs
...
# I took the tidy update here too, could really go in either
git checkout "$old_tf14" -- src/tools/tidy/src/issues.txt

# Commit this with a new message
git commit -a

# Now make everything look exactly like your branch
git checkout "$old_tf14" -- .
# And create a new commit using your existing commit message
git commit -a -C "$old_tf14"

# Sanity check that things look correct (empty diff, first commit only contains moved files
# and the tidy fix)
git log -2 --stat
git diff "$old_tf14"

# And update the PR
git push ... --force-with-lease

It looks like there is a conflict in the tidy list, I'll let you resolve that.

[tgross35]

Thank you!

@bors r+ rollup

[bors]

📌 Commit 1daba45 has been approved by tgross35

It is now in the queue for this repository.