Skip to content

Commit 5faf5a5

Browse files
committed
Auto merge of #1781 - RalfJung:rustup, r=RalfJung
rustup
2 parents 58436e9 + 4c741e5 commit 5faf5a5

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b2c20b51ed838368d3f2bdccb63f401bcddb7e1c
1+
06f0adb34570ba83fee391abeb0bec0eec28a234

tests/compile-fail/invalid_bool.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Validation makes this fail in the wrong place
22
// Make sure we find these even with many checks disabled.
33
// compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
4-
#![feature(test)]
4+
#![feature(bench_black_box)]
55

66
fn main() {
77
let b = unsafe { std::mem::transmute::<u8, bool>(2) };

tests/run-pass/float.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(stmt_expr_attributes, test)]
1+
#![feature(stmt_expr_attributes, bench_black_box)]
22
#![allow(arithmetic_overflow)]
33
use std::fmt::Debug;
44
use std::hint::black_box;

tests/run-pass/u128.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(test)]
1+
#![feature(bench_black_box)]
22
use std::hint::black_box as b;
33

44
fn main() {

0 commit comments

Comments
 (0)