Migrate rustc_monomorphize to use SessionDiagnostic #100730

CleanCut · 2022-08-18T21:56:16Z

Description

Migrates diagnostics in rustc_monomorphize to use SessionDiagnostic
Adds an impl IntoDiagnosticArg for PathBuf

TODO / Help!

I'm having trouble figuring out how to apply an optional note. 😕 Help!?
- Resolved. It was bad docs. Fixed in https://github.com/rust-lang/rustc-dev-guide/pull/1437/files
errors:RecursionLimit should be #[fatal ...], but that doesn't exist so it's #[error ...] at the moment.
- Maybe I can switch after this is merged in? --> Migrate rustc_ast_passes diagnostics to SessionDiagnostic and translatable messages (first part) #100694
- Or maybe I need to manually implement SessionDiagnostic instead of deriving it?
How does one go about converting an error inside of a call to struct_span_lint_hir?
~~What placeholder do you use in the fluent template to refer to the value in a vector? It seems like this code ought to have the answer (or something near it)...but I can't figure it out.~~ You can't. Punted.

rust-highfive · 2022-08-18T21:56:19Z

r? @estebank

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

compiler/rustc_monomorphize/src/errors.rs

JeanCASPAR · 2022-08-18T22:05:30Z

I'm having trouble figuring out how to apply an optional note. 😕 Help!?

You can pute the #[note] attribute on a Option<()> field. It will be displayed only when the field is Some, like I did here :
https://github.com/rust-lang/rust/pull/100724/files#diff-5fdce00f0b9b04a72a8bf8d6a0b8866deddf41201e908831c6f7cd444c64bef3R175

CleanCut · 2022-08-18T22:13:56Z

@JeanCASPAR The problem turned out to be my relying on incorrectly-documented syntax! (It was on an Option<()> field already). It seems to work, now. Or at least, it's no longer in the list of lint errors. 😉

rustbot · 2022-08-19T00:54:40Z

rustc_error_messages was changed

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

CleanCut · 2022-08-19T00:55:51Z

I've taken this PR out of draft status, because I'm now stuck and need a helpful reviewer to guide me forward. 😄

compiler/rustc_monomorphize/src/partitioning/mod.rs

compiler/rustc_monomorphize/src/errors.rs

davidtwco · 2022-08-19T09:30:29Z

errors:RecursionLimit should be #[fatal ...], but that doesn't exist so it's #[error ...] at the moment.

Just skip this one for now and rebase after @finalchild's #100694 lands with #[fatal(..)] support.

How does one go about converting an error inside of a call to struct_span_lint_hir?

You can use emit_spanned_lint, just use the LintDiagnostic derive instead of SessionDiagnostic with #[lint(..)] instead of #[error(..)]. These don't need #[primary_span] attributes, which we don't currently prevent but I'm going to make a task about fixing now.

What placeholder do you use in the fluent template to refer to the value in a vector? It seems like this code ought to have the answer (or something near it)...but I can't figure it out.

We support Vec<Span> fields, if you want to have one message in a bunch of locations, but we otherwise don't have an amazing answer for how to write out lists of items in a translatable way. This is an open question, feel free to read about Fluent and try work out a nice way to do it, then we can follow your approach wherever else this comes up, but you can also just skip a diagnostic with this for now.

compiler/rustc_monomorphize/src/errors.rs

…stic

…ough new struct, use fluent message in monomorphize

rustbot · 2022-08-25T17:07:11Z

Some changes occurred in src/tools/cargo

cc @ehuss

CleanCut · 2022-08-25T18:14:19Z

I assume that the codegen failure is spurious because nothing you've changed should make a difference there - once you've rebased and fixed the conflicts, we can try merging this. Thanks for sticking with it :)

I hope so. The local codegen failure persists even after the rebase.

davidtwco

I think we're almost ready to land this - you've pushed a submodule update for Cargo though, which shouldn't be there.

compiler/rustc_monomorphize/src/polymorphize.rs

…e rebased

CleanCut · 2022-08-26T21:18:49Z

I think we're almost ready to land this - you've pushed a submodule update for Cargo though, which shouldn't be there.

