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

rustup
2020-07-02 08:48:45 +00:00 · 2020-07-02 08:48:45 +00:00 · b4ccb07cc8
commit b4ccb07cc8
parent fd81012477 6ca67a346b
3 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-7750c3d46bc19784adb1ee6e37a5ec7e4cd7e772
+9491f18c5de3ff1c4bf9c3fdacf52d9859e26f7c
--- a/tests/run-pass/float.rs
+++ b/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.
--- a/tests/run-pass/track-caller-attribute.rs
+++ b/tests/run-pass/track-caller-attribute.rs
@ -1,4 +1,4 @@
-#![feature(track_caller, core_intrinsics)]
+#![feature(core_intrinsics)]

 use std::panic::Location;