diff options
Diffstat (limited to 'src/comp/syntax/parse')
| -rw-r--r-- | src/comp/syntax/parse/lexer.rs | 2 | ||||
| -rw-r--r-- | src/comp/syntax/parse/parser.rs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/comp/syntax/parse/lexer.rs b/src/comp/syntax/parse/lexer.rs index d1cec447d9f..988c46b6b88 100644 --- a/src/comp/syntax/parse/lexer.rs +++ b/src/comp/syntax/parse/lexer.rs @@ -81,7 +81,7 @@ fn new_reader(cm: &codemap::codemap, src: &istr, filemap: codemap::filemap, fn err(m: &istr) { codemap::emit_error( some(ast_util::mk_sp(chpos, chpos)), - istr::to_estr(m), cm); + m, cm); } } let strs: [istr] = []; diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs index 288f11ad797..0c4b6eac7b9 100644 --- a/src/comp/syntax/parse/parser.rs +++ b/src/comp/syntax/parse/parser.rs @@ -113,12 +113,12 @@ fn new_parser(sess: parse_sess, cfg: ast::crate_cfg, rdr: lexer::reader, } fn fatal(m: &istr) -> ! { codemap::emit_error(some(self.get_span()), - istr::to_estr(m), sess.cm); + m, sess.cm); fail; } fn warn(m: &istr) { codemap::emit_warning(some(self.get_span()), - istr::to_estr(m), sess.cm); + m, sess.cm); } fn restrict(r: restriction) { restr = r; } fn get_restriction() -> restriction { ret restr; } @@ -2581,8 +2581,8 @@ fn parse_crate_from_file(input: &istr, cfg: &ast::crate_cfg, } else if istr::ends_with(input, ~".rs") { parse_crate_from_source_file(input, cfg, sess) } else { - codemap::emit_error(none, "unknown input file type: " - + istr::to_estr(input), + codemap::emit_error(none, ~"unknown input file type: " + + input, sess.cm); fail } |
