Merge remote-tracking branch 'origin/master'

Author: RalfJung

src/eval_context.rs

@@ -789,11 +789,15 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
                 self.write_value(val, dest, dest_ty)?;
             }
 
-            Box(ty) => {
+            NullaryOp(mir::NullOp::Box, ty) => {
                 let ptr = self.alloc_ptr(ty)?;
                 self.write_primval(dest, PrimVal::Ptr(ptr), dest_ty)?;
             }
 
+            NullaryOp(mir::NullOp::SizeOf, _ty) => {
+                unimplemented!()
+            }
+
             Cast(kind, ref operand, cast_ty) => {
                 debug_assert_eq!(self.monomorphize(cast_ty, self.substs()), dest_ty);
                 use rustc::mir::CastKind::*;

tests/run-pass/non_capture_closure_to_fn_ptr.rs

@@ -1,5 +1,3 @@
-#![feature(closure_to_fn_coercion)]
-
 // allow(const_err) to work around a bug in warnings
 #[allow(const_err)]
 static FOO: fn() = || { assert_ne!(42, 43) };