---

yaml
---
r: 152505
b: refs/heads/try2
c: b7af250
h: refs/heads/master
i:
  152503: bf98088
v: v3

Author: alexcrichton

[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: f907d9772c55d942fb178622b0b2b5a8ca103c11
+refs/heads/try2: b7af25060a1b0451cb06085ba5893980bc4e5333
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libnative/io/c_win32.rs

@@ -77,15 +77,20 @@ pub mod compat {
         fn GetProcAddress(hModule: HMODULE, lpProcName: LPCSTR) -> LPVOID;
     }
 
-    // store_func() is idempotent, so using relaxed ordering for the atomics should be enough.
-    // This way, calling a function in this compatibility layer (after it's loaded) shouldn't
-    // be any slower than a regular DLL call.
-    unsafe fn store_func<T: Copy>(ptr: *mut T, module: &str, symbol: &str, fallback: T) {
+    // store_func() is idempotent, so using relaxed ordering for the atomics
+    // should be enough.  This way, calling a function in this compatibility
+    // layer (after it's loaded) shouldn't be any slower than a regular DLL
+    // call.
+    unsafe fn store_func(ptr: *mut uint, module: &str, symbol: &str, fallback: uint) {
         let module = module.to_utf16().append_one(0);
         symbol.with_c_str(|symbol| {
             let handle = GetModuleHandleW(module.as_ptr());
-            let func: Option<T> = transmute(GetProcAddress(handle, symbol));
-            atomic_store_relaxed(ptr, func.unwrap_or(fallback))
+            let func: uint = transmute(GetProcAddress(handle, symbol));
+            atomic_store_relaxed(ptr, if func == 0 {
+                fallback
+            } else {
+                func
+            })
         })
     }
 
@@ -109,10 +114,10 @@ pub mod compat {
 
                 extern "system" fn thunk($($argname: $argtype),*) -> $rettype {
                     unsafe {
-                        ::io::c::compat::store_func(&mut ptr,
-                                                             stringify!($module),
-                                                             stringify!($symbol),
-                                                             fallback);
+                        ::io::c::compat::store_func(&mut ptr as *mut _ as *mut uint,
+                                                    stringify!($module),
+                                                    stringify!($symbol),
+                                                    fallback as uint);
                         ::std::intrinsics::atomic_load_relaxed(&ptr)($($argname),*)
                     }
                 }

branches/try2/src/libstd/dynamic_lib.rs

@@ -158,6 +158,7 @@ mod test {
     use super::*;
     use prelude::*;
     use libc;
+    use mem;
 
     #[test]
     #[ignore(cfg(windows))] // FIXME #8818
@@ -174,7 +175,7 @@ mod test {
         let cosine: extern fn(libc::c_double) -> libc::c_double = unsafe {
             match libm.symbol("cos") {
                 Err(error) => fail!("Could not load function cos: {}", error),
-                Ok(cosine) => cosine
+                Ok(cosine) => mem::transmute::<*u8, _>(cosine)
             }
         };
 

branches/try2/src/libstd/io/fs.rs

@@ -977,7 +977,9 @@ mod test {
         let result = File::open_mode(filename, Open, Read);
 
         error!(result, "couldn't open file");
-        error!(result, "no such file or directory");
+        if cfg!(unix) {
+            error!(result, "no such file or directory");
+        }
         error!(result, format!("path={}; mode=open; access=read", filename.display()));
     })
 
@@ -988,7 +990,9 @@ mod test {
         let result = unlink(filename);
 
         error!(result, "couldn't unlink path");
-        error!(result, "no such file or directory");
+        if cfg!(unix) {
+            error!(result, "no such file or directory");
+        }
         error!(result, format!("path={}", filename.display()));
     })
 

branches/try2/src/libstd/rt/backtrace.rs

@@ -873,12 +873,12 @@ mod imp {
             Err(..) => return Ok(()),
         };
 
-        macro_rules! sym( ($e:expr, $t:ident) => (
-            match unsafe { lib.symbol::<$t>($e) } {
-                Ok(f) => f,
+        macro_rules! sym( ($e:expr, $t:ident) => (unsafe {
+            match lib.symbol($e) {
+                Ok(f) => mem::transmute::<*u8, $t>(f),
                 Err(..) => return Ok(())
             }
-        ) )
+        }) )
 
         // Fetch the symbols necessary from dbghelp.dll
         let SymFromAddr = sym!("SymFromAddr", SymFromAddrFn);

branches/try2/src/test/compile-fail/issue-14845.rs

@@ -17,7 +17,7 @@ fn main() {
     let x = X { a: [0] };
     let _f = &x.a as *mut u8;
     //~^ ERROR mismatched types: expected `*mut u8` but found `&[u8, .. 1]`
-    
+
     let local = [0u8];
     let _v = &local as *mut u8;
     //~^ ERROR mismatched types: expected `*mut u8` but found `&[u8, .. 1]`

branches/try2/src/test/compile-fail/transmute-different-sizes.rs

@@ -10,6 +10,8 @@
 
 // Tests that `transmute` cannot be called on types of different size.
 
+#![allow(warnings)]
+
 use std::mem::transmute;
 
 unsafe fn f() {

branches/try2/src/test/pretty/path-type-bounds.rs

@@ -14,11 +14,11 @@
 trait Tr { }
 impl Tr for int { }
 
-fn foo(x: Box<Tr: Share>) -> Box<Tr: Share> { x }
+fn foo(x: Box<Tr+ Share>) -> Box<Tr+ Share> { x }
 
 fn main() {
-    let x: Box<Tr: Share>;
+    let x: Box<Tr+ Share>;
 
-    box() 1 as Box<Tr: Share>;
+    box() 1 as Box<Tr+ Share>;
 }
 

branches/try2/src/test/run-pass-fulldeps/quote-tokens.rs

@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-android
+// ignore-pretty: does not work well with `--test`
+
 #![feature(quote)]
 #![feature(managed_boxes)]
 

branches/try2/src/test/run-pass/issue-14837.rs

@@ -9,8 +9,8 @@
 // except according to those terms.
 
 #![feature(struct_variant)]
-#![deny(warnings)]
 
+#[deny(dead_code)]
 pub enum Foo {
     Bar {
         pub baz: int