From 4e6d6abc6a514988ae13cea41993688d8cf9dd4a Mon Sep 17 00:00:00 2001 From: Caio Date: Sat, 17 Apr 2021 18:53:54 -0300 Subject: [PATCH] Move some tests to more reasonable directories - 6 --- src/test/ui/{bad => destructuring-assignment}/bad-expr-lhs.rs | 0 .../ui/{bad => destructuring-assignment}/bad-expr-lhs.stderr | 0 src/test/ui/{bad => fn}/bad-main.rs | 0 src/test/ui/{bad => fn}/bad-main.stderr | 0 src/test/ui/{bad => generics}/bad-mid-path-type-params.rs | 0 src/test/ui/{bad => generics}/bad-mid-path-type-params.stderr | 0 .../ui/{bad => intrinsics}/bad-intrinsic-monomorphization.rs | 0 .../{bad => intrinsics}/bad-intrinsic-monomorphization.stderr | 0 src/test/ui/{bad => linkage-attr}/bad-extern-link-attrs.rs | 0 src/test/ui/{bad => linkage-attr}/bad-extern-link-attrs.stderr | 0 src/test/ui/{bad => lint}/bad-lint-cap.rs | 0 src/test/ui/{bad => lint}/bad-lint-cap.stderr | 0 src/test/ui/{bad => lint}/bad-lint-cap2.rs | 0 src/test/ui/{bad => lint}/bad-lint-cap2.stderr | 0 src/test/ui/{bad => lint}/bad-lint-cap3.rs | 0 src/test/ui/{bad => lint}/bad-lint-cap3.stderr | 0 src/test/ui/{bad => parser}/bad-crate-name.rs | 0 src/test/ui/{bad => parser}/bad-crate-name.stderr | 0 src/test/ui/{bad => resolve}/bad-env-capture.rs | 0 src/test/ui/{bad => resolve}/bad-env-capture.stderr | 0 src/test/ui/{bad => resolve}/bad-env-capture2.rs | 0 src/test/ui/{bad => resolve}/bad-env-capture2.stderr | 0 src/test/ui/{bad => resolve}/bad-env-capture3.rs | 0 src/test/ui/{bad => resolve}/bad-env-capture3.stderr | 0 src/test/ui/{bad => resolve}/bad-expr-path.rs | 0 src/test/ui/{bad => resolve}/bad-expr-path.stderr | 0 src/test/ui/{bad => resolve}/bad-expr-path2.rs | 0 src/test/ui/{bad => resolve}/bad-expr-path2.stderr | 0 src/test/ui/{bad => resolve}/bad-module.rs | 0 src/test/ui/{bad => resolve}/bad-module.stderr | 0 src/test/ui/{bad => resolve}/bad-type-env-capture.rs | 0 src/test/ui/{bad => resolve}/bad-type-env-capture.stderr | 0 src/test/ui/{bad => static}/bad-const-type.rs | 0 src/test/ui/{bad => static}/bad-const-type.stderr | 0 src/test/ui/{bad => traits}/bad-method-typaram-kind.rs | 0 src/test/ui/{bad => traits}/bad-method-typaram-kind.stderr | 0 src/test/ui/{bad => traits}/bad-sized.rs | 0 src/test/ui/{bad => traits}/bad-sized.stderr | 0 src/tools/tidy/src/ui_tests.rs | 2 +- 39 files changed, 1 insertion(+), 1 deletion(-) rename src/test/ui/{bad => destructuring-assignment}/bad-expr-lhs.rs (100%) rename src/test/ui/{bad => destructuring-assignment}/bad-expr-lhs.stderr (100%) rename src/test/ui/{bad => fn}/bad-main.rs (100%) rename src/test/ui/{bad => fn}/bad-main.stderr (100%) rename src/test/ui/{bad => generics}/bad-mid-path-type-params.rs (100%) rename src/test/ui/{bad => generics}/bad-mid-path-type-params.stderr (100%) rename src/test/ui/{bad => intrinsics}/bad-intrinsic-monomorphization.rs (100%) rename src/test/ui/{bad => intrinsics}/bad-intrinsic-monomorphization.stderr (100%) rename src/test/ui/{bad => linkage-attr}/bad-extern-link-attrs.rs (100%) rename src/test/ui/{bad => linkage-attr}/bad-extern-link-attrs.stderr (100%) rename src/test/ui/{bad => lint}/bad-lint-cap.rs (100%) rename src/test/ui/{bad => lint}/bad-lint-cap.stderr (100%) rename src/test/ui/{bad => lint}/bad-lint-cap2.rs (100%) rename src/test/ui/{bad => lint}/bad-lint-cap2.stderr (100%) rename src/test/ui/{bad => lint}/bad-lint-cap3.rs (100%) rename src/test/ui/{bad => lint}/bad-lint-cap3.stderr (100%) rename src/test/ui/{bad => parser}/bad-crate-name.rs (100%) rename src/test/ui/{bad => parser}/bad-crate-name.stderr (100%) rename src/test/ui/{bad => resolve}/bad-env-capture.rs (100%) rename src/test/ui/{bad => resolve}/bad-env-capture.stderr (100%) rename src/test/ui/{bad => resolve}/bad-env-capture2.rs (100%) rename src/test/ui/{bad => resolve}/bad-env-capture2.stderr (100%) rename src/test/ui/{bad => resolve}/bad-env-capture3.rs (100%) rename src/test/ui/{bad => resolve}/bad-env-capture3.stderr (100%) rename src/test/ui/{bad => resolve}/bad-expr-path.rs (100%) rename src/test/ui/{bad => resolve}/bad-expr-path.stderr (100%) rename src/test/ui/{bad => resolve}/bad-expr-path2.rs (100%) rename src/test/ui/{bad => resolve}/bad-expr-path2.stderr (100%) rename src/test/ui/{bad => resolve}/bad-module.rs (100%) rename src/test/ui/{bad => resolve}/bad-module.stderr (100%) rename src/test/ui/{bad => resolve}/bad-type-env-capture.rs (100%) rename src/test/ui/{bad => resolve}/bad-type-env-capture.stderr (100%) rename src/test/ui/{bad => static}/bad-const-type.rs (100%) rename src/test/ui/{bad => static}/bad-const-type.stderr (100%) rename src/test/ui/{bad => traits}/bad-method-typaram-kind.rs (100%) rename src/test/ui/{bad => traits}/bad-method-typaram-kind.stderr (100%) rename src/test/ui/{bad => traits}/bad-sized.rs (100%) rename src/test/ui/{bad => traits}/bad-sized.stderr (100%) diff --git a/src/test/ui/bad/bad-expr-lhs.rs b/src/test/ui/destructuring-assignment/bad-expr-lhs.rs similarity index 100% rename from src/test/ui/bad/bad-expr-lhs.rs rename to src/test/ui/destructuring-assignment/bad-expr-lhs.rs diff --git a/src/test/ui/bad/bad-expr-lhs.stderr b/src/test/ui/destructuring-assignment/bad-expr-lhs.stderr similarity index 100% rename from src/test/ui/bad/bad-expr-lhs.stderr rename to src/test/ui/destructuring-assignment/bad-expr-lhs.stderr diff --git a/src/test/ui/bad/bad-main.rs b/src/test/ui/fn/bad-main.rs similarity index 100% rename from src/test/ui/bad/bad-main.rs rename to src/test/ui/fn/bad-main.rs diff --git a/src/test/ui/bad/bad-main.stderr b/src/test/ui/fn/bad-main.stderr similarity index 100% rename from src/test/ui/bad/bad-main.stderr rename to src/test/ui/fn/bad-main.stderr diff --git a/src/test/ui/bad/bad-mid-path-type-params.rs b/src/test/ui/generics/bad-mid-path-type-params.rs similarity index 100% rename from src/test/ui/bad/bad-mid-path-type-params.rs rename to src/test/ui/generics/bad-mid-path-type-params.rs diff --git a/src/test/ui/bad/bad-mid-path-type-params.stderr b/src/test/ui/generics/bad-mid-path-type-params.stderr similarity index 100% rename from src/test/ui/bad/bad-mid-path-type-params.stderr rename to src/test/ui/generics/bad-mid-path-type-params.stderr diff --git a/src/test/ui/bad/bad-intrinsic-monomorphization.rs b/src/test/ui/intrinsics/bad-intrinsic-monomorphization.rs similarity index 100% rename from src/test/ui/bad/bad-intrinsic-monomorphization.rs rename to src/test/ui/intrinsics/bad-intrinsic-monomorphization.rs diff --git a/src/test/ui/bad/bad-intrinsic-monomorphization.stderr b/src/test/ui/intrinsics/bad-intrinsic-monomorphization.stderr similarity index 100% rename from src/test/ui/bad/bad-intrinsic-monomorphization.stderr rename to src/test/ui/intrinsics/bad-intrinsic-monomorphization.stderr diff --git a/src/test/ui/bad/bad-extern-link-attrs.rs b/src/test/ui/linkage-attr/bad-extern-link-attrs.rs similarity index 100% rename from src/test/ui/bad/bad-extern-link-attrs.rs rename to src/test/ui/linkage-attr/bad-extern-link-attrs.rs diff --git a/src/test/ui/bad/bad-extern-link-attrs.stderr b/src/test/ui/linkage-attr/bad-extern-link-attrs.stderr similarity index 100% rename from src/test/ui/bad/bad-extern-link-attrs.stderr rename to src/test/ui/linkage-attr/bad-extern-link-attrs.stderr diff --git a/src/test/ui/bad/bad-lint-cap.rs b/src/test/ui/lint/bad-lint-cap.rs similarity index 100% rename from src/test/ui/bad/bad-lint-cap.rs rename to src/test/ui/lint/bad-lint-cap.rs diff --git a/src/test/ui/bad/bad-lint-cap.stderr b/src/test/ui/lint/bad-lint-cap.stderr similarity index 100% rename from src/test/ui/bad/bad-lint-cap.stderr rename to src/test/ui/lint/bad-lint-cap.stderr diff --git a/src/test/ui/bad/bad-lint-cap2.rs b/src/test/ui/lint/bad-lint-cap2.rs similarity index 100% rename from src/test/ui/bad/bad-lint-cap2.rs rename to src/test/ui/lint/bad-lint-cap2.rs diff --git a/src/test/ui/bad/bad-lint-cap2.stderr b/src/test/ui/lint/bad-lint-cap2.stderr similarity index 100% rename from src/test/ui/bad/bad-lint-cap2.stderr rename to src/test/ui/lint/bad-lint-cap2.stderr diff --git a/src/test/ui/bad/bad-lint-cap3.rs b/src/test/ui/lint/bad-lint-cap3.rs similarity index 100% rename from src/test/ui/bad/bad-lint-cap3.rs rename to src/test/ui/lint/bad-lint-cap3.rs diff --git a/src/test/ui/bad/bad-lint-cap3.stderr b/src/test/ui/lint/bad-lint-cap3.stderr similarity index 100% rename from src/test/ui/bad/bad-lint-cap3.stderr rename to src/test/ui/lint/bad-lint-cap3.stderr diff --git a/src/test/ui/bad/bad-crate-name.rs b/src/test/ui/parser/bad-crate-name.rs similarity index 100% rename from src/test/ui/bad/bad-crate-name.rs rename to src/test/ui/parser/bad-crate-name.rs diff --git a/src/test/ui/bad/bad-crate-name.stderr b/src/test/ui/parser/bad-crate-name.stderr similarity index 100% rename from src/test/ui/bad/bad-crate-name.stderr rename to src/test/ui/parser/bad-crate-name.stderr diff --git a/src/test/ui/bad/bad-env-capture.rs b/src/test/ui/resolve/bad-env-capture.rs similarity index 100% rename from src/test/ui/bad/bad-env-capture.rs rename to src/test/ui/resolve/bad-env-capture.rs diff --git a/src/test/ui/bad/bad-env-capture.stderr b/src/test/ui/resolve/bad-env-capture.stderr similarity index 100% rename from src/test/ui/bad/bad-env-capture.stderr rename to src/test/ui/resolve/bad-env-capture.stderr diff --git a/src/test/ui/bad/bad-env-capture2.rs b/src/test/ui/resolve/bad-env-capture2.rs similarity index 100% rename from src/test/ui/bad/bad-env-capture2.rs rename to src/test/ui/resolve/bad-env-capture2.rs diff --git a/src/test/ui/bad/bad-env-capture2.stderr b/src/test/ui/resolve/bad-env-capture2.stderr similarity index 100% rename from src/test/ui/bad/bad-env-capture2.stderr rename to src/test/ui/resolve/bad-env-capture2.stderr diff --git a/src/test/ui/bad/bad-env-capture3.rs b/src/test/ui/resolve/bad-env-capture3.rs similarity index 100% rename from src/test/ui/bad/bad-env-capture3.rs rename to src/test/ui/resolve/bad-env-capture3.rs diff --git a/src/test/ui/bad/bad-env-capture3.stderr b/src/test/ui/resolve/bad-env-capture3.stderr similarity index 100% rename from src/test/ui/bad/bad-env-capture3.stderr rename to src/test/ui/resolve/bad-env-capture3.stderr diff --git a/src/test/ui/bad/bad-expr-path.rs b/src/test/ui/resolve/bad-expr-path.rs similarity index 100% rename from src/test/ui/bad/bad-expr-path.rs rename to src/test/ui/resolve/bad-expr-path.rs diff --git a/src/test/ui/bad/bad-expr-path.stderr b/src/test/ui/resolve/bad-expr-path.stderr similarity index 100% rename from src/test/ui/bad/bad-expr-path.stderr rename to src/test/ui/resolve/bad-expr-path.stderr diff --git a/src/test/ui/bad/bad-expr-path2.rs b/src/test/ui/resolve/bad-expr-path2.rs similarity index 100% rename from src/test/ui/bad/bad-expr-path2.rs rename to src/test/ui/resolve/bad-expr-path2.rs diff --git a/src/test/ui/bad/bad-expr-path2.stderr b/src/test/ui/resolve/bad-expr-path2.stderr similarity index 100% rename from src/test/ui/bad/bad-expr-path2.stderr rename to src/test/ui/resolve/bad-expr-path2.stderr diff --git a/src/test/ui/bad/bad-module.rs b/src/test/ui/resolve/bad-module.rs similarity index 100% rename from src/test/ui/bad/bad-module.rs rename to src/test/ui/resolve/bad-module.rs diff --git a/src/test/ui/bad/bad-module.stderr b/src/test/ui/resolve/bad-module.stderr similarity index 100% rename from src/test/ui/bad/bad-module.stderr rename to src/test/ui/resolve/bad-module.stderr diff --git a/src/test/ui/bad/bad-type-env-capture.rs b/src/test/ui/resolve/bad-type-env-capture.rs similarity index 100% rename from src/test/ui/bad/bad-type-env-capture.rs rename to src/test/ui/resolve/bad-type-env-capture.rs diff --git a/src/test/ui/bad/bad-type-env-capture.stderr b/src/test/ui/resolve/bad-type-env-capture.stderr similarity index 100% rename from src/test/ui/bad/bad-type-env-capture.stderr rename to src/test/ui/resolve/bad-type-env-capture.stderr diff --git a/src/test/ui/bad/bad-const-type.rs b/src/test/ui/static/bad-const-type.rs similarity index 100% rename from src/test/ui/bad/bad-const-type.rs rename to src/test/ui/static/bad-const-type.rs diff --git a/src/test/ui/bad/bad-const-type.stderr b/src/test/ui/static/bad-const-type.stderr similarity index 100% rename from src/test/ui/bad/bad-const-type.stderr rename to src/test/ui/static/bad-const-type.stderr diff --git a/src/test/ui/bad/bad-method-typaram-kind.rs b/src/test/ui/traits/bad-method-typaram-kind.rs similarity index 100% rename from src/test/ui/bad/bad-method-typaram-kind.rs rename to src/test/ui/traits/bad-method-typaram-kind.rs diff --git a/src/test/ui/bad/bad-method-typaram-kind.stderr b/src/test/ui/traits/bad-method-typaram-kind.stderr similarity index 100% rename from src/test/ui/bad/bad-method-typaram-kind.stderr rename to src/test/ui/traits/bad-method-typaram-kind.stderr diff --git a/src/test/ui/bad/bad-sized.rs b/src/test/ui/traits/bad-sized.rs similarity index 100% rename from src/test/ui/bad/bad-sized.rs rename to src/test/ui/traits/bad-sized.rs diff --git a/src/test/ui/bad/bad-sized.stderr b/src/test/ui/traits/bad-sized.stderr similarity index 100% rename from src/test/ui/bad/bad-sized.stderr rename to src/test/ui/traits/bad-sized.stderr diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs index 7cc660454b492..8334bc68ae729 100644 --- a/src/tools/tidy/src/ui_tests.rs +++ b/src/tools/tidy/src/ui_tests.rs @@ -7,7 +7,7 @@ use std::path::Path; const ENTRY_LIMIT: usize = 1000; // FIXME: The following limits should be reduced eventually. -const ROOT_ENTRY_LIMIT: usize = 1390; +const ROOT_ENTRY_LIMIT: usize = 1388; const ISSUES_ENTRY_LIMIT: usize = 2551; fn check_entries(path: &Path, bad: &mut bool) {