Flip order of const & type

JulianKnodt · JulianKnodt · commit c48d45bf6bb5 · 2020-08-12T23:19:07.000Z
diff --git a/src/librustc_ast_passes/ast_validation.rs b/src/librustc_ast_passes/ast_validation.rs
@@ -777,7 +777,7 @@ fn validate_generic_param_order<'a>(
                 if sess.features_untracked().const_generics {
                     ", then consts and types"
                 } else if sess.features_untracked().min_const_generics {
-                    ", then consts, then types"
+                    ", then types, then consts"
                 } else {
                     ", then types"
                 },
diff --git a/src/test/ui/const-generics/defaults/needs-feature.min.stderr b/src/test/ui/const-generics/defaults/needs-feature.min.stderr
@@ -2,7 +2,7 @@ error: type parameters must be declared prior to const parameters
   --> $DIR/needs-feature.rs:10:26
    |
 LL | struct A<const N: usize, T=u32>(T);
-   |         -----------------^----- help: reorder the parameters: lifetimes, then consts, then types: `<T, const N: usize>`
+   |         -----------------^----- help: reorder the parameters: lifetimes, then types, then consts: `<T, const N: usize>`
 
 error: aborting due to previous error
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error: type parameters must be declared prior to const parameters`
`2`	`2`	`--> $DIR/needs-feature.rs:10:26`
`3`	`3`	`\|`
`4`	`4`	`LL \| struct A<const N: usize, T=u32>(T);`
`5`		- \| -----------------^----- help: reorder the parameters: lifetimes, then consts, then types: `<T, const N: usize>`
	`5`	+ \| -----------------^----- help: reorder the parameters: lifetimes, then types, then consts: `<T, const N: usize>`
`6`	`6`
`7`	`7`	`error: aborting due to previous error`
`8`	`8`