---

yaml
---
r: 151767
b: refs/heads/try2
c: 2afa42a
h: refs/heads/master
i:
  151765: 19aefd7
  151763: 46b5327
  151759: aef3e2e
v: v3

Author: emberian

[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: c4cf6ca8addb2b22c077bfa30e8112f5a6087f4a
+refs/heads/try2: 2afa42a32ee4422a5f1f6b82f177ee54312f5164
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libsyntax/diagnostic.rs

@@ -259,7 +259,7 @@ pub struct EmitterWriter {
 }
 
 enum Destination {
-    Terminal(~term::Terminal<~Writer:Send>:Send),
+    Terminal(Box<term::Terminal<Box<Writer:Send>>:Send>),
     Raw(Box<Writer:Send>),
 }
 

branches/try2/src/libterm/lib.rs

@@ -65,51 +65,51 @@ 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>)
         }
     }
 }
 
 #[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>)
         }
     }
 }

branches/try2/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> {

branches/try2/src/libtest/lib.rs

@@ -447,7 +447,7 @@ pub enum TestResult {
 }
 
 enum OutputLocation<T> {
-    Pretty(~term::Terminal<~Writer:Send>:Send),
+    Pretty(Box<term::Terminal<Box<Writer:Send>>:Send>),
     Raw(T),
 }