From b72f6e55a163a2446b8ec4203ffd4284514eb17b Mon Sep 17 00:00:00 2001 From: Caio Date: Tue, 26 Apr 2022 23:38:04 -0300 Subject: [PATCH] Move some tests to more reasonable places --- src/test/ui/{issues => associated-types}/issue-25339.rs | 0 src/test/ui/{issues => associated-types}/issue-55846.rs | 0 src/test/ui/{issues => binop}/issue-3820.rs | 0 src/test/ui/{issues => binop}/issue-3820.stderr | 0 src/test/ui/{issues => consts}/issue-19244.rs | 0 .../ui/{issues => nll}/issue-45696-no-variant-box-recur.rs | 0 src/test/ui/{issues => object-safety}/issue-19538.rs | 0 src/test/ui/{issues => object-safety}/issue-19538.stderr | 0 src/test/ui/{issues => pattern}/issue-72574-1.rs | 0 src/test/ui/{issues => pattern}/issue-72574-1.stderr | 0 src/test/ui/{issues => resolve}/issue-26545.rs | 0 src/test/ui/{issues => resolve}/issue-26545.stderr | 0 src/test/ui/{issues => statics}/issue-17233.rs | 0 src/test/ui/{ => suggestions}/suggest-using-chars.rs | 0 src/test/ui/{ => suggestions}/suggest-using-chars.stderr | 0 src/tools/tidy/src/ui_tests.rs | 4 ++-- 16 files changed, 2 insertions(+), 2 deletions(-) rename src/test/ui/{issues => associated-types}/issue-25339.rs (100%) rename src/test/ui/{issues => associated-types}/issue-55846.rs (100%) rename src/test/ui/{issues => binop}/issue-3820.rs (100%) rename src/test/ui/{issues => binop}/issue-3820.stderr (100%) rename src/test/ui/{issues => consts}/issue-19244.rs (100%) rename src/test/ui/{issues => nll}/issue-45696-no-variant-box-recur.rs (100%) rename src/test/ui/{issues => object-safety}/issue-19538.rs (100%) rename src/test/ui/{issues => object-safety}/issue-19538.stderr (100%) rename src/test/ui/{issues => pattern}/issue-72574-1.rs (100%) rename src/test/ui/{issues => pattern}/issue-72574-1.stderr (100%) rename src/test/ui/{issues => resolve}/issue-26545.rs (100%) rename src/test/ui/{issues => resolve}/issue-26545.stderr (100%) rename src/test/ui/{issues => statics}/issue-17233.rs (100%) rename src/test/ui/{ => suggestions}/suggest-using-chars.rs (100%) rename src/test/ui/{ => suggestions}/suggest-using-chars.stderr (100%) diff --git a/src/test/ui/issues/issue-25339.rs b/src/test/ui/associated-types/issue-25339.rs similarity index 100% rename from src/test/ui/issues/issue-25339.rs rename to src/test/ui/associated-types/issue-25339.rs diff --git a/src/test/ui/issues/issue-55846.rs b/src/test/ui/associated-types/issue-55846.rs similarity index 100% rename from src/test/ui/issues/issue-55846.rs rename to src/test/ui/associated-types/issue-55846.rs diff --git a/src/test/ui/issues/issue-3820.rs b/src/test/ui/binop/issue-3820.rs similarity index 100% rename from src/test/ui/issues/issue-3820.rs rename to src/test/ui/binop/issue-3820.rs diff --git a/src/test/ui/issues/issue-3820.stderr b/src/test/ui/binop/issue-3820.stderr similarity index 100% rename from src/test/ui/issues/issue-3820.stderr rename to src/test/ui/binop/issue-3820.stderr diff --git a/src/test/ui/issues/issue-19244.rs b/src/test/ui/consts/issue-19244.rs similarity index 100% rename from src/test/ui/issues/issue-19244.rs rename to src/test/ui/consts/issue-19244.rs diff --git a/src/test/ui/issues/issue-45696-no-variant-box-recur.rs b/src/test/ui/nll/issue-45696-no-variant-box-recur.rs similarity index 100% rename from src/test/ui/issues/issue-45696-no-variant-box-recur.rs rename to src/test/ui/nll/issue-45696-no-variant-box-recur.rs diff --git a/src/test/ui/issues/issue-19538.rs b/src/test/ui/object-safety/issue-19538.rs similarity index 100% rename from src/test/ui/issues/issue-19538.rs rename to src/test/ui/object-safety/issue-19538.rs diff --git a/src/test/ui/issues/issue-19538.stderr b/src/test/ui/object-safety/issue-19538.stderr similarity index 100% rename from src/test/ui/issues/issue-19538.stderr rename to src/test/ui/object-safety/issue-19538.stderr diff --git a/src/test/ui/issues/issue-72574-1.rs b/src/test/ui/pattern/issue-72574-1.rs similarity index 100% rename from src/test/ui/issues/issue-72574-1.rs rename to src/test/ui/pattern/issue-72574-1.rs diff --git a/src/test/ui/issues/issue-72574-1.stderr b/src/test/ui/pattern/issue-72574-1.stderr similarity index 100% rename from src/test/ui/issues/issue-72574-1.stderr rename to src/test/ui/pattern/issue-72574-1.stderr diff --git a/src/test/ui/issues/issue-26545.rs b/src/test/ui/resolve/issue-26545.rs similarity index 100% rename from src/test/ui/issues/issue-26545.rs rename to src/test/ui/resolve/issue-26545.rs diff --git a/src/test/ui/issues/issue-26545.stderr b/src/test/ui/resolve/issue-26545.stderr similarity index 100% rename from src/test/ui/issues/issue-26545.stderr rename to src/test/ui/resolve/issue-26545.stderr diff --git a/src/test/ui/issues/issue-17233.rs b/src/test/ui/statics/issue-17233.rs similarity index 100% rename from src/test/ui/issues/issue-17233.rs rename to src/test/ui/statics/issue-17233.rs diff --git a/src/test/ui/suggest-using-chars.rs b/src/test/ui/suggestions/suggest-using-chars.rs similarity index 100% rename from src/test/ui/suggest-using-chars.rs rename to src/test/ui/suggestions/suggest-using-chars.rs diff --git a/src/test/ui/suggest-using-chars.stderr b/src/test/ui/suggestions/suggest-using-chars.stderr similarity index 100% rename from src/test/ui/suggest-using-chars.stderr rename to src/test/ui/suggestions/suggest-using-chars.stderr diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs index d823b412c59..1f6f2336481 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 = 986; -const ISSUES_ENTRY_LIMIT: usize = 2292; +const ROOT_ENTRY_LIMIT: usize = 980; +const ISSUES_ENTRY_LIMIT: usize = 2278; fn check_entries(path: &Path, bad: &mut bool) { let dirs = walkdir::WalkDir::new(&path.join("test/ui"))