Skip to content

Commit 4756b2f

Browse files
committed
fix(tests/ui): diag oxford comma in .stderrs
1 parent e3da79e commit 4756b2f

File tree

56 files changed

+97
-97
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+97
-97
lines changed

tests/ui/const-generics/adt_const_params/suggest_feature_only_when_possible.stderr

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ error: `&'static mut ()` is forbidden as the type of a const generic parameter
44
LL | fn uwu_0<const N: &'static mut ()>() {}
55
| ^^^^^^^^^^^^^^^
66
|
7-
= note: the only supported types are integers, `bool` and `char`
7+
= note: the only supported types are integers, `bool`, and `char`
88

99
error: `&'static u32` is forbidden as the type of a const generic parameter
1010
--> $DIR/suggest_feature_only_when_possible.rs:15:19
1111
|
1212
LL | fn owo_0<const N: &'static u32>() {}
1313
| ^^^^^^^^^^^^
1414
|
15-
= note: the only supported types are integers, `bool` and `char`
15+
= note: the only supported types are integers, `bool`, and `char`
1616
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
1717
|
1818
LL + #![feature(adt_const_params)]
@@ -28,7 +28,7 @@ error: `Meow` is forbidden as the type of a const generic parameter
2828
LL | fn meow_0<const N: Meow>() {}
2929
| ^^^^
3030
|
31-
= note: the only supported types are integers, `bool` and `char`
31+
= note: the only supported types are integers, `bool`, and `char`
3232
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
3333
|
3434
LL + #![feature(adt_const_params)]
@@ -40,7 +40,7 @@ error: `&'static Meow` is forbidden as the type of a const generic parameter
4040
LL | fn meow_1<const N: &'static Meow>() {}
4141
| ^^^^^^^^^^^^^
4242
|
43-
= note: the only supported types are integers, `bool` and `char`
43+
= note: the only supported types are integers, `bool`, and `char`
4444
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
4545
|
4646
LL + #![feature(adt_const_params)]
@@ -56,39 +56,39 @@ error: `[Meow; 100]` is forbidden as the type of a const generic parameter
5656
LL | fn meow_2<const N: [Meow; 100]>() {}
5757
| ^^^^^^^^^^^
5858
|
59-
= note: the only supported types are integers, `bool` and `char`
59+
= note: the only supported types are integers, `bool`, and `char`
6060

6161
error: `(Meow, u8)` is forbidden as the type of a const generic parameter
6262
--> $DIR/suggest_feature_only_when_possible.rs:29:20
6363
|
6464
LL | fn meow_3<const N: (Meow, u8)>() {}
6565
| ^^^^^^^^^^
6666
|
67-
= note: the only supported types are integers, `bool` and `char`
67+
= note: the only supported types are integers, `bool`, and `char`
6868

6969
error: `(Meow, String)` is forbidden as the type of a const generic parameter
7070
--> $DIR/suggest_feature_only_when_possible.rs:34:20
7171
|
7272
LL | fn meow_4<const N: (Meow, String)>() {}
7373
| ^^^^^^^^^^^^^^
7474
|
75-
= note: the only supported types are integers, `bool` and `char`
75+
= note: the only supported types are integers, `bool`, and `char`
7676

7777
error: `String` is forbidden as the type of a const generic parameter
7878
--> $DIR/suggest_feature_only_when_possible.rs:38:19
7979
|
8080
LL | fn nya_0<const N: String>() {}
8181
| ^^^^^^
8282
|
83-
= note: the only supported types are integers, `bool` and `char`
83+
= note: the only supported types are integers, `bool`, and `char`
8484

8585
error: `Vec<u32>` is forbidden as the type of a const generic parameter
8686
--> $DIR/suggest_feature_only_when_possible.rs:40:19
8787
|
8888
LL | fn nya_1<const N: Vec<u32>>() {}
8989
| ^^^^^^^^
9090
|
91-
= note: the only supported types are integers, `bool` and `char`
91+
= note: the only supported types are integers, `bool`, and `char`
9292

9393
error: aborting due to 9 previous errors
9494

