mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #122737 - ytmimi:conditionally_ignore_fatal_diagnostic, r=davidtwco

Browse Source 
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 #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 https://github.com/rust-lang/rustfmt/issues/6109.

These changes allow rustfmt to maintain its previous behaviour when using the `SilentEmitter`, while allowing rustc code to still emit fatal diagnostics.
This commit is contained in:
Matthias Krüger 2024-03-24 17:08:15 +01:00 committed by GitHub
commit 5e141e034c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/parse/session.rs
View File

@ -121,6 +121,7 @@ fn default_dcx(
fallback_bundle, fallback_bundle,
fatal_dcx: DiagCtxt::new(emitter), fatal_dcx: DiagCtxt::new(emitter),
fatal_note: None, fatal_note: None,
emit_fatal_diagnostic: false,
}) })
} else { } else {
emitter emitter
@ -209,7 +210,7 @@ impl ParseSess {
rustc_driver::DEFAULT_LOCALE_RESOURCES.to_vec(), rustc_driver::DEFAULT_LOCALE_RESOURCES.to_vec(),
false, false,
); );
self.raw_psess.dcx.make_silent(fallback_bundle, None); self.raw_psess.dcx.make_silent(fallback_bundle, None, false);
} }
pub(crate) fn span_to_filename(&self, span: Span) -> FileName { pub(crate) fn span_to_filename(&self, span: Span) -> FileName {