Skip to content

Commit 41e93ab

Browse files
authored
Rollup merge of #136536 - DuskyElf:master, r=jieyouxu
Rename and Move some UI tests to more suitable subdirs ## Affected Tests - tests/ui/issues/issue-48838.rs -> tests/ui/enum/closure-in-enum-issue-48838.rs #48838 - tests/ui/issues/issue-40350.rs -> tests/ui/enum/enum-inside-enum-issue-40350.rs #40350 - tests/ui/issues/issue-41272.rs -> tests/ui/expr/if/if-let-no-match-guards-issue-41272.rs #41272 - tests/ui/issues/issue-40408.rs -> tests/ui/lexer/floating-point-0e10-issue-40408.rs #40408 - tests/ui/issues/issue-40136.rs -> tests/ui/macros/const-expr-invocations-issue-40136.rs #40136 - tests/ui/issues/issue-40845.rs -> tests/ui/macros/macros-in-trait-positions-issue-40845.rs #40845 - tests/ui/issues/issue-41213.rs -> tests/ui/match/enum-and-break-in-match-issue-41213.rs #41213 - tests/ui/issues/issue-40782.rs -> tests/ui/suggestions/for-loop-missing-in.rs #40782 - tests/ui/issues/issue-40827.rs -> tests/ui/trait-bounds/deep-level-Send-bound-check-issue-40827.rs #40827 - tests/ui/issues/issue-40610.rs -> tests/ui/typeck/coercion-check-for-addition-issue-40610.rs #40610 - tests/ui/issues/issue-40883.rs -> tests/ui/codegen/StackColoring-not-blowup-stack-issue-40883.rs #40883 - tests/ui/issues/issue-40861.rs -> tests/ui/typeck/coercion-check-for-indexing-expression-issue-40861.rs #40861 - tests/ui/issues/issue-41139.rs -> tests/ui/typeck/unsized-rvalue-issue-41139.rs #41139 - tests/ui/issues/issue-40749.rs -> tests/ui/wf/range-expr-root-of-constant-issue-40749.rs #40749 - tests/ui/issues/issue-40235.rs -> tests/ui/while/while-let-scope-issue-40235.rs #40235
2 parents 7ad1a3b + 5b981a8 commit 41e93ab

26 files changed

+21
-36
lines changed

src/tools/tidy/src/issues.txt

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2218,26 +2218,12 @@ ui/issues/issue-3993.rs
22182218
ui/issues/issue-39970.rs
22192219
ui/issues/issue-39984.rs
22202220
ui/issues/issue-40000.rs
2221-
ui/issues/issue-40136.rs
2222-
ui/issues/issue-40235.rs
22232221
ui/issues/issue-4025.rs
22242222
ui/issues/issue-40288-2.rs
22252223
ui/issues/issue-40288.rs
2226-
ui/issues/issue-40350.rs
2227-
ui/issues/issue-40408.rs
2228-
ui/issues/issue-40610.rs
2229-
ui/issues/issue-40749.rs
2230-
ui/issues/issue-40782.rs
2231-
ui/issues/issue-40827.rs
2232-
ui/issues/issue-40845.rs
2233-
ui/issues/issue-40861.rs
2234-
ui/issues/issue-40883.rs
22352224
ui/issues/issue-40951.rs
22362225
ui/issues/issue-41053.rs
2237-
ui/issues/issue-41139.rs
2238-
ui/issues/issue-41213.rs
22392226
ui/issues/issue-41229-ref-str.rs
2240-
ui/issues/issue-41272.rs
22412227
ui/issues/issue-41298.rs
22422228
ui/issues/issue-41479.rs
22432229
ui/issues/issue-41498.rs
@@ -2360,7 +2346,6 @@ ui/issues/issue-4830.rs
23602346
ui/issues/issue-48364.rs
23612347
ui/issues/issue-48728.rs
23622348
ui/issues/issue-4875.rs
2363-
ui/issues/issue-48838.rs
23642349
ui/issues/issue-48984.rs
23652350
ui/issues/issue-49298.rs
23662351
ui/issues/issue-4935.rs

src/tools/tidy/src/ui_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use ignore::Walk;
1717
const ENTRY_LIMIT: u32 = 901;
1818
// FIXME: The following limits should be reduced eventually.
1919

20-
const ISSUES_ENTRY_LIMIT: u32 = 1658;
20+
const ISSUES_ENTRY_LIMIT: u32 = 1634;
2121

2222
const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
2323
"rs", // test source files

tests/ui/issues/issue-48838.stderr renamed to tests/ui/enum/closure-in-enum-issue-48838.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error[E0308]: mismatched types
2-
--> $DIR/issue-48838.rs:2:14
2+
--> $DIR/closure-in-enum-issue-48838.rs:2:14
33
|
44
LL | Square = |x| x,
55
| ^^^^^ expected `isize`, found closure
66
|
77
= note: expected type `isize`
8-
found closure `{closure@$DIR/issue-48838.rs:2:14: 2:17}`
8+
found closure `{closure@$DIR/closure-in-enum-issue-48838.rs:2:14: 2:17}`
99

1010
error: aborting due to 1 previous error
1111

0 commit comments

Comments
 (0)