✅ Fixed the errant submodule change. Ready for re-review.

davidtwco · 2022-08-31T07:28:54Z

@bors r+

bors · 2022-08-31T07:28:56Z

📌 Commit 845d567 has been approved by davidtwco

It is now in the queue for this repository.

…phize, r=davidtwco Migrate rustc_monomorphize to use SessionDiagnostic ### Description - Migrates diagnostics in `rustc_monomorphize` to use `SessionDiagnostic` - Adds an `impl IntoDiagnosticArg for PathBuf` ### TODO / Help! - [x] I'm having trouble figuring out how to apply an optional note. 😕 Help!? - Resolved. It was bad docs. Fixed in https://github.com/rust-lang/rustc-dev-guide/pull/1437/files - [x] `errors:RecursionLimit` should be `#[fatal ...]`, but that doesn't exist so it's `#[error ...]` at the moment. - Maybe I can switch after this is merged in? --> rust-lang#100694 - Or maybe I need to manually implement `SessionDiagnostic` instead of deriving it? - [x] How does one go about converting an error inside of [a call to struct_span_lint_hir](https://github.com/rust-lang/rust/blob/8064a495086c2e63c0ef77e8e82fe3b9b5dc535f/compiler/rustc_monomorphize/src/collector.rs#L917-L927)? - [x] ~What placeholder do you use in the fluent template to refer to the value in a vector? It seems like [this code](https://github.com/rust-lang/rust/blob/0b79f758c9aa6646606662a6d623a0752286cd17/compiler/rustc_macros/src/diagnostics/diagnostic_builder.rs#L83-L114) ought to have the answer (or something near it)...but I can't figure it out.~ You can't. Punted.

klensy · 2022-08-31T11:47:27Z

Submodule changes still in commits history, can you actually rebase?

Rollup of 7 pull requests Successful merges: - rust-lang#90946 (Ignore `reference`s in "Type::inner_def_id") - rust-lang#100730 (Migrate rustc_monomorphize to use SessionDiagnostic) - rust-lang#100753 (translations(rustc_session): migrates `rustc_session` to use `SessionDiagnostic` - Pt. 1) - rust-lang#100831 (Migrate `symbol_mangling` module to new diagnostics structs) - rust-lang#101204 (rustdoc: Resugar async fn return type in `clean`, not `html`) - rust-lang#101216 (Use in-page links for sanitizer docs.) - rust-lang#101237 (fix into_iter on ZST) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

…phize, r=davidtwco Migrate rustc_monomorphize to use SessionDiagnostic ### Description - Migrates diagnostics in `rustc_monomorphize` to use `SessionDiagnostic` - Adds an `impl IntoDiagnosticArg for PathBuf` ### TODO / Help! - [x] I'm having trouble figuring out how to apply an optional note. 😕 Help!? - Resolved. It was bad docs. Fixed in https://github.com/rust-lang/rustc-dev-guide/pull/1437/files - [x] `errors:RecursionLimit` should be `#[fatal ...]`, but that doesn't exist so it's `#[error ...]` at the moment. - Maybe I can switch after this is merged in? --> rust-lang#100694 - Or maybe I need to manually implement `SessionDiagnostic` instead of deriving it? - [x] How does one go about converting an error inside of [a call to struct_span_lint_hir](https://github.com/rust-lang/rust/blob/8064a495086c2e63c0ef77e8e82fe3b9b5dc535f/compiler/rustc_monomorphize/src/collector.rs#L917-L927)? - [x] ~What placeholder do you use in the fluent template to refer to the value in a vector? It seems like [this code](https://github.com/rust-lang/rust/blob/0b79f758c9aa6646606662a6d623a0752286cd17/compiler/rustc_macros/src/diagnostics/diagnostic_builder.rs#L83-L114) ought to have the answer (or something near it)...but I can't figure it out.~ You can't. Punted.

rust-highfive assigned estebank Aug 18, 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 18, 2022

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

CleanCut mentioned this pull request Aug 18, 2022

Diagnostic Translation #100717

Open

84 tasks

compiler-errors reviewed Aug 18, 2022

View reviewed changes

compiler/rustc_monomorphize/src/errors.rs Outdated Show resolved Hide resolved

