stabilize min_const_generics

2020-11-17 10:55:13 +01:00
parent 1f5beec3b1
commit 06cc9c26da
17 changed files with 41 additions and 51 deletions
--- a/compiler/rustc_ast_passes/src/ast_validation.rs
+++ b/compiler/rustc_ast_passes/src/ast_validation.rs
@@ -773,14 +773,12 @@ fn validate_generic_param_order<'a>(
        err.span_suggestion(
            span,
            &format!(
-                "reorder the parameters: lifetimes{}",
+                "reorder the parameters: lifetimes, {}",
                if sess.features_untracked().const_generics {
-                    ", then consts and types"
-                } else if sess.features_untracked().min_const_generics {
-                    ", then types, then consts"
+                    "then consts and types"
                } else {
-                    ", then types"
-                },
+                    "then types, then consts"
+                }
            ),
            ordered_params.clone(),
            Applicability::MachineApplicable,