Skip to content

Commit a26aa22

Browse files
committed
---
yaml --- r: 37030 b: refs/heads/try2 c: af298de h: refs/heads/master v: v3
1 parent 4caf078 commit a26aa22

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 4550cb05626a1b982560710d6757145049cca247
8+
refs/heads/try2: af298deff7141c3b8b95acb94ef2145d2ef9adc0
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libcore/extfmt.rs

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -229,17 +229,11 @@ pub mod ct {
229229
pub fn parse_parameter(s: &str, i: uint, lim: uint) ->
230230
Parsed<Option<uint>> {
231231
if i >= lim { return Parsed::new(None, i); }
232-
let num = peek_num(s, i, lim);
233-
return match num {
234-
None => Parsed::new(None, i),
235-
Some(t) => {
236-
let n = t.val;
237-
let j = t.next;
238-
if j < lim && s[j] == '$' as u8 {
239-
Parsed::new(Some(n), j + 1)
240-
} else { Parsed::new(None, i) }
241-
}
242-
};
232+
match peek_num(s, i, lim) {
233+
Some(num) if num.next < lim && s[num.next] == '$' as u8 =>
234+
Parsed::new(Some(num.val), num.next + 1),
235+
_ => Parsed::new(None, i)
236+
}
243237
}
244238
pub fn parse_flags(s: &str, i: uint, lim: uint) ->
245239
Parsed<~[Flag]> {

0 commit comments

Comments
 (0)