From 25e395653df2a91fc9a76dfd3ef050f1c7ba9fca Mon Sep 17 00:00:00 2001 From: Caio Date: Sun, 14 May 2023 09:49:20 -0300 Subject: [PATCH 1/3] Move tests --- src/tools/tidy/src/ui_tests.rs | 4 ++-- tests/ui/{issues => async-await}/issue-78115.rs | 0 tests/ui/{issues => coercion}/issue-3794.rs | 0 tests/ui/{issues => consts}/issue-16538.mir.stderr | 0 tests/ui/{issues => consts}/issue-16538.rs | 0 tests/ui/{issues => consts}/issue-16538.thir.stderr | 0 tests/ui/{issues => consts}/issue-28822.rs | 0 tests/ui/{issues => enum-discriminant}/issue-50689.rs | 0 tests/ui/{issues => extern}/issue-1251.rs | 0 tests/ui/{issues => for-loop-while}/issue-1257.rs | 0 tests/ui/{issues => mir}/issue-29798.rs | 0 tests/ui/{ => pattern}/issue-94866.rs | 0 tests/ui/{ => pattern}/issue-94866.stderr | 0 tests/ui/{issues => recursion}/issue-3008-1.rs | 0 tests/ui/{issues => recursion}/issue-3008-1.stderr | 0 tests/ui/{issues => recursion}/issue-3008-2.rs | 0 tests/ui/{issues => recursion}/issue-3008-2.stderr | 0 tests/ui/{issues => recursion}/issue-3008-3.rs | 0 tests/ui/{issues => recursion}/issue-3008-3.stderr | 0 tests/ui/{issues => typeck}/issue-1871.rs | 0 tests/ui/{issues => typeck}/issue-1871.stderr | 0 tests/ui/{issues => typeck}/issue-2063-resource.rs | 0 tests/ui/{issues => typeck}/issue-2063.rs | 0 tests/ui/{issues => where-clauses}/issue-50825-1.rs | 0 tests/ui/{issues => where-clauses}/issue-50825.rs | 0 25 files changed, 2 insertions(+), 2 deletions(-) rename tests/ui/{issues => async-await}/issue-78115.rs (100%) rename tests/ui/{issues => coercion}/issue-3794.rs (100%) rename tests/ui/{issues => consts}/issue-16538.mir.stderr (100%) rename tests/ui/{issues => consts}/issue-16538.rs (100%) rename tests/ui/{issues => consts}/issue-16538.thir.stderr (100%) rename tests/ui/{issues => consts}/issue-28822.rs (100%) rename tests/ui/{issues => enum-discriminant}/issue-50689.rs (100%) rename tests/ui/{issues => extern}/issue-1251.rs (100%) rename tests/ui/{issues => for-loop-while}/issue-1257.rs (100%) rename tests/ui/{issues => mir}/issue-29798.rs (100%) rename tests/ui/{ => pattern}/issue-94866.rs (100%) rename tests/ui/{ => pattern}/issue-94866.stderr (100%) rename tests/ui/{issues => recursion}/issue-3008-1.rs (100%) rename tests/ui/{issues => recursion}/issue-3008-1.stderr (100%) rename tests/ui/{issues => recursion}/issue-3008-2.rs (100%) rename tests/ui/{issues => recursion}/issue-3008-2.stderr (100%) rename tests/ui/{issues => recursion}/issue-3008-3.rs (100%) rename tests/ui/{issues => recursion}/issue-3008-3.stderr (100%) rename tests/ui/{issues => typeck}/issue-1871.rs (100%) rename tests/ui/{issues => typeck}/issue-1871.stderr (100%) rename tests/ui/{issues => typeck}/issue-2063-resource.rs (100%) rename tests/ui/{issues => typeck}/issue-2063.rs (100%) rename tests/ui/{issues => where-clauses}/issue-50825-1.rs (100%) rename tests/ui/{issues => where-clauses}/issue-50825.rs (100%) diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs index be3a5d3aa0f03..3e9bf18a28711 100644 --- a/src/tools/tidy/src/ui_tests.rs +++ b/src/tools/tidy/src/ui_tests.rs @@ -10,8 +10,8 @@ use std::path::{Path, PathBuf}; const ENTRY_LIMIT: usize = 900; // FIXME: The following limits should be reduced eventually. -const ISSUES_ENTRY_LIMIT: usize = 1920; -const ROOT_ENTRY_LIMIT: usize = 896; +const ISSUES_ENTRY_LIMIT: usize = 1898; +const ROOT_ENTRY_LIMIT: usize = 894; const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[ "rs", // test source files diff --git a/tests/ui/issues/issue-78115.rs b/tests/ui/async-await/issue-78115.rs similarity index 100% rename from tests/ui/issues/issue-78115.rs rename to tests/ui/async-await/issue-78115.rs diff --git a/tests/ui/issues/issue-3794.rs b/tests/ui/coercion/issue-3794.rs similarity index 100% rename from tests/ui/issues/issue-3794.rs rename to tests/ui/coercion/issue-3794.rs diff --git a/tests/ui/issues/issue-16538.mir.stderr b/tests/ui/consts/issue-16538.mir.stderr similarity index 100% rename from tests/ui/issues/issue-16538.mir.stderr rename to tests/ui/consts/issue-16538.mir.stderr diff --git a/tests/ui/issues/issue-16538.rs b/tests/ui/consts/issue-16538.rs similarity index 100% rename from tests/ui/issues/issue-16538.rs rename to tests/ui/consts/issue-16538.rs diff --git a/tests/ui/issues/issue-16538.thir.stderr b/tests/ui/consts/issue-16538.thir.stderr similarity index 100% rename from tests/ui/issues/issue-16538.thir.stderr rename to tests/ui/consts/issue-16538.thir.stderr diff --git a/tests/ui/issues/issue-28822.rs b/tests/ui/consts/issue-28822.rs similarity index 100% rename from tests/ui/issues/issue-28822.rs rename to tests/ui/consts/issue-28822.rs diff --git a/tests/ui/issues/issue-50689.rs b/tests/ui/enum-discriminant/issue-50689.rs similarity index 100% rename from tests/ui/issues/issue-50689.rs rename to tests/ui/enum-discriminant/issue-50689.rs diff --git a/tests/ui/issues/issue-1251.rs b/tests/ui/extern/issue-1251.rs similarity index 100% rename from tests/ui/issues/issue-1251.rs rename to tests/ui/extern/issue-1251.rs diff --git a/tests/ui/issues/issue-1257.rs b/tests/ui/for-loop-while/issue-1257.rs similarity index 100% rename from tests/ui/issues/issue-1257.rs rename to tests/ui/for-loop-while/issue-1257.rs diff --git a/tests/ui/issues/issue-29798.rs b/tests/ui/mir/issue-29798.rs similarity index 100% rename from tests/ui/issues/issue-29798.rs rename to tests/ui/mir/issue-29798.rs diff --git a/tests/ui/issue-94866.rs b/tests/ui/pattern/issue-94866.rs similarity index 100% rename from tests/ui/issue-94866.rs rename to tests/ui/pattern/issue-94866.rs diff --git a/tests/ui/issue-94866.stderr b/tests/ui/pattern/issue-94866.stderr similarity index 100% rename from tests/ui/issue-94866.stderr rename to tests/ui/pattern/issue-94866.stderr diff --git a/tests/ui/issues/issue-3008-1.rs b/tests/ui/recursion/issue-3008-1.rs similarity index 100% rename from tests/ui/issues/issue-3008-1.rs rename to tests/ui/recursion/issue-3008-1.rs diff --git a/tests/ui/issues/issue-3008-1.stderr b/tests/ui/recursion/issue-3008-1.stderr similarity index 100% rename from tests/ui/issues/issue-3008-1.stderr rename to tests/ui/recursion/issue-3008-1.stderr diff --git a/tests/ui/issues/issue-3008-2.rs b/tests/ui/recursion/issue-3008-2.rs similarity index 100% rename from tests/ui/issues/issue-3008-2.rs rename to tests/ui/recursion/issue-3008-2.rs diff --git a/tests/ui/issues/issue-3008-2.stderr b/tests/ui/recursion/issue-3008-2.stderr similarity index 100% rename from tests/ui/issues/issue-3008-2.stderr rename to tests/ui/recursion/issue-3008-2.stderr diff --git a/tests/ui/issues/issue-3008-3.rs b/tests/ui/recursion/issue-3008-3.rs similarity index 100% rename from tests/ui/issues/issue-3008-3.rs rename to tests/ui/recursion/issue-3008-3.rs diff --git a/tests/ui/issues/issue-3008-3.stderr b/tests/ui/recursion/issue-3008-3.stderr similarity index 100% rename from tests/ui/issues/issue-3008-3.stderr rename to tests/ui/recursion/issue-3008-3.stderr diff --git a/tests/ui/issues/issue-1871.rs b/tests/ui/typeck/issue-1871.rs similarity index 100% rename from tests/ui/issues/issue-1871.rs rename to tests/ui/typeck/issue-1871.rs diff --git a/tests/ui/issues/issue-1871.stderr b/tests/ui/typeck/issue-1871.stderr similarity index 100% rename from tests/ui/issues/issue-1871.stderr rename to tests/ui/typeck/issue-1871.stderr diff --git a/tests/ui/issues/issue-2063-resource.rs b/tests/ui/typeck/issue-2063-resource.rs similarity index 100% rename from tests/ui/issues/issue-2063-resource.rs rename to tests/ui/typeck/issue-2063-resource.rs diff --git a/tests/ui/issues/issue-2063.rs b/tests/ui/typeck/issue-2063.rs similarity index 100% rename from tests/ui/issues/issue-2063.rs rename to tests/ui/typeck/issue-2063.rs diff --git a/tests/ui/issues/issue-50825-1.rs b/tests/ui/where-clauses/issue-50825-1.rs similarity index 100% rename from tests/ui/issues/issue-50825-1.rs rename to tests/ui/where-clauses/issue-50825-1.rs diff --git a/tests/ui/issues/issue-50825.rs b/tests/ui/where-clauses/issue-50825.rs similarity index 100% rename from tests/ui/issues/issue-50825.rs rename to tests/ui/where-clauses/issue-50825.rs From 41d414e3f44fa728c0231d2ef69bdf60313e2431 Mon Sep 17 00:00:00 2001 From: Caio Date: Wed, 24 May 2023 19:54:13 -0300 Subject: [PATCH 2/3] Address comments --- tests/ui/{mir => consts}/issue-29798.rs | 0 tests/ui/{recursion => enum-discriminant}/issue-3008-1.rs | 0 tests/ui/{recursion => enum-discriminant}/issue-3008-1.stderr | 0 tests/ui/{recursion => enum-discriminant}/issue-3008-2.rs | 0 tests/ui/{recursion => enum-discriminant}/issue-3008-2.stderr | 0 tests/ui/{recursion => enum-discriminant}/issue-3008-3.rs | 0 tests/ui/{recursion => enum-discriminant}/issue-3008-3.stderr | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename tests/ui/{mir => consts}/issue-29798.rs (100%) rename tests/ui/{recursion => enum-discriminant}/issue-3008-1.rs (100%) rename tests/ui/{recursion => enum-discriminant}/issue-3008-1.stderr (100%) rename tests/ui/{recursion => enum-discriminant}/issue-3008-2.rs (100%) rename tests/ui/{recursion => enum-discriminant}/issue-3008-2.stderr (100%) rename tests/ui/{recursion => enum-discriminant}/issue-3008-3.rs (100%) rename tests/ui/{recursion => enum-discriminant}/issue-3008-3.stderr (100%) diff --git a/tests/ui/mir/issue-29798.rs b/tests/ui/consts/issue-29798.rs similarity index 100% rename from tests/ui/mir/issue-29798.rs rename to tests/ui/consts/issue-29798.rs diff --git a/tests/ui/recursion/issue-3008-1.rs b/tests/ui/enum-discriminant/issue-3008-1.rs similarity index 100% rename from tests/ui/recursion/issue-3008-1.rs rename to tests/ui/enum-discriminant/issue-3008-1.rs diff --git a/tests/ui/recursion/issue-3008-1.stderr b/tests/ui/enum-discriminant/issue-3008-1.stderr similarity index 100% rename from tests/ui/recursion/issue-3008-1.stderr rename to tests/ui/enum-discriminant/issue-3008-1.stderr diff --git a/tests/ui/recursion/issue-3008-2.rs b/tests/ui/enum-discriminant/issue-3008-2.rs similarity index 100% rename from tests/ui/recursion/issue-3008-2.rs rename to tests/ui/enum-discriminant/issue-3008-2.rs diff --git a/tests/ui/recursion/issue-3008-2.stderr b/tests/ui/enum-discriminant/issue-3008-2.stderr similarity index 100% rename from tests/ui/recursion/issue-3008-2.stderr rename to tests/ui/enum-discriminant/issue-3008-2.stderr diff --git a/tests/ui/recursion/issue-3008-3.rs b/tests/ui/enum-discriminant/issue-3008-3.rs similarity index 100% rename from tests/ui/recursion/issue-3008-3.rs rename to tests/ui/enum-discriminant/issue-3008-3.rs diff --git a/tests/ui/recursion/issue-3008-3.stderr b/tests/ui/enum-discriminant/issue-3008-3.stderr similarity index 100% rename from tests/ui/recursion/issue-3008-3.stderr rename to tests/ui/enum-discriminant/issue-3008-3.stderr From c62d49e75eb8d03c039e59878de4529f656f26b4 Mon Sep 17 00:00:00 2001 From: Caio Date: Mon, 29 May 2023 12:07:41 -0300 Subject: [PATCH 3/3] Address comment --- tests/ui/{enum-discriminant => structs-enums}/issue-3008-1.rs | 0 tests/ui/{enum-discriminant => structs-enums}/issue-3008-1.stderr | 0 tests/ui/{enum-discriminant => structs-enums}/issue-3008-2.rs | 0 tests/ui/{enum-discriminant => structs-enums}/issue-3008-2.stderr | 0 tests/ui/{enum-discriminant => structs-enums}/issue-3008-3.rs | 0 tests/ui/{enum-discriminant => structs-enums}/issue-3008-3.stderr | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename tests/ui/{enum-discriminant => structs-enums}/issue-3008-1.rs (100%) rename tests/ui/{enum-discriminant => structs-enums}/issue-3008-1.stderr (100%) rename tests/ui/{enum-discriminant => structs-enums}/issue-3008-2.rs (100%) rename tests/ui/{enum-discriminant => structs-enums}/issue-3008-2.stderr (100%) rename tests/ui/{enum-discriminant => structs-enums}/issue-3008-3.rs (100%) rename tests/ui/{enum-discriminant => structs-enums}/issue-3008-3.stderr (100%) diff --git a/tests/ui/enum-discriminant/issue-3008-1.rs b/tests/ui/structs-enums/issue-3008-1.rs similarity index 100% rename from tests/ui/enum-discriminant/issue-3008-1.rs rename to tests/ui/structs-enums/issue-3008-1.rs diff --git a/tests/ui/enum-discriminant/issue-3008-1.stderr b/tests/ui/structs-enums/issue-3008-1.stderr similarity index 100% rename from tests/ui/enum-discriminant/issue-3008-1.stderr rename to tests/ui/structs-enums/issue-3008-1.stderr diff --git a/tests/ui/enum-discriminant/issue-3008-2.rs b/tests/ui/structs-enums/issue-3008-2.rs similarity index 100% rename from tests/ui/enum-discriminant/issue-3008-2.rs rename to tests/ui/structs-enums/issue-3008-2.rs diff --git a/tests/ui/enum-discriminant/issue-3008-2.stderr b/tests/ui/structs-enums/issue-3008-2.stderr similarity index 100% rename from tests/ui/enum-discriminant/issue-3008-2.stderr rename to tests/ui/structs-enums/issue-3008-2.stderr diff --git a/tests/ui/enum-discriminant/issue-3008-3.rs b/tests/ui/structs-enums/issue-3008-3.rs similarity index 100% rename from tests/ui/enum-discriminant/issue-3008-3.rs rename to tests/ui/structs-enums/issue-3008-3.rs diff --git a/tests/ui/enum-discriminant/issue-3008-3.stderr b/tests/ui/structs-enums/issue-3008-3.stderr similarity index 100% rename from tests/ui/enum-discriminant/issue-3008-3.stderr rename to tests/ui/structs-enums/issue-3008-3.stderr