From 2ffb0de8cfda57cafdfd71a690f14c2e17216d85 Mon Sep 17 00:00:00 2001 From: jyn Date: Sun, 2 Apr 2023 18:09:11 -0400 Subject: [PATCH] Move most ui-fulldeps tests to ui They pass fine. Only tests that required `extern crate rustc_*` or were marked `ignore-stage1` have been keep in fulldeps. --- src/tools/tidy/src/ui_tests.rs | 2 +- tests/{ui-fulldeps => ui}/auxiliary/issue-13560-1.rs | 0 tests/{ui-fulldeps => ui}/auxiliary/issue-13560-2.rs | 0 tests/{ui-fulldeps => ui}/auxiliary/issue-13560-3.rs | 0 tests/{ui-fulldeps => ui}/auxiliary/issue-16822.rs | 0 tests/{ui-fulldeps => ui}/auxiliary/issue-18502.rs | 0 tests/{ui-fulldeps => ui}/auxiliary/issue-24106.rs | 0 tests/{ui-fulldeps => ui}/extern-mod-syntax.rs | 0 .../{ui-fulldeps => ui}/internal-lints/diagnostics_incorrect.rs | 0 .../internal-lints/diagnostics_incorrect.stderr | 0 .../{ui-fulldeps => ui}/internal-lints/existing_doc_keyword.rs | 0 .../internal-lints/existing_doc_keyword.stderr | 0 .../internal-lints/query_stability_incorrect.rs | 0 .../internal-lints/query_stability_incorrect.stderr | 0 .../internal-lints/rustc_pass_by_value_self.rs | 0 .../internal-lints/rustc_pass_by_value_self.stderr | 0 tests/{ui-fulldeps => ui}/issue-11881.rs | 0 tests/{ui-fulldeps => ui}/issue-13560.rs | 0 tests/{ui-fulldeps => ui}/issue-15924.rs | 0 tests/{ui-fulldeps => ui}/issue-16822.rs | 0 tests/{ui-fulldeps => ui}/issue-18502.rs | 0 tests/{ui-fulldeps => ui}/issue-24106.rs | 0 tests/{ui-fulldeps => ui}/issue-2804.rs | 0 tests/{ui-fulldeps => ui}/myriad-closures.rs | 0 tests/{ui-fulldeps => ui}/std/issue-15149.rs | 0 .../{ui-fulldeps => ui}/std/issue-81357-unsound-file-methods.rs | 0 tests/{ui-fulldeps => ui}/std/stdio-from.rs | 0 tests/{ui-fulldeps => ui}/std/switch-stdout.rs | 0 28 files changed, 1 insertion(+), 1 deletion(-) rename tests/{ui-fulldeps => ui}/auxiliary/issue-13560-1.rs (100%) rename tests/{ui-fulldeps => ui}/auxiliary/issue-13560-2.rs (100%) rename tests/{ui-fulldeps => ui}/auxiliary/issue-13560-3.rs (100%) rename tests/{ui-fulldeps => ui}/auxiliary/issue-16822.rs (100%) rename tests/{ui-fulldeps => ui}/auxiliary/issue-18502.rs (100%) rename tests/{ui-fulldeps => ui}/auxiliary/issue-24106.rs (100%) rename tests/{ui-fulldeps => ui}/extern-mod-syntax.rs (100%) rename tests/{ui-fulldeps => ui}/internal-lints/diagnostics_incorrect.rs (100%) rename tests/{ui-fulldeps => ui}/internal-lints/diagnostics_incorrect.stderr (100%) rename tests/{ui-fulldeps => ui}/internal-lints/existing_doc_keyword.rs (100%) rename tests/{ui-fulldeps => ui}/internal-lints/existing_doc_keyword.stderr (100%) rename tests/{ui-fulldeps => ui}/internal-lints/query_stability_incorrect.rs (100%) rename tests/{ui-fulldeps => ui}/internal-lints/query_stability_incorrect.stderr (100%) rename tests/{ui-fulldeps => ui}/internal-lints/rustc_pass_by_value_self.rs (100%) rename tests/{ui-fulldeps => ui}/internal-lints/rustc_pass_by_value_self.stderr (100%) rename tests/{ui-fulldeps => ui}/issue-11881.rs (100%) rename tests/{ui-fulldeps => ui}/issue-13560.rs (100%) rename tests/{ui-fulldeps => ui}/issue-15924.rs (100%) rename tests/{ui-fulldeps => ui}/issue-16822.rs (100%) rename tests/{ui-fulldeps => ui}/issue-18502.rs (100%) rename tests/{ui-fulldeps => ui}/issue-24106.rs (100%) rename tests/{ui-fulldeps => ui}/issue-2804.rs (100%) rename tests/{ui-fulldeps => ui}/myriad-closures.rs (100%) rename tests/{ui-fulldeps => ui}/std/issue-15149.rs (100%) rename tests/{ui-fulldeps => ui}/std/issue-81357-unsound-file-methods.rs (100%) rename tests/{ui-fulldeps => ui}/std/stdio-from.rs (100%) rename tests/{ui-fulldeps => ui}/std/switch-stdout.rs (100%) diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs index 7b7ee62a247..3d7f9828a7e 100644 --- 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}; // FIXME: The following limits should be reduced eventually. const ENTRY_LIMIT: usize = 885; -const ROOT_ENTRY_LIMIT: usize = 880; +const ROOT_ENTRY_LIMIT: usize = 891; const ISSUES_ENTRY_LIMIT: usize = 1978; fn check_entries(tests_path: &Path, bad: &mut bool) { diff --git a/tests/ui-fulldeps/auxiliary/issue-13560-1.rs b/tests/ui/auxiliary/issue-13560-1.rs similarity index 100% rename from tests/ui-fulldeps/auxiliary/issue-13560-1.rs rename to tests/ui/auxiliary/issue-13560-1.rs diff --git a/tests/ui-fulldeps/auxiliary/issue-13560-2.rs b/tests/ui/auxiliary/issue-13560-2.rs similarity index 100% rename from tests/ui-fulldeps/auxiliary/issue-13560-2.rs rename to tests/ui/auxiliary/issue-13560-2.rs diff --git a/tests/ui-fulldeps/auxiliary/issue-13560-3.rs b/tests/ui/auxiliary/issue-13560-3.rs similarity index 100% rename from tests/ui-fulldeps/auxiliary/issue-13560-3.rs rename to tests/ui/auxiliary/issue-13560-3.rs diff --git a/tests/ui-fulldeps/auxiliary/issue-16822.rs b/tests/ui/auxiliary/issue-16822.rs similarity index 100% rename from tests/ui-fulldeps/auxiliary/issue-16822.rs rename to tests/ui/auxiliary/issue-16822.rs diff --git a/tests/ui-fulldeps/auxiliary/issue-18502.rs b/tests/ui/auxiliary/issue-18502.rs similarity index 100% rename from tests/ui-fulldeps/auxiliary/issue-18502.rs rename to tests/ui/auxiliary/issue-18502.rs diff --git a/tests/ui-fulldeps/auxiliary/issue-24106.rs b/tests/ui/auxiliary/issue-24106.rs similarity index 100% rename from tests/ui-fulldeps/auxiliary/issue-24106.rs rename to tests/ui/auxiliary/issue-24106.rs diff --git a/tests/ui-fulldeps/extern-mod-syntax.rs b/tests/ui/extern-mod-syntax.rs similarity index 100% rename from tests/ui-fulldeps/extern-mod-syntax.rs rename to tests/ui/extern-mod-syntax.rs diff --git a/tests/ui-fulldeps/internal-lints/diagnostics_incorrect.rs b/tests/ui/internal-lints/diagnostics_incorrect.rs similarity index 100% rename from tests/ui-fulldeps/internal-lints/diagnostics_incorrect.rs rename to tests/ui/internal-lints/diagnostics_incorrect.rs diff --git a/tests/ui-fulldeps/internal-lints/diagnostics_incorrect.stderr b/tests/ui/internal-lints/diagnostics_incorrect.stderr similarity index 100% rename from tests/ui-fulldeps/internal-lints/diagnostics_incorrect.stderr rename to tests/ui/internal-lints/diagnostics_incorrect.stderr diff --git a/tests/ui-fulldeps/internal-lints/existing_doc_keyword.rs b/tests/ui/internal-lints/existing_doc_keyword.rs similarity index 100% rename from tests/ui-fulldeps/internal-lints/existing_doc_keyword.rs rename to tests/ui/internal-lints/existing_doc_keyword.rs diff --git a/tests/ui-fulldeps/internal-lints/existing_doc_keyword.stderr b/tests/ui/internal-lints/existing_doc_keyword.stderr similarity index 100% rename from tests/ui-fulldeps/internal-lints/existing_doc_keyword.stderr rename to tests/ui/internal-lints/existing_doc_keyword.stderr diff --git a/tests/ui-fulldeps/internal-lints/query_stability_incorrect.rs b/tests/ui/internal-lints/query_stability_incorrect.rs similarity index 100% rename from tests/ui-fulldeps/internal-lints/query_stability_incorrect.rs rename to tests/ui/internal-lints/query_stability_incorrect.rs diff --git a/tests/ui-fulldeps/internal-lints/query_stability_incorrect.stderr b/tests/ui/internal-lints/query_stability_incorrect.stderr similarity index 100% rename from tests/ui-fulldeps/internal-lints/query_stability_incorrect.stderr rename to tests/ui/internal-lints/query_stability_incorrect.stderr diff --git a/tests/ui-fulldeps/internal-lints/rustc_pass_by_value_self.rs b/tests/ui/internal-lints/rustc_pass_by_value_self.rs similarity index 100% rename from tests/ui-fulldeps/internal-lints/rustc_pass_by_value_self.rs rename to tests/ui/internal-lints/rustc_pass_by_value_self.rs diff --git a/tests/ui-fulldeps/internal-lints/rustc_pass_by_value_self.stderr b/tests/ui/internal-lints/rustc_pass_by_value_self.stderr similarity index 100% rename from tests/ui-fulldeps/internal-lints/rustc_pass_by_value_self.stderr rename to tests/ui/internal-lints/rustc_pass_by_value_self.stderr diff --git a/tests/ui-fulldeps/issue-11881.rs b/tests/ui/issue-11881.rs similarity index 100% rename from tests/ui-fulldeps/issue-11881.rs rename to tests/ui/issue-11881.rs diff --git a/tests/ui-fulldeps/issue-13560.rs b/tests/ui/issue-13560.rs similarity index 100% rename from tests/ui-fulldeps/issue-13560.rs rename to tests/ui/issue-13560.rs diff --git a/tests/ui-fulldeps/issue-15924.rs b/tests/ui/issue-15924.rs similarity index 100% rename from tests/ui-fulldeps/issue-15924.rs rename to tests/ui/issue-15924.rs diff --git a/tests/ui-fulldeps/issue-16822.rs b/tests/ui/issue-16822.rs similarity index 100% rename from tests/ui-fulldeps/issue-16822.rs rename to tests/ui/issue-16822.rs diff --git a/tests/ui-fulldeps/issue-18502.rs b/tests/ui/issue-18502.rs similarity index 100% rename from tests/ui-fulldeps/issue-18502.rs rename to tests/ui/issue-18502.rs diff --git a/tests/ui-fulldeps/issue-24106.rs b/tests/ui/issue-24106.rs similarity index 100% rename from tests/ui-fulldeps/issue-24106.rs rename to tests/ui/issue-24106.rs diff --git a/tests/ui-fulldeps/issue-2804.rs b/tests/ui/issue-2804.rs similarity index 100% rename from tests/ui-fulldeps/issue-2804.rs rename to tests/ui/issue-2804.rs diff --git a/tests/ui-fulldeps/myriad-closures.rs b/tests/ui/myriad-closures.rs similarity index 100% rename from tests/ui-fulldeps/myriad-closures.rs rename to tests/ui/myriad-closures.rs diff --git a/tests/ui-fulldeps/std/issue-15149.rs b/tests/ui/std/issue-15149.rs similarity index 100% rename from tests/ui-fulldeps/std/issue-15149.rs rename to tests/ui/std/issue-15149.rs diff --git a/tests/ui-fulldeps/std/issue-81357-unsound-file-methods.rs b/tests/ui/std/issue-81357-unsound-file-methods.rs similarity index 100% rename from tests/ui-fulldeps/std/issue-81357-unsound-file-methods.rs rename to tests/ui/std/issue-81357-unsound-file-methods.rs diff --git a/tests/ui-fulldeps/std/stdio-from.rs b/tests/ui/std/stdio-from.rs similarity index 100% rename from tests/ui-fulldeps/std/stdio-from.rs rename to tests/ui/std/stdio-from.rs diff --git a/tests/ui-fulldeps/std/switch-stdout.rs b/tests/ui/std/switch-stdout.rs similarity index 100% rename from tests/ui-fulldeps/std/switch-stdout.rs rename to tests/ui/std/switch-stdout.rs