Skip to content

errors: share SilentEmitter between rustc and rustfmt#121301

Merged
bors merged 1 commit intorust-lang:masterfrom
davidtwco:rustfmt-silent-emitter
Mar 6, 2024
Merged

errors: share SilentEmitter between rustc and rustfmt#121301
bors merged 1 commit intorust-lang:masterfrom
davidtwco:rustfmt-silent-emitter

Conversation

@davidtwco
Copy link
Member

@davidtwco davidtwco commented Feb 19, 2024

Fixes rust-lang/rustfmt#6082.

Shares the SilentEmitter between rustc and rustfmt, and gives it a fallback bundle (since it can emit diagnostics in some contexts).

@rustbot
Copy link
Collaborator

rustbot commented Feb 19, 2024

r? @pnkfelix

rustbot has assigned @pnkfelix.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added 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 Feb 19, 2024
@rustbot
Copy link
Collaborator

rustbot commented Feb 19, 2024

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

davidtwco
davidtwco commented Feb 19, 2024
View reviewed changes
compiler/rustc_errors/src/emitter.rs
) -> Result<Cow<'_, str>, TranslateError<'_>> {
silent_translate(message)
// Ideally this field wouldn't be necessary and the fallback bundle in `fatal_dcx` would be
// used but the lock prevents this.
Copy link
Member Author

@davidtwco davidtwco Feb 19, 2024

Choose a reason for hiding this comment

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

Would appreciate any suggestions for how to work around this..

compiler-errors
compiler-errors reviewed Feb 19, 2024
View reviewed changes
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@davidtwco davidtwco force-pushed the rustfmt-silent-emitter branch from 273c4a5 to c5d8679 Compare February 20, 2024 09:45
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

This comment was marked as resolved.

Sign in to view
@davidtwco davidtwco mentioned this pull request Feb 21, 2024
Merged
@davidtwco davidtwco force-pushed the rustfmt-silent-emitter branch from c5d8679 to 4edb5fa Compare February 21, 2024 09:59
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@davidtwco davidtwco force-pushed the rustfmt-silent-emitter branch from 4edb5fa to d420015 Compare February 21, 2024 10:41
ytmimi
ytmimi reviewed Feb 21, 2024
View reviewed changes
ytmimi
ytmimi reviewed Feb 21, 2024
View reviewed changes
@ytmimi ytmimi mentioned this pull request Feb 23, 2024
Merged
@DaniPopes DaniPopes mentioned this pull request Feb 26, 2024
Closed
@calebcartwright calebcartwright mentioned this pull request Feb 27, 2024
Closed
@bors

This comment was marked as resolved.

Sign in to view
@davidtwco davidtwco force-pushed the rustfmt-silent-emitter branch 2 times, most recently from 7369d68 to 4da2abf Compare March 4, 2024 16:18
ytmimi
ytmimi approved these changes Mar 4, 2024
View reviewed changes
Copy link
Contributor

@ytmimi ytmimi left a comment

Choose a reason for hiding this comment

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

rustfmt changes look good to me 👍🏼

@bors

This comment was marked as resolved.

Sign in to view
@davidtwco
errors: share SilentEmitter between rustc and rustfmt
2ee0409 
Signed-off-by: David Wood <david@davidtw.co>
@davidtwco davidtwco force-pushed the rustfmt-silent-emitter branch from 4da2abf to 2ee0409 Compare March 5, 2024 10:15
@pnkfelix
Copy link
Contributor

pnkfelix commented Mar 5, 2024

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 5, 2024

📌 Commit 2ee0409 has been approved by pnkfelix

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 5, 2024
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 5, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 5, 2024
@matthiaskrgr
Rollup merge of rust-lang#121301 - davidtwco:rustfmt-silent-emitter, …
e4da0d3 
…r=pnkfelix

errors: share `SilentEmitter` between rustc and rustfmt

Fixes rust-lang/rustfmt#6082.

Shares the `SilentEmitter` between rustc and rustfmt, and gives it a fallback bundle (since it can emit diagnostics in some contexts).
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 5, 2024
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 5, 2024
@matthiaskrgr
Rollup merge of rust-lang#121301 - davidtwco:rustfmt-silent-emitter, …
15a6822 
…r=pnkfelix

errors: share `SilentEmitter` between rustc and rustfmt

Fixes rust-lang/rustfmt#6082.

Shares the `SilentEmitter` between rustc and rustfmt, and gives it a fallback bundle (since it can emit diagnostics in some contexts).
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 5, 2024
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 5, 2024
@matthiaskrgr
Rollup merge of rust-lang#121301 - davidtwco:rustfmt-silent-emitter, …
201078a 
…r=pnkfelix

errors: share `SilentEmitter` between rustc and rustfmt

Fixes rust-lang/rustfmt#6082.

Shares the `SilentEmitter` between rustc and rustfmt, and gives it a fallback bundle (since it can emit diagnostics in some contexts).
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 5, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 5, 2024
@bors
Auto merge of rust-lang#122033 - matthiaskrgr:rollup-t8g7wp1, r=matth…
270922f 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#121065 (Add basic i18n guidance for `Display`)
 - rust-lang#121301 (errors: share `SilentEmitter` between rustc and rustfmt)
 - rust-lang#121744 (Stop using Bubble in coherence and instead emulate it with an intercrate check)
 - rust-lang#121829 (Dummy tweaks (attempt 2))
 - rust-lang#121857 (Implement async closure signature deduction)
 - rust-lang#121894 (const_eval_select: make it safe but be careful with what we expose on stable for now)
 - rust-lang#121905 (Add a `description` field to target definitions)
 - rust-lang#122022 (loongarch: add frecipe and relax target feature)
 - rust-lang#122028 (Remove some dead code)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 5, 2024
@matthiaskrgr
Rollup merge of rust-lang#121301 - davidtwco:rustfmt-silent-emitter, …
8aa21bd 
…r=pnkfelix

errors: share `SilentEmitter` between rustc and rustfmt

Fixes rust-lang/rustfmt#6082.

Shares the `SilentEmitter` between rustc and rustfmt, and gives it a fallback bundle (since it can emit diagnostics in some contexts).
This was referenced Mar 5, 2024
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 5, 2024
@bors
Auto merge of rust-lang#122041 - matthiaskrgr:rollup-imsmdke, r=matth…
4cb986b 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#121202 (Limit the number of names and values in check-cfg diagnostics)
 - rust-lang#121301 (errors: share `SilentEmitter` between rustc and rustfmt)
 - rust-lang#121658 (Hint user to update nightly on ICEs produced from outdated nightly)
 - rust-lang#121846 (only compare ambiguity item that have hard error)
 - rust-lang#121961 (add test for rust-lang#78894 rust-lang#71450)
 - rust-lang#121975 (hir_analysis: enums return `None` in `find_field`)
 - rust-lang#121978 (Fix duplicated path in the "not found dylib" error)
 - rust-lang#121991 (Merge impl_trait_in_assoc_types_defined_by query back into `opaque_types_defined_by`)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 6, 2024
@bors
Auto merge of rust-lang#122041 - matthiaskrgr:rollup-imsmdke, r=matth…
62415e2 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#121202 (Limit the number of names and values in check-cfg diagnostics)
 - rust-lang#121301 (errors: share `SilentEmitter` between rustc and rustfmt)
 - rust-lang#121658 (Hint user to update nightly on ICEs produced from outdated nightly)
 - rust-lang#121846 (only compare ambiguity item that have hard error)
 - rust-lang#121961 (add test for rust-lang#78894 rust-lang#71450)
 - rust-lang#121975 (hir_analysis: enums return `None` in `find_field`)
 - rust-lang#121978 (Fix duplicated path in the "not found dylib" error)
 - rust-lang#121991 (Merge impl_trait_in_assoc_types_defined_by query back into `opaque_types_defined_by`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9153451 into rust-lang:master Mar 6, 2024
@rustbot rustbot added this to the 1.78.0 milestone Mar 6, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 6, 2024
@rust-timer
Unrolled build for rust-lang#121301
519e50e 
Rollup merge of rust-lang#121301 - davidtwco:rustfmt-silent-emitter, r=pnkfelix

errors: share `SilentEmitter` between rustc and rustfmt

Fixes rust-lang/rustfmt#6082.

Shares the `SilentEmitter` between rustc and rustfmt, and gives it a fallback bundle (since it can emit diagnostics in some contexts).
@davidtwco davidtwco deleted the rustfmt-silent-emitter branch March 6, 2024 12:48
@ytmimi
Copy link
Contributor

ytmimi commented Mar 8, 2024

@davidtwco thanks again for working on this fix. I've got confirmation that rust-lang/rustfmt#6082 is resolved!

This was referenced Mar 19, 2024
Closed
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 24, 2024
@matthiaskrgr
Rollup merge of rust-lang#122737 - ytmimi:conditionally_ignore_fatal_…
388da0a 
…diagnostic, r=davidtwco

conditionally ignore fatal diagnostic in the SilentEmitter

This change is primarily meant to allow rustfmt to ignore all diagnostics when using the `SilentEmitter`. Back in rust-lang#121301 the `SilentEmitter` was shared between rustc and rustfmt. This changed rustfmt's behavior from ignoring all diagnostic to emitting fatal diagnostics, which lead to rust-lang/rustfmt#6109.

These changes allow rustfmt to maintain its previous behaviour when using the `SilentEmitter`, while allowing rustc code to still emit fatal diagnostics.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 24, 2024
@matthiaskrgr
Rollup merge of rust-lang#122737 - ytmimi:conditionally_ignore_fatal_…
3fe9f66 
…diagnostic, r=davidtwco

conditionally ignore fatal diagnostic in the SilentEmitter

This change is primarily meant to allow rustfmt to ignore all diagnostics when using the `SilentEmitter`. Back in rust-lang#121301 the `SilentEmitter` was shared between rustc and rustfmt. This changed rustfmt's behavior from ignoring all diagnostic to emitting fatal diagnostics, which lead to rust-lang/rustfmt#6109.

These changes allow rustfmt to maintain its previous behaviour when using the `SilentEmitter`, while allowing rustc code to still emit fatal diagnostics.
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 24, 2024
@rust-timer
Unrolled build for rust-lang#122737
8d8e7b6 
Rollup merge of rust-lang#122737 - ytmimi:conditionally_ignore_fatal_diagnostic, r=davidtwco

conditionally ignore fatal diagnostic in the SilentEmitter

This change is primarily meant to allow rustfmt to ignore all diagnostics when using the `SilentEmitter`. Back in rust-lang#121301 the `SilentEmitter` was shared between rustc and rustfmt. This changed rustfmt's behavior from ignoring all diagnostic to emitting fatal diagnostics, which lead to rust-lang/rustfmt#6109.

These changes allow rustfmt to maintain its previous behaviour when using the `SilentEmitter`, while allowing rustc code to still emit fatal diagnostics.
RenjiSann pushed a commit to RenjiSann/rust that referenced this pull request Mar 25, 2024
@matthiaskrgr @RenjiSann
Rollup merge of rust-lang#122737 - ytmimi:conditionally_ignore_fatal_…
177b99e 
…diagnostic, r=davidtwco

conditionally ignore fatal diagnostic in the SilentEmitter

This change is primarily meant to allow rustfmt to ignore all diagnostics when using the `SilentEmitter`. Back in rust-lang#121301 the `SilentEmitter` was shared between rustc and rustfmt. This changed rustfmt's behavior from ignoring all diagnostic to emitting fatal diagnostics, which lead to rust-lang/rustfmt#6109.

These changes allow rustfmt to maintain its previous behaviour when using the `SilentEmitter`, while allowing rustc code to still emit fatal diagnostics.
calebcartwright pushed a commit to calebcartwright/rust that referenced this pull request Jun 22, 2024
@matthiaskrgr
Rollup merge of rust-lang#122737 - ytmimi:conditionally_ignore_fatal_…
5e141e0 
…diagnostic, r=davidtwco

conditionally ignore fatal diagnostic in the SilentEmitter

This change is primarily meant to allow rustfmt to ignore all diagnostics when using the `SilentEmitter`. Back in rust-lang#121301 the `SilentEmitter` was shared between rustc and rustfmt. This changed rustfmt's behavior from ignoring all diagnostic to emitting fatal diagnostics, which lead to rust-lang/rustfmt#6109.

These changes allow rustfmt to maintain its previous behaviour when using the `SilentEmitter`, while allowing rustc code to still emit fatal diagnostics.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@calebcartwright calebcartwright calebcartwright left review comments

@ytmimi ytmimi ytmimi approved these changes

+2 more reviewers

@pnkfelix pnkfelix pnkfelix left review comments

@compiler-errors compiler-errors compiler-errors left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@pnkfelix pnkfelix

Labels

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.78.0

Development

Successfully merging this pull request may close these issues.

thread 'main' panicked at src/tools/rustfmt/src/parse/session.rs:42:9: silent emitter attempted to translate a diagnostic

8 participants

@davidtwco @rustbot @rust-log-analyzer @bors @pnkfelix @ytmimi @compiler-errors @calebcartwright