Rollup merge of #90837 - c410-f3r:testsssssss, r=petrochenkov

Move some tests to more reasonable directories - 9 cc #73494 r? `@petrochenkov`
rust-lang · Nov 16, 2021 · 12d5297 · 12d5297
2 parents 96cfc9e + ab5434f
commit 12d5297
Show file tree

Hide file tree

Showing 187 changed files with 9 additions and 233 deletions.
diff --git a/src/test/ui/c-stack-returning-int64.rs → src/test/ui/abi/c-stack-returning-int64.rs b/src/test/ui/c-stack-returning-int64.rs → src/test/ui/abi/c-stack-returning-int64.rs
diff --git a/src/test/ui/x86stdcall.rs → src/test/ui/abi/x86stdcall.rs b/src/test/ui/x86stdcall.rs → src/test/ui/abi/x86stdcall.rs
diff --git a/src/test/ui/x86stdcall2.rs → src/test/ui/abi/x86stdcall2.rs b/src/test/ui/x86stdcall2.rs → src/test/ui/abi/x86stdcall2.rs
diff --git a/src/test/ui/default-alloc-error-hook.rs → ...i/alloc-error/default-alloc-error-hook.rs b/src/test/ui/default-alloc-error-hook.rs → ...i/alloc-error/default-alloc-error-hook.rs
diff --git a/src/test/ui/alloca-from-derived-tydesc.rs b/src/test/ui/alloca-from-derived-tydesc.rs
diff --git a/src/test/ui/associated-item-long-paths.rs → ...iated-types/associated-item-long-paths.rs b/src/test/ui/associated-item-long-paths.rs → ...iated-types/associated-item-long-paths.rs
diff --git a/src/test/ui/default-associated-types.rs → ...ociated-types/default-associated-types.rs b/src/test/ui/default-associated-types.rs → ...ociated-types/default-associated-types.rs
diff --git a/...orrect-move-async-order-issue-79694.fixed → ...orrect-move-async-order-issue-79694.fixed b/...orrect-move-async-order-issue-79694.fixed → ...orrect-move-async-order-issue-79694.fixed
diff --git a/...incorrect-move-async-order-issue-79694.rs → ...incorrect-move-async-order-issue-79694.rs b/...incorrect-move-async-order-issue-79694.rs → ...incorrect-move-async-order-issue-79694.rs
diff --git a/...rrect-move-async-order-issue-79694.stderr → ...rrect-move-async-order-issue-79694.stderr b/...rrect-move-async-order-issue-79694.stderr → ...rrect-move-async-order-issue-79694.stderr
diff --git a/src/test/ui/attr-eq-token-tree.rs → src/test/ui/attributes/attr-eq-token-tree.rs b/src/test/ui/attr-eq-token-tree.rs → src/test/ui/attributes/attr-eq-token-tree.rs
diff --git a/src/test/ui/attr-eq-token-tree.stderr → ...t/ui/attributes/attr-eq-token-tree.stderr b/src/test/ui/attr-eq-token-tree.stderr → ...t/ui/attributes/attr-eq-token-tree.stderr
diff --git a/src/test/ui/tool_attributes.rs → src/test/ui/attributes/tool_attributes.rs b/src/test/ui/tool_attributes.rs → src/test/ui/attributes/tool_attributes.rs
diff --git a/src/test/ui/augmented-assignments-feature-gate.rs b/src/test/ui/augmented-assignments-feature-gate.rs
diff --git a/src/test/ui/shift-various-bad-types.rs → src/test/ui/binop/shift-various-bad-types.rs b/src/test/ui/shift-various-bad-types.rs → src/test/ui/binop/shift-various-bad-types.rs
diff --git a/src/test/ui/shift-various-bad-types.stderr → ...t/ui/binop/shift-various-bad-types.stderr b/src/test/ui/shift-various-bad-types.stderr → ...t/ui/binop/shift-various-bad-types.stderr
diff --git a/src/test/ui/access-mode-in-closures.rs → ...st/ui/borrowck/access-mode-in-closures.rs b/src/test/ui/access-mode-in-closures.rs → ...st/ui/borrowck/access-mode-in-closures.rs
diff --git a/src/test/ui/access-mode-in-closures.stderr → ...i/borrowck/access-mode-in-closures.stderr b/src/test/ui/access-mode-in-closures.stderr → ...i/borrowck/access-mode-in-closures.stderr
diff --git a/src/test/ui/lazy-init.rs → src/test/ui/borrowck/lazy-init.rs b/src/test/ui/lazy-init.rs → src/test/ui/borrowck/lazy-init.rs
diff --git a/src/test/ui/new-box-syntax.rs → src/test/ui/box/new-box-syntax.rs b/src/test/ui/new-box-syntax.rs → src/test/ui/box/new-box-syntax.rs
diff --git a/src/test/ui/codegen-object-shim.rs → src/test/ui/cast/codegen-object-shim.rs b/src/test/ui/codegen-object-shim.rs → src/test/ui/cast/codegen-object-shim.rs
diff --git a/src/test/ui/crt-static-off-works.rs → src/test/ui/cfg/crt-static-off-works.rs b/src/test/ui/crt-static-off-works.rs → src/test/ui/cfg/crt-static-off-works.rs
diff --git a/src/test/ui/expanded-cfg.rs → src/test/ui/cfg/expanded-cfg.rs b/src/test/ui/expanded-cfg.rs → src/test/ui/cfg/expanded-cfg.rs
diff --git a/src/test/ui/closure-expected.rs → src/test/ui/closures/closure-expected.rs b/src/test/ui/closure-expected.rs → src/test/ui/closures/closure-expected.rs
diff --git a/src/test/ui/closure-expected.stderr → src/test/ui/closures/closure-expected.stderr b/src/test/ui/closure-expected.stderr → src/test/ui/closures/closure-expected.stderr
diff --git a/src/test/ui/closure_promotion.rs → src/test/ui/closures/closure_promotion.rs b/src/test/ui/closure_promotion.rs → src/test/ui/closures/closure_promotion.rs
diff --git a/src/test/ui/semistatement-in-lambda.rs → ...st/ui/closures/semistatement-in-lambda.rs b/src/test/ui/semistatement-in-lambda.rs → ...st/ui/closures/semistatement-in-lambda.rs
diff --git a/src/test/ui/thir-unsafeck-issue-85871.rs → .../ui/closures/thir-unsafeck-issue-85871.rs b/src/test/ui/thir-unsafeck-issue-85871.rs → .../ui/closures/thir-unsafeck-issue-85871.rs
diff --git a/src/test/ui/unsafe-coercion.rs → src/test/ui/coercion/unsafe-coercion.rs b/src/test/ui/unsafe-coercion.rs → src/test/ui/coercion/unsafe-coercion.rs
diff --git a/src/test/ui/eval-enum.rs → src/test/ui/consts/eval-enum.rs b/src/test/ui/eval-enum.rs → src/test/ui/consts/eval-enum.rs
diff --git a/src/test/ui/eval-enum.stderr → src/test/ui/consts/eval-enum.stderr b/src/test/ui/eval-enum.stderr → src/test/ui/consts/eval-enum.stderr
diff --git a/src/test/ui/auxiliary/inline_dtor.rs → src/test/ui/drop/auxiliary/inline_dtor.rs b/src/test/ui/auxiliary/inline_dtor.rs → src/test/ui/drop/auxiliary/inline_dtor.rs
diff --git a/src/test/ui/use_inline_dtor.rs → src/test/ui/drop/use_inline_dtor.rs b/src/test/ui/use_inline_dtor.rs → src/test/ui/drop/use_inline_dtor.rs
diff --git a/src/test/ui/edition-keywords-2015-2015.rs → ...ui/editions/edition-keywords-2015-2015.rs b/src/test/ui/edition-keywords-2015-2015.rs → ...ui/editions/edition-keywords-2015-2015.rs
diff --git a/src/test/ui/edition-keywords-2018-2015.rs → ...ui/editions/edition-keywords-2018-2015.rs b/src/test/ui/edition-keywords-2018-2015.rs → ...ui/editions/edition-keywords-2018-2015.rs
diff --git a/src/test/ui/estr-uniq.rs b/src/test/ui/estr-uniq.rs
diff --git a/src/test/ui/export-import.rs b/src/test/ui/export-import.rs
diff --git a/src/test/ui/export-import.stderr b/src/test/ui/export-import.stderr
diff --git a/src/test/ui/export-non-interference2.rs b/src/test/ui/export-non-interference2.rs
diff --git a/src/test/ui/export-non-interference3.rs b/src/test/ui/export-non-interference3.rs
diff --git a/src/test/ui/export2.rs b/src/test/ui/export2.rs
diff --git a/src/test/ui/export2.stderr b/src/test/ui/export2.stderr
diff --git a/src/test/ui/expr-block-unique.rs b/src/test/ui/expr-block-unique.rs
diff --git a/src/test/ui/expr-if.rs → src/test/ui/expr/if/expr-if.rs b/src/test/ui/expr-if.rs → src/test/ui/expr/if/expr-if.rs
diff --git a/...i/auxiliary/reexport-should-still-link.rs → ...n/auxiliary/reexport-should-still-link.rs b/...i/auxiliary/reexport-should-still-link.rs → ...n/auxiliary/reexport-should-still-link.rs
diff --git a/src/test/ui/gated-bad-feature.rs → ...est/ui/feature-gates/gated-bad-feature.rs b/src/test/ui/gated-bad-feature.rs → ...est/ui/feature-gates/gated-bad-feature.rs
diff --git a/src/test/ui/gated-bad-feature.stderr → ...ui/feature-gates/gated-bad-feature.stderr b/src/test/ui/gated-bad-feature.stderr → ...ui/feature-gates/gated-bad-feature.stderr
diff --git a/src/test/ui/stable-features.rs → src/test/ui/feature-gates/stable-features.rs b/src/test/ui/stable-features.rs → src/test/ui/feature-gates/stable-features.rs
diff --git a/src/test/ui/stable-features.stderr → ...t/ui/feature-gates/stable-features.stderr b/src/test/ui/stable-features.stderr → ...t/ui/feature-gates/stable-features.stderr
diff --git a/src/test/ui/expr-fn.rs → src/test/ui/fn/expr-fn.rs b/src/test/ui/expr-fn.rs → src/test/ui/fn/expr-fn.rs
diff --git a/...st/ui/nested-function-names-issue-8587.rs → ...ui/fn/nested-function-names-issue-8587.rs b/...st/ui/nested-function-names-issue-8587.rs → ...ui/fn/nested-function-names-issue-8587.rs
diff --git a/src/test/ui/while-let.rs → src/test/ui/for-loop-while/while-let-2.rs b/src/test/ui/while-let.rs → src/test/ui/for-loop-while/while-let-2.rs
diff --git a/src/test/ui/while-let.stderr → ...test/ui/for-loop-while/while-let-2.stderr b/src/test/ui/while-let.stderr → ...test/ui/for-loop-while/while-let-2.stderr
@@ -1,5 +1,5 @@
 warning: irrefutable `while let` pattern
