Skip to content

Commit 2bc009e

Browse files
committed
Auto merge of #153000 - Zalathar:rollup-68jDIBK, r=Zalathar
Rollup of 9 pull requests Successful merges: - rust-lang/rust#152229 (Remove deterministic picking from query cycle handling) - rust-lang/rust#152970 (extend unpin noalias tests to cover mutable references) - rust-lang/rust#149783 (stabilize `cfg_select!`) - rust-lang/rust#151744 (fix refining_impl_trait suggestion with return_type_notation) - rust-lang/rust#152366 (Add try_shrink_to and try_shrink_to_fit to Vec) - rust-lang/rust#152640 (Add direct link to rustc-dev-guide in README) - rust-lang/rust#152963 (Revert "Stabilize `str_as_str`") - rust-lang/rust#152984 (Remove redundant call to `check_codegen_attributes_extra` in Inliner) - rust-lang/rust#152987 (Use `HashStable` derive in more places)
2 parents 1f76d8d + a824ce1 commit 2bc009e

2 files changed

Lines changed: 1 addition & 2 deletions

File tree

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![cfg_attr(bootstrap, feature(if_let_guard))]
22
#![feature(abort_unwind)]
3-
#![feature(cfg_select)]
43
#![feature(rustc_private)]
54
#![feature(float_gamma)]
65
#![feature(float_erf)]
@@ -17,6 +16,7 @@
1716
#![feature(derive_coerce_pointee)]
1817
#![feature(arbitrary_self_types)]
1918
#![feature(iter_advance_by)]
19+
#![cfg_attr(bootstrap, feature(cfg_select))]
2020
// Configure clippy and other lints
2121
#![allow(
2222
clippy::collapsible_else_if,

tests/pass/float_extra_rounding_error.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
//@revisions: random max none
33
//@[max]compile-flags: -Zmiri-max-extra-rounding-error
44
//@[none]compile-flags: -Zmiri-no-extra-rounding-error
5-
#![feature(cfg_select)]
65

76
use std::collections::HashSet;
87
use std::hint::black_box;

0 commit comments

Comments
 (0)