Properly pluralize 'generic constants'

compiler-errors · compiler-errors · commit 9f6fef96571f · 2023-01-16T20:21:29.000Z
diff --git a/compiler/rustc_error_messages/locales/en-US/ty_utils.ftl b/compiler/rustc_error_messages/locales/en-US/ty_utils.ftl
@@ -10,17 +10,17 @@ ty_utils_address_and_deref_not_supported = dereferencing or taking the address i
 
 ty_utils_array_not_supported = array construction is not supported in generic constants
 
-ty_utils_block_not_supported = blocks are not supported in generic constant
+ty_utils_block_not_supported = blocks are not supported in generic constants
 
-ty_utils_never_to_any_not_supported = converting nevers to any is not supported in generic constant
+ty_utils_never_to_any_not_supported = converting nevers to any is not supported in generic constants
 
 ty_utils_tuple_not_supported = tuple construction is not supported in generic constants
 
-ty_utils_index_not_supported = indexing is not supported in generic constant
+ty_utils_index_not_supported = indexing is not supported in generic constants
 
-ty_utils_field_not_supported = field access is not supported in generic constant
+ty_utils_field_not_supported = field access is not supported in generic constants
 
-ty_utils_const_block_not_supported = const blocks are not supported in generic constant
+ty_utils_const_block_not_supported = const blocks are not supported in generic constants
 
 ty_utils_adt_not_supported = struct/enum construction is not supported in generic constants
 
@@ -44,4 +44,4 @@ ty_utils_control_flow_not_supported = control flow is not supported in generic c
 
 ty_utils_inline_asm_not_supported = assembly is not supported in generic constants
 
-ty_utils_operation_not_supported = unsupported operation in generic constant
+ty_utils_operation_not_supported = unsupported operation in generic constants
diff --git a/tests/ui/const-generics/generic_const_exprs/array-size-in-generic-struct-param.full.stderr b/tests/ui/const-generics/generic_const_exprs/array-size-in-generic-struct-param.full.stderr
@@ -10,7 +10,7 @@ error: overly complex generic constant
   --> $DIR/array-size-in-generic-struct-param.rs:19:15
    |
 LL |     arr: [u8; CFG.arr_size],
-   |               ^^^^^^^^^^^^ field access is not supported in generic constant
+   |               ^^^^^^^^^^^^ field access is not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
diff --git a/tests/ui/const-generics/generic_const_exprs/const-block-is-poly.stderr b/tests/ui/const-generics/generic_const_exprs/const-block-is-poly.stderr
@@ -11,7 +11,7 @@ error: overly complex generic constant
   --> $DIR/const-block-is-poly.rs:5:19
    |
 LL |     let _ = [0u8; const { std::mem::size_of::<T>() }];
