---

apasel422 · apasel422 · commit e17cfa1d7e27 · 2013-01-07T17:22:01.000-05:00
yaml --- r: 41583 b: refs/heads/master c: 9c383de h: refs/heads/master i: 41581: 1485b9b 41579: 1e04bee 41575: e5bb9f9 41567: f064841 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f4bc9e6d57c1e005c6539db59762e4030bd7bd2f
+refs/heads/master: 9c383deaa6683e5519ce6727e1d3d152d70e66a0
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
diff --git a/trunk/src/libcore/extfmt.rs b/trunk/src/libcore/extfmt.rs
@@ -264,7 +264,7 @@ pub mod ct {
     }
         pub fn parse_count(s: &str, i: uint, lim: uint)
         -> Parsed<Count> {
-        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<Count> {

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ pub mod ct {`
`264`	`264`	`}`
`265`	`265`	`pub fn parse_count(s: &str, i: uint, lim: uint)`
`266`	`266`	`-> Parsed<Count> {`
`267`		`- return if i >= lim {`
	`267`	`+ if i >= lim {`
`268`	`268`	`Parsed::new(CountImplied, i)`
`269`	`269`	`} else if s[i] == '*' as u8 {`
`270`	`270`	`let param = parse_parameter(s, i + 1, lim);`
`@@ -274,15 +274,14 @@ pub mod ct {`
`274`	`274`	`Some(n) => Parsed::new(CountIsParam(n), j)`
`275`	`275`	`}`
`276`	`276`	`} else {`
`277`		`- let num = peek_num(s, i, lim);`
`278`		`- match num {`
	`277`	`+ match peek_num(s, i, lim) {`
`279`	`278`	`None => Parsed::new(CountImplied, i),`
`280`	`279`	`Some(num) => Parsed::new(`
`281`	`280`	`CountIs(num.val),`
`282`	`281`	`num.next`
`283`	`282`	`)`
`284`	`283`	`}`
`285`		`- };`
	`284`	`+ }`
`286`	`285`	`}`
`287`	`286`	`pub fn parse_precision(s: &str, i: uint, lim: uint) ->`
`288`	`287`	`Parsed<Count> {`