---

yaml
---
r: 63459
b: refs/heads/snap-stage3
c: 021e81f
h: refs/heads/master
i:
  63457: f9f55b2
  63455: 0e9d430
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 9ef4c413a869b4fc1e5df3f79f484b2ffd46cda0
+refs/heads/snap-stage3: 021e81fbd311d93c94cbd40524ff53062fd7fe6e
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/macros.rs

@@ -39,18 +39,10 @@ macro_rules! rtassert (
 )
 
 
-// The do_abort function was originally inside the abort macro, but
-// this was ICEing the compiler so it has been moved outside. Now this
-// seems to work?
-#[allow(missing_doc)]
-pub fn do_abort() -> ! {
-    unsafe { ::libc::abort(); }
-}
-
 macro_rules! abort(
     ($( $msg:expr),+) => ( {
         rtdebug!($($msg),+);
-        ::macros::do_abort();
+        ::rt::util::abort();
     } )
 )
 

branches/snap-stage3/src/libstd/rt/util.rs

@@ -19,4 +19,8 @@ pub fn num_cpus() -> uint {
     extern {
         fn rust_get_num_cpus() -> libc::uintptr_t;
     }
+}
+
+pub fn abort() -> ! {
+    unsafe { libc::abort(); }
 }