diff options
| author | bors <bors@rust-lang.org> | 2021-04-25 10:35:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-25 10:35:24 +0000 |
| commit | 06f0adb34570ba83fee391abeb0bec0eec28a234 (patch) | |
| tree | d993b31319e211e49286ddb17f099bae694c5cc4 /src | |
| parent | 13a2615883aa28433383a723a764ca9acb43fd48 (diff) | |
| parent | 3d16e156aef937ae797892ef05e08b8159a415c4 (diff) | |
| download | rust-06f0adb34570ba83fee391abeb0bec0eec28a234.tar.gz rust-06f0adb34570ba83fee391abeb0bec0eec28a234.zip | |
Auto merge of #84216 - RalfJung:black-box, r=Mark-Simulacrum
move core::hint::black_box under its own feature gate The `black_box` function had its own RFC and is tracked separately from the `test` feature at https://github.com/rust-lang/rust/issues/64102. Let's reflect this in the feature gate. To avoid breaking all the benchmarks, libtest's `test::black_box` is a wrapping definition, not a reexport -- this means it is still under the `test` feature gate.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/ui/consts/cast-discriminant-zst-enum.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/consts/const_discriminant.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/sanitize/address.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/sanitize/hwaddress.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/sanitize/leak.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/sanitize/memory.rs | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/test/ui/consts/cast-discriminant-zst-enum.rs b/src/test/ui/consts/cast-discriminant-zst-enum.rs index 9c02d232e13..66b76627c02 100644 --- a/src/test/ui/consts/cast-discriminant-zst-enum.rs +++ b/src/test/ui/consts/cast-discriminant-zst-enum.rs @@ -1,6 +1,6 @@ // run-pass // Test a ZST enum whose dicriminant is ~0i128. This caused an ICE when casting to a i32. -#![feature(test)] +#![feature(bench_black_box)] use std::hint::black_box; #[derive(Copy, Clone)] diff --git a/src/test/ui/consts/const_discriminant.rs b/src/test/ui/consts/const_discriminant.rs index d016d236dbf..a47f6af0296 100644 --- a/src/test/ui/consts/const_discriminant.rs +++ b/src/test/ui/consts/const_discriminant.rs @@ -1,6 +1,6 @@ // run-pass #![feature(const_discriminant)] -#![feature(test)] +#![feature(bench_black_box)] #![allow(dead_code)] use std::mem::{discriminant, Discriminant}; diff --git a/src/test/ui/sanitize/address.rs b/src/test/ui/sanitize/address.rs index cee73b0425a..9a26a351d99 100644 --- a/src/test/ui/sanitize/address.rs +++ b/src/test/ui/sanitize/address.rs @@ -7,7 +7,7 @@ // error-pattern: AddressSanitizer: stack-buffer-overflow // error-pattern: 'xs' (line 15) <== Memory access at offset -#![feature(test)] +#![feature(bench_black_box)] use std::hint::black_box; diff --git a/src/test/ui/sanitize/hwaddress.rs b/src/test/ui/sanitize/hwaddress.rs index 88769b7cb45..bb6986740d9 100644 --- a/src/test/ui/sanitize/hwaddress.rs +++ b/src/test/ui/sanitize/hwaddress.rs @@ -7,7 +7,7 @@ // run-fail // error-pattern: HWAddressSanitizer: tag-mismatch -#![feature(test)] +#![feature(bench_black_box)] use std::hint::black_box; diff --git a/src/test/ui/sanitize/leak.rs b/src/test/ui/sanitize/leak.rs index c9f10fe4f46..f63f81352da 100644 --- a/src/test/ui/sanitize/leak.rs +++ b/src/test/ui/sanitize/leak.rs @@ -6,7 +6,7 @@ // run-fail // error-pattern: LeakSanitizer: detected memory leaks -#![feature(test)] +#![feature(bench_black_box)] use std::hint::black_box; use std::mem; diff --git a/src/test/ui/sanitize/memory.rs b/src/test/ui/sanitize/memory.rs index a26649a5800..48a482a13aa 100644 --- a/src/test/ui/sanitize/memory.rs +++ b/src/test/ui/sanitize/memory.rs @@ -13,7 +13,7 @@ #![feature(core_intrinsics)] #![feature(start)] -#![feature(test)] +#![feature(bench_black_box)] use std::hint::black_box; use std::mem::MaybeUninit; |