CleanCut mentioned this pull request Aug 18, 2022

Fix incorrect #[note] syntax rust-lang/rustc-dev-guide#1437

Merged

This comment has been minimized.

Sign in to view

CleanCut force-pushed the diagnostics-rustc_monomorphize branch from 70d79b0 to 2984519 Compare August 18, 2022 23:41

This comment has been minimized.

Sign in to view

CleanCut mentioned this pull request Aug 19, 2022

Add missing lifetime rust-lang/rustc-dev-guide#1439

Merged

CleanCut marked this pull request as ready for review August 19, 2022 00:54

compiler-errors reviewed Aug 19, 2022

View reviewed changes

compiler/rustc_monomorphize/src/partitioning/mod.rs Outdated Show resolved Hide resolved

compiler-errors reviewed Aug 19, 2022

View reviewed changes

compiler/rustc_monomorphize/src/errors.rs Outdated Show resolved Hide resolved

compiler-errors reviewed Aug 19, 2022

View reviewed changes

compiler/rustc_monomorphize/src/errors.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

davidtwco reviewed Aug 19, 2022

View reviewed changes

compiler/rustc_monomorphize/src/errors.rs Outdated Show resolved Hide resolved

Xiretza mentioned this pull request Aug 19, 2022

Kind-less SessionDiagnostic derive #100765

Merged

This comment was marked as resolved.

Sign in to view

CleanCut added 7 commits August 25, 2022 11:06

rebased: convert rustc_monomorphize errors to SessionDiagnostic

137f20c

replace some usages of [Span]FatalError with error-specific types

40f4473

remove stray comment

33cbbc2

bless the change in note/help order due to migrating to SessionDiagno…

e914247

…stic

allow non-monomorphize modules to access hard-coded error message thr…

30c7506

…ough new struct, use fluent message in monomorphize

adjust to new error value

6cdfdd0

have LangItemError derive everything LangItem does

82d609c

CleanCut force-pushed the diagnostics-rustc_monomorphize branch from 71ac469 to 82d609c Compare August 25, 2022 17:07

davidtwco reviewed Aug 26, 2022

View reviewed changes

compiler/rustc_monomorphize/src/polymorphize.rs Outdated Show resolved Hide resolved

CleanCut added 2 commits August 26, 2022 11:45

remove unnecessary comment

a19139f

revert src/tools/cargo submodule to where it ought to be from where w…

845d567

…e rebased

davidtwco approved these changes Aug 31, 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 31, 2022

GuillaumeGomez mentioned this pull request Aug 31, 2022

Rollup of 6 pull requests #101233

Closed

RalfJung mentioned this pull request Aug 31, 2022

Rollup of 7 pull requests #101238

Merged

bors merged commit 6c4bda6 into rust-lang:master Aug 31, 2022

rustbot added this to the 1.65.0 milestone Aug 31, 2022

CleanCut deleted the diagnostics-rustc_monomorphize branch August 31, 2022 16:53

rust-timer mentioned this pull request Oct 24, 2022

Rollup of 7 pull requests #103471

Merged

Migrate rustc_monomorphize to use SessionDiagnostic #100730

Migrate rustc_monomorphize to use SessionDiagnostic #100730

Uh oh!

Conversation

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

Uh oh!

Description

TODO / Help!

Uh oh!

rust-highfive commented Aug 18, 2022

Uh oh!

Uh oh!

JeanCASPAR commented Aug 18, 2022

Uh oh!

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

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rustbot commented Aug 19, 2022

Uh oh!

CleanCut commented Aug 19, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

davidtwco commented Aug 19, 2022

Uh oh!

Uh oh!

This comment was marked as resolved.

rustbot commented Aug 25, 2022

Uh oh!

CleanCut commented Aug 25, 2022

Uh oh!

davidtwco left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

CleanCut commented Aug 26, 2022

Uh oh!

davidtwco commented Aug 31, 2022

Uh oh!

bors commented Aug 31, 2022

Uh oh!

klensy commented Aug 31, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

CleanCut commented Aug 18, 2022 •

edited

Loading

CleanCut commented Aug 18, 2022 •

edited

Loading