Reduce the default max number of files in a UI test directory

[jyn514]

It doesn't make sense for the root directory to have a lower limit than subdirectories.

[rustbot]

r? @albertlarsan68

(rustbot has picked a reviewer for you, use r? to override)

[jyn514]

@bors rollup=iffy

[jyn514]

I wanted to make the limit even lower, but it turns out some subdirectories are already close to the limit (!):

tidy check
tidy error: following path contains more than 500 entries, you should move the test to some relevant subdirectory (current: 600): /Users/jyn/src/rust2/tests/ui/consts
tidy error: following path contains more than 500 entries, you should move the test to some relevant subdirectory (current: 678): /Users/jyn/src/rust2/tests/ui/suggestions
tidy error: following path contains more than 500 entries, you should move the test to some relevant subdirectory (current: 512): /Users/jyn/src/rust2/tests/ui/error-codes
tidy error: following path contains more than 500 entries, you should move the test to some relevant subdirectory (current: 885): /Users/jyn/src/rust2/tests/ui/parser
tidy error: following path contains more than 500 entries, you should move the test to some relevant subdirectory (current: 642): /Users/jyn/src/rust2/tests/ui/borrowck

[compiler-errors]

r? @compiler-errors @bors r+

suggestions/ is overloaded, but i dont know where a lot of those could live

parser/ could have a lot of the recovery-related ui tests moved into a subdirectory just for recoveries

error-codes/ is gonna grow monotonically as we get a lot of error codes :)

[bors]

📌 Commit 7db5024b192ddfec9d2041a183bd4985dbb04851 has been approved by compiler-errors

It is now in the queue for this repository.

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout subdirectory-limit (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self subdirectory-limit --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging src/tools/tidy/src/ui_tests.rs
CONFLICT (content): Merge conflict in src/tools/tidy/src/ui_tests.rs
Automatic merge failed; fix conflicts and then commit the result.

[bors]

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

[jyn514]

@bors r=compiler-errors

[bors]

📌 Commit a6810cc has been approved by compiler-errors

It is now in the queue for this repository.

[bors]

⌛ Testing commit a6810cc with merge 7f6edd3...

[bors]

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 7f6edd3 to master...

[rust-timer]

Finished benchmarking commit (7f6edd3): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	2.1%	[1.7%, 2.5%]	2
Improvements ✅ (primary)	-2.3%	[-2.3%, -2.3%]	1
Improvements ✅ (secondary)	-1.6%	[-1.6%, -1.6%]	1
All ❌✅ (primary)	-2.3%	[-2.3%, -2.3%]	1

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	3.9%	[3.7%, 4.1%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.1%	[-2.1%, -2.1%]	1
All ❌✅ (primary)	-	-	0