diff options
Diffstat (limited to 'src/libterm')
| -rw-r--r-- | src/libterm/terminfo/mod.rs | 7 | ||||
| -rw-r--r-- | src/libterm/win.rs | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/libterm/terminfo/mod.rs b/src/libterm/terminfo/mod.rs index 758191a6e11..b978d2d8054 100644 --- a/src/libterm/terminfo/mod.rs +++ b/src/libterm/terminfo/mod.rs @@ -72,7 +72,7 @@ pub struct TerminfoTerminal<T> { ti: Box<TermInfo> } -impl<T: Writer+Send> Terminal<T> for TerminfoTerminal<T> { +impl<T: Writer+Send+'static> Terminal<T> for TerminfoTerminal<T> { fn fg(&mut self, color: color::Color) -> IoResult<bool> { let color = self.dim_if_necessary(color); if self.num_colors > color { @@ -164,11 +164,11 @@ impl<T: Writer+Send> Terminal<T> for TerminfoTerminal<T> { fn get_mut<'a>(&'a mut self) -> &'a mut T { &mut self.out } } -impl<T: Writer+Send> UnwrappableTerminal<T> for TerminfoTerminal<T> { +impl<T: Writer+Send+'static> UnwrappableTerminal<T> for TerminfoTerminal<T> { fn unwrap(self) -> T { self.out } } -impl<T: Writer+Send> TerminfoTerminal<T> { +impl<T: Writer+Send+'static> TerminfoTerminal<T> { /// Returns `None` whenever the terminal cannot be created for some /// reason. pub fn new(out: T) -> Option<Box<Terminal<T>+Send+'static>> { @@ -229,4 +229,3 @@ impl<T: Writer> Writer for TerminfoTerminal<T> { self.out.flush() } } - diff --git a/src/libterm/win.rs b/src/libterm/win.rs index a56613681c8..e93b956dc7c 100644 --- a/src/libterm/win.rs +++ b/src/libterm/win.rs @@ -86,7 +86,7 @@ fn bits_to_color(bits: u16) -> color::Color { color | (bits & 0x8) // copy the hi-intensity bit } -impl<T: Writer+Send> WinConsole<T> { +impl<T: Writer+Send+'static> WinConsole<T> { fn apply(&mut self) { let _unused = self.buf.flush(); let mut accum: libc::WORD = 0; @@ -139,7 +139,7 @@ impl<T: Writer> Writer for WinConsole<T> { } } -impl<T: Writer+Send> Terminal<T> for WinConsole<T> { +impl<T: Writer+Send+'static> Terminal<T> for WinConsole<T> { fn fg(&mut self, color: color::Color) -> IoResult<bool> { self.foreground = color; self.apply(); @@ -192,6 +192,6 @@ impl<T: Writer+Send> Terminal<T> for WinConsole<T> { fn get_mut<'a>(&'a mut self) -> &'a mut T { &mut self.buf } } -impl<T: Writer+Send> UnwrappableTerminal<T> for WinConsole<T> { +impl<T: Writer+Send+'static> UnwrappableTerminal<T> for WinConsole<T> { fn unwrap(self) -> T { self.buf } } |
