File tree Expand file tree Collapse file tree 2 files changed +6
-12
lines changed
branches/try2/src/libcore Expand file tree Collapse file tree 2 files changed +6
-12
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
5
5
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8
- refs/heads/try2: 4550cb05626a1b982560710d6757145049cca247
8
+ refs/heads/try2: af298deff7141c3b8b95acb94ef2145d2ef9adc0
9
9
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
10
10
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
11
11
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
Original file line number Diff line number Diff line change @@ -229,17 +229,11 @@ pub mod ct {
229
229
pub fn parse_parameter(s: &str, i: uint, lim: uint) ->
230
230
Parsed<Option<uint>> {
231
231
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
+ }
243
237
}
244
238
pub fn parse_flags(s: &str, i: uint, lim: uint) ->
245
239
Parsed<~[Flag]> {
You can’t perform that action at this time.
0 commit comments