diff options
| author | bors <bors@rust-lang.org> | 2018-10-07 13:37:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-10-07 13:37:07 +0000 |
| commit | 0ee045ea09127e5318e9cb1fff85ec34b9e3e6eb (patch) | |
| tree | ce87285cf79fb4f3e06d6a68114505fe1e842e49 /src/liballoc | |
| parent | 5a6f122126c35a1a4ab7f3ef070e07a256ee0116 (diff) | |
| parent | fb04e2644730f48ff257d467c2ef6e25274e17d1 (diff) | |
| download | rust-0ee045ea09127e5318e9cb1fff85ec34b9e3e6eb.tar.gz rust-0ee045ea09127e5318e9cb1fff85ec34b9e3e6eb.zip | |
Auto merge of #54835 - oli-obk:mögen_konstante_funktionen_doch_bitte_endlich_stabil_sein, r=Centril
Stabilize `min_const_fn` tracking issue: #53555 r? @Centril
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/lib.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/tests/lib.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 5f9ceb8599c..78d1958b8fb 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -86,7 +86,7 @@ #![feature(box_syntax)] #![feature(cfg_target_has_atomic)] #![feature(coerce_unsized)] -#![feature(min_const_fn)] +#![cfg_attr(stage0, feature(min_const_fn))] #![feature(core_intrinsics)] #![feature(custom_attribute)] #![feature(dropck_eyepatch)] diff --git a/src/liballoc/tests/lib.rs b/src/liballoc/tests/lib.rs index b9ba319a943..c771c41dc3e 100644 --- a/src/liballoc/tests/lib.rs +++ b/src/liballoc/tests/lib.rs @@ -11,7 +11,7 @@ #![feature(allocator_api)] #![feature(alloc_system)] #![feature(box_syntax)] -#![feature(min_const_fn)] +#![cfg_attr(stage0, feature(min_const_fn))] #![feature(drain_filter)] #![feature(exact_size_is_empty)] #![feature(pattern)] |