tests/ui/const-generics/const-param-elided-lifetime.min.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ error: `&u8` is forbidden as the type of a const generic parameter
3434
LL | struct A<const N: &u8>;
3535
| ^^^
3636
|
37-
= note: the only supported types are integers, `bool` and `char`
37+
= note: the only supported types are integers, `bool`, and `char`
3838
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
3939
|
4040
LL + #![feature(adt_const_params)]
@@ -50,7 +50,7 @@ error: `&u8` is forbidden as the type of a const generic parameter
5050
LL | impl<const N: &u8> A<N> {
5151
| ^^^
5252
|
53-
= note: the only supported types are integers, `bool` and `char`
53+
= note: the only supported types are integers, `bool`, and `char`
5454
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
5555
|
5656
LL + #![feature(adt_const_params)]
@@ -66,7 +66,7 @@ error: `&u8` is forbidden as the type of a const generic parameter
6666
LL | impl<const N: &u8> B for A<N> {}
6767
| ^^^
6868
|
69-
= note: the only supported types are integers, `bool` and `char`
69+
= note: the only supported types are integers, `bool`, and `char`
7070
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
7171
|
7272
LL + #![feature(adt_const_params)]
@@ -82,7 +82,7 @@ error: `&u8` is forbidden as the type of a const generic parameter
8282
LL | fn bar<const N: &u8>() {}
8383
| ^^^
8484
|
85-
= note: the only supported types are integers, `bool` and `char`
85+
= note: the only supported types are integers, `bool`, and `char`
8686
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
8787
|
8888
LL + #![feature(adt_const_params)]
@@ -98,7 +98,7 @@ error: `&u8` is forbidden as the type of a const generic parameter
9898
LL | fn foo<const M: &u8>(&self) {}
9999
| ^^^
100100
|
101-
= note: the only supported types are integers, `bool` and `char`
101+
= note: the only supported types are integers, `bool`, and `char`
102102
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
103103
|
104104
LL + #![feature(adt_const_params)]

tests/ui/const-generics/const-param-type-depends-on-const-param.min.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ error: `[u8; N]` is forbidden as the type of a const generic parameter
2020
LL | pub struct Dependent<const N: usize, const X: [u8; N]>([(); N]);
2121
| ^^^^^^^
2222
|
23-
= note: the only supported types are integers, `bool` and `char`
23+
= note: the only supported types are integers, `bool`, and `char`
2424
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
2525
|
2626
LL + #![feature(adt_const_params)]
@@ -32,7 +32,7 @@ error: `[u8; N]` is forbidden as the type of a const generic parameter
3232
LL | pub struct SelfDependent<const N: [u8; N]>;
3333
| ^^^^^^^
3434
|
35-
= note: the only supported types are integers, `bool` and `char`
35+
= note: the only supported types are integers, `bool`, and `char`
3636
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
3737
|
3838
LL + #![feature(adt_const_params)]

tests/ui/const-generics/default-ty-closure.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: using function pointers as const generic parameters is forbidden
44
LL | struct X<const FN: fn() = { || {} }>;
55
| ^^^^
66
|
7-
= note: the only supported types are integers, `bool` and `char`
7+
= note: the only supported types are integers, `bool`, and `char`
88

99
error: aborting due to 1 previous error
1010

tests/ui/const-generics/float-generic.simple.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: `f32` is forbidden as the type of a const generic parameter
44
LL | fn foo<const F: f32>() {}
55
| ^^^
66
|
7-
= note: the only supported types are integers, `bool` and `char`
7+
= note: the only supported types are integers, `bool`, and `char`
88

99
error: aborting due to 1 previous error
1010

tests/ui/const-generics/fn-const-param-call.min.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ error: using function pointers as const generic parameters is forbidden
44
LL | struct Wrapper<const F: fn() -> u32>;
55
| ^^^^^^^^^^^
66
|
7-
= note: the only supported types are integers, `bool` and `char`
7+
= note: the only supported types are integers, `bool`, and `char`
88

99
error: using function pointers as const generic parameters is forbidden
1010
--> $DIR/fn-const-param-call.rs:15:15
1111
|
1212
LL | impl<const F: fn() -> u32> Wrapper<F> {
1313
| ^^^^^^^^^^^
1414
|
15-
= note: the only supported types are integers, `bool` and `char`
15+
= note: the only supported types are integers, `bool`, and `char`
1616

1717
error: aborting due to 2 previous errors
1818

tests/ui/const-generics/fn-const-param-infer.min.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: using function pointers as const generic parameters is forbidden
44
LL | struct Checked<const F: fn(usize) -> bool>;
55
| ^^^^^^^^^^^^^^^^^
66
|
7-
= note: the only supported types are integers, `bool` and `char`
7+
= note: the only supported types are integers, `bool`, and `char`
88

99
error[E0308]: mismatched types
1010
--> $DIR/fn-const-param-infer.rs:33:25

tests/ui/const-generics/generic_const_exprs/array-size-in-generic-struct-param.min.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ error: `Config` is forbidden as the type of a const generic parameter
2222
LL | struct B<const CFG: Config> {
2323
| ^^^^^^
2424
|
25-
= note: the only supported types are integers, `bool` and `char`
25+
= note: the only supported types are integers, `bool`, and `char`
2626
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
2727
|
2828
LL + #![feature(adt_const_params)]

tests/ui/const-generics/generic_const_exprs/error_in_ty.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ error: `[usize; x]` is forbidden as the type of a const generic parameter
1212
LL | pub struct A<const z: [usize; x]> {}
1313
| ^^^^^^^^^^
1414
|
15-
= note: the only supported types are integers, `bool` and `char`
15+
= note: the only supported types are integers, `bool`, and `char`
1616
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
1717
|
1818
LL + #![feature(adt_const_params)]

tests/ui/const-generics/generic_const_exprs/unevaluated-const-ice-119731.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ error: `[[usize; v4]; v4]` is forbidden as the type of a const generic parameter
6666
LL | pub struct v17<const v10: usize, const v7: v11> {
6767
| ^^^
6868
|
69-
= note: the only supported types are integers, `bool` and `char`
69+
= note: the only supported types are integers, `bool`, and `char`
7070
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
7171
|
7272
LL + #![feature(adt_const_params)]

tests/ui/const-generics/ice-118285-fn-ptr-value.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: using function pointers as const generic parameters is forbidden
44
LL | struct Checked<const F: fn(usize) -> bool>;
55
| ^^^^^^^^^^^^^^^^^
66
|
7-
= note: the only supported types are integers, `bool` and `char`
7+
= note: the only supported types are integers, `bool`, and `char`
88

99
error: aborting due to 1 previous error
1010

tests/ui/const-generics/intrinsics-type_name-as-const-argument.min.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ error: `&'static str` is forbidden as the type of a const generic parameter
1313
LL | trait Trait<const S: &'static str> {}
1414
| ^^^^^^^^^^^^
1515
|
16-
= note: the only supported types are integers, `bool` and `char`
16+
= note: the only supported types are integers, `bool`, and `char`
1717
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
1818
|
1919
LL + #![feature(adt_const_params)]

tests/ui/const-generics/issues/issue-56445-1.min.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ error: `&str` is forbidden as the type of a const generic parameter
1212
LL | struct Bug<'a, const S: &'a str>(PhantomData<&'a ()>);
1313
| ^^^^^^^
1414
|
15-
= note: the only supported types are integers, `bool` and `char`
15+
= note: the only supported types are integers, `bool`, and `char`
1616
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
1717
|
1818
LL + #![feature(adt_const_params)]

tests/ui/const-generics/issues/issue-62878.min.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ error: `[u8; N]` is forbidden as the type of a const generic parameter
1212
LL | fn foo<const N: usize, const A: [u8; N]>() {}
1313
| ^^^^^^^
1414
|
15-
= note: the only supported types are integers, `bool` and `char`
15+
= note: the only supported types are integers, `bool`, and `char`
1616
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
1717
|
1818
LL + #![feature(adt_const_params)]

tests/ui/const-generics/issues/issue-63322-forbid-dyn.min.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: `&'static (dyn A + 'static)` is forbidden as the type of a const generic
44
LL | fn test<const T: &'static dyn A>() {
55
| ^^^^^^^^^^^^^^
66
|
7-
= note: the only supported types are integers, `bool` and `char`
7+
= note: the only supported types are integers, `bool`, and `char`
88
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
99
|
1010
LL + #![feature(adt_const_params)]

tests/ui/const-generics/issues/issue-68366.full.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: `Option<usize>` is forbidden as the type of a const generic parameter
44
LL | struct Collatz<const N: Option<usize>>;
55
| ^^^^^^^^^^^^^
66
|
7-
= note: the only supported types are integers, `bool` and `char`
7+
= note: the only supported types are integers, `bool`, and `char`
88
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
99
|
1010
LL + #![feature(adt_const_params)]

tests/ui/const-generics/issues/issue-68366.min.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ error: `Option<usize>` is forbidden as the type of a const generic parameter
1313
LL | struct Collatz<const N: Option<usize>>;
1414
| ^^^^^^^^^^^^^
1515
|
16-
= note: the only supported types are integers, `bool` and `char`
16+
= note: the only supported types are integers, `bool`, and `char`
1717
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
1818
|
1919
LL + #![feature(adt_const_params)]

tests/ui/const-generics/issues/issue-68615-adt.min.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: `[usize; 0]` is forbidden as the type of a const generic parameter
44
LL | struct Const<const V: [usize; 0]> {}
55
| ^^^^^^^^^^
66
|
7-
= note: the only supported types are integers, `bool` and `char`
7+
= note: the only supported types are integers, `bool`, and `char`
88
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
99
|
1010
LL + #![feature(adt_const_params)]

tests/ui/const-generics/issues/issue-68615-array.min.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: `[usize; 0]` is forbidden as the type of a const generic parameter
44
LL | struct Foo<const V: [usize; 0] > {}
55
| ^^^^^^^^^^
66
|
7-
= note: the only supported types are integers, `bool` and `char`
7+
= note: the only supported types are integers, `bool`, and `char`
88
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
99
|
1010
LL + #![feature(adt_const_params)]

tests/ui/const-generics/issues/issue-71169.min.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ error: `[u8; LEN]` is forbidden as the type of a const generic parameter
1212
LL | fn foo<const LEN: usize, const DATA: [u8; LEN]>() {}
1313
| ^^^^^^^^^
1414
|
15-
= note: the only supported types are integers, `bool` and `char`
15+
= note: the only supported types are integers, `bool`, and `char`
1616
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
1717
|
1818
LL + #![feature(adt_const_params)]

tests/ui/const-generics/issues/issue-71381.min.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ error: using function pointers as const generic parameters is forbidden
2020
LL | pub fn call_me<Args: Sized, const IDX: usize, const FN: unsafe extern "C" fn(Args)>(&self) {
2121
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
2222
|
23-
= note: the only supported types are integers, `bool` and `char`
23+
= note: the only supported types are integers, `bool`, and `char`
2424

2525
error: using function pointers as const generic parameters is forbidden
2626
--> $DIR/issue-71381.rs:23:19
2727
|
2828
LL | const FN: unsafe extern "C" fn(Args),
2929
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
3030
|
31-
= note: the only supported types are integers, `bool` and `char`
31+
= note: the only supported types are integers, `bool`, and `char`
3232

3333
error: aborting due to 4 previous errors
3434

tests/ui/const-generics/issues/issue-71382.min.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: using function pointers as const generic parameters is forbidden
44
LL | fn test<const FN: fn()>(&self) {
55
| ^^^^
66
|
7-
= note: the only supported types are integers, `bool` and `char`
7+
= note: the only supported types are integers, `bool`, and `char`
88

99
error: aborting due to 1 previous error
1010

tests/ui/const-generics/issues/issue-71611.min.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ error: using function pointers as const generic parameters is forbidden
1212
LL | fn func<A, const F: fn(inner: A)>(outer: A) {
1313
| ^^^^^^^^^^^^
1414
|
15-
= note: the only supported types are integers, `bool` and `char`
15+
= note: the only supported types are integers, `bool`, and `char`
1616

1717
error: aborting due to 2 previous errors
1818

tests/ui/const-generics/issues/issue-72352.min.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: using function pointers as const generic parameters is forbidden
44
LL | unsafe fn unsafely_do_the_thing<const F: fn(&CStr) -> usize>(ptr: *const c_char) -> usize {
55
| ^^^^^^^^^^^^^^^^^^
66
|
7-
= note: the only supported types are integers, `bool` and `char`
7+
= note: the only supported types are integers, `bool`, and `char`
88

99
error: aborting due to 1 previous error
1010

tests/ui/const-generics/issues/issue-73491.min.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: `[u32; LEN]` is forbidden as the type of a const generic parameter
44
LL | fn hoge<const IN: [u32; LEN]>() {}
55
| ^^^^^^^^^^
66
|
7-
= note: the only supported types are integers, `bool` and `char`
7+
= note: the only supported types are integers, `bool`, and `char`
88
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
99
|
1010
LL + #![feature(adt_const_params)]

tests/ui/const-generics/issues/issue-73727-static-reference-array-const-param.min.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: `&'static [u32]` is forbidden as the type of a const generic parameter
44
LL | fn a<const X: &'static [u32]>() {}
55
| ^^^^^^^^^^^^^^
66
|
7-
= note: the only supported types are integers, `bool` and `char`
7+
= note: the only supported types are integers, `bool`, and `char`
88
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
99
|
1010
LL + #![feature(adt_const_params)]

tests/ui/const-generics/issues/issue-74101.min.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: `[u8; 1 + 2]` is forbidden as the type of a const generic parameter
44
LL | fn test<const N: [u8; 1 + 2]>() {}
55
| ^^^^^^^^^^^
66
|
7-
= note: the only supported types are integers, `bool` and `char`
7+
= note: the only supported types are integers, `bool`, and `char`
88
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
99
|
1010
LL + #![feature(adt_const_params)]
@@ -16,7 +16,7 @@ error: `[u8; 1 + 2]` is forbidden as the type of a const generic parameter
1616
LL | struct Foo<const N: [u8; 1 + 2]>;
1717
| ^^^^^^^^^^^
1818
|
19-
= note: the only supported types are integers, `bool` and `char`
19+
= note: the only supported types are integers, `bool`, and `char`
2020
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
2121
|
2222
LL + #![feature(adt_const_params)]

tests/ui/const-generics/issues/issue-74255.min.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: `IceEnum` is forbidden as the type of a const generic parameter
44
LL | fn ice_struct_fn<const I: IceEnum>() {}
55
| ^^^^^^^
66
|
7-
= note: the only supported types are integers, `bool` and `char`
7+
= note: the only supported types are integers, `bool`, and `char`
88
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
99
|
1010
LL + #![feature(adt_const_params)]

0 commit comments

Comments
 (0)