---

yaml
---
r: 82602
b: refs/heads/auto
c: 90e009f
h: refs/heads/master
v: v3

Author: luqmana

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 6d03897376f8737e28a93693f90bd651e9d08e92
+refs/heads/auto: 90e009f9b6aae3b3a9f500f07bca07b531e54507
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libextra/test.rs

@@ -30,6 +30,7 @@ use treemap::TreeMap;
 
 use std::clone::Clone;
 use std::comm::{stream, SharedChan, GenericPort, GenericChan};
+use std::libc;
 use std::io;
 use std::result;
 use std::task;
@@ -124,9 +125,8 @@ pub type MetricDiff = TreeMap<~str,MetricChange>;
 pub fn test_main(args: &[~str], tests: ~[TestDescAndFn]) {
     let opts =
         match parse_opts(args) {
-            Some(Ok(o)) => o,
-            Some(Err(msg)) => fail!(msg),
-            None => return
+            Ok(o) => o,
+            Err(msg) => fail!(msg)
         };
     if !run_tests_console(&opts, tests) { fail!("Some tests failed"); }
 }
@@ -189,7 +189,7 @@ fn optgroups() -> ~[getopts::groups::OptGroup] {
                      "A.B")]
 }
 
-fn usage(binary: &str, helpstr: &str) {
+fn usage(binary: &str, helpstr: &str) -> ! {
     #[fixed_stack_segment]; #[inline(never)];
 
     let message = fmt!("Usage: %s [OPTIONS] [FILTER]", binary);
@@ -217,19 +217,20 @@ Test Attributes:
                      tests. This may also be written as #[ignore(cfg(...))] to
                      ignore the test on certain configurations.");
     }
+    unsafe { libc::exit(0) }
 }
 
 // Parses command line arguments into test options