-   |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ const blocks are not supported in generic constant
+   |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ const blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
diff --git a/tests/ui/const-generics/generic_const_exprs/let-bindings.stderr b/tests/ui/const-generics/generic_const_exprs/let-bindings.stderr
@@ -2,7 +2,7 @@ error: overly complex generic constant
   --> $DIR/let-bindings.rs:6:68
    |
 LL | fn test<const N: usize>() -> [u8; { let x = N; N + 1 }] where [u8; { let x = N; N + 1 }]: Default {
-   |                                                                    ^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constant
+   |                                                                    ^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
@@ -11,7 +11,7 @@ error: overly complex generic constant
   --> $DIR/let-bindings.rs:6:35
    |
 LL | fn test<const N: usize>() -> [u8; { let x = N; N + 1 }] where [u8; { let x = N; N + 1 }]: Default {
-   |                                   ^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constant
+   |                                   ^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
diff --git a/tests/ui/const-generics/generic_const_exprs/unused_expr.stderr b/tests/ui/const-generics/generic_const_exprs/unused_expr.stderr
@@ -2,7 +2,7 @@ error: overly complex generic constant
   --> $DIR/unused_expr.rs:4:34
    |
 LL | fn add<const N: usize>() -> [u8; { N + 1; 5 }] {
-   |                                  ^^^^^^^^^^^^ blocks are not supported in generic constant
+   |                                  ^^^^^^^^^^^^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
@@ -11,7 +11,7 @@ error: overly complex generic constant
   --> $DIR/unused_expr.rs:9:34
    |
 LL | fn div<const N: usize>() -> [u8; { N / 1; 5 }] {
-   |                                  ^^^^^^^^^^^^ blocks are not supported in generic constant
+   |                                  ^^^^^^^^^^^^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
@@ -20,7 +20,7 @@ error: overly complex generic constant
   --> $DIR/unused_expr.rs:16:38
    |
 LL | fn fn_call<const N: usize>() -> [u8; { foo(N); 5 }] {
-   |                                      ^^^^^^^^^^^^^ blocks are not supported in generic constant
+   |                                      ^^^^^^^^^^^^^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
diff --git a/tests/ui/const-generics/issues/issue-67945-2.full.stderr b/tests/ui/const-generics/issues/issue-67945-2.full.stderr
@@ -8,7 +8,7 @@ LL | |         let x: Option<Box<Self>> = None;
 LL | |
 LL | |         0
 LL | |     }],
-   | |_____^ blocks are not supported in generic constant
+   | |_____^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
diff --git a/tests/ui/const-generics/issues/issue-67945-3.full.stderr b/tests/ui/const-generics/issues/issue-67945-3.full.stderr
@@ -7,7 +7,7 @@ LL | |         let x: Option<S> = None;
 LL | |
 LL | |         0
 LL | |     }],
-   | |_____^ blocks are not supported in generic constant
+   | |_____^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
diff --git a/tests/ui/const-generics/issues/issue-67945-4.full.stderr b/tests/ui/const-generics/issues/issue-67945-4.full.stderr
@@ -7,7 +7,7 @@ LL | |         let x: Option<Box<S>> = None;
 LL | |
 LL | |         0
 LL | |     }],
