Skip to content

Commit 12d5297

Browse files
authored
Rollup merge of #90837 - c410-f3r:testsssssss, r=petrochenkov
Move some tests to more reasonable directories - 9 cc #73494 r? `@petrochenkov`
2 parents 96cfc9e + ab5434f commit 12d5297

File tree

187 files changed

+9
-233
lines changed

Some content is hidden

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

187 files changed

+9
-233
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: src/test/ui/alloca-from-derived-tydesc.rs

-15
This file was deleted.
File renamed without changes.
File renamed without changes.

Diff for: src/test/ui/augmented-assignments-feature-gate.rs

-15
This file was deleted.
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.

Diff for: src/test/ui/estr-uniq.rs

-15
This file was deleted.

Diff for: src/test/ui/export-import.rs

-11
This file was deleted.

Diff for: src/test/ui/export-import.stderr

-15
This file was deleted.

Diff for: src/test/ui/export-non-interference2.rs

-11
This file was deleted.

Diff for: src/test/ui/export-non-interference3.rs

-11
This file was deleted.

Diff for: src/test/ui/export2.rs

-11
This file was deleted.

Diff for: src/test/ui/export2.stderr

-9
This file was deleted.

Diff for: src/test/ui/expr-block-unique.rs

-4
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: src/test/ui/while-let.stderr renamed to src/test/ui/for-loop-while/while-let-2.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: irrefutable `while let` pattern
2-
--> $DIR/while-let.rs:7:19
2+
--> $DIR/while-let-2.rs:7:19
33
|
44
LL | while let $p = $e $b
55
| ^^^
@@ -15,7 +15,7 @@ LL | | });
1515
= note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
1616

1717
warning: irrefutable `while let` pattern
18-
--> $DIR/while-let.rs:7:19
18+
--> $DIR/while-let-2.rs:7:19
1919
|
2020
LL | while let $p = $e $b
2121
| ^^^
@@ -30,7 +30,7 @@ LL | | });
3030
= note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
3131

3232
warning: irrefutable `while let` pattern
33-
--> $DIR/while-let.rs:27:11
33+
--> $DIR/while-let-2.rs:27:11
3434
|
3535
LL | while let _a = 1 {
3636
| ^^^^^^^^^^
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.

Diff for: src/test/ui/keyword-changes-2012-07-31.rs

-20
This file was deleted.
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.

Diff for: src/test/ui/paren-free.rs

-7
This file was deleted.
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.

Diff for: src/test/ui/purity-infer.rs

-6
This file was deleted.

Diff for: src/test/ui/readalias.rs

-12
This file was deleted.
File renamed without changes.

Diff for: src/test/ui/reexport-should-still-link.rs

-10
This file was deleted.
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.

Diff for: src/test/ui/ret-none.rs

-13
This file was deleted.
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.
File renamed without changes.
File renamed without changes.

Diff for: src/test/ui/type-in-nested-module.rs

-17
This file was deleted.
File renamed without changes.
File renamed without changes.

Diff for: src/test/ui/maybe-bounds-where-cpass.rs renamed to src/test/ui/unsized/maybe-bounds-where-cpass.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// build-pass (FIXME(62277): could be check-pass?)
1+
// check-pass
22

33
struct S<T>(*const T) where T: ?Sized;
44

Diff for: src/test/ui/use-crate-name-alias.rs

-7
This file was deleted.

Diff for: src/test/ui/writealias.rs

-19
This file was deleted.

Diff for: src/tools/tidy/src/ui_tests.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ use std::path::Path;
77

88
const ENTRY_LIMIT: usize = 1000;
99
// FIXME: The following limits should be reduced eventually.
10-
const ROOT_ENTRY_LIMIT: usize = 1275;
10+
const ROOT_ENTRY_LIMIT: usize = 1102;
1111
const ISSUES_ENTRY_LIMIT: usize = 2310;
12+
const PARSER_LIMIT: usize = 1004;
1213

1314
fn check_entries(path: &Path, bad: &mut bool) {
1415
let dirs = walkdir::WalkDir::new(&path.join("test/ui"))
@@ -21,10 +22,13 @@ fn check_entries(path: &Path, bad: &mut bool) {
2122
// Use special values for these dirs.
2223
let is_root = path.join("test/ui") == dir_path;
2324
let is_issues_dir = path.join("test/ui/issues") == dir_path;
25+
let is_parser = path.join("test/ui/parser") == dir_path;
2426
let limit = if is_root {
2527
ROOT_ENTRY_LIMIT
2628
} else if is_issues_dir {
2729
ISSUES_ENTRY_LIMIT
30+
} else if is_parser {
31+
PARSER_LIMIT
2832
} else {
2933
ENTRY_LIMIT
3034
};

0 commit comments

Comments
 (0)