Skip to content

Commit 8b35c0b

Browse files
borsbors
committed
Auto merge of #112068 - WaffleLapkin:move-discrim-tests, r=compiler-errors
Move tests from `ui/discrim` dir It seems that we already have a `enum-discriminant` with more tests, so it makes sense to merge them.
2 parents a77659a + 7b8e8ad commit 8b35c0b

7 files changed

+25
-25
lines changed

‎src/tools/tidy/src/ui_tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use std::path::{Path, PathBuf};
1111
const ENTRY_LIMIT: usize = 900;
1212
// FIXME: The following limits should be reduced eventually.
1313
const ISSUES_ENTRY_LIMIT: usize = 1898;
14-
const ROOT_ENTRY_LIMIT: usize = 871;
14+
const ROOT_ENTRY_LIMIT: usize = 870;
1515

1616
const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
1717
"rs", // test source files

‎tests/ui/discrim/discrim-ill-typed.rs renamed to ‎tests/ui/enum-discriminant/discriminant-ill-typed.rs

File renamed without changes.

‎tests/ui/discrim/discrim-ill-typed.stderr renamed to ‎tests/ui/enum-discriminant/discriminant-ill-typed.stderr

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0308]: mismatched types
2-
--> $DIR/discrim-ill-typed.rs:15:16
2+
--> $DIR/discriminant-ill-typed.rs:15:16
33
|
44
LL | OhNo = 0_u8,
55
| ^^^^ expected `i8`, found `u8`
@@ -10,7 +10,7 @@ LL | OhNo = 0_i8,
1010
| ~~
1111

1212
error[E0308]: mismatched types
13-
--> $DIR/discrim-ill-typed.rs:28:16
13+
--> $DIR/discriminant-ill-typed.rs:28:16
1414
|
1515
LL | OhNo = 0_i8,
1616
| ^^^^ expected `u8`, found `i8`
@@ -21,7 +21,7 @@ LL | OhNo = 0_u8,
2121
| ~~
2222

2323
error[E0308]: mismatched types
24-
--> $DIR/discrim-ill-typed.rs:41:16
24+
--> $DIR/discriminant-ill-typed.rs:41:16
2525
|
2626
LL | OhNo = 0_u16,
2727
| ^^^^^ expected `i16`, found `u16`
@@ -32,7 +32,7 @@ LL | OhNo = 0_i16,
3232
| ~~~
3333

3434
error[E0308]: mismatched types
35-
--> $DIR/discrim-ill-typed.rs:54:16
35+
--> $DIR/discriminant-ill-typed.rs:54:16
3636
|
3737
LL | OhNo = 0_i16,
3838
| ^^^^^ expected `u16`, found `i16`
@@ -43,7 +43,7 @@ LL | OhNo = 0_u16,
4343
| ~~~
4444

4545
error[E0308]: mismatched types
46-
--> $DIR/discrim-ill-typed.rs:67:16
46+
--> $DIR/discriminant-ill-typed.rs:67:16
4747
|
4848
LL | OhNo = 0_u32,
4949
| ^^^^^ expected `i32`, found `u32`
@@ -54,7 +54,7 @@ LL | OhNo = 0_i32,
5454
| ~~~
5555

5656
error[E0308]: mismatched types
57-
--> $DIR/discrim-ill-typed.rs:80:16
57+
--> $DIR/discriminant-ill-typed.rs:80:16
5858
|
5959
LL | OhNo = 0_i32,
6060
| ^^^^^ expected `u32`, found `i32`
@@ -65,7 +65,7 @@ LL | OhNo = 0_u32,
6565
| ~~~
6666

6767
error[E0308]: mismatched types
68-
--> $DIR/discrim-ill-typed.rs:93:16
68+
--> $DIR/discriminant-ill-typed.rs:93:16
6969
|
7070
LL | OhNo = 0_u64,
7171
| ^^^^^ expected `i64`, found `u64`
@@ -76,7 +76,7 @@ LL | OhNo = 0_i64,
7676
| ~~~
7777

7878
error[E0308]: mismatched types
79-
--> $DIR/discrim-ill-typed.rs:106:16
79+
--> $DIR/discriminant-ill-typed.rs:106:16
8080
|
8181
LL | OhNo = 0_i64,
8282
| ^^^^^ expected `u64`, found `i64`

‎tests/ui/discrim/discrim-overflow-2.rs renamed to ‎tests/ui/enum-discriminant/discriminant-overflow-2.rs

File renamed without changes.

‎tests/ui/discrim/discrim-overflow.stderr renamed to ‎tests/ui/enum-discriminant/discriminant-overflow-2.stderr

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
11
error[E0370]: enum discriminant overflowed
2-
--> $DIR/discrim-overflow.rs:11:9
2+
--> $DIR/discriminant-overflow-2.rs:13:9
33
|
44
LL | OhNo,
55
| ^^^^ overflowed on value after 127
66
|
77
= note: explicitly set `OhNo = -128` if that is desired outcome
88

99
error[E0370]: enum discriminant overflowed
10-
--> $DIR/discrim-overflow.rs:22:9
10+
--> $DIR/discriminant-overflow-2.rs:22:9
1111
|
1212
LL | OhNo,
1313
| ^^^^ overflowed on value after 255
1414
|
1515
= note: explicitly set `OhNo = 0` if that is desired outcome
1616

