---

yaml
---
r: 81077
b: refs/heads/snap-stage3
c: 32f97cc
h: refs/heads/master
i:
  81075: 834432b
v: v3

Author: jbclements

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: e3624ed968905b789b35c2301eb3c8057c05b3b3
+refs/heads/snap-stage3: 32f97cc891a6a2857338b4fcc7bb022e609eac1c
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librust/rust.rs

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

branches/snap-stage3/src/libsyntax/ext/expand.rs

@@ -1640,9 +1640,10 @@ mod test {
                   macro_rules! user(($x:ident) => ({letty!($x); $x}))
                   fn main() -> int {user!(z)}",
                  ~[~[0]], false),
-                // FIXME #8062: this test exposes a *potential* bug; our system does
-                // not behave exactly like MTWT, but I haven't thought of a way that
-                // this could cause a bug in Rust, yet.
+                // no longer a fixme #8062: this test exposes a *potential* bug; our system does
+                // not behave exactly like MTWT, but a conversation with Matthew Flatt
+                // suggests that this can only occur in the presence of local-expand, which
+                // we have no plans to support.
                 // ("fn main() {let hrcoo = 19; macro_rules! getx(()=>(hrcoo)); getx!();}",
                 // ~[~[0]], true)
                 // FIXME #6994: the next string exposes the bug referred to in issue 6994, so I'm
@@ -1655,6 +1656,7 @@ mod test {
                 //   fn a(){g!(z)}"
                 // create a really evil test case where a $x appears inside a binding of $x
                 // but *shouldnt* bind because it was inserted by a different macro....
+                // can't write this test case until we have macro-generating macros.
             ];
         for (idx,s) in tests.iter().enumerate() {
             run_renaming_test(s,idx);