---

emberian · emberian · commit 1604255e3ac5 · 2014-05-16T10:00:13.000-07:00
yaml --- r: 151766 b: refs/heads/try2 c: c4cf6ca h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 67aea1f8bd422b3e4c05c5b8bf6ea468ca0bf4e2
+refs/heads/try2: c4cf6ca8addb2b22c077bfa30e8112f5a6087f4a
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/libterm/terminfo/mod.rs b/branches/try2/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() {

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ use self::parm::{expand, Number, Variables};`
`23`	`23`
`24`	`24`
`25`	`25`	`/// A parsed terminfo database entry.`
	`26`	`+#[deriving(Show)]`
`26`	`27`	`pub struct TermInfo {`
`27`	`28`	`/// Names for the terminal`
`28`	`29`	`pub names: Vec<StrBuf> ,`
`@@ -86,7 +87,7 @@ impl<T: Writer> Terminal<T> for TerminfoTerminal<T> {`
`86`	`87`	`// msys terminal`
`87`	`88`	`return Some(TerminfoTerminal {out: out, ti: msys_terminfo(), num_colors: 8});`
`88`	`89`	`}`
`89`		`- debug!("error finding terminfo entry: {}", entry.unwrap_err());`
	`90`	`+ debug!("error finding terminfo entry: {}", entry.err().unwrap());`
`90`	`91`	`return None;`
`91`	`92`	`}`
`92`	`93`
`@@ -183,7 +184,7 @@ impl<T: Writer> Terminal<T> for TerminfoTerminal<T> {`
`183`	`184`	`cap = self.ti.strings.find_equiv(&("op"));`
`184`	`185`	`}`
`185`	`186`	`}`
`186`		- let s = cap.map_or(Err(~"can't find terminfo capability `sgr0`"), \|op\| {
	`187`	+ let s = cap.map_or(Err("can't find terminfo capability `sgr0`".to_owned()), \|op\| {
`187`	`188`	`expand(op.as_slice(), [], &mut Variables::new())`
`188`	`189`	`});`
`189`	`190`	`if s.is_ok() {`