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

rustup

rust-version

@@ -1 +1 @@
-7750c3d46bc19784adb1ee6e37a5ec7e4cd7e772
+9491f18c5de3ff1c4bf9c3fdacf52d9859e26f7c

tests/run-pass/float.rs

@@ -1,4 +1,4 @@
-#![feature(track_caller, stmt_expr_attributes)]
+#![feature(stmt_expr_attributes)]
 use std::fmt::Debug;
 
 // Helper function to avoid promotion so that this tests "run-time" casts, not CTFE.

tests/run-pass/track-caller-attribute.rs

@@ -1,4 +1,4 @@
-#![feature(track_caller, core_intrinsics)]
+#![feature(core_intrinsics)]
 
 use std::panic::Location;