Skip to content

Commit af298de

Browse files
committed
fmt: simplify parse_parameter
1 parent 4550cb0 commit af298de

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

src/libcore/extfmt.rs

+5-11
Original file line numberDiff line numberDiff line change
@@ -229,17 +229,11 @@ pub mod ct {
229229
pub fn parse_parameter(s: &str, i: uint, lim: uint) ->
230230
Parsed<Option<uint>> {
231231
if i >= lim { return Parsed::new(None, i); }
232-
let num = peek_num(s, i, lim);
233-
return match num {
234-
None => Parsed::new(None, i),
235-
Some(t) => {
236-
let n = t.val;
237-
let j = t.next;
238-
if j < lim && s[j] == '$' as u8 {
239-
Parsed::new(Some(n), j + 1)
240-
} else { Parsed::new(None, i) }
241-
}
242-
};
232+
match peek_num(s, i, lim) {
233+
Some(num) if num.next < lim && s[num.next] == '$' as u8 =>
234+
Parsed::new(Some(num.val), num.next + 1),
235+
_ => Parsed::new(None, i)
236+
}
243237
}
244238
pub fn parse_flags(s: &str, i: uint, lim: uint) ->
245239
Parsed<~[Flag]> {

0 commit comments

Comments
 (0)