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

Fixes error count display is different when there's only one error left #118138

Merged
merged 7 commits into from
Nov 24, 2023

Conversation

Noratrieb
Copy link
Member

Supersedes #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 #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

@rustbot
Copy link
Collaborator

rustbot commented Nov 21, 2023

Could not assign reviewer from: WaffleLapkin.
User(s) WaffleLapkin are either the PR author, already assigned, or on vacation, and there are no other candidates.
Use r? to specify someone else to assign.

@Noratrieb
Copy link
Member Author

(waffle told me that it is ready to review this now)

@WaffleLapkin
Copy link
Member

@bors r+ rollup p=10

let's pray to ferris everything goes smoothly 🙏

@bors
Copy link
Contributor

bors commented Nov 21, 2023

📌 Commit 7466811 has been approved by WaffleLapkin

It is now in the queue for this repository.

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 21, 2023
@WaffleLapkin
Copy link
Member

@bors rollup=never

🤣

@rust-log-analyzer

This comment has been minimized.

@Noratrieb
Copy link
Member Author

@bors r-

@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 21, 2023
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Nov 21, 2023
@rustbot
Copy link
Collaborator

rustbot commented Nov 21, 2023

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@Noratrieb
Copy link
Member Author

I blessed it some more 🙏
@bors r=WaffleLapkin

@bors
Copy link
Contributor

bors commented Nov 21, 2023

📌 Commit 524fcb2 has been approved by WaffleLapkin

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 21, 2023
@bors
Copy link
Contributor

bors commented Nov 21, 2023

⌛ Testing commit 524fcb2 with merge 8d515ab...

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`
@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Nov 21, 2023

💔 Test failed - checks-actions

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 21, 2023
@rust-log-analyzer

This comment has been minimized.

@Noratrieb
Copy link
Member Author

@bors r-

@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 24, 2023
We have to ignore some tests in stage1.
@Noratrieb
Copy link
Member Author

@bors r=WaffleLapkin p=15

@bors
Copy link
Contributor

bors commented Nov 24, 2023

📌 Commit c73d392 has been approved by WaffleLapkin

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 24, 2023
@bors
Copy link
Contributor

bors commented Nov 24, 2023

⌛ Testing commit c73d392 with merge 37b2813...

@bors
Copy link
Contributor

bors commented Nov 24, 2023

☀️ Test successful - checks-actions
Approved by: WaffleLapkin
Pushing 37b2813 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 24, 2023
@bors bors merged commit 37b2813 into rust-lang:master Nov 24, 2023
12 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Nov 24, 2023
@Noratrieb Noratrieb deleted the one-previous-error branch November 24, 2023 23:45
@Noratrieb
Copy link
Member Author

@flip1995 @RalfJung it's merged!

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (37b2813): 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)
1.0% [1.0%, 1.0%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.1% [-1.1%, -1.1%] 1
All ❌✅ (primary) - - 0

Cycles

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

Binary size

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

Bootstrap: 675.167s -> 676.226s (0.16%)
Artifact size: 313.56 MiB -> 313.43 MiB (-0.04%)

celinval added a commit to model-checking/kani that referenced this pull request Nov 27, 2023
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
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants