Auto merge of #1607 - RalfJung:rustup, r=RalfJung

rustup

Author: bors

rust-version

@@ -1 +1 @@
-17cc9b6256c95c31944591aec683884fead4e3b6
+a53fb30e3bf2655b0563da6d561c23cda5f3ec11

tests/run-pass/box.rs

@@ -21,7 +21,7 @@ fn into_raw() { unsafe {
 
 fn into_unique() { unsafe {
     let b = Box::new(4i32);
-    let u = Box::into_unique(b);
+    let u = Box::into_unique(b).0;
 
     // "lose the tag"
     let r = ((u.as_ptr() as usize)+0) as *mut i32;

tests/run-pass/dyn-traits.rs

@@ -1,4 +1,5 @@
-#![feature(unsized_locals)]
+#![feature(unsized_locals, unsized_fn_params)]
+#![allow(incomplete_features)]
 
 fn ref_box_dyn() {
     struct Struct(i32);