bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make Handler::{err,bug} more like Handler::{warn,note}.

Browse source
This commit is contained in:
Nicholas Nethercote 2023-12-04 14:48:11 +11:00
parent 883bdb7fda
commit 3ab05caa4d
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1096,10 +1096,7 @@ impl Handler {
#[rustc_lint_diagnostics] #[rustc_lint_diagnostics]
pub fn err(&self, msg: impl Into<DiagnosticMessage>) -> ErrorGuaranteed { pub fn err(&self, msg: impl Into<DiagnosticMessage>) -> ErrorGuaranteed {
self.inner DiagnosticBuilder::<ErrorGuaranteed>::new(self, Error { lint: false }, msg).emit()
.borrow_mut()
.emit_diagnostic(&mut Diagnostic::new(Error { lint: false }, msg))
.unwrap()
} }
#[rustc_lint_diagnostics] #[rustc_lint_diagnostics]
@ -1113,7 +1110,8 @@ impl Handler {
} }
pub fn bug(&self, msg: impl Into<DiagnosticMessage>) -> ! { pub fn bug(&self, msg: impl Into<DiagnosticMessage>) -> ! {
self.inner.borrow_mut().bug(msg) DiagnosticBuilder::<diagnostic_builder::Bug>::new(self, Bug, msg).emit();
panic::panic_any(ExplicitBug);
} }
#[inline] #[inline]
@ -1601,11 +1599,6 @@ impl HandlerInner {
FatalError FatalError
} }
fn bug(&mut self, msg: impl Into<DiagnosticMessage>) -> ! {
self.emit_diagnostic(&mut Diagnostic::new(Bug, msg));
panic::panic_any(ExplicitBug);
}
fn flush_delayed( fn flush_delayed(
&mut self, &mut self,
bugs: impl IntoIterator<Item = DelayedDiagnostic>, bugs: impl IntoIterator<Item = DelayedDiagnostic>,