From 34f30bcc0fec62078751c923fa9f546b847488cd Mon Sep 17 00:00:00 2001 From: Caio Date: Sun, 14 Feb 2021 14:53:31 -0300 Subject: [PATCH] Move some tests to more reasonable directories --- .../ui/{issues => associated-types}/issue-21726.rs | 0 .../ui/{issues => associated-types}/issue-22560.rs | 0 .../issue-22560.stderr | 0 .../{issues => associated-types}/issue-23595-2.rs | 0 .../issue-23595-2.stderr | 0 .../ui/{issues => associated-types}/issue-24204.rs | 0 .../issue-43784-associated-type.rs | 0 .../issue-43784-associated-type.stderr | 0 .../project-defer-unification.rs | 0 .../ui/{issues => async-await}/issue-77993-2.rs | 0 .../{issues => async-await}/issue-77993-2.stderr | 0 .../repeat_count_const_in_async_fn.rs | 0 src/test/ui/{issues => consts}/issue-13837.rs | 0 .../{issues => consts}/issue-17718-references.rs | 0 .../issue-17718-references.stderr | 0 src/test/ui/{issues => consts}/issue-32829.rs | 0 src/test/ui/{issues => consts}/issue-32829.stderr | 0 src/test/ui/{issues => consts}/issue-33537.rs | 0 .../ui/{ => consts}/rvalue-static-promotion.rs | 0 .../{ => consts}/write-to-static-mut-in-static.rs | 0 .../write-to-static-mut-in-static.stderr | 0 src/test/ui/emit-artifact-notifications.stderr | 1 - .../if/expr-if-panic-pass.rs} | 0 src/test/ui/{issues => expr/if}/issue-4201.rs | 0 src/test/ui/{issues => expr/if}/issue-4201.stderr | 0 .../cleanup-rvalue-during-if-and-while.rs | 0 src/test/ui/{issues => hygiene}/issue-40847.rs | 0 src/test/ui/{issues => }/issue-6157.rs | 0 .../{issues => lint}/issue-31924-non-snake-ffi.rs | 0 src/test/ui/{ => macros}/html-literals.rs | 0 src/test/ui/{ => parser}/dotdotdot-expr.rs | 0 src/test/ui/{ => parser}/dotdotdot-expr.stderr | 0 src/test/ui/{issues => parser}/issue-20616-3.rs | 0 .../ui/{issues => parser}/issue-20616-3.stderr | 0 src/test/ui/{issues => parser}/issue-44406.rs | 0 src/test/ui/{issues => parser}/issue-44406.stderr | 0 .../old-suffixes-are-really-forbidden.rs | 0 .../old-suffixes-are-really-forbidden.stderr | 0 .../{ => parser}/struct-literal-variant-in-if.rs | 0 .../struct-literal-variant-in-if.stderr | 0 src/test/ui/range_inclusive_gate.rs | 14 -------------- ...ions-fn-subtyping-return-static-fail.nll.stderr | 0 .../regions-fn-subtyping-return-static-fail.rs | 0 .../regions-fn-subtyping-return-static-fail.stderr | 0 .../emit-artifact-notifications.nll.stderr | 0 .../emit-artifact-notifications.polonius.stderr | 0 .../ui/{ => rmeta}/emit-artifact-notifications.rs | 0 .../ui/rmeta/emit-artifact-notifications.stderr | 1 + src/test/ui/{ => rmeta}/emit-metadata-obj.rs | 0 src/test/ui/{ => structs-enums}/type-sizes.rs | 0 src/test/ui/{ => tuple}/one-tuple.rs | 0 .../{ => unboxed-closures}/type-id-higher-rank.rs | 0 src/tools/tidy/src/ui_tests.rs | 4 ++-- 53 files changed, 3 insertions(+), 17 deletions(-) rename src/test/ui/{issues => associated-types}/issue-21726.rs (100%) rename src/test/ui/{issues => associated-types}/issue-22560.rs (100%) rename src/test/ui/{issues => associated-types}/issue-22560.stderr (100%) rename src/test/ui/{issues => associated-types}/issue-23595-2.rs (100%) rename src/test/ui/{issues => associated-types}/issue-23595-2.stderr (100%) rename src/test/ui/{issues => associated-types}/issue-24204.rs (100%) rename src/test/ui/{issues => associated-types}/issue-43784-associated-type.rs (100%) rename src/test/ui/{issues => associated-types}/issue-43784-associated-type.stderr (100%) rename src/test/ui/{ => associated-types}/project-defer-unification.rs (100%) rename src/test/ui/{issues => async-await}/issue-77993-2.rs (100%) rename src/test/ui/{issues => async-await}/issue-77993-2.stderr (100%) rename src/test/ui/{ => async-await}/repeat_count_const_in_async_fn.rs (100%) rename src/test/ui/{issues => consts}/issue-13837.rs (100%) rename src/test/ui/{issues => consts}/issue-17718-references.rs (100%) rename src/test/ui/{issues => consts}/issue-17718-references.stderr (100%) rename src/test/ui/{issues => consts}/issue-32829.rs (100%) rename src/test/ui/{issues => consts}/issue-32829.stderr (100%) rename src/test/ui/{issues => consts}/issue-33537.rs (100%) rename src/test/ui/{ => consts}/rvalue-static-promotion.rs (100%) rename src/test/ui/{ => consts}/write-to-static-mut-in-static.rs (100%) rename src/test/ui/{ => consts}/write-to-static-mut-in-static.stderr (100%) delete mode 100644 src/test/ui/emit-artifact-notifications.stderr rename src/test/ui/{expr-if-panic.rs => expr/if/expr-if-panic-pass.rs} (100%) rename src/test/ui/{issues => expr/if}/issue-4201.rs (100%) rename src/test/ui/{issues => expr/if}/issue-4201.stderr (100%) rename src/test/ui/{ => for-loop-while}/cleanup-rvalue-during-if-and-while.rs (100%) rename src/test/ui/{issues => hygiene}/issue-40847.rs (100%) rename src/test/ui/{issues => }/issue-6157.rs (100%) rename src/test/ui/{issues => lint}/issue-31924-non-snake-ffi.rs (100%) rename src/test/ui/{ => macros}/html-literals.rs (100%) rename src/test/ui/{ => parser}/dotdotdot-expr.rs (100%) rename src/test/ui/{ => parser}/dotdotdot-expr.stderr (100%) rename src/test/ui/{issues => parser}/issue-20616-3.rs (100%) rename src/test/ui/{issues => parser}/issue-20616-3.stderr (100%) rename src/test/ui/{issues => parser}/issue-44406.rs (100%) rename src/test/ui/{issues => parser}/issue-44406.stderr (100%) rename src/test/ui/{ => parser}/old-suffixes-are-really-forbidden.rs (100%) rename src/test/ui/{ => parser}/old-suffixes-are-really-forbidden.stderr (100%) rename src/test/ui/{ => parser}/struct-literal-variant-in-if.rs (100%) rename src/test/ui/{ => parser}/struct-literal-variant-in-if.stderr (100%) delete mode 100644 src/test/ui/range_inclusive_gate.rs rename src/test/ui/{ => regions}/regions-fn-subtyping-return-static-fail.nll.stderr (100%) rename src/test/ui/{ => regions}/regions-fn-subtyping-return-static-fail.rs (100%) rename src/test/ui/{ => regions}/regions-fn-subtyping-return-static-fail.stderr (100%) rename src/test/ui/{ => rmeta}/emit-artifact-notifications.nll.stderr (100%) rename src/test/ui/{ => rmeta}/emit-artifact-notifications.polonius.stderr (100%) rename src/test/ui/{ => rmeta}/emit-artifact-notifications.rs (100%) create mode 100644 src/test/ui/rmeta/emit-artifact-notifications.stderr rename src/test/ui/{ => rmeta}/emit-metadata-obj.rs (100%) rename src/test/ui/{ => structs-enums}/type-sizes.rs (100%) rename src/test/ui/{ => tuple}/one-tuple.rs (100%) rename src/test/ui/{ => unboxed-closures}/type-id-higher-rank.rs (100%) diff --git a/src/test/ui/issues/issue-21726.rs b/src/test/ui/associated-types/issue-21726.rs similarity index 100% rename from src/test/ui/issues/issue-21726.rs rename to src/test/ui/associated-types/issue-21726.rs diff --git a/src/test/ui/issues/issue-22560.rs b/src/test/ui/associated-types/issue-22560.rs similarity index 100% rename from src/test/ui/issues/issue-22560.rs rename to src/test/ui/associated-types/issue-22560.rs diff --git a/src/test/ui/issues/issue-22560.stderr b/src/test/ui/associated-types/issue-22560.stderr similarity index 100% rename from src/test/ui/issues/issue-22560.stderr rename to src/test/ui/associated-types/issue-22560.stderr diff --git a/src/test/ui/issues/issue-23595-2.rs b/src/test/ui/associated-types/issue-23595-2.rs similarity index 100% rename from src/test/ui/issues/issue-23595-2.rs rename to src/test/ui/associated-types/issue-23595-2.rs diff --git a/src/test/ui/issues/issue-23595-2.stderr b/src/test/ui/associated-types/issue-23595-2.stderr similarity index 100% rename from src/test/ui/issues/issue-23595-2.stderr rename to src/test/ui/associated-types/issue-23595-2.stderr diff --git a/src/test/ui/issues/issue-24204.rs b/src/test/ui/associated-types/issue-24204.rs similarity index 100% rename from src/test/ui/issues/issue-24204.rs rename to src/test/ui/associated-types/issue-24204.rs diff --git a/src/test/ui/issues/issue-43784-associated-type.rs b/src/test/ui/associated-types/issue-43784-associated-type.rs similarity index 100% rename from src/test/ui/issues/issue-43784-associated-type.rs rename to src/test/ui/associated-types/issue-43784-associated-type.rs diff --git a/src/test/ui/issues/issue-43784-associated-type.stderr b/src/test/ui/associated-types/issue-43784-associated-type.stderr similarity index 100% rename from src/test/ui/issues/issue-43784-associated-type.stderr rename to src/test/ui/associated-types/issue-43784-associated-type.stderr diff --git a/src/test/ui/project-defer-unification.rs b/src/test/ui/associated-types/project-defer-unification.rs similarity index 100% rename from src/test/ui/project-defer-unification.rs rename to src/test/ui/associated-types/project-defer-unification.rs diff --git a/src/test/ui/issues/issue-77993-2.rs b/src/test/ui/async-await/issue-77993-2.rs similarity index 100% rename from src/test/ui/issues/issue-77993-2.rs rename to src/test/ui/async-await/issue-77993-2.rs diff --git a/src/test/ui/issues/issue-77993-2.stderr b/src/test/ui/async-await/issue-77993-2.stderr similarity index 100% rename from src/test/ui/issues/issue-77993-2.stderr rename to src/test/ui/async-await/issue-77993-2.stderr diff --git a/src/test/ui/repeat_count_const_in_async_fn.rs b/src/test/ui/async-await/repeat_count_const_in_async_fn.rs similarity index 100% rename from src/test/ui/repeat_count_const_in_async_fn.rs rename to src/test/ui/async-await/repeat_count_const_in_async_fn.rs diff --git a/src/test/ui/issues/issue-13837.rs b/src/test/ui/consts/issue-13837.rs similarity index 100% rename from src/test/ui/issues/issue-13837.rs rename to src/test/ui/consts/issue-13837.rs diff --git a/src/test/ui/issues/issue-17718-references.rs b/src/test/ui/consts/issue-17718-references.rs similarity index 100% rename from src/test/ui/issues/issue-17718-references.rs rename to src/test/ui/consts/issue-17718-references.rs diff --git a/src/test/ui/issues/issue-17718-references.stderr b/src/test/ui/consts/issue-17718-references.stderr similarity index 100% rename from src/test/ui/issues/issue-17718-references.stderr rename to src/test/ui/consts/issue-17718-references.stderr diff --git a/src/test/ui/issues/issue-32829.rs b/src/test/ui/consts/issue-32829.rs similarity index 100% rename from src/test/ui/issues/issue-32829.rs rename to src/test/ui/consts/issue-32829.rs diff --git a/src/test/ui/issues/issue-32829.stderr b/src/test/ui/consts/issue-32829.stderr similarity index 100% rename from src/test/ui/issues/issue-32829.stderr rename to src/test/ui/consts/issue-32829.stderr diff --git a/src/test/ui/issues/issue-33537.rs b/src/test/ui/consts/issue-33537.rs similarity index 100% rename from src/test/ui/issues/issue-33537.rs rename to src/test/ui/consts/issue-33537.rs diff --git a/src/test/ui/rvalue-static-promotion.rs b/src/test/ui/consts/rvalue-static-promotion.rs similarity index 100% rename from src/test/ui/rvalue-static-promotion.rs rename to src/test/ui/consts/rvalue-static-promotion.rs diff --git a/src/test/ui/write-to-static-mut-in-static.rs b/src/test/ui/consts/write-to-static-mut-in-static.rs similarity index 100% rename from src/test/ui/write-to-static-mut-in-static.rs rename to src/test/ui/consts/write-to-static-mut-in-static.rs diff --git a/src/test/ui/write-to-static-mut-in-static.stderr b/src/test/ui/consts/write-to-static-mut-in-static.stderr similarity index 100% rename from src/test/ui/write-to-static-mut-in-static.stderr rename to src/test/ui/consts/write-to-static-mut-in-static.stderr diff --git a/src/test/ui/emit-artifact-notifications.stderr b/src/test/ui/emit-artifact-notifications.stderr deleted file mode 100644 index 260d41b8f15cc..0000000000000 --- a/src/test/ui/emit-artifact-notifications.stderr +++ /dev/null @@ -1 +0,0 @@ -{"artifact":"$TEST_BUILD_DIR/emit-artifact-notifications/libemit_artifact_notifications.rmeta","emit":"metadata"} diff --git a/src/test/ui/expr-if-panic.rs b/src/test/ui/expr/if/expr-if-panic-pass.rs similarity index 100% rename from src/test/ui/expr-if-panic.rs rename to src/test/ui/expr/if/expr-if-panic-pass.rs diff --git a/src/test/ui/issues/issue-4201.rs b/src/test/ui/expr/if/issue-4201.rs similarity index 100% rename from src/test/ui/issues/issue-4201.rs rename to src/test/ui/expr/if/issue-4201.rs diff --git a/src/test/ui/issues/issue-4201.stderr b/src/test/ui/expr/if/issue-4201.stderr similarity index 100% rename from src/test/ui/issues/issue-4201.stderr rename to src/test/ui/expr/if/issue-4201.stderr diff --git a/src/test/ui/cleanup-rvalue-during-if-and-while.rs b/src/test/ui/for-loop-while/cleanup-rvalue-during-if-and-while.rs similarity index 100% rename from src/test/ui/cleanup-rvalue-during-if-and-while.rs rename to src/test/ui/for-loop-while/cleanup-rvalue-during-if-and-while.rs diff --git a/src/test/ui/issues/issue-40847.rs b/src/test/ui/hygiene/issue-40847.rs similarity index 100% rename from src/test/ui/issues/issue-40847.rs rename to src/test/ui/hygiene/issue-40847.rs diff --git a/src/test/ui/issues/issue-6157.rs b/src/test/ui/issue-6157.rs similarity index 100% rename from src/test/ui/issues/issue-6157.rs rename to src/test/ui/issue-6157.rs diff --git a/src/test/ui/issues/issue-31924-non-snake-ffi.rs b/src/test/ui/lint/issue-31924-non-snake-ffi.rs similarity index 100% rename from src/test/ui/issues/issue-31924-non-snake-ffi.rs rename to src/test/ui/lint/issue-31924-non-snake-ffi.rs diff --git a/src/test/ui/html-literals.rs b/src/test/ui/macros/html-literals.rs similarity index 100% rename from src/test/ui/html-literals.rs rename to src/test/ui/macros/html-literals.rs diff --git a/src/test/ui/dotdotdot-expr.rs b/src/test/ui/parser/dotdotdot-expr.rs similarity index 100% rename from src/test/ui/dotdotdot-expr.rs rename to src/test/ui/parser/dotdotdot-expr.rs diff --git a/src/test/ui/dotdotdot-expr.stderr b/src/test/ui/parser/dotdotdot-expr.stderr similarity index 100% rename from src/test/ui/dotdotdot-expr.stderr rename to src/test/ui/parser/dotdotdot-expr.stderr diff --git a/src/test/ui/issues/issue-20616-3.rs b/src/test/ui/parser/issue-20616-3.rs similarity index 100% rename from src/test/ui/issues/issue-20616-3.rs rename to src/test/ui/parser/issue-20616-3.rs diff --git a/src/test/ui/issues/issue-20616-3.stderr b/src/test/ui/parser/issue-20616-3.stderr similarity index 100% rename from src/test/ui/issues/issue-20616-3.stderr rename to src/test/ui/parser/issue-20616-3.stderr diff --git a/src/test/ui/issues/issue-44406.rs b/src/test/ui/parser/issue-44406.rs similarity index 100% rename from src/test/ui/issues/issue-44406.rs rename to src/test/ui/parser/issue-44406.rs diff --git a/src/test/ui/issues/issue-44406.stderr b/src/test/ui/parser/issue-44406.stderr similarity index 100% rename from src/test/ui/issues/issue-44406.stderr rename to src/test/ui/parser/issue-44406.stderr diff --git a/src/test/ui/old-suffixes-are-really-forbidden.rs b/src/test/ui/parser/old-suffixes-are-really-forbidden.rs similarity index 100% rename from src/test/ui/old-suffixes-are-really-forbidden.rs rename to src/test/ui/parser/old-suffixes-are-really-forbidden.rs diff --git a/src/test/ui/old-suffixes-are-really-forbidden.stderr b/src/test/ui/parser/old-suffixes-are-really-forbidden.stderr similarity index 100% rename from src/test/ui/old-suffixes-are-really-forbidden.stderr rename to src/test/ui/parser/old-suffixes-are-really-forbidden.stderr diff --git a/src/test/ui/struct-literal-variant-in-if.rs b/src/test/ui/parser/struct-literal-variant-in-if.rs similarity index 100% rename from src/test/ui/struct-literal-variant-in-if.rs rename to src/test/ui/parser/struct-literal-variant-in-if.rs diff --git a/src/test/ui/struct-literal-variant-in-if.stderr b/src/test/ui/parser/struct-literal-variant-in-if.stderr similarity index 100% rename from src/test/ui/struct-literal-variant-in-if.stderr rename to src/test/ui/parser/struct-literal-variant-in-if.stderr diff --git a/src/test/ui/range_inclusive_gate.rs b/src/test/ui/range_inclusive_gate.rs deleted file mode 100644 index e26e31b44a079..0000000000000 --- a/src/test/ui/range_inclusive_gate.rs +++ /dev/null @@ -1,14 +0,0 @@ -// run-pass - -#![allow(unused_comparisons)] -// Test that you only need the syntax gate if you don't mention the structs. -// (Obsoleted since both features are stabilized) - -fn main() { - let mut count = 0; - for i in 0_usize..=10 { - assert!(i >= 0 && i <= 10); - count += i; - } - assert_eq!(count, 55); -} diff --git a/src/test/ui/regions-fn-subtyping-return-static-fail.nll.stderr b/src/test/ui/regions/regions-fn-subtyping-return-static-fail.nll.stderr similarity index 100% rename from src/test/ui/regions-fn-subtyping-return-static-fail.nll.stderr rename to src/test/ui/regions/regions-fn-subtyping-return-static-fail.nll.stderr diff --git a/src/test/ui/regions-fn-subtyping-return-static-fail.rs b/src/test/ui/regions/regions-fn-subtyping-return-static-fail.rs similarity index 100% rename from src/test/ui/regions-fn-subtyping-return-static-fail.rs rename to src/test/ui/regions/regions-fn-subtyping-return-static-fail.rs diff --git a/src/test/ui/regions-fn-subtyping-return-static-fail.stderr b/src/test/ui/regions/regions-fn-subtyping-return-static-fail.stderr similarity index 100% rename from src/test/ui/regions-fn-subtyping-return-static-fail.stderr rename to src/test/ui/regions/regions-fn-subtyping-return-static-fail.stderr diff --git a/src/test/ui/emit-artifact-notifications.nll.stderr b/src/test/ui/rmeta/emit-artifact-notifications.nll.stderr similarity index 100% rename from src/test/ui/emit-artifact-notifications.nll.stderr rename to src/test/ui/rmeta/emit-artifact-notifications.nll.stderr diff --git a/src/test/ui/emit-artifact-notifications.polonius.stderr b/src/test/ui/rmeta/emit-artifact-notifications.polonius.stderr similarity index 100% rename from src/test/ui/emit-artifact-notifications.polonius.stderr rename to src/test/ui/rmeta/emit-artifact-notifications.polonius.stderr diff --git a/src/test/ui/emit-artifact-notifications.rs b/src/test/ui/rmeta/emit-artifact-notifications.rs similarity index 100% rename from src/test/ui/emit-artifact-notifications.rs rename to src/test/ui/rmeta/emit-artifact-notifications.rs diff --git a/src/test/ui/rmeta/emit-artifact-notifications.stderr b/src/test/ui/rmeta/emit-artifact-notifications.stderr new file mode 100644 index 0000000000000..b2f0aa7575c06 --- /dev/null +++ b/src/test/ui/rmeta/emit-artifact-notifications.stderr @@ -0,0 +1 @@ +{"artifact":"$TEST_BUILD_DIR/rmeta/emit-artifact-notifications/libemit_artifact_notifications.rmeta","emit":"metadata"} diff --git a/src/test/ui/emit-metadata-obj.rs b/src/test/ui/rmeta/emit-metadata-obj.rs similarity index 100% rename from src/test/ui/emit-metadata-obj.rs rename to src/test/ui/rmeta/emit-metadata-obj.rs diff --git a/src/test/ui/type-sizes.rs b/src/test/ui/structs-enums/type-sizes.rs similarity index 100% rename from src/test/ui/type-sizes.rs rename to src/test/ui/structs-enums/type-sizes.rs diff --git a/src/test/ui/one-tuple.rs b/src/test/ui/tuple/one-tuple.rs similarity index 100% rename from src/test/ui/one-tuple.rs rename to src/test/ui/tuple/one-tuple.rs diff --git a/src/test/ui/type-id-higher-rank.rs b/src/test/ui/unboxed-closures/type-id-higher-rank.rs similarity index 100% rename from src/test/ui/type-id-higher-rank.rs rename to src/test/ui/unboxed-closures/type-id-higher-rank.rs diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs index 74ed236675208..083f9edc7516c 100644 --- a/src/tools/tidy/src/ui_tests.rs +++ b/src/tools/tidy/src/ui_tests.rs @@ -7,8 +7,8 @@ use std::path::Path; const ENTRY_LIMIT: usize = 1000; // FIXME: The following limits should be reduced eventually. -const ROOT_ENTRY_LIMIT: usize = 1459; -const ISSUES_ENTRY_LIMIT: usize = 2615; +const ROOT_ENTRY_LIMIT: usize = 1418; +const ISSUES_ENTRY_LIMIT: usize = 2576; fn check_entries(path: &Path, bad: &mut bool) { let dirs = walkdir::WalkDir::new(&path.join("test/ui"))