---

yaml
---
r: 119197
b: refs/heads/dist-snap
c: 487fa95
h: refs/heads/master
i:
  119195: d0a5459
v: v3

Author: alexcrichton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 1813e5aa1a03b0596b8de7abd1af31edf5d6098f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 57e0908af395af1c10e28600b785b5366a43660c
+refs/heads/dist-snap: 487fa9568b69753fecb74a8460109239f4bf3631
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libstd/rt/global_heap.rs

@@ -64,16 +64,16 @@ pub unsafe fn realloc_raw(ptr: *mut u8, size: uint) -> *mut u8 {
     }
 }
 
-// The compiler never calls `exchange_free` on ~ZeroSizeType, so zero-size
-// allocations can point to this `static`. It would be incorrect to use a null
-// pointer, due to enums assuming types like unique pointers are never null.
-static EMPTY: () = ();
-
 /// The allocator for unique pointers without contained managed pointers.
 #[cfg(not(test))]
 #[lang="exchange_malloc"]
 #[inline]
 pub unsafe fn exchange_malloc(size: uint) -> *mut u8 {
+    // The compiler never calls `exchange_free` on ~ZeroSizeType, so zero-size
+    // allocations can point to this `static`. It would be incorrect to use a null
+    // pointer, due to enums assuming types like unique pointers are never null.
+    static EMPTY: () = ();
+
     if size == 0 {
         &EMPTY as *() as *mut u8
     } else {

branches/dist-snap/src/libsyntax/abi.rs

@@ -193,12 +193,12 @@ fn indices_are_correct() {
 
 #[test]
 fn pick_uniplatform() {
-    assert_eq!(Stdcall.for_arch(OsLinux, X86), Some(Stdcall));
-    assert_eq!(Stdcall.for_arch(OsLinux, Arm), None);
-    assert_eq!(System.for_arch(OsLinux, X86), Some(C));
-    assert_eq!(System.for_arch(OsWin32, X86), Some(Stdcall));
-    assert_eq!(System.for_arch(OsWin32, X86_64), Some(C));
-    assert_eq!(System.for_arch(OsWin32, Arm), Some(C));
-    assert_eq!(Stdcall.for_arch(OsWin32, X86), Some(Stdcall));
-    assert_eq!(Stdcall.for_arch(OsWin32, X86_64), Some(Stdcall));
+    assert_eq!(Stdcall.for_target(OsLinux, X86), Some(Stdcall));
+    assert_eq!(Stdcall.for_target(OsLinux, Arm), None);
+    assert_eq!(System.for_target(OsLinux, X86), Some(C));
+    assert_eq!(System.for_target(OsWin32, X86), Some(Stdcall));
+    assert_eq!(System.for_target(OsWin32, X86_64), Some(C));
+    assert_eq!(System.for_target(OsWin32, Arm), Some(C));
+    assert_eq!(Stdcall.for_target(OsWin32, X86), Some(Stdcall));
+    assert_eq!(Stdcall.for_target(OsWin32, X86_64), Some(Stdcall));
 }

branches/dist-snap/src/test/bench/rt-spawn-rate.rs

@@ -8,13 +8,23 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#![no_start]
+
+extern crate green;
+extern crate rustuv;
+
 use std::task::spawn;
 use std::os;
 use std::uint;
 
 // Very simple spawn rate test. Spawn N tasks that do nothing and
 // return.
 
+#[start]
+fn start(argc: int, argv: **u8) -> int {
+    green::start(argc, argv, rustuv::event_loop, main)
+}
+
 fn main() {
 
     let args = os::args();