---

apasel422 · apasel422 · commit b45a78cc6c19 · 2013-01-07T17:22:01.000-05:00
yaml --- r: 52131 b: refs/heads/dist-snap c: 9c383de h: refs/heads/master i: 52129: cb5fed8 52127: b8c9d96 v: v3
diff --git a/[refs] b/[refs]
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: f4bc9e6d57c1e005c6539db59762e4030bd7bd2f
+refs/heads/dist-snap: 9c383deaa6683e5519ce6727e1d3d152d70e66a0
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
diff --git a/branches/dist-snap/src/libcore/extfmt.rs b/branches/dist-snap/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> {`