From d3e480f0cbabe32b927ae32dad3c1617666f65a3 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Thu, 18 Feb 2016 05:21:15 -0500 Subject: [PATCH] Move the borrowck run-pass/compile-fail tests into their own directories as a test. --- src/test/compile-fail/{ => borrowck}/borrowck-and-init.rs | 0 .../compile-fail/{ => borrowck}/borrowck-anon-fields-struct.rs | 0 .../compile-fail/{ => borrowck}/borrowck-anon-fields-tuple.rs | 0 .../compile-fail/{ => borrowck}/borrowck-anon-fields-variant.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-argument.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-assign-comp-idx.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-assign-comp.rs | 0 .../{ => borrowck}/borrowck-assign-to-andmut-in-aliasable-loc.rs | 0 .../{ => borrowck}/borrowck-assign-to-andmut-in-borrowed-loc.rs | 0 .../compile-fail/{ => borrowck}/borrowck-assign-to-constants.rs | 0 .../{ => borrowck}/borrowck-auto-mut-ref-to-immut-var.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-autoref-3261.rs | 0 .../compile-fail/{ => borrowck}/borrowck-bad-nested-calls-free.rs | 0 .../compile-fail/{ => borrowck}/borrowck-bad-nested-calls-move.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-block-unint.rs | 0 .../compile-fail/{ => borrowck}/borrowck-borrow-from-owned-ptr.rs | 0 .../{ => borrowck}/borrowck-borrow-from-stack-variable.rs | 0 .../compile-fail/{ => borrowck}/borrowck-borrow-from-temporary.rs | 0 .../{ => borrowck}/borrowck-borrow-immut-deref-of-box-as-mut.rs | 0 .../borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs | 0 .../{ => borrowck}/borrowck-borrow-mut-object-twice.rs | 0 .../{ => borrowck}/borrowck-borrow-overloaded-auto-deref-mut.rs | 0 .../{ => borrowck}/borrowck-borrow-overloaded-auto-deref.rs | 0 .../{ => borrowck}/borrowck-borrow-overloaded-deref-mut.rs | 0 .../{ => borrowck}/borrowck-borrow-overloaded-deref.rs | 0 .../{ => borrowck}/borrowck-borrowed-uniq-rvalue-2.rs | 0 .../compile-fail/{ => borrowck}/borrowck-borrowed-uniq-rvalue.rs | 0 .../compile-fail/{ => borrowck}/borrowck-box-insensitivity.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-break-uninit-2.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-break-uninit.rs | 0 .../{ => borrowck}/borrowck-call-is-borrow-issue-12224.rs | 0 .../{ => borrowck}/borrowck-call-method-from-mut-aliasable.rs | 0 .../compile-fail/{ => borrowck}/borrowck-closures-mut-and-imm.rs | 0 .../compile-fail/{ => borrowck}/borrowck-closures-mut-of-imm.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-closures-two-mut.rs | 0 .../compile-fail/{ => borrowck}/borrowck-closures-unique-imm.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-closures-unique.rs | 0 .../{ => borrowck}/borrowck-closures-use-after-free.rs | 0 .../compile-fail/{ => borrowck}/borrowck-consume-unsize-vec.rs | 0 .../compile-fail/{ => borrowck}/borrowck-consume-upcast-box.rs | 0 .../{ => borrowck}/borrowck-escaping-closure-error-1.rs | 0 .../{ => borrowck}/borrowck-escaping-closure-error-2.rs | 0 .../compile-fail/{ => borrowck}/borrowck-field-sensitivity.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-fn-in-const-a.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-fn-in-const-b.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-fn-in-const-c.rs | 0 .../{ => borrowck}/borrowck-for-loop-correct-cmt-for-pattern.rs | 0 .../compile-fail/{ => borrowck}/borrowck-for-loop-head-linkage.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-if-no-else.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-if-with-else.rs | 0 .../borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-in-static.rs | 0 .../{ => borrowck}/borrowck-init-in-called-fn-expr.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-init-in-fn-expr.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-init-in-fru.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-init-op-equal.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-init-plus-equal.rs | 0 .../compile-fail/{ => borrowck}/borrowck-insert-during-each.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-issue-14498.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-issue-2657-1.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-issue-2657-2.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-lend-flow-if.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-lend-flow-loop.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-lend-flow-match.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-lend-flow.rs | 0 .../{ => borrowck}/borrowck-let-suggestion-suffixes.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-let-suggestion.rs | 0 .../compile-fail/{ => borrowck}/borrowck-loan-blocks-move-cc.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-loan-blocks-move.rs | 0 .../compile-fail/{ => borrowck}/borrowck-loan-blocks-mut-uniq.rs | 0 .../compile-fail/{ => borrowck}/borrowck-loan-in-overloaded-op.rs | 0 .../{ => borrowck}/borrowck-loan-of-static-data-issue-27616.rs | 0 .../{ => borrowck}/borrowck-loan-rcvr-overloaded-op.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-loan-rcvr.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-loan-vec-content.rs | 0 .../{ => borrowck}/borrowck-match-binding-is-assignment.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-move-by-capture.rs | 0 .../compile-fail/{ => borrowck}/borrowck-move-error-with-note.rs | 0 .../{ => borrowck}/borrowck-move-from-subpath-of-borrowed-path.rs | 0 .../compile-fail/{ => borrowck}/borrowck-move-from-unsafe-ptr.rs | 0 .../compile-fail/{ => borrowck}/borrowck-move-in-irrefut-pat.rs | 0 .../{ => borrowck}/borrowck-move-moved-value-into-closure.rs | 0 .../compile-fail/{ => borrowck}/borrowck-move-mut-base-ptr.rs | 0 .../{ => borrowck}/borrowck-move-out-of-overloaded-auto-deref.rs | 0 .../{ => borrowck}/borrowck-move-out-of-overloaded-deref.rs | 0 .../{ => borrowck}/borrowck-move-out-of-static-item.rs | 0 .../{ => borrowck}/borrowck-move-out-of-struct-with-dtor.rs | 0 .../{ => borrowck}/borrowck-move-out-of-tuple-struct-with-dtor.rs | 0 .../compile-fail/{ => borrowck}/borrowck-move-out-of-vec-tail.rs | 0 .../compile-fail/{ => borrowck}/borrowck-move-subcomponent.rs | 0 .../compile-fail/{ => borrowck}/borrowck-multiple-captures.rs | 0 .../compile-fail/{ => borrowck}/borrowck-mut-addr-of-imm-var.rs | 0 .../{ => borrowck}/borrowck-mut-borrow-linear-errors.rs | 0 .../{ => borrowck}/borrowck-mut-borrow-of-mut-base-ptr.rs | 0 .../compile-fail/{ => borrowck}/borrowck-mut-slice-of-imm-vec.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-mutate-in-guard.rs | 0 .../{ => borrowck}/borrowck-no-cycle-in-exchange-heap.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-object-lifetime.rs | 0 .../compile-fail/{ => borrowck}/borrowck-object-mutability.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-or-init.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-overloaded-call.rs | 0 .../borrowck-overloaded-index-and-overloaded-deref.rs | 0 .../{ => borrowck}/borrowck-overloaded-index-autoderef.rs | 0 .../{ => borrowck}/borrowck-overloaded-index-move-from-vec.rs | 0 .../{ => borrowck}/borrowck-overloaded-index-move-index.rs | 0 .../{ => borrowck}/borrowck-overloaded-index-ref-index.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-partial-reinit-1.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-partial-reinit-2.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-partial-reinit-3.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-partial-reinit-4.rs | 0 .../compile-fail/{ => borrowck}/borrowck-pat-reassign-binding.rs | 0 .../compile-fail/{ => borrowck}/borrowck-reborrow-from-mut.rs | 0 .../{ => borrowck}/borrowck-reborrow-from-shorter-lived-andmut.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-ref-into-rvalue.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-ref-mut-of-imm.rs | 0 .../{ => borrowck}/borrowck-report-with-custom-diagnostic.rs | 0 .../{ => borrowck}/borrowck-return-variable-on-stack-via-clone.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-return.rs | 0 .../{ => borrowck}/borrowck-struct-update-with-dtor.rs | 0 .../compile-fail/{ => borrowck}/borrowck-swap-mut-base-ptr.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-unary-move.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-unboxed-closures.rs | 0 .../compile-fail/{ => borrowck}/borrowck-uninit-after-item.rs | 0 .../compile-fail/{ => borrowck}/borrowck-uninit-in-assignop.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-uninit.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-uniq-via-lend.rs | 0 .../compile-fail/{ => borrowck}/borrowck-use-in-index-lvalue.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-use-mut-borrow.rs | 0 .../{ => borrowck}/borrowck-use-uninitialized-in-cast-trait.rs | 0 .../{ => borrowck}/borrowck-use-uninitialized-in-cast.rs | 0 .../{ => borrowck}/borrowck-vec-pattern-element-loan.rs | 0 .../{ => borrowck}/borrowck-vec-pattern-loan-from-mut.rs | 0 .../compile-fail/{ => borrowck}/borrowck-vec-pattern-move-tail.rs | 0 .../compile-fail/{ => borrowck}/borrowck-vec-pattern-nesting.rs | 0 .../{ => borrowck}/borrowck-vec-pattern-tail-element-loan.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-while-break.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-while-cond.rs | 0 src/test/compile-fail/{ => borrowck}/borrowck-while.rs | 0 src/test/run-pass/{ => borrowck}/borrowck-assign-to-subfield.rs | 0 src/test/run-pass/{ => borrowck}/borrowck-binding-mutbl.rs | 0 .../run-pass/{ => borrowck}/borrowck-borrow-from-expr-block.rs | 0 .../{ => borrowck}/borrowck-borrow-of-mut-base-ptr-safe.rs | 0 src/test/run-pass/{ => borrowck}/borrowck-closures-two-imm.rs | 0 src/test/run-pass/{ => borrowck}/borrowck-field-sensitivity.rs | 0 src/test/run-pass/{ => borrowck}/borrowck-fixed-length-vecs.rs | 0 src/test/run-pass/{ => borrowck}/borrowck-freeze-frozen-mut.rs | 0 src/test/run-pass/{ => borrowck}/borrowck-lend-args.rs | 0 .../{ => borrowck}/borrowck-macro-interaction-issue-6304.rs | 0 src/test/run-pass/{ => borrowck}/borrowck-move-by-capture-ok.rs | 0 src/test/run-pass/{ => borrowck}/borrowck-mut-uniq.rs | 0 src/test/run-pass/{ => borrowck}/borrowck-mut-vec-as-imm-slice.rs | 0 src/test/run-pass/{ => borrowck}/borrowck-pat-enum.rs | 0 .../run-pass/{ => borrowck}/borrowck-pat-reassign-no-binding.rs | 0 src/test/run-pass/{ => borrowck}/borrowck-rvalues-mutable.rs | 0 .../run-pass/{ => borrowck}/borrowck-scope-of-deref-issue-4666.rs | 0 src/test/run-pass/{ => borrowck}/borrowck-static-item-in-fn.rs | 0 src/test/run-pass/{ => borrowck}/borrowck-trait-lifetime.rs | 0 src/test/run-pass/{ => borrowck}/borrowck-uniq-via-ref.rs | 0 src/test/run-pass/{ => borrowck}/borrowck-univariant-enum.rs | 0 src/test/run-pass/{ => borrowck}/borrowck-use-mut-borrow.rs | 0 160 files changed, 0 insertions(+), 0 deletions(-) rename src/test/compile-fail/{ => borrowck}/borrowck-and-init.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-anon-fields-struct.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-anon-fields-tuple.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-anon-fields-variant.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-argument.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-assign-comp-idx.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-assign-comp.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-assign-to-andmut-in-aliasable-loc.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-assign-to-andmut-in-borrowed-loc.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-assign-to-constants.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-auto-mut-ref-to-immut-var.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-autoref-3261.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-bad-nested-calls-free.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-bad-nested-calls-move.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-block-unint.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-borrow-from-owned-ptr.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-borrow-from-stack-variable.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-borrow-from-temporary.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-borrow-immut-deref-of-box-as-mut.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-borrow-mut-object-twice.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-borrow-overloaded-auto-deref-mut.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-borrow-overloaded-auto-deref.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-borrow-overloaded-deref-mut.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-borrow-overloaded-deref.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-borrowed-uniq-rvalue-2.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-borrowed-uniq-rvalue.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-box-insensitivity.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-break-uninit-2.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-break-uninit.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-call-is-borrow-issue-12224.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-call-method-from-mut-aliasable.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-closures-mut-and-imm.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-closures-mut-of-imm.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-closures-two-mut.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-closures-unique-imm.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-closures-unique.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-closures-use-after-free.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-consume-unsize-vec.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-consume-upcast-box.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-escaping-closure-error-1.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-escaping-closure-error-2.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-field-sensitivity.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-fn-in-const-a.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-fn-in-const-b.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-fn-in-const-c.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-for-loop-correct-cmt-for-pattern.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-for-loop-head-linkage.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-if-no-else.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-if-with-else.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-in-static.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-init-in-called-fn-expr.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-init-in-fn-expr.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-init-in-fru.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-init-op-equal.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-init-plus-equal.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-insert-during-each.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-issue-14498.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-issue-2657-1.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-issue-2657-2.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-lend-flow-if.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-lend-flow-loop.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-lend-flow-match.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-lend-flow.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-let-suggestion-suffixes.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-let-suggestion.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-loan-blocks-move-cc.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-loan-blocks-move.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-loan-blocks-mut-uniq.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-loan-in-overloaded-op.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-loan-of-static-data-issue-27616.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-loan-rcvr-overloaded-op.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-loan-rcvr.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-loan-vec-content.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-match-binding-is-assignment.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-move-by-capture.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-move-error-with-note.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-move-from-subpath-of-borrowed-path.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-move-from-unsafe-ptr.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-move-in-irrefut-pat.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-move-moved-value-into-closure.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-move-mut-base-ptr.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-move-out-of-overloaded-auto-deref.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-move-out-of-overloaded-deref.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-move-out-of-static-item.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-move-out-of-struct-with-dtor.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-move-out-of-tuple-struct-with-dtor.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-move-out-of-vec-tail.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-move-subcomponent.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-multiple-captures.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-mut-addr-of-imm-var.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-mut-borrow-linear-errors.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-mut-borrow-of-mut-base-ptr.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-mut-slice-of-imm-vec.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-mutate-in-guard.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-no-cycle-in-exchange-heap.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-object-lifetime.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-object-mutability.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-or-init.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-overloaded-call.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-overloaded-index-and-overloaded-deref.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-overloaded-index-autoderef.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-overloaded-index-move-from-vec.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-overloaded-index-move-index.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-overloaded-index-ref-index.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-partial-reinit-1.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-partial-reinit-2.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-partial-reinit-3.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-partial-reinit-4.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-pat-reassign-binding.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-reborrow-from-mut.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-reborrow-from-shorter-lived-andmut.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-ref-into-rvalue.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-ref-mut-of-imm.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-report-with-custom-diagnostic.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-return-variable-on-stack-via-clone.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-return.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-struct-update-with-dtor.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-swap-mut-base-ptr.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-unary-move.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-unboxed-closures.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-uninit-after-item.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-uninit-in-assignop.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-uninit.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-uniq-via-lend.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-use-in-index-lvalue.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-use-mut-borrow.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-use-uninitialized-in-cast-trait.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-use-uninitialized-in-cast.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-vec-pattern-element-loan.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-vec-pattern-loan-from-mut.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-vec-pattern-move-tail.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-vec-pattern-nesting.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-vec-pattern-tail-element-loan.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-while-break.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-while-cond.rs (100%) rename src/test/compile-fail/{ => borrowck}/borrowck-while.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-assign-to-subfield.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-binding-mutbl.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-borrow-from-expr-block.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-borrow-of-mut-base-ptr-safe.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-closures-two-imm.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-field-sensitivity.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-fixed-length-vecs.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-freeze-frozen-mut.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-lend-args.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-macro-interaction-issue-6304.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-move-by-capture-ok.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-mut-uniq.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-mut-vec-as-imm-slice.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-pat-enum.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-pat-reassign-no-binding.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-rvalues-mutable.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-scope-of-deref-issue-4666.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-static-item-in-fn.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-trait-lifetime.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-uniq-via-ref.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-univariant-enum.rs (100%) rename src/test/run-pass/{ => borrowck}/borrowck-use-mut-borrow.rs (100%) diff --git a/src/test/compile-fail/borrowck-and-init.rs b/src/test/compile-fail/borrowck/borrowck-and-init.rs similarity index 100% rename from src/test/compile-fail/borrowck-and-init.rs rename to src/test/compile-fail/borrowck/borrowck-and-init.rs diff --git a/src/test/compile-fail/borrowck-anon-fields-struct.rs b/src/test/compile-fail/borrowck/borrowck-anon-fields-struct.rs similarity index 100% rename from src/test/compile-fail/borrowck-anon-fields-struct.rs rename to src/test/compile-fail/borrowck/borrowck-anon-fields-struct.rs diff --git a/src/test/compile-fail/borrowck-anon-fields-tuple.rs b/src/test/compile-fail/borrowck/borrowck-anon-fields-tuple.rs similarity index 100% rename from src/test/compile-fail/borrowck-anon-fields-tuple.rs rename to src/test/compile-fail/borrowck/borrowck-anon-fields-tuple.rs diff --git a/src/test/compile-fail/borrowck-anon-fields-variant.rs b/src/test/compile-fail/borrowck/borrowck-anon-fields-variant.rs similarity index 100% rename from src/test/compile-fail/borrowck-anon-fields-variant.rs rename to src/test/compile-fail/borrowck/borrowck-anon-fields-variant.rs diff --git a/src/test/compile-fail/borrowck-argument.rs b/src/test/compile-fail/borrowck/borrowck-argument.rs similarity index 100% rename from src/test/compile-fail/borrowck-argument.rs rename to src/test/compile-fail/borrowck/borrowck-argument.rs diff --git a/src/test/compile-fail/borrowck-assign-comp-idx.rs b/src/test/compile-fail/borrowck/borrowck-assign-comp-idx.rs similarity index 100% rename from src/test/compile-fail/borrowck-assign-comp-idx.rs rename to src/test/compile-fail/borrowck/borrowck-assign-comp-idx.rs diff --git a/src/test/compile-fail/borrowck-assign-comp.rs b/src/test/compile-fail/borrowck/borrowck-assign-comp.rs similarity index 100% rename from src/test/compile-fail/borrowck-assign-comp.rs rename to src/test/compile-fail/borrowck/borrowck-assign-comp.rs diff --git a/src/test/compile-fail/borrowck-assign-to-andmut-in-aliasable-loc.rs b/src/test/compile-fail/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.rs similarity index 100% rename from src/test/compile-fail/borrowck-assign-to-andmut-in-aliasable-loc.rs rename to src/test/compile-fail/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.rs diff --git a/src/test/compile-fail/borrowck-assign-to-andmut-in-borrowed-loc.rs b/src/test/compile-fail/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.rs similarity index 100% rename from src/test/compile-fail/borrowck-assign-to-andmut-in-borrowed-loc.rs rename to src/test/compile-fail/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.rs diff --git a/src/test/compile-fail/borrowck-assign-to-constants.rs b/src/test/compile-fail/borrowck/borrowck-assign-to-constants.rs similarity index 100% rename from src/test/compile-fail/borrowck-assign-to-constants.rs rename to src/test/compile-fail/borrowck/borrowck-assign-to-constants.rs diff --git a/src/test/compile-fail/borrowck-auto-mut-ref-to-immut-var.rs b/src/test/compile-fail/borrowck/borrowck-auto-mut-ref-to-immut-var.rs similarity index 100% rename from src/test/compile-fail/borrowck-auto-mut-ref-to-immut-var.rs rename to src/test/compile-fail/borrowck/borrowck-auto-mut-ref-to-immut-var.rs diff --git a/src/test/compile-fail/borrowck-autoref-3261.rs b/src/test/compile-fail/borrowck/borrowck-autoref-3261.rs similarity index 100% rename from src/test/compile-fail/borrowck-autoref-3261.rs rename to src/test/compile-fail/borrowck/borrowck-autoref-3261.rs diff --git a/src/test/compile-fail/borrowck-bad-nested-calls-free.rs b/src/test/compile-fail/borrowck/borrowck-bad-nested-calls-free.rs similarity index 100% rename from src/test/compile-fail/borrowck-bad-nested-calls-free.rs rename to src/test/compile-fail/borrowck/borrowck-bad-nested-calls-free.rs diff --git a/src/test/compile-fail/borrowck-bad-nested-calls-move.rs b/src/test/compile-fail/borrowck/borrowck-bad-nested-calls-move.rs similarity index 100% rename from src/test/compile-fail/borrowck-bad-nested-calls-move.rs rename to src/test/compile-fail/borrowck/borrowck-bad-nested-calls-move.rs diff --git a/src/test/compile-fail/borrowck-block-unint.rs b/src/test/compile-fail/borrowck/borrowck-block-unint.rs similarity index 100% rename from src/test/compile-fail/borrowck-block-unint.rs rename to src/test/compile-fail/borrowck/borrowck-block-unint.rs diff --git a/src/test/compile-fail/borrowck-borrow-from-owned-ptr.rs b/src/test/compile-fail/borrowck/borrowck-borrow-from-owned-ptr.rs similarity index 100% rename from src/test/compile-fail/borrowck-borrow-from-owned-ptr.rs rename to src/test/compile-fail/borrowck/borrowck-borrow-from-owned-ptr.rs diff --git a/src/test/compile-fail/borrowck-borrow-from-stack-variable.rs b/src/test/compile-fail/borrowck/borrowck-borrow-from-stack-variable.rs similarity index 100% rename from src/test/compile-fail/borrowck-borrow-from-stack-variable.rs rename to src/test/compile-fail/borrowck/borrowck-borrow-from-stack-variable.rs diff --git a/src/test/compile-fail/borrowck-borrow-from-temporary.rs b/src/test/compile-fail/borrowck/borrowck-borrow-from-temporary.rs similarity index 100% rename from src/test/compile-fail/borrowck-borrow-from-temporary.rs rename to src/test/compile-fail/borrowck/borrowck-borrow-from-temporary.rs diff --git a/src/test/compile-fail/borrowck-borrow-immut-deref-of-box-as-mut.rs b/src/test/compile-fail/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.rs similarity index 100% rename from src/test/compile-fail/borrowck-borrow-immut-deref-of-box-as-mut.rs rename to src/test/compile-fail/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.rs diff --git a/src/test/compile-fail/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs b/src/test/compile-fail/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs similarity index 100% rename from src/test/compile-fail/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs rename to src/test/compile-fail/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs diff --git a/src/test/compile-fail/borrowck-borrow-mut-object-twice.rs b/src/test/compile-fail/borrowck/borrowck-borrow-mut-object-twice.rs similarity index 100% rename from src/test/compile-fail/borrowck-borrow-mut-object-twice.rs rename to src/test/compile-fail/borrowck/borrowck-borrow-mut-object-twice.rs diff --git a/src/test/compile-fail/borrowck-borrow-overloaded-auto-deref-mut.rs b/src/test/compile-fail/borrowck/borrowck-borrow-overloaded-auto-deref-mut.rs similarity index 100% rename from src/test/compile-fail/borrowck-borrow-overloaded-auto-deref-mut.rs rename to src/test/compile-fail/borrowck/borrowck-borrow-overloaded-auto-deref-mut.rs diff --git a/src/test/compile-fail/borrowck-borrow-overloaded-auto-deref.rs b/src/test/compile-fail/borrowck/borrowck-borrow-overloaded-auto-deref.rs similarity index 100% rename from src/test/compile-fail/borrowck-borrow-overloaded-auto-deref.rs rename to src/test/compile-fail/borrowck/borrowck-borrow-overloaded-auto-deref.rs diff --git a/src/test/compile-fail/borrowck-borrow-overloaded-deref-mut.rs b/src/test/compile-fail/borrowck/borrowck-borrow-overloaded-deref-mut.rs similarity index 100% rename from src/test/compile-fail/borrowck-borrow-overloaded-deref-mut.rs rename to src/test/compile-fail/borrowck/borrowck-borrow-overloaded-deref-mut.rs diff --git a/src/test/compile-fail/borrowck-borrow-overloaded-deref.rs b/src/test/compile-fail/borrowck/borrowck-borrow-overloaded-deref.rs similarity index 100% rename from src/test/compile-fail/borrowck-borrow-overloaded-deref.rs rename to src/test/compile-fail/borrowck/borrowck-borrow-overloaded-deref.rs diff --git a/src/test/compile-fail/borrowck-borrowed-uniq-rvalue-2.rs b/src/test/compile-fail/borrowck/borrowck-borrowed-uniq-rvalue-2.rs similarity index 100% rename from src/test/compile-fail/borrowck-borrowed-uniq-rvalue-2.rs rename to src/test/compile-fail/borrowck/borrowck-borrowed-uniq-rvalue-2.rs diff --git a/src/test/compile-fail/borrowck-borrowed-uniq-rvalue.rs b/src/test/compile-fail/borrowck/borrowck-borrowed-uniq-rvalue.rs similarity index 100% rename from src/test/compile-fail/borrowck-borrowed-uniq-rvalue.rs rename to src/test/compile-fail/borrowck/borrowck-borrowed-uniq-rvalue.rs diff --git a/src/test/compile-fail/borrowck-box-insensitivity.rs b/src/test/compile-fail/borrowck/borrowck-box-insensitivity.rs similarity index 100% rename from src/test/compile-fail/borrowck-box-insensitivity.rs rename to src/test/compile-fail/borrowck/borrowck-box-insensitivity.rs diff --git a/src/test/compile-fail/borrowck-break-uninit-2.rs b/src/test/compile-fail/borrowck/borrowck-break-uninit-2.rs similarity index 100% rename from src/test/compile-fail/borrowck-break-uninit-2.rs rename to src/test/compile-fail/borrowck/borrowck-break-uninit-2.rs diff --git a/src/test/compile-fail/borrowck-break-uninit.rs b/src/test/compile-fail/borrowck/borrowck-break-uninit.rs similarity index 100% rename from src/test/compile-fail/borrowck-break-uninit.rs rename to src/test/compile-fail/borrowck/borrowck-break-uninit.rs diff --git a/src/test/compile-fail/borrowck-call-is-borrow-issue-12224.rs b/src/test/compile-fail/borrowck/borrowck-call-is-borrow-issue-12224.rs similarity index 100% rename from src/test/compile-fail/borrowck-call-is-borrow-issue-12224.rs rename to src/test/compile-fail/borrowck/borrowck-call-is-borrow-issue-12224.rs diff --git a/src/test/compile-fail/borrowck-call-method-from-mut-aliasable.rs b/src/test/compile-fail/borrowck/borrowck-call-method-from-mut-aliasable.rs similarity index 100% rename from src/test/compile-fail/borrowck-call-method-from-mut-aliasable.rs rename to src/test/compile-fail/borrowck/borrowck-call-method-from-mut-aliasable.rs diff --git a/src/test/compile-fail/borrowck-closures-mut-and-imm.rs b/src/test/compile-fail/borrowck/borrowck-closures-mut-and-imm.rs similarity index 100% rename from src/test/compile-fail/borrowck-closures-mut-and-imm.rs rename to src/test/compile-fail/borrowck/borrowck-closures-mut-and-imm.rs diff --git a/src/test/compile-fail/borrowck-closures-mut-of-imm.rs b/src/test/compile-fail/borrowck/borrowck-closures-mut-of-imm.rs similarity index 100% rename from src/test/compile-fail/borrowck-closures-mut-of-imm.rs rename to src/test/compile-fail/borrowck/borrowck-closures-mut-of-imm.rs diff --git a/src/test/compile-fail/borrowck-closures-two-mut.rs b/src/test/compile-fail/borrowck/borrowck-closures-two-mut.rs similarity index 100% rename from src/test/compile-fail/borrowck-closures-two-mut.rs rename to src/test/compile-fail/borrowck/borrowck-closures-two-mut.rs diff --git a/src/test/compile-fail/borrowck-closures-unique-imm.rs b/src/test/compile-fail/borrowck/borrowck-closures-unique-imm.rs similarity index 100% rename from src/test/compile-fail/borrowck-closures-unique-imm.rs rename to src/test/compile-fail/borrowck/borrowck-closures-unique-imm.rs diff --git a/src/test/compile-fail/borrowck-closures-unique.rs b/src/test/compile-fail/borrowck/borrowck-closures-unique.rs similarity index 100% rename from src/test/compile-fail/borrowck-closures-unique.rs rename to src/test/compile-fail/borrowck/borrowck-closures-unique.rs diff --git a/src/test/compile-fail/borrowck-closures-use-after-free.rs b/src/test/compile-fail/borrowck/borrowck-closures-use-after-free.rs similarity index 100% rename from src/test/compile-fail/borrowck-closures-use-after-free.rs rename to src/test/compile-fail/borrowck/borrowck-closures-use-after-free.rs diff --git a/src/test/compile-fail/borrowck-consume-unsize-vec.rs b/src/test/compile-fail/borrowck/borrowck-consume-unsize-vec.rs similarity index 100% rename from src/test/compile-fail/borrowck-consume-unsize-vec.rs rename to src/test/compile-fail/borrowck/borrowck-consume-unsize-vec.rs diff --git a/src/test/compile-fail/borrowck-consume-upcast-box.rs b/src/test/compile-fail/borrowck/borrowck-consume-upcast-box.rs similarity index 100% rename from src/test/compile-fail/borrowck-consume-upcast-box.rs rename to src/test/compile-fail/borrowck/borrowck-consume-upcast-box.rs diff --git a/src/test/compile-fail/borrowck-escaping-closure-error-1.rs b/src/test/compile-fail/borrowck/borrowck-escaping-closure-error-1.rs similarity index 100% rename from src/test/compile-fail/borrowck-escaping-closure-error-1.rs rename to src/test/compile-fail/borrowck/borrowck-escaping-closure-error-1.rs diff --git a/src/test/compile-fail/borrowck-escaping-closure-error-2.rs b/src/test/compile-fail/borrowck/borrowck-escaping-closure-error-2.rs similarity index 100% rename from src/test/compile-fail/borrowck-escaping-closure-error-2.rs rename to src/test/compile-fail/borrowck/borrowck-escaping-closure-error-2.rs diff --git a/src/test/compile-fail/borrowck-field-sensitivity.rs b/src/test/compile-fail/borrowck/borrowck-field-sensitivity.rs similarity index 100% rename from src/test/compile-fail/borrowck-field-sensitivity.rs rename to src/test/compile-fail/borrowck/borrowck-field-sensitivity.rs diff --git a/src/test/compile-fail/borrowck-fn-in-const-a.rs b/src/test/compile-fail/borrowck/borrowck-fn-in-const-a.rs similarity index 100% rename from src/test/compile-fail/borrowck-fn-in-const-a.rs rename to src/test/compile-fail/borrowck/borrowck-fn-in-const-a.rs diff --git a/src/test/compile-fail/borrowck-fn-in-const-b.rs b/src/test/compile-fail/borrowck/borrowck-fn-in-const-b.rs similarity index 100% rename from src/test/compile-fail/borrowck-fn-in-const-b.rs rename to src/test/compile-fail/borrowck/borrowck-fn-in-const-b.rs diff --git a/src/test/compile-fail/borrowck-fn-in-const-c.rs b/src/test/compile-fail/borrowck/borrowck-fn-in-const-c.rs similarity index 100% rename from src/test/compile-fail/borrowck-fn-in-const-c.rs rename to src/test/compile-fail/borrowck/borrowck-fn-in-const-c.rs diff --git a/src/test/compile-fail/borrowck-for-loop-correct-cmt-for-pattern.rs b/src/test/compile-fail/borrowck/borrowck-for-loop-correct-cmt-for-pattern.rs similarity index 100% rename from src/test/compile-fail/borrowck-for-loop-correct-cmt-for-pattern.rs rename to src/test/compile-fail/borrowck/borrowck-for-loop-correct-cmt-for-pattern.rs diff --git a/src/test/compile-fail/borrowck-for-loop-head-linkage.rs b/src/test/compile-fail/borrowck/borrowck-for-loop-head-linkage.rs similarity index 100% rename from src/test/compile-fail/borrowck-for-loop-head-linkage.rs rename to src/test/compile-fail/borrowck/borrowck-for-loop-head-linkage.rs diff --git a/src/test/compile-fail/borrowck-if-no-else.rs b/src/test/compile-fail/borrowck/borrowck-if-no-else.rs similarity index 100% rename from src/test/compile-fail/borrowck-if-no-else.rs rename to src/test/compile-fail/borrowck/borrowck-if-no-else.rs diff --git a/src/test/compile-fail/borrowck-if-with-else.rs b/src/test/compile-fail/borrowck/borrowck-if-with-else.rs similarity index 100% rename from src/test/compile-fail/borrowck-if-with-else.rs rename to src/test/compile-fail/borrowck/borrowck-if-with-else.rs diff --git a/src/test/compile-fail/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs b/src/test/compile-fail/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs similarity index 100% rename from src/test/compile-fail/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs rename to src/test/compile-fail/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs diff --git a/src/test/compile-fail/borrowck-in-static.rs b/src/test/compile-fail/borrowck/borrowck-in-static.rs similarity index 100% rename from src/test/compile-fail/borrowck-in-static.rs rename to src/test/compile-fail/borrowck/borrowck-in-static.rs diff --git a/src/test/compile-fail/borrowck-init-in-called-fn-expr.rs b/src/test/compile-fail/borrowck/borrowck-init-in-called-fn-expr.rs similarity index 100% rename from src/test/compile-fail/borrowck-init-in-called-fn-expr.rs rename to src/test/compile-fail/borrowck/borrowck-init-in-called-fn-expr.rs diff --git a/src/test/compile-fail/borrowck-init-in-fn-expr.rs b/src/test/compile-fail/borrowck/borrowck-init-in-fn-expr.rs similarity index 100% rename from src/test/compile-fail/borrowck-init-in-fn-expr.rs rename to src/test/compile-fail/borrowck/borrowck-init-in-fn-expr.rs diff --git a/src/test/compile-fail/borrowck-init-in-fru.rs b/src/test/compile-fail/borrowck/borrowck-init-in-fru.rs similarity index 100% rename from src/test/compile-fail/borrowck-init-in-fru.rs rename to src/test/compile-fail/borrowck/borrowck-init-in-fru.rs diff --git a/src/test/compile-fail/borrowck-init-op-equal.rs b/src/test/compile-fail/borrowck/borrowck-init-op-equal.rs similarity index 100% rename from src/test/compile-fail/borrowck-init-op-equal.rs rename to src/test/compile-fail/borrowck/borrowck-init-op-equal.rs diff --git a/src/test/compile-fail/borrowck-init-plus-equal.rs b/src/test/compile-fail/borrowck/borrowck-init-plus-equal.rs similarity index 100% rename from src/test/compile-fail/borrowck-init-plus-equal.rs rename to src/test/compile-fail/borrowck/borrowck-init-plus-equal.rs diff --git a/src/test/compile-fail/borrowck-insert-during-each.rs b/src/test/compile-fail/borrowck/borrowck-insert-during-each.rs similarity index 100% rename from src/test/compile-fail/borrowck-insert-during-each.rs rename to src/test/compile-fail/borrowck/borrowck-insert-during-each.rs diff --git a/src/test/compile-fail/borrowck-issue-14498.rs b/src/test/compile-fail/borrowck/borrowck-issue-14498.rs similarity index 100% rename from src/test/compile-fail/borrowck-issue-14498.rs rename to src/test/compile-fail/borrowck/borrowck-issue-14498.rs diff --git a/src/test/compile-fail/borrowck-issue-2657-1.rs b/src/test/compile-fail/borrowck/borrowck-issue-2657-1.rs similarity index 100% rename from src/test/compile-fail/borrowck-issue-2657-1.rs rename to src/test/compile-fail/borrowck/borrowck-issue-2657-1.rs diff --git a/src/test/compile-fail/borrowck-issue-2657-2.rs b/src/test/compile-fail/borrowck/borrowck-issue-2657-2.rs similarity index 100% rename from src/test/compile-fail/borrowck-issue-2657-2.rs rename to src/test/compile-fail/borrowck/borrowck-issue-2657-2.rs diff --git a/src/test/compile-fail/borrowck-lend-flow-if.rs b/src/test/compile-fail/borrowck/borrowck-lend-flow-if.rs similarity index 100% rename from src/test/compile-fail/borrowck-lend-flow-if.rs rename to src/test/compile-fail/borrowck/borrowck-lend-flow-if.rs diff --git a/src/test/compile-fail/borrowck-lend-flow-loop.rs b/src/test/compile-fail/borrowck/borrowck-lend-flow-loop.rs similarity index 100% rename from src/test/compile-fail/borrowck-lend-flow-loop.rs rename to src/test/compile-fail/borrowck/borrowck-lend-flow-loop.rs diff --git a/src/test/compile-fail/borrowck-lend-flow-match.rs b/src/test/compile-fail/borrowck/borrowck-lend-flow-match.rs similarity index 100% rename from src/test/compile-fail/borrowck-lend-flow-match.rs rename to src/test/compile-fail/borrowck/borrowck-lend-flow-match.rs diff --git a/src/test/compile-fail/borrowck-lend-flow.rs b/src/test/compile-fail/borrowck/borrowck-lend-flow.rs similarity index 100% rename from src/test/compile-fail/borrowck-lend-flow.rs rename to src/test/compile-fail/borrowck/borrowck-lend-flow.rs diff --git a/src/test/compile-fail/borrowck-let-suggestion-suffixes.rs b/src/test/compile-fail/borrowck/borrowck-let-suggestion-suffixes.rs similarity index 100% rename from src/test/compile-fail/borrowck-let-suggestion-suffixes.rs rename to src/test/compile-fail/borrowck/borrowck-let-suggestion-suffixes.rs diff --git a/src/test/compile-fail/borrowck-let-suggestion.rs b/src/test/compile-fail/borrowck/borrowck-let-suggestion.rs similarity index 100% rename from src/test/compile-fail/borrowck-let-suggestion.rs rename to src/test/compile-fail/borrowck/borrowck-let-suggestion.rs diff --git a/src/test/compile-fail/borrowck-loan-blocks-move-cc.rs b/src/test/compile-fail/borrowck/borrowck-loan-blocks-move-cc.rs similarity index 100% rename from src/test/compile-fail/borrowck-loan-blocks-move-cc.rs rename to src/test/compile-fail/borrowck/borrowck-loan-blocks-move-cc.rs diff --git a/src/test/compile-fail/borrowck-loan-blocks-move.rs b/src/test/compile-fail/borrowck/borrowck-loan-blocks-move.rs similarity index 100% rename from src/test/compile-fail/borrowck-loan-blocks-move.rs rename to src/test/compile-fail/borrowck/borrowck-loan-blocks-move.rs diff --git a/src/test/compile-fail/borrowck-loan-blocks-mut-uniq.rs b/src/test/compile-fail/borrowck/borrowck-loan-blocks-mut-uniq.rs similarity index 100% rename from src/test/compile-fail/borrowck-loan-blocks-mut-uniq.rs rename to src/test/compile-fail/borrowck/borrowck-loan-blocks-mut-uniq.rs diff --git a/src/test/compile-fail/borrowck-loan-in-overloaded-op.rs b/src/test/compile-fail/borrowck/borrowck-loan-in-overloaded-op.rs similarity index 100% rename from src/test/compile-fail/borrowck-loan-in-overloaded-op.rs rename to src/test/compile-fail/borrowck/borrowck-loan-in-overloaded-op.rs diff --git a/src/test/compile-fail/borrowck-loan-of-static-data-issue-27616.rs b/src/test/compile-fail/borrowck/borrowck-loan-of-static-data-issue-27616.rs similarity index 100% rename from src/test/compile-fail/borrowck-loan-of-static-data-issue-27616.rs rename to src/test/compile-fail/borrowck/borrowck-loan-of-static-data-issue-27616.rs diff --git a/src/test/compile-fail/borrowck-loan-rcvr-overloaded-op.rs b/src/test/compile-fail/borrowck/borrowck-loan-rcvr-overloaded-op.rs similarity index 100% rename from src/test/compile-fail/borrowck-loan-rcvr-overloaded-op.rs rename to src/test/compile-fail/borrowck/borrowck-loan-rcvr-overloaded-op.rs diff --git a/src/test/compile-fail/borrowck-loan-rcvr.rs b/src/test/compile-fail/borrowck/borrowck-loan-rcvr.rs similarity index 100% rename from src/test/compile-fail/borrowck-loan-rcvr.rs rename to src/test/compile-fail/borrowck/borrowck-loan-rcvr.rs diff --git a/src/test/compile-fail/borrowck-loan-vec-content.rs b/src/test/compile-fail/borrowck/borrowck-loan-vec-content.rs similarity index 100% rename from src/test/compile-fail/borrowck-loan-vec-content.rs rename to src/test/compile-fail/borrowck/borrowck-loan-vec-content.rs diff --git a/src/test/compile-fail/borrowck-match-binding-is-assignment.rs b/src/test/compile-fail/borrowck/borrowck-match-binding-is-assignment.rs similarity index 100% rename from src/test/compile-fail/borrowck-match-binding-is-assignment.rs rename to src/test/compile-fail/borrowck/borrowck-match-binding-is-assignment.rs diff --git a/src/test/compile-fail/borrowck-move-by-capture.rs b/src/test/compile-fail/borrowck/borrowck-move-by-capture.rs similarity index 100% rename from src/test/compile-fail/borrowck-move-by-capture.rs rename to src/test/compile-fail/borrowck/borrowck-move-by-capture.rs diff --git a/src/test/compile-fail/borrowck-move-error-with-note.rs b/src/test/compile-fail/borrowck/borrowck-move-error-with-note.rs similarity index 100% rename from src/test/compile-fail/borrowck-move-error-with-note.rs rename to src/test/compile-fail/borrowck/borrowck-move-error-with-note.rs diff --git a/src/test/compile-fail/borrowck-move-from-subpath-of-borrowed-path.rs b/src/test/compile-fail/borrowck/borrowck-move-from-subpath-of-borrowed-path.rs similarity index 100% rename from src/test/compile-fail/borrowck-move-from-subpath-of-borrowed-path.rs rename to src/test/compile-fail/borrowck/borrowck-move-from-subpath-of-borrowed-path.rs diff --git a/src/test/compile-fail/borrowck-move-from-unsafe-ptr.rs b/src/test/compile-fail/borrowck/borrowck-move-from-unsafe-ptr.rs similarity index 100% rename from src/test/compile-fail/borrowck-move-from-unsafe-ptr.rs rename to src/test/compile-fail/borrowck/borrowck-move-from-unsafe-ptr.rs diff --git a/src/test/compile-fail/borrowck-move-in-irrefut-pat.rs b/src/test/compile-fail/borrowck/borrowck-move-in-irrefut-pat.rs similarity index 100% rename from src/test/compile-fail/borrowck-move-in-irrefut-pat.rs rename to src/test/compile-fail/borrowck/borrowck-move-in-irrefut-pat.rs diff --git a/src/test/compile-fail/borrowck-move-moved-value-into-closure.rs b/src/test/compile-fail/borrowck/borrowck-move-moved-value-into-closure.rs similarity index 100% rename from src/test/compile-fail/borrowck-move-moved-value-into-closure.rs rename to src/test/compile-fail/borrowck/borrowck-move-moved-value-into-closure.rs diff --git a/src/test/compile-fail/borrowck-move-mut-base-ptr.rs b/src/test/compile-fail/borrowck/borrowck-move-mut-base-ptr.rs similarity index 100% rename from src/test/compile-fail/borrowck-move-mut-base-ptr.rs rename to src/test/compile-fail/borrowck/borrowck-move-mut-base-ptr.rs diff --git a/src/test/compile-fail/borrowck-move-out-of-overloaded-auto-deref.rs b/src/test/compile-fail/borrowck/borrowck-move-out-of-overloaded-auto-deref.rs similarity index 100% rename from src/test/compile-fail/borrowck-move-out-of-overloaded-auto-deref.rs rename to src/test/compile-fail/borrowck/borrowck-move-out-of-overloaded-auto-deref.rs diff --git a/src/test/compile-fail/borrowck-move-out-of-overloaded-deref.rs b/src/test/compile-fail/borrowck/borrowck-move-out-of-overloaded-deref.rs similarity index 100% rename from src/test/compile-fail/borrowck-move-out-of-overloaded-deref.rs rename to src/test/compile-fail/borrowck/borrowck-move-out-of-overloaded-deref.rs diff --git a/src/test/compile-fail/borrowck-move-out-of-static-item.rs b/src/test/compile-fail/borrowck/borrowck-move-out-of-static-item.rs similarity index 100% rename from src/test/compile-fail/borrowck-move-out-of-static-item.rs rename to src/test/compile-fail/borrowck/borrowck-move-out-of-static-item.rs diff --git a/src/test/compile-fail/borrowck-move-out-of-struct-with-dtor.rs b/src/test/compile-fail/borrowck/borrowck-move-out-of-struct-with-dtor.rs similarity index 100% rename from src/test/compile-fail/borrowck-move-out-of-struct-with-dtor.rs rename to src/test/compile-fail/borrowck/borrowck-move-out-of-struct-with-dtor.rs diff --git a/src/test/compile-fail/borrowck-move-out-of-tuple-struct-with-dtor.rs b/src/test/compile-fail/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.rs similarity index 100% rename from src/test/compile-fail/borrowck-move-out-of-tuple-struct-with-dtor.rs rename to src/test/compile-fail/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.rs diff --git a/src/test/compile-fail/borrowck-move-out-of-vec-tail.rs b/src/test/compile-fail/borrowck/borrowck-move-out-of-vec-tail.rs similarity index 100% rename from src/test/compile-fail/borrowck-move-out-of-vec-tail.rs rename to src/test/compile-fail/borrowck/borrowck-move-out-of-vec-tail.rs diff --git a/src/test/compile-fail/borrowck-move-subcomponent.rs b/src/test/compile-fail/borrowck/borrowck-move-subcomponent.rs similarity index 100% rename from src/test/compile-fail/borrowck-move-subcomponent.rs rename to src/test/compile-fail/borrowck/borrowck-move-subcomponent.rs diff --git a/src/test/compile-fail/borrowck-multiple-captures.rs b/src/test/compile-fail/borrowck/borrowck-multiple-captures.rs similarity index 100% rename from src/test/compile-fail/borrowck-multiple-captures.rs rename to src/test/compile-fail/borrowck/borrowck-multiple-captures.rs diff --git a/src/test/compile-fail/borrowck-mut-addr-of-imm-var.rs b/src/test/compile-fail/borrowck/borrowck-mut-addr-of-imm-var.rs similarity index 100% rename from src/test/compile-fail/borrowck-mut-addr-of-imm-var.rs rename to src/test/compile-fail/borrowck/borrowck-mut-addr-of-imm-var.rs diff --git a/src/test/compile-fail/borrowck-mut-borrow-linear-errors.rs b/src/test/compile-fail/borrowck/borrowck-mut-borrow-linear-errors.rs similarity index 100% rename from src/test/compile-fail/borrowck-mut-borrow-linear-errors.rs rename to src/test/compile-fail/borrowck/borrowck-mut-borrow-linear-errors.rs diff --git a/src/test/compile-fail/borrowck-mut-borrow-of-mut-base-ptr.rs b/src/test/compile-fail/borrowck/borrowck-mut-borrow-of-mut-base-ptr.rs similarity index 100% rename from src/test/compile-fail/borrowck-mut-borrow-of-mut-base-ptr.rs rename to src/test/compile-fail/borrowck/borrowck-mut-borrow-of-mut-base-ptr.rs diff --git a/src/test/compile-fail/borrowck-mut-slice-of-imm-vec.rs b/src/test/compile-fail/borrowck/borrowck-mut-slice-of-imm-vec.rs similarity index 100% rename from src/test/compile-fail/borrowck-mut-slice-of-imm-vec.rs rename to src/test/compile-fail/borrowck/borrowck-mut-slice-of-imm-vec.rs diff --git a/src/test/compile-fail/borrowck-mutate-in-guard.rs b/src/test/compile-fail/borrowck/borrowck-mutate-in-guard.rs similarity index 100% rename from src/test/compile-fail/borrowck-mutate-in-guard.rs rename to src/test/compile-fail/borrowck/borrowck-mutate-in-guard.rs diff --git a/src/test/compile-fail/borrowck-no-cycle-in-exchange-heap.rs b/src/test/compile-fail/borrowck/borrowck-no-cycle-in-exchange-heap.rs similarity index 100% rename from src/test/compile-fail/borrowck-no-cycle-in-exchange-heap.rs rename to src/test/compile-fail/borrowck/borrowck-no-cycle-in-exchange-heap.rs diff --git a/src/test/compile-fail/borrowck-object-lifetime.rs b/src/test/compile-fail/borrowck/borrowck-object-lifetime.rs similarity index 100% rename from src/test/compile-fail/borrowck-object-lifetime.rs rename to src/test/compile-fail/borrowck/borrowck-object-lifetime.rs diff --git a/src/test/compile-fail/borrowck-object-mutability.rs b/src/test/compile-fail/borrowck/borrowck-object-mutability.rs similarity index 100% rename from src/test/compile-fail/borrowck-object-mutability.rs rename to src/test/compile-fail/borrowck/borrowck-object-mutability.rs diff --git a/src/test/compile-fail/borrowck-or-init.rs b/src/test/compile-fail/borrowck/borrowck-or-init.rs similarity index 100% rename from src/test/compile-fail/borrowck-or-init.rs rename to src/test/compile-fail/borrowck/borrowck-or-init.rs diff --git a/src/test/compile-fail/borrowck-overloaded-call.rs b/src/test/compile-fail/borrowck/borrowck-overloaded-call.rs similarity index 100% rename from src/test/compile-fail/borrowck-overloaded-call.rs rename to src/test/compile-fail/borrowck/borrowck-overloaded-call.rs diff --git a/src/test/compile-fail/borrowck-overloaded-index-and-overloaded-deref.rs b/src/test/compile-fail/borrowck/borrowck-overloaded-index-and-overloaded-deref.rs similarity index 100% rename from src/test/compile-fail/borrowck-overloaded-index-and-overloaded-deref.rs rename to src/test/compile-fail/borrowck/borrowck-overloaded-index-and-overloaded-deref.rs diff --git a/src/test/compile-fail/borrowck-overloaded-index-autoderef.rs b/src/test/compile-fail/borrowck/borrowck-overloaded-index-autoderef.rs similarity index 100% rename from src/test/compile-fail/borrowck-overloaded-index-autoderef.rs rename to src/test/compile-fail/borrowck/borrowck-overloaded-index-autoderef.rs diff --git a/src/test/compile-fail/borrowck-overloaded-index-move-from-vec.rs b/src/test/compile-fail/borrowck/borrowck-overloaded-index-move-from-vec.rs similarity index 100% rename from src/test/compile-fail/borrowck-overloaded-index-move-from-vec.rs rename to src/test/compile-fail/borrowck/borrowck-overloaded-index-move-from-vec.rs diff --git a/src/test/compile-fail/borrowck-overloaded-index-move-index.rs b/src/test/compile-fail/borrowck/borrowck-overloaded-index-move-index.rs similarity index 100% rename from src/test/compile-fail/borrowck-overloaded-index-move-index.rs rename to src/test/compile-fail/borrowck/borrowck-overloaded-index-move-index.rs diff --git a/src/test/compile-fail/borrowck-overloaded-index-ref-index.rs b/src/test/compile-fail/borrowck/borrowck-overloaded-index-ref-index.rs similarity index 100% rename from src/test/compile-fail/borrowck-overloaded-index-ref-index.rs rename to src/test/compile-fail/borrowck/borrowck-overloaded-index-ref-index.rs diff --git a/src/test/compile-fail/borrowck-partial-reinit-1.rs b/src/test/compile-fail/borrowck/borrowck-partial-reinit-1.rs similarity index 100% rename from src/test/compile-fail/borrowck-partial-reinit-1.rs rename to src/test/compile-fail/borrowck/borrowck-partial-reinit-1.rs diff --git a/src/test/compile-fail/borrowck-partial-reinit-2.rs b/src/test/compile-fail/borrowck/borrowck-partial-reinit-2.rs similarity index 100% rename from src/test/compile-fail/borrowck-partial-reinit-2.rs rename to src/test/compile-fail/borrowck/borrowck-partial-reinit-2.rs diff --git a/src/test/compile-fail/borrowck-partial-reinit-3.rs b/src/test/compile-fail/borrowck/borrowck-partial-reinit-3.rs similarity index 100% rename from src/test/compile-fail/borrowck-partial-reinit-3.rs rename to src/test/compile-fail/borrowck/borrowck-partial-reinit-3.rs diff --git a/src/test/compile-fail/borrowck-partial-reinit-4.rs b/src/test/compile-fail/borrowck/borrowck-partial-reinit-4.rs similarity index 100% rename from src/test/compile-fail/borrowck-partial-reinit-4.rs rename to src/test/compile-fail/borrowck/borrowck-partial-reinit-4.rs diff --git a/src/test/compile-fail/borrowck-pat-reassign-binding.rs b/src/test/compile-fail/borrowck/borrowck-pat-reassign-binding.rs similarity index 100% rename from src/test/compile-fail/borrowck-pat-reassign-binding.rs rename to src/test/compile-fail/borrowck/borrowck-pat-reassign-binding.rs diff --git a/src/test/compile-fail/borrowck-reborrow-from-mut.rs b/src/test/compile-fail/borrowck/borrowck-reborrow-from-mut.rs similarity index 100% rename from src/test/compile-fail/borrowck-reborrow-from-mut.rs rename to src/test/compile-fail/borrowck/borrowck-reborrow-from-mut.rs diff --git a/src/test/compile-fail/borrowck-reborrow-from-shorter-lived-andmut.rs b/src/test/compile-fail/borrowck/borrowck-reborrow-from-shorter-lived-andmut.rs similarity index 100% rename from src/test/compile-fail/borrowck-reborrow-from-shorter-lived-andmut.rs rename to src/test/compile-fail/borrowck/borrowck-reborrow-from-shorter-lived-andmut.rs diff --git a/src/test/compile-fail/borrowck-ref-into-rvalue.rs b/src/test/compile-fail/borrowck/borrowck-ref-into-rvalue.rs similarity index 100% rename from src/test/compile-fail/borrowck-ref-into-rvalue.rs rename to src/test/compile-fail/borrowck/borrowck-ref-into-rvalue.rs diff --git a/src/test/compile-fail/borrowck-ref-mut-of-imm.rs b/src/test/compile-fail/borrowck/borrowck-ref-mut-of-imm.rs similarity index 100% rename from src/test/compile-fail/borrowck-ref-mut-of-imm.rs rename to src/test/compile-fail/borrowck/borrowck-ref-mut-of-imm.rs diff --git a/src/test/compile-fail/borrowck-report-with-custom-diagnostic.rs b/src/test/compile-fail/borrowck/borrowck-report-with-custom-diagnostic.rs similarity index 100% rename from src/test/compile-fail/borrowck-report-with-custom-diagnostic.rs rename to src/test/compile-fail/borrowck/borrowck-report-with-custom-diagnostic.rs diff --git a/src/test/compile-fail/borrowck-return-variable-on-stack-via-clone.rs b/src/test/compile-fail/borrowck/borrowck-return-variable-on-stack-via-clone.rs similarity index 100% rename from src/test/compile-fail/borrowck-return-variable-on-stack-via-clone.rs rename to src/test/compile-fail/borrowck/borrowck-return-variable-on-stack-via-clone.rs diff --git a/src/test/compile-fail/borrowck-return.rs b/src/test/compile-fail/borrowck/borrowck-return.rs similarity index 100% rename from src/test/compile-fail/borrowck-return.rs rename to src/test/compile-fail/borrowck/borrowck-return.rs diff --git a/src/test/compile-fail/borrowck-struct-update-with-dtor.rs b/src/test/compile-fail/borrowck/borrowck-struct-update-with-dtor.rs similarity index 100% rename from src/test/compile-fail/borrowck-struct-update-with-dtor.rs rename to src/test/compile-fail/borrowck/borrowck-struct-update-with-dtor.rs diff --git a/src/test/compile-fail/borrowck-swap-mut-base-ptr.rs b/src/test/compile-fail/borrowck/borrowck-swap-mut-base-ptr.rs similarity index 100% rename from src/test/compile-fail/borrowck-swap-mut-base-ptr.rs rename to src/test/compile-fail/borrowck/borrowck-swap-mut-base-ptr.rs diff --git a/src/test/compile-fail/borrowck-unary-move.rs b/src/test/compile-fail/borrowck/borrowck-unary-move.rs similarity index 100% rename from src/test/compile-fail/borrowck-unary-move.rs rename to src/test/compile-fail/borrowck/borrowck-unary-move.rs diff --git a/src/test/compile-fail/borrowck-unboxed-closures.rs b/src/test/compile-fail/borrowck/borrowck-unboxed-closures.rs similarity index 100% rename from src/test/compile-fail/borrowck-unboxed-closures.rs rename to src/test/compile-fail/borrowck/borrowck-unboxed-closures.rs diff --git a/src/test/compile-fail/borrowck-uninit-after-item.rs b/src/test/compile-fail/borrowck/borrowck-uninit-after-item.rs similarity index 100% rename from src/test/compile-fail/borrowck-uninit-after-item.rs rename to src/test/compile-fail/borrowck/borrowck-uninit-after-item.rs diff --git a/src/test/compile-fail/borrowck-uninit-in-assignop.rs b/src/test/compile-fail/borrowck/borrowck-uninit-in-assignop.rs similarity index 100% rename from src/test/compile-fail/borrowck-uninit-in-assignop.rs rename to src/test/compile-fail/borrowck/borrowck-uninit-in-assignop.rs diff --git a/src/test/compile-fail/borrowck-uninit.rs b/src/test/compile-fail/borrowck/borrowck-uninit.rs similarity index 100% rename from src/test/compile-fail/borrowck-uninit.rs rename to src/test/compile-fail/borrowck/borrowck-uninit.rs diff --git a/src/test/compile-fail/borrowck-uniq-via-lend.rs b/src/test/compile-fail/borrowck/borrowck-uniq-via-lend.rs similarity index 100% rename from src/test/compile-fail/borrowck-uniq-via-lend.rs rename to src/test/compile-fail/borrowck/borrowck-uniq-via-lend.rs diff --git a/src/test/compile-fail/borrowck-use-in-index-lvalue.rs b/src/test/compile-fail/borrowck/borrowck-use-in-index-lvalue.rs similarity index 100% rename from src/test/compile-fail/borrowck-use-in-index-lvalue.rs rename to src/test/compile-fail/borrowck/borrowck-use-in-index-lvalue.rs diff --git a/src/test/compile-fail/borrowck-use-mut-borrow.rs b/src/test/compile-fail/borrowck/borrowck-use-mut-borrow.rs similarity index 100% rename from src/test/compile-fail/borrowck-use-mut-borrow.rs rename to src/test/compile-fail/borrowck/borrowck-use-mut-borrow.rs diff --git a/src/test/compile-fail/borrowck-use-uninitialized-in-cast-trait.rs b/src/test/compile-fail/borrowck/borrowck-use-uninitialized-in-cast-trait.rs similarity index 100% rename from src/test/compile-fail/borrowck-use-uninitialized-in-cast-trait.rs rename to src/test/compile-fail/borrowck/borrowck-use-uninitialized-in-cast-trait.rs diff --git a/src/test/compile-fail/borrowck-use-uninitialized-in-cast.rs b/src/test/compile-fail/borrowck/borrowck-use-uninitialized-in-cast.rs similarity index 100% rename from src/test/compile-fail/borrowck-use-uninitialized-in-cast.rs rename to src/test/compile-fail/borrowck/borrowck-use-uninitialized-in-cast.rs diff --git a/src/test/compile-fail/borrowck-vec-pattern-element-loan.rs b/src/test/compile-fail/borrowck/borrowck-vec-pattern-element-loan.rs similarity index 100% rename from src/test/compile-fail/borrowck-vec-pattern-element-loan.rs rename to src/test/compile-fail/borrowck/borrowck-vec-pattern-element-loan.rs diff --git a/src/test/compile-fail/borrowck-vec-pattern-loan-from-mut.rs b/src/test/compile-fail/borrowck/borrowck-vec-pattern-loan-from-mut.rs similarity index 100% rename from src/test/compile-fail/borrowck-vec-pattern-loan-from-mut.rs rename to src/test/compile-fail/borrowck/borrowck-vec-pattern-loan-from-mut.rs diff --git a/src/test/compile-fail/borrowck-vec-pattern-move-tail.rs b/src/test/compile-fail/borrowck/borrowck-vec-pattern-move-tail.rs similarity index 100% rename from src/test/compile-fail/borrowck-vec-pattern-move-tail.rs rename to src/test/compile-fail/borrowck/borrowck-vec-pattern-move-tail.rs diff --git a/src/test/compile-fail/borrowck-vec-pattern-nesting.rs b/src/test/compile-fail/borrowck/borrowck-vec-pattern-nesting.rs similarity index 100% rename from src/test/compile-fail/borrowck-vec-pattern-nesting.rs rename to src/test/compile-fail/borrowck/borrowck-vec-pattern-nesting.rs diff --git a/src/test/compile-fail/borrowck-vec-pattern-tail-element-loan.rs b/src/test/compile-fail/borrowck/borrowck-vec-pattern-tail-element-loan.rs similarity index 100% rename from src/test/compile-fail/borrowck-vec-pattern-tail-element-loan.rs rename to src/test/compile-fail/borrowck/borrowck-vec-pattern-tail-element-loan.rs diff --git a/src/test/compile-fail/borrowck-while-break.rs b/src/test/compile-fail/borrowck/borrowck-while-break.rs similarity index 100% rename from src/test/compile-fail/borrowck-while-break.rs rename to src/test/compile-fail/borrowck/borrowck-while-break.rs diff --git a/src/test/compile-fail/borrowck-while-cond.rs b/src/test/compile-fail/borrowck/borrowck-while-cond.rs similarity index 100% rename from src/test/compile-fail/borrowck-while-cond.rs rename to src/test/compile-fail/borrowck/borrowck-while-cond.rs diff --git a/src/test/compile-fail/borrowck-while.rs b/src/test/compile-fail/borrowck/borrowck-while.rs similarity index 100% rename from src/test/compile-fail/borrowck-while.rs rename to src/test/compile-fail/borrowck/borrowck-while.rs diff --git a/src/test/run-pass/borrowck-assign-to-subfield.rs b/src/test/run-pass/borrowck/borrowck-assign-to-subfield.rs similarity index 100% rename from src/test/run-pass/borrowck-assign-to-subfield.rs rename to src/test/run-pass/borrowck/borrowck-assign-to-subfield.rs diff --git a/src/test/run-pass/borrowck-binding-mutbl.rs b/src/test/run-pass/borrowck/borrowck-binding-mutbl.rs similarity index 100% rename from src/test/run-pass/borrowck-binding-mutbl.rs rename to src/test/run-pass/borrowck/borrowck-binding-mutbl.rs diff --git a/src/test/run-pass/borrowck-borrow-from-expr-block.rs b/src/test/run-pass/borrowck/borrowck-borrow-from-expr-block.rs similarity index 100% rename from src/test/run-pass/borrowck-borrow-from-expr-block.rs rename to src/test/run-pass/borrowck/borrowck-borrow-from-expr-block.rs diff --git a/src/test/run-pass/borrowck-borrow-of-mut-base-ptr-safe.rs b/src/test/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs similarity index 100% rename from src/test/run-pass/borrowck-borrow-of-mut-base-ptr-safe.rs rename to src/test/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs diff --git a/src/test/run-pass/borrowck-closures-two-imm.rs b/src/test/run-pass/borrowck/borrowck-closures-two-imm.rs similarity index 100% rename from src/test/run-pass/borrowck-closures-two-imm.rs rename to src/test/run-pass/borrowck/borrowck-closures-two-imm.rs diff --git a/src/test/run-pass/borrowck-field-sensitivity.rs b/src/test/run-pass/borrowck/borrowck-field-sensitivity.rs similarity index 100% rename from src/test/run-pass/borrowck-field-sensitivity.rs rename to src/test/run-pass/borrowck/borrowck-field-sensitivity.rs diff --git a/src/test/run-pass/borrowck-fixed-length-vecs.rs b/src/test/run-pass/borrowck/borrowck-fixed-length-vecs.rs similarity index 100% rename from src/test/run-pass/borrowck-fixed-length-vecs.rs rename to src/test/run-pass/borrowck/borrowck-fixed-length-vecs.rs diff --git a/src/test/run-pass/borrowck-freeze-frozen-mut.rs b/src/test/run-pass/borrowck/borrowck-freeze-frozen-mut.rs similarity index 100% rename from src/test/run-pass/borrowck-freeze-frozen-mut.rs rename to src/test/run-pass/borrowck/borrowck-freeze-frozen-mut.rs diff --git a/src/test/run-pass/borrowck-lend-args.rs b/src/test/run-pass/borrowck/borrowck-lend-args.rs similarity index 100% rename from src/test/run-pass/borrowck-lend-args.rs rename to src/test/run-pass/borrowck/borrowck-lend-args.rs diff --git a/src/test/run-pass/borrowck-macro-interaction-issue-6304.rs b/src/test/run-pass/borrowck/borrowck-macro-interaction-issue-6304.rs similarity index 100% rename from src/test/run-pass/borrowck-macro-interaction-issue-6304.rs rename to src/test/run-pass/borrowck/borrowck-macro-interaction-issue-6304.rs diff --git a/src/test/run-pass/borrowck-move-by-capture-ok.rs b/src/test/run-pass/borrowck/borrowck-move-by-capture-ok.rs similarity index 100% rename from src/test/run-pass/borrowck-move-by-capture-ok.rs rename to src/test/run-pass/borrowck/borrowck-move-by-capture-ok.rs diff --git a/src/test/run-pass/borrowck-mut-uniq.rs b/src/test/run-pass/borrowck/borrowck-mut-uniq.rs similarity index 100% rename from src/test/run-pass/borrowck-mut-uniq.rs rename to src/test/run-pass/borrowck/borrowck-mut-uniq.rs diff --git a/src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs b/src/test/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs similarity index 100% rename from src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs rename to src/test/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs diff --git a/src/test/run-pass/borrowck-pat-enum.rs b/src/test/run-pass/borrowck/borrowck-pat-enum.rs similarity index 100% rename from src/test/run-pass/borrowck-pat-enum.rs rename to src/test/run-pass/borrowck/borrowck-pat-enum.rs diff --git a/src/test/run-pass/borrowck-pat-reassign-no-binding.rs b/src/test/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs similarity index 100% rename from src/test/run-pass/borrowck-pat-reassign-no-binding.rs rename to src/test/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs diff --git a/src/test/run-pass/borrowck-rvalues-mutable.rs b/src/test/run-pass/borrowck/borrowck-rvalues-mutable.rs similarity index 100% rename from src/test/run-pass/borrowck-rvalues-mutable.rs rename to src/test/run-pass/borrowck/borrowck-rvalues-mutable.rs diff --git a/src/test/run-pass/borrowck-scope-of-deref-issue-4666.rs b/src/test/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs similarity index 100% rename from src/test/run-pass/borrowck-scope-of-deref-issue-4666.rs rename to src/test/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs diff --git a/src/test/run-pass/borrowck-static-item-in-fn.rs b/src/test/run-pass/borrowck/borrowck-static-item-in-fn.rs similarity index 100% rename from src/test/run-pass/borrowck-static-item-in-fn.rs rename to src/test/run-pass/borrowck/borrowck-static-item-in-fn.rs diff --git a/src/test/run-pass/borrowck-trait-lifetime.rs b/src/test/run-pass/borrowck/borrowck-trait-lifetime.rs similarity index 100% rename from src/test/run-pass/borrowck-trait-lifetime.rs rename to src/test/run-pass/borrowck/borrowck-trait-lifetime.rs diff --git a/src/test/run-pass/borrowck-uniq-via-ref.rs b/src/test/run-pass/borrowck/borrowck-uniq-via-ref.rs similarity index 100% rename from src/test/run-pass/borrowck-uniq-via-ref.rs rename to src/test/run-pass/borrowck/borrowck-uniq-via-ref.rs diff --git a/src/test/run-pass/borrowck-univariant-enum.rs b/src/test/run-pass/borrowck/borrowck-univariant-enum.rs similarity index 100% rename from src/test/run-pass/borrowck-univariant-enum.rs rename to src/test/run-pass/borrowck/borrowck-univariant-enum.rs diff --git a/src/test/run-pass/borrowck-use-mut-borrow.rs b/src/test/run-pass/borrowck/borrowck-use-mut-borrow.rs similarity index 100% rename from src/test/run-pass/borrowck-use-mut-borrow.rs rename to src/test/run-pass/borrowck/borrowck-use-mut-borrow.rs