bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #93229 - mark-i-m:noquiet, r=eddyb

Browse source 
Remove DiagnosticBuilder.quiet

r? `@eddyb`

cc https://github.com/rust-lang/rust/issues/69426 `@GuillaumeGomez` `@Manishearth`
This commit is contained in:
Matthias Krüger 2022-01-23 20:13:07 +01:00 • committed by GitHub
commit a1645e5b57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -445,9 +445,6 @@ struct HandlerInner {
deduplicated_warn_count: usize,
future_breakage_diagnostics: Vec<Diagnostic>,
/// If set to `true`, no warning or error will be emitted.
quiet: bool,
}
/// A key denoting where from a diagnostic was stashed.
@ -563,19 +560,10 @@ impl Handler {
emitted_diagnostics: Default::default(),
stashed_diagnostics: Default::default(),
future_breakage_diagnostics: Vec::new(),
quiet: false,
}),
}
}
pub fn with_disabled_diagnostic<T, F: FnOnce() -> T>(&self, f: F) -> T {
let prev = self.inner.borrow_mut().quiet;
self.inner.borrow_mut().quiet = true;
let ret = f();
self.inner.borrow_mut().quiet = prev;
ret
}
// This is here to not allow mutation of flags;
// as of this writing it's only used in tests in librustc_middle.
pub fn can_emit_warnings(&self) -> bool {
@ -946,7 +934,7 @@ impl HandlerInner {
}
fn emit_diagnostic(&mut self, diagnostic: &Diagnostic) {
if diagnostic.cancelled() || self.quiet {
if diagnostic.cancelled() {
return;
}
@ -1170,9 +1158,6 @@ impl HandlerInner {
}
fn delay_as_bug(&mut self, diagnostic: Diagnostic) {
if self.quiet {
return;
}
if self.flags.report_delayed_bugs {
self.emit_diagnostic(&diagnostic);
}