---

yaml
---
r: 5856
b: refs/heads/master
c: 457683c
h: refs/heads/master
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6323a012bd1417451cd81f00679039d630dc1695
+refs/heads/master: 457683c7feef42f07f3044ccfdc8ee7816176ab0

trunk/src/comp/middle/trans.rs

@@ -5762,7 +5762,7 @@ fn register_native_fn(ccx: @crate_ctxt, sp: span, path: [str], name: str,
     let cast_to_i32;
     alt abi {
       ast::native_abi_rust. {
-        pass_task = true;
+        pass_task = false;
         uses_retptr = false;
         cast_to_i32 = true;
       }

trunk/src/lib/run_program.rs

@@ -114,9 +114,9 @@ fn program_output(prog: str, args: [str]) ->
    {status: int, out: str, err: str} {
     let pr = start_program(prog, args);
     pr.close_input();
-    ret {status: pr.finish(),
-         out: read_all(pr.output()),
-         err: read_all(pr.err())};
+    let out = read_all(pr.output());
+    let err = read_all(pr.err());
+    ret {status: pr.finish(), out: out, err: err};
 }
 
 /* Returns an exit status */

trunk/src/lib/task.rs

@@ -38,7 +38,6 @@ native "rust" mod rustrt {
     fn new_task() -> task_id;
     fn drop_task(task: *rust_task);
     fn get_task_pointer(id: task_id) -> *rust_task;
-    fn get_task_trampoline() -> u32;
 
     fn migrate_alloc(alloc: *u8, target: task_id);
     fn start_task(id: task_id, closure: *u8);