---

apasel422 · apasel422 · commit 4caf078e1b66 · 2013-01-07T17:22:01.000-05:00
yaml --- r: 37029 b: refs/heads/try2 c: 4550cb0 h: refs/heads/master i: 37027: 7dac4df v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 9c383deaa6683e5519ce6727e1d3d152d70e66a0
+refs/heads/try2: 4550cb05626a1b982560710d6757145049cca247
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try2/src/libcore/extfmt.rs b/branches/try2/src/libcore/extfmt.rs
@@ -285,9 +285,7 @@ pub mod ct {
     }
     pub fn parse_precision(s: &str, i: uint, lim: uint) ->
        Parsed<Count> {
-        return if i >= lim {
-                Parsed::new(CountImplied, i)
-            } else if s[i] == '.' as u8 {
+            if i < lim && s[i] == '.' as u8 {
                 let count = parse_count(s, i + 1u, lim);
 
 
@@ -297,7 +295,7 @@ pub mod ct {
                   CountImplied => Parsed::new(CountIs(0), count.next),
                   _ => count
                 }
-            } else { Parsed::new(CountImplied, i) };
+            } else { Parsed::new(CountImplied, i) }
     }
     pub fn parse_type(s: &str, i: uint, lim: uint, err: ErrorFn) ->
        Parsed<Ty> {

Original file line number	Diff line number	Diff line change
`@@ -285,9 +285,7 @@ pub mod ct {`
`285`	`285`	`}`
`286`	`286`	`pub fn parse_precision(s: &str, i: uint, lim: uint) ->`
`287`	`287`	`Parsed<Count> {`
`288`		`- return if i >= lim {`
`289`		`- Parsed::new(CountImplied, i)`
`290`		`- } else if s[i] == '.' as u8 {`
	`288`	`+ if i < lim && s[i] == '.' as u8 {`
`291`	`289`	`let count = parse_count(s, i + 1u, lim);`
`292`	`290`
`293`	`291`
`@@ -297,7 +295,7 @@ pub mod ct {`
`297`	`295`	`CountImplied => Parsed::new(CountIs(0), count.next),`
`298`	`296`	`_ => count`
`299`	`297`	`}`
`300`		`- } else { Parsed::new(CountImplied, i) };`
	`298`	`+ } else { Parsed::new(CountImplied, i) }`
`301`	`299`	`}`
`302`	`300`	`pub fn parse_type(s: &str, i: uint, lim: uint, err: ErrorFn) ->`
`303`	`301`	`Parsed<Ty> {`