Skip to content

Clean up (sub)diagnostic derives #101851

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 9 commits into from
Sep 26, 2022
Merged

Clean up (sub)diagnostic derives #101851

merged 9 commits into from
Sep 26, 2022

Conversation

Xiretza
Copy link
Contributor

@Xiretza Xiretza commented Sep 15, 2022

The biggest chunk of this is unifying the parsing of subdiagnostic attributes (#[error], #[suggestion(...)], #[label(...)], etc) between Subdiagnostic and Diagnostic type attributes as well as Diagnostic field attributes.

It also improves a number of proc macro diagnostics.

Waiting for #101558.

@rustbot rustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 15, 2022
@rust-highfive
Copy link
Contributor

r? @eholk

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 15, 2022
@Xiretza
Copy link
Contributor Author

Xiretza commented Sep 15, 2022

r? @davidtwco

@rust-highfive rust-highfive assigned davidtwco and unassigned eholk Sep 15, 2022
@davidtwco
Copy link
Member

LGTM, is there a reason that this is still marked as a draft or can I r=me it?

@Xiretza
Copy link
Contributor Author

Xiretza commented Sep 21, 2022

Waiting for #101558.

@JhonnyBillM has been waiting and rebasing for longer, I'll let them go first.

@davidtwco
Copy link
Member

Waiting for #101558.

@JhonnyBillM has been waiting and rebasing for longer, I'll let them go first.

#101558 has p=1, rollup=never and is an older PR, so should get through the queue quicker. I'm going to unmark this as a draft and approve it so that I don't need to keep track of these pull requests and make sure that I approve this once that has landed - there's already a lot of pull requests in flight and I've got a backlog so would rather avoid the extra dependency to keep track of here.

@davidtwco davidtwco marked this pull request as ready for review September 21, 2022 15:23
@rustbot
Copy link
Collaborator

rustbot commented Sep 21, 2022

rustc_macros::diagnostics was changed

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

@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 21, 2022

📌 Commit 1c8048bb6394652f52295fb65eeafe7d7ba2af68 has been approved by davidtwco

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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 21, 2022
@Xiretza Xiretza force-pushed the diagnostic-derive-cleanups branch from 1c8048b to 7c98dc7 Compare September 21, 2022 17:39
@Xiretza
Copy link
Contributor Author

Xiretza commented Sep 21, 2022

Sorry for force-pushing after r+, but I did actually still have a bugfix locally that I was waiting to push together with a rebase.

@davidtwco
Copy link
Member

@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 Sep 21, 2022
@bors

This comment was marked as resolved.

# to view
@Xiretza Xiretza force-pushed the diagnostic-derive-cleanups branch from 7c98dc7 to 336a72a Compare September 22, 2022 15:26
@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 22, 2022

📌 Commit 336a72a has been approved by davidtwco

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 Sep 22, 2022
@davidtwco davidtwco mentioned this pull request Sep 23, 2022
Merged
@fee1-dead fee1-dead mentioned this pull request Sep 26, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 26, 2022
@bors
Auto merge of rust-lang#102292 - fee1-dead-contrib:rollup-61ptdkt, r=…
fe217c2 
…fee1-dead

Rollup of 4 pull requests

Successful merges:

 - rust-lang#101851 (Clean up (sub)diagnostic derives)
 - rust-lang#102244 (Only generate closure def id for async fns with body)
 - rust-lang#102263 (Clarify Iterator::rposition code example)
 - rust-lang#102280 (rustdoc: clean up `.out-of-band`/`.in-band` CSS)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1a93028 into rust-lang:master Sep 26, 2022
@rustbot rustbot added this to the 1.66.0 milestone Sep 26, 2022
@Xiretza Xiretza deleted the diagnostic-derive-cleanups branch October 22, 2022 06:50
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@davidtwco davidtwco davidtwco approved these changes

Assignees

@davidtwco davidtwco

Labels
A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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.66.0
Development

Successfully merging this pull request may close these issues.
6 participants
@Xiretza @rust-highfive @davidtwco @rustbot @bors @eholk