-  --> $DIR/while-let.rs:7:19
+  --> $DIR/while-let-2.rs:7:19
    |
 LL |               while let $p = $e $b
    |                     ^^^
@@ -15,7 +15,7 @@ LL | |     });
    = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: irrefutable `while let` pattern
-  --> $DIR/while-let.rs:7:19
+  --> $DIR/while-let-2.rs:7:19
    |
 LL |               while let $p = $e $b
    |                     ^^^
@@ -30,7 +30,7 @@ LL | |     });
    = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: irrefutable `while let` pattern
-  --> $DIR/while-let.rs:27:11
+  --> $DIR/while-let-2.rs:27:11
    |
 LL |     while let _a = 1 {
    |           ^^^^^^^^^^

diff --git a/src/test/ui/autobind.rs → src/test/ui/generics/autobind.rs b/src/test/ui/autobind.rs → src/test/ui/generics/autobind.rs
diff --git a/src/test/ui/lifetime-before-type-params.rs → ...i/generics/lifetime-before-type-params.rs b/src/test/ui/lifetime-before-type-params.rs → ...i/generics/lifetime-before-type-params.rs
diff --git a/...est/ui/lifetime-before-type-params.stderr → ...nerics/lifetime-before-type-params.stderr b/...est/ui/lifetime-before-type-params.stderr → ...nerics/lifetime-before-type-params.stderr
diff --git a/src/test/ui/type-params-in-for-each.rs → ...st/ui/generics/type-params-in-for-each.rs b/src/test/ui/type-params-in-for-each.rs → ...st/ui/generics/type-params-in-for-each.rs
diff --git a/src/test/ui/export-multi.rs → src/test/ui/imports/export-multi.rs b/src/test/ui/export-multi.rs → src/test/ui/imports/export-multi.rs
diff --git a/src/test/ui/glob-cycles.rs → src/test/ui/imports/glob-cycles.rs b/src/test/ui/glob-cycles.rs → src/test/ui/imports/glob-cycles.rs
diff --git a/src/test/ui/no-std-inject.rs → src/test/ui/imports/no-std-inject.rs b/src/test/ui/no-std-inject.rs → src/test/ui/imports/no-std-inject.rs
diff --git a/src/test/ui/no-std-inject.stderr → src/test/ui/imports/no-std-inject.stderr b/src/test/ui/no-std-inject.stderr → src/test/ui/imports/no-std-inject.stderr
diff --git a/src/test/ui/use-mod.rs → src/test/ui/imports/use-mod.rs b/src/test/ui/use-mod.rs → src/test/ui/imports/use-mod.rs
diff --git a/src/test/ui/question-mark-type-infer.rs → .../ui/inference/question-mark-type-infer.rs b/src/test/ui/question-mark-type-infer.rs → .../ui/inference/question-mark-type-infer.rs
diff --git a/src/test/ui/question-mark-type-infer.stderr → ...inference/question-mark-type-infer.stderr b/src/test/ui/question-mark-type-infer.stderr → ...inference/question-mark-type-infer.stderr
diff --git a/src/test/ui/simple-infer.rs → src/test/ui/inference/simple-infer.rs b/src/test/ui/simple-infer.rs → src/test/ui/inference/simple-infer.rs
diff --git a/src/test/ui/keyword-changes-2012-07-31.rs b/src/test/ui/keyword-changes-2012-07-31.rs
diff --git a/src/test/ui/no_owned_box_lang_item.rs → ...t/ui/lang-items/no_owned_box_lang_item.rs b/src/test/ui/no_owned_box_lang_item.rs → ...t/ui/lang-items/no_owned_box_lang_item.rs
diff --git a/src/test/ui/no_owned_box_lang_item.stderr → .../lang-items/no_owned_box_lang_item.stderr b/src/test/ui/no_owned_box_lang_item.stderr → .../lang-items/no_owned_box_lang_item.stderr
diff --git a/src/test/ui/auxiliary/linkage1.rs → ...est/ui/linkage-attr/auxiliary/linkage1.rs b/src/test/ui/auxiliary/linkage1.rs → ...est/ui/linkage-attr/auxiliary/linkage1.rs
diff --git a/src/test/ui/linkage1.rs → src/test/ui/linkage-attr/linkage1.rs b/src/test/ui/linkage1.rs → src/test/ui/linkage-attr/linkage1.rs
diff --git a/...st-allow-dead-extern-static-no-warning.rs → ...st-allow-dead-extern-static-no-warning.rs b/...st-allow-dead-extern-static-no-warning.rs → ...st-allow-dead-extern-static-no-warning.rs
diff --git a/src/test/ui/warn-path-statement.rs → src/test/ui/lint/warn-path-statement.rs b/src/test/ui/warn-path-statement.rs → src/test/ui/lint/warn-path-statement.rs
diff --git a/src/test/ui/warn-path-statement.stderr → src/test/ui/lint/warn-path-statement.stderr b/src/test/ui/warn-path-statement.stderr → src/test/ui/lint/warn-path-statement.stderr
diff --git a/src/test/ui/auxiliary/debuginfo-lto-aux.rs → ...est/ui/lto/auxiliary/debuginfo-lto-aux.rs b/src/test/ui/auxiliary/debuginfo-lto-aux.rs → ...est/ui/lto/auxiliary/debuginfo-lto-aux.rs
diff --git a/src/test/ui/debuginfo-lto.rs → src/test/ui/lto/debuginfo-lto.rs b/src/test/ui/debuginfo-lto.rs → src/test/ui/lto/debuginfo-lto.rs
diff --git a/src/test/ui/fat-lto.rs → src/test/ui/lto/fat-lto.rs b/src/test/ui/fat-lto.rs → src/test/ui/lto/fat-lto.rs
diff --git a/src/test/ui/auxiliary/proc_macro_def.rs → ...est/ui/macros/auxiliary/proc_macro_def.rs b/src/test/ui/auxiliary/proc_macro_def.rs → ...est/ui/macros/auxiliary/proc_macro_def.rs
diff --git a/src/test/ui/concat.rs → src/test/ui/macros/concat.rs b/src/test/ui/concat.rs → src/test/ui/macros/concat.rs
diff --git a/src/test/ui/concat.stderr → src/test/ui/macros/concat.stderr b/src/test/ui/concat.stderr → src/test/ui/macros/concat.stderr
diff --git a/src/test/ui/include-single-expr-helper-1.rs → ...ui/macros/include-single-expr-helper-1.rs b/src/test/ui/include-single-expr-helper-1.rs → ...ui/macros/include-single-expr-helper-1.rs
diff --git a/src/test/ui/include-single-expr-helper.rs → ...t/ui/macros/include-single-expr-helper.rs b/src/test/ui/include-single-expr-helper.rs → ...t/ui/macros/include-single-expr-helper.rs
diff --git a/src/test/ui/include-single-expr.rs → src/test/ui/macros/include-single-expr.rs b/src/test/ui/include-single-expr.rs → src/test/ui/macros/include-single-expr.rs
diff --git a/src/test/ui/include-single-expr.stderr → ...test/ui/macros/include-single-expr.stderr b/src/test/ui/include-single-expr.stderr → ...test/ui/macros/include-single-expr.stderr
diff --git a/src/test/ui/malformed_macro_lhs.rs → src/test/ui/macros/malformed_macro_lhs.rs b/src/test/ui/malformed_macro_lhs.rs → src/test/ui/macros/malformed_macro_lhs.rs
diff --git a/src/test/ui/malformed_macro_lhs.stderr → ...test/ui/macros/malformed_macro_lhs.stderr b/src/test/ui/malformed_macro_lhs.stderr → ...test/ui/macros/malformed_macro_lhs.stderr
diff --git a/src/test/ui/no-std-macros.rs → src/test/ui/macros/no-std-macros.rs b/src/test/ui/no-std-macros.rs → src/test/ui/macros/no-std-macros.rs
diff --git a/src/test/ui/proc_macro.rs → src/test/ui/macros/proc_macro.rs b/src/test/ui/proc_macro.rs → src/test/ui/macros/proc_macro.rs
diff --git a/src/test/ui/lub-match.nll.stderr → src/test/ui/nll/lub-match.nll.stderr b/src/test/ui/lub-match.nll.stderr → src/test/ui/nll/lub-match.nll.stderr
diff --git a/src/test/ui/lub-match.rs → src/test/ui/nll/lub-match.rs b/src/test/ui/lub-match.rs → src/test/ui/nll/lub-match.rs
diff --git a/src/test/ui/lub-match.stderr → src/test/ui/nll/lub-match.stderr b/src/test/ui/lub-match.stderr → src/test/ui/nll/lub-match.stderr
diff --git a/src/test/ui/ref-suggestion.rs → src/test/ui/nll/ref-suggestion.rs b/src/test/ui/ref-suggestion.rs → src/test/ui/nll/ref-suggestion.rs
diff --git a/src/test/ui/ref-suggestion.stderr → src/test/ui/nll/ref-suggestion.stderr b/src/test/ui/ref-suggestion.stderr → src/test/ui/nll/ref-suggestion.stderr
diff --git a/...st/ui/integer-literal-suffix-inference.rs → ...meric/integer-literal-suffix-inference.rs b/...st/ui/integer-literal-suffix-inference.rs → ...meric/integer-literal-suffix-inference.rs
diff --git a/...i/integer-literal-suffix-inference.stderr → ...c/integer-literal-suffix-inference.stderr b/...i/integer-literal-suffix-inference.stderr → ...c/integer-literal-suffix-inference.stderr
diff --git a/...ect-lifetime-default-default-to-static.rs → ...ect-lifetime-default-default-to-static.rs b/...ect-lifetime-default-default-to-static.rs → ...ect-lifetime-default-default-to-static.rs
diff --git a/...bject-lifetime-default-from-ref-struct.rs → ...bject-lifetime-default-from-ref-struct.rs b/...bject-lifetime-default-from-ref-struct.rs → ...bject-lifetime-default-from-ref-struct.rs
diff --git a/.../object-lifetime-default-from-rptr-box.rs → .../object-lifetime-default-from-rptr-box.rs b/.../object-lifetime-default-from-rptr-box.rs → .../object-lifetime-default-from-rptr-box.rs
diff --git a/.../object-lifetime-default-from-rptr-mut.rs → .../object-lifetime-default-from-rptr-mut.rs b/.../object-lifetime-default-from-rptr-mut.rs → .../object-lifetime-default-from-rptr-mut.rs
diff --git a/...ject-lifetime-default-from-rptr-struct.rs → ...ject-lifetime-default-from-rptr-struct.rs b/...ject-lifetime-default-from-rptr-struct.rs → ...ject-lifetime-default-from-rptr-struct.rs
diff --git a/...t/ui/object-lifetime-default-from-rptr.rs → ...time/object-lifetime-default-from-rptr.rs b/...t/ui/object-lifetime-default-from-rptr.rs → ...time/object-lifetime-default-from-rptr.rs
diff --git a/...st/ui/object-lifetime-default-inferred.rs → ...etime/object-lifetime-default-inferred.rs b/...st/ui/object-lifetime-default-inferred.rs → ...etime/object-lifetime-default-inferred.rs
diff --git a/src/test/ui/fixup-deref-mut.rs → src/test/ui/overloaded/fixup-deref-mut.rs b/src/test/ui/fixup-deref-mut.rs → src/test/ui/overloaded/fixup-deref-mut.rs
diff --git a/src/test/ui/paren-free.rs b/src/test/ui/paren-free.rs
diff --git a/src/test/ui/issue-83639.rs → src/test/ui/parser/issue-83639.rs b/src/test/ui/issue-83639.rs → src/test/ui/parser/issue-83639.rs
diff --git a/src/test/ui/issue-83639.stderr → src/test/ui/parser/issue-83639.stderr b/src/test/ui/issue-83639.stderr → src/test/ui/parser/issue-83639.stderr
diff --git a/...est/ui/obsolete-syntax-impl-for-dotdot.rs → ...parser/obsolete-syntax-impl-for-dotdot.rs b/...est/ui/obsolete-syntax-impl-for-dotdot.rs → ...parser/obsolete-syntax-impl-for-dotdot.rs
diff --git a/...ui/obsolete-syntax-impl-for-dotdot.stderr → ...er/obsolete-syntax-impl-for-dotdot.stderr b/...ui/obsolete-syntax-impl-for-dotdot.stderr → ...er/obsolete-syntax-impl-for-dotdot.stderr
diff --git a/src/test/ui/ranges-precedence.rs → src/test/ui/parser/ranges-precedence.rs b/src/test/ui/ranges-precedence.rs → src/test/ui/parser/ranges-precedence.rs
diff --git a/src/test/ui/similar-tokens.rs → src/test/ui/parser/similar-tokens.rs b/src/test/ui/similar-tokens.rs → src/test/ui/parser/similar-tokens.rs
diff --git a/src/test/ui/similar-tokens.stderr → src/test/ui/parser/similar-tokens.stderr b/src/test/ui/similar-tokens.stderr → src/test/ui/parser/similar-tokens.stderr
diff --git a/src/test/ui/utf8_idents-rpass.rs → src/test/ui/parser/utf8_idents-rpass.rs b/src/test/ui/utf8_idents-rpass.rs → src/test/ui/parser/utf8_idents-rpass.rs
diff --git a/src/test/ui/useless-pub.rs → src/test/ui/privacy/useless-pub.rs b/src/test/ui/useless-pub.rs → src/test/ui/privacy/useless-pub.rs
diff --git a/src/test/ui/useless-pub.stderr → src/test/ui/privacy/useless-pub.stderr b/src/test/ui/useless-pub.stderr → src/test/ui/privacy/useless-pub.stderr
diff --git a/src/test/ui/auxiliary/cond_plugin.rs → ...st/ui/proc-macro/auxiliary/cond_plugin.rs b/src/test/ui/auxiliary/cond_plugin.rs → ...st/ui/proc-macro/auxiliary/cond_plugin.rs
diff --git a/src/test/ui/macro-quote-cond.rs → src/test/ui/proc-macro/macro-quote-cond.rs b/src/test/ui/macro-quote-cond.rs → src/test/ui/proc-macro/macro-quote-cond.rs
diff --git a/src/test/ui/fds-are-cloexec.rs → src/test/ui/process/fds-are-cloexec.rs b/src/test/ui/fds-are-cloexec.rs → src/test/ui/process/fds-are-cloexec.rs
diff --git a/src/test/ui/sigpipe-should-be-ignored.rs → ...t/ui/process/sigpipe-should-be-ignored.rs b/src/test/ui/sigpipe-should-be-ignored.rs → ...t/ui/process/sigpipe-should-be-ignored.rs
diff --git a/src/test/ui/purity-infer.rs b/src/test/ui/purity-infer.rs
diff --git a/src/test/ui/readalias.rs b/src/test/ui/readalias.rs
diff --git a/src/test/ui/instantiable.rs → src/test/ui/recursion/instantiable.rs b/src/test/ui/instantiable.rs → src/test/ui/recursion/instantiable.rs
diff --git a/src/test/ui/reexport-should-still-link.rs b/src/test/ui/reexport-should-still-link.rs
diff --git a/src/test/ui/init-res-into-things.rs → src/test/ui/regions/init-res-into-things.rs b/src/test/ui/init-res-into-things.rs → src/test/ui/regions/init-res-into-things.rs
diff --git a/src/test/ui/owned-implies-static.rs → src/test/ui/regions/owned-implies-static.rs b/src/test/ui/owned-implies-static.rs → src/test/ui/regions/owned-implies-static.rs
diff --git a/src/test/ui/rcvr-borrowed-to-region.rs → ...est/ui/regions/rcvr-borrowed-to-region.rs b/src/test/ui/rcvr-borrowed-to-region.rs → ...est/ui/regions/rcvr-borrowed-to-region.rs
diff --git a/src/test/ui/attr-usage-repr.rs → src/test/ui/repr/attr-usage-repr.rs b/src/test/ui/attr-usage-repr.rs → src/test/ui/repr/attr-usage-repr.rs
diff --git a/src/test/ui/attr-usage-repr.stderr → src/test/ui/repr/attr-usage-repr.stderr b/src/test/ui/attr-usage-repr.stderr → src/test/ui/repr/attr-usage-repr.stderr
diff --git a/src/test/ui/repr.rs → src/test/ui/repr/repr.rs b/src/test/ui/repr.rs → src/test/ui/repr/repr.rs
diff --git a/src/test/ui/repr.stderr → src/test/ui/repr/repr.stderr b/src/test/ui/repr.stderr → src/test/ui/repr/repr.stderr
diff --git a/src/test/ui/crate-in-paths.rs → src/test/ui/resolve/crate-in-paths.rs b/src/test/ui/crate-in-paths.rs → src/test/ui/resolve/crate-in-paths.rs
diff --git a/src/test/ui/crate-in-paths.stderr → src/test/ui/resolve/crate-in-paths.stderr b/src/test/ui/crate-in-paths.stderr → src/test/ui/resolve/crate-in-paths.stderr
diff --git a/src/test/ui/editions-crate-root-2018.rs → ...st/ui/resolve/editions-crate-root-2018.rs b/src/test/ui/editions-crate-root-2018.rs → ...st/ui/resolve/editions-crate-root-2018.rs
diff --git a/src/test/ui/editions-crate-root-2018.stderr → ...i/resolve/editions-crate-root-2018.stderr b/src/test/ui/editions-crate-root-2018.stderr → ...i/resolve/editions-crate-root-2018.stderr
diff --git a/src/test/ui/enums-pats-not-idents.rs → src/test/ui/resolve/enums-pats-not-idents.rs b/src/test/ui/enums-pats-not-idents.rs → src/test/ui/resolve/enums-pats-not-idents.rs
diff --git a/src/test/ui/enums-pats-not-idents.stderr → ...t/ui/resolve/enums-pats-not-idents.stderr b/src/test/ui/enums-pats-not-idents.stderr → ...t/ui/resolve/enums-pats-not-idents.stderr
diff --git a/src/test/ui/no-implicit-prelude-nested.rs → .../ui/resolve/no-implicit-prelude-nested.rs b/src/test/ui/no-implicit-prelude-nested.rs → .../ui/resolve/no-implicit-prelude-nested.rs
diff --git a/...test/ui/no-implicit-prelude-nested.stderr → ...resolve/no-implicit-prelude-nested.stderr b/...test/ui/no-implicit-prelude-nested.stderr → ...resolve/no-implicit-prelude-nested.stderr
diff --git a/src/test/ui/resolve-issue-2428.rs → src/test/ui/resolve/resolve-issue-2428.rs b/src/test/ui/resolve-issue-2428.rs → src/test/ui/resolve/resolve-issue-2428.rs
diff --git a/src/test/ui/ret-none.rs b/src/test/ui/ret-none.rs
diff --git a/src/test/ui/out-of-stack.rs → src/test/ui/runtime/out-of-stack.rs b/src/test/ui/out-of-stack.rs → src/test/ui/runtime/out-of-stack.rs
diff --git a/src/test/ui/rt-explody-panic-payloads.rs → ...t/ui/runtime/rt-explody-panic-payloads.rs b/src/test/ui/rt-explody-panic-payloads.rs → ...t/ui/runtime/rt-explody-panic-payloads.rs
diff --git a/src/test/ui/running-with-no-runtime.rs → ...est/ui/runtime/running-with-no-runtime.rs b/src/test/ui/running-with-no-runtime.rs → ...est/ui/runtime/running-with-no-runtime.rs
diff --git a/...test/ui/signal-alternate-stack-cleanup.rs → ...runtime/signal-alternate-stack-cleanup.rs b/...test/ui/signal-alternate-stack-cleanup.rs → ...runtime/signal-alternate-stack-cleanup.rs
diff --git a/src/test/ui/stdout-during-shutdown.rs → ...test/ui/runtime/stdout-during-shutdown.rs b/src/test/ui/stdout-during-shutdown.rs → ...test/ui/runtime/stdout-during-shutdown.rs
diff --git a/...test/ui/stdout-during-shutdown.run.stdout → ...runtime/stdout-during-shutdown.run.stdout b/...test/ui/stdout-during-shutdown.run.stdout → ...runtime/stdout-during-shutdown.run.stdout
diff --git a/src/test/ui/duplicate_doc_alias.rs → src/test/ui/rustdoc/duplicate_doc_alias.rs b/src/test/ui/duplicate_doc_alias.rs → src/test/ui/rustdoc/duplicate_doc_alias.rs
diff --git a/src/test/ui/duplicate_doc_alias.stderr → ...est/ui/rustdoc/duplicate_doc_alias.stderr b/src/test/ui/duplicate_doc_alias.stderr → ...est/ui/rustdoc/duplicate_doc_alias.stderr
diff --git a/src/test/ui/hidden-doc-associated-item.rs → .../ui/rustdoc/hidden-doc-associated-item.rs b/src/test/ui/hidden-doc-associated-item.rs → .../ui/rustdoc/hidden-doc-associated-item.rs
diff --git a/src/test/ui/class-missing-self.rs → src/test/ui/self/class-missing-self.rs b/src/test/ui/class-missing-self.rs → src/test/ui/self/class-missing-self.rs
diff --git a/src/test/ui/class-missing-self.stderr → src/test/ui/self/class-missing-self.stderr b/src/test/ui/class-missing-self.stderr → src/test/ui/self/class-missing-self.stderr
diff --git a/...t/ui/objects-owned-object-owned-method.rs → ...self/objects-owned-object-owned-method.rs b/...t/ui/objects-owned-object-owned-method.rs → ...self/objects-owned-object-owned-method.rs
diff --git a/...est/ui/refer-to-other-statics-by-value.rs → ...static/refer-to-other-statics-by-value.rs b/...est/ui/refer-to-other-statics-by-value.rs → ...static/refer-to-other-statics-by-value.rs
diff --git a/src/test/ui/static_sized_requirement.rs → ...est/ui/static/static_sized_requirement.rs b/src/test/ui/static_sized_requirement.rs → ...est/ui/static/static_sized_requirement.rs
diff --git a/src/test/ui/builtin-clone.rs → ...est/ui/stdlib-unit-tests/builtin-clone.rs b/src/test/ui/builtin-clone.rs → ...est/ui/stdlib-unit-tests/builtin-clone.rs
diff --git a/src/test/ui/eq-multidispatch.rs → .../ui/stdlib-unit-tests/eq-multidispatch.rs b/src/test/ui/eq-multidispatch.rs → .../ui/stdlib-unit-tests/eq-multidispatch.rs
diff --git a/src/test/ui/istr.rs → src/test/ui/stdlib-unit-tests/istr.rs b/src/test/ui/istr.rs → src/test/ui/stdlib-unit-tests/istr.rs
diff --git a/...log-knows-the-names-of-variants-in-std.rs → ...log-knows-the-names-of-variants-in-std.rs b/...log-knows-the-names-of-variants-in-std.rs → ...log-knows-the-names-of-variants-in-std.rs
diff --git a/src/test/ui/seq-compare.rs → src/test/ui/stdlib-unit-tests/seq-compare.rs b/src/test/ui/seq-compare.rs → src/test/ui/stdlib-unit-tests/seq-compare.rs
diff --git a/src/test/ui/large-records.rs → src/test/ui/structs/large-records.rs b/src/test/ui/large-records.rs → src/test/ui/structs/large-records.rs
diff --git a/src/test/ui/bound-suggestions.fixed → ...st/ui/suggestions/bound-suggestions.fixed b/src/test/ui/bound-suggestions.fixed → ...st/ui/suggestions/bound-suggestions.fixed
diff --git a/src/test/ui/bound-suggestions.rs → src/test/ui/suggestions/bound-suggestions.rs b/src/test/ui/bound-suggestions.rs → src/test/ui/suggestions/bound-suggestions.rs
diff --git a/src/test/ui/bound-suggestions.stderr → ...t/ui/suggestions/bound-suggestions.stderr b/src/test/ui/bound-suggestions.stderr → ...t/ui/suggestions/bound-suggestions.stderr
diff --git a/src/test/ui/child-outlives-parent.rs → ...threads-sendsync/child-outlives-parent.rs b/src/test/ui/child-outlives-parent.rs → ...threads-sendsync/child-outlives-parent.rs
diff --git a/src/test/ui/mpsc_stress.rs → src/test/ui/threads-sendsync/mpsc_stress.rs b/src/test/ui/mpsc_stress.rs → src/test/ui/threads-sendsync/mpsc_stress.rs
diff --git a/src/test/ui/unwind-resource.rs → ...st/ui/threads-sendsync/unwind-resource.rs b/src/test/ui/unwind-resource.rs → ...st/ui/threads-sendsync/unwind-resource.rs
diff --git a/src/test/ui/yield.rs → src/test/ui/threads-sendsync/yield.rs b/src/test/ui/yield.rs → src/test/ui/threads-sendsync/yield.rs
diff --git a/src/test/ui/yield1.rs → src/test/ui/threads-sendsync/yield1.rs b/src/test/ui/yield1.rs → src/test/ui/threads-sendsync/yield1.rs
diff --git a/src/test/ui/bug-7295.rs → src/test/ui/traits/bug-7295.rs b/src/test/ui/bug-7295.rs → src/test/ui/traits/bug-7295.rs
diff --git a/src/test/ui/monad.rs → src/test/ui/traits/monad.rs b/src/test/ui/monad.rs → src/test/ui/traits/monad.rs
diff --git a/...omorphized-callees-with-ty-params-3314.rs → ...omorphized-callees-with-ty-params-3314.rs b/...omorphized-callees-with-ty-params-3314.rs → ...omorphized-callees-with-ty-params-3314.rs
diff --git a/...spatch-conditional-impl-not-considered.rs → ...spatch-conditional-impl-not-considered.rs b/...spatch-conditional-impl-not-considered.rs → ...spatch-conditional-impl-not-considered.rs
diff --git a/src/test/ui/multidispatch1.rs → src/test/ui/traits/multidispatch1.rs b/src/test/ui/multidispatch1.rs → src/test/ui/traits/multidispatch1.rs
diff --git a/src/test/ui/multidispatch2.rs → src/test/ui/traits/multidispatch2.rs b/src/test/ui/multidispatch2.rs → src/test/ui/traits/multidispatch2.rs
diff --git a/...wned-object-borrowed-method-headerless.rs → ...wned-object-borrowed-method-headerless.rs b/...wned-object-borrowed-method-headerless.rs → ...wned-object-borrowed-method-headerless.rs
diff --git a/src/test/ui/staticness-mismatch.rs → src/test/ui/traits/staticness-mismatch.rs b/src/test/ui/staticness-mismatch.rs → src/test/ui/traits/staticness-mismatch.rs
diff --git a/src/test/ui/staticness-mismatch.stderr → ...test/ui/traits/staticness-mismatch.stderr b/src/test/ui/staticness-mismatch.stderr → ...test/ui/traits/staticness-mismatch.stderr
diff --git a/src/test/ui/typeclasses-eq-example-static.rs → ...i/traits/typeclasses-eq-example-static.rs b/src/test/ui/typeclasses-eq-example-static.rs → ...i/traits/typeclasses-eq-example-static.rs
diff --git a/src/test/ui/typeclasses-eq-example.rs → src/test/ui/traits/typeclasses-eq-example.rs b/src/test/ui/typeclasses-eq-example.rs → src/test/ui/traits/typeclasses-eq-example.rs
diff --git a/src/test/ui/vtable-res-trait-param.rs → src/test/ui/traits/vtable-res-trait-param.rs b/src/test/ui/vtable-res-trait-param.rs → src/test/ui/traits/vtable-res-trait-param.rs
diff --git a/src/test/ui/vtable-res-trait-param.stderr → ...t/ui/traits/vtable-res-trait-param.stderr b/src/test/ui/vtable-res-trait-param.stderr → ...t/ui/traits/vtable-res-trait-param.stderr
diff --git a/src/test/ui/tuple-index-fat-types.rs → src/test/ui/tuple/tuple-index-fat-types.rs b/src/test/ui/tuple-index-fat-types.rs → src/test/ui/tuple/tuple-index-fat-types.rs
diff --git a/src/test/ui/type-in-nested-module.rs b/src/test/ui/type-in-nested-module.rs
diff --git a/src/test/ui/prim-with-args.rs → src/test/ui/typeck/prim-with-args.rs b/src/test/ui/prim-with-args.rs → src/test/ui/typeck/prim-with-args.rs
diff --git a/src/test/ui/prim-with-args.stderr → src/test/ui/typeck/prim-with-args.stderr b/src/test/ui/prim-with-args.stderr → src/test/ui/typeck/prim-with-args.stderr
diff --git a/src/test/ui/maybe-bounds-where-cpass.rs → ...st/ui/unsized/maybe-bounds-where-cpass.rs b/src/test/ui/maybe-bounds-where-cpass.rs → ...st/ui/unsized/maybe-bounds-where-cpass.rs
@@ -1,4 +1,4 @@
-// build-pass (FIXME(62277): could be check-pass?)
+// check-pass
 
 struct S<T>(*const T) where T: ?Sized;
 

diff --git a/src/test/ui/use-crate-name-alias.rs b/src/test/ui/use-crate-name-alias.rs
diff --git a/src/test/ui/writealias.rs b/src/test/ui/writealias.rs
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
@@ -7,8 +7,9 @@ use std::path::Path;
 
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
-const ROOT_ENTRY_LIMIT: usize = 1275;
+const ROOT_ENTRY_LIMIT: usize = 1102;
 const ISSUES_ENTRY_LIMIT: usize = 2310;
+const PARSER_LIMIT: usize = 1004;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))
@@ -21,10 +22,13 @@ fn check_entries(path: &Path, bad: &mut bool) {
             // Use special values for these dirs.
             let is_root = path.join("test/ui") == dir_path;
             let is_issues_dir = path.join("test/ui/issues") == dir_path;
+            let is_parser = path.join("test/ui/parser") == dir_path;
             let limit = if is_root {
                 ROOT_ENTRY_LIMIT
             } else if is_issues_dir {
                 ISSUES_ENTRY_LIMIT
+            } else if is_parser {
+                PARSER_LIMIT
             } else {
                 ENTRY_LIMIT
             };