bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fmt: simplify parse_count

Browse source
This commit is contained in:
Andrew Paseltiner 2013-01-07 14:41:37 -05:00
parent f4bc9e6d57
commit 9c383deaa6
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libcore/extfmt.rs
View file

@ -264,7 +264,7 @@ pub mod ct {
} }
pub fn parse_count(s: &str, i: uint, lim: uint) pub fn parse_count(s: &str, i: uint, lim: uint)
-> Parsed<Count> { -> Parsed<Count> {
return if i >= lim { if i >= lim {
Parsed::new(CountImplied, i) Parsed::new(CountImplied, i)
} else if s[i] == '*' as u8 { } else if s[i] == '*' as u8 {
let param = parse_parameter(s, i + 1, lim); let param = parse_parameter(s, i + 1, lim);
@ -274,15 +274,14 @@ pub mod ct {
Some(n) => Parsed::new(CountIsParam(n), j) Some(n) => Parsed::new(CountIsParam(n), j)
} }
} else { } else {
let num = peek_num(s, i, lim); match peek_num(s, i, lim) {
match num {
None => Parsed::new(CountImplied, i), None => Parsed::new(CountImplied, i),
Some(num) => Parsed::new( Some(num) => Parsed::new(
CountIs(num.val), CountIs(num.val),
num.next num.next
) )
} }
}; }
} }
pub fn parse_precision(s: &str, i: uint, lim: uint) -> pub fn parse_precision(s: &str, i: uint, lim: uint) ->
Parsed<Count> { Parsed<Count> {