---

yaml
---
r: 41585
b: refs/heads/master
c: af298de
h: refs/heads/master
i:
  41583: e17cfa1
v: v3

Author: apasel422

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 4550cb05626a1b982560710d6757145049cca247
+refs/heads/master: af298deff7141c3b8b95acb94ef2145d2ef9adc0
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/libcore/extfmt.rs

@@ -229,17 +229,11 @@ pub mod ct {
     pub fn parse_parameter(s: &str, i: uint, lim: uint) ->
        Parsed<Option<uint>> {
         if i >= lim { return Parsed::new(None, i); }
-        let num = peek_num(s, i, lim);
-        return match num {
-              None => Parsed::new(None, i),
-              Some(t) => {
-                let n = t.val;
-                let j = t.next;
-                if j < lim && s[j] == '$' as u8 {
-                    Parsed::new(Some(n), j + 1)
-                } else { Parsed::new(None, i) }
-              }
-            };
+        match peek_num(s, i, lim) {
+            Some(num) if num.next < lim && s[num.next] == '$' as u8 =>
+                Parsed::new(Some(num.val), num.next + 1),
+            _ => Parsed::new(None, i)
+        }
     }
     pub fn parse_flags(s: &str, i: uint, lim: uint) ->
        Parsed<~[Flag]> {