Skip to content

Diagnostic args are still args if they're documented - #111170

Merged
bors merged 2 commits into
rust-lang:masterfrom
compiler-errors:diag-doc
May 8, 2023
Merged

Diagnostic args are still args if they're documented#111170
bors merged 2 commits into
rust-lang:masterfrom
compiler-errors:diag-doc

Conversation

@compiler-errors

Copy link
Copy Markdown
Contributor

Fixes https://rust-lang.zulipchat.com/#narrow/stream/336883-i18n/topic/.60.23.5Bderive.28Diagnostic.29.5D.60.20works.20badly.20with.20docs/near/355597997

There's a lot of really strange code incongruencies between Diagnostic and Subdiagnostic derive. Perhaps those macros need some more overhaul, but I didn't really want to do it today.

@rustbot

Copy link
Copy Markdown
Collaborator

r? @petrochenkov

(rustbot has picked a reviewer for you, use r? to override)

@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 May 4, 2023
@rustbot

Copy link
Copy Markdown
Collaborator

rustc_macros::diagnostics was changed

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

@petrochenkov

petrochenkov commented May 5, 2023

Copy link
Copy Markdown
Contributor

@bors r+
I didn't look very carefully.
It's also not clear why something is done to remove raw identifiers.

@bors

bors commented May 5, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 0aa6b1e has been approved by petrochenkov

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 May 5, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 5, 2023
…henkov
Diagnostic args are still args if they're documented
Fixes https://rust-lang.zulipchat.com/#narrow/stream/336883-i18n/topic/.60.23.5Bderive.28Diagnostic.29.5D.60.20works.20badly.20with.20docs/near/355597997
There's a lot of really strange code incongruencies between `Diagnostic` and `Subdiagnostic` derive. Perhaps those macros need some more overhaul, but I didn't really want to do it today.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 6, 2023
…henkov
Diagnostic args are still args if they're documented
Fixes https://rust-lang.zulipchat.com/#narrow/stream/336883-i18n/topic/.60.23.5Bderive.28Diagnostic.29.5D.60.20works.20badly.20with.20docs/near/355597997
There's a lot of really strange code incongruencies between `Diagnostic` and `Subdiagnostic` derive. Perhaps those macros need some more overhaul, but I didn't really want to do it today.
@matthiaskrgr

Copy link
Copy Markdown
Member

@compiler-errors

Copy link
Copy Markdown
ContributorAuthor

Rebased and copied some test normalization from another derive-diagnostic test

@bors r=petrochenkov

@bors

bors commented May 8, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit a156bd7 has been approved by petrochenkov

It is now in the queue for this repository.

@compiler-errors

Copy link
Copy Markdown
ContributorAuthor

@bors rollup

bors added a commit to rust-lang-ci/rust that referenced this pull request May 8, 2023
…mpiler-errors
Rollup of 6 pull requests
Successful merges:
- rust-lang#104070 (Prevent aborting guard from aborting the process in a forced unwind)
- rust-lang#109410 (Introduce `AliasKind::Inherent` for inherent associated types)
- rust-lang#111004 (Migrate `mir_transform` to translatable diagnostics)
- rust-lang#111118 (Suggest struct when we get colon in fileds in enum)
- rust-lang#111170 (Diagnostic args are still args if they're documented)
- rust-lang#111354 (Fix miscompilation when calling default methods on `Future`)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 24ba82d into rust-lang:masterMay 8, 2023
@rustbotrustbot added this to the 1.71.0 milestone May 8, 2023
@compiler-errors
compiler-errors deleted the diag-doc branch August 11, 2023 19:58
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.

5 participants

@compiler-errors@rustbot@petrochenkov@bors@matthiaskrgr