about summary refs log tree commit diff
path: root/src/libstd/task
diff options
context:
space:
mode:
authortoddaaro <github@opprobrio.us>2013-06-10 15:29:02 -0700
committertoddaaro <github@opprobrio.us>2013-06-10 15:29:02 -0700
commitd64d26cd39a86a40feb0db7a9147cc2ae5e82994 (patch)
tree00cedc9e9b752fa99dfb552b73fa9359cd86b7ce /src/libstd/task
parentd4de99aa6c53b0eb0d5be2ccfc62e2c89b2cd2df (diff)
downloadrust-d64d26cd39a86a40feb0db7a9147cc2ae5e82994.tar.gz
rust-d64d26cd39a86a40feb0db7a9147cc2ae5e82994.zip
debugged a compiler ICE when merging local::borrow changes into the main io branch and modified the incoming new file lang.rs to be api-compatible
Diffstat (limited to 'src/libstd/task')
-rw-r--r--src/libstd/task/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/task/mod.rs b/src/libstd/task/mod.rs
index f24d2327358..df5b88207ec 100644
--- a/src/libstd/task/mod.rs
+++ b/src/libstd/task/mod.rs
@@ -514,7 +514,7 @@ pub fn failing() -> bool {
         }
         _ => {
             let mut unwinding = false;
-            do Local::borrow::<Task> |local| {
+            do Local::borrow::<Task, ()> |local| {
                 unwinding = match local.unwinder {
                     Some(unwinder) => {
                         unwinder.unwinding