about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-10-07 13:37:07 +0000
committerbors <bors@rust-lang.org>2018-10-07 13:37:07 +0000
commit0ee045ea09127e5318e9cb1fff85ec34b9e3e6eb (patch)
treece87285cf79fb4f3e06d6a68114505fe1e842e49 /src/libstd
parent5a6f122126c35a1a4ab7f3ef070e07a256ee0116 (diff)
parentfb04e2644730f48ff257d467c2ef6e25274e17d1 (diff)
downloadrust-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/libstd')
-rw-r--r--src/libstd/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index c58bd364ced..a4db8796805 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -250,7 +250,7 @@
 #![feature(cfg_target_vendor)]
 #![feature(char_error_internals)]
 #![feature(compiler_builtins_lib)]
-#![feature(min_const_fn)]
+#![cfg_attr(stage0, feature(min_const_fn))]
 #![feature(const_int_ops)]
 #![feature(const_ip)]
 #![feature(const_raw_ptr_deref)]