Rename emit_struct->emit

diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs
index ab331239cdbaf0f859710c15ddeaba8e2cc1e2f1..697f9687b0a15bf47466b8fa12afbe17493a1a07 100644 (file)
--- a/src/librustc_errors/emitter.rs
+++ b/src/librustc_errors/emitter.rs
@@ -29,7 +29,7 @@
 /// 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 @@ fn emit_message(&mut self,
 }
 
 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 e3e63341ee9065a47fe5352f164f836974a75dde..7c14c132382e770984035967307987422445b3c9 100644 (file)
--- a/src/librustc_errors/lib.rs
+++ b/src/librustc_errors/lib.rs
@@ -238,7 +238,7 @@ pub fn emit(&mut self) {
             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 @@ fn drop(&mut self) {
 /// 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 @@ pub fn with_emitter(can_emit_warnings: bool,
                         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),

diff --git a/src/libsyntax/json.rs b/src/libsyntax/json.rs
index 20908453e73e0ff2e7bdeaf8138a8189d5d4087b..a40c30b3e3397fe61d6175a21e5ab9f56bd8bbad 100644 (file)
--- a/src/libsyntax/json.rs
+++ b/src/libsyntax/json.rs
@@ -53,7 +53,7 @@ pub fn stderr(registry: Option<Registry>,
 }
 
 impl Emitter for JsonEmitter {
-    fn emit_struct(&mut self, db: &DiagnosticBuilder) {
+    fn emit(&mut self, db: &DiagnosticBuilder) {
         let data = Diagnostic::from_diagnostic_builder(db, self);
         if let Err(e) = writeln!(&mut self.dst, "{}", as_json(&data)) {
             panic!("failed to print diagnostics: {:?}", e);