Rollup merge of #109873 - jyn514:subdirectories, r=compiler-errors

Move some UI tests into subdirectories
rust-lang · Apr 3, 2023 · 22df710 · 22df710
2 parents 41cd454 + 01b75e2
commit 22df710
Show file tree

Hide file tree

Showing 60 changed files with 1 addition and 1 deletion.
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
@@ -9,7 +9,7 @@ use std::path::{Path, PathBuf};
 
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
-const ROOT_ENTRY_LIMIT: usize = 940;
+const ROOT_ENTRY_LIMIT: usize = 881;
 const ISSUES_ENTRY_LIMIT: usize = 1978;
 
 fn check_entries(tests_path: &Path, bad: &mut bool) {

diff --git a/...slightly-nice-generic-literal-messages.rs → ...slightly-nice-generic-literal-messages.rs b/...slightly-nice-generic-literal-messages.rs → ...slightly-nice-generic-literal-messages.rs
diff --git a/...htly-nice-generic-literal-messages.stderr → ...htly-nice-generic-literal-messages.stderr b/...htly-nice-generic-literal-messages.stderr → ...htly-nice-generic-literal-messages.stderr
diff --git a/tests/ui/unterminated-comment.rs → tests/ui/lexer/unterminated-comment.rs b/tests/ui/unterminated-comment.rs → tests/ui/lexer/unterminated-comment.rs
diff --git a/tests/ui/unterminated-comment.stderr → tests/ui/lexer/unterminated-comment.stderr b/tests/ui/unterminated-comment.stderr → tests/ui/lexer/unterminated-comment.stderr
diff --git a/tests/ui/unterminated-nested-comment.rs → ...s/ui/lexer/unterminated-nested-comment.rs b/tests/ui/unterminated-nested-comment.rs → ...s/ui/lexer/unterminated-nested-comment.rs
diff --git a/tests/ui/unterminated-nested-comment.stderr → .../lexer/unterminated-nested-comment.stderr b/tests/ui/unterminated-nested-comment.stderr → .../lexer/unterminated-nested-comment.stderr
diff --git a/tests/ui/auxiliary/xc-private-method-lib.rs → ...rivacy/auxiliary/xc-private-method-lib.rs b/tests/ui/auxiliary/xc-private-method-lib.rs → ...rivacy/auxiliary/xc-private-method-lib.rs
diff --git a/tests/ui/xc-private-method.rs → tests/ui/privacy/xc-private-method.rs b/tests/ui/xc-private-method.rs → tests/ui/privacy/xc-private-method.rs
diff --git a/tests/ui/xc-private-method.stderr → tests/ui/privacy/xc-private-method.stderr b/tests/ui/xc-private-method.stderr → tests/ui/privacy/xc-private-method.stderr
diff --git a/tests/ui/xc-private-method2.rs → tests/ui/privacy/xc-private-method2.rs b/tests/ui/xc-private-method2.rs → tests/ui/privacy/xc-private-method2.rs
diff --git a/tests/ui/xc-private-method2.stderr → tests/ui/privacy/xc-private-method2.stderr b/tests/ui/xc-private-method2.stderr → tests/ui/privacy/xc-private-method2.stderr
diff --git a/tests/ui/reachable-unnameable-type-alias.rs → ...chable/reachable-unnameable-type-alias.rs b/tests/ui/reachable-unnameable-type-alias.rs → ...chable/reachable-unnameable-type-alias.rs
diff --git a/tests/ui/disambiguate-identical-names.rs → ...i/resolve/disambiguate-identical-names.rs b/tests/ui/disambiguate-identical-names.rs → ...i/resolve/disambiguate-identical-names.rs
diff --git a/tests/ui/disambiguate-identical-names.stderr → ...solve/disambiguate-identical-names.stderr b/tests/ui/disambiguate-identical-names.stderr → ...solve/disambiguate-identical-names.stderr
diff --git a/tests/ui/thread-local-mutation.rs → .../ui/thread-local/thread-local-mutation.rs b/tests/ui/thread-local-mutation.rs → .../ui/thread-local/thread-local-mutation.rs
diff --git a/tests/ui/thread-local-mutation.stderr → ...thread-local/thread-local-mutation.stderr b/tests/ui/thread-local-mutation.stderr → ...thread-local/thread-local-mutation.stderr
diff --git a/tests/ui/thread-local-static.rs → tests/ui/thread-local/thread-local-static.rs b/tests/ui/thread-local-static.rs → tests/ui/thread-local/thread-local-static.rs
diff --git a/tests/ui/thread-local-static.stderr → ...i/thread-local/thread-local-static.stderr b/tests/ui/thread-local-static.stderr → ...i/thread-local/thread-local-static.stderr
diff --git a/tests/ui/wrong-mul-method-signature.rs → ...s/ui/traits/wrong-mul-method-signature.rs b/tests/ui/wrong-mul-method-signature.rs → ...s/ui/traits/wrong-mul-method-signature.rs
diff --git a/tests/ui/wrong-mul-method-signature.stderr → .../traits/wrong-mul-method-signature.stderr b/tests/ui/wrong-mul-method-signature.stderr → .../traits/wrong-mul-method-signature.stderr
diff --git a/tests/ui/tuple-index.rs → tests/ui/tuple/tuple-index.rs b/tests/ui/tuple-index.rs → tests/ui/tuple/tuple-index.rs
diff --git a/tests/ui/output-type-mismatch.rs → tests/ui/typeck/output-type-mismatch.rs b/tests/ui/output-type-mismatch.rs → tests/ui/typeck/output-type-mismatch.rs
diff --git a/tests/ui/output-type-mismatch.stderr → tests/ui/typeck/output-type-mismatch.stderr b/tests/ui/output-type-mismatch.stderr → tests/ui/typeck/output-type-mismatch.stderr
diff --git a/tests/ui/suppressed-error.rs → tests/ui/typeck/suppressed-error.rs b/tests/ui/suppressed-error.rs → tests/ui/typeck/suppressed-error.rs
diff --git a/tests/ui/suppressed-error.stderr → tests/ui/typeck/suppressed-error.stderr b/tests/ui/suppressed-error.stderr → tests/ui/typeck/suppressed-error.stderr
diff --git a/tests/ui/tag-that-dare-not-speak-its-name.rs → ...ypeck/tag-that-dare-not-speak-its-name.rs b/tests/ui/tag-that-dare-not-speak-its-name.rs → ...ypeck/tag-that-dare-not-speak-its-name.rs
diff --git a/...i/tag-that-dare-not-speak-its-name.stderr → ...k/tag-that-dare-not-speak-its-name.stderr b/...i/tag-that-dare-not-speak-its-name.stderr → ...k/tag-that-dare-not-speak-its-name.stderr
diff --git a/tests/ui/terr-in-field.rs → tests/ui/typeck/terr-in-field.rs b/tests/ui/terr-in-field.rs → tests/ui/typeck/terr-in-field.rs
diff --git a/tests/ui/terr-in-field.stderr → tests/ui/typeck/terr-in-field.stderr b/tests/ui/terr-in-field.stderr → tests/ui/typeck/terr-in-field.stderr
diff --git a/tests/ui/terr-sorts.rs → tests/ui/typeck/terr-sorts.rs b/tests/ui/terr-sorts.rs → tests/ui/typeck/terr-sorts.rs
diff --git a/tests/ui/terr-sorts.stderr → tests/ui/typeck/terr-sorts.stderr b/tests/ui/terr-sorts.stderr → tests/ui/typeck/terr-sorts.stderr
diff --git a/tests/ui/while-type-error.rs → tests/ui/typeck/while-type-error.rs b/tests/ui/while-type-error.rs → tests/ui/typeck/while-type-error.rs
diff --git a/tests/ui/while-type-error.stderr → tests/ui/typeck/while-type-error.stderr b/tests/ui/while-type-error.stderr → tests/ui/typeck/while-type-error.stderr
diff --git a/tests/ui/wrong-ret-type.rs → tests/ui/typeck/wrong-ret-type.rs b/tests/ui/wrong-ret-type.rs → tests/ui/typeck/wrong-ret-type.rs
diff --git a/tests/ui/wrong-ret-type.stderr → tests/ui/typeck/wrong-ret-type.stderr b/tests/ui/wrong-ret-type.stderr → tests/ui/typeck/wrong-ret-type.stderr
diff --git a/tests/ui/ufcs-polymorphic-paths.rs → tests/ui/ufcs/ufcs-polymorphic-paths.rs b/tests/ui/ufcs-polymorphic-paths.rs → tests/ui/ufcs/ufcs-polymorphic-paths.rs
diff --git a/tests/ui/expr-block-generic-unique1.rs → ...s/ui/unique/expr-block-generic-unique1.rs b/tests/ui/expr-block-generic-unique1.rs → ...s/ui/unique/expr-block-generic-unique1.rs
diff --git a/tests/ui/expr-block-generic-unique2.rs → ...s/ui/unique/expr-block-generic-unique2.rs b/tests/ui/expr-block-generic-unique2.rs → ...s/ui/unique/expr-block-generic-unique2.rs
diff --git a/tests/ui/expr-if-unique.rs → tests/ui/unique/expr-if-unique.rs b/tests/ui/expr-if-unique.rs → tests/ui/unique/expr-if-unique.rs
diff --git a/tests/ui/unique-object-noncopyable.rs → tests/ui/unique/unique-object-noncopyable.rs b/tests/ui/unique-object-noncopyable.rs → tests/ui/unique/unique-object-noncopyable.rs
diff --git a/tests/ui/unique-object-noncopyable.stderr → ...i/unique/unique-object-noncopyable.stderr b/tests/ui/unique-object-noncopyable.stderr → ...i/unique/unique-object-noncopyable.stderr
diff --git a/tests/ui/unique-pinned-nocopy.rs → tests/ui/unique/unique-pinned-nocopy.rs b/tests/ui/unique-pinned-nocopy.rs → tests/ui/unique/unique-pinned-nocopy.rs
diff --git a/tests/ui/unique-pinned-nocopy.stderr → tests/ui/unique/unique-pinned-nocopy.stderr b/tests/ui/unique-pinned-nocopy.stderr → tests/ui/unique/unique-pinned-nocopy.stderr
diff --git a/tests/ui/unwind-unique.rs → tests/ui/unique/unwind-unique.rs b/tests/ui/unwind-unique.rs → tests/ui/unique/unwind-unique.rs
diff --git a/tests/ui/mir-unpretty.rs → tests/ui/unpretty/mir-unpretty.rs b/tests/ui/mir-unpretty.rs → tests/ui/unpretty/mir-unpretty.rs
diff --git a/tests/ui/mir-unpretty.stderr → tests/ui/unpretty/mir-unpretty.stderr b/tests/ui/mir-unpretty.stderr → tests/ui/unpretty/mir-unpretty.stderr
diff --git a/tests/ui/unpretty-expr-fn-arg.rs → tests/ui/unpretty/unpretty-expr-fn-arg.rs b/tests/ui/unpretty-expr-fn-arg.rs → tests/ui/unpretty/unpretty-expr-fn-arg.rs
diff --git a/tests/ui/unpretty-expr-fn-arg.stdout → ...s/ui/unpretty/unpretty-expr-fn-arg.stdout b/tests/ui/unpretty-expr-fn-arg.stdout → ...s/ui/unpretty/unpretty-expr-fn-arg.stdout
diff --git a/tests/ui/foreign-unsafe-fn-called.mir.stderr → ...nsafe/foreign-unsafe-fn-called.mir.stderr b/tests/ui/foreign-unsafe-fn-called.mir.stderr → ...nsafe/foreign-unsafe-fn-called.mir.stderr
diff --git a/tests/ui/foreign-unsafe-fn-called.rs → tests/ui/unsafe/foreign-unsafe-fn-called.rs b/tests/ui/foreign-unsafe-fn-called.rs → tests/ui/unsafe/foreign-unsafe-fn-called.rs
diff --git a/...s/ui/foreign-unsafe-fn-called.thir.stderr → ...safe/foreign-unsafe-fn-called.thir.stderr b/...s/ui/foreign-unsafe-fn-called.thir.stderr → ...safe/foreign-unsafe-fn-called.thir.stderr
diff --git a/tests/ui/new-unsafe-pointers.rs → tests/ui/unsafe/new-unsafe-pointers.rs b/tests/ui/new-unsafe-pointers.rs → tests/ui/unsafe/new-unsafe-pointers.rs
diff --git a/tests/ui/unsafe-fn-called-from-unsafe-blk.rs → ...nsafe/unsafe-fn-called-from-unsafe-blk.rs b/tests/ui/unsafe-fn-called-from-unsafe-blk.rs → ...nsafe/unsafe-fn-called-from-unsafe-blk.rs
diff --git a/tests/ui/unsafe-fn-called-from-unsafe-fn.rs → ...unsafe/unsafe-fn-called-from-unsafe-fn.rs b/tests/ui/unsafe-fn-called-from-unsafe-fn.rs → ...unsafe/unsafe-fn-called-from-unsafe-fn.rs
diff --git a/tests/ui/unsafe-pointer-assignability.rs → ...ui/unsafe/unsafe-pointer-assignability.rs b/tests/ui/unsafe-pointer-assignability.rs → ...ui/unsafe/unsafe-pointer-assignability.rs
diff --git a/...riance-intersection-of-ref-and-opt-ref.rs → ...riance-intersection-of-ref-and-opt-ref.rs b/...riance-intersection-of-ref-and-opt-ref.rs → ...riance-intersection-of-ref-and-opt-ref.rs
diff --git a/tests/ui/variance-iterators-in-libcore.rs → ...variance/variance-iterators-in-libcore.rs b/tests/ui/variance-iterators-in-libcore.rs → ...variance/variance-iterators-in-libcore.rs
diff --git a/tests/ui/wasm-custom-section-relocations.rs → ...i/wasm/wasm-custom-section-relocations.rs b/tests/ui/wasm-custom-section-relocations.rs → ...i/wasm/wasm-custom-section-relocations.rs
diff --git a/...ui/wasm-custom-section-relocations.stderr → ...sm/wasm-custom-section-relocations.stderr b/...ui/wasm-custom-section-relocations.stderr → ...sm/wasm-custom-section-relocations.stderr