---

yaml
---
r: 152423
b: refs/heads/try2
c: f02b6f3
h: refs/heads/master
i:
  152421: 72c516a
  152419: 464055b
  152415: bd54db6
v: v3

Author: pcwalton

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

branches/try2/src/compiletest/compiletest.rs

@@ -292,7 +292,6 @@ pub fn test_opts(config: &Config) -> test::TestOpts {
         save_metrics: config.save_metrics.clone(),
         test_shard: config.test_shard.clone(),
         nocapture: false,
-        color: test::AutoColor,
     }
 }
 

branches/try2/src/compiletest/procsrv.rs

@@ -11,7 +11,7 @@
 use std::os;
 use std::str;
 use std::io::process::{ProcessExit, Command, Process, ProcessOutput};
-use std::dynamic_lib::DynamicLibrary;
+use std::unstable::dynamic_lib::DynamicLibrary;
 
 fn target_env(lib_path: &str, prog: &str) -> Vec<(String, String)> {
     let prog = if cfg!(windows) {prog.slice_to(prog.len() - 4)} else {prog};

branches/try2/src/libcollections/bitv.rs

@@ -13,7 +13,6 @@
 use core::prelude::*;
 
 use core::cmp;
-use core::default::Default;
 use core::fmt;
 use core::iter::{Enumerate, Repeat, Map, Zip};
 use core::ops;
@@ -699,11 +698,6 @@ pub struct BitvSet {
     bitv: BigBitv
 }
 
-impl Default for BitvSet {
-    #[inline]
-    fn default() -> BitvSet { BitvSet::new() }
-}
-
 impl BitvSet {
     /// Creates a new bit vector set with initially no contents
     pub fn new() -> BitvSet {

branches/try2/src/libcollections/dlist.rs

@@ -24,7 +24,6 @@
 use core::prelude::*;
 
 use alloc::owned::Box;
-use core::default::Default;
 use core::fmt;
 use core::iter;
 use core::mem;
@@ -263,11 +262,6 @@ impl<T> Deque<T> for DList<T> {
     }
 }
 
-impl<T> Default for DList<T> {
-    #[inline]
-    fn default() -> DList<T> { DList::new() }
-}
-
 impl<T> DList<T> {
     /// Create an empty DList
     #[inline]

branches/try2/src/libcollections/priority_queue.rs

@@ -14,7 +14,6 @@
 
 use core::prelude::*;
 
-use core::default::Default;
 use core::mem::{zeroed, replace, swap};
 use core::ptr;
 
@@ -38,11 +37,6 @@ impl<T: Ord> Mutable for PriorityQueue<T> {
     fn clear(&mut self) { self.data.truncate(0) }
 }
 
-impl<T: Ord> Default for PriorityQueue<T> {
-    #[inline]
-    fn default() -> PriorityQueue<T> { PriorityQueue::new() }
-}
-
 impl<T: Ord> PriorityQueue<T> {
     /// An iterator visiting all values in underlying vector, in
     /// arbitrary order.

branches/try2/src/libcollections/ringbuf.rs

@@ -16,7 +16,6 @@
 use core::prelude::*;
 
 use core::cmp;
-use core::default::Default;
 use core::fmt;
 use core::iter::RandomAccessIterator;
 
@@ -113,11 +112,6 @@ impl<T> Deque<T> for RingBuf<T> {
     }
 }
 
-impl<T> Default for RingBuf<T> {
-    #[inline]
-    fn default() -> RingBuf<T> { RingBuf::new() }
-}
-
 impl<T> RingBuf<T> {
     /// Create an empty RingBuf
     pub fn new() -> RingBuf<T> {

branches/try2/src/libcollections/smallintmap.rs

@@ -17,7 +17,6 @@
 
 use core::prelude::*;
 
-use core::default::Default;
 use core::fmt;
 use core::iter::{Enumerate, FilterMap};
 use core::mem::replace;
@@ -115,11 +114,6 @@ impl<V> MutableMap<uint, V> for SmallIntMap<V> {
     }
 }
 
-impl<V> Default for SmallIntMap<V> {
-    #[inline]
-    fn default() -> SmallIntMap<V> { SmallIntMap::new() }
-}
-
 impl<V> SmallIntMap<V> {
     /// Create an empty SmallIntMap
     pub fn new() -> SmallIntMap<V> { SmallIntMap{v: vec!()} }

branches/try2/src/libcollections/treemap.rs

@@ -15,7 +15,6 @@
 use core::prelude::*;
 
 use alloc::owned::Box;
-use core::default::Default;
 use core::fmt;
 use core::fmt::Show;
 use core::iter::Peekable;
@@ -136,11 +135,6 @@ impl<K: Ord, V> MutableMap<K, V> for TreeMap<K, V> {
     }
 }
 
-impl<K: Ord, V> Default for TreeMap<K,V> {
-    #[inline]
-    fn default() -> TreeMap<K, V> { TreeMap::new() }
-}
-
 impl<K: Ord, V> TreeMap<K, V> {
     /// Create an empty TreeMap
     pub fn new() -> TreeMap<K, V> { TreeMap{root: None, length: 0} }
@@ -639,11 +633,6 @@ impl<T: Ord> MutableSet<T> for TreeSet<T> {
     fn remove(&mut self, value: &T) -> bool { self.map.remove(value) }
 }
 
-impl<T: Ord> Default for TreeSet<T> {
-    #[inline]
-    fn default() -> TreeSet<T> { TreeSet::new() }
-}
-
 impl<T: Ord> TreeSet<T> {
     /// Create an empty TreeSet
     #[inline]

branches/try2/src/libcollections/trie.rs

@@ -13,7 +13,6 @@
 use core::prelude::*;
 
 use alloc::owned::Box;
-use core::default::Default;
 use core::mem::zeroed;
 use core::mem;
 use core::uint;
@@ -106,11 +105,6 @@ impl<T> MutableMap<uint, T> for TrieMap<T> {
     }
 }
 
-impl<T> Default for TrieMap<T> {
-    #[inline]
-    fn default() -> TrieMap<T> { TrieMap::new() }
-}
-
 impl<T> TrieMap<T> {
     /// Create an empty TrieMap
     #[inline]
@@ -338,11 +332,6 @@ impl MutableSet<uint> for TrieSet {
     }
 }
 
-impl Default for TrieSet {
-    #[inline]
-    fn default() -> TrieSet { TrieSet::new() }
-}
-
 impl TrieSet {
     /// Create an empty TrieSet
     #[inline]

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

@@ -69,6 +69,7 @@ extern "system" {
 pub mod compat {
     use std::intrinsics::{atomic_store_relaxed, transmute};
     use libc::types::os::arch::extra::{LPCWSTR, HMODULE, LPCSTR, LPVOID};
+    use std::os::win32::as_utf16_p;
 
     extern "system" {
         fn GetModuleHandleW(lpModuleName: LPCWSTR) -> HMODULE;
@@ -79,11 +80,12 @@ pub mod compat {
     // 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) {
-        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))
+        as_utf16_p(module, |module| {
+            symbol.with_c_str(|symbol| {
+                let handle = GetModuleHandleW(module);
+                let func: Option<T> = transmute(GetProcAddress(handle, symbol));
+                atomic_store_relaxed(ptr, func.unwrap_or(fallback))
+            })
         })
     }