bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

use slicing sugar

Browse source
This commit is contained in:
Jorge Aparicio 2015-01-07 11:58:31 -05:00
parent 6e2bfe4ae8
commit 517f1cc63c
198 changed files with 2383 additions and 2405 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/libfmt_macros/lib.rs
View file

@ -211,12 +211,12 @@ impl<'a> Parser<'a> {
self.cur.next();
}
Some((_, other)) => {
self.err(format!("expected `{:?}`, found `{:?}`", c,
other).index(&FullRange));
self.err(&format!("expected `{:?}`, found `{:?}`", c,
other)[]);
}
None => {
self.err(format!("expected `{:?}` but string was terminated",
c).index(&FullRange));
self.err(&format!("expected `{:?}` but string was terminated",
c)[]);
}
}
}
@ -239,12 +239,12 @@ impl<'a> Parser<'a> {
// we may not consume the character, so clone the iterator
match self.cur.clone().next() {
Some((pos, '}')) | Some((pos, '{')) => {
return self.input.index(&(start..pos));
return &self.input[start..pos];
}
Some(..) => { self.cur.next(); }
None => {
self.cur.next();
return self.input.index(&(start..self.input.len()));
return &self.input[start..self.input.len()];
}
}
}
@ -284,7 +284,7 @@ impl<'a> Parser<'a> {
flags: 0,
precision: CountImplied,
width: CountImplied,
ty: self.input.index(&(0..0)),
ty: &self.input[0..0],
};
if !self.consume(':') { return spec }
@ -393,7 +393,7 @@ impl<'a> Parser<'a> {
self.cur.next();
pos
}
Some(..) | None => { return self.input.index(&(0..0)); }
Some(..) | None => { return &self.input[0..0]; }
};
let mut end;
loop {
@ -405,7 +405,7 @@ impl<'a> Parser<'a> {
None => { end = self.input.len(); break }
}
}
self.input.index(&(start..end))
&self.input[start..end]
}
/// Optionally parses an integer at the current position. This doesn't deal