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

rustup
rust-lang · Apr 25, 2021 · 5faf5a5 · 5faf5a5
2 parents 58436e9 + 4c741e5
commit 5faf5a5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-b2c20b51ed838368d3f2bdccb63f401bcddb7e1c
+06f0adb34570ba83fee391abeb0bec0eec28a234
diff --git a/tests/compile-fail/invalid_bool.rs b/tests/compile-fail/invalid_bool.rs
@@ -1,7 +1,7 @@
 // Validation makes this fail in the wrong place
 // Make sure we find these even with many checks disabled.
 // compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
-#![feature(test)]
+#![feature(bench_black_box)]
 
 fn main() {
     let b = unsafe { std::mem::transmute::<u8, bool>(2) };

diff --git a/tests/run-pass/float.rs b/tests/run-pass/float.rs
@@ -1,4 +1,4 @@
-#![feature(stmt_expr_attributes, test)]
+#![feature(stmt_expr_attributes, bench_black_box)]
 #![allow(arithmetic_overflow)]
 use std::fmt::Debug;
 use std::hint::black_box;

diff --git a/tests/run-pass/u128.rs b/tests/run-pass/u128.rs
@@ -1,4 +1,4 @@
-#![feature(test)]
+#![feature(bench_black_box)]
 use std::hint::black_box as b;
 
 fn main() {