Skip to content

Commit 91578c0

Browse files
authored
Rollup merge of rust-lang#102232 - Urgau:stabilize-bench_black_box, r=TaKO8Ki
Stabilize bench_black_box This PR stabilize `feature(bench_black_box)`. ```rust pub fn black_box<T>(dummy: T) -> T; ``` The FCP was completed in rust-lang#64102. `@rustbot` label +T-libs-api -T-libs
2 parents bde14a3 + aca404a commit 91578c0

File tree

23 files changed

+7
-27
lines changed

23 files changed

+7
-27
lines changed

compiler/rustc_codegen_cranelift/example/std_example.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(core_intrinsics, generators, generator_trait, is_sorted, bench_black_box)]
1+
#![feature(core_intrinsics, generators, generator_trait, is_sorted)]
22

33
#[cfg(target_arch = "x86_64")]
44
use std::arch::x86_64::*;

compiler/rustc_codegen_gcc/tests/run/int.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Run-time:
44
// status: 0
55

6-
#![feature(bench_black_box, const_black_box, core_intrinsics, start)]
6+
#![feature(const_black_box, core_intrinsics, start)]
77

88
#![no_std]
99

compiler/rustc_index/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#![deny(rustc::untranslatable_diagnostic)]
22
#![deny(rustc::diagnostic_outside_of_impl)]
33
#![feature(allow_internal_unstable)]
4-
#![feature(bench_black_box)]
54
#![feature(extend_one)]
65
#![feature(min_specialization)]
76
#![feature(new_uninit)]

library/alloc/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
#![feature(pointer_is_aligned)]
4242
#![feature(slice_flatten)]
4343
#![feature(thin_box)]
44-
#![feature(bench_black_box)]
4544
#![feature(strict_provenance)]
4645
#![feature(once_cell)]
4746
#![feature(drain_keep_rest)]

library/core/src/hint.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ pub fn spin_loop() {
217217
///
218218
/// [`std::convert::identity`]: crate::convert::identity
219219
#[inline]
220-
#[unstable(feature = "bench_black_box", issue = "64102")]
220+
#[stable(feature = "bench_black_box", since = "CURRENT_RUSTC_VERSION")]
221221
#[rustc_const_unstable(feature = "const_black_box", issue = "none")]
222222
pub const fn black_box<T>(dummy: T) -> T {
223223
crate::intrinsics::black_box(dummy)

library/core/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#![feature(array_chunks)]
33
#![feature(array_methods)]
44
#![feature(array_windows)]
5-
#![feature(bench_black_box)]
65
#![feature(bigint_helper_methods)]
76
#![feature(cell_update)]
87
#![feature(const_assume)]

library/std/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,6 @@
348348
#![feature(trace_macros)]
349349
//
350350
// Only used in tests/benchmarks:
351-
#![feature(bench_black_box)]
352351
//
353352
// Only for const-ness:
354353
#![feature(const_io_structs)]

library/test/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
#![unstable(feature = "test", issue = "50297")]
1717
#![doc(test(attr(deny(warnings))))]
18-
#![feature(bench_black_box)]
1918
#![feature(internal_output_capture)]
2019
#![feature(staged_api)]
2120
#![feature(process_exitcode_internals)]

src/test/incremental/spans_significant_w_panic.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// compile-flags: -C overflow-checks=on -Z query-dep-graph
99

1010
#![feature(rustc_attrs)]
11-
#![feature(bench_black_box)]
1211
#![rustc_partition_codegened(module = "spans_significant_w_panic", cfg = "rpass2")]
1312
#![rustc_partition_codegened(module = "spans_significant_w_panic", cfg = "rpass4")]
1413

src/test/ui/box/issue-95036.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// compile-flags: -O
22
// build-pass
33

4-
#![feature(allocator_api, bench_black_box)]
4+
#![feature(allocator_api)]
55

66
#[inline(never)]
77
pub fn by_ref(node: &mut Box<[u8; 1], &std::alloc::Global>) {

src/test/ui/consts/cast-discriminant-zst-enum.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// run-pass
22
// Test a ZST enum whose dicriminant is ~0i128. This caused an ICE when casting to an i32.
3-
#![feature(bench_black_box)]
43
use std::hint::black_box;
54

65
#[derive(Copy, Clone)]

src/test/ui/consts/const_discriminant.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// run-pass
22
#![feature(const_discriminant)]
3-
#![feature(bench_black_box)]
43
#![allow(dead_code)]
54

65
use std::mem::{discriminant, Discriminant};

src/test/ui/issues/issue-99838.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// run-pass
2-
#![feature(bench_black_box)]
2+
33
use std::hint;
44

55
struct U16(u16);

src/test/ui/oom_unwind.rs

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
// needs-unwind
55
// only-linux
66

7-
#![feature(bench_black_box)]
8-
97
use std::hint::black_box;
108
use std::mem::forget;
119
use std::panic::catch_unwind;

src/test/ui/process/process-panic-after-fork.rs

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
// ignore-sgx no processes
88
// ignore-android: FIXME(#85261)
99

10-
#![feature(bench_black_box)]
1110
#![feature(rustc_private)]
1211
#![feature(never_type)]
1312
#![feature(panic_always_abort)]

src/test/ui/sanitize/address.rs

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
// error-pattern: AddressSanitizer: stack-buffer-overflow
88
// error-pattern: 'xs' (line 15) <== Memory access at offset
99

10-
#![feature(bench_black_box)]
11-
1210
use std::hint::black_box;
1311

1412
fn main() {

src/test/ui/sanitize/hwaddress.rs

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
// run-fail
1111
// error-pattern: HWAddressSanitizer: tag-mismatch
1212

13-
#![feature(bench_black_box)]
14-
1513
use std::hint::black_box;
1614

1715
fn main() {

src/test/ui/sanitize/leak.rs

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
// run-fail
77
// error-pattern: LeakSanitizer: detected memory leaks
88

9-
#![feature(bench_black_box)]
10-
119
use std::hint::black_box;
1210
use std::mem;
1311

src/test/ui/sanitize/memory-eager.rs

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
#![feature(core_intrinsics)]
1919
#![feature(start)]
20-
#![feature(bench_black_box)]
2120

2221
use std::hint::black_box;
2322
use std::mem::MaybeUninit;

src/test/ui/sanitize/memory.rs

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#![feature(core_intrinsics)]
1818
#![feature(start)]
19-
#![feature(bench_black_box)]
2019
#![allow(invalid_value)]
2120

2221
use std::hint::black_box;

src/tools/miri/tests/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(bench_black_box)]
4+
55

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

src/tools/miri/tests/pass/float.rs

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

src/tools/miri/tests/pass/u128.rs

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

43
fn main() {

0 commit comments

Comments
 (0)