---

yaml
---
r: 97245
b: refs/heads/dist-snap
c: 705f472
h: refs/heads/master
i:
  97243: bb9cb91
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: a1d3cc53860b1e2377e489333e1f41dec6132b10
+refs/heads/dist-snap: 705f472c5509ec3a8fe3448541282eca1386344a
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libextra/num/rational.rs

@@ -14,7 +14,7 @@
 use std::cmp;
 use std::from_str::FromStr;
 use std::num::{Zero,One,ToStrRadix,FromStrRadix,Round};
-use super::bigint::{BigInt, BigUint, Sign, Plus, Minus};
+use super::bigint::BigInt;
 
 /// Represents the ratio between 2 numbers.
 #[deriving(Clone)]
@@ -107,27 +107,6 @@ impl<T: Clone + Integer + Ord>
     }
 }
 
-impl Ratio<BigInt> {
-    /// Converts a float into a rational number
-    pub fn from_float<T: Float>(f: T) -> Option<BigRational> {
-        if !f.is_finite() {
-            return None;
-        }
-        let (mantissa, exponent, sign) = f.integer_decode();
-        let bigint_sign: Sign = if sign == 1 { Plus } else { Minus };
-        if exponent < 0 {
-            let one: BigInt = One::one();
-            let denom: BigInt = one << ((-exponent) as uint);
-            let numer: BigUint = FromPrimitive::from_u64(mantissa).unwrap();
-            Some(Ratio::new(BigInt::from_biguint(bigint_sign, numer), denom))
-        } else {
-            let mut numer: BigUint = FromPrimitive::from_u64(mantissa).unwrap();
-            numer = numer << (exponent as uint);
-            Some(Ratio::from_integer(BigInt::from_biguint(bigint_sign, numer)))
-        }
-    }
-}
-
 /* Comparisons */
 
 // comparing a/b and c/d is the same as comparing a*d and b*c, so we
@@ -642,42 +621,4 @@ mod test {
             test(s);
         }
     }
-
-    #[test]
-    fn test_from_float() {
-        fn test<T: Float>(given: T, (numer, denom): (&str, &str)) {
-            let ratio: BigRational = Ratio::from_float(given).unwrap();
-            assert_eq!(ratio, Ratio::new(
-                FromStr::from_str(numer).unwrap(),
-                FromStr::from_str(denom).unwrap()));
-        }
-
-        // f32
-        test(3.14159265359f32, ("13176795", "4194304"));
-        test(2f32.pow(&100.), ("1267650600228229401496703205376", "1"));
-        test(-2f32.pow(&100.), ("-1267650600228229401496703205376", "1"));
-        test(1.0 / 2f32.pow(&100.), ("1", "1267650600228229401496703205376"));
-        test(684729.48391f32, ("1369459", "2"));
-        test(-8573.5918555f32, ("-4389679", "512"));
-
-        // f64
-        test(3.14159265359f64, ("3537118876014453", "1125899906842624"));
-        test(2f64.pow(&100.), ("1267650600228229401496703205376", "1"));
-        test(-2f64.pow(&100.), ("-1267650600228229401496703205376", "1"));
-        test(684729.48391f64, ("367611342500051", "536870912"));
-        test(-8573.5918555, ("-4713381968463931", "549755813888"));
-        test(1.0 / 2f64.pow(&100.), ("1", "1267650600228229401496703205376"));
-    }
-
-    #[test]
-    fn test_from_float_fail() {
-        use std::{f32, f64};
-
-        assert_eq!(Ratio::from_float(f32::NAN), None);
-        assert_eq!(Ratio::from_float(f32::INFINITY), None);
-        assert_eq!(Ratio::from_float(f32::NEG_INFINITY), None);
-        assert_eq!(Ratio::from_float(f64::NAN), None);
-        assert_eq!(Ratio::from_float(f64::INFINITY), None);
-        assert_eq!(Ratio::from_float(f64::NEG_INFINITY), None);
-    }
 }

branches/dist-snap/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/dist-snap/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/dist-snap/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/dist-snap/src/libstd/rt/unwind.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/dist-snap/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() {
+}