Skip to content

Commit 0ce2112

Browse files
borsbors
committed
Auto merge of rust-lang#86522 - JohnTitor:move-ui-tests, r=petrochenkov
Move some UI tests to more suitable subdirs cc rust-lang#73494 The classified result is here: https://gist.github.com/JohnTitor/c9e00840990b5e4a8fc562ec3571e427 - issues/issue-27060.rs: misclassified, should be packed. - issues/issue-45157.rs: moved to nll. - issues/issue-69532.rs: ~~couldn't figured out the best place, placed a new `llvm` dir~~ moved to consts. - fsu-moves-and-copies.rs: moved to borrowck. - issues/issue-36638.rs: misclassified, moved to keyword. - issues/issue-48636.rs: moved to parser. - issues/issue-37655.rs: I'm not sure but associated-types shouldn't the best, moved to coercion but region may be better. - issues/issue-20005.rs: moved to associated-types. - issues/issue-82869.rs: moved to asm. - issues/issue-24535-allow-mutable-borrow-in-match-guard.rs: moved to nll. - issues/issue-52169.rs: moved to macros. - test-passed.rs: moved to test-attrs along with `test-` prefixed tests. - test-cfg.rs: moved to conditional-compilation. - non-integer-atomic.rs: moved to intrinsics. - issues/issue-54521-2.rs: moved to parser. - issues/issue-17756.rs: moved to consts. - conversion-methods.rs: ~~moved to suggestions~~ moved to typeck. r? `@petrochenkov`
2 parents 6d82086 + 2c62686 commit 0ce2112

Some content is hidden

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

53 files changed

+11
-9
lines changed

‎src/test/ui/issues/issue-82869.rs renamed to ‎src/test/ui/asm/issue-82869.rs

File renamed without changes.

‎src/test/ui/issues/issue-82869.stderr renamed to ‎src/test/ui/asm/issue-82869.stderr

File renamed without changes.

‎src/test/ui/issues/issue-20005.rs renamed to ‎src/test/ui/associated-types/issue-20005.rs

File renamed without changes.

‎src/test/ui/issues/issue-20005.stderr renamed to ‎src/test/ui/associated-types/issue-20005.stderr

File renamed without changes.

‎src/test/ui/fsu-moves-and-copies.rs renamed to ‎src/test/ui/borrowck/fsu-moves-and-copies.rs

File renamed without changes.

‎src/test/ui/issues/issue-37655.rs renamed to ‎src/test/ui/coercion/issue-37655.rs

File renamed without changes.

‎src/test/ui/test-cfg.rs renamed to ‎src/test/ui/conditional-compilation/test-cfg.rs

File renamed without changes.

‎src/test/ui/test-cfg.stderr renamed to ‎src/test/ui/conditional-compilation/test-cfg.stderr

File renamed without changes.

‎src/test/ui/issues/issue-17756.rs renamed to ‎src/test/ui/consts/issue-17756.rs

File renamed without changes.

‎src/test/ui/issues/issue-69532.rs renamed to ‎src/test/ui/consts/issue-69532.rs

File renamed without changes.

‎src/test/ui/non-integer-atomic.rs renamed to ‎src/test/ui/intrinsics/non-integer-atomic.rs

File renamed without changes.

‎src/test/ui/non-integer-atomic.stderr renamed to ‎src/test/ui/intrinsics/non-integer-atomic.stderr

File renamed without changes.

‎src/test/ui/issues/issue-36638.rs renamed to ‎src/test/ui/keyword/keyword-self-as-type-param.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Regression test of #36638.
2+
13
struct Foo<Self>(Self);
24
//~^ ERROR expected identifier, found keyword `Self`
35
//~^^ ERROR E0392

‎src/test/ui/issues/issue-36638.stderr renamed to ‎src/test/ui/keyword/keyword-self-as-type-param.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
error: expected identifier, found keyword `Self`
2-
--> $DIR/issue-36638.rs:1:12
2+
--> $DIR/keyword-self-as-type-param.rs:3:12
33
|
44
LL | struct Foo<Self>(Self);
55
| ^^^^ expected identifier, found keyword
66

