diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-04-03 20:29:12 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-04-03 20:30:01 -0700 |
| commit | e325146eb436c4995385d8220ff7ac3a4a5f62ab (patch) | |
| tree | 999875912f33a00906c76f1eac278251bf63658a /src/rt/rust.cpp | |
| parent | bd97ee65200966e6c3b0fb45de1fc771c3cf5f3f (diff) | |
| parent | 4cf7efc8f7df215b0ff9e3ea15b7890b84db1b51 (diff) | |
| download | rust-e325146eb436c4995385d8220ff7ac3a4a5f62ab.tar.gz rust-e325146eb436c4995385d8220ff7ac3a4a5f62ab.zip | |
Merge remote-tracking branch 'brson/mainthread'
Conflicts: src/rt/rust_kernel.cpp src/rt/rust_scheduler.cpp src/rt/rust_scheduler.h
Diffstat (limited to 'src/rt/rust.cpp')
| -rw-r--r-- | src/rt/rust.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rt/rust.cpp b/src/rt/rust.cpp index 4f9cd3bf7fd..2fed06854cb 100644 --- a/src/rt/rust.cpp +++ b/src/rt/rust.cpp @@ -93,7 +93,7 @@ rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) { root_task->start((spawn_fn)main_fn, NULL, args->args); root_task = NULL; - int ret = kernel->wait_for_exit(); + int ret = kernel->run(); delete args; delete kernel; |