about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBastian Kauschke <bastian_kauschke@hotmail.de>2020-07-23 08:06:42 +0200
committerBastian Kauschke <bastian_kauschke@hotmail.de>2020-07-23 08:14:39 +0200
commit2f565967b056335659ff1dfc2108c746f4ac8af3 (patch)
treecef906053ab925ce37269d0bf621fa4e2271762e
parenta95e6bb91673e250e35886ff09a2ba023e536ff6 (diff)
downloadrust-2f565967b056335659ff1dfc2108c746f4ac8af3.tar.gz
rust-2f565967b056335659ff1dfc2108c746f4ac8af3.zip
tweak wording
Co-authored-by: varkor <github@varkor.com>
-rw-r--r--src/librustc_ast_passes/ast_validation.rs2
-rw-r--r--src/test/ui/const-generics/defaults/wrong-order.stderr2
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 f25f5d563eb..daf3e23d6a1 100644
--- a/src/librustc_ast_passes/ast_validation.rs
+++ b/src/librustc_ast_passes/ast_validation.rs
@@ -1132,7 +1132,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                         if matches!(param.kind, GenericParamKind::Const { .. }) {
                             err.note(
                                 "using type defaults and const parameters \
-                                 in the same parameter listing is currently not possible",
+                                 in the same parameter list is currently not permitted",
                             );
                         }
                         err.emit();
diff --git a/src/test/ui/const-generics/defaults/wrong-order.stderr b/src/test/ui/const-generics/defaults/wrong-order.stderr
index 7d7cd0fa36f..283f6656121 100644
--- a/src/test/ui/const-generics/defaults/wrong-order.stderr
+++ b/src/test/ui/const-generics/defaults/wrong-order.stderr
@@ -4,7 +4,7 @@ error: type parameters with a default must be trailing
 LL | struct A<T = u32, const N: usize> {
    |          ^
    |
-   = note: using type defaults and const parameters in the same parameter listing is currently not possible
+   = note: using type defaults and const parameters in the same parameter list is currently not permitted
 
 warning: the feature `const_generics` is incomplete and may not be safe to use and/or cause compiler crashes
   --> $DIR/wrong-order.rs:1:12