From dbc8f51da49c6f90f063cf7564c1cf1175f9baa4 Mon Sep 17 00:00:00 2001 From: Caio Date: Thu, 13 Oct 2022 12:32:58 -0300 Subject: [PATCH] Move some tests to more reasonable directories --- .../issue-17718-static-move.rs | 0 .../issue-17718-static-move.stderr | 0 .../issue-17718-constants-not-static.rs | 0 .../issue-17718-constants-not-static.stderr | 0 .../issue-17718-const-destructors.rs | 0 src/test/ui/{issues => drop}/issue-48962.rs | 0 src/test/ui/issues/issue-77993-1.rs | 12 ------------ src/test/ui/issues/issue-77993-1.stderr | 16 ---------------- .../ui/{issues => never_type}/issue-5500-1.rs | 0 .../issue-17718-parse-const.rs | 0 .../{issues => pattern}/issue-17718-patterns.rs | 0 .../issue-17718-patterns.stderr | 0 .../auxiliary/issue-17718-const-privacy.rs | 0 .../issue-17718-const-privacy.rs | 0 .../issue-17718-const-privacy.stderr | 0 .../issue-17718-static-sync.rs | 0 .../issue-17718-static-sync.stderr | 0 .../issue-17718-static-unsafe-interior.rs | 0 src/tools/tidy/src/ui_tests.rs | 4 ++-- 19 files changed, 2 insertions(+), 30 deletions(-) rename src/test/ui/{issues => borrowck}/issue-17718-static-move.rs (100%) rename src/test/ui/{issues => borrowck}/issue-17718-static-move.stderr (100%) rename src/test/ui/{issues => consts}/issue-17718-constants-not-static.rs (100%) rename src/test/ui/{issues => consts}/issue-17718-constants-not-static.stderr (100%) rename src/test/ui/{issues => drop}/issue-17718-const-destructors.rs (100%) rename src/test/ui/{issues => drop}/issue-48962.rs (100%) delete mode 100644 src/test/ui/issues/issue-77993-1.rs delete mode 100644 src/test/ui/issues/issue-77993-1.stderr rename src/test/ui/{issues => never_type}/issue-5500-1.rs (100%) rename src/test/ui/{issues => parser}/issue-17718-parse-const.rs (100%) rename src/test/ui/{issues => pattern}/issue-17718-patterns.rs (100%) rename src/test/ui/{issues => pattern}/issue-17718-patterns.stderr (100%) rename src/test/ui/{issues => privacy}/auxiliary/issue-17718-const-privacy.rs (100%) rename src/test/ui/{issues => privacy}/issue-17718-const-privacy.rs (100%) rename src/test/ui/{issues => privacy}/issue-17718-const-privacy.stderr (100%) rename src/test/ui/{issues => statics}/issue-17718-static-sync.rs (100%) rename src/test/ui/{issues => statics}/issue-17718-static-sync.stderr (100%) rename src/test/ui/{issues => statics}/issue-17718-static-unsafe-interior.rs (100%) diff --git a/src/test/ui/issues/issue-17718-static-move.rs b/src/test/ui/borrowck/issue-17718-static-move.rs similarity index 100% rename from src/test/ui/issues/issue-17718-static-move.rs rename to src/test/ui/borrowck/issue-17718-static-move.rs diff --git a/src/test/ui/issues/issue-17718-static-move.stderr b/src/test/ui/borrowck/issue-17718-static-move.stderr similarity index 100% rename from src/test/ui/issues/issue-17718-static-move.stderr rename to src/test/ui/borrowck/issue-17718-static-move.stderr diff --git a/src/test/ui/issues/issue-17718-constants-not-static.rs b/src/test/ui/consts/issue-17718-constants-not-static.rs similarity index 100% rename from src/test/ui/issues/issue-17718-constants-not-static.rs rename to src/test/ui/consts/issue-17718-constants-not-static.rs diff --git a/src/test/ui/issues/issue-17718-constants-not-static.stderr b/src/test/ui/consts/issue-17718-constants-not-static.stderr similarity index 100% rename from src/test/ui/issues/issue-17718-constants-not-static.stderr rename to src/test/ui/consts/issue-17718-constants-not-static.stderr diff --git a/src/test/ui/issues/issue-17718-const-destructors.rs b/src/test/ui/drop/issue-17718-const-destructors.rs similarity index 100% rename from src/test/ui/issues/issue-17718-const-destructors.rs rename to src/test/ui/drop/issue-17718-const-destructors.rs diff --git a/src/test/ui/issues/issue-48962.rs b/src/test/ui/drop/issue-48962.rs similarity index 100% rename from src/test/ui/issues/issue-48962.rs rename to src/test/ui/drop/issue-48962.rs diff --git a/src/test/ui/issues/issue-77993-1.rs b/src/test/ui/issues/issue-77993-1.rs deleted file mode 100644 index 515b3bc09f076..0000000000000 --- a/src/test/ui/issues/issue-77993-1.rs +++ /dev/null @@ -1,12 +0,0 @@ -#[derive(Clone)] -struct InGroup { - it: It, - //~^ ERROR cannot find type `It` in this scope - f: F, -} -fn dates_in_year() -> impl Clone { - InGroup { f: |d| d } - //~^ ERROR missing field `it` in initializer of `InGroup<_>` -} - -fn main() {} diff --git a/src/test/ui/issues/issue-77993-1.stderr b/src/test/ui/issues/issue-77993-1.stderr deleted file mode 100644 index 3dc78ba6f8563..0000000000000 --- a/src/test/ui/issues/issue-77993-1.stderr +++ /dev/null @@ -1,16 +0,0 @@ -error[E0412]: cannot find type `It` in this scope - --> $DIR/issue-77993-1.rs:3:9 - | -LL | it: It, - | ^^ not found in this scope - -error[E0063]: missing field `it` in initializer of `InGroup<_>` - --> $DIR/issue-77993-1.rs:8:5 - | -LL | InGroup { f: |d| d } - | ^^^^^^^ missing `it` - -error: aborting due to 2 previous errors - -Some errors have detailed explanations: E0063, E0412. -For more information about an error, try `rustc --explain E0063`. diff --git a/src/test/ui/issues/issue-5500-1.rs b/src/test/ui/never_type/issue-5500-1.rs similarity index 100% rename from src/test/ui/issues/issue-5500-1.rs rename to src/test/ui/never_type/issue-5500-1.rs diff --git a/src/test/ui/issues/issue-17718-parse-const.rs b/src/test/ui/parser/issue-17718-parse-const.rs similarity index 100% rename from src/test/ui/issues/issue-17718-parse-const.rs rename to src/test/ui/parser/issue-17718-parse-const.rs diff --git a/src/test/ui/issues/issue-17718-patterns.rs b/src/test/ui/pattern/issue-17718-patterns.rs similarity index 100% rename from src/test/ui/issues/issue-17718-patterns.rs rename to src/test/ui/pattern/issue-17718-patterns.rs diff --git a/src/test/ui/issues/issue-17718-patterns.stderr b/src/test/ui/pattern/issue-17718-patterns.stderr similarity index 100% rename from src/test/ui/issues/issue-17718-patterns.stderr rename to src/test/ui/pattern/issue-17718-patterns.stderr diff --git a/src/test/ui/issues/auxiliary/issue-17718-const-privacy.rs b/src/test/ui/privacy/auxiliary/issue-17718-const-privacy.rs similarity index 100% rename from src/test/ui/issues/auxiliary/issue-17718-const-privacy.rs rename to src/test/ui/privacy/auxiliary/issue-17718-const-privacy.rs diff --git a/src/test/ui/issues/issue-17718-const-privacy.rs b/src/test/ui/privacy/issue-17718-const-privacy.rs similarity index 100% rename from src/test/ui/issues/issue-17718-const-privacy.rs rename to src/test/ui/privacy/issue-17718-const-privacy.rs diff --git a/src/test/ui/issues/issue-17718-const-privacy.stderr b/src/test/ui/privacy/issue-17718-const-privacy.stderr similarity index 100% rename from src/test/ui/issues/issue-17718-const-privacy.stderr rename to src/test/ui/privacy/issue-17718-const-privacy.stderr diff --git a/src/test/ui/issues/issue-17718-static-sync.rs b/src/test/ui/statics/issue-17718-static-sync.rs similarity index 100% rename from src/test/ui/issues/issue-17718-static-sync.rs rename to src/test/ui/statics/issue-17718-static-sync.rs diff --git a/src/test/ui/issues/issue-17718-static-sync.stderr b/src/test/ui/statics/issue-17718-static-sync.stderr similarity index 100% rename from src/test/ui/issues/issue-17718-static-sync.stderr rename to src/test/ui/statics/issue-17718-static-sync.stderr diff --git a/src/test/ui/issues/issue-17718-static-unsafe-interior.rs b/src/test/ui/statics/issue-17718-static-unsafe-interior.rs similarity index 100% rename from src/test/ui/issues/issue-17718-static-unsafe-interior.rs rename to src/test/ui/statics/issue-17718-static-unsafe-interior.rs diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs index 052abfdab5dd3..3815259c9aac9 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 = 950; -const ISSUES_ENTRY_LIMIT: usize = 2141; +const ROOT_ENTRY_LIMIT: usize = 948; +const ISSUES_ENTRY_LIMIT: usize = 2126; fn check_entries(path: &Path, bad: &mut bool) { let dirs = walkdir::WalkDir::new(&path.join("test/ui"))