rollup merge of #20723: pnkfelix/feature-gate-box-syntax

Conflicts:
	src/compiletest/compiletest.rs
	src/libcollections/lib.rs
	src/libserialize/lib.rs
	src/libsyntax/feature_gate.rs

diff --cc src/liballoc/boxed.rs
Simple merge

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

diff --cc src/libcollections/lib.rs
index a3adc09b581cb6547dca58015992e9a9562f6cf5,37bc37b84dfd849cf14f529ce64107ada84194c6..7692c1558a70f7c6797e729a701a162d69f40e61
--- 1/src/libcollections/lib.rs
--- 2/src/libcollections/lib.rs
+++ b/src/libcollections/lib.rs
@@@ -24,8 -23,9 +24,9 @@@
  
  #![allow(unknown_features)]
  #![feature(unsafe_destructor, slicing_syntax)]
 -#![feature(old_impl_check)]
+ #![feature(box_syntax)]
  #![feature(unboxed_closures)]
 +#![feature(old_impl_check)]
  #![no_std]
  
  #[macro_use]

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

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

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

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

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

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

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

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

diff --cc src/libserialize/lib.rs
index d51f070632fd3bd33e7457e56654bf01395a3eb5,39a6471aac65bdb140e4a193fef6a086eb6f9c29..b3c4cec2ef13f5ef01b800f5161cc4048f2b0015
--- 1/src/libserialize/lib.rs
--- 2/src/libserialize/lib.rs
+++ b/src/libserialize/lib.rs
@@@ -24,9 -23,10 +24,10 @@@ Core encoding and decoding interfaces
         html_root_url = "http://doc.rust-lang.org/nightly/",
         html_playground_url = "http://play.rust-lang.org/")]
  #![allow(unknown_features)]
 -#![feature(slicing_syntax)]
 +#![cfg_attr(stage0, allow(unused_attributes))]
+ #![feature(box_syntax)]
  #![feature(old_impl_check)]
 -#![cfg_attr(stage0, allow(unused_attributes))]
 +#![feature(slicing_syntax)]
  
  // test harness access
  #[cfg(test)] extern crate test;

diff --cc src/libstd/lib.rs
index 316ea65af87357d4b0b479ba7535dd15bb3519c1,d34f497bbea360cde46186ba7ac7daa24d577f47..71221a654e8c1d155b43126513b4cd99ee02c8a6
--- 1/src/libstd/lib.rs
--- 2/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@@ -108,7 -107,9 +108,8 @@@
  #![feature(linkage, thread_local, asm)]
  #![feature(lang_items, unsafe_destructor)]
  #![feature(slicing_syntax, unboxed_closures)]
+ #![feature(box_syntax)]
  #![feature(old_impl_check)]
 -#![cfg_attr(stage0, allow(unused_attributes))]
  
  // Don't link to std. We are std.
  #![no_std]

diff --cc src/libsyntax/feature_gate.rs
index 21d3e4fef7f9675f0930fd4f4f76e5e0fef931cf,fbff5e16ef5f755b5da16798b72f32a888a32b18..2cfcd38d48fca9d4be9034fb232dd48bbfbb7dd8
--- 1/src/libsyntax/feature_gate.rs
--- 2/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@@ -337,6 -338,20 +338,15 @@@ impl<'a, 'v> Visitor<'v> for PostExpans
      }
  
      fn visit_expr(&mut self, e: &ast::Expr) {
 -            ast::ExprRange(..) => {
 -                self.gate_feature("slicing_syntax",
 -                                  e.span,
 -                                  "range syntax is experimental");
 -            }
+         match e.node {
+             ast::ExprBox(..) | ast::ExprUnary(ast::UnOp::UnUniq, _) => {
+                 self.gate_feature("box_syntax",
+                                   e.span,
+                                   "box expression syntax is experimental in alpha release; \
+                                    you can call `Box::new` instead.");
+             }
+             _ => {}
+         }
          visit::walk_expr(self, e);
      }
  

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

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

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

diff --cc src/test/run-pass/drop-trait-enum.rs
Simple merge

diff --cc src/test/run-pass/ifmt.rs
Simple merge

diff --cc src/test/run-pass/issue-16774.rs
Simple merge

diff --cc src/test/run-pass/unique-send-2.rs
Simple merge