Skip to content

Commit c80ac66

Browse files
authored
Unrolled build for rust-lang#125310
Rollup merge of rust-lang#125310 - workingjubilee:muck-out-the-test-stables, r=Nilstrieb Move ~100 tests from tests/ui to subdirs new dirs for some, the rest in old sweep tests up before they turn cold to stop our code from growing mold
2 parents 5065123 + d895008 commit c80ac66

File tree

127 files changed

+42
-45
lines changed

Some content is hidden

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

127 files changed

+42
-45
lines changed

src/tools/tidy/src/ui_tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const ENTRY_LIMIT: usize = 900;
1616
// FIXME: The following limits should be reduced eventually.
1717

1818
const ISSUES_ENTRY_LIMIT: usize = 1676;
19-
const ROOT_ENTRY_LIMIT: usize = 859;
19+
const ROOT_ENTRY_LIMIT: usize = 757;
2020

2121
const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
2222
"rs", // test source files
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

tests/ui/xcrate/xcrate-private-by-default.stderr tests/ui/cross-crate/private-by-default.stderr

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0603]: static `j` is private
2-
--> $DIR/xcrate-private-by-default.rs:23:29
2+
--> $DIR/private-by-default.rs:23:29
33
|
44
LL | static_priv_by_default::j;
55
| ^ private static
@@ -11,7 +11,7 @@ LL | static j: isize = 0;
1111
| ^^^^^^^^^^^^^^^
1212

1313
error[E0603]: function `k` is private
14-
--> $DIR/xcrate-private-by-default.rs:25:29
14+
--> $DIR/private-by-default.rs:25:29
1515
|
1616
LL | static_priv_by_default::k;
1717
| ^ private function
@@ -23,7 +23,7 @@ LL | fn k() {}
2323
| ^^^^^^
2424

2525
error[E0603]: unit struct `l` is private
26-
--> $DIR/xcrate-private-by-default.rs:27:29
26+
--> $DIR/private-by-default.rs:27:29
2727
|
2828
LL | static_priv_by_default::l;
2929
| ^ private unit struct
@@ -35,7 +35,7 @@ LL | struct l;
3535
| ^^^^^^^^
3636

3737
error[E0603]: enum `m` is private
38-
--> $DIR/xcrate-private-by-default.rs:29:35
38+
--> $DIR/private-by-default.rs:29:35
3939
|
4040
LL | foo::<static_priv_by_default::m>();
4141
| ^ private enum
@@ -47,7 +47,7 @@ LL | enum m {}
4747
| ^^^^^^
4848

4949
error[E0603]: type alias `n` is private
50-
--> $DIR/xcrate-private-by-default.rs:31:35
50+
--> $DIR/private-by-default.rs:31:35
5151
|
5252
LL | foo::<static_priv_by_default::n>();
5353
| ^ private type alias
@@ -59,7 +59,7 @@ LL | type n = isize;
5959
| ^^^^^^
6060

