bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Omit integer suffix when unnecessary

Browse source 
See PR # 21378 for context
This commit is contained in:
Alfie John 2015-01-28 01:01:48 +00:00
parent ca4b9674c2
commit 9683745fed
15 changed files with 142 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/libsyntax/codemap.rs
View file

@ -431,7 +431,7 @@ impl CodeMap {
let lo = self.lookup_char_pos(sp.lo);
let hi = self.lookup_char_pos(sp.hi);
let mut lines = Vec::new();
for i in lo.line - 1us..hi.line as usize {
for i in lo.line - 1..hi.line as usize {
lines.push(i);
};
FileLines {file: lo.file, lines: lines}
@ -499,10 +499,10 @@ impl CodeMap {
let files = self.files.borrow();
let files = &*files;
let len = files.len();
let mut a = 0us;
let mut a = 0;
let mut b = len;
while b - a > 1us {
let m = (a + b) / 2us;
while b - a > 1 {
let m = (a + b) / 2;
if files[m].start_pos > pos {
b = m;
} else {
@ -538,12 +538,12 @@ impl CodeMap {
let files = self.files.borrow();
let f = (*files)[idx].clone();
let mut a = 0us;
let mut a = 0;
{
let lines = f.lines.borrow();
let mut b = lines.len();
while b - a > 1us {
let m = (a + b) / 2us;
while b - a > 1 {
let m = (a + b) / 2;
if (*lines)[m] > pos { b = m; } else { a = m; }
}
}
@ -552,7 +552,7 @@ impl CodeMap {
fn lookup_pos(&self, pos: BytePos) -> Loc {
let FileMapAndLine {fm: f, line: a} = self.lookup_line(pos);
let line = a + 1us; // Line numbers start at 1
let line = a + 1; // Line numbers start at 1
let chpos = self.bytepos_to_file_charpos(pos);
let linebpos = (*f.lines.borrow())[a];
let linechpos = self.bytepos_to_file_charpos(linebpos);
@ -763,7 +763,7 @@ mod test {
assert_eq!(file_lines.file.name, "blork.rs");
assert_eq!(file_lines.lines.len(), 1);
assert_eq!(file_lines.lines[0], 1us);
assert_eq!(file_lines.lines[0], 1);
}
#[test]