nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

auto merge of #9471 : brson/rust/rustexit, r=thestinger

Browse Source 
This appears to eliminate the common errors with assertions failures
in rust_initialize_rt_tls_key.
This commit is contained in:
bors 2013-09-24 11:46:02 -07:00
commit e3624ed968
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/librust/rust.rs
View File

@ -28,7 +28,6 @@ extern mod rustc;
use std::io;
use std::os;
use std::run;
use std::libc::exit;
enum ValidUsage {
Valid(int), Invalid
@ -235,7 +234,7 @@ pub fn main() {
if (os_args.len() > 1 && (os_args[1] == ~"-v" || os_args[1] == ~"--version")) {
rustc::version(os_args[0]);
unsafe { exit(0); }
return;
}
let args = os_args.tail();
@ -245,8 +244,11 @@ pub fn main() {
for command in r.iter() {
let result = do_command(command, args.tail());
match result {
Valid(exit_code) => unsafe { exit(exit_code.to_i32()) },
_ => loop
Valid(exit_code) => {
os::set_exit_status(exit_code);
return;
}
_ => loop
}
}
}