Fixes error count display is different when there's only one error left #118138
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Could not assign reviewer from: |
|
(waffle told me that it is ready to review this now) |
WaffleLapkin
approved these changes
Nov 21, 2023
|
@bors r+ rollup p=10 let's pray to ferris everything goes smoothly 🙏 |
bors
added
the
S-waiting-on-bors
|
@bors rollup=never 🤣 |
This comment has been minimized.
This comment has been minimized.
|
@bors r- |
bors
added
S-waiting-on-author
Noratrieb
force-pushed
the
one-previous-error
branch
from
7466811 to
ae7157d
Compare
rustbot
added
T-compiler
|
The Miri subtree was changed cc @rust-lang/miri Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
This comment has been minimized.
This comment has been minimized.
Noratrieb
force-pushed
the
one-previous-error
branch
from
ae7157d to
10d241a
Compare
This comment has been minimized.
This comment has been minimized.
|
I blessed it some more 🙏 |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 21, 2023
…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`
This comment has been minimized.
This comment has been minimized.
|
💔 Test failed - checks-actions |
bors
removed
the
S-waiting-on-bors
This comment has been minimized.
This comment has been minimized.
|
@bors r- |
bors
added
S-waiting-on-author
We have to ignore some tests in stage1.
|
@bors r=WaffleLapkin p=15 |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
This was referenced Nov 25, 2023
|
Finished benchmarking commit (37b2813): comparison URL. Overall result: no relevant changes - no action needed@rustbot label: -perf-regression Instruction countThis benchmark run did not return any relevant results for this metric. Max RSS (memory usage)ResultsThis 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.
CyclesThis benchmark run did not return any relevant results for this metric. Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 675.167s -> 676.226s (0.16%) |
celinval
added a commit
to model-checking/kani
that referenced
this pull request
Nov 27, 2023
Changes required due to: - rust-lang/rust#118256 - rust-lang/rust#118138
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 6, 2024
…monster-mess, r=WaffleLapkin Remove ignore-stage1 that was added when changing error count msg The bootstrap bump has happened, so the bootstrap compiler now contains the new diagnostic. this was added in rust-lang#118138
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 6, 2024
Rollup merge of rust-lang#119655 - Nilstrieb:cleanup-the-error-count-monster-mess, r=WaffleLapkin Remove ignore-stage1 that was added when changing error count msg The bootstrap bump has happened, so the bootstrap compiler now contains the new diagnostic. this was added in rust-lang#118138
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Supersedes #114759
What did I do?
I did the small change in
rustc_errorsby hand. Then I did the other changes in/compilerby hand, those were just find replace on*.rsin the workspace. The changes in run-make are find replace forrun-makein the workspace.All other changes are blessed using
x test TEST --bless. I blessed the tests that were blessed in #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