bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Use fallback fluent bundle from inner emitter in SilentEmitter

Browse source
This commit is contained in:
bjorn3 2025-02-02 15:36:28 +00:00
parent aa2b870bb5
commit 6556147d15
4 changed files with 6 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_errors/src/emitter.rs
View file

@ -540,7 +540,6 @@ impl Emitter for HumanEmitter {
/// Fatal diagnostics are forwarded to `fatal_emitter` to avoid silent
/// failures of rustc, as witnessed e.g. in issue #89358.
pub struct SilentEmitter {
pub fallback_bundle: LazyFallbackBundle,
pub fatal_emitter: Box<dyn Emitter + DynSend>,
pub fatal_note: Option<String>,
pub emit_fatal_diagnostic: bool,
@ -552,9 +551,7 @@ impl Translate for SilentEmitter {
}
fn fallback_fluent_bundle(&self) -> &FluentBundle {
// Ideally this field wouldn't be necessary and the fallback bundle in `fatal_dcx` would be
// used but the lock prevents this.
&self.fallback_bundle
self.fatal_emitter.fallback_fluent_bundle()
}
}

8
compiler/rustc_errors/src/lib.rs
View file

@ -676,12 +676,7 @@ impl DiagCtxt {
Self { inner: Lock::new(DiagCtxtInner::new(emitter)) }
}
pub fn make_silent(
&self,
fallback_bundle: LazyFallbackBundle,
fatal_note: Option<String>,
emit_fatal_diagnostic: bool,
) {
pub fn make_silent(&self, fatal_note: Option<String>, emit_fatal_diagnostic: bool) {
// An empty type that implements `Emitter` to temporarily swap in place of the real one,
// which will be used in constructing its replacement.
struct FalseEmitter;
@ -710,7 +705,6 @@ impl DiagCtxt {
let mut prev_emitter = Box::new(FalseEmitter) as Box<dyn Emitter + DynSend>;
std::mem::swap(&mut inner.emitter, &mut prev_emitter);
let new_emitter = Box::new(emitter::SilentEmitter {
fallback_bundle,
fatal_emitter: prev_emitter,
fatal_note,
emit_fatal_diagnostic,