---

yaml
---
r: 276151
b: refs/heads/master
c: 41a652e
h: refs/heads/master
i:
  276149: 3821f70
  276147: 0fd8937
  276143: 88e5ffa

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 489a6c95bf747059b28472efc17d39795c6adcad
+refs/heads/master: 41a652e0948d6cbcffa89a219b37a1e39ae619d4
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
 refs/heads/try: 49312a405e14a449b98fe0056b12a40ac128be4a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/src/librustc_trans/back/write.rs

@@ -19,9 +19,9 @@ use llvm::SMDiagnosticRef;
 use {CrateTranslation, ModuleTranslation};
 use util::common::time;
 use util::common::path2cstr;
-use syntax::codemap::{self, MultiSpan};
+use syntax::codemap::MultiSpan;
 use syntax::errors::{self, Handler, Level};
-use syntax::errors::emitter::Emitter;
+use syntax::errors::emitter::RudimentaryEmitter;
 
 use std::collections::HashMap;
 use std::ffi::{CStr, CString};
@@ -100,24 +100,17 @@ impl SharedEmitter {
     }
 }
 
-impl Emitter for SharedEmitter {
-    fn emit(&mut self,
-            sp: &codemap::MultiSpan,
-            msg: &str,
-            code: Option<&str>,
-            lvl: Level) {
-        assert!(sp.primary_span().is_none(), "SharedEmitter doesn't support spans");
-
+impl RudimentaryEmitter for SharedEmitter {
+    fn emit_rudimentary(&mut self,
+                        msg: &str,
+                        code: Option<&str>,
+                        lvl: Level) {
         self.buffer.lock().unwrap().push(Diagnostic {
             msg: msg.to_string(),
             code: code.map(|s| s.to_string()),
             lvl: lvl,
         });
     }
-
-    fn emit_struct(&mut self, _db: &errors::DiagnosticBuilder) {
-        bug!("SharedEmitter doesn't support emit_struct");
-    }
 }
 
 

trunk/src/libsyntax/errors/emitter.rs

@@ -25,12 +25,38 @@ use std::rc::Rc;
 use term;
 
 pub trait Emitter {
+    /// Emit a standalone diagnostic message.
     fn emit(&mut self, span: &MultiSpan, msg: &str, code: Option<&str>, lvl: Level);
 
     /// Emit a structured diagnostic.
     fn emit_struct(&mut self, db: &DiagnosticBuilder);
 }
 
+/// A core trait that can only handle very simple messages: those
+/// without spans or any real structure. Used only in specific contexts.
+pub trait RudimentaryEmitter {
+    fn emit_rudimentary(&mut self, msg: &str, code: Option<&str>, lvl: Level);
+}
+
+impl<T: RudimentaryEmitter> Emitter for T {
+    fn emit(&mut self,
+            msp: &MultiSpan,
+            msg: &str,
+            code: Option<&str>,
+            lvl: Level) {
+        assert!(msp.primary_span().is_none(), "Rudimenatry emitters can't handle spans");
+        self.emit_rudimentary(msg, code, lvl);
+    }
+
+    fn emit_struct(&mut self, db: &DiagnosticBuilder) {
+        self.emit(&db.span, &db.message, db.code.as_ref().map(|s| &**s), db.level);
+        for child in &db.children {
+            assert!(child.render_span.is_none(), "Rudimentary emitters can't handle render spans");
+            self.emit(&child.span, &child.message, None, child.level);
+        }
+    }
+}
+
 /// maximum number of lines we will print for each error; arbitrary.
 pub const MAX_HIGHLIGHT_LINES: usize = 6;
 
@@ -57,26 +83,15 @@ pub struct BasicEmitter {
     dst: Destination,
 }
 
-impl Emitter for BasicEmitter {
-    fn emit(&mut self,
-            msp: &MultiSpan,
-            msg: &str,
-            code: Option<&str>,
-            lvl: Level) {
-        assert!(msp.primary_span().is_none(), "BasicEmitter can't handle spans");
-
+impl RudimentaryEmitter for BasicEmitter {
+    fn emit_rudimentary(&mut self,
+                        msg: &str,
+                        code: Option<&str>,
+                        lvl: Level) {
         if let Err(e) = print_diagnostic(&mut self.dst, "", lvl, msg, code) {
             panic!("failed to print diagnostics: {:?}", e);
         }
     }
-
-    fn emit_struct(&mut self, db: &DiagnosticBuilder) {
-        self.emit(&db.span, &db.message, db.code.as_ref().map(|s| &**s), db.level);
-        for child in &db.children {
-            assert!(child.render_span.is_none(), "BasicEmitter can't handle spans");
-            self.emit(&child.span, &child.message, None, child.level);
-        }
-    }
 }
 
 impl BasicEmitter {