diff options
| author | Oliver Schneider <github35764891676564198441@oli-obk.de> | 2018-08-29 13:20:43 +0200 |
|---|---|---|
| committer | Oliver Schneider <github35764891676564198441@oli-obk.de> | 2018-08-31 08:40:00 +0200 |
| commit | d125e904b5e298f710c7a5a1aaa3ebd953d2ced3 (patch) | |
| tree | d7205cb1b42043cc15c1dedaf5c40b0150f9bfe2 /src/liballoc | |
| parent | 7b3d930ca6f8269d07bce30ace4a9be2f316a63a (diff) | |
| download | rust-d125e904b5e298f710c7a5a1aaa3ebd953d2ced3.tar.gz rust-d125e904b5e298f710c7a5a1aaa3ebd953d2ced3.zip | |
Restrict most uses of `const_fn` to `min_const_fn`
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/lib.rs | 3 | ||||
| -rw-r--r-- | src/liballoc/tests/lib.rs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 676c977514f..452d2b1472f 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -88,7 +88,8 @@ #![feature(box_syntax)] #![feature(cfg_target_has_atomic)] #![feature(coerce_unsized)] -#![feature(const_fn)] +#![cfg_attr(stage0, feature(const_fn))] +#![cfg_attr(not(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 3a84f9e7e47..710c659ac53 100644 --- a/src/liballoc/tests/lib.rs +++ b/src/liballoc/tests/lib.rs @@ -11,7 +11,8 @@ #![feature(allocator_api)] #![feature(alloc_system)] #![feature(box_syntax)] -#![feature(const_fn)] +#![cfg_attr(stage0, feature(const_fn))] +#![cfg_attr(not(stage0), feature(min_const_fn))] #![feature(drain_filter)] #![feature(exact_size_is_empty)] #![feature(pattern)] |