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

Take Diagnostic in Handler::emit_diagnostic

Browse source
This commit is contained in:
Mark Rousskov 2019-09-07 10:03:15 -04:00
parent cdd805506e
commit 0b586b436d
3 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/librustc_errors/lib.rs
View file

@ -589,7 +589,7 @@ impl Handler {
}
fn delay_as_bug(&self, diagnostic: Diagnostic) {
if self.flags.report_delayed_bugs {
DiagnosticBuilder::new_diagnostic(self, diagnostic.clone()).emit();
self.emit_diagnostic(&diagnostic);
}
self.delayed_span_bugs.borrow_mut().push(diagnostic);
}
@ -747,8 +747,10 @@ impl Handler {
db.cancel();
}
fn emit_db(&self, db: &DiagnosticBuilder<'_>) {
let diagnostic = &**db;
fn emit_diagnostic(&self, diagnostic: &Diagnostic) {
if diagnostic.cancelled() {
return;
}
TRACK_DIAGNOSTICS.with(|track_diagnostics| {
track_diagnostics.get()(diagnostic);
@ -768,12 +770,12 @@ impl Handler {
// Only emit the diagnostic if we haven't already emitted an equivalent
// one:
if self.emitted_diagnostics.borrow_mut().insert(diagnostic_hash) {
self.emitter.borrow_mut().emit_diagnostic(db);
if db.is_error() {
self.emitter.borrow_mut().emit_diagnostic(diagnostic);
if diagnostic.is_error() {
self.deduplicated_err_count.fetch_add(1, SeqCst);
}
}
if db.is_error() {
if diagnostic.is_error() {
self.bump_err_count();
}
}