Skip to content
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.

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

Detect unused files in src/test/mir-opt and error on them in tidy. #103781

Merged
merged 1 commit into from
Nov 2, 2022

Conversation

JakobDegen
Copy link
Contributor

Closes #97564 .

Determining which files are generated by a given mir opt test is somewhat difficult. Because of this, we extract the logic for doing it out into a common crate that both compiletest and tidy can depend on. This avoids making compiletest a dependency of tidy which would negatively impact compile times for tidy.

Testing for this is that it catches 5 files that violated this lint (and removes them).

@rustbot
Copy link
Collaborator

rustbot commented Oct 31, 2022

r? @jyn514

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

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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. labels Oct 31, 2022
@jyn514
Copy link
Member

jyn514 commented Oct 31, 2022

The new tidy check seems good to me 👍

@oli-obk can you or someone else on @rust-lang/wg-mir-opt confirm that just deleting these unused files is the right thing to do? Not sure if we should add a test that uses them or something.

@jyn514 jyn514 added S-waiting-on-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 31, 2022
@JakobDegen
Copy link
Contributor Author

I had removed the test associated with these files in #100827 . There was a replacement test added at the time

@jyn514
Copy link
Member

jyn514 commented Oct 31, 2022

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Oct 31, 2022

📌 Commit f5dc0758d0798a64932cd6c68a2b2f267e745b68 has been approved by jyn514

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-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). labels Oct 31, 2022
@bors
Copy link
Contributor

bors commented Nov 1, 2022

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

@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 1, 2022
@JakobDegen
Copy link
Contributor Author

Rebased

@jyn514
Copy link
Member

jyn514 commented Nov 1, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Nov 1, 2022

📌 Commit 17395b4 has been approved by jyn514

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 1, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 2, 2022
…earth

Rollup of 8 pull requests

Successful merges:

 - rust-lang#103072 (compiletest: set the dylib path when gathering target cfg)
 - rust-lang#103084 (Derive `Eq` and `Hash` for `ControlFlow`)
 - rust-lang#103575 (Change #[suggestion_*] attributes to use style="...")
 - rust-lang#103637 (Use stdio in UWP apps)
 - rust-lang#103638 (Add `multivalue` target feature to WASM target)
 - rust-lang#103781 (Detect unused files in `src/test/mir-opt` and error on them in tidy.)
 - rust-lang#103837 (Migrate sidebar-links-color GUI test to functions)
 - rust-lang#103839 (Print valid `--print` requests if request is invalid)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e2a6d28 into rust-lang:master Nov 2, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 2, 2022
@JakobDegen JakobDegen deleted the mir-opt-tidy branch November 2, 2022 21:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.

Check for stale files in src/test/mir-opt
4 participants