diff options
| author | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-09-11 12:52:17 -0700 |
|---|---|---|
| committer | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-09-12 18:54:13 -0700 |
| commit | 38f97ea10313ba9a8c6f57fbf73ff8daf5376e8b (patch) | |
| tree | 72966f38845b07f6f43291d06957634135d97030 /src/libextra/num | |
| parent | e03d60e9ebf2dbc2d18ab9919f905c17b967fcde (diff) | |
| download | rust-38f97ea10313ba9a8c6f57fbf73ff8daf5376e8b.tar.gz rust-38f97ea10313ba9a8c6f57fbf73ff8daf5376e8b.zip | |
std: Rename {Option,Result}::chain{,_err}* to {and_then,or_else}
Diffstat (limited to 'src/libextra/num')
| -rw-r--r-- | src/libextra/num/rational.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libextra/num/rational.rs b/src/libextra/num/rational.rs index 41e9a488bf8..1991d9f1b5b 100644 --- a/src/libextra/num/rational.rs +++ b/src/libextra/num/rational.rs @@ -273,9 +273,9 @@ impl<T: FromStr + Clone + Integer + Ord> return None } let a_option: Option<T> = FromStr::from_str(split[0]); - do a_option.chain |a| { + do a_option.and_then |a| { let b_option: Option<T> = FromStr::from_str(split[1]); - do b_option.chain |b| { + do b_option.and_then |b| { Some(Ratio::new(a.clone(), b.clone())) } } @@ -291,10 +291,10 @@ impl<T: FromStrRadix + Clone + Integer + Ord> } else { let a_option: Option<T> = FromStrRadix::from_str_radix(split[0], radix); - do a_option.chain |a| { + do a_option.and_then |a| { let b_option: Option<T> = FromStrRadix::from_str_radix(split[1], radix); - do b_option.chain |b| { + do b_option.and_then |b| { Some(Ratio::new(a.clone(), b.clone())) } } |