rustc: Extract driver::diagnostic from syntax::codemap

2 files changed, 7 insertions, 5 deletions

diff --git a/src/comp/syntax/parse/lexer.rs b/src/comp/syntax/parse/lexer.rs
index cb247e12a40..cc0850d88b0 100644
--- a/src/comp/syntax/parse/lexer.rs
+++ b/src/comp/syntax/parse/lexer.rs
@@ -6,6 +6,7 @@ import option::{some, none};
 import util::interner;
 import util::interner::intern;
 import codemap;
+import driver::diagnostic;
 
 type reader = @{
     cm: codemap::codemap,
@@ -47,7 +48,7 @@ impl reader for reader {
         } else { self.curr = -1 as char; }
     }
     fn err(m: str) {
-        codemap::emit_error(
+        diagnostic::emit_error(
             some((self.cm, ast_util::mk_sp(self.chpos, self.chpos))), m);
     }
 }
diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs
index ad8eb0d5175..097ac8e7162 100644
--- a/src/comp/syntax/parse/parser.rs
+++ b/src/comp/syntax/parse/parser.rs
@@ -10,6 +10,7 @@ import util::interner;
 import ast::{node_id, spanned};
 import front::attr;
 import lexer::reader;
+import driver::diagnostic;
 
 tag restriction {
     UNRESTRICTED;
@@ -71,11 +72,11 @@ impl parser for parser {
         self.span_fatal(self.span, m);
     }
     fn span_fatal(sp: span, m: str) -> ! {
-        codemap::emit_error(some((self.sess.cm, sp)), m);
+        diagnostic::emit_error(some((self.sess.cm, sp)), m);
         fail;
     }
     fn warn(m: str) {
-        codemap::emit_warning(some((self.sess.cm, self.span)), m);
+        diagnostic::emit_warning(some((self.sess.cm, self.span)), m);
     }
     fn get_str(i: token::str_num) -> str {
         interner::get(*self.reader.interner, i)
@@ -92,7 +93,7 @@ fn new_parser_from_file(sess: parse_sess, cfg: ast::crate_cfg, path: str,
         src
       }
       result::err(e) {
-        codemap::emit_error(none, e);
+        diagnostic::emit_error(none, e);
         fail;
       }
     };
@@ -2525,7 +2526,7 @@ fn parse_crate_from_file(input: str, cfg: ast::crate_cfg, sess: parse_sess) ->
     } else if str::ends_with(input, ".rs") {
         parse_crate_from_source_file(input, cfg, sess)
     } else {
-        codemap::emit_error(none, "unknown input file type: " + input);
+        diagnostic::emit_error(none, "unknown input file type: " + input);
         fail
     }
 }