diff --git a/src/comp/driver/diagnostic.rs b/src/comp/driver/diagnostic.rs
index 2536e5ebe166..7021ace445d6 100644
--- a/src/comp/driver/diagnostic.rs
+++ b/src/comp/driver/diagnostic.rs
@@ -3,7 +3,7 @@ import io::writer_util;
 import syntax::codemap;
 import codemap::span;
 
-export emitter, emit_diagnostic;
+export emitter, emit;
 export level, fatal, error, warning, note;
 export handler, mk_codemap_handler;
 
@@ -89,7 +89,7 @@ fn mk_codemap_handler(cm: codemap::codemap,
       none. {
         let f = fn@(cmsp: option<(codemap::codemap, span)>,
             msg: str, t: level) {
-            emit_diagnostic(cmsp, msg, t);
+            emit(cmsp, msg, t);
         };
         f
       }
@@ -141,8 +141,8 @@ fn print_diagnostic(topic: str, lvl: level, msg: str) {
     io::stdout().write_str(#fmt[" %s\n", msg]);
 }
 
-fn emit_diagnostic(cmsp: option<(codemap::codemap, span)>,
-                   msg: str, lvl: level) {
+fn emit(cmsp: option<(codemap::codemap, span)>,
+        msg: str, lvl: level) {
     alt cmsp {
       some((cm, sp)) {
         let ss = codemap::span_to_str(sp, cm);
diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs
index e43ca9b53f3d..fd450517e582 100644
--- a/src/comp/driver/rustc.rs
+++ b/src/comp/driver/rustc.rs
@@ -72,7 +72,7 @@ fn main(args: [str]) {
 
     let demitter = fn@(cmsp: option<(codemap::codemap, codemap::span)>,
                        msg: str, lvl: diagnostic::level) {
-        diagnostic::emit_diagnostic(cmsp, msg, lvl);
+        diagnostic::emit(cmsp, msg, lvl);
     };
 
     let match =