diff options
| author | Marvin Löbel <loebel.marvin@gmail.com> | 2013-12-06 19:51:10 +0100 |
|---|---|---|
| committer | Marvin Löbel <loebel.marvin@gmail.com> | 2014-01-08 00:53:40 +0100 |
| commit | 90b394514dad9df9c55b795be724093765d9df3a (patch) | |
| tree | 7e14d65e0e865662485c6f9f0dd2ca9fdcdb619f /src/libextra/term.rs | |
| parent | 4329fc6730e381b3b06f9987327072c50a739ad4 (diff) | |
| download | rust-90b394514dad9df9c55b795be724093765d9df3a.tar.gz rust-90b394514dad9df9c55b795be724093765d9df3a.zip | |
Renamed Option::map_default and mutate_default to map_or and mutate_or_set
Diffstat (limited to 'src/libextra/term.rs')
| -rw-r--r-- | src/libextra/term.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libextra/term.rs b/src/libextra/term.rs index 1f119ca9db4..c01530e1255 100644 --- a/src/libextra/term.rs +++ b/src/libextra/term.rs @@ -122,7 +122,7 @@ impl<T: Writer> Terminal<T> { let inf = ti.unwrap(); let nc = if inf.strings.find_equiv(&("setaf")).is_some() && inf.strings.find_equiv(&("setab")).is_some() { - inf.numbers.find_equiv(&("colors")).map_default(0, |&n| n) + inf.numbers.find_equiv(&("colors")).map_or(0, |&n| n) } else { 0 }; return Ok(Terminal {out: out, ti: inf, num_colors: nc}); @@ -215,7 +215,7 @@ impl<T: Writer> Terminal<T> { cap = self.ti.strings.find_equiv(&("op")); } } - let s = cap.map_default(Err(~"can't find terminfo capability `sgr0`"), |op| { + let s = cap.map_or(Err(~"can't find terminfo capability `sgr0`"), |op| { expand(*op, [], &mut Variables::new()) }); if s.is_ok() { |