---

yaml
---
r: 92862
b: refs/heads/auto
c: 250ca0e
h: refs/heads/master
v: v3

Author: bors

[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: d255d4a4ff394da96bb669fef7a70871e08498fa
+refs/heads/auto: 250ca0eb85ca7bf4497cdf68ecbaa5f90dc7439d
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libextra/getopts.rs

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

branches/auto/src/librustc/back/link.rs

@@ -11,7 +11,6 @@
 
 use back::archive::{Archive, METADATA_FILENAME};
 use back::rpath;
-use back::manifest;
 use driver::driver::CrateTranslation;
 use driver::session::Session;
 use driver::session;
@@ -828,12 +827,6 @@ fn link_binary_output(sess: Session,
         }
         session::OutputExecutable => {
             link_natively(sess, false, obj_filename, &out_filename);
-            // Windows linker will add an ".exe" extension if there was none
-            let out_filename = match out_filename.extension() {
-                Some(_) => out_filename.clone(),
-                None => out_filename.with_extension(win32::EXE_EXTENSION)
-            };
-            manifest::postprocess_executable(sess, &out_filename);
         }
         session::OutputDylib => {
             link_natively(sess, true, obj_filename, &out_filename);

branches/auto/src/librustc/back/manifest.rs

@@ -88,7 +88,6 @@ pub mod front {
 pub mod back {
     pub mod archive;
     pub mod link;
-    pub mod manifest;
     pub mod abi;
     pub mod arm;
     pub mod mips;

branches/auto/src/librustc/lib.rs

@@ -138,7 +138,6 @@ fn maketest(s: &str, cratename: &str) -> @str {
     let mut prog = ~r"
 #[deny(warnings)];
 #[allow(unused_variable, dead_assignment, unused_mut, attribute_usage, dead_code)];
-#[feature(macro_rules, globs, struct_variant, managed_boxes)];
 ";
     if s.contains("extra") {
         prog.push_str("extern mod extra;\n");

branches/auto/src/librustdoc/test.rs

@@ -180,22 +180,29 @@ impl Unwinder {
         self.unwinding = true;
         self.cause = Some(cause);
 
-        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)
-        }
+        rust_fail();
 
-        extern "C" fn exception_cleanup(_unwind_code: uw::_Unwind_Reason_Code,
-                                        exception: *uw::_Unwind_Exception) {
-            rtdebug!("exception_cleanup()");
+        // An uninlined, unmangled function upon which to slap yer breakpoints
+        #[inline(never)]
+        #[no_mangle]
+        fn rust_fail() -> ! {
             unsafe {
-                let _: ~uw::_Unwind_Exception = cast::transmute(exception);
+                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);
+                }
             }
         }
     }

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

@@ -38,11 +38,15 @@ there are three common kinds of strings in rust:
 As an example, here's a few different kinds of strings.
 
 ```rust
-let owned_string = ~"I am an owned string";
-let managed_string = @"This string is garbage-collected";
-let borrowed_string1 = "This string is borrowed with the 'static lifetime";
-let borrowed_string2: &str = owned_string;   // owned strings can be borrowed
-let borrowed_string3: &str = managed_string; // managed strings can also be borrowed
+#[feature(managed_boxes)];
+
+fn main() {
+    let owned_string = ~"I am an owned string";
+    let managed_string = @"This string is garbage-collected";
+    let borrowed_string1 = "This string is borrowed with the 'static lifetime";
+    let borrowed_string2: &str = owned_string;   // owned strings can be borrowed
+    let borrowed_string3: &str = managed_string; // managed strings can also be borrowed
+}
  ```
 
 From the example above, you can see that rust has 3 different kinds of string