---

yaml
---
r: 95626
b: refs/heads/dist-snap
c: e117aa0
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 61ed2cfb5516f76487509766b1054275f1340f70
+refs/heads/dist-snap: e117aa0e2a4121aab101cb7526a5e79812bfb76e
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libstd/rt/task.rs

@@ -546,7 +546,6 @@ pub fn begin_unwind(msg: *c_char, file: *c_char, line: size_t) -> ! {
     use rt::in_green_task_context;
     use rt::task::Task;
     use rt::local::Local;
-    use rt::logging::Logger;
     use str::Str;
     use c_str::CString;
     use unstable::intrinsics;
@@ -573,16 +572,19 @@ pub fn begin_unwind(msg: *c_char, file: *c_char, line: size_t) -> ! {
         // have been failing due to a lack of memory in the first place...
         let task: *mut Task = Local::unsafe_borrow();
         let n = (*task).name.as_ref().map(|n| n.as_slice()).unwrap_or("<unnamed>");
+
+        // XXX: this should no get forcibly printed to the console, this should
+        //      either be sent to the parent task (ideally), or get printed to
+        //      the task's logger. Right now the logger is actually a uvio
+        //      instance, which uses unkillable blocks internally for various
+        //      reasons. This will cause serious trouble if the task is failing
+        //      due to mismanagment of its own kill flag, so calling our own
+        //      logger in its current state is a bit of a problem.
         match file.as_str() {
             Some(file) => {
-                format_args!(|args| { (*task).logger.log(args) },
-                             "task '{}' failed at '{}', {}:{}",
-                             n, msg, file, line);
-            }
-            None => {
-                format_args!(|args| { (*task).logger.log(args) },
-                             "task '{}' failed at '{}'", n, msg);
+                rterrln!("task '{}' failed at '{}', {}:{}", n, msg, file, line);
             }
+            None => rterrln!("task '{}' failed at '{}'", n, msg),
         }
         if (*task).unwinder.unwinding {
             rtabort!("unwinding again");

branches/dist-snap/src/libstd/rt/util.rs

@@ -72,8 +72,8 @@ pub fn default_sched_threads() -> uint {
 pub fn dumb_println(args: &fmt::Arguments) {
     use rt::io::native::stdio::stderr;
     use rt::io::{Writer, io_error, ResourceUnavailable};
-    let mut out = stderr();
 
+    let mut out = stderr();
     let mut again = true;
     do io_error::cond.trap(|e| {
         again = e.kind == ResourceUnavailable;