diff options
Diffstat (limited to 'src/librustc_errors')
| -rw-r--r-- | src/librustc_errors/emitter.rs | 4 | ||||
| -rw-r--r-- | src/librustc_errors/lib.rs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs index ab331239cdb..697f9687b0a 100644 --- a/src/librustc_errors/emitter.rs +++ b/src/librustc_errors/emitter.rs @@ -29,7 +29,7 @@ use term; /// implement `CoreEmitter` instead. pub trait Emitter { /// Emit a structured diagnostic. - fn emit_struct(&mut self, db: &DiagnosticBuilder); + fn emit(&mut self, db: &DiagnosticBuilder); } pub trait CoreEmitter { @@ -43,7 +43,7 @@ pub trait CoreEmitter { } impl<T: CoreEmitter> Emitter for T { - fn emit_struct(&mut self, db: &DiagnosticBuilder) { + fn emit(&mut self, db: &DiagnosticBuilder) { let old_school = check_old_skool(); let db_span = FullSpan(db.span.clone()); self.emit_message(&FullSpan(db.span.clone()), diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs index e3e63341ee9..7c14c132382 100644 --- a/src/librustc_errors/lib.rs +++ b/src/librustc_errors/lib.rs @@ -238,7 +238,7 @@ impl<'a> DiagnosticBuilder<'a> { return; } - self.handler.emit.borrow_mut().emit_struct(&self); + self.handler.emitter.borrow_mut().emit(&self); self.cancel(); self.handler.panic_if_treat_err_as_bug(); @@ -420,7 +420,7 @@ impl<'a> Drop for DiagnosticBuilder<'a> { /// others log errors for later reporting. pub struct Handler { err_count: Cell<usize>, - emit: RefCell<Box<Emitter>>, + emitter: RefCell<Box<Emitter>>, pub can_emit_warnings: bool, treat_err_as_bug: bool, continue_after_error: Cell<bool>, @@ -444,7 +444,7 @@ impl Handler { e: Box<Emitter>) -> Handler { Handler { err_count: Cell::new(0), - emit: RefCell::new(e), + emitter: RefCell::new(e), can_emit_warnings: can_emit_warnings, treat_err_as_bug: treat_err_as_bug, continue_after_error: Cell::new(true), |