diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2020-08-13 11:05:48 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-13 11:05:48 +0900 |
| commit | 76ac5d61e431c2ed347e4b9627e50cc7df9bc6e3 (patch) | |
| tree | 313884e17a60fd701e6fc9e585b3ce53302b998f | |
| parent | 5526c1a8cdd77ca202f8f29bf35a74fd85455b2e (diff) | |
| parent | c48d45bf6bb54cfa1b5b6176daa8e438767d0a30 (diff) | |
| download | rust-76ac5d61e431c2ed347e4b9627e50cc7df9bc6e3.tar.gz rust-76ac5d61e431c2ed347e4b9627e50cc7df9bc6e3.zip | |
Rollup merge of #75473 - JulianKnodt:swap_order_oops, r=varkor
Flip order of const & type Fix swapped order of consts & types in error message introduced in #74953 r? @varkor cc @lcnr
| -rw-r--r-- | src/librustc_ast_passes/ast_validation.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/const-generics/defaults/needs-feature.min.stderr | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_ast_passes/ast_validation.rs b/src/librustc_ast_passes/ast_validation.rs index 244377dfa1d..3c2a063cf24 100644 --- 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 index d57190ea3bb..7058327fdce 100644 --- 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 |