user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

std: Rename {Option,Result}::chain{,_err}* to {and_then,or_else}

Browse source
This commit is contained in:
Erick Tryzelaar 2013-09-11 12:52:17 -07:00
parent e03d60e9eb
commit 38f97ea103
25 changed files with 205 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustpkg/version.rs
View file

@ -118,7 +118,7 @@ pub fn try_getting_local_version(local_path: &Path) -> Option<Version> {
if !l.is_whitespace() {
output = Some(l);
}
match output.chain(try_parsing_version) {
match output.and_then(try_parsing_version) {
Some(v) => return Some(v),
None => ()
}
@ -158,7 +158,7 @@ pub fn try_getting_version(remote_path: &Path) -> Option<Version> {
}
}
output.chain(try_parsing_version)
output.and_then(try_parsing_version)
}
else {
None