bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #121301 - davidtwco:rustfmt-silent-emitter, r=pnkfelix

Browse source 
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 commit is contained in:
Matthias Krüger 2024-03-05 19:53:18 +01:00 • committed by GitHub
commit 9153451a91
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 131 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/rustc_session/src/parse.rs
View file

@ -265,14 +265,20 @@ impl ParseSess {
}
}
pub fn with_silent_emitter(fatal_note: String) -> Self {
let fallback_bundle = fallback_fluent_bundle(Vec::new(), false);
pub fn with_silent_emitter(locale_resources: Vec<&'static str>, fatal_note: String) -> Self {
let fallback_bundle = fallback_fluent_bundle(locale_resources, false);
let sm = Lrc::new(SourceMap::new(FilePathMapping::empty()));
let emitter =
Box::new(HumanEmitter::new(stderr_destination(ColorConfig::Auto), fallback_bundle));
let emitter = Box::new(HumanEmitter::new(
stderr_destination(ColorConfig::Auto),
fallback_bundle.clone(),
));
let fatal_dcx = DiagCtxt::new(emitter);
let dcx =
DiagCtxt::new(Box::new(SilentEmitter { fatal_dcx, fatal_note })).disable_warnings();
let dcx = DiagCtxt::new(Box::new(SilentEmitter {
fallback_bundle,
fatal_dcx,
fatal_note: Some(fatal_note),
}))
.disable_warnings();
ParseSess::with_dcx(dcx, sm)
}