Skip to content

Commit fea32f1

Browse files
committedSep 1, 2018
Auto merge of #53604 - oli-obk:min_const_fn, r=Centril,varkor
Implement the `min_const_fn` feature gate cc @RalfJung @eddyb r? @Centril implements the feature gate for #53555 I added a hack so the `const_fn` feature gate also enables the `min_const_fn` feature gate. This ensures that nightly users of `const_fn` don't have to touch their code at all. The `min_const_fn` checks are run first, and if they succeeded, the `const_fn` checks are run additionally to ensure we didn't miss anything.
2 parents e6381a7 + 2839f4f commit fea32f1

File tree

83 files changed

+1713
-279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+1713
-279
lines changed
 

‎src/liballoc/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@
8888
#![feature(box_syntax)]
8989
#![feature(cfg_target_has_atomic)]
9090
#![feature(coerce_unsized)]
91-
#![feature(const_fn)]
91+
#![cfg_attr(stage0, feature(const_fn))]
92+
#![cfg_attr(not(stage0), feature(min_const_fn))]
9293
#![feature(core_intrinsics)]
9394
#![feature(custom_attribute)]
9495
#![feature(dropck_eyepatch)]

‎src/liballoc/tests/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
#![feature(allocator_api)]
1212
#![feature(alloc_system)]
1313
#![feature(box_syntax)]
14-
#![feature(const_fn)]
14+
#![cfg_attr(stage0, feature(const_fn))]
15+
#![cfg_attr(not(stage0), feature(min_const_fn))]
1516
#![feature(drain_filter)]
1617
#![feature(exact_size_is_empty)]
1718
#![feature(pattern)]

0 commit comments

Comments
 (0)