rust-lang · bors · Nov 19, 2021 · Nov 18, 2021
diff --git a/src/test/ui/byte-literals.rs → src/test/ui/array-slice-vec/byte-literals.rs b/src/test/ui/byte-literals.rs → src/test/ui/array-slice-vec/byte-literals.rs
diff --git a/src/test/ui/suffixed-literal-meta.rs → ...st/ui/attributes/suffixed-literal-meta.rs b/src/test/ui/suffixed-literal-meta.rs → ...st/ui/attributes/suffixed-literal-meta.rs
diff --git a/src/test/ui/suffixed-literal-meta.stderr → ...i/attributes/suffixed-literal-meta.stderr b/src/test/ui/suffixed-literal-meta.stderr → ...i/attributes/suffixed-literal-meta.stderr
diff --git a/src/test/ui/operator-multidispatch.rs → src/test/ui/binop/operator-multidispatch.rs b/src/test/ui/operator-multidispatch.rs → src/test/ui/binop/operator-multidispatch.rs
diff --git a/src/test/ui/operator-overloading.rs → src/test/ui/binop/operator-overloading.rs b/src/test/ui/operator-overloading.rs → src/test/ui/binop/operator-overloading.rs
diff --git a/src/test/ui/placement-syntax.rs → src/test/ui/binop/placement-syntax.rs b/src/test/ui/placement-syntax.rs → src/test/ui/binop/placement-syntax.rs
diff --git a/src/test/ui/placement-syntax.stderr → src/test/ui/binop/placement-syntax.stderr b/src/test/ui/placement-syntax.stderr → src/test/ui/binop/placement-syntax.stderr
diff --git a/src/test/ui/immut-function-arguments.rs → ...t/ui/borrowck/immut-function-arguments.rs b/src/test/ui/immut-function-arguments.rs → ...t/ui/borrowck/immut-function-arguments.rs
diff --git a/src/test/ui/immut-function-arguments.stderr → .../borrowck/immut-function-arguments.stderr b/src/test/ui/immut-function-arguments.stderr → .../borrowck/immut-function-arguments.stderr
diff --git a/.../ui/kindck-implicit-close-over-mut-var.rs → ...wck/kindck-implicit-close-over-mut-var.rs b/.../ui/kindck-implicit-close-over-mut-var.rs → ...wck/kindck-implicit-close-over-mut-var.rs
diff --git a/src/test/ui/crt-static-on-works.rs → src/test/ui/cfg/crt-static-on-works.rs b/src/test/ui/crt-static-on-works.rs → src/test/ui/cfg/crt-static-on-works.rs
diff --git a/src/test/ui/once-move-out-on-heap.rs → ...test/ui/closures/once-move-out-on-heap.rs b/src/test/ui/once-move-out-on-heap.rs → ...test/ui/closures/once-move-out-on-heap.rs
diff --git a/src/test/ui/auxiliary/llvm_pr32379.rs → ...test/ui/codegen/auxiliary/llvm_pr32379.rs b/src/test/ui/auxiliary/llvm_pr32379.rs → ...test/ui/codegen/auxiliary/llvm_pr32379.rs
diff --git a/src/test/ui/init-large-type.rs → src/test/ui/codegen/init-large-type.rs b/src/test/ui/init-large-type.rs → src/test/ui/codegen/init-large-type.rs
diff --git a/src/test/ui/llvm-pr32379.rs → src/test/ui/codegen/llvm-pr32379.rs b/src/test/ui/llvm-pr32379.rs → src/test/ui/codegen/llvm-pr32379.rs
diff --git a/src/test/ui/retslot-cast.rs → src/test/ui/coercion/retslot-cast.rs b/src/test/ui/retslot-cast.rs → src/test/ui/coercion/retslot-cast.rs
diff --git a/src/test/ui/retslot-cast.stderr → src/test/ui/coercion/retslot-cast.stderr b/src/test/ui/retslot-cast.stderr → src/test/ui/coercion/retslot-cast.stderr
diff --git a/src/test/ui/cleanup-arm-conditional.rs → ...test/ui/dropck/cleanup-arm-conditional.rs b/src/test/ui/cleanup-arm-conditional.rs → ...test/ui/dropck/cleanup-arm-conditional.rs
diff --git a/src/test/ui/edition-keywords-2015-2018.rs → ...ui/editions/edition-keywords-2015-2018.rs b/src/test/ui/edition-keywords-2015-2018.rs → ...ui/editions/edition-keywords-2015-2018.rs
diff --git a/src/test/ui/edition-keywords-2018-2018.rs → ...ui/editions/edition-keywords-2018-2018.rs b/src/test/ui/edition-keywords-2018-2018.rs → ...ui/editions/edition-keywords-2018-2018.rs
diff --git a/src/test/ui/export.rs b/src/test/ui/export.rs
diff --git a/src/test/ui/export.stderr b/src/test/ui/export.stderr
diff --git a/src/test/ui/expr-block-slot.rs b/src/test/ui/expr-block-slot.rs
diff --git a/...t/ui/auxiliary/no-mangle-associated-fn.rs → ...tern/auxiliary/no-mangle-associated-fn.rs b/...t/ui/auxiliary/no-mangle-associated-fn.rs → ...tern/auxiliary/no-mangle-associated-fn.rs
diff --git a/src/test/ui/no-mangle-associated-fn.rs → ...test/ui/extern/no-mangle-associated-fn.rs b/src/test/ui/no-mangle-associated-fn.rs → ...test/ui/extern/no-mangle-associated-fn.rs
diff --git a/src/test/ui/fun-call-variants.rs → src/test/ui/fn/fun-call-variants.rs b/src/test/ui/fun-call-variants.rs → src/test/ui/fn/fun-call-variants.rs
diff --git a/src/test/ui/break-outside-loop.rs → ...t/ui/for-loop-while/break-outside-loop.rs b/src/test/ui/break-outside-loop.rs → ...t/ui/for-loop-while/break-outside-loop.rs
diff --git a/src/test/ui/break-outside-loop.stderr → .../for-loop-while/break-outside-loop.stderr b/src/test/ui/break-outside-loop.stderr → .../for-loop-while/break-outside-loop.stderr
diff --git a/src/test/ui/break-while-condition.rs → ...i/for-loop-while/break-while-condition.rs b/src/test/ui/break-while-condition.rs → ...i/for-loop-while/break-while-condition.rs
diff --git a/src/test/ui/break-while-condition.stderr → ...r-loop-while/break-while-condition.stderr b/src/test/ui/break-while-condition.stderr → ...r-loop-while/break-while-condition.stderr
diff --git a/src/test/ui/thread-local-not-in-prelude.rs → ...ui/hygiene/thread-local-not-in-prelude.rs b/src/test/ui/thread-local-not-in-prelude.rs → ...ui/hygiene/thread-local-not-in-prelude.rs
diff --git a/...ui/absolute-paths-in-nested-use-groups.rs → ...ts/absolute-paths-in-nested-use-groups.rs b/...ui/absolute-paths-in-nested-use-groups.rs → ...ts/absolute-paths-in-nested-use-groups.rs
diff --git a/...bsolute-paths-in-nested-use-groups.stderr → ...bsolute-paths-in-nested-use-groups.stderr b/...bsolute-paths-in-nested-use-groups.stderr → ...bsolute-paths-in-nested-use-groups.stderr
diff --git a/src/test/ui/reexport-star.rs → src/test/ui/imports/reexport-star.rs b/src/test/ui/reexport-star.rs → src/test/ui/imports/reexport-star.rs
diff --git a/src/test/ui/newlambdas-ret-infer.rs → ...test/ui/inference/newlambdas-ret-infer.rs b/src/test/ui/newlambdas-ret-infer.rs → ...test/ui/inference/newlambdas-ret-infer.rs
diff --git a/src/test/ui/newlambdas-ret-infer2.rs → ...est/ui/inference/newlambdas-ret-infer2.rs b/src/test/ui/newlambdas-ret-infer2.rs → ...est/ui/inference/newlambdas-ret-infer2.rs
diff --git a/src/test/ui/range-type-infer.rs → src/test/ui/inference/range-type-infer.rs b/src/test/ui/range-type-infer.rs → src/test/ui/inference/range-type-infer.rs
diff --git a/...test/ui/tutorial-suffix-inference-test.rs → ...ference/tutorial-suffix-inference-test.rs b/...test/ui/tutorial-suffix-inference-test.rs → ...ference/tutorial-suffix-inference-test.rs
diff --git a/.../ui/tutorial-suffix-inference-test.stderr → ...nce/tutorial-suffix-inference-test.stderr b/.../ui/tutorial-suffix-inference-test.stderr → ...nce/tutorial-suffix-inference-test.stderr
diff --git a/src/test/ui/type-infer-generalize-ty-var.rs → ...inference/type-infer-generalize-ty-var.rs b/src/test/ui/type-infer-generalize-ty-var.rs → ...inference/type-infer-generalize-ty-var.rs
diff --git a/src/test/ui/leak-unique-as-tydesc.rs b/src/test/ui/leak-unique-as-tydesc.rs
diff --git a/...iliary/link-cfg-works-transitive-dylib.rs → ...iliary/link-cfg-works-transitive-dylib.rs b/...iliary/link-cfg-works-transitive-dylib.rs → ...iliary/link-cfg-works-transitive-dylib.rs
diff --git a/...xiliary/link-cfg-works-transitive-rlib.rs → ...xiliary/link-cfg-works-transitive-rlib.rs b/...xiliary/link-cfg-works-transitive-rlib.rs → ...xiliary/link-cfg-works-transitive-rlib.rs
diff --git a/src/test/ui/link-cfg-works.rs → src/test/ui/linkage-attr/link-cfg-works.rs b/src/test/ui/link-cfg-works.rs → src/test/ui/linkage-attr/link-cfg-works.rs
diff --git a/src/test/ui/lint-cap.rs → src/test/ui/lint/lint-cap.rs b/src/test/ui/lint-cap.rs → src/test/ui/lint/lint-cap.rs
diff --git a/...ui/liveness-assign-imm-local-after-ret.rs → ...ss/liveness-assign-imm-local-after-ret.rs b/...ui/liveness-assign-imm-local-after-ret.rs → ...ss/liveness-assign-imm-local-after-ret.rs
diff --git a/...st/ui/match-on-negative-integer-ranges.rs → ...match/match-on-negative-integer-ranges.rs b/...st/ui/match-on-negative-integer-ranges.rs → ...match/match-on-negative-integer-ranges.rs
diff --git a/src/test/ui/issue-73914.rs → src/test/ui/mir/issue-73914.rs b/src/test/ui/issue-73914.rs → src/test/ui/mir/issue-73914.rs
diff --git a/...t/ui/assignment-operator-unimplemented.rs → ...ypes/assignment-operator-unimplemented.rs b/...t/ui/assignment-operator-unimplemented.rs → ...ypes/assignment-operator-unimplemented.rs
diff --git a/.../assignment-operator-unimplemented.stderr → .../assignment-operator-unimplemented.stderr b/.../assignment-operator-unimplemented.stderr → .../assignment-operator-unimplemented.stderr
diff --git a/...i/float-literal-inference-restrictions.rs → ...s/float-literal-inference-restrictions.rs b/...i/float-literal-inference-restrictions.rs → ...s/float-literal-inference-restrictions.rs
diff --git a/...oat-literal-inference-restrictions.stderr → ...oat-literal-inference-restrictions.stderr b/...oat-literal-inference-restrictions.stderr → ...oat-literal-inference-restrictions.stderr
diff --git a/src/test/ui/newtype-temporary.rs b/src/test/ui/newtype-temporary.rs
diff --git a/src/test/ui/lub-if.nll.stderr → src/test/ui/nll/lub-if.nll.stderr b/src/test/ui/lub-if.nll.stderr → src/test/ui/nll/lub-if.nll.stderr
diff --git a/src/test/ui/lub-if.rs → src/test/ui/nll/lub-if.rs b/src/test/ui/lub-if.rs → src/test/ui/nll/lub-if.rs
diff --git a/src/test/ui/lub-if.stderr → src/test/ui/nll/lub-if.stderr b/src/test/ui/lub-if.stderr → src/test/ui/nll/lub-if.stderr
diff --git a/src/test/ui/non-legacy-modes.rs b/src/test/ui/non-legacy-modes.rs
diff --git a/src/test/ui/overloaded-calls-nontuple.rs → ...i/overloaded/overloaded-calls-nontuple.rs b/src/test/ui/overloaded-calls-nontuple.rs → ...i/overloaded/overloaded-calls-nontuple.rs
diff --git a/src/test/ui/overloaded-calls-nontuple.stderr → ...erloaded/overloaded-calls-nontuple.stderr b/src/test/ui/overloaded-calls-nontuple.stderr → ...erloaded/overloaded-calls-nontuple.stderr
diff --git a/...ute-with-no-generics-in-parameter-list.rs → ...ute-with-no-generics-in-parameter-list.rs b/...ute-with-no-generics-in-parameter-list.rs → ...ute-with-no-generics-in-parameter-list.rs
diff --git a/...with-no-generics-in-parameter-list.stderr → ...with-no-generics-in-parameter-list.stderr b/...with-no-generics-in-parameter-list.stderr → ...with-no-generics-in-parameter-list.stderr
diff --git a/src/test/ui/dyn-trait-compatibility.rs → ...test/ui/parser/dyn-trait-compatibility.rs b/src/test/ui/dyn-trait-compatibility.rs → ...test/ui/parser/dyn-trait-compatibility.rs
diff --git a/src/test/ui/dyn-trait-compatibility.stderr → .../ui/parser/dyn-trait-compatibility.stderr b/src/test/ui/dyn-trait-compatibility.stderr → .../ui/parser/dyn-trait-compatibility.stderr
diff --git a/src/test/ui/operator-associativity.rs → src/test/ui/parser/operator-associativity.rs b/src/test/ui/operator-associativity.rs → src/test/ui/parser/operator-associativity.rs
diff --git a/src/test/ui/ignore-all-the-things.rs → src/test/ui/pattern/ignore-all-the-things.rs b/src/test/ui/ignore-all-the-things.rs → src/test/ui/pattern/ignore-all-the-things.rs
diff --git a/src/test/ui/auxiliary/impl_privacy_xc_2.rs → ...ui/privacy/auxiliary/impl_privacy_xc_2.rs b/src/test/ui/auxiliary/impl_privacy_xc_2.rs → ...ui/privacy/auxiliary/impl_privacy_xc_2.rs
diff --git a/...i/auxiliary/reachable-unnameable-items.rs → ...y/auxiliary/reachable-unnameable-items.rs b/...i/auxiliary/reachable-unnameable-items.rs → ...y/auxiliary/reachable-unnameable-items.rs
diff --git a/src/test/ui/export-tag-variant.rs → src/test/ui/privacy/export-tag-variant.rs b/src/test/ui/export-tag-variant.rs → src/test/ui/privacy/export-tag-variant.rs
diff --git a/src/test/ui/export-tag-variant.stderr → ...test/ui/privacy/export-tag-variant.stderr b/src/test/ui/export-tag-variant.stderr → ...test/ui/privacy/export-tag-variant.stderr
diff --git a/src/test/ui/impl-privacy-xc-2.rs → src/test/ui/privacy/impl-privacy-xc-2.rs b/src/test/ui/impl-privacy-xc-2.rs → src/test/ui/privacy/impl-privacy-xc-2.rs
diff --git a/src/test/ui/reachable-unnameable-items.rs → .../ui/privacy/reachable-unnameable-items.rs b/src/test/ui/reachable-unnameable-items.rs → .../ui/privacy/reachable-unnameable-items.rs
diff --git a/src/test/ui/core-run-destroy.rs → src/test/ui/process/core-run-destroy.rs b/src/test/ui/core-run-destroy.rs → src/test/ui/process/core-run-destroy.rs
diff --git a/src/test/ui/multi-panic.rs → src/test/ui/process/multi-panic.rs b/src/test/ui/multi-panic.rs → src/test/ui/process/multi-panic.rs
diff --git a/src/test/ui/no-stdio.rs → src/test/ui/process/no-stdio.rs b/src/test/ui/no-stdio.rs → src/test/ui/process/no-stdio.rs
diff --git a/src/test/ui/try-wait.rs → src/test/ui/process/try-wait.rs b/src/test/ui/try-wait.rs → src/test/ui/process/try-wait.rs
diff --git a/src/test/ui/pure-sum.rs b/src/test/ui/pure-sum.rs
diff --git a/...test/ui/wf-bound-region-in-object-type.rs → ...regions/wf-bound-region-in-object-type.rs b/...test/ui/wf-bound-region-in-object-type.rs → ...regions/wf-bound-region-in-object-type.rs
diff --git a/...ry/blind-item-mixed-crate-use-item-foo.rs → ...ry/blind-item-mixed-crate-use-item-foo.rs b/...ry/blind-item-mixed-crate-use-item-foo.rs → ...ry/blind-item-mixed-crate-use-item-foo.rs
diff --git a/...y/blind-item-mixed-crate-use-item-foo2.rs → ...y/blind-item-mixed-crate-use-item-foo2.rs b/...y/blind-item-mixed-crate-use-item-foo2.rs → ...y/blind-item-mixed-crate-use-item-foo2.rs
diff --git a/...est/ui/blind-item-mixed-crate-use-item.rs → ...esolve/blind-item-mixed-crate-use-item.rs b/...est/ui/blind-item-mixed-crate-use-item.rs → ...esolve/blind-item-mixed-crate-use-item.rs
diff --git a/src/test/ui/blind-item-mixed-use-item.rs → ...t/ui/resolve/blind-item-mixed-use-item.rs b/src/test/ui/blind-item-mixed-use-item.rs → ...t/ui/resolve/blind-item-mixed-use-item.rs
diff --git a/src/test/ui/export-fully-qualified.rs → ...test/ui/resolve/export-fully-qualified.rs b/src/test/ui/export-fully-qualified.rs → ...test/ui/resolve/export-fully-qualified.rs
diff --git a/src/test/ui/export-fully-qualified.stderr → .../ui/resolve/export-fully-qualified.stderr b/src/test/ui/export-fully-qualified.stderr → .../ui/resolve/export-fully-qualified.stderr
diff --git a/src/test/ui/no-std-1.rs → src/test/ui/resolve/no-std-1.rs b/src/test/ui/no-std-1.rs → src/test/ui/resolve/no-std-1.rs
diff --git a/src/test/ui/no-std-2.rs → src/test/ui/resolve/no-std-2.rs b/src/test/ui/no-std-2.rs → src/test/ui/resolve/no-std-2.rs
diff --git a/src/test/ui/no-std-3.rs → src/test/ui/resolve/no-std-3.rs b/src/test/ui/no-std-3.rs → src/test/ui/resolve/no-std-3.rs
diff --git a/src/test/ui/pathless-extern-ok.rs → src/test/ui/resolve/pathless-extern-ok.rs b/src/test/ui/pathless-extern-ok.rs → src/test/ui/resolve/pathless-extern-ok.rs
diff --git a/src/test/ui/atomic-print.rs → src/test/ui/runtime/atomic-print.rs b/src/test/ui/atomic-print.rs → src/test/ui/runtime/atomic-print.rs
diff --git a/src/test/ui/backtrace-debuginfo-aux.rs → ...est/ui/runtime/backtrace-debuginfo-aux.rs b/src/test/ui/backtrace-debuginfo-aux.rs → ...est/ui/runtime/backtrace-debuginfo-aux.rs
diff --git a/src/test/ui/backtrace-debuginfo.rs → src/test/ui/runtime/backtrace-debuginfo.rs b/src/test/ui/backtrace-debuginfo.rs → src/test/ui/runtime/backtrace-debuginfo.rs
diff --git a/src/test/ui/native-print-no-runtime.rs → ...est/ui/runtime/native-print-no-runtime.rs b/src/test/ui/native-print-no-runtime.rs → ...est/ui/runtime/native-print-no-runtime.rs
diff --git a/src/test/ui/stability-in-private-module.rs → ...-attribute/stability-in-private-module.rs b/src/test/ui/stability-in-private-module.rs → ...-attribute/stability-in-private-module.rs
diff --git a/...est/ui/stability-in-private-module.stderr → ...ribute/stability-in-private-module.stderr b/...est/ui/stability-in-private-module.stderr → ...ribute/stability-in-private-module.stderr
diff --git a/src/test/ui/auxiliary/extern-statics.rs → ...est/ui/static/auxiliary/extern-statics.rs b/src/test/ui/auxiliary/extern-statics.rs → ...est/ui/static/auxiliary/extern-statics.rs
diff --git a/...est/ui/safe-extern-statics-mut.mir.stderr → ...static/safe-extern-statics-mut.mir.stderr b/...est/ui/safe-extern-statics-mut.mir.stderr → ...static/safe-extern-statics-mut.mir.stderr
diff --git a/src/test/ui/safe-extern-statics-mut.rs → ...test/ui/static/safe-extern-statics-mut.rs b/src/test/ui/safe-extern-statics-mut.rs → ...test/ui/static/safe-extern-statics-mut.rs
diff --git a/...st/ui/safe-extern-statics-mut.thir.stderr → ...tatic/safe-extern-statics-mut.thir.stderr b/...st/ui/safe-extern-statics-mut.thir.stderr → ...tatic/safe-extern-statics-mut.thir.stderr
diff --git a/src/test/ui/safe-extern-statics.mir.stderr → .../ui/static/safe-extern-statics.mir.stderr b/src/test/ui/safe-extern-statics.mir.stderr → .../ui/static/safe-extern-statics.mir.stderr
diff --git a/src/test/ui/safe-extern-statics.rs → src/test/ui/static/safe-extern-statics.rs b/src/test/ui/safe-extern-statics.rs → src/test/ui/static/safe-extern-statics.rs
diff --git a/src/test/ui/safe-extern-statics.thir.stderr → ...ui/static/safe-extern-statics.thir.stderr b/src/test/ui/safe-extern-statics.thir.stderr → ...ui/static/safe-extern-statics.thir.stderr
diff --git a/src/test/ui/thread-local-in-ctfe.rs → src/test/ui/static/thread-local-in-ctfe.rs b/src/test/ui/thread-local-in-ctfe.rs → src/test/ui/static/thread-local-in-ctfe.rs
diff --git a/src/test/ui/thread-local-in-ctfe.stderr → ...est/ui/static/thread-local-in-ctfe.stderr b/src/test/ui/thread-local-in-ctfe.stderr → ...est/ui/static/thread-local-in-ctfe.stderr
diff --git a/src/test/ui/matches2021.rs → src/test/ui/stdlib-unit-tests/matches2021.rs b/src/test/ui/matches2021.rs → src/test/ui/stdlib-unit-tests/matches2021.rs
diff --git a/src/test/ui/minmax-stability-issue-23687.rs → ...nit-tests/minmax-stability-issue-23687.rs b/src/test/ui/minmax-stability-issue-23687.rs → ...nit-tests/minmax-stability-issue-23687.rs
diff --git a/src/test/ui/not-sync.rs → src/test/ui/stdlib-unit-tests/not-sync.rs b/src/test/ui/not-sync.rs → src/test/ui/stdlib-unit-tests/not-sync.rs
diff --git a/src/test/ui/not-sync.stderr → ...test/ui/stdlib-unit-tests/not-sync.stderr b/src/test/ui/not-sync.stderr → ...test/ui/stdlib-unit-tests/not-sync.stderr
diff --git a/src/test/ui/raw-fat-ptr.rs → src/test/ui/stdlib-unit-tests/raw-fat-ptr.rs b/src/test/ui/raw-fat-ptr.rs → src/test/ui/stdlib-unit-tests/raw-fat-ptr.rs
diff --git a/src/test/ui/volatile-fat-ptr.rs → .../ui/stdlib-unit-tests/volatile-fat-ptr.rs b/src/test/ui/volatile-fat-ptr.rs → .../ui/stdlib-unit-tests/volatile-fat-ptr.rs
diff --git a/src/test/ui/syntax-trait-polarity-feature-gate.rs b/src/test/ui/syntax-trait-polarity-feature-gate.rs
diff --git a/src/test/ui/syntax-trait-polarity-feature-gate.stderr b/src/test/ui/syntax-trait-polarity-feature-gate.stderr
diff --git a/src/test/ui/tail-direct.rs b/src/test/ui/tail-direct.rs
diff --git a/src/test/ui/clone-with-exterior.rs → ...i/threads-sendsync/clone-with-exterior.rs b/src/test/ui/clone-with-exterior.rs → ...i/threads-sendsync/clone-with-exterior.rs
diff --git a/src/test/ui/tcp-stress.rs → src/test/ui/threads-sendsync/tcp-stress.rs b/src/test/ui/tcp-stress.rs → src/test/ui/threads-sendsync/tcp-stress.rs
diff --git a/src/test/ui/alignment-gep-tup-like-1.rs → ...est/ui/traits/alignment-gep-tup-like-1.rs b/src/test/ui/alignment-gep-tup-like-1.rs → ...est/ui/traits/alignment-gep-tup-like-1.rs
diff --git a/src/test/ui/cycle-generic-bound.rs → src/test/ui/traits/cycle-generic-bound.rs b/src/test/ui/cycle-generic-bound.rs → src/test/ui/traits/cycle-generic-bound.rs
diff --git a/src/test/ui/early-vtbl-resolution.rs → src/test/ui/traits/early-vtbl-resolution.rs b/src/test/ui/early-vtbl-resolution.rs → src/test/ui/traits/early-vtbl-resolution.rs
diff --git a/src/test/ui/map-types.rs → src/test/ui/traits/map-types.rs b/src/test/ui/map-types.rs → src/test/ui/traits/map-types.rs
diff --git a/src/test/ui/map-types.stderr → src/test/ui/traits/map-types.stderr b/src/test/ui/map-types.stderr → src/test/ui/traits/map-types.stderr
diff --git a/src/test/ui/no_send-struct.rs → src/test/ui/traits/no_send-struct.rs b/src/test/ui/no_send-struct.rs → src/test/ui/traits/no_send-struct.rs
diff --git a/src/test/ui/no_send-struct.stderr → src/test/ui/traits/no_send-struct.stderr b/src/test/ui/no_send-struct.stderr → src/test/ui/traits/no_send-struct.stderr
diff --git a/src/test/ui/try-is-identifier-edition2015.rs → ...ry-block/try-is-identifier-edition2015.rs b/src/test/ui/try-is-identifier-edition2015.rs → ...ry-block/try-is-identifier-edition2015.rs
diff --git a/src/test/ui/type-ascription.rs → src/test/ui/type/type-ascription.rs b/src/test/ui/type-ascription.rs → src/test/ui/type/type-ascription.rs
diff --git a/src/test/ui/no-type-for-node-ice.rs → src/test/ui/typeck/no-type-for-node-ice.rs b/src/test/ui/no-type-for-node-ice.rs → src/test/ui/typeck/no-type-for-node-ice.rs
diff --git a/src/test/ui/no-type-for-node-ice.stderr → ...est/ui/typeck/no-type-for-node-ice.stderr b/src/test/ui/no-type-for-node-ice.stderr → ...est/ui/typeck/no-type-for-node-ice.stderr
diff --git a/src/test/ui/project-cache-issue-37154.rs → ...st/ui/typeck/project-cache-issue-37154.rs b/src/test/ui/project-cache-issue-37154.rs → ...st/ui/typeck/project-cache-issue-37154.rs
diff --git a/src/test/ui/ufcs-type-params.rs → src/test/ui/typeck/ufcs-type-params.rs b/src/test/ui/ufcs-type-params.rs → src/test/ui/typeck/ufcs-type-params.rs
diff --git a/src/test/ui/unify-return-ty.rs → src/test/ui/typeck/unify-return-ty.rs b/src/test/ui/unify-return-ty.rs → src/test/ui/typeck/unify-return-ty.rs
diff --git a/src/test/ui/maybe-bounds-where.rs → src/test/ui/unsized/maybe-bounds-where.rs b/src/test/ui/maybe-bounds-where.rs → src/test/ui/unsized/maybe-bounds-where.rs
diff --git a/src/test/ui/maybe-bounds-where.stderr → ...test/ui/unsized/maybe-bounds-where.stderr b/src/test/ui/maybe-bounds-where.stderr → ...test/ui/unsized/maybe-bounds-where.stderr
diff --git a/src/test/ui/wasm-import-module.rs → src/test/ui/wasm/wasm-import-module.rs b/src/test/ui/wasm-import-module.rs → src/test/ui/wasm/wasm-import-module.rs
diff --git a/src/test/ui/wasm-import-module.stderr → src/test/ui/wasm/wasm-import-module.stderr b/src/test/ui/wasm-import-module.stderr → src/test/ui/wasm/wasm-import-module.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
@@ -7,9 +7,9 @@ use std::path::Path;
 
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
-const ROOT_ENTRY_LIMIT: usize = 1102;
+const ROOT_ENTRY_LIMIT: usize = 983;
 const ISSUES_ENTRY_LIMIT: usize = 2310;
-const PARSER_LIMIT: usize = 1005;
+const PARSER_LIMIT: usize = 1010;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))