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

translation: doc comments with derives, subdiagnostic-less enum variants, more derive use #103051

Merged
merged 8 commits into from
Oct 21, 2022
Merged

translation: doc comments with derives, subdiagnostic-less enum variants, more derive use #103051

merged 8 commits into from
Oct 21, 2022

Conversation

davidtwco
Copy link
Member

  • Adds support for doc attributes in the diagnostic derives so that documentation comments don't result in the derive failing.
  • Adds support for enum variants in the subdiagnostic derive to not actually correspond to an addition to a diagnostic.
  • Made use of the derive in more places in the rustc_ast_lowering, rustc_ast_passes, rustc_lint, rustc_session, rustc_infer - taking advantage of recent additions like eager subdiagnostics, multispan suggestions, etc.

cc #100717

@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 Oct 14, 2022
@rust-highfive
Copy link
Collaborator

r? @compiler-errors

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

@rustbot
Copy link
Collaborator

rustbot commented Oct 14, 2022

rustc_macros::diagnostics was changed

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

rustc_error_messages was changed

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 14, 2022
@davidtwco
macros: support doc comments in diag derives
7fbaf27 
Documentation comments shouldn't affect the diagnostic derive in any
way, but explicit support has to be added for ignoring the `doc`
attribute.

Signed-off-by: David Wood <david.wood@huawei.com>
@davidtwco
macros: allow subdiagnostic-kind-less variants
1045e69 
Sometimes it is convenient to return a subdiagnostic enum where one or
more of the variants don't add anything to the diagnostic.

Signed-off-by: David Wood <david.wood@huawei.com>
@davidtwco
macros: fully specify path to Fn
feeeb11 
Signed-off-by: David Wood <david.wood@huawei.com>
@davidtwco
ast_lowering: use derive more
2a4b587 
Signed-off-by: David Wood <david.wood@huawei.com>
@davidtwco
ast_passes: use derive more
ea5d258 
Signed-off-by: David Wood <david.wood@huawei.com>
@davidtwco
lint: use derive more
21d3bbd 
Signed-off-by: David Wood <david.wood@huawei.com>
@davidtwco
session: use derive more
f8b628b 
Signed-off-by: David Wood <david.wood@huawei.com>
@davidtwco
infer: use derive more
913f597 
Signed-off-by: David Wood <david.wood@huawei.com>
@davidtwco davidtwco force-pushed the translation-tidying-up branch from 5700362 to 913f597 Compare October 17, 2022 09:47
@compiler-errors
Copy link
Member

Looks good.

@bors r+

@bors
Copy link
Contributor

bors commented Oct 19, 2022

📌 Commit 913f597 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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 19, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 20, 2022
@matthiaskrgr
Rollup merge of rust-lang#103051 - davidtwco:translation-tidying-up, …
dd348af 
…r=compiler-errors

translation: doc comments with derives, subdiagnostic-less enum variants, more derive use

- Adds support for `doc` attributes in the diagnostic derives so that documentation comments don't result in the derive failing.
- Adds support for enum variants in the subdiagnostic derive to not actually correspond to an addition to a diagnostic.
- Made use of the derive in more places in the `rustc_ast_lowering`, `rustc_ast_passes`, `rustc_lint`, `rustc_session`, `rustc_infer` - taking advantage of recent additions like eager subdiagnostics, multispan suggestions, etc.

cc rust-lang#100717
This was referenced Oct 20, 2022
Closed
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 20, 2022
@matthiaskrgr
Rollup merge of rust-lang#103051 - davidtwco:translation-tidying-up, …
ca6097f 
…r=compiler-errors

translation: doc comments with derives, subdiagnostic-less enum variants, more derive use

- Adds support for `doc` attributes in the diagnostic derives so that documentation comments don't result in the derive failing.
- Adds support for enum variants in the subdiagnostic derive to not actually correspond to an addition to a diagnostic.
- Made use of the derive in more places in the `rustc_ast_lowering`, `rustc_ast_passes`, `rustc_lint`, `rustc_session`, `rustc_infer` - taking advantage of recent additions like eager subdiagnostics, multispan suggestions, etc.

cc rust-lang#100717
@Dylan-DPC Dylan-DPC mentioned this pull request Oct 21, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 21, 2022
@bors
Auto merge of rust-lang#103344 - Dylan-DPC:rollup-d1rpfvx, r=Dylan-DPC
657f246 
Rollup of 6 pull requests

Successful merges:

 - rust-lang#102287 (Elaborate supertrait bounds when triggering `unused_must_use` on `impl Trait`)
 - rust-lang#102922 (Filtering spans when emitting json)
 - rust-lang#103051 (translation: doc comments with derives, subdiagnostic-less enum variants, more derive use)
 - rust-lang#103111 (Account for hygiene in typo suggestions, and use them to point to shadowed names)
 - rust-lang#103260 (Fixup a few tests needing asm support)
 - rust-lang#103321 (rustdoc: improve appearance of source page navigation bar)

Failed merges:

 - rust-lang#103209 (Diagnostic derives: allow specifying multiple alternative suggestions)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e11511d into rust-lang:master Oct 21, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 21, 2022
@davidtwco davidtwco deleted the translation-tidying-up branch October 21, 2022 15:28
flip1995 pushed a commit to flip1995/rust that referenced this pull request Nov 21, 2022
@bors
Auto merge of rust-lang#103344 - Dylan-DPC:rollup-d1rpfvx, r=Dylan-DPC
46cf1ea 
Rollup of 6 pull requests

Successful merges:

 - rust-lang#102287 (Elaborate supertrait bounds when triggering `unused_must_use` on `impl Trait`)
 - rust-lang#102922 (Filtering spans when emitting json)
 - rust-lang#103051 (translation: doc comments with derives, subdiagnostic-less enum variants, more derive use)
 - rust-lang#103111 (Account for hygiene in typo suggestions, and use them to point to shadowed names)
 - rust-lang#103260 (Fixup a few tests needing asm support)
 - rust-lang#103321 (rustdoc: improve appearance of source page navigation bar)

Failed merges:

 - rust-lang#103209 (Diagnostic derives: allow specifying multiple alternative suggestions)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Xiretza Xiretza Xiretza left review comments

@compiler-errors compiler-errors compiler-errors approved these changes

Assignees

@compiler-errors compiler-errors

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
@davidtwco @rust-highfive @rustbot @compiler-errors @bors @Xiretza