codemap: be less annoying in debug logging

This commit is contained in:
Corey Richardson
2014-06-23 13:37:30 -07:00
parent ae9a92bd4e
commit 5f970e690f
+4 -5
View File
@@ -430,7 +430,6 @@ pub fn lookup_byte_offset(&self, bpos: BytePos) -> FileMapAndBytePos {
/// Converts an absolute BytePos to a CharPos relative to the filemap and above.
pub fn bytepos_to_file_charpos(&self, bpos: BytePos) -> CharPos {
debug!("codemap: converting {:?} to char pos", bpos);
let idx = self.lookup_filemap_idx(bpos);
let files = self.files.borrow();
let map = files.get(idx);
@@ -439,7 +438,7 @@ pub fn bytepos_to_file_charpos(&self, bpos: BytePos) -> CharPos {
let mut total_extra_bytes = 0;
for mbc in map.multibyte_chars.borrow().iter() {
debug!("codemap: {:?}-byte char at {:?}", mbc.bytes, mbc.pos);
debug!("{}-byte char at {}", mbc.bytes, mbc.pos);
if mbc.pos < bpos {
// every character is at least one byte, so we only
// count the actual extra bytes.
@@ -514,11 +513,11 @@ fn lookup_pos(&self, pos: BytePos) -> Loc {
let chpos = self.bytepos_to_file_charpos(pos);
let linebpos = *f.lines.borrow().get(a);
let linechpos = self.bytepos_to_file_charpos(linebpos);
debug!("codemap: byte pos {:?} is on the line at byte pos {:?}",
debug!("byte pos {} is on the line at byte pos {}",
pos, linebpos);
debug!("codemap: char pos {:?} is on the line at char pos {:?}",
debug!("char pos {} is on the line at char pos {}",
chpos, linechpos);
debug!("codemap: byte is on line: {:?}", line);
debug!("byte is on line: {}", line);
assert!(chpos >= linechpos);
Loc {
file: f,