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

bors · bors · commit b4ccb07cc8bf · 2020-07-02T08:48:45.000Z
rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-7750c3d46bc19784adb1ee6e37a5ec7e4cd7e772
+9491f18c5de3ff1c4bf9c3fdacf52d9859e26f7c
diff --git 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.
diff --git 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;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#![feature(track_caller, stmt_expr_attributes)]`
	`1`	`+#![feature(stmt_expr_attributes)]`
`2`	`2`	`use std::fmt::Debug;`
`3`	`3`
`4`	`4`	`// Helper function to avoid promotion so that this tests "run-time" casts, not CTFE.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#![feature(track_caller, core_intrinsics)]`
	`1`	`+#![feature(core_intrinsics)]`
`2`	`2`
`3`	`3`	`use std::panic::Location;`
`4`	`4`