migrate rustc_query_system to use SessionDiagnostic #100844

evopen · 2022-08-21T13:28:19Z

issues:

variable list is not supported in fluent
~~cannot have two sub diagnostic with the same tag (eg. 2 .note or 2 .help)~~

allow multiple tag with SessionSubdiagnostic derive

rust-highfive · 2022-08-21T13:28:22Z

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

Please see the contribution instructions for more information.

rustbot · 2022-08-21T13:28:22Z

rustc_error_messages was changed

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

davidtwco

Looks good, I've left a suggestion for how we might translate the remaining part if you're up for looking into that.

compiler/rustc_query_system/src/error.rs

evopen · 2022-08-24T01:22:35Z

currently Vec<SubDiagType> does not solve the problem of list of variable in fluent.

rustbot · 2022-08-24T05:50:56Z

rustc_macros::diagnostics was changed

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

davidtwco · 2022-08-25T14:29:02Z

compiler/rustc_macros/src/diagnostics/subdiagnostic.rs

    /// `#[kind(slug)]` attribute on the type or variant.
-    slug: Option<(Path, proc_macro::Span)>,
+    slugs: Vec<(Path, proc_macro::Span)>,


This will conflict with #100970 but they should be otherwise compatible

davidtwco · 2022-08-25T14:35:13Z

@bors r+

bors · 2022-08-25T14:35:16Z

📌 Commit c0c43106e7921779587b6c4c14a86b8960cdddf1 has been approved by davidtwco

It is now in the queue for this repository.

compiler/rustc_query_system/src/query/job.rs

Co-authored-by: David Wood <[email protected]>

fixes `SessionSubdiagnostic` to accept multiple attributes emitting list of fluent message remains unresolved

evopen · 2022-08-31T12:07:40Z

@rustbot ready
wow, it will never merge

davidtwco · 2022-08-31T12:26:28Z

@bors r+

bors · 2022-08-31T12:26:30Z

📌 Commit 7ce59eb has been approved by davidtwco

It is now in the queue for this repository.

migrate rustc_query_system to use SessionDiagnostic issues: * variable list is not supported in fluent * ~~cannot have two sub diagnostic with the same tag (eg. 2 .note or 2 .help)~~ allow multiple tag with SessionSubdiagnostic derive

…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#100787 (Pretty printing give proper error message without panic) - rust-lang#100838 (Suggest moving redundant generic args of an assoc fn to its trait) - rust-lang#100844 (migrate rustc_query_system to use SessionDiagnostic) - rust-lang#101140 (Update Clippy) - rust-lang#101161 (Fix uintended diagnostic caused by `drain(..)`) - rust-lang#101165 (Use more `into_iter` rather than `drain(..)`) - rust-lang#101229 (Link “? operator” to relevant chapter in The Book) - rust-lang#101230 (lint: avoid linting diag functions with diag lints) - rust-lang#101236 (Avoid needless buffer zeroing in `std::sys::windows::fs`) - rust-lang#101240 (Fix a typo on `wasm64-unknown-unknown` doc) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

Xiretza · 2022-09-01T05:23:24Z

This accidentally reverted (at least) #100970, I'll clean that up in a couple hours unless someone else gets to it first.

evopen · 2022-09-01T05:58:55Z

This accidentally reverted (at least) #100970, I'll clean that up in a couple hours unless someone else gets to it first.

I apologize for this. I didn't review my changes in the last rebase. Truely sorry.

davidtwco · 2022-09-01T08:02:20Z

This accidentally reverted (at least) #100970, I'll clean that up in a couple hours unless someone else gets to it first.

My bad, I should have noticed this in the review.

…idtwco Fix rust-lang#100844 rebase accident This undoes the rebase accident in rust-lang#100844, which accidentally caused rust-lang#100970 to be reverted.

…llaumeGomez Rollup of 9 pull requests Successful merges: - rust-lang#97739 (Uplift the `let_underscore` lints from clippy into rustc.) - rust-lang#99583 (Add additional methods to the Demand type) - rust-lang#100147 (optimization of access level table construction) - rust-lang#100552 (rustc_target: Add a compatibility layer to separate internal and user-facing linker flavors) - rust-lang#100827 (Simplify MIR opt tests) - rust-lang#101166 (Generate error index with mdbook instead of raw HTML pages) - rust-lang#101294 (Fix rust-lang#100844 rebase accident) - rust-lang#101298 (rustdoc: remove unused CSS `#main-content > .since`) - rust-lang#101304 (Add autolabels for `A-query-system`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#100787 (Pretty printing give proper error message without panic) - rust-lang#100838 (Suggest moving redundant generic args of an assoc fn to its trait) - rust-lang#100844 (migrate rustc_query_system to use SessionDiagnostic) - rust-lang#101140 (Update Clippy) - rust-lang#101161 (Fix uintended diagnostic caused by `drain(..)`) - rust-lang#101165 (Use more `into_iter` rather than `drain(..)`) - rust-lang#101229 (Link “? operator” to relevant chapter in The Book) - rust-lang#101230 (lint: avoid linting diag functions with diag lints) - rust-lang#101236 (Avoid needless buffer zeroing in `std::sys::windows::fs`) - rust-lang#101240 (Fix a typo on `wasm64-unknown-unknown` doc) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned TaKO8Ki Aug 21, 2022

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 Aug 21, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 21, 2022

