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

Do not ICE on foreign malformed diagnostic::on_unimplemented #124683

Merged
merged 2 commits into from
May 8, 2024
Merged

Do not ICE on foreign malformed diagnostic::on_unimplemented #124683

merged 2 commits into from
May 8, 2024

Conversation

estebank
Copy link
Contributor

@estebank estebank commented May 3, 2024

Fix #124651.

@estebank estebank added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels May 3, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 3, 2024

r? @spastorino

rustbot has assigned @spastorino.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 3, 2024
@compiler-errors
Copy link
Member

compiler-errors commented May 4, 2024 •
edited
Loading

Please write a test, then r=me

@rustbot author

@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels May 4, 2024
@estebank
Copy link
Contributor Author

estebank commented May 7, 2024

Added test.

@bors r=compiler-errors

@bors
Copy link
Contributor

bors commented May 7, 2024

📌 Commit fb37600 has been approved by compiler-errors

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 May 7, 2024
@compiler-errors
Copy link
Member

I think this will fail tidy since you're missing newlines on your test and auxiliary file.

@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 May 7, 2024
@estebank
Copy link
Contributor Author

estebank commented May 7, 2024

Yeah, and I was missing the .stderr. The contents of my staged changes wasn't what I thought it was when I pushed.

@bors r=compiler-errors

@bors
Copy link
Contributor

bors commented May 7, 2024

📌 Commit 758e459 has been approved by compiler-errors

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 May 7, 2024
@bors
Copy link
Contributor

bors commented May 8, 2024

⌛ Testing commit 758e459 with merge a60f077...

@bors
Copy link
Contributor

bors commented May 8, 2024

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing a60f077 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 8, 2024
@bors bors merged commit a60f077 into rust-lang:master May 8, 2024
7 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 8, 2024
@compiler-errors compiler-errors mentioned this pull request May 8, 2024
Merged
@compiler-errors
Copy link
Member

This should be backported together with #124875.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a60f077): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -2.4% [-2.4%, -2.4%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -2.4% [-2.4%, -2.4%] 1

Max RSS (memory usage)

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

Cycles

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)		 - - 0
Improvements ✅
(primary)		 -2.5% [-2.5%, -2.5%] 1
Improvements ✅
(secondary)		 -4.0% [-4.0%, -4.0%] 1
All ❌✅ (primary) -2.5% [-2.5%, -2.5%] 1

Binary size

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

Bootstrap: 676.569s -> 675.408s (-0.17%)
Artifact size: 315.94 MiB -> 315.79 MiB (-0.05%)

@apiraino
Copy link
Contributor

Beta backports approved as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle.

The stable backport so far does not look like that urgent so we're not pressing for a dot release, but if it happens for other reason then why not include this either.

@rustbot label +beta-accepted +stable-accepted

@rustbot rustbot added beta-accepted Accepted for backporting to the compiler in the beta channel. stable-accepted Accepted for backporting to the compiler in the stable channel. labels May 10, 2024
@cuviper cuviper mentioned this pull request May 16, 2024
Merged
@cuviper cuviper modified the milestones: 1.80.0, 1.79.0 May 16, 2024
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 16, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request May 17, 2024
@bors
Auto merge of rust-lang#125183 - cuviper:beta-next, r=cuviper
0436bf1 
[beta] backports

- Do not ICE on foreign malformed `diagnostic::on_unimplemented` rust-lang#124683
- Fix more ICEs in `diagnostic::on_unimplemented` rust-lang#124875
- rustdoc: use stability, instead of features, to decide what to show rust-lang#124864
- Don't do post-method-probe error reporting steps if we're in a suggestion rust-lang#125100
-  Make `non-local-def` lint Allow by default rust-lang#124950

r? cuviper
@cuviper cuviper removed stable-nominated Nominated for backporting to the compiler in the stable channel. stable-accepted Accepted for backporting to the compiler in the stable channel. labels Jun 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@spastorino spastorino

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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.
Projects
None yet
Milestone
1.79.0
8 participants
@estebank @rustbot @compiler-errors @bors @rust-timer @apiraino @cuviper @spastorino