6161
error[E0603]: module `foo` is private
62-
--> $DIR/xcrate-private-by-default.rs:35:29
62+
--> $DIR/private-by-default.rs:35:29
6363
|
6464
LL | static_priv_by_default::foo::a;
6565
| ^^^ - static `a` is not publicly re-exported
@@ -73,7 +73,7 @@ LL | mod foo {
7373
| ^^^^^^^
7474

7575
error[E0603]: module `foo` is private
76-
--> $DIR/xcrate-private-by-default.rs:37:29
76+
--> $DIR/private-by-default.rs:37:29
7777
|
7878
LL | static_priv_by_default::foo::b;
7979
| ^^^ - function `b` is not publicly re-exported
@@ -87,7 +87,7 @@ LL | mod foo {
8787
| ^^^^^^^
8888

8989
error[E0603]: module `foo` is private
90-
--> $DIR/xcrate-private-by-default.rs:39:29
90+
--> $DIR/private-by-default.rs:39:29
9191
|
9292
LL | static_priv_by_default::foo::c;
9393
| ^^^ - unit struct `c` is not publicly re-exported
@@ -101,7 +101,7 @@ LL | mod foo {
101101
| ^^^^^^^
102102

103103
error[E0603]: module `foo` is private
104-
--> $DIR/xcrate-private-by-default.rs:41:35
104+
--> $DIR/private-by-default.rs:41:35
105105
|
106106
LL | foo::<static_priv_by_default::foo::d>();
107107
| ^^^ - enum `d` is not publicly re-exported
@@ -115,7 +115,7 @@ LL | mod foo {
115115
| ^^^^^^^
116116

117117
error[E0603]: module `foo` is private
118-
--> $DIR/xcrate-private-by-default.rs:43:35
118+
--> $DIR/private-by-default.rs:43:35
119119
|
120120
LL | foo::<static_priv_by_default::foo::e>();
121121
| ^^^ - type alias `e` is not publicly re-exported
File renamed without changes.
File renamed without changes.

tests/ui/xcrate/xcrate-unit-struct.stderr tests/ui/cross-crate/unit-struct.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0423]: expected value, found struct `xcrate_unit_struct::StructWithFields`
2-
--> $DIR/xcrate-unit-struct.rs:9:13
2+
--> $DIR/unit-struct.rs:9:13
33
|
44
LL | let _ = xcrate_unit_struct::StructWithFields;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use struct literal syntax instead: `xcrate_unit_struct::StructWithFields { foo: val }`
@@ -10,7 +10,7 @@ LL | pub struct StructWithFields {
1010
| --------------------------- `xcrate_unit_struct::StructWithFields` defined here
1111

1212
error[E0423]: expected value, found struct `xcrate_unit_struct::StructWithPrivFields`
13-
--> $DIR/xcrate-unit-struct.rs:11:13
13+
--> $DIR/unit-struct.rs:11:13
1414
|
1515
LL | let _ = xcrate_unit_struct::StructWithPrivFields;
1616
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

tests/ui/main-wrong-location.stderr tests/ui/fn-main/wrong-location.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
error[E0601]: `main` function not found in crate `main_wrong_location`
2-
--> $DIR/main-wrong-location.rs:5:2
1+
error[E0601]: `main` function not found in crate `wrong_location`
2+
--> $DIR/wrong-location.rs:5:2
33
|
44
LL | }
5-
| ^ the main function must be defined at the crate level (in `$DIR/main-wrong-location.rs`)
5+
| ^ the main function must be defined at the crate level (in `$DIR/wrong-location.rs`)
66
|
77
note: here is a function named `main`
8-
--> $DIR/main-wrong-location.rs:4:5
8+
--> $DIR/wrong-location.rs:4:5
99
|
1010
LL | fn main() { }
1111
| ^^^^^^^^^
File renamed without changes.

tests/ui/main-wrong-type.stderr tests/ui/fn-main/wrong-type.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0580]: `main` function has wrong type
2-
--> $DIR/main-wrong-type.rs:6:1
2+
--> $DIR/wrong-type.rs:6:1
33
|
44
LL | fn main(foo: S) {
55
| ^^^^^^^^^^^^^^^ incorrect number of function parameters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

tests/ui/intrinsics-always-extern.stderr tests/ui/intrinsics/always-extern.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
2-
--> $DIR/intrinsics-always-extern.rs:4:32
2+
--> $DIR/always-extern.rs:4:32
33
|
44
LL | extern "rust-intrinsic" fn foo(&self);
55
| ^^^
66

77
error[E0093]: unrecognized intrinsic function: `hello`
8-
--> $DIR/intrinsics-always-extern.rs:12:28
8+
--> $DIR/always-extern.rs:12:28
99
|
1010
LL | extern "rust-intrinsic" fn hello() {
1111
| ^^^^^ unrecognized intrinsic
1212
|
1313
= help: if you're adding an intrinsic, be sure to update `check_intrinsic_type`
1414

1515
error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
16-
--> $DIR/intrinsics-always-extern.rs:8:43
16+
--> $DIR/always-extern.rs:8:43
1717
|
1818
LL | extern "rust-intrinsic" fn foo(&self) {
1919
| ___________________________________________^
2020
LL | | }
2121
| |_____^
2222

2323
error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
24-
--> $DIR/intrinsics-always-extern.rs:12:36
24+
--> $DIR/always-extern.rs:12:36
2525
|
2626
LL | extern "rust-intrinsic" fn hello() {
2727
| ____________________________________^
File renamed without changes.
File renamed without changes.

tests/ui/lint-group-forbid-always-trumps-cli.stderr tests/ui/lint/group-forbid-always-trumps-cli.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: unused variable: `x`
2-
--> $DIR/lint-group-forbid-always-trumps-cli.rs:4:9
2+
--> $DIR/group-forbid-always-trumps-cli.rs:4:9
33
|
44
LL | let x = 1;
55
| ^ help: if this is intentional, prefix it with an underscore: `_x`
File renamed without changes.
File renamed without changes.

tests/ui/super-fast-paren-parsing.rs tests/ui/parser/super-fast-paren-parsing.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
#![allow(unused_parens)]
44
#![allow(non_upper_case_globals)]
55
#![allow(dead_code)]
6-
//@ exec-env:RUST_MIN_STACK=16000000
7-
//@ rustc-env:RUST_MIN_STACK=16000000
8-
//
9-
// Big stack is needed for pretty printing, a little sad...
6+
#![cfg_attr(rustfmt, rustfmt::skip)]
107

118
static a: isize =
129
(((((((((((((((((((((((((((((((((((((((((((((((((((
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

tests/ui/check-static-immutable-mut-slices.stderr tests/ui/statics/check-immutable-mut-slices.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0764]: mutable references are not allowed in the final value of statics
2-
--> $DIR/check-static-immutable-mut-slices.rs:3:37
2+
--> $DIR/check-immutable-mut-slices.rs:3:37
33
|
44
LL | static TEST: &'static mut [isize] = &mut [];
55
| ^^^^^^^

tests/ui/check-static-values-constraints.stderr tests/ui/statics/check-values-constraints.stderr

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0493]: destructor of `SafeStruct` cannot be evaluated at compile-time
2-
--> $DIR/check-static-values-constraints.rs:64:7
2+
--> $DIR/check-values-constraints.rs:64:7
33
|
44
LL | ..SafeStruct {
55
| _______^
@@ -12,15 +12,15 @@ LL | };
1212
| - value is dropped here
1313

1414
error[E0010]: allocations are not allowed in statics
15-
--> $DIR/check-static-values-constraints.rs:81:33
15+
--> $DIR/check-values-constraints.rs:81:33
1616
|
1717
LL | static STATIC11: Vec<MyOwned> = vec![MyOwned];
1818
| ^^^^^^^^^^^^^ allocation not allowed in statics
1919
|
2020
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
2121

2222
error[E0015]: cannot call non-const fn `slice::<impl [MyOwned]>::into_vec::<std::alloc::Global>` in statics
23-
--> $DIR/check-static-values-constraints.rs:81:33
23+
--> $DIR/check-values-constraints.rs:81:33
2424
|
2525
LL | static STATIC11: Vec<MyOwned> = vec![MyOwned];
2626
| ^^^^^^^^^^^^^
@@ -30,7 +30,7 @@ LL | static STATIC11: Vec<MyOwned> = vec![MyOwned];
3030
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
3131

3232
error[E0015]: cannot call non-const fn `<str as ToString>::to_string` in statics
33-
--> $DIR/check-static-values-constraints.rs:92:38
33+
--> $DIR/check-values-constraints.rs:92:38
3434
|
3535
LL | field2: SafeEnum::Variant4("str".to_string()),
3636
| ^^^^^^^^^^^
@@ -43,15 +43,15 @@ LL + #![feature(const_trait_impl)]
4343
|
4444

4545
error[E0010]: allocations are not allowed in statics
46-
--> $DIR/check-static-values-constraints.rs:96:5
46+
--> $DIR/check-values-constraints.rs:96:5
4747
|
4848
LL | vec![MyOwned],
4949
| ^^^^^^^^^^^^^ allocation not allowed in statics
5050
|
5151
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
5252

5353
error[E0015]: cannot call non-const fn `slice::<impl [MyOwned]>::into_vec::<std::alloc::Global>` in statics
54-
--> $DIR/check-static-values-constraints.rs:96:5
54+
--> $DIR/check-values-constraints.rs:96:5
5555
|
5656
LL | vec![MyOwned],
5757
| ^^^^^^^^^^^^^
@@ -61,15 +61,15 @@ LL | vec![MyOwned],
6161
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
6262

6363
error[E0010]: allocations are not allowed in statics
64-
--> $DIR/check-static-values-constraints.rs:98:5
64+
--> $DIR/check-values-constraints.rs:98:5
6565
|
6666
LL | vec![MyOwned],
6767
| ^^^^^^^^^^^^^ allocation not allowed in statics
6868
|
6969
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
7070

7171
error[E0015]: cannot call non-const fn `slice::<impl [MyOwned]>::into_vec::<std::alloc::Global>` in statics
72-
--> $DIR/check-static-values-constraints.rs:98:5
72+
--> $DIR/check-values-constraints.rs:98:5
7373
|
7474
LL | vec![MyOwned],
7575
| ^^^^^^^^^^^^^
@@ -79,15 +79,15 @@ LL | vec![MyOwned],
7979
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
8080

8181
error[E0010]: allocations are not allowed in statics
82-
--> $DIR/check-static-values-constraints.rs:103:6
82+
--> $DIR/check-values-constraints.rs:103:6
8383
|
8484
LL | &vec![MyOwned],
8585
| ^^^^^^^^^^^^^ allocation not allowed in statics
8686
|
8787
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
8888

8989
error[E0015]: cannot call non-const fn `slice::<impl [MyOwned]>::into_vec::<std::alloc::Global>` in statics
90-
--> $DIR/check-static-values-constraints.rs:103:6
90+
--> $DIR/check-values-constraints.rs:103:6
9191
|
9292
LL | &vec![MyOwned],
9393
| ^^^^^^^^^^^^^
@@ -97,15 +97,15 @@ LL | &vec![MyOwned],
9797
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
9898

9999
error[E0010]: allocations are not allowed in statics
100-
--> $DIR/check-static-values-constraints.rs:105:6
100+
--> $DIR/check-values-constraints.rs:105:6
101101
|
102102
LL | &vec![MyOwned],
103103
| ^^^^^^^^^^^^^ allocation not allowed in statics
104104
|
105105
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
106106

107107
error[E0015]: cannot call non-const fn `slice::<impl [MyOwned]>::into_vec::<std::alloc::Global>` in statics
108-
--> $DIR/check-static-values-constraints.rs:105:6
108+
--> $DIR/check-values-constraints.rs:105:6
109109
|
110110
LL | &vec![MyOwned],
111111
| ^^^^^^^^^^^^^
@@ -115,15 +115,15 @@ LL | &vec![MyOwned],
115115
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
116116

117117
error[E0010]: allocations are not allowed in statics
118-
--> $DIR/check-static-values-constraints.rs:111:31
118+
--> $DIR/check-values-constraints.rs:111:31
119119
|
120120
LL | static STATIC19: Vec<isize> = vec![3];
121121
| ^^^^^^^ allocation not allowed in statics
122122
|
123123
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
124124

125125
error[E0015]: cannot call non-const fn `slice::<impl [isize]>::into_vec::<std::alloc::Global>` in statics
126-
--> $DIR/check-static-values-constraints.rs:111:31
126+
--> $DIR/check-values-constraints.rs:111:31
127127
|
128128
LL | static STATIC19: Vec<isize> = vec![3];
129129
| ^^^^^^^
@@ -133,15 +133,15 @@ LL | static STATIC19: Vec<isize> = vec![3];
133133
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
134134

135135
error[E0010]: allocations are not allowed in statics
136-
--> $DIR/check-static-values-constraints.rs:117:32
136+
--> $DIR/check-values-constraints.rs:117:32
137137
|
138138
LL | static x: Vec<isize> = vec![3];
139139
| ^^^^^^^ allocation not allowed in statics
140140
|
141141
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
142142

143143
error[E0015]: cannot call non-const fn `slice::<impl [isize]>::into_vec::<std::alloc::Global>` in statics
144-
--> $DIR/check-static-values-constraints.rs:117:32
144+
--> $DIR/check-values-constraints.rs:117:32
145145
|
146146
LL | static x: Vec<isize> = vec![3];
147147
| ^^^^^^^
@@ -151,7 +151,7 @@ LL | static x: Vec<isize> = vec![3];
151151
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
152152

153153
error[E0507]: cannot move out of static item `x`
154-
--> $DIR/check-static-values-constraints.rs:119:9
154+
--> $DIR/check-values-constraints.rs:119:9
155155
|
156156
LL | x
157157
| ^ move occurs because `x` has type `Vec<isize>`, which does not implement the `Copy` trait
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)