diff --git a/src/test/ui/issues/issue-43784-supertrait.rs b/src/test/ui/associated-types/issue-43784-supertrait.rs similarity index 100% rename from src/test/ui/issues/issue-43784-supertrait.rs rename to src/test/ui/associated-types/issue-43784-supertrait.rs diff --git a/src/test/ui/issues/issue-43784-supertrait.stderr b/src/test/ui/associated-types/issue-43784-supertrait.stderr similarity index 100% rename from src/test/ui/issues/issue-43784-supertrait.stderr rename to src/test/ui/associated-types/issue-43784-supertrait.stderr diff --git a/src/test/ui/issues/issue-73541-3.rs b/src/test/ui/async-await/issue-73541-3.rs similarity index 100% rename from src/test/ui/issues/issue-73541-3.rs rename to src/test/ui/async-await/issue-73541-3.rs diff --git a/src/test/ui/issues/issue-73541-3.stderr b/src/test/ui/async-await/issue-73541-3.stderr similarity index 100% rename from src/test/ui/issues/issue-73541-3.stderr rename to src/test/ui/async-await/issue-73541-3.stderr diff --git a/src/test/ui/issues/issue-73541.rs b/src/test/ui/async-await/issue-73541-4.rs similarity index 100% rename from src/test/ui/issues/issue-73541.rs rename to src/test/ui/async-await/issue-73541-4.rs diff --git a/src/test/ui/issues/issue-73541.stderr b/src/test/ui/async-await/issue-73541-4.stderr similarity index 92% rename from src/test/ui/issues/issue-73541.stderr rename to src/test/ui/async-await/issue-73541-4.stderr index 4bb466ff16c58..4b4f7caf360f8 100644 --- a/src/test/ui/issues/issue-73541.stderr +++ b/src/test/ui/async-await/issue-73541-4.stderr @@ -1,5 +1,5 @@ error[E0767]: use of unreachable label `'a` - --> $DIR/issue-73541.rs:4:29 + --> $DIR/issue-73541-4.rs:4:29 | LL | 'a: loop { | -- unreachable label defined here diff --git a/src/test/ui/issues/issue-77993-1.rs b/src/test/ui/async-await/issue-77993-1.rs similarity index 100% rename from src/test/ui/issues/issue-77993-1.rs rename to src/test/ui/async-await/issue-77993-1.rs diff --git a/src/test/ui/issues/issue-77993-1.stderr b/src/test/ui/async-await/issue-77993-1.stderr similarity index 100% rename from src/test/ui/issues/issue-77993-1.stderr rename to src/test/ui/async-await/issue-77993-1.stderr diff --git a/src/test/ui/issues/issue-3563-2.rs b/src/test/ui/block-result/issue-3563-2.rs similarity index 100% rename from src/test/ui/issues/issue-3563-2.rs rename to src/test/ui/block-result/issue-3563-2.rs diff --git a/src/test/ui/issues/issue-3563-3.rs b/src/test/ui/block-result/issue-3563-3.rs similarity index 100% rename from src/test/ui/issues/issue-3563-3.rs rename to src/test/ui/block-result/issue-3563-3.rs diff --git a/src/test/ui/issues/issue-5500-1.rs b/src/test/ui/block-result/issue-5500-1.rs similarity index 100% rename from src/test/ui/issues/issue-5500-1.rs rename to src/test/ui/block-result/issue-5500-1.rs diff --git a/src/test/ui/issues/issue-46471-1.rs b/src/test/ui/borrowck/issue-46471-1.rs similarity index 100% rename from src/test/ui/issues/issue-46471-1.rs rename to src/test/ui/borrowck/issue-46471-1.rs diff --git a/src/test/ui/issues/issue-46471-1.stderr b/src/test/ui/borrowck/issue-46471-1.stderr similarity index 100% rename from src/test/ui/issues/issue-46471-1.stderr rename to src/test/ui/borrowck/issue-46471-1.stderr diff --git a/src/test/ui/issues/issue-48962.rs b/src/test/ui/borrowck/issue-48962.rs similarity index 100% rename from src/test/ui/issues/issue-48962.rs rename to src/test/ui/borrowck/issue-48962.rs diff --git a/src/test/ui/auxiliary/issue-76387.rs b/src/test/ui/codegen/auxiliary/issue-76387.rs similarity index 100% rename from src/test/ui/auxiliary/issue-76387.rs rename to src/test/ui/codegen/auxiliary/issue-76387.rs diff --git a/src/test/ui/issue-76387-llvm-miscompile.rs b/src/test/ui/codegen/issue-76387-llvm-miscompile.rs similarity index 100% rename from src/test/ui/issue-76387-llvm-miscompile.rs rename to src/test/ui/codegen/issue-76387-llvm-miscompile.rs diff --git a/src/test/ui/issues/auxiliary/issue-17718-const-privacy.rs b/src/test/ui/consts/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/consts/auxiliary/issue-17718-const-privacy.rs diff --git a/src/test/ui/issues/issue-17718-const-destructors.rs b/src/test/ui/consts/issue-17718-const-destructors.rs similarity index 100% rename from src/test/ui/issues/issue-17718-const-destructors.rs rename to src/test/ui/consts/issue-17718-const-destructors.rs diff --git a/src/test/ui/parser/issues/issue-17718-const-mut.rs b/src/test/ui/consts/issue-17718-const-mut.rs similarity index 100% rename from src/test/ui/parser/issues/issue-17718-const-mut.rs rename to src/test/ui/consts/issue-17718-const-mut.rs diff --git a/src/test/ui/parser/issues/issue-17718-const-mut.stderr b/src/test/ui/consts/issue-17718-const-mut.stderr similarity index 100% rename from src/test/ui/parser/issues/issue-17718-const-mut.stderr rename to src/test/ui/consts/issue-17718-const-mut.stderr diff --git a/src/test/ui/lint/issue-17718-const-naming.rs b/src/test/ui/consts/issue-17718-const-naming.rs similarity index 100% rename from src/test/ui/lint/issue-17718-const-naming.rs rename to src/test/ui/consts/issue-17718-const-naming.rs diff --git a/src/test/ui/lint/issue-17718-const-naming.stderr b/src/test/ui/consts/issue-17718-const-naming.stderr similarity index 100% rename from src/test/ui/lint/issue-17718-const-naming.stderr rename to src/test/ui/consts/issue-17718-const-naming.stderr diff --git a/src/test/ui/issues/issue-17718-const-privacy.rs b/src/test/ui/consts/issue-17718-const-privacy.rs similarity index 100% rename from src/test/ui/issues/issue-17718-const-privacy.rs rename to src/test/ui/consts/issue-17718-const-privacy.rs diff --git a/src/test/ui/issues/issue-17718-const-privacy.stderr b/src/test/ui/consts/issue-17718-const-privacy.stderr similarity index 100% rename from src/test/ui/issues/issue-17718-const-privacy.stderr rename to src/test/ui/consts/issue-17718-const-privacy.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-parse-const.rs b/src/test/ui/consts/issue-17718-parse-const.rs similarity index 100% rename from src/test/ui/issues/issue-17718-parse-const.rs rename to src/test/ui/consts/issue-17718-parse-const.rs diff --git a/src/test/ui/issues/issue-17718-patterns.rs b/src/test/ui/consts/issue-17718-patterns.rs similarity index 100% rename from src/test/ui/issues/issue-17718-patterns.rs rename to src/test/ui/consts/issue-17718-patterns.rs diff --git a/src/test/ui/issues/issue-17718-patterns.stderr b/src/test/ui/consts/issue-17718-patterns.stderr similarity index 100% rename from src/test/ui/issues/issue-17718-patterns.stderr rename to src/test/ui/consts/issue-17718-patterns.stderr diff --git a/src/test/ui/issues/issue-17718-static-move.rs b/src/test/ui/consts/issue-17718-static-move.rs similarity index 100% rename from src/test/ui/issues/issue-17718-static-move.rs rename to src/test/ui/consts/issue-17718-static-move.rs diff --git a/src/test/ui/issues/issue-17718-static-move.stderr b/src/test/ui/consts/issue-17718-static-move.stderr similarity index 100% rename from src/test/ui/issues/issue-17718-static-move.stderr rename to src/test/ui/consts/issue-17718-static-move.stderr diff --git a/src/test/ui/issues/issue-17718-static-sync.rs b/src/test/ui/consts/issue-17718-static-sync.rs similarity index 100% rename from src/test/ui/issues/issue-17718-static-sync.rs rename to src/test/ui/consts/issue-17718-static-sync.rs diff --git a/src/test/ui/issues/issue-17718-static-sync.stderr b/src/test/ui/consts/issue-17718-static-sync.stderr similarity index 100% rename from src/test/ui/issues/issue-17718-static-sync.stderr rename to src/test/ui/consts/issue-17718-static-sync.stderr diff --git a/src/test/ui/issues/issue-17718-static-unsafe-interior.rs b/src/test/ui/consts/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/consts/issue-17718-static-unsafe-interior.rs diff --git a/src/test/ui/issues/issue-19244-1.rs b/src/test/ui/consts/issue-19244-1.rs similarity index 100% rename from src/test/ui/issues/issue-19244-1.rs rename to src/test/ui/consts/issue-19244-1.rs diff --git a/src/test/ui/issues/issue-19244-1.stderr b/src/test/ui/consts/issue-19244-1.stderr similarity index 100% rename from src/test/ui/issues/issue-19244-1.stderr rename to src/test/ui/consts/issue-19244-1.stderr diff --git a/src/test/ui/issues/issue-19244-2.rs b/src/test/ui/consts/issue-19244-2.rs similarity index 100% rename from src/test/ui/issues/issue-19244-2.rs rename to src/test/ui/consts/issue-19244-2.rs diff --git a/src/test/ui/issues/issue-19244-2.stderr b/src/test/ui/consts/issue-19244-2.stderr similarity index 100% rename from src/test/ui/issues/issue-19244-2.stderr rename to src/test/ui/consts/issue-19244-2.stderr diff --git a/src/test/ui/issues/issue-3521-2.fixed b/src/test/ui/consts/issue-3521-2.fixed similarity index 100% rename from src/test/ui/issues/issue-3521-2.fixed rename to src/test/ui/consts/issue-3521-2.fixed diff --git a/src/test/ui/issues/issue-3521-2.rs b/src/test/ui/consts/issue-3521-2.rs similarity index 100% rename from src/test/ui/issues/issue-3521-2.rs rename to src/test/ui/consts/issue-3521-2.rs diff --git a/src/test/ui/issues/issue-3521-2.stderr b/src/test/ui/consts/issue-3521-2.stderr similarity index 100% rename from src/test/ui/issues/issue-3521-2.stderr rename to src/test/ui/consts/issue-3521-2.stderr diff --git a/src/test/ui/issues/issue-30018-panic.rs b/src/test/ui/drop/issue-30018-panic.rs similarity index 100% rename from src/test/ui/issues/issue-30018-panic.rs rename to src/test/ui/drop/issue-30018-panic.rs diff --git a/src/test/ui/issues/issue-28498-must-work-ex1.rs b/src/test/ui/dropck/issue-28498-must-work-ex1.rs similarity index 100% rename from src/test/ui/issues/issue-28498-must-work-ex1.rs rename to src/test/ui/dropck/issue-28498-must-work-ex1.rs diff --git a/src/test/ui/issues/issue-28498-must-work-ex2.rs b/src/test/ui/dropck/issue-28498-must-work-ex2.rs similarity index 100% rename from src/test/ui/issues/issue-28498-must-work-ex2.rs rename to src/test/ui/dropck/issue-28498-must-work-ex2.rs diff --git a/src/test/ui/span/issue28498-reject-ex1.rs b/src/test/ui/dropck/issue-28498-reject-ex1.rs similarity index 100% rename from src/test/ui/span/issue28498-reject-ex1.rs rename to src/test/ui/dropck/issue-28498-reject-ex1.rs diff --git a/src/test/ui/span/issue28498-reject-ex1.stderr b/src/test/ui/dropck/issue-28498-reject-ex1.stderr similarity index 93% rename from src/test/ui/span/issue28498-reject-ex1.stderr rename to src/test/ui/dropck/issue-28498-reject-ex1.stderr index 86e2d8c56b08f..66a119cdcd717 100644 --- a/src/test/ui/span/issue28498-reject-ex1.stderr +++ b/src/test/ui/dropck/issue-28498-reject-ex1.stderr @@ -1,5 +1,5 @@ error[E0713]: borrow may still be in use when destructor runs - --> $DIR/issue28498-reject-ex1.rs:34:29 + --> $DIR/issue-28498-reject-ex1.rs:34:29 | LL | foo.data[0].1.set(Some(&foo.data[1])); | ^^^^^^^^ diff --git a/src/test/ui/span/issue28498-reject-lifetime-param.rs b/src/test/ui/dropck/issue-28498-reject-lifetime-param.rs similarity index 100% rename from src/test/ui/span/issue28498-reject-lifetime-param.rs rename to src/test/ui/dropck/issue-28498-reject-lifetime-param.rs diff --git a/src/test/ui/span/issue28498-reject-lifetime-param.stderr b/src/test/ui/dropck/issue-28498-reject-lifetime-param.stderr similarity index 91% rename from src/test/ui/span/issue28498-reject-lifetime-param.stderr rename to src/test/ui/dropck/issue-28498-reject-lifetime-param.stderr index 3119ddd03cc26..2a46b24699294 100644 --- a/src/test/ui/span/issue28498-reject-lifetime-param.stderr +++ b/src/test/ui/dropck/issue-28498-reject-lifetime-param.stderr @@ -1,5 +1,5 @@ error[E0597]: `first_dropped` does not live long enough - --> $DIR/issue28498-reject-lifetime-param.rs:32:19 + --> $DIR/issue-28498-reject-lifetime-param.rs:32:19 | LL | foo1 = Foo(1, &first_dropped); | ^^^^^^^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue28498-reject-passed-to-fn.rs b/src/test/ui/dropck/issue-28498-reject-passed-to-fn.rs similarity index 100% rename from src/test/ui/span/issue28498-reject-passed-to-fn.rs rename to src/test/ui/dropck/issue-28498-reject-passed-to-fn.rs diff --git a/src/test/ui/span/issue28498-reject-passed-to-fn.stderr b/src/test/ui/dropck/issue-28498-reject-passed-to-fn.stderr similarity index 91% rename from src/test/ui/span/issue28498-reject-passed-to-fn.stderr rename to src/test/ui/dropck/issue-28498-reject-passed-to-fn.stderr index 60e8a648cd597..eb06202d52dc2 100644 --- a/src/test/ui/span/issue28498-reject-passed-to-fn.stderr +++ b/src/test/ui/dropck/issue-28498-reject-passed-to-fn.stderr @@ -1,5 +1,5 @@ error[E0597]: `first_dropped` does not live long enough - --> $DIR/issue28498-reject-passed-to-fn.rs:34:19 + --> $DIR/issue-28498-reject-passed-to-fn.rs:34:19 | LL | foo1 = Foo(1, &first_dropped, Box::new(callback)); | ^^^^^^^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue28498-reject-trait-bound.rs b/src/test/ui/dropck/issue-28498-reject-trait-bound.rs similarity index 100% rename from src/test/ui/span/issue28498-reject-trait-bound.rs rename to src/test/ui/dropck/issue-28498-reject-trait-bound.rs diff --git a/src/test/ui/span/issue28498-reject-trait-bound.stderr b/src/test/ui/dropck/issue-28498-reject-trait-bound.stderr similarity index 91% rename from src/test/ui/span/issue28498-reject-trait-bound.stderr rename to src/test/ui/dropck/issue-28498-reject-trait-bound.stderr index 22e4a8205b617..5424241896078 100644 --- a/src/test/ui/span/issue28498-reject-trait-bound.stderr +++ b/src/test/ui/dropck/issue-28498-reject-trait-bound.stderr @@ -1,5 +1,5 @@ error[E0597]: `first_dropped` does not live long enough - --> $DIR/issue28498-reject-trait-bound.rs:34:19 + --> $DIR/issue-28498-reject-trait-bound.rs:34:19 | LL | foo1 = Foo(1, &first_dropped); | ^^^^^^^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/issues/issue-28498-ugeh-ex1.rs b/src/test/ui/dropck/issue-28498-ugeh-ex1.rs similarity index 100% rename from src/test/ui/issues/issue-28498-ugeh-ex1.rs rename to src/test/ui/dropck/issue-28498-ugeh-ex1.rs diff --git a/src/test/ui/issues/issue-10764.rs b/src/test/ui/extern/issue-10764.rs similarity index 100% rename from src/test/ui/issues/issue-10764.rs rename to src/test/ui/extern/issue-10764.rs diff --git a/src/test/ui/issues/issue-10764.stderr b/src/test/ui/extern/issue-10764.stderr similarity index 100% rename from src/test/ui/issues/issue-10764.stderr rename to src/test/ui/extern/issue-10764.stderr diff --git a/src/test/ui/issues/issue-64620.rs b/src/test/ui/generator/issue-64620.rs similarity index 100% rename from src/test/ui/issues/issue-64620.rs rename to src/test/ui/generator/issue-64620.rs diff --git a/src/test/ui/issues/issue-64620.stderr b/src/test/ui/generator/issue-64620.stderr similarity index 100% rename from src/test/ui/issues/issue-64620.stderr rename to src/test/ui/generator/issue-64620.stderr diff --git a/src/test/ui/issues/issue-54302-cases.rs b/src/test/ui/hrtb/issue-54302-cases.rs similarity index 100% rename from src/test/ui/issues/issue-54302-cases.rs rename to src/test/ui/hrtb/issue-54302-cases.rs diff --git a/src/test/ui/issues/issue-54302-cases.stderr b/src/test/ui/hrtb/issue-54302-cases.stderr similarity index 100% rename from src/test/ui/issues/issue-54302-cases.stderr rename to src/test/ui/hrtb/issue-54302-cases.stderr diff --git a/src/test/ui/issues/issue-54302.rs b/src/test/ui/hrtb/issue-54302.rs similarity index 100% rename from src/test/ui/issues/issue-54302.rs rename to src/test/ui/hrtb/issue-54302.rs diff --git a/src/test/ui/issues/issue-54302.stderr b/src/test/ui/hrtb/issue-54302.stderr similarity index 100% rename from src/test/ui/issues/issue-54302.stderr rename to src/test/ui/hrtb/issue-54302.stderr diff --git a/src/test/ui/issues/issue-6596-2.rs b/src/test/ui/macros/issue-6596-2.rs similarity index 100% rename from src/test/ui/issues/issue-6596-2.rs rename to src/test/ui/macros/issue-6596-2.rs diff --git a/src/test/ui/issues/issue-6596-2.stderr b/src/test/ui/macros/issue-6596-2.stderr similarity index 100% rename from src/test/ui/issues/issue-6596-2.stderr rename to src/test/ui/macros/issue-6596-2.stderr diff --git a/src/test/ui/issue-94866.rs b/src/test/ui/match/issue-94866.rs similarity index 100% rename from src/test/ui/issue-94866.rs rename to src/test/ui/match/issue-94866.rs diff --git a/src/test/ui/issue-94866.stderr b/src/test/ui/match/issue-94866.stderr similarity index 100% rename from src/test/ui/issue-94866.stderr rename to src/test/ui/match/issue-94866.stderr diff --git a/src/test/ui/issues/issue-36053.rs b/src/test/ui/mismatched_types/issue-36053.rs similarity index 100% rename from src/test/ui/issues/issue-36053.rs rename to src/test/ui/mismatched_types/issue-36053.rs diff --git a/src/test/ui/issues/issue-52533.rs b/src/test/ui/nll/issue-52533.rs similarity index 100% rename from src/test/ui/issues/issue-52533.rs rename to src/test/ui/nll/issue-52533.rs diff --git a/src/test/ui/issues/issue-52533.stderr b/src/test/ui/nll/issue-52533.stderr similarity index 100% rename from src/test/ui/issues/issue-52533.stderr rename to src/test/ui/nll/issue-52533.stderr diff --git a/src/test/ui/issues/issue-54943-1.rs b/src/test/ui/nll/issue-54943-1.rs similarity index 100% rename from src/test/ui/issues/issue-54943-1.rs rename to src/test/ui/nll/issue-54943-1.rs diff --git a/src/test/ui/issues/issue-54943-2.rs b/src/test/ui/nll/issue-54943-2.rs similarity index 100% rename from src/test/ui/issues/issue-54943-2.rs rename to src/test/ui/nll/issue-54943-2.rs diff --git a/src/test/ui/issues/issue-54943.rs b/src/test/ui/nll/issue-54943.rs similarity index 100% rename from src/test/ui/issues/issue-54943.rs rename to src/test/ui/nll/issue-54943.rs diff --git a/src/test/ui/issues/issue-54943.stderr b/src/test/ui/nll/issue-54943.stderr similarity index 100% rename from src/test/ui/issues/issue-54943.stderr rename to src/test/ui/nll/issue-54943.stderr diff --git a/src/test/ui/parser/issue-61858.rs b/src/test/ui/parser/issues/issue-61858.rs similarity index 100% rename from src/test/ui/parser/issue-61858.rs rename to src/test/ui/parser/issues/issue-61858.rs diff --git a/src/test/ui/parser/issue-61858.stderr b/src/test/ui/parser/issues/issue-61858.stderr similarity index 100% rename from src/test/ui/parser/issue-61858.stderr rename to src/test/ui/parser/issues/issue-61858.stderr diff --git a/src/test/ui/parser/issue-68091-unicode-ident-after-if.rs b/src/test/ui/parser/issues/issue-68091-unicode-ident-after-if.rs similarity index 100% rename from src/test/ui/parser/issue-68091-unicode-ident-after-if.rs rename to src/test/ui/parser/issues/issue-68091-unicode-ident-after-if.rs diff --git a/src/test/ui/parser/issue-68091-unicode-ident-after-if.stderr b/src/test/ui/parser/issues/issue-68091-unicode-ident-after-if.stderr similarity index 100% rename from src/test/ui/parser/issue-68091-unicode-ident-after-if.stderr rename to src/test/ui/parser/issues/issue-68091-unicode-ident-after-if.stderr diff --git a/src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.rs b/src/test/ui/parser/issues/issue-68092-unicode-ident-after-incomplete-expr.rs similarity index 100% rename from src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.rs rename to src/test/ui/parser/issues/issue-68092-unicode-ident-after-incomplete-expr.rs diff --git a/src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.stderr b/src/test/ui/parser/issues/issue-68092-unicode-ident-after-incomplete-expr.stderr similarity index 100% rename from src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.stderr rename to src/test/ui/parser/issues/issue-68092-unicode-ident-after-incomplete-expr.stderr diff --git a/src/test/ui/parser/issue-81804.rs b/src/test/ui/parser/issues/issue-81804.rs similarity index 100% rename from src/test/ui/parser/issue-81804.rs rename to src/test/ui/parser/issues/issue-81804.rs diff --git a/src/test/ui/parser/issue-81804.stderr b/src/test/ui/parser/issues/issue-81804.stderr similarity index 100% rename from src/test/ui/parser/issue-81804.stderr rename to src/test/ui/parser/issues/issue-81804.stderr diff --git a/src/test/ui/parser/issue-81827.rs b/src/test/ui/parser/issues/issue-81827.rs similarity index 100% rename from src/test/ui/parser/issue-81827.rs rename to src/test/ui/parser/issues/issue-81827.rs diff --git a/src/test/ui/parser/issue-81827.stderr b/src/test/ui/parser/issues/issue-81827.stderr similarity index 100% rename from src/test/ui/parser/issue-81827.stderr rename to src/test/ui/parser/issues/issue-81827.stderr diff --git a/src/test/ui/parser/issue-87694-duplicated-pub.rs b/src/test/ui/parser/issues/issue-87694-duplicated-pub.rs similarity index 100% rename from src/test/ui/parser/issue-87694-duplicated-pub.rs rename to src/test/ui/parser/issues/issue-87694-duplicated-pub.rs diff --git a/src/test/ui/parser/issue-87694-duplicated-pub.stderr b/src/test/ui/parser/issues/issue-87694-duplicated-pub.stderr similarity index 100% rename from src/test/ui/parser/issue-87694-duplicated-pub.stderr rename to src/test/ui/parser/issues/issue-87694-duplicated-pub.stderr diff --git a/src/test/ui/parser/issue-87694-misplaced-pub.rs b/src/test/ui/parser/issues/issue-87694-misplaced-pub.rs similarity index 100% rename from src/test/ui/parser/issue-87694-misplaced-pub.rs rename to src/test/ui/parser/issues/issue-87694-misplaced-pub.rs diff --git a/src/test/ui/parser/issue-87694-misplaced-pub.stderr b/src/test/ui/parser/issues/issue-87694-misplaced-pub.stderr similarity index 100% rename from src/test/ui/parser/issue-87694-misplaced-pub.stderr rename to src/test/ui/parser/issues/issue-87694-misplaced-pub.stderr diff --git a/src/test/ui/parser/issue-90728.rs b/src/test/ui/parser/issues/issue-90728.rs similarity index 100% rename from src/test/ui/parser/issue-90728.rs rename to src/test/ui/parser/issues/issue-90728.rs diff --git a/src/test/ui/parser/issue-90728.stderr b/src/test/ui/parser/issues/issue-90728.stderr similarity index 100% rename from src/test/ui/parser/issue-90728.stderr rename to src/test/ui/parser/issues/issue-90728.stderr diff --git a/src/test/ui/parser/issue-91421.rs b/src/test/ui/parser/issues/issue-91421.rs similarity index 100% rename from src/test/ui/parser/issue-91421.rs rename to src/test/ui/parser/issues/issue-91421.rs diff --git a/src/test/ui/parser/issue-91421.stderr b/src/test/ui/parser/issues/issue-91421.stderr similarity index 100% rename from src/test/ui/parser/issue-91421.stderr rename to src/test/ui/parser/issues/issue-91421.stderr diff --git a/src/test/ui/issues/issue-15129-rpass.rs b/src/test/ui/pattern/usefulness/issue-15129-rpass.rs similarity index 100% rename from src/test/ui/issues/issue-15129-rpass.rs rename to src/test/ui/pattern/usefulness/issue-15129-rpass.rs diff --git a/src/test/ui/issues/issue-2718-a.rs b/src/test/ui/regions/issue-2718-a.rs similarity index 100% rename from src/test/ui/issues/issue-2718-a.rs rename to src/test/ui/regions/issue-2718-a.rs diff --git a/src/test/ui/issues/issue-2718-a.stderr b/src/test/ui/regions/issue-2718-a.stderr similarity index 100% rename from src/test/ui/issues/issue-2718-a.stderr rename to src/test/ui/regions/issue-2718-a.stderr diff --git a/src/test/ui/issues/issue-14254.rs b/src/test/ui/resolve/issue-14254-1.rs similarity index 100% rename from src/test/ui/issues/issue-14254.rs rename to src/test/ui/resolve/issue-14254-1.rs diff --git a/src/test/ui/issues/issue-2428.rs b/src/test/ui/resolve/issue-2428.rs similarity index 100% rename from src/test/ui/issues/issue-2428.rs rename to src/test/ui/resolve/issue-2428.rs diff --git a/src/test/ui/issues/issue-3021-b.rs b/src/test/ui/resolve/issue-3021-b.rs similarity index 100% rename from src/test/ui/issues/issue-3021-b.rs rename to src/test/ui/resolve/issue-3021-b.rs diff --git a/src/test/ui/issues/issue-3021-b.stderr b/src/test/ui/resolve/issue-3021-b.stderr similarity index 100% rename from src/test/ui/issues/issue-3021-b.stderr rename to src/test/ui/resolve/issue-3021-b.stderr diff --git a/src/test/ui/issues/issue-3021-d.rs b/src/test/ui/resolve/issue-3021-d.rs similarity index 100% rename from src/test/ui/issues/issue-3021-d.rs rename to src/test/ui/resolve/issue-3021-d.rs diff --git a/src/test/ui/issues/issue-3021-d.stderr b/src/test/ui/resolve/issue-3021-d.stderr similarity index 100% rename from src/test/ui/issues/issue-3021-d.stderr rename to src/test/ui/resolve/issue-3021-d.stderr diff --git a/src/test/ui/issues/issue-23338-ensure-param-drop-order.rs b/src/test/ui/span/issue-23338-ensure-param-drop-order.rs similarity index 100% rename from src/test/ui/issues/issue-23338-ensure-param-drop-order.rs rename to src/test/ui/span/issue-23338-ensure-param-drop-order.rs diff --git a/src/test/ui/issues/issue-23338-params-outlive-temps-of-body.rs b/src/test/ui/span/issue-23338-params-outlive-temps-of-body.rs similarity index 100% rename from src/test/ui/issues/issue-23338-params-outlive-temps-of-body.rs rename to src/test/ui/span/issue-23338-params-outlive-temps-of-body.rs diff --git a/src/test/ui/issues/issue-24805-dropck-itemless.rs b/src/test/ui/span/issue-24805-dropck-itemless.rs similarity index 100% rename from src/test/ui/issues/issue-24805-dropck-itemless.rs rename to src/test/ui/span/issue-24805-dropck-itemless.rs diff --git a/src/test/ui/issues/issue-7575.rs b/src/test/ui/span/issue-7575-1.rs similarity index 100% rename from src/test/ui/issues/issue-7575.rs rename to src/test/ui/span/issue-7575-1.rs diff --git a/src/test/ui/issues/issue-11515.rs b/src/test/ui/traits/trait-upcasting/issue-11515.rs similarity index 100% rename from src/test/ui/issues/issue-11515.rs rename to src/test/ui/traits/trait-upcasting/issue-11515.rs diff --git a/src/test/ui/issues/issue-11515.stderr b/src/test/ui/traits/trait-upcasting/issue-11515.stderr similarity index 100% rename from src/test/ui/issues/issue-11515.stderr rename to src/test/ui/traits/trait-upcasting/issue-11515.stderr diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs index 8ec5c33249333..85f62095867e0 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 = 968; -const ISSUES_ENTRY_LIMIT: usize = 2147; +const ROOT_ENTRY_LIMIT: usize = 965; +const ISSUES_ENTRY_LIMIT: usize = 2077; fn check_entries(path: &Path, bad: &mut bool) { let dirs = walkdir::WalkDir::new(&path.join("test/ui"))