1717
error[E0370]: enum discriminant overflowed
18-
--> $DIR/discrim-overflow.rs:33:9
18+
--> $DIR/discriminant-overflow-2.rs:31:9
1919
|
2020
LL | OhNo,
2121
| ^^^^ overflowed on value after 32767
2222
|
2323
= note: explicitly set `OhNo = -32768` if that is desired outcome
2424

2525
error[E0370]: enum discriminant overflowed
26-
--> $DIR/discrim-overflow.rs:44:9
26+
--> $DIR/discriminant-overflow-2.rs:40:9
2727
|
2828
LL | OhNo,
2929
| ^^^^ overflowed on value after 65535
3030
|
3131
= note: explicitly set `OhNo = 0` if that is desired outcome
3232

3333
error[E0370]: enum discriminant overflowed
34-
--> $DIR/discrim-overflow.rs:56:9
34+
--> $DIR/discriminant-overflow-2.rs:49:9
3535
|
3636
LL | OhNo,
3737
| ^^^^ overflowed on value after 2147483647
3838
|
3939
= note: explicitly set `OhNo = -2147483648` if that is desired outcome
4040

4141
error[E0370]: enum discriminant overflowed
42-
--> $DIR/discrim-overflow.rs:68:9
42+
--> $DIR/discriminant-overflow-2.rs:58:9
4343
|
4444
LL | OhNo,
4545
| ^^^^ overflowed on value after 4294967295
4646
|
4747
= note: explicitly set `OhNo = 0` if that is desired outcome
4848

4949
error[E0370]: enum discriminant overflowed
50-
--> $DIR/discrim-overflow.rs:80:9
50+
--> $DIR/discriminant-overflow-2.rs:67:9
5151
|
5252
LL | OhNo,
5353
| ^^^^ overflowed on value after 9223372036854775807
5454
|
5555
= note: explicitly set `OhNo = -9223372036854775808` if that is desired outcome
5656

5757
error[E0370]: enum discriminant overflowed
58-
--> $DIR/discrim-overflow.rs:92:9
58+
--> $DIR/discriminant-overflow-2.rs:76:9
5959
|
6060
LL | OhNo,
6161
| ^^^^ overflowed on value after 18446744073709551615

‎tests/ui/discrim/discrim-overflow.rs renamed to ‎tests/ui/enum-discriminant/discriminant-overflow.rs

File renamed without changes.

‎tests/ui/discrim/discrim-overflow-2.stderr renamed to ‎tests/ui/enum-discriminant/discriminant-overflow.stderr

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
11
error[E0370]: enum discriminant overflowed
2-
--> $DIR/discrim-overflow-2.rs:13:9
2+
--> $DIR/discriminant-overflow.rs:11:9
33
|
44
LL | OhNo,
55
| ^^^^ overflowed on value after 127
66
|
77
= note: explicitly set `OhNo = -128` if that is desired outcome
88

99
error[E0370]: enum discriminant overflowed
10-
--> $DIR/discrim-overflow-2.rs:22:9
10+
--> $DIR/discriminant-overflow.rs:22:9
1111
|
1212
LL | OhNo,
1313
| ^^^^ overflowed on value after 255
1414
|
1515
= note: explicitly set `OhNo = 0` if that is desired outcome
1616

1717
error[E0370]: enum discriminant overflowed
18-
--> $DIR/discrim-overflow-2.rs:31:9
18+
--> $DIR/discriminant-overflow.rs:33:9
1919
|
2020
LL | OhNo,
2121
| ^^^^ overflowed on value after 32767
2222
|
2323
= note: explicitly set `OhNo = -32768` if that is desired outcome
2424

2525
error[E0370]: enum discriminant overflowed
26-
--> $DIR/discrim-overflow-2.rs:40:9
26+
--> $DIR/discriminant-overflow.rs:44:9
2727
|
2828
LL | OhNo,
2929
| ^^^^ overflowed on value after 65535
3030
|
3131
= note: explicitly set `OhNo = 0` if that is desired outcome
3232

3333
error[E0370]: enum discriminant overflowed
34-
--> $DIR/discrim-overflow-2.rs:49:9
34+
--> $DIR/discriminant-overflow.rs:56:9
3535
|
3636
LL | OhNo,
3737
| ^^^^ overflowed on value after 2147483647
3838
|
3939
= note: explicitly set `OhNo = -2147483648` if that is desired outcome
4040

4141
error[E0370]: enum discriminant overflowed
42-
--> $DIR/discrim-overflow-2.rs:58:9
42+
--> $DIR/discriminant-overflow.rs:68:9
4343
|
4444
LL | OhNo,
4545
| ^^^^ overflowed on value after 4294967295
4646
|
4747
= note: explicitly set `OhNo = 0` if that is desired outcome
4848

4949
error[E0370]: enum discriminant overflowed
50-
--> $DIR/discrim-overflow-2.rs:67:9
50+
--> $DIR/discriminant-overflow.rs:80:9
5151
|
5252
LL | OhNo,
5353
| ^^^^ overflowed on value after 9223372036854775807
5454
|
5555
= note: explicitly set `OhNo = -9223372036854775808` if that is desired outcome
5656

5757
error[E0370]: enum discriminant overflowed
58-
--> $DIR/discrim-overflow-2.rs:76:9
58+
--> $DIR/discriminant-overflow.rs:92:9
5959
|
6060
LL | OhNo,
6161
| ^^^^ overflowed on value after 18446744073709551615

0 commit comments

Comments
 (0)