-   | |_____^ blocks are not supported in generic constant
+   | |_____^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
diff --git a/tests/ui/const-generics/issues/issue-77357.stderr b/tests/ui/const-generics/issues/issue-77357.stderr
@@ -2,7 +2,7 @@ error: overly complex generic constant
   --> $DIR/issue-77357.rs:6:46
    |
 LL | fn bug<'a, T>() -> &'static dyn MyTrait<[(); { |x: &'a u32| { x }; 4 }]> {
-   |                                              ^^^^^^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constant
+   |                                              ^^^^^^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ error: overly complex generic constant`
`10`	`10`	`--> $DIR/array-size-in-generic-struct-param.rs:19:15`
`11`	`11`	`\|`
`12`	`12`	`LL \| arr: [u8; CFG.arr_size],`
`13`		`- \| ^^^^^^^^^^^^ field access is not supported in generic constant`
	`13`	`+ \| ^^^^^^^^^^^^ field access is not supported in generic constants`
`14`	`14`	`\|`
`15`	`15`	= help: consider moving this anonymous constant into a `const` function
`16`	`16`	`= note: this operation may be supported in the future`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ error: overly complex generic constant`
`11`	`11`	`--> $DIR/const-block-is-poly.rs:5:19`
`12`	`12`	`\|`
`13`	`13`	`LL \| let _ = [0u8; const { std::mem::size_of::<T>() }];`
`14`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ const blocks are not supported in generic constant`
	`14`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ const blocks are not supported in generic constants`
`15`	`15`	`\|`
`16`	`16`	= help: consider moving this anonymous constant into a `const` function
`17`	`17`	`= note: this operation may be supported in the future`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error: overly complex generic constant`
`2`	`2`	`--> $DIR/let-bindings.rs:6:68`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn test<const N: usize>() -> [u8; { let x = N; N + 1 }] where [u8; { let x = N; N + 1 }]: Default {`
`5`		`- \| ^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constant`
	`5`	`+ \| ^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constants`
`6`	`6`	`\|`
`7`	`7`	= help: consider moving this anonymous constant into a `const` function
`8`	`8`	`= note: this operation may be supported in the future`
`@@ -11,7 +11,7 @@ error: overly complex generic constant`
`11`	`11`	`--> $DIR/let-bindings.rs:6:35`
`12`	`12`	`\|`
`13`	`13`	`LL \| fn test<const N: usize>() -> [u8; { let x = N; N + 1 }] where [u8; { let x = N; N + 1 }]: Default {`
`14`		`- \| ^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constant`
	`14`	`+ \| ^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constants`
`15`	`15`	`\|`
`16`	`16`	= help: consider moving this anonymous constant into a `const` function
`17`	`17`	`= note: this operation may be supported in the future`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error: overly complex generic constant`
`2`	`2`	`--> $DIR/unused_expr.rs:4:34`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn add<const N: usize>() -> [u8; { N + 1; 5 }] {`
`5`		`- \| ^^^^^^^^^^^^ blocks are not supported in generic constant`
	`5`	`+ \| ^^^^^^^^^^^^ blocks are not supported in generic constants`
`6`	`6`	`\|`
`7`	`7`	= help: consider moving this anonymous constant into a `const` function
`8`	`8`	`= note: this operation may be supported in the future`
`@@ -11,7 +11,7 @@ error: overly complex generic constant`
`11`	`11`	`--> $DIR/unused_expr.rs:9:34`
`12`	`12`	`\|`
`13`	`13`	`LL \| fn div<const N: usize>() -> [u8; { N / 1; 5 }] {`
`14`		`- \| ^^^^^^^^^^^^ blocks are not supported in generic constant`
	`14`	`+ \| ^^^^^^^^^^^^ blocks are not supported in generic constants`
`15`	`15`	`\|`
`16`	`16`	= help: consider moving this anonymous constant into a `const` function
`17`	`17`	`= note: this operation may be supported in the future`
`@@ -20,7 +20,7 @@ error: overly complex generic constant`
`20`	`20`	`--> $DIR/unused_expr.rs:16:38`
`21`	`21`	`\|`
`22`	`22`	`LL \| fn fn_call<const N: usize>() -> [u8; { foo(N); 5 }] {`
`23`		`- \| ^^^^^^^^^^^^^ blocks are not supported in generic constant`
	`23`	`+ \| ^^^^^^^^^^^^^ blocks are not supported in generic constants`
`24`	`24`	`\|`
`25`	`25`	= help: consider moving this anonymous constant into a `const` function
`26`	`26`	`= note: this operation may be supported in the future`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ LL \| \| let x: Option<Box<Self>> = None;`
`8`	`8`	`LL \| \|`
`9`	`9`	`LL \| \| 0`
`10`	`10`	`LL \| \| }],`
`11`		`- \| \|_____^ blocks are not supported in generic constant`
	`11`	`+ \| \|_____^ blocks are not supported in generic constants`
`12`	`12`	`\|`
`13`	`13`	= help: consider moving this anonymous constant into a `const` function
`14`	`14`	`= note: this operation may be supported in the future`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| \| let x: Option<S> = None;`
`7`	`7`	`LL \| \|`
`8`	`8`	`LL \| \| 0`
`9`	`9`	`LL \| \| }],`
`10`		`- \| \|_____^ blocks are not supported in generic constant`
	`10`	`+ \| \|_____^ blocks are not supported in generic constants`
`11`	`11`	`\|`
`12`	`12`	= help: consider moving this anonymous constant into a `const` function
`13`	`13`	`= note: this operation may be supported in the future`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| \| let x: Option<Box<S>> = None;`
`7`	`7`	`LL \| \|`
`8`	`8`	`LL \| \| 0`
`9`	`9`	`LL \| \| }],`
`10`		`- \| \|_____^ blocks are not supported in generic constant`
	`10`	`+ \| \|_____^ blocks are not supported in generic constants`
`11`	`11`	`\|`
`12`	`12`	= help: consider moving this anonymous constant into a `const` function
`13`	`13`	`= note: this operation may be supported in the future`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error: overly complex generic constant`
`2`	`2`	`--> $DIR/issue-77357.rs:6:46`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn bug<'a, T>() -> &'static dyn MyTrait<[(); { \|x: &'a u32\| { x }; 4 }]> {`
`5`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constant`
	`5`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constants`
`6`	`6`	`\|`
`7`	`7`	= help: consider moving this anonymous constant into a `const` function
`8`	`8`	`= note: this operation may be supported in the future`