77
error: expected identifier, found keyword `Self`
8-
--> $DIR/issue-36638.rs:5:11
8+
--> $DIR/keyword-self-as-type-param.rs:7:11
99
|
1010
LL | trait Bar<Self> {}
1111
| ^^^^ expected identifier, found keyword
1212

1313
error[E0392]: parameter `Self` is never used
14-
--> $DIR/issue-36638.rs:1:12
14+
--> $DIR/keyword-self-as-type-param.rs:3:12
1515
|
1616
LL | struct Foo<Self>(Self);
1717
| ^^^^ unused parameter

‎src/test/ui/issues/issue-52169.rs renamed to ‎src/test/ui/macros/issue-52169.rs

File renamed without changes.

‎src/test/ui/issues/issue-24535-allow-mutable-borrow-in-match-guard.rs renamed to ‎src/test/ui/nll/issue-24535-allow-mutable-borrow-in-match-guard.rs

File renamed without changes.

‎src/test/ui/issues/issue-45157.rs renamed to ‎src/test/ui/nll/issue-45157.rs

File renamed without changes.

‎src/test/ui/issues/issue-45157.stderr renamed to ‎src/test/ui/nll/issue-45157.stderr

File renamed without changes.

‎src/test/ui/issues/issue-27060-2.rs renamed to ‎src/test/ui/packed/issue-27060-2.rs

File renamed without changes.

‎src/test/ui/issues/issue-27060-2.stderr renamed to ‎src/test/ui/packed/issue-27060-2.stderr

File renamed without changes.

‎src/test/ui/issues/issue-27060-rpass.rs renamed to ‎src/test/ui/packed/issue-27060-rpass.rs

File renamed without changes.

‎src/test/ui/issues/issue-27060.rs renamed to ‎src/test/ui/packed/issue-27060.rs

File renamed without changes.

‎src/test/ui/issues/issue-27060.stderr renamed to ‎src/test/ui/packed/issue-27060.stderr

File renamed without changes.

‎src/test/ui/issues/issue-48636.fixed renamed to ‎src/test/ui/parser/issue-48636.fixed

File renamed without changes.

‎src/test/ui/issues/issue-48636.rs renamed to ‎src/test/ui/parser/issue-48636.rs

File renamed without changes.

‎src/test/ui/issues/issue-48636.stderr renamed to ‎src/test/ui/parser/issue-48636.stderr

File renamed without changes.

‎src/test/ui/issues/issue-54521-1.rs renamed to ‎src/test/ui/parser/issue-54521-1.rs

File renamed without changes.

‎src/test/ui/issues/issue-54521-2.fixed renamed to ‎src/test/ui/parser/issue-54521-2.fixed

File renamed without changes.

‎src/test/ui/issues/issue-54521-2.rs renamed to ‎src/test/ui/parser/issue-54521-2.rs

File renamed without changes.

‎src/test/ui/issues/issue-54521-2.stderr renamed to ‎src/test/ui/parser/issue-54521-2.stderr

File renamed without changes.

‎src/test/ui/issues/issue-54521.fixed renamed to ‎src/test/ui/parser/issue-54521-3.fixed

File renamed without changes.

‎src/test/ui/issues/issue-54521.rs renamed to ‎src/test/ui/parser/issue-54521-3.rs

File renamed without changes.

‎src/test/ui/issues/issue-54521.stderr renamed to ‎src/test/ui/parser/issue-54521-3.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
error: unmatched angle brackets
2-
--> $DIR/issue-54521.rs:11:60
2+
--> $DIR/issue-54521-3.rs:11:60
33
|
44
LL | let _ = vec![1, 2, 3].into_iter().collect::<Vec<usize>>>>>>();
55
| ^^^^ help: remove extra angle brackets
66

77
error: unmatched angle brackets
8-
--> $DIR/issue-54521.rs:14:60
8+
--> $DIR/issue-54521-3.rs:14:60
99
|
1010
LL | let _ = vec![1, 2, 3].into_iter().collect::<Vec<usize>>>>>();
1111
| ^^^ help: remove extra angle brackets
1212

