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.

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

compiletest: autoremove duplicate .nll.* files (#51204) #51427

Merged
merged 1 commit into from
Jun 9, 2018
Merged

compiletest: autoremove duplicate .nll.* files (#51204) #51427

merged 1 commit into from
Jun 9, 2018

Conversation

FelixMcFelix
Copy link
Contributor

@FelixMcFelix FelixMcFelix commented Jun 8, 2018 •
edited by oli-obk
Loading

UI tests in bless mode should now check to see if .nll.* files have a
matching .* file. If a match is found, it will be deleted.
This should be extensible to other modes (i.e., Polonius).
On running with --bless, the two files removed in #51186 are, in turn,
removed automatically.

fixes #51204

@FelixMcFelix
compiletest: autoremove duplicate .nll.* files (rust-lang#51204)
ec08622 
UI tests in bless mode should now check to see if `.nll.*` files have a
matching `.*` file. If a match is found, it will be deleted.
This should be extensible to other modes (i.e., Polonius).
On running with `--bless`, the two files removed in rust-lang#51186 are, in turn,
removed automatically.
@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 8, 2018
@oli-obk
Copy link
Contributor

oli-obk commented Jun 8, 2018

I took the liberty of adding a fixes #51204 comment to your post in order to have the issue get closed automatically once this PR is merged.

@bors r+

Thanks for the PR, great reuse of existing code! I'm really excited for the first time this starts autoremoving test files in a PR that improves some nll output :D

@bors
Copy link
Contributor

bors commented Jun 8, 2018

📌 Commit ec08622 has been approved by oli-obk

@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 8, 2018
@oli-obk
Copy link
Contributor

oli-obk commented Jun 8, 2018

@bors rollup

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Jun 8, 2018
@Mark-Simulacrum
Rollup merge of rust-lang#51427 - FelixMcFelix:nll-stderr-remover, r=…
4a2c1c2 
…oli-obk

compiletest: autoremove duplicate .nll.* files (rust-lang#51204)

UI tests in bless mode should now check to see if `.nll.*` files have a
matching `.*` file. If a match is found, it will be deleted.
This should be extensible to other modes (i.e., Polonius).
On running with `--bless`, the two files removed in rust-lang#51186 are, in turn,
removed automatically.

fixes rust-lang#51204
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jun 8, 2018
Merged
bors added a commit that referenced this pull request Jun 8, 2018
@bors
Auto merge of #51448 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
cf91e9b 
Rollup of 13 pull requests

Successful merges:

 - #50143 (Add deprecation lint for duplicated `macro_export`s)
 - #51099 (Fix Issue 38777)
 - #51276 (Dedup auto traits in trait objects.)
 - #51298 (Stabilize unit tests with non-`()` return type)
 - #51360 (Suggest parentheses when a struct literal needs them)
 - #51391 (Use spans pointing at the inside of a rustdoc attribute)
 - #51394 (Use scope tree depths to speed up `nearest_common_ancestor`.)
 - #51396 (Make the size of Option<NonZero*> a documented guarantee.)
 - #51401 (Warn on `repr` without hints)
 - #51412 (Avoid useless Vec clones in pending_obligations().)
 - #51427 (compiletest: autoremove duplicate .nll.* files (#51204))
 - #51436 (Do not require stage 2 compiler for rustdoc)
 - #51437 (rustbuild: generate full list of dependencies for metadata)

Failed merges:
@bors bors merged commit ec08622 into rust-lang:master Jun 9, 2018
@FelixMcFelix FelixMcFelix deleted the nll-stderr-remover branch June 9, 2018 02:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Compiletest should detect when a .nll.stderr file matches the .stderr file
5 participants
@FelixMcFelix @rust-highfive @oli-obk @bors @alexcrichton