---

yaml
---
r: 151764
b: refs/heads/try2
c: 3af7755
h: refs/heads/master
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: 7bf1de528396f0f2622ca391da0b03d79a27ee52
+refs/heads/try2: 3af77559096ef2df19cdc83e96674b10b27911b6
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libtest/lib.rs

@@ -447,7 +447,7 @@ pub enum TestResult {
 }
 
 enum OutputLocation<T> {
-    Pretty(term::Terminal<T>),
+    Pretty(~term::Terminal<~Writer:Send>:Send),
     Raw(T),
 }
 
@@ -472,10 +472,11 @@ impl<T: Writer> ConsoleTestState<T> {
             Some(ref path) => Some(try!(File::create(path))),
             None => None
         };
-        let out = match term::Terminal::new(io::stdio::stdout_raw()) {
-            Err(_) => Raw(io::stdio::stdout_raw()),
-            Ok(t) => Pretty(t)
+        let out = match term::stdout() {
+            None => Raw(io::stdio::stdout_raw()),
+            Some(t) => Pretty(t)
         };
+
         Ok(ConsoleTestState {
             out: out,
             log_out: log_out,