---

yaml
---
r: 147791
b: refs/heads/try2
c: d255d4a
h: refs/heads/master
i:
  147789: ac49069
  147787: e021df8
  147783: 36dd1cb
  147775: a5a6c9b
v: v3

Author: huonw

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: d459e805df076ace12ed3f7f57f2b1378f0e2403
+refs/heads/try2: d255d4a4ff394da96bb669fef7a70871e08498fa
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libextra/getopts.rs

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

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

@@ -11,6 +11,7 @@
 
 use back::archive::{Archive, METADATA_FILENAME};
 use back::rpath;
+use back::manifest;
 use driver::driver::CrateTranslation;
 use driver::session::Session;
 use driver::session;
@@ -827,6 +828,12 @@ 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/try2/src/librustc/back/manifest.rs

@@ -0,0 +1,106 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+
+// To avoid problems with Windows UAC installer detection heuristics,
+// Rust-produced executables need an application manifest.
+// For details, see issue #10512.
+
+// No-op on other platforms.
+
+use driver::session::Session;
+use std::path::Path;
+
+#[cfg(not(windows))]
+pub fn postprocess_executable(_sess: Session, _filename: &Path) {}
+
+#[cfg(windows)]
+pub fn postprocess_executable(sess: Session, filename: &Path) {
+
+    let default_manifest = concat!(
+        "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>",
+        "<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>",
+        "  <trustInfo xmlns='urn:schemas-microsoft-com:asm.v3'>",
+        "    <security>",
+        "      <requestedPrivileges>",
+        "        <requestedExecutionLevel level='asInvoker' uiAccess='false' />",
+        "      </requestedPrivileges>",
+        "    </security>",
+        "  </trustInfo>",
+        "</assembly>");
+
+    match windows::embed_manifest(filename, default_manifest) {
+        Ok(_) => (),
+        Err(msg) => sess.err(format!("Could not embed application manifest: {}", msg))
+    }
+}
+
+#[cfg(windows)]
+mod windows {
+    use std::libc::types::os::arch::extra::{BOOL,WORD,DWORD,HANDLE,LPCWSTR,LPCVOID};
+    use std::libc::consts::os::extra::FALSE;
+    use std::cast::transmute;
+    use std::os;
+
+    // FIXME #9053: should import as_utf16_p from std rather than re-defining here
+    //use std::os::win32::as_utf16_p;
+    fn as_utf16_p<T>(s: &str, f: |*u16| -> T) -> T {
+        let mut t = s.to_utf16();
+        // Null terminate before passing on.
+        t.push(0u16);
+        f(t.as_ptr())
+    }
+
+    #[link_name = "kernel32"]
+    extern "system" {
+        pub fn BeginUpdateResourceW(pFileName: LPCWSTR,
+                                    bDeleteExistingResources: BOOL) -> HANDLE;
+        pub fn UpdateResourceW(hUpdate: HANDLE,
+                               lpType: LPCWSTR,
+                               lpName: LPCWSTR,
+                               wLanguage: WORD,
+                               lpData: LPCVOID,
+                               cbData: DWORD) -> BOOL;
+        pub fn EndUpdateResourceW(hUpdate: HANDLE,
+                                  fDiscard: BOOL) -> BOOL;
+    }
+
+    fn MAKEINTRESOURCEW(id: int) -> LPCWSTR {
+        unsafe{ transmute(id) }
+    }
+
+    pub fn embed_manifest(filename: &Path,
+                          manifest: &str) -> Result<(),~str> {
+        unsafe {
+            let hUpdate = as_utf16_p(filename.as_str().unwrap(), |path| {
+                BeginUpdateResourceW(path, FALSE)
+            });
+            if hUpdate.is_null() {
+                return Err(format!("failure in BeginUpdateResourceW: {}", os::last_os_error()));
+            }
+
+            let ok = UpdateResourceW(hUpdate,
+                                     MAKEINTRESOURCEW(24), // RT_MANIFEST
+                                     MAKEINTRESOURCEW(1),  // CREATEPROCESS_MANIFEST_RESOURCE_ID
+                                     0,                    // LANG_NEUTRAL, SUBLANG_NEUTRAL
+                                     manifest.as_ptr() as LPCVOID,
+                                     manifest.len() as u32);
+            if ok == FALSE {
+                return Err(format!("failure in UpdateResourceW: {}", os::last_os_error()));
+            }
+
+            let ok = EndUpdateResourceW(hUpdate, FALSE);
+            if ok == FALSE {
+                return Err(format!("failure in EndUpdateResourceW: {}", os::last_os_error()));
+            }
+            Ok(())
+        }
+    }
+}

branches/try2/src/librustc/lib.rs

@@ -88,6 +88,7 @@ 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/try2/src/librustdoc/test.rs

@@ -138,6 +138,7 @@ 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/try2/src/libstd/rt/logging.rs

@@ -17,7 +17,7 @@ use io::stdio::StdWriter;
 use io::buffered::LineBufferedWriter;
 use rt::crate_map::{ModEntry, CrateMap, iter_crate_map, get_crate_map};
 use str::StrSlice;
-use vec::ImmutableVector;
+use vec::{ImmutableVector, MutableTotalOrdVector};
 #[cfg(test)] use cast::transmute;
 
 struct LogDirective {
@@ -141,7 +141,14 @@ fn update_log_settings(crate_map: &CrateMap, settings: ~str) {
     if settings.len() > 0 {
         if settings == ~"::help" || settings == ~"?" {
             rterrln!("\nCrate log map:\n");
-            iter_crate_map(crate_map, |entry| rterrln!(" {}", entry.name));
+
+            let mut entries = ~[];
+            iter_crate_map(crate_map, |entry| entries.push(entry.name.to_owned()));
+            entries.sort();
+
+            for name in entries.iter() {
+                rterrln!(" {}", *name);
+            }
             unsafe { exit(1); }
         }
         dirs = parse_logging_spec(settings);

branches/try2/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);
             }
         }
     }

branches/try2/src/libstd/str.rs

@@ -38,15 +38,11 @@ there are three common kinds of strings in rust:
 As an example, here's a few different kinds of strings.
 
 ```rust
-#[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
-}
+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

branches/try2/src/test/run-pass/setup.rs

@@ -0,0 +1,19 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// On Windows this test checks that Rust binaries have an embedded
+// application manifest and don't trip UAC installer detection
+// heuristics ("setup" is one of the "installer" keywords).
+// For details, see issue #10512.
+
+// On other platforms this is a no-op.
+
+pub fn main() {
+}