From 9c383deaa6683e5519ce6727e1d3d152d70e66a0 Mon Sep 17 00:00:00 2001 From: Andrew Paseltiner Date: Mon, 7 Jan 2013 14:41:37 -0500 Subject: [PATCH] fmt: simplify parse_count --- src/libcore/extfmt.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libcore/extfmt.rs b/src/libcore/extfmt.rs index 25e349f0dc3..1216d965300 100644 --- a/src/libcore/extfmt.rs +++ b/src/libcore/extfmt.rs @@ -264,7 +264,7 @@ pub mod ct { } pub fn parse_count(s: &str, i: uint, lim: uint) -> Parsed { - return if i >= lim { + if i >= lim { Parsed::new(CountImplied, i) } else if s[i] == '*' as u8 { let param = parse_parameter(s, i + 1, lim); @@ -274,15 +274,14 @@ pub mod ct { Some(n) => Parsed::new(CountIsParam(n), j) } } else { - let num = peek_num(s, i, lim); - match num { + match peek_num(s, i, lim) { None => Parsed::new(CountImplied, i), Some(num) => Parsed::new( CountIs(num.val), num.next ) } - }; + } } pub fn parse_precision(s: &str, i: uint, lim: uint) -> Parsed {