mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4243 from erickt/incoming

Browse Source 
Fix a bug in Result::unwrap_err (and minor cleanup)
This commit is contained in:
Tim Chevalier 2012-12-23 13:49:32 -08:00
commit 197a1f9cfe
2 changed files with 40 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcore/result.rs
View File

@ -234,7 +234,7 @@ impl<T, E> Result<T, E> {
pure fn unwrap(self) -> T { unwrap(self) }
#[inline(always)]
pure fn unwrap_err(self) -> T { unwrap(self) }
pure fn unwrap_err(self) -> E { unwrap_err(self) }
#[inline(always)]
pure fn chain<U>(self, op: fn(T) -> Result<U,E>) -> Result<U,E> {

117
src/libstd/time.rs
View File

@ -385,36 +385,22 @@ fn parse_type(s: &str, pos: uint, ch: char, tm: &mut Tm)
None => Err(~"Invalid year")
},
'c' => {
// FIXME(#3724): cleanup
result::chain(
result::chain(
result::chain(
result::chain(
result::chain(
result::chain(
result::chain(
result::chain(
move parse_type(s, pos, 'a', tm),
|pos| parse_char(s, pos, ' ')),
|pos| parse_type(s, pos, 'b', tm)),
|pos| parse_char(s, pos, ' ')),
|pos| parse_type(s, pos, 'e', tm)),
|pos| parse_char(s, pos, ' ')),
|pos| parse_type(s, pos, 'T', tm)),
|pos| parse_char(s, pos, ' ')),
|pos| parse_type(s, pos, 'Y', tm))
parse_type(s, pos, 'a', tm)
.chain(|pos| parse_char(s, pos, ' '))
.chain(|pos| parse_type(s, pos, 'b', tm))
.chain(|pos| parse_char(s, pos, ' '))
.chain(|pos| parse_type(s, pos, 'e', tm))
.chain(|pos| parse_char(s, pos, ' '))
.chain(|pos| parse_type(s, pos, 'T', tm))
.chain(|pos| parse_char(s, pos, ' '))
.chain(|pos| parse_type(s, pos, 'Y', tm))
}
'D' | 'x' => {
// FIXME(#3724): cleanup
result::chain(
result::chain(
result::chain(
result::chain(
move parse_type(s, pos, 'm', tm),
|pos| parse_char(s, pos, '/')),
|pos| parse_type(s, pos, 'd', tm)),
|pos| parse_char(s, pos, '/')),
|pos| parse_type(s, pos, 'y', tm))
parse_type(s, pos, 'm', tm)
.chain(|pos| parse_char(s, pos, '/'))
.chain(|pos| parse_type(s, pos, 'd', tm))
.chain(|pos| parse_char(s, pos, '/'))
.chain(|pos| parse_type(s, pos, 'y', tm))
}
'd' => match match_digits(s, pos, 2u, false) {
Some(item) => { let (v, pos) = item; tm.tm_mday = v; Ok(pos) }
@ -425,16 +411,11 @@ fn parse_type(s: &str, pos: uint, ch: char, tm: &mut Tm)
None => Err(~"Invalid day of the month")
},
'F' => {
// FIXME(#3724): cleanup
result::chain(
result::chain(
result::chain(
result::chain(
move parse_type(s, pos, 'Y', tm),
|pos| parse_char(s, pos, '-')),
|pos| parse_type(s, pos, 'm', tm)),
|pos| parse_char(s, pos, '-')),
|pos| parse_type(s, pos, 'd', tm))
parse_type(s, pos, 'Y', tm)
.chain(|pos| parse_char(s, pos, '-'))
.chain(|pos| parse_type(s, pos, 'm', tm))
.chain(|pos| parse_char(s, pos, '-'))
.chain(|pos| parse_type(s, pos, 'd', tm))
}
'H' => {
// FIXME (#2350): range check.
@ -515,28 +496,18 @@ fn parse_type(s: &str, pos: uint, ch: char, tm: &mut Tm)
None => Err(~"Invalid hour")
},
'R' => {
// FIXME(#3724): cleanup
result::chain(
result::chain(
move parse_type(s, pos, 'H', tm),
|pos| parse_char(s, pos, ':')),
|pos| parse_type(s, pos, 'M', tm))
parse_type(s, pos, 'H', tm)
.chain(|pos| parse_char(s, pos, ':'))
.chain(|pos| parse_type(s, pos, 'M', tm))
}
'r' => {
// FIXME(#3724): cleanup
result::chain(
result::chain(
result::chain(
result::chain(
result::chain(
result::chain(
move parse_type(s, pos, 'I', tm),
|pos| parse_char(s, pos, ':')),
|pos| parse_type(s, pos, 'M', tm)),
|pos| parse_char(s, pos, ':')),
|pos| parse_type(s, pos, 'S', tm)),
|pos| parse_char(s, pos, ' ')),
|pos| parse_type(s, pos, 'p', tm))
parse_type(s, pos, 'I', tm)
.chain(|pos| parse_char(s, pos, ':'))
.chain(|pos| parse_type(s, pos, 'M', tm))
.chain(|pos| parse_char(s, pos, ':'))
.chain(|pos| parse_type(s, pos, 'S', tm))
.chain(|pos| parse_char(s, pos, ' '))
.chain(|pos| parse_type(s, pos, 'p', tm))
}
'S' => {
// FIXME (#2350): range check.
@ -551,16 +522,11 @@ fn parse_type(s: &str, pos: uint, ch: char, tm: &mut Tm)
}
//'s' {}
'T' | 'X' => {
// FIXME(#3724): cleanup
result::chain(
result::chain(
result::chain(
result::chain(
move parse_type(s, pos, 'H', tm),
|pos| parse_char(s, pos, ':')),
|pos| parse_type(s, pos, 'M', tm)),
|pos| parse_char(s, pos, ':')),
|pos| parse_type(s, pos, 'S', tm))
parse_type(s, pos, 'H', tm)
.chain(|pos| parse_char(s, pos, ':'))
.chain(|pos| parse_type(s, pos, 'M', tm))
.chain(|pos| parse_char(s, pos, ':'))
.chain(|pos| parse_type(s, pos, 'S', tm))
}
't' => parse_char(s, pos, '\t'),
'u' => {
@ -575,16 +541,11 @@ fn parse_type(s: &str, pos: uint, ch: char, tm: &mut Tm)
}
}
'v' => {
// FIXME(#3724): cleanup
result::chain(
result::chain(
result::chain(
result::chain(
move parse_type(s, pos, 'e', tm),
|pos| parse_char(s, pos, '-')),
|pos| parse_type(s, pos, 'b', tm)),
|pos| parse_char(s, pos, '-')),
|pos| parse_type(s, pos, 'Y', tm))
parse_type(s, pos, 'e', tm)
.chain(|pos| parse_char(s, pos, '-'))
.chain(|pos| parse_type(s, pos, 'b', tm))
.chain(|pos| parse_char(s, pos, '-'))
.chain(|pos| parse_type(s, pos, 'Y', tm))
}
//'W' {}
'w' => {