bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Drop the '2' suffix from logging macros

Browse source 
Who doesn't like a massive renaming?
This commit is contained in:
Alex Crichton 2013-10-21 13:08:31 -07:00
parent 15a6bdebab
commit daf5f5a4d1
726 changed files with 3060 additions and 3060 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libsyntax/codemap.rs
View file

@ -374,7 +374,7 @@ impl CodeMap {
for fm in self.files.iter() { if filename == fm.name { return *fm; } }
//XXjdm the following triggers a mismatched type bug
// (or expected function, found _|_)
fail2!(); // ("asking for " + filename + " which we don't know about");
fail!(); // ("asking for " + filename + " which we don't know about");
}
}
@ -393,7 +393,7 @@ impl CodeMap {
}
}
if (a >= len) {
fail2!("position {} does not resolve to a source location", pos.to_uint())
fail!("position {} does not resolve to a source location", pos.to_uint())
}
return a;
@ -419,11 +419,11 @@ impl CodeMap {
let chpos = self.bytepos_to_local_charpos(pos);
let linebpos = f.lines[a];
let linechpos = self.bytepos_to_local_charpos(linebpos);
debug2!("codemap: byte pos {:?} is on the line at byte pos {:?}",
debug!("codemap: byte pos {:?} is on the line at byte pos {:?}",
pos, linebpos);
debug2!("codemap: char pos {:?} is on the line at char pos {:?}",
debug!("codemap: char pos {:?} is on the line at char pos {:?}",
chpos, linechpos);
debug2!("codemap: byte is on line: {:?}", line);
debug!("codemap: byte is on line: {:?}", line);
assert!(chpos >= linechpos);
return Loc {
file: f,
@ -450,7 +450,7 @@ impl CodeMap {
// Converts an absolute BytePos to a CharPos relative to the file it is
// located in
fn bytepos_to_local_charpos(&self, bpos: BytePos) -> CharPos {
debug2!("codemap: converting {:?} to char pos", bpos);
debug!("codemap: converting {:?} to char pos", bpos);
let idx = self.lookup_filemap_idx(bpos);
let map = self.files[idx];
@ -458,7 +458,7 @@ impl CodeMap {
let mut total_extra_bytes = 0;
for mbc in map.multibyte_chars.iter() {
debug2!("codemap: {:?}-byte char at {:?}", mbc.bytes, mbc.pos);
debug!("codemap: {:?}-byte char at {:?}", mbc.bytes, mbc.pos);
if mbc.pos < bpos {
total_extra_bytes += mbc.bytes;
// We should never see a byte position in the middle of a