---

yaml
---
r: 152435
b: refs/heads/try2
c: e0855bc
h: refs/heads/master
i:
  152433: 8c6a4fe
  152431: 7ed4ac0
v: v3

Author: renato-zannon

[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: b1302f9c4f6619bf83fff39b305b990d8f628eb7
+refs/heads/try2: e0855bccd356d191074a83c2aeedabd88d2b7bab
 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/liballoc/arc.rs

@@ -184,7 +184,7 @@ impl<T: Share + Send> Drop for Arc<T> {
 
         // This fence is needed to prevent reordering of use of the data and
         // deletion of the data. Because it is marked `Release`, the
-        // decreasing of the reference count synchronizes with this `Acquire`
+        // decreasing of the reference count sychronizes with this `Acquire`
         // fence. This means that use of the data happens before decreasing
         // the refernce count, which happens before this fence, which
         // happens before the deletion of the data.

branches/try2/src/libarena/lib.rs

@@ -298,6 +298,20 @@ fn test_arena_destructors() {
     }
 }
 
+#[test]
+fn test_arena_alloc_nested() {
+    struct Inner { value: uint }
+    struct Outer<'a> { inner: &'a Inner }
+
+    let arena = Arena::new();
+
+    let result = arena.alloc(|| Outer {
+        inner: arena.alloc(|| Inner { value: 10 })
+    });
+
+    assert_eq!(result.inner.value, 10);
+}
+
 #[test]
 #[should_fail]
 fn test_arena_destructors_fail() {

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/libcore/fmt/mod.rs

@@ -539,7 +539,7 @@ impl<'a> Formatter<'a> {
     }
 
     /// Runs a callback, emitting the correct padding either before or
-    /// afterwards depending on whether right or left alignment is requested.
+    /// afterwards depending on whether right or left alingment is requested.
     fn with_padding(&mut self,
                     padding: uint,
                     default: rt::Alignment,

branches/try2/src/libcore/result.rs

@@ -105,7 +105,7 @@
 //! *Note: The actual definition of `Writer` uses `IoResult`, which
 //! is just a synonym for `Result<T, IoError>`.*
 //!
-//! This method doesn't produce a value, but the write may
+//! This method doesn`t produce a value, but the write may
 //! fail. It's crucial to handle the error case, and *not* write
 //! something like this:
 //!

branches/try2/src/libgetopts/lib.rs

@@ -163,7 +163,7 @@ pub struct OptGroup {
     pub occur: Occur
 }
 
-/// Describes whether an option is given at all or has a value.
+/// Describes wether an option is given at all or has a value.
 #[deriving(Clone, PartialEq)]
 enum Optval {
     Val(String),

branches/try2/src/libglob/lib.rs

@@ -44,6 +44,7 @@ use std::string::String;
  * pattern - see the `glob` function for more details.
  */
 pub struct Paths {
+    root: Path,
     dir_patterns: Vec<Pattern>,
     require_dir: bool,
     options: MatchOptions,
@@ -107,6 +108,7 @@ pub fn glob_with(pattern: &str, options: MatchOptions) -> Paths {
             // FIXME: How do we want to handle verbatim paths? I'm inclined to return nothing,
             // since we can't very well find all UNC shares with a 1-letter server name.
             return Paths {
+                root: root,
                 dir_patterns: Vec::new(),
                 require_dir: false,
                 options: options,
@@ -132,6 +134,7 @@ pub fn glob_with(pattern: &str, options: MatchOptions) -> Paths {
     }
 
     Paths {
+        root: root,
         dir_patterns: dir_patterns,
         require_dir: require_dir,
         options: options,

branches/try2/src/libgreen/context.rs

@@ -143,7 +143,6 @@ extern {
 // stacks are disabled.
 
 #[cfg(target_arch = "x86")]
-#[repr(C)]
 struct Registers {
     eax: u32, ebx: u32, ecx: u32, edx: u32,
     ebp: u32, esi: u32, edi: u32, esp: u32,
@@ -227,7 +226,7 @@ fn initialize_call_frame(regs: &mut Registers, fptr: InitFn, arg: uint,
     regs[RUSTRT_R14] = procedure.env as uint;
     regs[RUSTRT_R15] = fptr as uint;
 
-    // These registers are picked up by the regular context switch paths. These
+    // These registers are picked up by the regulard context switch paths. These
     // will put us in "mostly the right context" except for frobbing all the
     // arguments to the right place. We have the small trampoline code inside of
     // rust_bootstrap_green_task to do that.

branches/try2/src/libgreen/sched.rs

@@ -82,7 +82,7 @@ pub struct Scheduler {
     run_anything: bool,
     /// A fast XorShift rng for scheduler use
     rng: XorShiftRng,
-    /// A toggleable idle callback
+    /// A togglable idle callback
     idle_callback: Option<Box<PausableIdleCallback:Send>>,
     /// A countdown that starts at a random value and is decremented
     /// every time a yield check is performed. When it hits 0 a task
@@ -287,7 +287,7 @@ impl Scheduler {
 
         // After processing a message, we consider doing some more work on the
         // event loop. The "keep going" condition changes after the first
-        // iteration because we don't want to spin here infinitely.
+        // iteration becase we don't want to spin here infinitely.
         //
         // Once we start doing work we can keep doing work so long as the
         // iteration does something. Note that we don't want to starve the

branches/try2/src/liblibc/lib.rs

@@ -291,7 +291,7 @@ pub use types::os::arch::extra::{mach_timebase_info};
 extern {}
 
 /// A wrapper for a nullable pointer. Don't use this except for interacting
-/// with libc. Basically Option, but without the dependence on libstd.
+/// with libc. Basically Option, but without the dependance on libstd.
 // If/when libprim happens, this can be removed in favor of that
 pub enum Nullable<T> {
     Null,
@@ -3497,7 +3497,7 @@ pub mod consts {
 
 
 pub mod funcs {
-    // Thankfully most of c95 is universally available and does not vary by OS
+    // Thankfull most of c95 is universally available and does not vary by OS
     // or anything. The same is not true of POSIX.
 
     pub mod c95 {

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

@@ -20,7 +20,6 @@ pub static FIONBIO: libc::c_long = 0x8004667e;
 static FD_SETSIZE: uint = 64;
 pub static MSG_DONTWAIT: libc::c_int = 0;
 
-#[repr(C)]
 pub struct WSADATA {
     pub wVersion: libc::WORD,
     pub wHighVersion: libc::WORD,
@@ -33,7 +32,6 @@ pub struct WSADATA {
 
 pub type LPWSADATA = *mut WSADATA;
 
-#[repr(C)]
 pub struct fd_set {
     fd_count: libc::c_uint,
     fd_array: [libc::SOCKET, ..FD_SETSIZE],
@@ -71,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;
@@ -81,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))
+            })
         })
     }