Skip to content

Commit cf62e8a

Browse files
committed
Auto merge of rust-lang#102388 - JohnTitor:rollup-mbyw6fl, r=JohnTitor
Rollup of 8 pull requests Successful merges: - rust-lang#100747 (Add long description and test for E0311) - rust-lang#102232 (Stabilize bench_black_box) - rust-lang#102288 (Suggest unwrapping `???<T>` if a method cannot be found on it but is present on `T`.) - rust-lang#102338 (Deny associated type bindings within associated type bindings) - rust-lang#102347 (Unescaping cleanups) - rust-lang#102348 (Tweak `FulfillProcessor`.) - rust-lang#102378 (Use already resolved `self_ty` in `confirm_fn_pointer_candidate`) - rust-lang#102380 (rustdoc: remove redundant mobile `.source > .sidebar` CSS) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 6784b45 + 12d81c2 commit cf62e8a

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

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) };

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;

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)