nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 00:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update for master

Browse Source
This commit is contained in:
Corey Richardson 2014-05-07 09:45:53 -04:00
parent 67aea1f8bd
commit c4cf6ca8ad
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libterm/terminfo/mod.rs
View File

@ -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() {