evopen force-pushed the migrate-diag branch from def6b8b to c9dca69 Compare August 21, 2022 13:37

davidtwco requested changes Aug 22, 2022

View reviewed changes

compiler/rustc_query_system/src/error.rs Outdated Show resolved Hide resolved

compiler/rustc_query_system/src/error.rs Outdated Show resolved Hide resolved

davidtwco 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 Aug 22, 2022

This was referenced Aug 23, 2022

Migrate rustc_monomorphize to use SessionDiagnostic #100730

Merged

Diagnostic Translation #100717

Open

evopen commented Aug 24, 2022

View reviewed changes

compiler/rustc_query_system/src/error.rs Outdated Show resolved Hide resolved

evopen requested a review from davidtwco August 24, 2022 05:56

evopen marked this pull request as draft August 24, 2022 06:00

This comment has been minimized.

Sign in to view

evopen force-pushed the migrate-diag branch 3 times, most recently from 57eb0e7 to c0c4310 Compare August 25, 2022 13:47

davidtwco reviewed Aug 25, 2022

View reviewed changes

davidtwco approved these changes Aug 25, 2022

View reviewed changes

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 Aug 25, 2022

davidtwco marked this pull request as ready for review August 25, 2022 14:36

jyn514 reviewed Aug 25, 2022

View reviewed changes

compiler/rustc_query_system/src/query/job.rs Outdated Show resolved Hide resolved

evopen and others added 4 commits August 31, 2022 19:33

link related issue to FIXME

d7e07c0

Co-authored-by: David Wood <[email protected]>

use derive proc macro to impl SessionDiagnostic

ac638c1

fixes `SessionSubdiagnostic` to accept multiple attributes emitting list of fluent message remains unresolved

delete leftover comment

166aef9

SessionDiagnostic for QueryOverflow error

7ce59eb

evopen force-pushed the migrate-diag branch from 54069d8 to 7ce59eb Compare August 31, 2022 12:06

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 31, 2022

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 Aug 31, 2022

matthiaskrgr mentioned this pull request Aug 31, 2022

Rollup of 9 pull requests #101244

Closed

matthiaskrgr mentioned this pull request Aug 31, 2022

Rollup of 9 pull requests #101246

Closed

matthiaskrgr mentioned this pull request Aug 31, 2022

Rollup of 10 pull requests #101249

Merged

bors merged commit 22c5c83 into rust-lang:master Sep 1, 2022

rustbot added this to the 1.65.0 milestone Sep 1, 2022

Xiretza mentioned this pull request Sep 1, 2022

Fix #100844 rebase accident #101294

Merged

GuillaumeGomez mentioned this pull request Sep 2, 2022

Rollup of 9 pull requests #101318

Merged

migrate rustc_query_system to use SessionDiagnostic #100844

migrate rustc_query_system to use SessionDiagnostic #100844

Uh oh!

Conversation

evopen commented Aug 21, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Aug 21, 2022

Uh oh!

rustbot commented Aug 21, 2022

Uh oh!

davidtwco left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

evopen commented Aug 24, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Aug 24, 2022

Uh oh!

This comment has been minimized.

This comment has been minimized.

davidtwco Aug 25, 2022

Choose a reason for hiding this comment

Uh oh!

davidtwco commented Aug 25, 2022

Uh oh!

bors commented Aug 25, 2022

Uh oh!

Uh oh!

evopen commented Aug 31, 2022

Uh oh!

davidtwco commented Aug 31, 2022

Uh oh!

bors commented Aug 31, 2022

Uh oh!

Xiretza commented Sep 1, 2022

Uh oh!

evopen commented Sep 1, 2022

Uh oh!

davidtwco commented Sep 1, 2022

Uh oh!

Uh oh!

evopen commented Aug 21, 2022 •

edited

Loading

evopen commented Aug 24, 2022 •

edited

Loading