Stabilize min_const_fn feature gate

diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index e854e3d67606fabda5370d7e2433d1e2fe1b310b..d72800bcd1e99b8ea88be3bd3ff3434df55641b6 100644 (file)
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -40,16 +40,6 @@
 use std::{env};
 
 macro_rules! set {
-    // The const_fn feature also enables the min_const_fn feature, because `min_const_fn` allows
-    // the declaration `const fn`, but the `const_fn` feature gate enables things inside those
-    // functions that we do not want to expose to the user for now.
-    (const_fn) => {{
-        fn f(features: &mut Features, _: Span) {
-            features.const_fn = true;
-            features.min_const_fn = true;
-        }
-        f as fn(&mut Features, Span)
-    }};
     ($field: ident) => {{
         fn f(features: &mut Features, _: Span) {
             features.$field = true;
@@ -219,9 +209,6 @@ pub fn walk_feature_fields<F>(&self, mut f: F)
     // Allows the definition of `const fn` functions with some advanced features.
     (active, const_fn, "1.2.0", Some(24111), None),
 
-    // Allows the definition of `const fn` functions.
-    (active, min_const_fn, "1.30.0", Some(53555), None),
-
     // Allows let bindings and destructuring in `const fn` functions and constants.
     (active, const_let, "1.22.1", Some(48821), None),
 
@@ -685,6 +672,8 @@ pub fn walk_feature_fields<F>(&self, mut f: F)
     (accepted, extern_prelude, "1.30.0", Some(44660), None),
     // Parentheses in patterns
     (accepted, pattern_parentheses, "1.31.0", Some(51087), None),
+    // Allows the definition of `const fn` functions.
+    (accepted, min_const_fn, "1.31.0", Some(53555), None),
 );
 
 // If you change this, please modify src/doc/unstable-book as well. You must