From 911f6a438f1e6e6b1e80b56be638e6c193ec93ef Mon Sep 17 00:00:00 2001
From: Yacin Tmimi <yacintmimi@gmail.com>
Date: Tue, 19 Mar 2024 12:58:23 -0400
Subject: [PATCH] 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 PR 121301 the
`SilentEmitter` was shared between rustc and rustfmt. This changed
rustfmt's behavior from ignoring all diagnostic to emitting fatal
diagnostics.
These changes allow rustfmt to maintain it's previous behaviour when
using the SilentEmitter, while allowing rustc code to still emit fatal
diagnostics.
---
src/parse/session.rs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/parse/session.rs b/src/parse/session.rs
index cb46e65999df6..1a39d212386bd 100644
--- a/src/parse/session.rs
+++ b/src/parse/session.rs
@@ -121,6 +121,7 @@ fn default_dcx(
fallback_bundle,
fatal_dcx: DiagCtxt::new(emitter),
fatal_note: None,
+ emit_fatal_diagnostic: false,
})
} else {
emitter
@@ -209,7 +210,7 @@ impl ParseSess {
rustc_driver::DEFAULT_LOCALE_RESOURCES.to_vec(),
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 {