---

yaml
---
r: 6259
b: refs/heads/master
c: 9b9fc33
h: refs/heads/master
i:
  6257: 0f3f8da
  6255: 79903ef
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2dd5f5cff2e64198a248997635c9ca7a9dd6384
+refs/heads/master: 9b9fc33663ea20242181e3c5a2f13efc0f40b377

trunk/src/test/run-fail/linked-failure4.rs

@@ -1,31 +1,27 @@
 // -*- rust -*-
 // error-pattern:1 == 2
-// xfail-test Been deadlocking on mac
 use std;
 import std::task;
 import std::comm::chan;
 import std::comm::port;
 import std::comm::recv;
 
-fn child() { assert (1 == 2); }
+fn child(&&_args: ()) { assert (1 == 2); }
 
-fn parent() {
+fn parent(&&_args: ()) {
     let p = port::<int>();
-    let f = child;
-    task::spawn(f);
+    task::spawn((), child);
     let x = recv(p);
 }
 
 // This task is not linked to the failure chain, but since the other
 // tasks are going to fail the kernel, this one will fail too
-fn sleeper() {
+fn sleeper(&&_args: ()) {
     let p = port::<int>();
     let x = recv(p);
 }
 
 fn main() {
-    let g = sleeper;
-    task::spawn(g);
-    let f = parent;
-    task::spawn(f);
+    task::spawn((), sleeper);
+    task::spawn((), parent);
 }