Skip to content

Support eager subdiagnostics again - #105806

Merged
bors merged 1 commit into
rust-lang:masterfrom
mejrs:eager2
Jan 12, 2023
Merged

Support eager subdiagnostics again#105806
bors merged 1 commit into
rust-lang:masterfrom
mejrs:eager2

Conversation

@mejrs

Copy link
Copy Markdown
Member

See #104941 (comment)

I'm not sure how to add a test for this. But I did pick some of the diagnostic structs in the mentioned PR and it works with them.

@rustbot

Copy link
Copy Markdown
Collaborator

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

Please see the contribution instructions for more information.

@rustbotrustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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 Dec 17, 2022
@rustbot

Copy link
Copy Markdown
Collaborator

rustc_macros::diagnostics was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @estebank, @TaKO8Ki

@davidtwcodavidtwco left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologies for the delay in reviewing, r=me after fixing the comment.

Comment threadsrc/test/ui-fulldeps/session-diagnostic/diagnostic-derive.rs Outdated
@davidtwco

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jan 9, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit d956ea3 has been approved by davidtwco

It is now in the queue for this repository.

@borsbors 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 Jan 9, 2023
JohnTitor pushed a commit to JohnTitor/rust that referenced this pull request Jan 10, 2023
Support eager subdiagnostics again
See rust-lang#104941 (comment)
I'm not sure how to add a test for this. But I did pick some of the diagnostic structs in the mentioned PR and it works with them.
@JohnTitorJohnTitor mentioned this pull request Jan 10, 2023
@dtolnay

dtolnay commented Jan 11, 2023

Copy link
Copy Markdown
Member

Rebased to resolve conflict with #106458, since this was showing not mergeable in bors.
https://bors.rust-lang.org/queue/rust
@bors r=davidtwco

@bors

bors commented Jan 11, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 7aff210 has been approved by davidtwco

It is now in the queue for this repository.

Noratrieb added a commit to Noratrieb/rust that referenced this pull request Jan 12, 2023
Support eager subdiagnostics again
See rust-lang#104941 (comment)
I'm not sure how to add a test for this. But I did pick some of the diagnostic structs in the mentioned PR and it works with them.
This was referenced Jan 12, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 12, 2023
Rollup of 6 pull requests
Successful merges:
- rust-lang#105806 (Support eager subdiagnostics again)
- rust-lang#106322 (Handle inference variables in `CollectAllMismatches` correctly)
- rust-lang#106579 (Suggest making private tuple struct field public)
- rust-lang#106714 (remove unreachable error code `E0490`)
- rust-lang#106751 (Fix rendering 'const' in header for intrinsics)
- rust-lang#106761 (Add `WaffleLapkin` to compiler reviewers)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 6bf57b8 into rust-lang:masterJan 12, 2023
@rustbotrustbot added this to the 1.68.0 milestone Jan 12, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-translationArea: Translation infrastructure, and migrating existing diagnostics to SessionDiagnosticS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@mejrs@rustbot@davidtwco@bors@dtolnay@wesleywiser