From ab5434f9b8d3937fe33f813b3f8e1a43a4657781 Mon Sep 17 00:00:00 2001 From: Caio Date: Sun, 14 Nov 2021 14:38:42 -0300 Subject: [PATCH] Move some tests to more reasonable directories --- .../ui/{ => abi}/c-stack-returning-int64.rs | 0 src/test/ui/{ => abi}/x86stdcall.rs | 0 src/test/ui/{ => abi}/x86stdcall2.rs | 0 .../default-alloc-error-hook.rs | 0 src/test/ui/alloca-from-derived-tydesc.rs | 15 -------------- .../associated-item-long-paths.rs | 0 .../default-associated-types.rs | 0 ...correct-move-async-order-issue-79694.fixed | 0 .../incorrect-move-async-order-issue-79694.rs | 0 ...orrect-move-async-order-issue-79694.stderr | 0 .../ui/{ => attributes}/attr-eq-token-tree.rs | 0 .../attr-eq-token-tree.stderr | 0 .../ui/{ => attributes}/tool_attributes.rs | 0 .../ui/augmented-assignments-feature-gate.rs | 15 -------------- .../ui/{ => binop}/shift-various-bad-types.rs | 0 .../shift-various-bad-types.stderr | 0 .../{ => borrowck}/access-mode-in-closures.rs | 0 .../access-mode-in-closures.stderr | 0 src/test/ui/{ => borrowck}/lazy-init.rs | 0 src/test/ui/{ => box}/new-box-syntax.rs | 0 src/test/ui/{ => cast}/codegen-object-shim.rs | 0 src/test/ui/{ => cfg}/crt-static-off-works.rs | 0 src/test/ui/{ => cfg}/expanded-cfg.rs | 0 .../ui/{ => closures}/closure-expected.rs | 0 .../ui/{ => closures}/closure-expected.stderr | 0 .../ui/{ => closures}/closure_promotion.rs | 0 .../{ => closures}/semistatement-in-lambda.rs | 0 .../thir-unsafeck-issue-85871.rs | 0 src/test/ui/{ => coercion}/unsafe-coercion.rs | 0 src/test/ui/{ => consts}/eval-enum.rs | 0 src/test/ui/{ => consts}/eval-enum.stderr | 0 .../ui/{ => drop}/auxiliary/inline_dtor.rs | 0 src/test/ui/{ => drop}/use_inline_dtor.rs | 0 .../edition-keywords-2015-2015.rs | 0 .../edition-keywords-2018-2015.rs | 0 src/test/ui/estr-uniq.rs | 15 -------------- src/test/ui/export-import.rs | 11 ---------- src/test/ui/export-import.stderr | 15 -------------- src/test/ui/export-non-interference2.rs | 11 ---------- src/test/ui/export-non-interference3.rs | 11 ---------- src/test/ui/export2.rs | 11 ---------- src/test/ui/export2.stderr | 9 --------- src/test/ui/expr-block-unique.rs | 4 ---- src/test/ui/{ => expr/if}/expr-if.rs | 0 .../auxiliary/reexport-should-still-link.rs | 0 .../{ => feature-gates}/gated-bad-feature.rs | 0 .../gated-bad-feature.stderr | 0 .../ui/{ => feature-gates}/stable-features.rs | 0 .../stable-features.stderr | 0 src/test/ui/{ => fn}/expr-fn.rs | 0 .../nested-function-names-issue-8587.rs | 0 .../while-let-2.rs} | 0 .../while-let-2.stderr} | 6 +++--- src/test/ui/{ => generics}/autobind.rs | 0 .../lifetime-before-type-params.rs | 0 .../lifetime-before-type-params.stderr | 0 .../{ => generics}/type-params-in-for-each.rs | 0 src/test/ui/{ => imports}/export-multi.rs | 0 src/test/ui/{ => imports}/glob-cycles.rs | 0 src/test/ui/{ => imports}/no-std-inject.rs | 0 .../ui/{ => imports}/no-std-inject.stderr | 0 src/test/ui/{ => imports}/use-mod.rs | 0 .../question-mark-type-infer.rs | 0 .../question-mark-type-infer.stderr | 0 src/test/ui/{ => inference}/simple-infer.rs | 0 src/test/ui/keyword-changes-2012-07-31.rs | 20 ------------------- .../no_owned_box_lang_item.rs | 0 .../no_owned_box_lang_item.stderr | 0 .../{ => linkage-attr}/auxiliary/linkage1.rs | 0 src/test/ui/{ => linkage-attr}/linkage1.rs | 0 ...est-allow-dead-extern-static-no-warning.rs | 0 src/test/ui/{ => lint}/warn-path-statement.rs | 0 .../ui/{ => lint}/warn-path-statement.stderr | 0 .../{ => lto}/auxiliary/debuginfo-lto-aux.rs | 0 src/test/ui/{ => lto}/debuginfo-lto.rs | 0 src/test/ui/{ => lto}/fat-lto.rs | 0 .../{ => macros}/auxiliary/proc_macro_def.rs | 0 src/test/ui/{ => macros}/concat.rs | 0 src/test/ui/{ => macros}/concat.stderr | 0 .../include-single-expr-helper-1.rs | 0 .../include-single-expr-helper.rs | 0 .../ui/{ => macros}/include-single-expr.rs | 0 .../{ => macros}/include-single-expr.stderr | 0 .../ui/{ => macros}/malformed_macro_lhs.rs | 0 .../{ => macros}/malformed_macro_lhs.stderr | 0 src/test/ui/{ => macros}/no-std-macros.rs | 0 src/test/ui/{ => macros}/proc_macro.rs | 0 src/test/ui/{ => nll}/lub-match.nll.stderr | 0 src/test/ui/{ => nll}/lub-match.rs | 0 src/test/ui/{ => nll}/lub-match.stderr | 0 src/test/ui/{ => nll}/ref-suggestion.rs | 0 src/test/ui/{ => nll}/ref-suggestion.stderr | 0 .../integer-literal-suffix-inference.rs | 0 .../integer-literal-suffix-inference.stderr | 0 ...ject-lifetime-default-default-to-static.rs | 0 ...object-lifetime-default-from-ref-struct.rs | 0 .../object-lifetime-default-from-rptr-box.rs | 0 .../object-lifetime-default-from-rptr-mut.rs | 0 ...bject-lifetime-default-from-rptr-struct.rs | 0 .../object-lifetime-default-from-rptr.rs | 0 .../object-lifetime-default-inferred.rs | 0 .../ui/{ => overloaded}/fixup-deref-mut.rs | 0 src/test/ui/paren-free.rs | 7 ------- src/test/ui/{ => parser}/issue-83639.rs | 0 src/test/ui/{ => parser}/issue-83639.stderr | 0 .../obsolete-syntax-impl-for-dotdot.rs | 0 .../obsolete-syntax-impl-for-dotdot.stderr | 0 src/test/ui/{ => parser}/ranges-precedence.rs | 0 src/test/ui/{ => parser}/similar-tokens.rs | 0 .../ui/{ => parser}/similar-tokens.stderr | 0 src/test/ui/{ => parser}/utf8_idents-rpass.rs | 0 src/test/ui/{ => privacy}/useless-pub.rs | 0 src/test/ui/{ => privacy}/useless-pub.stderr | 0 .../{ => proc-macro}/auxiliary/cond_plugin.rs | 0 .../ui/{ => proc-macro}/macro-quote-cond.rs | 0 src/test/ui/{ => process}/fds-are-cloexec.rs | 0 .../sigpipe-should-be-ignored.rs | 0 src/test/ui/purity-infer.rs | 6 ------ src/test/ui/readalias.rs | 12 ----------- src/test/ui/{ => recursion}/instantiable.rs | 0 src/test/ui/reexport-should-still-link.rs | 10 ---------- .../ui/{ => regions}/init-res-into-things.rs | 0 .../ui/{ => regions}/owned-implies-static.rs | 0 .../{ => regions}/rcvr-borrowed-to-region.rs | 0 src/test/ui/{ => repr}/attr-usage-repr.rs | 0 src/test/ui/{ => repr}/attr-usage-repr.stderr | 0 src/test/ui/{ => repr}/repr.rs | 0 src/test/ui/{ => repr}/repr.stderr | 0 src/test/ui/{ => resolve}/crate-in-paths.rs | 0 .../ui/{ => resolve}/crate-in-paths.stderr | 0 .../{ => resolve}/editions-crate-root-2018.rs | 0 .../editions-crate-root-2018.stderr | 0 .../ui/{ => resolve}/enums-pats-not-idents.rs | 0 .../enums-pats-not-idents.stderr | 0 .../no-implicit-prelude-nested.rs | 0 .../no-implicit-prelude-nested.stderr | 0 .../ui/{ => resolve}/resolve-issue-2428.rs | 0 src/test/ui/ret-none.rs | 13 ------------ src/test/ui/{ => runtime}/out-of-stack.rs | 0 .../rt-explody-panic-payloads.rs | 0 .../{ => runtime}/running-with-no-runtime.rs | 0 .../signal-alternate-stack-cleanup.rs | 0 .../{ => runtime}/stdout-during-shutdown.rs | 0 .../stdout-during-shutdown.run.stdout | 0 .../ui/{ => rustdoc}/duplicate_doc_alias.rs | 0 .../{ => rustdoc}/duplicate_doc_alias.stderr | 0 .../hidden-doc-associated-item.rs | 0 src/test/ui/{ => self}/class-missing-self.rs | 0 .../ui/{ => self}/class-missing-self.stderr | 0 .../objects-owned-object-owned-method.rs | 0 .../refer-to-other-statics-by-value.rs | 0 .../{ => static}/static_sized_requirement.rs | 0 .../{ => stdlib-unit-tests}/builtin-clone.rs | 0 .../eq-multidispatch.rs | 0 src/test/ui/{ => stdlib-unit-tests}/istr.rs | 0 .../log-knows-the-names-of-variants-in-std.rs | 0 .../ui/{ => stdlib-unit-tests}/seq-compare.rs | 0 src/test/ui/{ => structs}/large-records.rs | 0 .../{ => suggestions}/bound-suggestions.fixed | 0 .../ui/{ => suggestions}/bound-suggestions.rs | 0 .../bound-suggestions.stderr | 0 .../child-outlives-parent.rs | 0 .../ui/{ => threads-sendsync}/mpsc_stress.rs | 0 .../{ => threads-sendsync}/unwind-resource.rs | 0 src/test/ui/{ => threads-sendsync}/yield.rs | 0 src/test/ui/{ => threads-sendsync}/yield1.rs | 0 src/test/ui/{ => traits}/bug-7295.rs | 0 src/test/ui/{ => traits}/monad.rs | 0 ...nomorphized-callees-with-ty-params-3314.rs | 0 ...ispatch-conditional-impl-not-considered.rs | 0 src/test/ui/{ => traits}/multidispatch1.rs | 0 src/test/ui/{ => traits}/multidispatch2.rs | 0 ...owned-object-borrowed-method-headerless.rs | 0 .../ui/{ => traits}/staticness-mismatch.rs | 0 .../{ => traits}/staticness-mismatch.stderr | 0 .../typeclasses-eq-example-static.rs | 0 .../ui/{ => traits}/typeclasses-eq-example.rs | 0 .../ui/{ => traits}/vtable-res-trait-param.rs | 0 .../vtable-res-trait-param.stderr | 0 .../ui/{ => tuple}/tuple-index-fat-types.rs | 0 src/test/ui/type-in-nested-module.rs | 17 ---------------- src/test/ui/{ => typeck}/prim-with-args.rs | 0 .../ui/{ => typeck}/prim-with-args.stderr | 0 .../{ => unsized}/maybe-bounds-where-cpass.rs | 2 +- src/test/ui/use-crate-name-alias.rs | 7 ------- src/test/ui/writealias.rs | 19 ------------------ src/tools/tidy/src/ui_tests.rs | 6 +++++- 187 files changed, 9 insertions(+), 233 deletions(-) rename src/test/ui/{ => abi}/c-stack-returning-int64.rs (100%) rename src/test/ui/{ => abi}/x86stdcall.rs (100%) rename src/test/ui/{ => abi}/x86stdcall2.rs (100%) rename src/test/ui/{ => alloc-error}/default-alloc-error-hook.rs (100%) delete mode 100644 src/test/ui/alloca-from-derived-tydesc.rs rename src/test/ui/{ => associated-types}/associated-item-long-paths.rs (100%) rename src/test/ui/{ => associated-types}/default-associated-types.rs (100%) rename src/test/ui/{parser => async-await}/incorrect-move-async-order-issue-79694.fixed (100%) rename src/test/ui/{parser => async-await}/incorrect-move-async-order-issue-79694.rs (100%) rename src/test/ui/{parser => async-await}/incorrect-move-async-order-issue-79694.stderr (100%) rename src/test/ui/{ => attributes}/attr-eq-token-tree.rs (100%) rename src/test/ui/{ => attributes}/attr-eq-token-tree.stderr (100%) rename src/test/ui/{ => attributes}/tool_attributes.rs (100%) delete mode 100644 src/test/ui/augmented-assignments-feature-gate.rs rename src/test/ui/{ => binop}/shift-various-bad-types.rs (100%) rename src/test/ui/{ => binop}/shift-various-bad-types.stderr (100%) rename src/test/ui/{ => borrowck}/access-mode-in-closures.rs (100%) rename src/test/ui/{ => borrowck}/access-mode-in-closures.stderr (100%) rename src/test/ui/{ => borrowck}/lazy-init.rs (100%) rename src/test/ui/{ => box}/new-box-syntax.rs (100%) rename src/test/ui/{ => cast}/codegen-object-shim.rs (100%) rename src/test/ui/{ => cfg}/crt-static-off-works.rs (100%) rename src/test/ui/{ => cfg}/expanded-cfg.rs (100%) rename src/test/ui/{ => closures}/closure-expected.rs (100%) rename src/test/ui/{ => closures}/closure-expected.stderr (100%) rename src/test/ui/{ => closures}/closure_promotion.rs (100%) rename src/test/ui/{ => closures}/semistatement-in-lambda.rs (100%) rename src/test/ui/{ => closures}/thir-unsafeck-issue-85871.rs (100%) rename src/test/ui/{ => coercion}/unsafe-coercion.rs (100%) rename src/test/ui/{ => consts}/eval-enum.rs (100%) rename src/test/ui/{ => consts}/eval-enum.stderr (100%) rename src/test/ui/{ => drop}/auxiliary/inline_dtor.rs (100%) rename src/test/ui/{ => drop}/use_inline_dtor.rs (100%) rename src/test/ui/{ => editions}/edition-keywords-2015-2015.rs (100%) rename src/test/ui/{ => editions}/edition-keywords-2018-2015.rs (100%) delete mode 100644 src/test/ui/estr-uniq.rs delete mode 100644 src/test/ui/export-import.rs delete mode 100644 src/test/ui/export-import.stderr delete mode 100644 src/test/ui/export-non-interference2.rs delete mode 100644 src/test/ui/export-non-interference3.rs delete mode 100644 src/test/ui/export2.rs delete mode 100644 src/test/ui/export2.stderr delete mode 100644 src/test/ui/expr-block-unique.rs rename src/test/ui/{ => expr/if}/expr-if.rs (100%) rename src/test/ui/{ => extern}/auxiliary/reexport-should-still-link.rs (100%) rename src/test/ui/{ => feature-gates}/gated-bad-feature.rs (100%) rename src/test/ui/{ => feature-gates}/gated-bad-feature.stderr (100%) rename src/test/ui/{ => feature-gates}/stable-features.rs (100%) rename src/test/ui/{ => feature-gates}/stable-features.stderr (100%) rename src/test/ui/{ => fn}/expr-fn.rs (100%) rename src/test/ui/{ => fn}/nested-function-names-issue-8587.rs (100%) rename src/test/ui/{while-let.rs => for-loop-while/while-let-2.rs} (100%) rename src/test/ui/{while-let.stderr => for-loop-while/while-let-2.stderr} (93%) rename src/test/ui/{ => generics}/autobind.rs (100%) rename src/test/ui/{ => generics}/lifetime-before-type-params.rs (100%) rename src/test/ui/{ => generics}/lifetime-before-type-params.stderr (100%) rename src/test/ui/{ => generics}/type-params-in-for-each.rs (100%) rename src/test/ui/{ => imports}/export-multi.rs (100%) rename src/test/ui/{ => imports}/glob-cycles.rs (100%) rename src/test/ui/{ => imports}/no-std-inject.rs (100%) rename src/test/ui/{ => imports}/no-std-inject.stderr (100%) rename src/test/ui/{ => imports}/use-mod.rs (100%) rename src/test/ui/{ => inference}/question-mark-type-infer.rs (100%) rename src/test/ui/{ => inference}/question-mark-type-infer.stderr (100%) rename src/test/ui/{ => inference}/simple-infer.rs (100%) delete mode 100644 src/test/ui/keyword-changes-2012-07-31.rs rename src/test/ui/{ => lang-items}/no_owned_box_lang_item.rs (100%) rename src/test/ui/{ => lang-items}/no_owned_box_lang_item.stderr (100%) rename src/test/ui/{ => linkage-attr}/auxiliary/linkage1.rs (100%) rename src/test/ui/{ => linkage-attr}/linkage1.rs (100%) rename src/test/ui/{ => lint}/test-allow-dead-extern-static-no-warning.rs (100%) rename src/test/ui/{ => lint}/warn-path-statement.rs (100%) rename src/test/ui/{ => lint}/warn-path-statement.stderr (100%) rename src/test/ui/{ => lto}/auxiliary/debuginfo-lto-aux.rs (100%) rename src/test/ui/{ => lto}/debuginfo-lto.rs (100%) rename src/test/ui/{ => lto}/fat-lto.rs (100%) rename src/test/ui/{ => macros}/auxiliary/proc_macro_def.rs (100%) rename src/test/ui/{ => macros}/concat.rs (100%) rename src/test/ui/{ => macros}/concat.stderr (100%) rename src/test/ui/{ => macros}/include-single-expr-helper-1.rs (100%) rename src/test/ui/{ => macros}/include-single-expr-helper.rs (100%) rename src/test/ui/{ => macros}/include-single-expr.rs (100%) rename src/test/ui/{ => macros}/include-single-expr.stderr (100%) rename src/test/ui/{ => macros}/malformed_macro_lhs.rs (100%) rename src/test/ui/{ => macros}/malformed_macro_lhs.stderr (100%) rename src/test/ui/{ => macros}/no-std-macros.rs (100%) rename src/test/ui/{ => macros}/proc_macro.rs (100%) rename src/test/ui/{ => nll}/lub-match.nll.stderr (100%) rename src/test/ui/{ => nll}/lub-match.rs (100%) rename src/test/ui/{ => nll}/lub-match.stderr (100%) rename src/test/ui/{ => nll}/ref-suggestion.rs (100%) rename src/test/ui/{ => nll}/ref-suggestion.stderr (100%) rename src/test/ui/{ => numeric}/integer-literal-suffix-inference.rs (100%) rename src/test/ui/{ => numeric}/integer-literal-suffix-inference.stderr (100%) rename src/test/ui/{ => object-lifetime}/object-lifetime-default-default-to-static.rs (100%) rename src/test/ui/{structs-enums => object-lifetime}/object-lifetime-default-from-ref-struct.rs (100%) rename src/test/ui/{ => object-lifetime}/object-lifetime-default-from-rptr-box.rs (100%) rename src/test/ui/{ => object-lifetime}/object-lifetime-default-from-rptr-mut.rs (100%) rename src/test/ui/{structs-enums => object-lifetime}/object-lifetime-default-from-rptr-struct.rs (100%) rename src/test/ui/{ => object-lifetime}/object-lifetime-default-from-rptr.rs (100%) rename src/test/ui/{ => object-lifetime}/object-lifetime-default-inferred.rs (100%) rename src/test/ui/{ => overloaded}/fixup-deref-mut.rs (100%) delete mode 100644 src/test/ui/paren-free.rs rename src/test/ui/{ => parser}/issue-83639.rs (100%) rename src/test/ui/{ => parser}/issue-83639.stderr (100%) rename src/test/ui/{ => parser}/obsolete-syntax-impl-for-dotdot.rs (100%) rename src/test/ui/{ => parser}/obsolete-syntax-impl-for-dotdot.stderr (100%) rename src/test/ui/{ => parser}/ranges-precedence.rs (100%) rename src/test/ui/{ => parser}/similar-tokens.rs (100%) rename src/test/ui/{ => parser}/similar-tokens.stderr (100%) rename src/test/ui/{ => parser}/utf8_idents-rpass.rs (100%) rename src/test/ui/{ => privacy}/useless-pub.rs (100%) rename src/test/ui/{ => privacy}/useless-pub.stderr (100%) rename src/test/ui/{ => proc-macro}/auxiliary/cond_plugin.rs (100%) rename src/test/ui/{ => proc-macro}/macro-quote-cond.rs (100%) rename src/test/ui/{ => process}/fds-are-cloexec.rs (100%) rename src/test/ui/{ => process}/sigpipe-should-be-ignored.rs (100%) delete mode 100644 src/test/ui/purity-infer.rs delete mode 100644 src/test/ui/readalias.rs rename src/test/ui/{ => recursion}/instantiable.rs (100%) delete mode 100644 src/test/ui/reexport-should-still-link.rs rename src/test/ui/{ => regions}/init-res-into-things.rs (100%) rename src/test/ui/{ => regions}/owned-implies-static.rs (100%) rename src/test/ui/{ => regions}/rcvr-borrowed-to-region.rs (100%) rename src/test/ui/{ => repr}/attr-usage-repr.rs (100%) rename src/test/ui/{ => repr}/attr-usage-repr.stderr (100%) rename src/test/ui/{ => repr}/repr.rs (100%) rename src/test/ui/{ => repr}/repr.stderr (100%) rename src/test/ui/{ => resolve}/crate-in-paths.rs (100%) rename src/test/ui/{ => resolve}/crate-in-paths.stderr (100%) rename src/test/ui/{ => resolve}/editions-crate-root-2018.rs (100%) rename src/test/ui/{ => resolve}/editions-crate-root-2018.stderr (100%) rename src/test/ui/{ => resolve}/enums-pats-not-idents.rs (100%) rename src/test/ui/{ => resolve}/enums-pats-not-idents.stderr (100%) rename src/test/ui/{ => resolve}/no-implicit-prelude-nested.rs (100%) rename src/test/ui/{ => resolve}/no-implicit-prelude-nested.stderr (100%) rename src/test/ui/{ => resolve}/resolve-issue-2428.rs (100%) delete mode 100644 src/test/ui/ret-none.rs rename src/test/ui/{ => runtime}/out-of-stack.rs (100%) rename src/test/ui/{ => runtime}/rt-explody-panic-payloads.rs (100%) rename src/test/ui/{ => runtime}/running-with-no-runtime.rs (100%) rename src/test/ui/{ => runtime}/signal-alternate-stack-cleanup.rs (100%) rename src/test/ui/{ => runtime}/stdout-during-shutdown.rs (100%) rename src/test/ui/{ => runtime}/stdout-during-shutdown.run.stdout (100%) rename src/test/ui/{ => rustdoc}/duplicate_doc_alias.rs (100%) rename src/test/ui/{ => rustdoc}/duplicate_doc_alias.stderr (100%) rename src/test/ui/{ => rustdoc}/hidden-doc-associated-item.rs (100%) rename src/test/ui/{ => self}/class-missing-self.rs (100%) rename src/test/ui/{ => self}/class-missing-self.stderr (100%) rename src/test/ui/{ => self}/objects-owned-object-owned-method.rs (100%) rename src/test/ui/{ => static}/refer-to-other-statics-by-value.rs (100%) rename src/test/ui/{ => static}/static_sized_requirement.rs (100%) rename src/test/ui/{ => stdlib-unit-tests}/builtin-clone.rs (100%) rename src/test/ui/{ => stdlib-unit-tests}/eq-multidispatch.rs (100%) rename src/test/ui/{ => stdlib-unit-tests}/istr.rs (100%) rename src/test/ui/{ => stdlib-unit-tests}/log-knows-the-names-of-variants-in-std.rs (100%) rename src/test/ui/{ => stdlib-unit-tests}/seq-compare.rs (100%) rename src/test/ui/{ => structs}/large-records.rs (100%) rename src/test/ui/{ => suggestions}/bound-suggestions.fixed (100%) rename src/test/ui/{ => suggestions}/bound-suggestions.rs (100%) rename src/test/ui/{ => suggestions}/bound-suggestions.stderr (100%) rename src/test/ui/{ => threads-sendsync}/child-outlives-parent.rs (100%) rename src/test/ui/{ => threads-sendsync}/mpsc_stress.rs (100%) rename src/test/ui/{ => threads-sendsync}/unwind-resource.rs (100%) rename src/test/ui/{ => threads-sendsync}/yield.rs (100%) rename src/test/ui/{ => threads-sendsync}/yield1.rs (100%) rename src/test/ui/{ => traits}/bug-7295.rs (100%) rename src/test/ui/{ => traits}/monad.rs (100%) rename src/test/ui/{ => traits}/monomorphized-callees-with-ty-params-3314.rs (100%) rename src/test/ui/{ => traits}/multidispatch-conditional-impl-not-considered.rs (100%) rename src/test/ui/{ => traits}/multidispatch1.rs (100%) rename src/test/ui/{ => traits}/multidispatch2.rs (100%) rename src/test/ui/{ => traits}/objects-owned-object-borrowed-method-headerless.rs (100%) rename src/test/ui/{ => traits}/staticness-mismatch.rs (100%) rename src/test/ui/{ => traits}/staticness-mismatch.stderr (100%) rename src/test/ui/{ => traits}/typeclasses-eq-example-static.rs (100%) rename src/test/ui/{ => traits}/typeclasses-eq-example.rs (100%) rename src/test/ui/{ => traits}/vtable-res-trait-param.rs (100%) rename src/test/ui/{ => traits}/vtable-res-trait-param.stderr (100%) rename src/test/ui/{ => tuple}/tuple-index-fat-types.rs (100%) delete mode 100644 src/test/ui/type-in-nested-module.rs rename src/test/ui/{ => typeck}/prim-with-args.rs (100%) rename src/test/ui/{ => typeck}/prim-with-args.stderr (100%) rename src/test/ui/{ => unsized}/maybe-bounds-where-cpass.rs (69%) delete mode 100644 src/test/ui/use-crate-name-alias.rs delete mode 100644 src/test/ui/writealias.rs diff --git a/src/test/ui/c-stack-returning-int64.rs b/src/test/ui/abi/c-stack-returning-int64.rs similarity index 100% rename from src/test/ui/c-stack-returning-int64.rs rename to src/test/ui/abi/c-stack-returning-int64.rs diff --git a/src/test/ui/x86stdcall.rs b/src/test/ui/abi/x86stdcall.rs similarity index 100% rename from src/test/ui/x86stdcall.rs rename to src/test/ui/abi/x86stdcall.rs diff --git a/src/test/ui/x86stdcall2.rs b/src/test/ui/abi/x86stdcall2.rs similarity index 100% rename from src/test/ui/x86stdcall2.rs rename to src/test/ui/abi/x86stdcall2.rs diff --git a/src/test/ui/default-alloc-error-hook.rs b/src/test/ui/alloc-error/default-alloc-error-hook.rs similarity index 100% rename from src/test/ui/default-alloc-error-hook.rs rename to src/test/ui/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 deleted file mode 100644 index c7f7fbad435ee..0000000000000 --- a/src/test/ui/alloca-from-derived-tydesc.rs +++ /dev/null @@ -1,15 +0,0 @@ -// run-pass - -#![allow(non_camel_case_types)] -#![allow(dead_code)] - - -// pretty-expanded FIXME #23616 - -enum option { some(T), none, } - -struct R {v: Vec> } - -fn f() -> Vec { return Vec::new(); } - -pub fn main() { let mut r: R = R {v: Vec::new()}; r.v = f(); } diff --git a/src/test/ui/associated-item-long-paths.rs b/src/test/ui/associated-types/associated-item-long-paths.rs similarity index 100% rename from src/test/ui/associated-item-long-paths.rs rename to src/test/ui/associated-types/associated-item-long-paths.rs diff --git a/src/test/ui/default-associated-types.rs b/src/test/ui/associated-types/default-associated-types.rs similarity index 100% rename from src/test/ui/default-associated-types.rs rename to src/test/ui/associated-types/default-associated-types.rs diff --git a/src/test/ui/parser/incorrect-move-async-order-issue-79694.fixed b/src/test/ui/async-await/incorrect-move-async-order-issue-79694.fixed similarity index 100% rename from src/test/ui/parser/incorrect-move-async-order-issue-79694.fixed rename to src/test/ui/async-await/incorrect-move-async-order-issue-79694.fixed diff --git a/src/test/ui/parser/incorrect-move-async-order-issue-79694.rs b/src/test/ui/async-await/incorrect-move-async-order-issue-79694.rs similarity index 100% rename from src/test/ui/parser/incorrect-move-async-order-issue-79694.rs rename to src/test/ui/async-await/incorrect-move-async-order-issue-79694.rs diff --git a/src/test/ui/parser/incorrect-move-async-order-issue-79694.stderr b/src/test/ui/async-await/incorrect-move-async-order-issue-79694.stderr similarity index 100% rename from src/test/ui/parser/incorrect-move-async-order-issue-79694.stderr rename to src/test/ui/async-await/incorrect-move-async-order-issue-79694.stderr diff --git a/src/test/ui/attr-eq-token-tree.rs b/src/test/ui/attributes/attr-eq-token-tree.rs similarity index 100% rename from src/test/ui/attr-eq-token-tree.rs rename to src/test/ui/attributes/attr-eq-token-tree.rs diff --git a/src/test/ui/attr-eq-token-tree.stderr b/src/test/ui/attributes/attr-eq-token-tree.stderr similarity index 100% rename from src/test/ui/attr-eq-token-tree.stderr rename to src/test/ui/attributes/attr-eq-token-tree.stderr diff --git a/src/test/ui/tool_attributes.rs b/src/test/ui/attributes/tool_attributes.rs similarity index 100% rename from src/test/ui/tool_attributes.rs rename to 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 deleted file mode 100644 index 8e686796fee9b..0000000000000 --- a/src/test/ui/augmented-assignments-feature-gate.rs +++ /dev/null @@ -1,15 +0,0 @@ -// run-pass - -use std::ops::AddAssign; - -struct Int(i32); - -impl AddAssign for Int { - fn add_assign(&mut self, _: i32) { - } -} - -fn main() { - let mut x = Int(0); - x += 1; -} diff --git a/src/test/ui/shift-various-bad-types.rs b/src/test/ui/binop/shift-various-bad-types.rs similarity index 100% rename from src/test/ui/shift-various-bad-types.rs rename to src/test/ui/binop/shift-various-bad-types.rs diff --git a/src/test/ui/shift-various-bad-types.stderr b/src/test/ui/binop/shift-various-bad-types.stderr similarity index 100% rename from src/test/ui/shift-various-bad-types.stderr rename to src/test/ui/binop/shift-various-bad-types.stderr diff --git a/src/test/ui/access-mode-in-closures.rs b/src/test/ui/borrowck/access-mode-in-closures.rs similarity index 100% rename from src/test/ui/access-mode-in-closures.rs rename to src/test/ui/borrowck/access-mode-in-closures.rs diff --git a/src/test/ui/access-mode-in-closures.stderr b/src/test/ui/borrowck/access-mode-in-closures.stderr similarity index 100% rename from src/test/ui/access-mode-in-closures.stderr rename to src/test/ui/borrowck/access-mode-in-closures.stderr diff --git a/src/test/ui/lazy-init.rs b/src/test/ui/borrowck/lazy-init.rs similarity index 100% rename from src/test/ui/lazy-init.rs rename to src/test/ui/borrowck/lazy-init.rs diff --git a/src/test/ui/new-box-syntax.rs b/src/test/ui/box/new-box-syntax.rs similarity index 100% rename from src/test/ui/new-box-syntax.rs rename to src/test/ui/box/new-box-syntax.rs diff --git a/src/test/ui/codegen-object-shim.rs b/src/test/ui/cast/codegen-object-shim.rs similarity index 100% rename from src/test/ui/codegen-object-shim.rs rename to src/test/ui/cast/codegen-object-shim.rs diff --git a/src/test/ui/crt-static-off-works.rs b/src/test/ui/cfg/crt-static-off-works.rs similarity index 100% rename from src/test/ui/crt-static-off-works.rs rename to src/test/ui/cfg/crt-static-off-works.rs diff --git a/src/test/ui/expanded-cfg.rs b/src/test/ui/cfg/expanded-cfg.rs similarity index 100% rename from src/test/ui/expanded-cfg.rs rename to src/test/ui/cfg/expanded-cfg.rs diff --git a/src/test/ui/closure-expected.rs b/src/test/ui/closures/closure-expected.rs similarity index 100% rename from src/test/ui/closure-expected.rs rename to src/test/ui/closures/closure-expected.rs diff --git a/src/test/ui/closure-expected.stderr b/src/test/ui/closures/closure-expected.stderr similarity index 100% rename from src/test/ui/closure-expected.stderr rename to src/test/ui/closures/closure-expected.stderr diff --git a/src/test/ui/closure_promotion.rs b/src/test/ui/closures/closure_promotion.rs similarity index 100% rename from src/test/ui/closure_promotion.rs rename to src/test/ui/closures/closure_promotion.rs diff --git a/src/test/ui/semistatement-in-lambda.rs b/src/test/ui/closures/semistatement-in-lambda.rs similarity index 100% rename from src/test/ui/semistatement-in-lambda.rs rename to src/test/ui/closures/semistatement-in-lambda.rs diff --git a/src/test/ui/thir-unsafeck-issue-85871.rs b/src/test/ui/closures/thir-unsafeck-issue-85871.rs similarity index 100% rename from src/test/ui/thir-unsafeck-issue-85871.rs rename to src/test/ui/closures/thir-unsafeck-issue-85871.rs diff --git a/src/test/ui/unsafe-coercion.rs b/src/test/ui/coercion/unsafe-coercion.rs similarity index 100% rename from src/test/ui/unsafe-coercion.rs rename to src/test/ui/coercion/unsafe-coercion.rs diff --git a/src/test/ui/eval-enum.rs b/src/test/ui/consts/eval-enum.rs similarity index 100% rename from src/test/ui/eval-enum.rs rename to src/test/ui/consts/eval-enum.rs diff --git a/src/test/ui/eval-enum.stderr b/src/test/ui/consts/eval-enum.stderr similarity index 100% rename from src/test/ui/eval-enum.stderr rename to src/test/ui/consts/eval-enum.stderr diff --git a/src/test/ui/auxiliary/inline_dtor.rs b/src/test/ui/drop/auxiliary/inline_dtor.rs similarity index 100% rename from src/test/ui/auxiliary/inline_dtor.rs rename to src/test/ui/drop/auxiliary/inline_dtor.rs diff --git a/src/test/ui/use_inline_dtor.rs b/src/test/ui/drop/use_inline_dtor.rs similarity index 100% rename from src/test/ui/use_inline_dtor.rs rename to src/test/ui/drop/use_inline_dtor.rs diff --git a/src/test/ui/edition-keywords-2015-2015.rs b/src/test/ui/editions/edition-keywords-2015-2015.rs similarity index 100% rename from src/test/ui/edition-keywords-2015-2015.rs rename to src/test/ui/editions/edition-keywords-2015-2015.rs diff --git a/src/test/ui/edition-keywords-2018-2015.rs b/src/test/ui/editions/edition-keywords-2018-2015.rs similarity index 100% rename from src/test/ui/edition-keywords-2018-2015.rs rename to src/test/ui/editions/edition-keywords-2018-2015.rs diff --git a/src/test/ui/estr-uniq.rs b/src/test/ui/estr-uniq.rs deleted file mode 100644 index 1d0a427395317..0000000000000 --- a/src/test/ui/estr-uniq.rs +++ /dev/null @@ -1,15 +0,0 @@ -// run-pass - -#![allow(unused_assignments)] -#![allow(unknown_lints)] - -#![allow(dead_assignment)] - -pub fn main() { - let x : String = "hello".to_string(); - let _y : String = "there".to_string(); - let mut z = "thing".to_string(); - z = x; - assert_eq!(z.as_bytes()[0], ('h' as u8)); - assert_eq!(z.as_bytes()[4], ('o' as u8)); -} diff --git a/src/test/ui/export-import.rs b/src/test/ui/export-import.rs deleted file mode 100644 index 3f543636064e4..0000000000000 --- a/src/test/ui/export-import.rs +++ /dev/null @@ -1,11 +0,0 @@ -use m::unexported; -//~^ ERROR: is private - -mod m { - pub fn exported() { } - - fn unexported() { } -} - - -fn main() { unexported(); } diff --git a/src/test/ui/export-import.stderr b/src/test/ui/export-import.stderr deleted file mode 100644 index 753424c7f88b8..0000000000000 --- a/src/test/ui/export-import.stderr +++ /dev/null @@ -1,15 +0,0 @@ -error[E0603]: function `unexported` is private - --> $DIR/export-import.rs:1:8 - | -LL | use m::unexported; - | ^^^^^^^^^^ private function - | -note: the function `unexported` is defined here - --> $DIR/export-import.rs:7:5 - | -LL | fn unexported() { } - | ^^^^^^^^^^^^^^^ - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0603`. diff --git a/src/test/ui/export-non-interference2.rs b/src/test/ui/export-non-interference2.rs deleted file mode 100644 index 6d18b03891a37..0000000000000 --- a/src/test/ui/export-non-interference2.rs +++ /dev/null @@ -1,11 +0,0 @@ -// run-pass - -mod foo { - pub mod bar { - pub fn y() { super::super::foo::x(); } - } - - pub fn x() { println!("x"); } -} - -pub fn main() { self::foo::bar::y(); } diff --git a/src/test/ui/export-non-interference3.rs b/src/test/ui/export-non-interference3.rs deleted file mode 100644 index 0d6b6369f9471..0000000000000 --- a/src/test/ui/export-non-interference3.rs +++ /dev/null @@ -1,11 +0,0 @@ -// run-pass - -pub mod foo { - pub fn x() { ::bar::x(); } -} - -pub mod bar { - pub fn x() { println!("x"); } -} - -pub fn main() { foo::x(); } diff --git a/src/test/ui/export2.rs b/src/test/ui/export2.rs deleted file mode 100644 index 64ebeddffa8cf..0000000000000 --- a/src/test/ui/export2.rs +++ /dev/null @@ -1,11 +0,0 @@ -mod foo { - pub fn x() { bar::x(); } //~ ERROR failed to resolve: use of undeclared crate or module `bar` -} - -mod bar { - fn x() { println!("x"); } - - pub fn y() { } -} - -fn main() { foo::x(); } diff --git a/src/test/ui/export2.stderr b/src/test/ui/export2.stderr deleted file mode 100644 index 7cf47d0764b1e..0000000000000 --- a/src/test/ui/export2.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error[E0433]: failed to resolve: use of undeclared crate or module `bar` - --> $DIR/export2.rs:2:18 - | -LL | pub fn x() { bar::x(); } - | ^^^ use of undeclared crate or module `bar` - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0433`. diff --git a/src/test/ui/expr-block-unique.rs b/src/test/ui/expr-block-unique.rs deleted file mode 100644 index 5fa11ad1283b9..0000000000000 --- a/src/test/ui/expr-block-unique.rs +++ /dev/null @@ -1,4 +0,0 @@ -// run-pass -#![allow(unused_braces)] - -pub fn main() { let x: Box<_> = { Box::new(100) }; assert_eq!(*x, 100); } diff --git a/src/test/ui/expr-if.rs b/src/test/ui/expr/if/expr-if.rs similarity index 100% rename from src/test/ui/expr-if.rs rename to src/test/ui/expr/if/expr-if.rs diff --git a/src/test/ui/auxiliary/reexport-should-still-link.rs b/src/test/ui/extern/auxiliary/reexport-should-still-link.rs similarity index 100% rename from src/test/ui/auxiliary/reexport-should-still-link.rs rename to src/test/ui/extern/auxiliary/reexport-should-still-link.rs diff --git a/src/test/ui/gated-bad-feature.rs b/src/test/ui/feature-gates/gated-bad-feature.rs similarity index 100% rename from src/test/ui/gated-bad-feature.rs rename to src/test/ui/feature-gates/gated-bad-feature.rs diff --git a/src/test/ui/gated-bad-feature.stderr b/src/test/ui/feature-gates/gated-bad-feature.stderr similarity index 100% rename from src/test/ui/gated-bad-feature.stderr rename to src/test/ui/feature-gates/gated-bad-feature.stderr diff --git a/src/test/ui/stable-features.rs b/src/test/ui/feature-gates/stable-features.rs similarity index 100% rename from src/test/ui/stable-features.rs rename to src/test/ui/feature-gates/stable-features.rs diff --git a/src/test/ui/stable-features.stderr b/src/test/ui/feature-gates/stable-features.stderr similarity index 100% rename from src/test/ui/stable-features.stderr rename to src/test/ui/feature-gates/stable-features.stderr diff --git a/src/test/ui/expr-fn.rs b/src/test/ui/fn/expr-fn.rs similarity index 100% rename from src/test/ui/expr-fn.rs rename to src/test/ui/fn/expr-fn.rs diff --git a/src/test/ui/nested-function-names-issue-8587.rs b/src/test/ui/fn/nested-function-names-issue-8587.rs similarity index 100% rename from src/test/ui/nested-function-names-issue-8587.rs rename to src/test/ui/fn/nested-function-names-issue-8587.rs diff --git a/src/test/ui/while-let.rs b/src/test/ui/for-loop-while/while-let-2.rs similarity index 100% rename from src/test/ui/while-let.rs rename to src/test/ui/for-loop-while/while-let-2.rs diff --git a/src/test/ui/while-let.stderr b/src/test/ui/for-loop-while/while-let-2.stderr similarity index 93% rename from src/test/ui/while-let.stderr rename to src/test/ui/for-loop-while/while-let-2.stderr index c5e2fd92f0441..cb1abd435710e 100644 --- a/src/test/ui/while-let.stderr +++ b/src/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 b/src/test/ui/generics/autobind.rs similarity index 100% rename from src/test/ui/autobind.rs rename to src/test/ui/generics/autobind.rs diff --git a/src/test/ui/lifetime-before-type-params.rs b/src/test/ui/generics/lifetime-before-type-params.rs similarity index 100% rename from src/test/ui/lifetime-before-type-params.rs rename to src/test/ui/generics/lifetime-before-type-params.rs diff --git a/src/test/ui/lifetime-before-type-params.stderr b/src/test/ui/generics/lifetime-before-type-params.stderr similarity index 100% rename from src/test/ui/lifetime-before-type-params.stderr rename to src/test/ui/generics/lifetime-before-type-params.stderr diff --git a/src/test/ui/type-params-in-for-each.rs b/src/test/ui/generics/type-params-in-for-each.rs similarity index 100% rename from src/test/ui/type-params-in-for-each.rs rename to src/test/ui/generics/type-params-in-for-each.rs diff --git a/src/test/ui/export-multi.rs b/src/test/ui/imports/export-multi.rs similarity index 100% rename from src/test/ui/export-multi.rs rename to src/test/ui/imports/export-multi.rs diff --git a/src/test/ui/glob-cycles.rs b/src/test/ui/imports/glob-cycles.rs similarity index 100% rename from src/test/ui/glob-cycles.rs rename to src/test/ui/imports/glob-cycles.rs diff --git a/src/test/ui/no-std-inject.rs b/src/test/ui/imports/no-std-inject.rs similarity index 100% rename from src/test/ui/no-std-inject.rs rename to src/test/ui/imports/no-std-inject.rs diff --git a/src/test/ui/no-std-inject.stderr b/src/test/ui/imports/no-std-inject.stderr similarity index 100% rename from src/test/ui/no-std-inject.stderr rename to src/test/ui/imports/no-std-inject.stderr diff --git a/src/test/ui/use-mod.rs b/src/test/ui/imports/use-mod.rs similarity index 100% rename from src/test/ui/use-mod.rs rename to src/test/ui/imports/use-mod.rs diff --git a/src/test/ui/question-mark-type-infer.rs b/src/test/ui/inference/question-mark-type-infer.rs similarity index 100% rename from src/test/ui/question-mark-type-infer.rs rename to src/test/ui/inference/question-mark-type-infer.rs diff --git a/src/test/ui/question-mark-type-infer.stderr b/src/test/ui/inference/question-mark-type-infer.stderr similarity index 100% rename from src/test/ui/question-mark-type-infer.stderr rename to src/test/ui/inference/question-mark-type-infer.stderr diff --git a/src/test/ui/simple-infer.rs b/src/test/ui/inference/simple-infer.rs similarity index 100% rename from src/test/ui/simple-infer.rs rename to 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 deleted file mode 100644 index 1b38527ec2907..0000000000000 --- a/src/test/ui/keyword-changes-2012-07-31.rs +++ /dev/null @@ -1,20 +0,0 @@ -// run-pass - -#![allow(dead_code)] -// return -> return -// mod -> module -// match -> match - -// pretty-expanded FIXME #23616 - -pub fn main() { -} - -mod foo { -} - -fn bar() -> isize { - match 0 { - _ => { 0 } - } -} diff --git a/src/test/ui/no_owned_box_lang_item.rs b/src/test/ui/lang-items/no_owned_box_lang_item.rs similarity index 100% rename from src/test/ui/no_owned_box_lang_item.rs rename to src/test/ui/lang-items/no_owned_box_lang_item.rs diff --git a/src/test/ui/no_owned_box_lang_item.stderr b/src/test/ui/lang-items/no_owned_box_lang_item.stderr similarity index 100% rename from src/test/ui/no_owned_box_lang_item.stderr rename to src/test/ui/lang-items/no_owned_box_lang_item.stderr diff --git a/src/test/ui/auxiliary/linkage1.rs b/src/test/ui/linkage-attr/auxiliary/linkage1.rs similarity index 100% rename from src/test/ui/auxiliary/linkage1.rs rename to src/test/ui/linkage-attr/auxiliary/linkage1.rs diff --git a/src/test/ui/linkage1.rs b/src/test/ui/linkage-attr/linkage1.rs similarity index 100% rename from src/test/ui/linkage1.rs rename to src/test/ui/linkage-attr/linkage1.rs diff --git a/src/test/ui/test-allow-dead-extern-static-no-warning.rs b/src/test/ui/lint/test-allow-dead-extern-static-no-warning.rs similarity index 100% rename from src/test/ui/test-allow-dead-extern-static-no-warning.rs rename to src/test/ui/lint/test-allow-dead-extern-static-no-warning.rs diff --git a/src/test/ui/warn-path-statement.rs b/src/test/ui/lint/warn-path-statement.rs similarity index 100% rename from src/test/ui/warn-path-statement.rs rename to src/test/ui/lint/warn-path-statement.rs diff --git a/src/test/ui/warn-path-statement.stderr b/src/test/ui/lint/warn-path-statement.stderr similarity index 100% rename from src/test/ui/warn-path-statement.stderr rename to src/test/ui/lint/warn-path-statement.stderr diff --git a/src/test/ui/auxiliary/debuginfo-lto-aux.rs b/src/test/ui/lto/auxiliary/debuginfo-lto-aux.rs similarity index 100% rename from src/test/ui/auxiliary/debuginfo-lto-aux.rs rename to src/test/ui/lto/auxiliary/debuginfo-lto-aux.rs diff --git a/src/test/ui/debuginfo-lto.rs b/src/test/ui/lto/debuginfo-lto.rs similarity index 100% rename from src/test/ui/debuginfo-lto.rs rename to src/test/ui/lto/debuginfo-lto.rs diff --git a/src/test/ui/fat-lto.rs b/src/test/ui/lto/fat-lto.rs similarity index 100% rename from src/test/ui/fat-lto.rs rename to src/test/ui/lto/fat-lto.rs diff --git a/src/test/ui/auxiliary/proc_macro_def.rs b/src/test/ui/macros/auxiliary/proc_macro_def.rs similarity index 100% rename from src/test/ui/auxiliary/proc_macro_def.rs rename to src/test/ui/macros/auxiliary/proc_macro_def.rs diff --git a/src/test/ui/concat.rs b/src/test/ui/macros/concat.rs similarity index 100% rename from src/test/ui/concat.rs rename to src/test/ui/macros/concat.rs diff --git a/src/test/ui/concat.stderr b/src/test/ui/macros/concat.stderr similarity index 100% rename from src/test/ui/concat.stderr rename to src/test/ui/macros/concat.stderr diff --git a/src/test/ui/include-single-expr-helper-1.rs b/src/test/ui/macros/include-single-expr-helper-1.rs similarity index 100% rename from src/test/ui/include-single-expr-helper-1.rs rename to src/test/ui/macros/include-single-expr-helper-1.rs diff --git a/src/test/ui/include-single-expr-helper.rs b/src/test/ui/macros/include-single-expr-helper.rs similarity index 100% rename from src/test/ui/include-single-expr-helper.rs rename to src/test/ui/macros/include-single-expr-helper.rs diff --git a/src/test/ui/include-single-expr.rs b/src/test/ui/macros/include-single-expr.rs similarity index 100% rename from src/test/ui/include-single-expr.rs rename to src/test/ui/macros/include-single-expr.rs diff --git a/src/test/ui/include-single-expr.stderr b/src/test/ui/macros/include-single-expr.stderr similarity index 100% rename from src/test/ui/include-single-expr.stderr rename to src/test/ui/macros/include-single-expr.stderr diff --git a/src/test/ui/malformed_macro_lhs.rs b/src/test/ui/macros/malformed_macro_lhs.rs similarity index 100% rename from src/test/ui/malformed_macro_lhs.rs rename to src/test/ui/macros/malformed_macro_lhs.rs diff --git a/src/test/ui/malformed_macro_lhs.stderr b/src/test/ui/macros/malformed_macro_lhs.stderr similarity index 100% rename from src/test/ui/malformed_macro_lhs.stderr rename to src/test/ui/macros/malformed_macro_lhs.stderr diff --git a/src/test/ui/no-std-macros.rs b/src/test/ui/macros/no-std-macros.rs similarity index 100% rename from src/test/ui/no-std-macros.rs rename to src/test/ui/macros/no-std-macros.rs diff --git a/src/test/ui/proc_macro.rs b/src/test/ui/macros/proc_macro.rs similarity index 100% rename from src/test/ui/proc_macro.rs rename to src/test/ui/macros/proc_macro.rs diff --git a/src/test/ui/lub-match.nll.stderr b/src/test/ui/nll/lub-match.nll.stderr similarity index 100% rename from src/test/ui/lub-match.nll.stderr rename to src/test/ui/nll/lub-match.nll.stderr diff --git a/src/test/ui/lub-match.rs b/src/test/ui/nll/lub-match.rs similarity index 100% rename from src/test/ui/lub-match.rs rename to src/test/ui/nll/lub-match.rs diff --git a/src/test/ui/lub-match.stderr b/src/test/ui/nll/lub-match.stderr similarity index 100% rename from src/test/ui/lub-match.stderr rename to src/test/ui/nll/lub-match.stderr diff --git a/src/test/ui/ref-suggestion.rs b/src/test/ui/nll/ref-suggestion.rs similarity index 100% rename from src/test/ui/ref-suggestion.rs rename to src/test/ui/nll/ref-suggestion.rs diff --git a/src/test/ui/ref-suggestion.stderr b/src/test/ui/nll/ref-suggestion.stderr similarity index 100% rename from src/test/ui/ref-suggestion.stderr rename to src/test/ui/nll/ref-suggestion.stderr diff --git a/src/test/ui/integer-literal-suffix-inference.rs b/src/test/ui/numeric/integer-literal-suffix-inference.rs similarity index 100% rename from src/test/ui/integer-literal-suffix-inference.rs rename to src/test/ui/numeric/integer-literal-suffix-inference.rs diff --git a/src/test/ui/integer-literal-suffix-inference.stderr b/src/test/ui/numeric/integer-literal-suffix-inference.stderr similarity index 100% rename from src/test/ui/integer-literal-suffix-inference.stderr rename to src/test/ui/numeric/integer-literal-suffix-inference.stderr diff --git a/src/test/ui/object-lifetime-default-default-to-static.rs b/src/test/ui/object-lifetime/object-lifetime-default-default-to-static.rs similarity index 100% rename from src/test/ui/object-lifetime-default-default-to-static.rs rename to src/test/ui/object-lifetime/object-lifetime-default-default-to-static.rs diff --git a/src/test/ui/structs-enums/object-lifetime-default-from-ref-struct.rs b/src/test/ui/object-lifetime/object-lifetime-default-from-ref-struct.rs similarity index 100% rename from src/test/ui/structs-enums/object-lifetime-default-from-ref-struct.rs rename to src/test/ui/object-lifetime/object-lifetime-default-from-ref-struct.rs diff --git a/src/test/ui/object-lifetime-default-from-rptr-box.rs b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box.rs similarity index 100% rename from src/test/ui/object-lifetime-default-from-rptr-box.rs rename to src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box.rs diff --git a/src/test/ui/object-lifetime-default-from-rptr-mut.rs b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-mut.rs similarity index 100% rename from src/test/ui/object-lifetime-default-from-rptr-mut.rs rename to src/test/ui/object-lifetime/object-lifetime-default-from-rptr-mut.rs diff --git a/src/test/ui/structs-enums/object-lifetime-default-from-rptr-struct.rs b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct.rs similarity index 100% rename from src/test/ui/structs-enums/object-lifetime-default-from-rptr-struct.rs rename to src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct.rs diff --git a/src/test/ui/object-lifetime-default-from-rptr.rs b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr.rs similarity index 100% rename from src/test/ui/object-lifetime-default-from-rptr.rs rename to src/test/ui/object-lifetime/object-lifetime-default-from-rptr.rs diff --git a/src/test/ui/object-lifetime-default-inferred.rs b/src/test/ui/object-lifetime/object-lifetime-default-inferred.rs similarity index 100% rename from src/test/ui/object-lifetime-default-inferred.rs rename to src/test/ui/object-lifetime/object-lifetime-default-inferred.rs diff --git a/src/test/ui/fixup-deref-mut.rs b/src/test/ui/overloaded/fixup-deref-mut.rs similarity index 100% rename from src/test/ui/fixup-deref-mut.rs rename to src/test/ui/overloaded/fixup-deref-mut.rs diff --git a/src/test/ui/paren-free.rs b/src/test/ui/paren-free.rs deleted file mode 100644 index 8e8bb8800ec0d..0000000000000 --- a/src/test/ui/paren-free.rs +++ /dev/null @@ -1,7 +0,0 @@ -// run-pass - -pub fn main() { - let x = true; - if x { let mut i = 10; while i > 0 { i -= 1; } } - match x { true => { println!("right"); } false => { println!("wrong"); } } -} diff --git a/src/test/ui/issue-83639.rs b/src/test/ui/parser/issue-83639.rs similarity index 100% rename from src/test/ui/issue-83639.rs rename to src/test/ui/parser/issue-83639.rs diff --git a/src/test/ui/issue-83639.stderr b/src/test/ui/parser/issue-83639.stderr similarity index 100% rename from src/test/ui/issue-83639.stderr rename to src/test/ui/parser/issue-83639.stderr diff --git a/src/test/ui/obsolete-syntax-impl-for-dotdot.rs b/src/test/ui/parser/obsolete-syntax-impl-for-dotdot.rs similarity index 100% rename from src/test/ui/obsolete-syntax-impl-for-dotdot.rs rename to src/test/ui/parser/obsolete-syntax-impl-for-dotdot.rs diff --git a/src/test/ui/obsolete-syntax-impl-for-dotdot.stderr b/src/test/ui/parser/obsolete-syntax-impl-for-dotdot.stderr similarity index 100% rename from src/test/ui/obsolete-syntax-impl-for-dotdot.stderr rename to src/test/ui/parser/obsolete-syntax-impl-for-dotdot.stderr diff --git a/src/test/ui/ranges-precedence.rs b/src/test/ui/parser/ranges-precedence.rs similarity index 100% rename from src/test/ui/ranges-precedence.rs rename to src/test/ui/parser/ranges-precedence.rs diff --git a/src/test/ui/similar-tokens.rs b/src/test/ui/parser/similar-tokens.rs similarity index 100% rename from src/test/ui/similar-tokens.rs rename to src/test/ui/parser/similar-tokens.rs diff --git a/src/test/ui/similar-tokens.stderr b/src/test/ui/parser/similar-tokens.stderr similarity index 100% rename from src/test/ui/similar-tokens.stderr rename to src/test/ui/parser/similar-tokens.stderr diff --git a/src/test/ui/utf8_idents-rpass.rs b/src/test/ui/parser/utf8_idents-rpass.rs similarity index 100% rename from src/test/ui/utf8_idents-rpass.rs rename to src/test/ui/parser/utf8_idents-rpass.rs diff --git a/src/test/ui/useless-pub.rs b/src/test/ui/privacy/useless-pub.rs similarity index 100% rename from src/test/ui/useless-pub.rs rename to src/test/ui/privacy/useless-pub.rs diff --git a/src/test/ui/useless-pub.stderr b/src/test/ui/privacy/useless-pub.stderr similarity index 100% rename from src/test/ui/useless-pub.stderr rename to src/test/ui/privacy/useless-pub.stderr diff --git a/src/test/ui/auxiliary/cond_plugin.rs b/src/test/ui/proc-macro/auxiliary/cond_plugin.rs similarity index 100% rename from src/test/ui/auxiliary/cond_plugin.rs rename to src/test/ui/proc-macro/auxiliary/cond_plugin.rs diff --git a/src/test/ui/macro-quote-cond.rs b/src/test/ui/proc-macro/macro-quote-cond.rs similarity index 100% rename from src/test/ui/macro-quote-cond.rs rename to src/test/ui/proc-macro/macro-quote-cond.rs diff --git a/src/test/ui/fds-are-cloexec.rs b/src/test/ui/process/fds-are-cloexec.rs similarity index 100% rename from src/test/ui/fds-are-cloexec.rs rename to src/test/ui/process/fds-are-cloexec.rs diff --git a/src/test/ui/sigpipe-should-be-ignored.rs b/src/test/ui/process/sigpipe-should-be-ignored.rs similarity index 100% rename from src/test/ui/sigpipe-should-be-ignored.rs rename to src/test/ui/process/sigpipe-should-be-ignored.rs diff --git a/src/test/ui/purity-infer.rs b/src/test/ui/purity-infer.rs deleted file mode 100644 index dc0eb89bfa207..0000000000000 --- a/src/test/ui/purity-infer.rs +++ /dev/null @@ -1,6 +0,0 @@ -// run-pass - -fn something(f: F) where F: FnOnce() { f(); } -pub fn main() { - something(|| println!("hi!") ); -} diff --git a/src/test/ui/readalias.rs b/src/test/ui/readalias.rs deleted file mode 100644 index a6bf61803cf85..0000000000000 --- a/src/test/ui/readalias.rs +++ /dev/null @@ -1,12 +0,0 @@ -// run-pass - -#![allow(dead_code)] - - - - -struct Point {x: isize, y: isize, z: isize} - -fn f(p: Point) { assert_eq!(p.z, 12); } - -pub fn main() { let x: Point = Point {x: 10, y: 11, z: 12}; f(x); } diff --git a/src/test/ui/instantiable.rs b/src/test/ui/recursion/instantiable.rs similarity index 100% rename from src/test/ui/instantiable.rs rename to 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 deleted file mode 100644 index 913da56a184f5..0000000000000 --- a/src/test/ui/reexport-should-still-link.rs +++ /dev/null @@ -1,10 +0,0 @@ -// run-pass -// aux-build:reexport-should-still-link.rs - -// pretty-expanded FIXME #23616 - -extern crate reexport_should_still_link as foo; - -pub fn main() { - foo::bar(); -} diff --git a/src/test/ui/init-res-into-things.rs b/src/test/ui/regions/init-res-into-things.rs similarity index 100% rename from src/test/ui/init-res-into-things.rs rename to src/test/ui/regions/init-res-into-things.rs diff --git a/src/test/ui/owned-implies-static.rs b/src/test/ui/regions/owned-implies-static.rs similarity index 100% rename from src/test/ui/owned-implies-static.rs rename to src/test/ui/regions/owned-implies-static.rs diff --git a/src/test/ui/rcvr-borrowed-to-region.rs b/src/test/ui/regions/rcvr-borrowed-to-region.rs similarity index 100% rename from src/test/ui/rcvr-borrowed-to-region.rs rename to src/test/ui/regions/rcvr-borrowed-to-region.rs diff --git a/src/test/ui/attr-usage-repr.rs b/src/test/ui/repr/attr-usage-repr.rs similarity index 100% rename from src/test/ui/attr-usage-repr.rs rename to src/test/ui/repr/attr-usage-repr.rs diff --git a/src/test/ui/attr-usage-repr.stderr b/src/test/ui/repr/attr-usage-repr.stderr similarity index 100% rename from src/test/ui/attr-usage-repr.stderr rename to src/test/ui/repr/attr-usage-repr.stderr diff --git a/src/test/ui/repr.rs b/src/test/ui/repr/repr.rs similarity index 100% rename from src/test/ui/repr.rs rename to src/test/ui/repr/repr.rs diff --git a/src/test/ui/repr.stderr b/src/test/ui/repr/repr.stderr similarity index 100% rename from src/test/ui/repr.stderr rename to src/test/ui/repr/repr.stderr diff --git a/src/test/ui/crate-in-paths.rs b/src/test/ui/resolve/crate-in-paths.rs similarity index 100% rename from src/test/ui/crate-in-paths.rs rename to src/test/ui/resolve/crate-in-paths.rs diff --git a/src/test/ui/crate-in-paths.stderr b/src/test/ui/resolve/crate-in-paths.stderr similarity index 100% rename from src/test/ui/crate-in-paths.stderr rename to src/test/ui/resolve/crate-in-paths.stderr diff --git a/src/test/ui/editions-crate-root-2018.rs b/src/test/ui/resolve/editions-crate-root-2018.rs similarity index 100% rename from src/test/ui/editions-crate-root-2018.rs rename to src/test/ui/resolve/editions-crate-root-2018.rs diff --git a/src/test/ui/editions-crate-root-2018.stderr b/src/test/ui/resolve/editions-crate-root-2018.stderr similarity index 100% rename from src/test/ui/editions-crate-root-2018.stderr rename to src/test/ui/resolve/editions-crate-root-2018.stderr diff --git a/src/test/ui/enums-pats-not-idents.rs b/src/test/ui/resolve/enums-pats-not-idents.rs similarity index 100% rename from src/test/ui/enums-pats-not-idents.rs rename to src/test/ui/resolve/enums-pats-not-idents.rs diff --git a/src/test/ui/enums-pats-not-idents.stderr b/src/test/ui/resolve/enums-pats-not-idents.stderr similarity index 100% rename from src/test/ui/enums-pats-not-idents.stderr rename to src/test/ui/resolve/enums-pats-not-idents.stderr diff --git a/src/test/ui/no-implicit-prelude-nested.rs b/src/test/ui/resolve/no-implicit-prelude-nested.rs similarity index 100% rename from src/test/ui/no-implicit-prelude-nested.rs rename to src/test/ui/resolve/no-implicit-prelude-nested.rs diff --git a/src/test/ui/no-implicit-prelude-nested.stderr b/src/test/ui/resolve/no-implicit-prelude-nested.stderr similarity index 100% rename from src/test/ui/no-implicit-prelude-nested.stderr rename to src/test/ui/resolve/no-implicit-prelude-nested.stderr diff --git a/src/test/ui/resolve-issue-2428.rs b/src/test/ui/resolve/resolve-issue-2428.rs similarity index 100% rename from src/test/ui/resolve-issue-2428.rs rename to src/test/ui/resolve/resolve-issue-2428.rs diff --git a/src/test/ui/ret-none.rs b/src/test/ui/ret-none.rs deleted file mode 100644 index d595506e336f6..0000000000000 --- a/src/test/ui/ret-none.rs +++ /dev/null @@ -1,13 +0,0 @@ -// run-pass - -#![allow(non_camel_case_types)] -#![allow(dead_code)] - - -// pretty-expanded FIXME #23616 - -enum option { none, some(T), } - -fn f() -> option { return option::none; } - -pub fn main() { f::(); } diff --git a/src/test/ui/out-of-stack.rs b/src/test/ui/runtime/out-of-stack.rs similarity index 100% rename from src/test/ui/out-of-stack.rs rename to src/test/ui/runtime/out-of-stack.rs diff --git a/src/test/ui/rt-explody-panic-payloads.rs b/src/test/ui/runtime/rt-explody-panic-payloads.rs similarity index 100% rename from src/test/ui/rt-explody-panic-payloads.rs rename to src/test/ui/runtime/rt-explody-panic-payloads.rs diff --git a/src/test/ui/running-with-no-runtime.rs b/src/test/ui/runtime/running-with-no-runtime.rs similarity index 100% rename from src/test/ui/running-with-no-runtime.rs rename to src/test/ui/runtime/running-with-no-runtime.rs diff --git a/src/test/ui/signal-alternate-stack-cleanup.rs b/src/test/ui/runtime/signal-alternate-stack-cleanup.rs similarity index 100% rename from src/test/ui/signal-alternate-stack-cleanup.rs rename to src/test/ui/runtime/signal-alternate-stack-cleanup.rs diff --git a/src/test/ui/stdout-during-shutdown.rs b/src/test/ui/runtime/stdout-during-shutdown.rs similarity index 100% rename from src/test/ui/stdout-during-shutdown.rs rename to src/test/ui/runtime/stdout-during-shutdown.rs diff --git a/src/test/ui/stdout-during-shutdown.run.stdout b/src/test/ui/runtime/stdout-during-shutdown.run.stdout similarity index 100% rename from src/test/ui/stdout-during-shutdown.run.stdout rename to src/test/ui/runtime/stdout-during-shutdown.run.stdout diff --git a/src/test/ui/duplicate_doc_alias.rs b/src/test/ui/rustdoc/duplicate_doc_alias.rs similarity index 100% rename from src/test/ui/duplicate_doc_alias.rs rename to src/test/ui/rustdoc/duplicate_doc_alias.rs diff --git a/src/test/ui/duplicate_doc_alias.stderr b/src/test/ui/rustdoc/duplicate_doc_alias.stderr similarity index 100% rename from src/test/ui/duplicate_doc_alias.stderr rename to src/test/ui/rustdoc/duplicate_doc_alias.stderr diff --git a/src/test/ui/hidden-doc-associated-item.rs b/src/test/ui/rustdoc/hidden-doc-associated-item.rs similarity index 100% rename from src/test/ui/hidden-doc-associated-item.rs rename to src/test/ui/rustdoc/hidden-doc-associated-item.rs diff --git a/src/test/ui/class-missing-self.rs b/src/test/ui/self/class-missing-self.rs similarity index 100% rename from src/test/ui/class-missing-self.rs rename to src/test/ui/self/class-missing-self.rs diff --git a/src/test/ui/class-missing-self.stderr b/src/test/ui/self/class-missing-self.stderr similarity index 100% rename from src/test/ui/class-missing-self.stderr rename to src/test/ui/self/class-missing-self.stderr diff --git a/src/test/ui/objects-owned-object-owned-method.rs b/src/test/ui/self/objects-owned-object-owned-method.rs similarity index 100% rename from src/test/ui/objects-owned-object-owned-method.rs rename to src/test/ui/self/objects-owned-object-owned-method.rs diff --git a/src/test/ui/refer-to-other-statics-by-value.rs b/src/test/ui/static/refer-to-other-statics-by-value.rs similarity index 100% rename from src/test/ui/refer-to-other-statics-by-value.rs rename to src/test/ui/static/refer-to-other-statics-by-value.rs diff --git a/src/test/ui/static_sized_requirement.rs b/src/test/ui/static/static_sized_requirement.rs similarity index 100% rename from src/test/ui/static_sized_requirement.rs rename to src/test/ui/static/static_sized_requirement.rs diff --git a/src/test/ui/builtin-clone.rs b/src/test/ui/stdlib-unit-tests/builtin-clone.rs similarity index 100% rename from src/test/ui/builtin-clone.rs rename to src/test/ui/stdlib-unit-tests/builtin-clone.rs diff --git a/src/test/ui/eq-multidispatch.rs b/src/test/ui/stdlib-unit-tests/eq-multidispatch.rs similarity index 100% rename from src/test/ui/eq-multidispatch.rs rename to src/test/ui/stdlib-unit-tests/eq-multidispatch.rs diff --git a/src/test/ui/istr.rs b/src/test/ui/stdlib-unit-tests/istr.rs similarity index 100% rename from src/test/ui/istr.rs rename to src/test/ui/stdlib-unit-tests/istr.rs diff --git a/src/test/ui/log-knows-the-names-of-variants-in-std.rs b/src/test/ui/stdlib-unit-tests/log-knows-the-names-of-variants-in-std.rs similarity index 100% rename from src/test/ui/log-knows-the-names-of-variants-in-std.rs rename to src/test/ui/stdlib-unit-tests/log-knows-the-names-of-variants-in-std.rs diff --git a/src/test/ui/seq-compare.rs b/src/test/ui/stdlib-unit-tests/seq-compare.rs similarity index 100% rename from src/test/ui/seq-compare.rs rename to src/test/ui/stdlib-unit-tests/seq-compare.rs diff --git a/src/test/ui/large-records.rs b/src/test/ui/structs/large-records.rs similarity index 100% rename from src/test/ui/large-records.rs rename to src/test/ui/structs/large-records.rs diff --git a/src/test/ui/bound-suggestions.fixed b/src/test/ui/suggestions/bound-suggestions.fixed similarity index 100% rename from src/test/ui/bound-suggestions.fixed rename to src/test/ui/suggestions/bound-suggestions.fixed diff --git a/src/test/ui/bound-suggestions.rs b/src/test/ui/suggestions/bound-suggestions.rs similarity index 100% rename from src/test/ui/bound-suggestions.rs rename to src/test/ui/suggestions/bound-suggestions.rs diff --git a/src/test/ui/bound-suggestions.stderr b/src/test/ui/suggestions/bound-suggestions.stderr similarity index 100% rename from src/test/ui/bound-suggestions.stderr rename to src/test/ui/suggestions/bound-suggestions.stderr diff --git a/src/test/ui/child-outlives-parent.rs b/src/test/ui/threads-sendsync/child-outlives-parent.rs similarity index 100% rename from src/test/ui/child-outlives-parent.rs rename to src/test/ui/threads-sendsync/child-outlives-parent.rs diff --git a/src/test/ui/mpsc_stress.rs b/src/test/ui/threads-sendsync/mpsc_stress.rs similarity index 100% rename from src/test/ui/mpsc_stress.rs rename to src/test/ui/threads-sendsync/mpsc_stress.rs diff --git a/src/test/ui/unwind-resource.rs b/src/test/ui/threads-sendsync/unwind-resource.rs similarity index 100% rename from src/test/ui/unwind-resource.rs rename to src/test/ui/threads-sendsync/unwind-resource.rs diff --git a/src/test/ui/yield.rs b/src/test/ui/threads-sendsync/yield.rs similarity index 100% rename from src/test/ui/yield.rs rename to src/test/ui/threads-sendsync/yield.rs diff --git a/src/test/ui/yield1.rs b/src/test/ui/threads-sendsync/yield1.rs similarity index 100% rename from src/test/ui/yield1.rs rename to src/test/ui/threads-sendsync/yield1.rs diff --git a/src/test/ui/bug-7295.rs b/src/test/ui/traits/bug-7295.rs similarity index 100% rename from src/test/ui/bug-7295.rs rename to src/test/ui/traits/bug-7295.rs diff --git a/src/test/ui/monad.rs b/src/test/ui/traits/monad.rs similarity index 100% rename from src/test/ui/monad.rs rename to src/test/ui/traits/monad.rs diff --git a/src/test/ui/monomorphized-callees-with-ty-params-3314.rs b/src/test/ui/traits/monomorphized-callees-with-ty-params-3314.rs similarity index 100% rename from src/test/ui/monomorphized-callees-with-ty-params-3314.rs rename to src/test/ui/traits/monomorphized-callees-with-ty-params-3314.rs diff --git a/src/test/ui/multidispatch-conditional-impl-not-considered.rs b/src/test/ui/traits/multidispatch-conditional-impl-not-considered.rs similarity index 100% rename from src/test/ui/multidispatch-conditional-impl-not-considered.rs rename to src/test/ui/traits/multidispatch-conditional-impl-not-considered.rs diff --git a/src/test/ui/multidispatch1.rs b/src/test/ui/traits/multidispatch1.rs similarity index 100% rename from src/test/ui/multidispatch1.rs rename to src/test/ui/traits/multidispatch1.rs diff --git a/src/test/ui/multidispatch2.rs b/src/test/ui/traits/multidispatch2.rs similarity index 100% rename from src/test/ui/multidispatch2.rs rename to src/test/ui/traits/multidispatch2.rs diff --git a/src/test/ui/objects-owned-object-borrowed-method-headerless.rs b/src/test/ui/traits/objects-owned-object-borrowed-method-headerless.rs similarity index 100% rename from src/test/ui/objects-owned-object-borrowed-method-headerless.rs rename to src/test/ui/traits/objects-owned-object-borrowed-method-headerless.rs diff --git a/src/test/ui/staticness-mismatch.rs b/src/test/ui/traits/staticness-mismatch.rs similarity index 100% rename from src/test/ui/staticness-mismatch.rs rename to src/test/ui/traits/staticness-mismatch.rs diff --git a/src/test/ui/staticness-mismatch.stderr b/src/test/ui/traits/staticness-mismatch.stderr similarity index 100% rename from src/test/ui/staticness-mismatch.stderr rename to src/test/ui/traits/staticness-mismatch.stderr diff --git a/src/test/ui/typeclasses-eq-example-static.rs b/src/test/ui/traits/typeclasses-eq-example-static.rs similarity index 100% rename from src/test/ui/typeclasses-eq-example-static.rs rename to src/test/ui/traits/typeclasses-eq-example-static.rs diff --git a/src/test/ui/typeclasses-eq-example.rs b/src/test/ui/traits/typeclasses-eq-example.rs similarity index 100% rename from src/test/ui/typeclasses-eq-example.rs rename to src/test/ui/traits/typeclasses-eq-example.rs diff --git a/src/test/ui/vtable-res-trait-param.rs b/src/test/ui/traits/vtable-res-trait-param.rs similarity index 100% rename from src/test/ui/vtable-res-trait-param.rs rename to src/test/ui/traits/vtable-res-trait-param.rs diff --git a/src/test/ui/vtable-res-trait-param.stderr b/src/test/ui/traits/vtable-res-trait-param.stderr similarity index 100% rename from src/test/ui/vtable-res-trait-param.stderr rename to src/test/ui/traits/vtable-res-trait-param.stderr diff --git a/src/test/ui/tuple-index-fat-types.rs b/src/test/ui/tuple/tuple-index-fat-types.rs similarity index 100% rename from src/test/ui/tuple-index-fat-types.rs rename to 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 deleted file mode 100644 index 8a92f065f1bb8..0000000000000 --- a/src/test/ui/type-in-nested-module.rs +++ /dev/null @@ -1,17 +0,0 @@ -// run-pass - -#![allow(non_camel_case_types)] -#![allow(dead_code)] - - -// pretty-expanded FIXME #23616 - -mod a { - pub mod b { - pub type t = isize; - - pub fn foo() { let _x: t = 10; } - } -} - -pub fn main() { } diff --git a/src/test/ui/prim-with-args.rs b/src/test/ui/typeck/prim-with-args.rs similarity index 100% rename from src/test/ui/prim-with-args.rs rename to src/test/ui/typeck/prim-with-args.rs diff --git a/src/test/ui/prim-with-args.stderr b/src/test/ui/typeck/prim-with-args.stderr similarity index 100% rename from src/test/ui/prim-with-args.stderr rename to src/test/ui/typeck/prim-with-args.stderr diff --git a/src/test/ui/maybe-bounds-where-cpass.rs b/src/test/ui/unsized/maybe-bounds-where-cpass.rs similarity index 69% rename from src/test/ui/maybe-bounds-where-cpass.rs rename to src/test/ui/unsized/maybe-bounds-where-cpass.rs index d4bc05f7cb421..0e018cdabb23f 100644 --- a/src/test/ui/maybe-bounds-where-cpass.rs +++ b/src/test/ui/unsized/maybe-bounds-where-cpass.rs @@ -1,4 +1,4 @@ -// build-pass (FIXME(62277): could be check-pass?) +// check-pass struct S(*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 deleted file mode 100644 index 0920d96858539..0000000000000 --- a/src/test/ui/use-crate-name-alias.rs +++ /dev/null @@ -1,7 +0,0 @@ -// run-pass -// Issue #1706 -// pretty-expanded FIXME #23616 - -extern crate std as stdlib; - -pub fn main() {} diff --git a/src/test/ui/writealias.rs b/src/test/ui/writealias.rs deleted file mode 100644 index 8ba4b09ae2985..0000000000000 --- a/src/test/ui/writealias.rs +++ /dev/null @@ -1,19 +0,0 @@ -// run-pass - -#![allow(dead_code)] - -use std::sync::Mutex; - -struct Point {x: isize, y: isize, z: isize} - -fn f(p: &mut Point) { p.z = 13; } - -pub fn main() { - let x = Some(Mutex::new(true)); - match x { - Some(ref z) if *z.lock().unwrap() => { - assert!(*z.lock().unwrap()); - }, - _ => panic!() - } -} diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs index 88ede45655c94..cc058d538f388 100644 --- 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 };