-pub fn parse_opts(args: &[~str]) -> Option<OptRes> {
+pub fn parse_opts(args: &[~str]) -> OptRes {
     let args_ = args.tail();
     let matches =
         match groups::getopts(args_, optgroups()) {
           Ok(m) => m,
-          Err(f) => return Some(Err(f.to_err_msg()))
+          Err(f) => return Err(f.to_err_msg())
         };
 
-    if matches.opt_present("h") { usage(args[0], "h"); return None; }
-    if matches.opt_present("help") { usage(args[0], "help"); return None; }
+    if matches.opt_present("h") { usage(args[0], "h"); }
+    if matches.opt_present("help") { usage(args[0], "help"); }
 
     let filter =
         if matches.free.len() > 0 {
@@ -271,7 +272,7 @@ pub fn parse_opts(args: &[~str]) -> Option<OptRes> {
         logfile: logfile
     };
 
-    Some(Ok(test_opts))
+    Ok(test_opts)
 }
 
 pub fn opt_shard(maybestr: Option<~str>) -> Option<(uint,uint)> {
@@ -1227,7 +1228,7 @@ mod tests {
     fn first_free_arg_should_be_a_filter() {
         let args = ~[~"progname", ~"filter"];
         let opts = match parse_opts(args) {
-            Some(Ok(o)) => o,
+            Ok(o) => o,
             _ => fail!("Malformed arg in first_free_arg_should_be_a_filter")
         };
         assert!("filter" == opts.filter.clone().unwrap());
@@ -1237,7 +1238,7 @@ mod tests {
     fn parse_ignored_flag() {
         let args = ~[~"progname", ~"filter", ~"--ignored"];
         let opts = match parse_opts(args) {
-            Some(Ok(o)) => o,
+            Ok(o) => o,
             _ => fail!("Malformed arg in parse_ignored_flag")
         };
         assert!((opts.run_ignored));

branches/auto/src/librust/rust.rs

@@ -45,7 +45,7 @@ impl ValidUsage {
 
 enum Action {
     Call(extern "Rust" fn(args: &[~str]) -> ValidUsage),
-    CallMain(&'static str, extern "Rust" fn(&[~str]) -> int),
+    CallMain(&'static str, extern "Rust" fn(&[~str])),
 }
 
 enum UsageSource<'self> {
@@ -186,17 +186,18 @@ fn cmd_run(args: &[~str]) -> ValidUsage {
     }
 }
 
-fn invoke(prog: &str, args: &[~str], f: &fn(&[~str]) -> int) -> int {
+fn invoke(prog: &str, args: &[~str], f: &fn(&[~str])) {
     let mut osargs = ~[prog.to_owned()];
     osargs.push_all_move(args.to_owned());
-    f(osargs)
+    f(osargs);
 }
 
 fn do_command(command: &Command, args: &[~str]) -> ValidUsage {
     match command.action {
         Call(f) => f(args),
         CallMain(prog, f) => {
-            Valid(invoke(prog, args, f))
+            invoke(prog, args, f);
+            Valid(0)
         }
     }
 }

branches/auto/src/librustc/middle/trans/base.rs

@@ -2949,7 +2949,7 @@ pub fn decl_crate_map(sess: session::Session, mapmeta: LinkMeta,
     };
     let sym_name = ~"_rust_crate_map_" + mapname;
     let arrtype = Type::array(&int_type, n_subcrates as u64);
-    let maptype = Type::struct_([Type::i32(), Type::i8p(), int_type, arrtype], false);
+    let maptype = Type::struct_([Type::i32(), int_type, arrtype], false);
     let map = do sym_name.with_c_str |buf| {
         unsafe {
             llvm::LLVMAddGlobal(llmod, maptype.to_ref(), buf)
@@ -2990,8 +2990,6 @@ pub fn fill_crate_map(ccx: @mut CrateContext, map: ValueRef) {
         let mod_map = create_module_map(ccx);
         llvm::LLVMSetInitializer(map, C_struct(
             [C_i32(1),
-             // FIXME #8431 This used to be the annihilate function, now it's nothing
-             C_null(Type::i8p()),
              p2i(ccx, mod_map),
              C_array(ccx.int_type, subcrates)]));
     }

branches/auto/src/librustc/rustc.rs

@@ -394,14 +394,13 @@ pub fn monitor(f: ~fn(@diagnostic::Emitter)) {
 }
 
 pub fn main() {
-    std::os::set_exit_status(main_args(std::os::args()));
+    let args = os::args();
+    main_args(args);
 }
 
-pub fn main_args(args: &[~str]) -> int {
+pub fn main_args(args: &[~str]) {
     let owned_args = args.to_owned();
     do monitor |demitter| {
         run_compiler(owned_args, demitter);
     }
-
-    return 0;
 }

branches/auto/src/librustdoc/rustdoc.rs

@@ -52,7 +52,7 @@ enum OutputFormat {
 }
 
 pub fn main() {
-    std::os::set_exit_status(main_args(std::os::args()));
+    main_args(std::os::args());
 }
 
 pub fn opts() -> ~[groups::OptGroup] {
@@ -76,14 +76,14 @@ pub fn usage(argv0: &str) {
                                   argv0), opts()));
 }
 
-pub fn main_args(args: &[~str]) -> int {
+pub fn main_args(args: &[~str]) {
     //use extra::getopts::groups::*;
 
     let matches = groups::getopts(args.tail(), opts()).unwrap();
 
     if matches.opt_present("h") || matches.opt_present("help") {
         usage(args[0]);
-        return 0;
+        return;
     }
 
     let (format, cratefile) = match matches.free.clone() {
@@ -92,17 +92,17 @@ pub fn main_args(args: &[~str]) -> int {
         [s, _] => {
             println!("Unknown output format: `{}`", s);
             usage(args[0]);
-            return 1;
+            exit(1);
         }
         [_, .._] => {
             println!("Expected exactly one crate to process");
             usage(args[0]);
-            return 1;
+            exit(1);
         }
         _ => {
             println!("Expected an output format and then one crate");
             usage(args[0]);
-            return 1;
+            exit(1);
         }
     };
 
@@ -179,8 +179,6 @@ pub fn main_args(args: &[~str]) -> int {
     }
     let ended = time::precise_time_ns();
     info2!("Took {:.03f}s", (ended as f64 - started as f64) / 1000000000f64);
-
-    return 0;
 }
 
 fn jsonify(crate: clean::Crate, res: ~[plugins::PluginJson], dst: Path) {
@@ -210,3 +208,9 @@ fn jsonify(crate: clean::Crate, res: ~[plugins::PluginJson], dst: Path) {
     let output = extra::json::Object(json).to_str();
     file.write(output.as_bytes());
 }
+
+fn exit(status: int) -> ! {
+    #[fixed_stack_segment]; #[inline(never)];
+    use std::libc;
+    unsafe { libc::exit(status as libc::c_int) }
+}

branches/auto/src/librusti/rusti.rs

@@ -517,7 +517,8 @@ pub fn run_line(repl: &mut Repl, input: @io::Reader, out: @io::Writer, line: ~st
 }
 
 pub fn main() {
-    os::set_exit_status(main_args(os::args()));
+    let args = os::args();
+    main_args(args);
 }
 
 struct Completer;
@@ -533,7 +534,7 @@ impl CompletionCb for Completer {
     }
 }
 
-pub fn main_args(args: &[~str]) -> int {
+pub fn main_args(args: &[~str]) {
     #[fixed_stack_segment]; #[inline(never)];
 
     let input = io::stdin();
@@ -575,8 +576,6 @@ pub fn main_args(args: &[~str]) -> int {
             }
         }
     }
-
-    return 0;
 }
 
 #[cfg(test)]

branches/auto/src/librustpkg/rustpkg.rs

@@ -615,10 +615,11 @@ impl CtxMethods for BuildContext {
 
 pub fn main() {
     io::println("WARNING: The Rust package manager is experimental and may be unstable");
-    os::set_exit_status(main_args(os::args()));
+    let args = os::args();
+    main_args(args);
 }
 
-pub fn main_args(args: &[~str]) -> int {
+pub fn main_args(args: &[~str]) {
     let opts = ~[getopts::optflag("h"), getopts::optflag("help"),
                                         getopts::optflag("no-link"),
                                         getopts::optflag("no-trans"),
@@ -644,7 +645,7 @@ pub fn main_args(args: &[~str]) -> int {
         result::Err(f) => {
             error(fmt!("%s", f.to_err_msg()));
 
-            return 1;
+            return;
         }
     };
     let mut help = matches.opt_present("h") ||
@@ -661,7 +662,7 @@ pub fn main_args(args: &[~str]) -> int {
     if matches.opt_present("v") ||
        matches.opt_present("version") {
         rustc::version(args[0]);
-        return 0;
+        return;
     }
 
     let use_rust_path_hack = matches.opt_present("r") ||
@@ -700,8 +701,7 @@ pub fn main_args(args: &[~str]) -> int {
     args.shift();
 
     if (args.len() < 1) {
-        usage::general();
-        return 1;
+        return usage::general();
     }
 
     let rustc_flags = RustcFlags {
@@ -739,14 +739,11 @@ pub fn main_args(args: &[~str]) -> int {
         }
     }
     let cmd = match cmd_opt {
-        None => {
-            usage::general();
-            return 0;
-        }
+        None => return usage::general(),
         Some(cmd) => {
             help |= context::flags_ok_for_cmd(&rustc_flags, cfgs, *cmd, user_supplied_opt_level);
             if help {
-                match *cmd {
+                return match *cmd {
                     ~"build" => usage::build(),
                     ~"clean" => usage::clean(),
                     ~"do" => usage::do_cmd(),
@@ -760,7 +757,6 @@ pub fn main_args(args: &[~str]) -> int {
                     ~"unprefer" => usage::unprefer(),
                     _ => usage::general()
                 };
-                return 0;
             } else {
                 cmd
             }
@@ -798,8 +794,8 @@ pub fn main_args(args: &[~str]) -> int {
     // and at least one test case succeeds if rustpkg returns COPY_FAILED_CODE,
     // when actually, it might set the exit code for that even if a different
     // unhandled condition got raised.
-    if result.is_err() { return COPY_FAILED_CODE; }
-    return 0;
+    if result.is_err() { os::set_exit_status(COPY_FAILED_CODE); }
+
 }
 
 /**