1313
error: unmatched angle brackets
14-
--> $DIR/issue-54521.rs:17:60
14+
--> $DIR/issue-54521-3.rs:17:60
1515
|
1616
LL | let _ = vec![1, 2, 3].into_iter().collect::<Vec<usize>>>>();
1717
| ^^ help: remove extra angle brackets
1818

1919
error: unmatched angle bracket
20-
--> $DIR/issue-54521.rs:20:60
20+
--> $DIR/issue-54521-3.rs:20:60
2121
|
2222
LL | let _ = vec![1, 2, 3].into_iter().collect::<Vec<usize>>>();
2323
| ^ help: remove extra angle bracket

‎src/test/ui/test-panic-abort-disabled.rs renamed to ‎src/test/ui/test-attrs/test-panic-abort-disabled.rs

File renamed without changes.

‎src/test/ui/test-panic-abort-disabled.stderr renamed to ‎src/test/ui/test-attrs/test-panic-abort-disabled.stderr

File renamed without changes.

‎src/test/ui/test-panic-abort-nocapture.rs renamed to ‎src/test/ui/test-attrs/test-panic-abort-nocapture.rs

File renamed without changes.

‎src/test/ui/test-panic-abort-nocapture.run.stderr renamed to ‎src/test/ui/test-attrs/test-panic-abort-nocapture.run.stderr

File renamed without changes.

‎src/test/ui/test-panic-abort-nocapture.run.stdout renamed to ‎src/test/ui/test-attrs/test-panic-abort-nocapture.run.stdout

File renamed without changes.

‎src/test/ui/test-panic-abort.rs renamed to ‎src/test/ui/test-attrs/test-panic-abort.rs

File renamed without changes.

‎src/test/ui/test-panic-abort.run.stdout renamed to ‎src/test/ui/test-attrs/test-panic-abort.run.stdout

File renamed without changes.

‎src/test/ui/test-panic-while-printing.rs renamed to ‎src/test/ui/test-attrs/test-panic-while-printing.rs

File renamed without changes.

‎src/test/ui/test-passed-wasm.rs renamed to ‎src/test/ui/test-attrs/test-passed-wasm.rs

File renamed without changes.

‎src/test/ui/test-passed-wasm.run.stdout renamed to ‎src/test/ui/test-attrs/test-passed-wasm.run.stdout

File renamed without changes.

‎src/test/ui/test-passed.rs renamed to ‎src/test/ui/test-attrs/test-passed.rs

File renamed without changes.

‎src/test/ui/test-passed.run.stdout renamed to ‎src/test/ui/test-attrs/test-passed.run.stdout

File renamed without changes.

‎src/test/ui/test-thread-capture.rs renamed to ‎src/test/ui/test-attrs/test-thread-capture.rs

File renamed without changes.

‎src/test/ui/test-thread-capture.run.stdout renamed to ‎src/test/ui/test-attrs/test-thread-capture.run.stdout

File renamed without changes.

‎src/test/ui/test-thread-nocapture.rs renamed to ‎src/test/ui/test-attrs/test-thread-nocapture.rs

File renamed without changes.

‎src/test/ui/test-thread-nocapture.run.stderr renamed to ‎src/test/ui/test-attrs/test-thread-nocapture.run.stderr

File renamed without changes.

‎src/test/ui/test-thread-nocapture.run.stdout renamed to ‎src/test/ui/test-attrs/test-thread-nocapture.run.stdout

File renamed without changes.

‎src/test/ui/conversion-methods.rs renamed to ‎src/test/ui/typeck/conversion-methods.rs

File renamed without changes.

‎src/test/ui/conversion-methods.stderr renamed to ‎src/test/ui/typeck/conversion-methods.stderr

File renamed without changes.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ 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 = 1371;
11-
const ISSUES_ENTRY_LIMIT: usize = 2559;
10+
const ROOT_ENTRY_LIMIT: usize = 1345;
11+
const ISSUES_ENTRY_LIMIT: usize = 2530;
1212

1313
fn check_entries(path: &Path, bad: &mut bool) {
1414
let dirs = walkdir::WalkDir::new(&path.join("test/ui"))

0 commit comments

Comments
 (0)