Merge remote-tracking branch 'origin/master' into rollup

Conflicts:
	src/liballoc/lib.rs
	src/libcore/ops.rs

diff --cc src/liballoc/lib.rs
index 1fc205b5f754dfb1c19bc41cbb4b487a165ca972,8960667fdfa861481f82f4d721c9a6ff5ee9f925..99423349020393721ac3b32c6d7de92ec7e85dc9
--- 1/src/liballoc/lib.rs
--- 2/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@@ -69,7 -69,9 +69,8 @@@
  #![feature(lang_items, unsafe_destructor)]
  #![feature(box_syntax)]
  #![feature(optin_builtin_traits)]
 -#![allow(unknown_features)] #![feature(int_uint)]
 +#![feature(int_uint)]
+ #![feature(unboxed_closures)]
  #![feature(core)]
  #![feature(hash)]
  #![feature(libc)]

diff --cc src/libcore/ops.rs
index cd469ecb0ed3d2b7161e6f4dfa3826c3897f3867,0b9b865c13700af59ada7f8cb5828fe4678f9c46..4b19d29330baa2c0ea3921811b793f1252ca9c9a
--- 1/src/libcore/ops.rs
--- 2/src/libcore/ops.rs
+++ b/src/libcore/ops.rs
@@@ -1134,6 -1134,56 +1134,7 @@@ impl<'a, T: ?Sized> DerefMut for &'a mu
  #[lang="fn"]
  #[unstable(feature = "core",
             reason = "uncertain about variadic generics, input versus associated types")]
 -#[cfg(stage0)]
 -pub trait Fn<Args,Output> {
 -    /// This is called when the call operator is used.
 -    extern "rust-call" fn call(&self, args: Args) -> Output;
 -}
 -
 -/// A version of the call operator that takes a mutable receiver.
 -#[lang="fn_mut"]
 -#[unstable(feature = "core",
 -           reason = "uncertain about variadic generics, input versus associated types")]
 -#[cfg(stage0)]
 -pub trait FnMut<Args,Output> {
 -    /// This is called when the call operator is used.
 -    extern "rust-call" fn call_mut(&mut self, args: Args) -> Output;
 -}
 -
 -/// A version of the call operator that takes a by-value receiver.
 -#[lang="fn_once"]
 -#[unstable(feature = "core",
 -           reason = "uncertain about variadic generics, input versus associated types")]
 -#[cfg(stage0)]
 -pub trait FnOnce<Args,Output> {
 -    /// This is called when the call operator is used.
 -    extern "rust-call" fn call_once(self, args: Args) -> Output;
 -}
 -
 -#[cfg(stage0)]
 -impl<F: ?Sized, A, R> FnMut<A, R> for F
 -    where F : Fn<A, R>
 -{
 -    extern "rust-call" fn call_mut(&mut self, args: A) -> R {
 -        self.call(args)
 -    }
 -}
 -
 -#[cfg(stage0)]
 -impl<F,A,R> FnOnce<A,R> for F
 -    where F : FnMut<A,R>
 -{
 -    extern "rust-call" fn call_once(mut self, args: A) -> R {
 -        self.call_mut(args)
 -    }
 -}
 -
 -/// A version of the call operator that takes an immutable receiver.
 -#[lang="fn"]
 -#[unstable(feature = "core",
 -           reason = "uncertain about variadic generics, input versus associated types")]
 -#[cfg(not(stage0))]
+ #[rustc_paren_sugar]
  pub trait Fn<Args> {
      type Output;
  
@@@ -1145,6 -1195,8 +1146,7 @@@
  #[lang="fn_mut"]
  #[unstable(feature = "core",
             reason = "uncertain about variadic generics, input versus associated types")]
 -#[cfg(not(stage0))]
+ #[rustc_paren_sugar]
  pub trait FnMut<Args> {
      type Output;
  
@@@ -1156,6 -1208,8 +1158,7 @@@
  #[lang="fn_once"]
  #[unstable(feature = "core",
             reason = "uncertain about variadic generics, input versus associated types")]
 -#[cfg(not(stage0))]
+ #[rustc_paren_sugar]
  pub trait FnOnce<Args> {
      type Output;
  

diff --cc src/librustc/lint/builtin.rs
Simple merge

diff --cc src/librustc/metadata/decoder.rs
Simple merge

diff --cc src/librustc/middle/expr_use_visitor.rs
Simple merge

diff --cc src/librustc/middle/mem_categorization.rs
Simple merge

diff --cc src/librustc/middle/ty.rs
Simple merge

diff --cc src/librustc/util/ppaux.rs
Simple merge

diff --cc src/librustc_driver/driver.rs
Simple merge

diff --cc src/librustc_resolve/lib.rs
Simple merge

diff --cc src/librustc_trans/trans/base.rs
Simple merge

diff --cc src/librustc_typeck/check/mod.rs
Simple merge

diff --cc src/librustc_typeck/check/regionck.rs
Simple merge