Don't abort the process in native::start

If the main closure failed, then the `exit_code` variable would still be `None`,
and the `unwrap()` was failing (triggering a process abort). This changes the
`unwrap()` to an `unwrap_or()` in order to prevent process abort and detect when
the native task failed.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/libnative/lib.rs b/src/libnative/lib.rs
index b3b83fda599..9c30e94194d 100644
--- a/src/libnative/lib.rs
+++ b/src/libnative/lib.rs
@@ -73,7 +73,8 @@ pub fn start(argc: int, argv: **u8, main: proc()) -> int {
         exit_code = Some(run(main.take_unwrap()));
     });
     unsafe { rt::cleanup(); }
-    return exit_code.unwrap();
+    // If the exit code wasn't set, then the task block must have failed.
+    return exit_code.unwrap_or(rt::DEFAULT_ERROR_CODE);
 }
 
 /// Executes a procedure on the current thread in a Rust task context.