---

yaml
---
r: 94835
b: refs/heads/try
c: a60f12d
h: refs/heads/master
i:
  94833: 472848f
  94831: 578e8ea
v: v3

Author: alan-andrade

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: b88138a3ec4bb142fa514a863b62f955bf1c44e3
+refs/heads/try: a60f12d84cc50978b09d1a092047025c7cc2df5e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libextra/getopts.rs

@@ -31,7 +31,7 @@
 //!
 //! ~~~{.rust}
 //! extern mod extra;
-//! use extra::getopts::*;
+//! use extra::getopts::{optopt,optflag,getopts};
 //! use std::os;
 //!
 //! fn do_work(inp: &str, out: Option<~str>) {

branches/try/src/libstd/rt/unwind.rs

@@ -180,29 +180,22 @@ impl Unwinder {
         self.unwinding = true;
         self.cause = Some(cause);
 
-        rust_fail();
+        unsafe {
+            let exception = ~uw::_Unwind_Exception {
+                exception_class: rust_exception_class(),
+                exception_cleanup: exception_cleanup,
+                private_1: 0,
+                private_2: 0
+            };
+            let error = uw::_Unwind_RaiseException(cast::transmute(exception));
+            rtabort!("Could not unwind stack, error = {}", error as int)
+        }
 
-        // An uninlined, unmangled function upon which to slap yer breakpoints
-        #[inline(never)]
-        #[no_mangle]
-        fn rust_fail() -> ! {
+        extern "C" fn exception_cleanup(_unwind_code: uw::_Unwind_Reason_Code,
+                                        exception: *uw::_Unwind_Exception) {
+            rtdebug!("exception_cleanup()");
             unsafe {
-                let exception = ~uw::_Unwind_Exception {
-                    exception_class: rust_exception_class(),
-                    exception_cleanup: exception_cleanup,
-                    private_1: 0,
-                    private_2: 0
-                };
-                let error = uw::_Unwind_RaiseException(cast::transmute(exception));
-                rtabort!("Could not unwind stack, error = {}", error as int)
-            }
-
-            extern "C" fn exception_cleanup(_unwind_code: uw::_Unwind_Reason_Code,
-                                            exception: *uw::_Unwind_Exception) {
-                rtdebug!("exception_cleanup()");
-                unsafe {
-                    let _: ~uw::_Unwind_Exception = cast::transmute(exception);
-                }
+                let _: ~uw::_Unwind_Exception = cast::transmute(exception);
             }
         }
     }