Skip to content

Migrate rustc_interface diagnostics - #100808

Merged
bors merged 6 commits into
rust-lang:masterfrom
SkiFire13:migrate_diagnostics_rustc_interface
Aug 25, 2022
Merged

Migrate rustc_interface diagnostics #100808
bors merged 6 commits into
rust-lang:masterfrom
SkiFire13:migrate_diagnostics_rustc_interface

Conversation

@SkiFire13

@SkiFire13SkiFire13 commented Aug 20, 2022•
edited
Loading

Copy link
Copy Markdown
Contributor

@rustbot label +A-translation

r? rust-lang/diagnostics
cc #100717

@rustbotrustbot 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 20, 2022
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 20, 2022
@rustbot

rustbot commented Aug 20, 2022

Copy link
Copy Markdown
Collaborator

rustc_macros::diagnostics was changed

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

rustc_error_messages was changed

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

@SkiFire13
SkiFire13force-pushed the migrate_diagnostics_rustc_interface branch from f349490 to 674ddc8CompareAugust 20, 2022 17:16
@rustbot

rustbot commented Aug 20, 2022

Copy link
Copy Markdown
Collaborator

Changes rustc_apfloat. rustc_apfloat is currently in limbo and you almost certainly don't want to change it (see #55993).

cc @eddyb

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred in HTML/CSS themes.

cc @GuillaumeGomez

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

The Miri submodule was changed

cc @rust-lang/miri

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez, @Folyd, @jsha

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred in src/librustdoc/clean/types.rs

cc @camelid

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

A change occurred in the Ayu theme.

cc @Cldfire

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

@SkiFire13

SkiFire13 commented Aug 20, 2022

Copy link
Copy Markdown
ContributorAuthor

Looks like fatal was already implemented in #100694, I'm gonna rebase on it for now. It won't build due to #100694 (comment)

Blocked on #100694
@rustbot label +S-blocked

@rustbotrustbot added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Aug 20, 2022
@SkiFire13SkiFire13 changed the title Implement fatal in SessionDiagnostic derive macro and migrate rustc_interface diagnostics Migrate rustc_interface diagnostics Aug 20, 2022
@bjorn3

bjorn3 commented Aug 20, 2022

Copy link
Copy Markdown
Member

This contains unrelated changes.

@SkiFire13
SkiFire13force-pushed the migrate_diagnostics_rustc_interface branch from 674ddc8 to 5839b06CompareAugust 20, 2022 17:18
@SkiFire13

SkiFire13 commented Aug 20, 2022

Copy link
Copy Markdown
ContributorAuthor

I messed up the rebase, now it should only contain the commits from #100694 and this PR.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@SkiFire13
SkiFire13force-pushed the migrate_diagnostics_rustc_interface branch from 5839b06 to 4316eb9CompareAugust 20, 2022 17:41
@SkiFire13
SkiFire13 marked this pull request as draft August 20, 2022 17:49
@bors

bors commented Aug 21, 2022

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #100765) made this pull request unmergeable. Please resolve the merge conflicts.

@SkiFire13
SkiFire13force-pushed the migrate_diagnostics_rustc_interface branch from 4316eb9 to 1df9fdeCompareAugust 21, 2022 16:41
@SkiFire13
SkiFire13force-pushed the migrate_diagnostics_rustc_interface branch from 1df9fde to f07ff77CompareAugust 22, 2022 11:20
@SkiFire13
SkiFire13force-pushed the migrate_diagnostics_rustc_interface branch from f07ff77 to ccc1a4bCompareAugust 22, 2022 11:22
@SkiFire13
SkiFire13 marked this pull request as ready for review August 22, 2022 12:11
@SkiFire13

SkiFire13 commented Aug 22, 2022

Copy link
Copy Markdown
ContributorAuthor

@rustbot label -S-blocked

@rustbotrustbot removed the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Aug 22, 2022
davidtwco
davidtwco reviewed Aug 22, 2022
View reviewed changes

@davidtwcodavidtwco left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This looks good to me, left some comments, just need to wait on #[fatal(..)] support now :)

Comment threadcompiler/rustc_error_messages/locales/en-US/interface.ftl Outdated
Comment threadcompiler/rustc_interface/src/passes.rs Outdated
@SkiFire13

SkiFire13 commented Aug 22, 2022

Copy link
Copy Markdown
ContributorAuthor

just need to wait on #[fatal(..)] support now :)

#100765 already changed it to a generic #[diag(...)] and #100694 has already been merged, adding emit_fatal.

@davidtwco@SkiFire13
errors: IntoDiagnosticArg for io::Error/paths
0d80ee7
Add impls of `IntoDiagnosticArg` for `std::io::Error`, `std::path::Path`
and `std::path::PathBuf`.
Signed-off-by: David Wood <david.wood@huawei.com>
@davidtwco

davidtwco commented Aug 23, 2022

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Aug 23, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 645de5b has been approved by davidtwco

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 Aug 23, 2022
@davidtwcodavidtwco mentioned this pull request Aug 23, 2022
Open
84 tasks
@JohnTitorJohnTitor mentioned this pull request Aug 24, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 25, 2022
@bors
Auto merge ofrust-lang#100977- JohnTitor:rollup-8hc7rxh, r=JohnTitor
9b9bc63
Rollup of 8 pull requests
Successful merges:
- rust-lang#99332 (Stabilize `#![feature(label_break_value)]`)
- rust-lang#99954 (let-else: break out to one scope higher for let-else)
- rust-lang#100188 (Parser will not suggest invalid expression when use public)
- rust-lang#100780 (save_analysis: Migrate diagnostic)
- rust-lang#100808 (Migrate `rustc_interface` diagnostics )
- rust-lang#100921 (Add a warning about `Option/Result::and()` being eagerly evaluated)
- rust-lang#100960 (rustdoc: ayu code color selector more specific)
- rust-lang#100964 (Sync rustc_codegen_cranelift)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 0fd4a74 into rust-lang:masterAug 25, 2022
@rustbotrustbot added this to the 1.65.0 milestone Aug 25, 2022
@SkiFire13
SkiFire13 deleted the migrate_diagnostics_rustc_interface branch August 25, 2022 06:37
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@davidtwcodavidtwcodavidtwco approved these changes

Assignees

@estebankestebank

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

Milestone

1.65.0

Development

Successfully merging this pull request may close these issues.

8 participants

@SkiFire13@rustbot@bjorn3@rust-log-analyzer@bors@davidtwco@estebank@rust-highfive