diff options
| author | Corey Richardson <corey@octayn.net> | 2014-05-07 09:45:53 -0400 |
|---|---|---|
| committer | Corey Richardson <corey@octayn.net> | 2014-05-16 10:00:13 -0700 |
| commit | c4cf6ca8addb2b22c077bfa30e8112f5a6087f4a (patch) | |
| tree | a848d284e5a773fca27274ef956d5519ede890e6 /src/libterm | |
| parent | 67aea1f8bd422b3e4c05c5b8bf6ea468ca0bf4e2 (diff) | |
| download | rust-c4cf6ca8addb2b22c077bfa30e8112f5a6087f4a.tar.gz rust-c4cf6ca8addb2b22c077bfa30e8112f5a6087f4a.zip | |
Update for master
Diffstat (limited to 'src/libterm')
| -rw-r--r-- | src/libterm/terminfo/mod.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libterm/terminfo/mod.rs b/src/libterm/terminfo/mod.rs index 93a7657fae9..0c07bbd1e6d 100644 --- a/src/libterm/terminfo/mod.rs +++ b/src/libterm/terminfo/mod.rs @@ -23,6 +23,7 @@ use self::parm::{expand, Number, Variables}; /// A parsed terminfo database entry. +#[deriving(Show)] pub struct TermInfo { /// Names for the terminal pub names: Vec<StrBuf> , @@ -86,7 +87,7 @@ impl<T: Writer> Terminal<T> for TerminfoTerminal<T> { // msys terminal return Some(TerminfoTerminal {out: out, ti: msys_terminfo(), num_colors: 8}); } - debug!("error finding terminfo entry: {}", entry.unwrap_err()); + debug!("error finding terminfo entry: {}", entry.err().unwrap()); return None; } @@ -183,7 +184,7 @@ impl<T: Writer> Terminal<T> for TerminfoTerminal<T> { cap = self.ti.strings.find_equiv(&("op")); } } - let s = cap.map_or(Err(~"can't find terminfo capability `sgr0`"), |op| { + let s = cap.map_or(Err("can't find terminfo capability `sgr0`".to_owned()), |op| { expand(op.as_slice(), [], &mut Variables::new()) }); if s.is_ok() { |