Fixes error count display is different when there's only one error left #114759
Conversation
|
r? @cjgillot (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
|
Some changes occurred in src/tools/clippy cc @rust-lang/clippy The Miri subtree was changed cc @rust-lang/miri |
This comment has been minimized.
This comment has been minimized.
|
☔ The latest upstream changes (presumably #112842) made this pull request unmergeable. Please resolve the merge conflicts. |
|
thank you for your PR. I think it's likely that your PR will not be accepted, simply due to being extremely hard to review (because the diff is so huge). This is especially conflict heavy and you'll probably have a bad time just keeping up with conflicts. I think the way to do this change (which is a good change imo) is to have a trusted member from the compiler (contributors) team do the change and then quickly get it reviewed (without reviewing the entire diff, trusting that the author didn't make big mistakes). But I'm not sure whether this would be a good solution either. I currently don't have much time for Rust so I definitely can't help here. Just trying to set expectations^^ |
|
Hi @Nilstrieb, thanks for your comment 🙏. |
|
r? wesleywiser |
|
@wesleywiser fyi, I'm willing to help with this (either by re-blessing the tests as a trusted contributor as suggested by @Nilstrieb, or by reviewing you, if you want to do this, etc) |
|
Given the time elapsed since your question @WaffleLapkin I can safely assume that you can take on the review of this one. I'll reassign this PR to you. Thank you for your help! In case, please @wesleywiser feel free to chime in and revert the review reassignment. |
|
In collaboration with @WaffleLapkin, I'm going to implement my plan above by basically re-doing your PR (crediting you as a co-author of course!) and then putting up a new PR that waffle will approve. |
…leLapkin Fixes error count display is different when there's only one error left Supersedes rust-lang#114759 ### What did I do? I did the small change in `rustc_errors` by hand. Then I did the other changes in `/compiler` by hand, those were just find replace on `*.rs` in the workspace. The changes in run-make are find replace for `run-make` in the workspace. All other changes are blessed using `x test TEST --bless`. I blessed the tests that were blessed in rust-lang#114759. ### how to review this nightmare ping bors with an `r+`. You should check that my logic is sound and maybe quickly scroll through the diff, but fully verifying it seems fairly hard to impossible. I did my best to do this correctly. Thank you `@adrianEffe` for bringing this up and your initial implementation. cc `@flip1995,` you said you want to do a subtree sync asap cc `@RalfJung` maybe you want to do a quick subtree sync afterwards as well for Miri r? `@WaffleLapkin`
…leLapkin Fixes error count display is different when there's only one error left Supersedes rust-lang#114759 ### What did I do? I did the small change in `rustc_errors` by hand. Then I did the other changes in `/compiler` by hand, those were just find replace on `*.rs` in the workspace. The changes in run-make are find replace for `run-make` in the workspace. All other changes are blessed using `x test TEST --bless`. I blessed the tests that were blessed in rust-lang#114759. ### how to review this nightmare ping bors with an `r+`. You should check that my logic is sound and maybe quickly scroll through the diff, but fully verifying it seems fairly hard to impossible. I did my best to do this correctly. Thank you `@adrianEffe` for bringing this up and your initial implementation. cc `@flip1995,` you said you want to do a subtree sync asap cc `@RalfJung` maybe you want to do a quick subtree sync afterwards as well for Miri r? `@WaffleLapkin`
…leLapkin Fixes error count display is different when there's only one error left Supersedes rust-lang#114759 ### What did I do? I did the small change in `rustc_errors` by hand. Then I did the other changes in `/compiler` by hand, those were just find replace on `*.rs` in the workspace. The changes in run-make are find replace for `run-make` in the workspace. All other changes are blessed using `x test TEST --bless`. I blessed the tests that were blessed in rust-lang#114759. ### how to review this nightmare ping bors with an `r+`. You should check that my logic is sound and maybe quickly scroll through the diff, but fully verifying it seems fairly hard to impossible. I did my best to do this correctly. Thank you `@adrianEffe` for bringing this up and your initial implementation. cc `@flip1995,` you said you want to do a subtree sync asap cc `@RalfJung` maybe you want to do a quick subtree sync afterwards as well for Miri r? `@WaffleLapkin`
…leLapkin Fixes error count display is different when there's only one error left Supersedes rust-lang#114759 ### What did I do? I did the small change in `rustc_errors` by hand. Then I did the other changes in `/compiler` by hand, those were just find replace on `*.rs` in the workspace. The changes in run-make are find replace for `run-make` in the workspace. All other changes are blessed using `x test TEST --bless`. I blessed the tests that were blessed in rust-lang#114759. ### how to review this nightmare ping bors with an `r+`. You should check that my logic is sound and maybe quickly scroll through the diff, but fully verifying it seems fairly hard to impossible. I did my best to do this correctly. Thank you `@adrianEffe` for bringing this up and your initial implementation. cc `@flip1995,` you said you want to do a subtree sync asap cc `@RalfJung` maybe you want to do a quick subtree sync afterwards as well for Miri r? `@WaffleLapkin`
|
Closing since #118138 was merged. |
Fixes error count display is different when there's only one error left ### What does this PR try to resolve? When there's only 1 error left, the number 1 appears in the output so that it scans the same as the output when there's more than 1 error, so: ``` error: could not compile `crate` (lib test) due to 1 previous error ``` instead of the current: ``` error: could not compile `crate` (lib test) due to a previous error ``` Fixes #12390 rustc related PR [#114759](rust-lang/rust#114759)
WaffleLapkin
removed
the
S-waiting-on-review
What does this PR try to resolve?
Relates to Cargo issue #12390 and the intention is to align rustc and cargo.
Related cargo PR #12484
When there's only 1 error left, the number 1 appears in the output so that it scans the same as the output when there's more than 1 error, so:
instead of the current: