Merge remote-tracking branch 'mozilla/master'

Conflicts:
	src/libextra/test.rs
	src/libstd/rt/global_heap.rs
	src/libstd/unstable/lang.rs
	src/libstd/vec.rs

diff --cc src/libextra/test.rs
index f3051e083839aee09492e725db6ea766b4af7dc6,97793ce440c2b477726145334de97c5e7d5369db..1c6e2a25c01b7298d5c40d65c5747b66c33dd076
--- 1/src/libextra/test.rs
--- 2/src/libextra/test.rs
+++ b/src/libextra/test.rs
@@@ -479,16 -487,17 +479,16 @@@ fn run_tests(opts: &TestOpts
  
  // Windows tends to dislike being overloaded with threads.
  #[cfg(windows)]
- static sched_overcommit : uint = 1;
+ static SCHED_OVERCOMMIT : uint = 1;
  
  #[cfg(unix)]
- static sched_overcommit : uint = 4u;
+ static SCHED_OVERCOMMIT : uint = 4u;
  
  fn get_concurrency() -> uint {
 -    unsafe {
 -        let threads = rustrt::rust_sched_threads() as uint;
 -        if threads == 1 { 1 }
 -        else { threads * SCHED_OVERCOMMIT }
 -    }
 +    use std::rt;
 +    let threads = rt::util::default_sched_threads();
 +    if threads == 1 { 1 }
-     else { threads * sched_overcommit }
++    else { threads * SCHED_OVERCOMMIT }
  }
  
  #[allow(non_implicitly_copyable_typarams)]

diff --cc src/libstd/at_vec.rs
Simple merge

diff --cc src/libstd/os.rs
Simple merge

diff --cc src/libstd/rt/global_heap.rs
index 4b475d743972f25910418399448cc4c06f806a81,54deb8924f5c708add448532266a1a8483cfa8aa..c9bf3b28530391c6d4e3baeff474becbcc6ffb00
--- 1/src/libstd/rt/global_heap.rs
--- 2/src/libstd/rt/global_heap.rs
+++ b/src/libstd/rt/global_heap.rs
@@@ -86,13 -80,14 +80,14 @@@ pub unsafe fn exchange_malloc(td: *c_ch
  #[cfg(not(stage0), not(test))]
  #[lang="exchange_malloc"]
  #[inline]
- pub unsafe fn exchange_malloc_(align: u32, size: uintptr_t) -> *c_char {
-     exchange_malloc(align, size)
 -pub unsafe fn exchange_malloc(_align: u32, size: uintptr_t) -> *c_char {
++pub unsafe fn exchange_malloc(align: u32, size: uintptr_t) -> *c_char {
+     malloc_raw(size as uint) as *c_char
  }
  
- #[cfg(not(stage0))]
+ #[cfg(not(test))]
+ #[lang="vector_exchange_malloc"]
  #[inline]
- pub unsafe fn exchange_malloc(align: u32, size: uintptr_t) -> *c_char {
+ pub unsafe fn vector_exchange_malloc(align: u32, size: uintptr_t) -> *c_char {
      let total_size = get_box_size(size as uint, align as uint);
      malloc_raw(total_size as uint) as *c_char
  }

diff --cc src/libstd/rt/uv/mod.rs
Simple merge

diff --cc src/libstd/vec.rs
index 1180ac883e738cfbc269d4029a91eb864544d357,33857556548fa4025fc2ef7f085f424620ba2856..2c1e913511eff65bb18a0fae15bfeba80815556e
--- 1/src/libstd/vec.rs
--- 2/src/libstd/vec.rs
+++ b/src/libstd/vec.rs
@@@ -16,14 -16,13 +16,12 @@@ use cast::transmute
  use cast;
  use container::{Container, Mutable};
  use cmp;
- use cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
+ use cmp::{Eq, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
  use clone::Clone;
  use iterator::{FromIterator, Iterator, IteratorUtil};
- use iter::FromIter;
  use kinds::Copy;
 -use libc;
  use libc::c_void;
  use num::Zero;
- use ops::Add;
  use option::{None, Option, Some};
  use ptr::to_unsafe_ptr;
  use ptr;

diff --cc src/rt/rust_uv.cpp
Simple merge