Skip to content

Commit 78be196

Browse files
committed
---
yaml --- r: 123446 b: refs/heads/auto c: 5f970e6 h: refs/heads/master v: v3
1 parent 7aaea76 commit 78be196

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: ae9a92bd4ef25b8aba0ef06e7ad26319691e9e5a
16+
refs/heads/auto: 5f970e690f2ca7ddb7884b6b8752baf3771ad459
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libsyntax/codemap.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,6 @@ impl CodeMap {
430430

431431
/// Converts an absolute BytePos to a CharPos relative to the filemap and above.
432432
pub fn bytepos_to_file_charpos(&self, bpos: BytePos) -> CharPos {
433-
debug!("codemap: converting {:?} to char pos", bpos);
434433
let idx = self.lookup_filemap_idx(bpos);
435434
let files = self.files.borrow();
436435
let map = files.get(idx);
@@ -439,7 +438,7 @@ impl CodeMap {
439438
let mut total_extra_bytes = 0;
440439

441440
for mbc in map.multibyte_chars.borrow().iter() {
442-
debug!("codemap: {:?}-byte char at {:?}", mbc.bytes, mbc.pos);
441+
debug!("{}-byte char at {}", mbc.bytes, mbc.pos);
443442
if mbc.pos < bpos {
444443
// every character is at least one byte, so we only
445444
// count the actual extra bytes.
@@ -514,11 +513,11 @@ impl CodeMap {
514513
let chpos = self.bytepos_to_file_charpos(pos);
515514
let linebpos = *f.lines.borrow().get(a);
516515
let linechpos = self.bytepos_to_file_charpos(linebpos);
517-
debug!("codemap: byte pos {:?} is on the line at byte pos {:?}",
516+
debug!("byte pos {} is on the line at byte pos {}",
518517
pos, linebpos);
519-
debug!("codemap: char pos {:?} is on the line at char pos {:?}",
518+
debug!("char pos {} is on the line at char pos {}",
520519
chpos, linechpos);
521-
debug!("codemap: byte is on line: {:?}", line);
520+
debug!("byte is on line: {}", line);
522521
assert!(chpos >= linechpos);
523522
Loc {
524523
file: f,

0 commit comments

Comments
 (0)