Skip to content

Commit 0f7e546

Browse files
authored
Unrolled build for rust-lang#136112
Rollup merge of rust-lang#136112 - fmease:clean-up-all-dead-files-in-ui-tests, r=compiler-errors Clean up all dead files inside `tests/ui/` While rebasing rust-lang#135860 I noticed that there are several dead `*.stderr` files inside `tests/ui/`. When I checked thoroughly, I found 69 dead `*.$revision.stderr` files, 3 other dead `*.stderr` files and one dead `*.rs` file. Prior to rust-lang#134808, compiletest's `--bless` didn't remove dead `*.stderr` files when the set of revisions changed in any way (renamings, removals, additions, …) which explains their existence. Regarding the dead `*.rs` file, that one was located inside an `auxiliary/` directory (together with a `*.stderr` file) despite not being meant to be an auxiliary file (it's not referenced by any `//@ aux-*`, it has an accompanying `*.stderr` file and it's obvious from looking at rust-lang#111056 which added it). Ideally compiletest or tidy would forbid `*.std{out,err}` files inside `auxiliary/` dirs, that would've caught it. I moved it, updated it and turned it into a proper UI test. --- How to reproduce: 1. Run `rm tests/ui/**/*.stderr` 2. Run `./x test tests/ui --bless` (or similar) 3. Manually / semi-automatically go through all tests that were ignored (likely due to your OS etc. not matching) and restore any stderr files that were overzealously removed --- r? compiler
2 parents 0cffe5c + c38951b commit 0f7e546

File tree

76 files changed

+45
-3628
lines changed

Some content is hidden

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

76 files changed

+45
-3628
lines changed

src/tools/tidy/src/issues.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1385,7 +1385,6 @@ ui/issue-18502.rs
13851385
ui/issue-24106.rs
13861386
ui/issue-76387-llvm-miscompile.rs
13871387
ui/issues-71798.rs
1388-
ui/issues/auxiliary/issue-111011.rs
13891388
ui/issues/auxiliary/issue-11224.rs
13901389
ui/issues/auxiliary/issue-11508.rs
13911390
ui/issues/auxiliary/issue-11529.rs

src/tools/tidy/src/ui_tests.rs

+1-1
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 = 1662;
20+
const ISSUES_ENTRY_LIMIT: u32 = 1658;
2121

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

tests/ui/associated-type-bounds/return-type-notation/equality.current.stderr

-17
This file was deleted.

tests/ui/associated-type-bounds/return-type-notation/equality.next.stderr

-17
This file was deleted.

tests/ui/async-await/return-type-notation/issue-110963-late.next.stderr

-11
This file was deleted.

tests/ui/async-await/return-type-notation/super-method-bound.next.stderr

-10
This file was deleted.

tests/ui/cfg/disallowed-cli-cfgs.test_.stderr

-8
This file was deleted.

tests/ui/closures/closure-expected-type/expect-region-supply-region-2.polonius.stderr

-37
This file was deleted.

tests/ui/cmse-nonsecure/cmse-nonsecure-entry/trustzone-only.stderr

-9
This file was deleted.

tests/ui/consts/const-eval/ub-nonnull.chalk.64bit.stderr

-9
This file was deleted.

tests/ui/consts/const-eval/ub-wide-ptr.chalk.64bit.stderr

-9
This file was deleted.

tests/ui/consts/write_to_mut_ref_dest.stock.stderr

-23
This file was deleted.

tests/ui/coroutine/coroutine-region-requirements.migrate.stderr

-12
This file was deleted.

tests/ui/generic-associated-types/gat-in-trait-path.base.stderr

-52
This file was deleted.

tests/ui/generic-associated-types/issue-67510-pass.base.stderr

-19
This file was deleted.

tests/ui/generic-associated-types/issue-76535.base.stderr

-57
This file was deleted.

tests/ui/generic-associated-types/issue-76535.extended.stderr

-19
This file was deleted.

tests/ui/generic-associated-types/issue-78671.base.stderr

-36
This file was deleted.

tests/ui/generic-associated-types/issue-78671.extended.stderr

-19
This file was deleted.

0 commit comments

Comments
 (0)