From 2afa42a32ee4422a5f1f6b82f177ee54312f5164 Mon Sep 17 00:00:00 2001
From: Corey Richardson <corey@octayn.net>
Date: Wed, 7 May 2014 11:12:04 -0400
Subject: Update for Box

---
 src/libterm/lib.rs          | 44 ++++++++++++++++++++++----------------------
 src/libterm/terminfo/mod.rs |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'src/libterm')

diff --git a/src/libterm/lib.rs b/src/libterm/lib.rs
index 8f5452c23f2..6a50d62ba01 100644
--- a/src/libterm/lib.rs
+++ b/src/libterm/lib.rs
@@ -65,25 +65,25 @@ mod win;
 #[cfg(not(windows))]
 /// Return a Terminal wrapping stdout, or None if a terminal couldn't be
 /// opened.
-pub fn stdout() -> Option<~Terminal<~Writer:Send>:Send> {
-    let ti: Option<TerminfoTerminal<~Writer:Send>>
-        = Terminal::new(~std::io::stdout() as ~Writer:Send);
-    ti.map(|t| ~t as ~Terminal<~Writer:Send>:Send)
+pub fn stdout() -> Option<Box<Terminal<Box<Writer:Send>>:Send>> {
+    let ti: Option<TerminfoTerminal<Box<Writer:Send>>>
+        = Terminal::new(box std::io::stdout() as Box<Writer:Send>);
+    ti.map(|t| box t as Box<Terminal<Box<Writer:Send>:Send>:Send>)
 }
 
 #[cfg(windows)]
 /// Return a Terminal wrapping stdout, or None if a terminal couldn't be
 /// opened.
-pub fn stdout() -> Option<~Terminal<~Writer:Send>:Send> {
-    let ti: Option<TerminfoTerminal<~Writer:Send>>
-        = Terminal::new(~std::io::stdout() as ~Writer:Send);
+pub fn stdout() -> Option<Box<Terminal<Box<Writer:Send>:Send>:Send>> {
+    let ti: Option<TerminfoTerminal<Box<Writer:Send>>>
+        = Terminal::new(box std::io::stdout() as Box<Writer:Send>);
 
     match ti {
-        Some(t) => Some(~t as ~Terminal<~Writer:Send>:Send),
+        Some(t) => Some(box t as Box<Terminal<Box<Writer:Send>:Send>:Send>),
         None => {
-            let wc: Option<WinConsole<~Writer:Send>>
-                = Terminal::new(~std::io::stdout() as ~Writer:Send);
-            wc.map(|w| ~w as ~Terminal<~Writer:Send>:Send)
+            let wc: Option<WinConsole<Box<Writer:Send>>>
+                = Terminal::new(box std::io::stdout() as Box<Writer:Send>);
+            wc.map(|w| box w as Box<Terminal<Box<Writer:Send>:Send>:Send>)
         }
     }
 }
@@ -91,25 +91,25 @@ pub fn stdout() -> Option<~Terminal<~Writer:Send>:Send> {
 #[cfg(not(windows))]
 /// Return a Terminal wrapping stderr, or None if a terminal couldn't be
 /// opened.
-pub fn stderr() -> Option<~Terminal<~Writer:Send>:Send> {
-    let ti: Option<TerminfoTerminal<~Writer:Send>>
-        = Terminal::new(~std::io::stderr() as ~Writer:Send);
-    ti.map(|t| ~t as ~Terminal<~Writer:Send>:Send)
+pub fn stderr() -> Option<Box<Terminal<Box<Writer:Send>:Send>:Send>:Send> {
+    let ti: Option<TerminfoTerminal<Box<Writer:Send>>>
+        = Terminal::new(box std::io::stderr() as Box<Writer:Send>);
+    ti.map(|t| box t as Box<Terminal<Box<Writer:Send>:Send>:Send>)
 }
 
 #[cfg(windows)]
 /// Return a Terminal wrapping stderr, or None if a terminal couldn't be
 /// opened.
-pub fn stderr() -> Option<~Terminal<~Writer:Send>:Send> {
-    let ti: Option<TerminfoTerminal<~Writer:Send>>
-        = Terminal::new(~std::io::stderr() as ~Writer:Send);
+pub fn stderr() -> Option<Box<Terminal<Box<Writer:Send>:Send>:Send>> {
+    let ti: Option<TerminfoTerminal<Box<Writer:Send>>>
+        = Terminal::new(box std::io::stderr() as Box<Writer:Send>);
 
     match ti {
-        Some(t) => Some(~t as ~Terminal<~Writer:Send>:Send),
+        Some(t) => Some(box t as Box<Terminal<Box<Writer:Send>:Send>:Send>),
         None => {
-            let wc: Option<WinConsole<~Writer:Send>>
-                = Terminal::new(~std::io::stderr() as ~Writer:Send);
-            wc.map(|w| ~w as ~Terminal<~Writer:Send>:Send)
+            let wc: Option<WinConsole<Box<Writer:Send>>>
+                = Terminal::new(box std::io::stderr() as Box<Writer:Send>);
+            wc.map(|w| box w as Box<Terminal<Box<Writer:Send>:Send>:Send>)
         }
     }
 }
diff --git a/src/libterm/terminfo/mod.rs b/src/libterm/terminfo/mod.rs
index 0c07bbd1e6d..71ea88127a7 100644
--- a/src/libterm/terminfo/mod.rs
+++ b/src/libterm/terminfo/mod.rs
@@ -68,7 +68,7 @@ fn cap_for_attr(attr: attr::Attr) -> &'static str {
 pub struct TerminfoTerminal<T> {
     num_colors: u16,
     out: T,
-    ti: ~TermInfo
+    ti: Box<TermInfo>
 }
 
 impl<T: Writer> Terminal<T> for TerminfoTerminal<T> {
-- 
cgit 1.4.1-3-g733a5