std: Rename Show/String to Debug/Display

[rust.git] / src / libterm / terminfo / mod.rs

diff --git a/src/libterm/terminfo/mod.rs b/src/libterm/terminfo/mod.rs
index f2dcdc6160aa9e3b9f00848d9a6a3dcd8f18cd95..2ef0bca3785cbc43ba1d6b81b46abeb030125d20 100644 (file)
--- a/src/libterm/terminfo/mod.rs
+++ b/src/libterm/terminfo/mod.rs
@@ -180,7 +180,7 @@ pub fn new(out: T) -> Option<Box<Terminal<T>+Send+'static>> {
             }
         };
 
-        let entry = open(term.index(&FullRange));
+        let entry = open(&term[]);
         if entry.is_err() {
             if os::getenv("MSYSCON").map_or(false, |s| {
                     "mintty.exe" == s
@@ -197,7 +197,7 @@ pub fn new(out: T) -> Option<Box<Terminal<T>+Send+'static>> {
         let mut file = entry.unwrap();
         let ti = parse(&mut file, false);
         if ti.is_err() {
-            debug!("error parsing terminfo entry: {:?}", ti.unwrap_err());
+            debug!("error parsing terminfo entry: {:?}", ti.err().unwrap());
             return None;
         }