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

migrate rustc_query_system to use SessionDiagnostic #100844

Merged
merged 5 commits into from
Sep 1, 2022
Merged

migrate rustc_query_system to use SessionDiagnostic #100844

merged 5 commits into from
Sep 1, 2022

Conversation

evopen
Copy link
Contributor

@evopen evopen commented Aug 21, 2022 •
edited
Loading

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

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

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
Copy link
Collaborator

rustbot commented Aug 21, 2022

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 Aug 21, 2022
davidtwco
davidtwco requested changes Aug 22, 2022
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

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

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 Outdated Show resolved Hide resolved
compiler/rustc_query_system/src/error.rs Outdated Show resolved Hide resolved
@davidtwco 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
Merged
Open
@evopen
Copy link
Contributor Author

evopen commented Aug 24, 2022 •
edited
Loading

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

@rustbot
Copy link
Collaborator

rustbot commented Aug 24, 2022

rustc_macros::diagnostics was changed

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

@evopen evopen requested a review from davidtwco August 24, 2022 05:56
@evopen evopen marked this pull request as draft August 24, 2022 06:00
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@evopen evopen force-pushed the migrate-diag branch 3 times, most recently from 57eb0e7 to c0c4310 Compare August 25, 2022 13:47
davidtwco
davidtwco reviewed Aug 25, 2022
View reviewed changes
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)>,
Copy link
Member

Choose a reason for hiding this comment

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

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

@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 25, 2022

📌 Commit c0c43106e7921779587b6c4c14a86b8960cdddf1 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 Aug 25, 2022
@davidtwco davidtwco marked this pull request as ready for review August 25, 2022 14:36
evopen and others added 4 commits August 31, 2022 19:33
@evopen @davidtwco
link related issue to FIXME
d7e07c0 
Co-authored-by: David Wood <agile.lion3441@fuligin.ink>
@evopen
use derive proc macro to impl SessionDiagnostic
ac638c1 
fixes `SessionSubdiagnostic` to accept multiple attributes
emitting list of fluent message remains unresolved
@evopen
delete leftover comment
166aef9
@evopen
SessionDiagnostic for QueryOverflow error
7ce59eb
@evopen
Copy link
Contributor Author

evopen commented Aug 31, 2022

@rustbot ready
wow, it will never merge

@rustbot 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
@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 31, 2022

📌 Commit 7ce59eb 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 Aug 31, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 31, 2022
@matthiaskrgr
Rollup merge of rust-lang#100844 - evopen:migrate-diag, r=davidtwco
83141af 
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
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 31, 2022
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 31, 2022
@matthiaskrgr
Rollup merge of rust-lang#100844 - evopen:migrate-diag, r=davidtwco
c8fede9 
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
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 31, 2022
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 31, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 31, 2022
@bors
Auto merge of rust-lang#101249 - matthiaskrgr:rollup-wahnoz8, r=matth…
db00199 
…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
@bors bors merged commit 22c5c83 into rust-lang:master Sep 1, 2022
@rustbot rustbot added this to the 1.65.0 milestone Sep 1, 2022
@Xiretza
Copy link
Contributor

Xiretza commented Sep 1, 2022

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

@evopen
Copy link
Contributor Author

evopen commented Sep 1, 2022

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
Copy link
Member

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.

@Xiretza Xiretza mentioned this pull request Sep 1, 2022
Merged
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Sep 2, 2022
@GuillaumeGomez
Rollup merge of rust-lang#101294 - Xiretza:fix-100844-accident, r=dav…
4c1b6b5 
…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.
@GuillaumeGomez GuillaumeGomez mentioned this pull request Sep 2, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 2, 2022
@bors
Auto merge of rust-lang#101318 - GuillaumeGomez:rollup-qsr51z4, r=Gui…
9353538 
…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
flip1995 pushed a commit to flip1995/rust that referenced this pull request Sep 9, 2022
@bors
Auto merge of rust-lang#101249 - matthiaskrgr:rollup-wahnoz8, r=matth…
5b784f8 
…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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jyn514 jyn514 jyn514 left review comments

@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.65.0
Development

Successfully merging this pull request may close these issues.
9 participants
@evopen @rust-highfive @rustbot @rust-log-analyzer @davidtwco @bors @jyn514 @Xiretza @TaKO8Ki