diff options
| author | Marijn Haverbeke <marijnh@gmail.com> | 2011-10-20 12:32:43 +0200 |
|---|---|---|
| committer | Marijn Haverbeke <marijnh@gmail.com> | 2011-10-20 14:22:17 +0200 |
| commit | 457683c7feef42f07f3044ccfdc8ee7816176ab0 (patch) | |
| tree | 4e8fe9608e807fa86ae14b839fb2fac7d4cfc20f /src/lib | |
| parent | 6323a012bd1417451cd81f00679039d630dc1695 (diff) | |
Do not pass taskpointers to "rust" native functions
Issue #466
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/run_program.rs | 6 | ||||
| -rw-r--r-- | src/lib/task.rs | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/run_program.rs b/src/lib/run_program.rs index cb36179587f..8e5c949f361 100644 --- a/src/lib/run_program.rs +++ b/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 */ diff --git a/src/lib/task.rs b/src/lib/task.rs index de1a749fee3..bcc37f4d09d 100644 --- a/src/lib/task.rs +++ b/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); |
