Skip to content

Fix a bug in Result::unwrap_err (and minor cleanup) #4243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 23, 2012
Merged

Fix a bug in Result::unwrap_err (and minor cleanup) #4243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e94407
Fix Option::unwrap_err.
erickt Dec 21, 2012
beec519
Switch chain calls to use Option::chain method
erickt Dec 21, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libcore/result.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down
117 changes: 39 additions & 78 deletions src/libstd/time.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,36 +385,22 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
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) }
Expand All @@ -425,16 +411,11 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
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.
Expand Down Expand Up @@ -515,28 +496,18 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
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.
Expand All @@ -551,16 +522,11 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
}
//'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' => {
Expand All @@ -575,16 +541,11 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
}
}
'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' => {
Expand Down