diff --git a/tests/ui/generator/addassign-yield.rs b/tests/ui/coroutine/addassign-yield.rs
similarity index 100%
rename from tests/ui/generator/addassign-yield.rs
rename to tests/ui/coroutine/addassign-yield.rs
diff --git a/tests/ui/generator/async-coroutine-issue-67158.rs b/tests/ui/coroutine/async-coroutine-issue-67158.rs
similarity index 100%
rename from tests/ui/generator/async-coroutine-issue-67158.rs
rename to tests/ui/coroutine/async-coroutine-issue-67158.rs
diff --git a/tests/ui/generator/async-coroutine-issue-67158.stderr b/tests/ui/coroutine/async-coroutine-issue-67158.stderr
similarity index 100%
rename from tests/ui/generator/async-coroutine-issue-67158.stderr
rename to tests/ui/coroutine/async-coroutine-issue-67158.stderr
diff --git a/tests/ui/generator/auto-trait-regions.rs b/tests/ui/coroutine/auto-trait-regions.rs
similarity index 100%
rename from tests/ui/generator/auto-trait-regions.rs
rename to tests/ui/coroutine/auto-trait-regions.rs
diff --git a/tests/ui/generator/auto-trait-regions.stderr b/tests/ui/coroutine/auto-trait-regions.stderr
similarity index 100%
rename from tests/ui/generator/auto-trait-regions.stderr
rename to tests/ui/coroutine/auto-trait-regions.stderr
diff --git a/tests/ui/generator/auxiliary/metadata-sufficient-for-layout.rs b/tests/ui/coroutine/auxiliary/metadata-sufficient-for-layout.rs
similarity index 100%
rename from tests/ui/generator/auxiliary/metadata-sufficient-for-layout.rs
rename to tests/ui/coroutine/auxiliary/metadata-sufficient-for-layout.rs
diff --git a/tests/ui/generator/auxiliary/xcrate-reachable.rs b/tests/ui/coroutine/auxiliary/xcrate-reachable.rs
similarity index 100%
rename from tests/ui/generator/auxiliary/xcrate-reachable.rs
rename to tests/ui/coroutine/auxiliary/xcrate-reachable.rs
diff --git a/tests/ui/generator/auxiliary/xcrate.rs b/tests/ui/coroutine/auxiliary/xcrate.rs
similarity index 100%
rename from tests/ui/generator/auxiliary/xcrate.rs
rename to tests/ui/coroutine/auxiliary/xcrate.rs
diff --git a/tests/ui/generator/borrow-in-tail-expr.rs b/tests/ui/coroutine/borrow-in-tail-expr.rs
similarity index 100%
rename from tests/ui/generator/borrow-in-tail-expr.rs
rename to tests/ui/coroutine/borrow-in-tail-expr.rs
diff --git a/tests/ui/generator/borrowing.rs b/tests/ui/coroutine/borrowing.rs
similarity index 100%
rename from tests/ui/generator/borrowing.rs
rename to tests/ui/coroutine/borrowing.rs
diff --git a/tests/ui/generator/borrowing.stderr b/tests/ui/coroutine/borrowing.stderr
similarity index 100%
rename from tests/ui/generator/borrowing.stderr
rename to tests/ui/coroutine/borrowing.stderr
diff --git a/tests/ui/generator/clone-impl-async.rs b/tests/ui/coroutine/clone-impl-async.rs
similarity index 100%
rename from tests/ui/generator/clone-impl-async.rs
rename to tests/ui/coroutine/clone-impl-async.rs
diff --git a/tests/ui/generator/clone-impl-async.stderr b/tests/ui/coroutine/clone-impl-async.stderr
similarity index 100%
rename from tests/ui/generator/clone-impl-async.stderr
rename to tests/ui/coroutine/clone-impl-async.stderr
diff --git a/tests/ui/generator/clone-impl-static.rs b/tests/ui/coroutine/clone-impl-static.rs
similarity index 100%
rename from tests/ui/generator/clone-impl-static.rs
rename to tests/ui/coroutine/clone-impl-static.rs
diff --git a/tests/ui/generator/clone-impl-static.stderr b/tests/ui/coroutine/clone-impl-static.stderr
similarity index 100%
rename from tests/ui/generator/clone-impl-static.stderr
rename to tests/ui/coroutine/clone-impl-static.stderr
diff --git a/tests/ui/generator/clone-impl.rs b/tests/ui/coroutine/clone-impl.rs
similarity index 100%
rename from tests/ui/generator/clone-impl.rs
rename to tests/ui/coroutine/clone-impl.rs
diff --git a/tests/ui/generator/clone-impl.stderr b/tests/ui/coroutine/clone-impl.stderr
similarity index 100%
rename from tests/ui/generator/clone-impl.stderr
rename to tests/ui/coroutine/clone-impl.stderr
diff --git a/tests/ui/generator/conditional-drop.rs b/tests/ui/coroutine/conditional-drop.rs
similarity index 100%
rename from tests/ui/generator/conditional-drop.rs
rename to tests/ui/coroutine/conditional-drop.rs
diff --git a/tests/ui/generator/control-flow.rs b/tests/ui/coroutine/control-flow.rs
similarity index 100%
rename from tests/ui/generator/control-flow.rs
rename to tests/ui/coroutine/control-flow.rs
diff --git a/tests/ui/generator/coroutine-region-requirements.migrate.stderr b/tests/ui/coroutine/coroutine-region-requirements.migrate.stderr
similarity index 100%
rename from tests/ui/generator/coroutine-region-requirements.migrate.stderr
rename to tests/ui/coroutine/coroutine-region-requirements.migrate.stderr
diff --git a/tests/ui/generator/coroutine-region-requirements.rs b/tests/ui/coroutine/coroutine-region-requirements.rs
similarity index 100%
rename from tests/ui/generator/coroutine-region-requirements.rs
rename to tests/ui/coroutine/coroutine-region-requirements.rs
diff --git a/tests/ui/generator/coroutine-region-requirements.stderr b/tests/ui/coroutine/coroutine-region-requirements.stderr
similarity index 100%
rename from tests/ui/generator/coroutine-region-requirements.stderr
rename to tests/ui/coroutine/coroutine-region-requirements.stderr
diff --git a/tests/ui/generator/coroutine-resume-after-panic.rs b/tests/ui/coroutine/coroutine-resume-after-panic.rs
similarity index 100%
rename from tests/ui/generator/coroutine-resume-after-panic.rs
rename to tests/ui/coroutine/coroutine-resume-after-panic.rs
diff --git a/tests/ui/generator/coroutine-with-nll.rs b/tests/ui/coroutine/coroutine-with-nll.rs
similarity index 100%
rename from tests/ui/generator/coroutine-with-nll.rs
rename to tests/ui/coroutine/coroutine-with-nll.rs
diff --git a/tests/ui/generator/coroutine-with-nll.stderr b/tests/ui/coroutine/coroutine-with-nll.stderr
similarity index 100%
rename from tests/ui/generator/coroutine-with-nll.stderr
rename to tests/ui/coroutine/coroutine-with-nll.stderr
diff --git a/tests/ui/generator/coroutine-yielding-or-returning-itself.rs b/tests/ui/coroutine/coroutine-yielding-or-returning-itself.rs
similarity index 100%
rename from tests/ui/generator/coroutine-yielding-or-returning-itself.rs
rename to tests/ui/coroutine/coroutine-yielding-or-returning-itself.rs
diff --git a/tests/ui/generator/coroutine-yielding-or-returning-itself.stderr b/tests/ui/coroutine/coroutine-yielding-or-returning-itself.stderr
similarity index 100%
rename from tests/ui/generator/coroutine-yielding-or-returning-itself.stderr
rename to tests/ui/coroutine/coroutine-yielding-or-returning-itself.stderr
diff --git a/tests/ui/generator/derived-drop-parent-expr.rs b/tests/ui/coroutine/derived-drop-parent-expr.rs
similarity index 100%
rename from tests/ui/generator/derived-drop-parent-expr.rs
rename to tests/ui/coroutine/derived-drop-parent-expr.rs
diff --git a/tests/ui/generator/discriminant.rs b/tests/ui/coroutine/discriminant.rs
similarity index 100%
rename from tests/ui/generator/discriminant.rs
rename to tests/ui/coroutine/discriminant.rs
diff --git a/tests/ui/generator/drop-and-replace.rs b/tests/ui/coroutine/drop-and-replace.rs
similarity index 100%
rename from tests/ui/generator/drop-and-replace.rs
rename to tests/ui/coroutine/drop-and-replace.rs
diff --git a/tests/ui/generator/drop-control-flow.rs b/tests/ui/coroutine/drop-control-flow.rs
similarity index 100%
rename from tests/ui/generator/drop-control-flow.rs
rename to tests/ui/coroutine/drop-control-flow.rs
diff --git a/tests/ui/generator/drop-env.rs b/tests/ui/coroutine/drop-env.rs
similarity index 100%
rename from tests/ui/generator/drop-env.rs
rename to tests/ui/coroutine/drop-env.rs
diff --git a/tests/ui/generator/drop-track-addassign-yield.rs b/tests/ui/coroutine/drop-track-addassign-yield.rs
similarity index 100%
rename from tests/ui/generator/drop-track-addassign-yield.rs
rename to tests/ui/coroutine/drop-track-addassign-yield.rs
diff --git a/tests/ui/generator/drop-tracking-parent-expression.rs b/tests/ui/coroutine/drop-tracking-parent-expression.rs
similarity index 100%
rename from tests/ui/generator/drop-tracking-parent-expression.rs
rename to tests/ui/coroutine/drop-tracking-parent-expression.rs
diff --git a/tests/ui/generator/drop-tracking-parent-expression.stderr b/tests/ui/coroutine/drop-tracking-parent-expression.stderr
similarity index 100%
rename from tests/ui/generator/drop-tracking-parent-expression.stderr
rename to tests/ui/coroutine/drop-tracking-parent-expression.stderr
diff --git a/tests/ui/generator/drop-tracking-yielding-in-match-guards.rs b/tests/ui/coroutine/drop-tracking-yielding-in-match-guards.rs
similarity index 100%
rename from tests/ui/generator/drop-tracking-yielding-in-match-guards.rs
rename to tests/ui/coroutine/drop-tracking-yielding-in-match-guards.rs
diff --git a/tests/ui/generator/drop-yield-twice.rs b/tests/ui/coroutine/drop-yield-twice.rs
similarity index 100%
rename from tests/ui/generator/drop-yield-twice.rs
rename to tests/ui/coroutine/drop-yield-twice.rs
diff --git a/tests/ui/generator/drop-yield-twice.stderr b/tests/ui/coroutine/drop-yield-twice.stderr
similarity index 100%
rename from tests/ui/generator/drop-yield-twice.stderr
rename to tests/ui/coroutine/drop-yield-twice.stderr
diff --git a/tests/ui/generator/dropck-resume.rs b/tests/ui/coroutine/dropck-resume.rs
similarity index 100%
rename from tests/ui/generator/dropck-resume.rs
rename to tests/ui/coroutine/dropck-resume.rs
diff --git a/tests/ui/generator/dropck-resume.stderr b/tests/ui/coroutine/dropck-resume.stderr
similarity index 100%
rename from tests/ui/generator/dropck-resume.stderr
rename to tests/ui/coroutine/dropck-resume.stderr
diff --git a/tests/ui/generator/dropck.rs b/tests/ui/coroutine/dropck.rs
similarity index 100%
rename from tests/ui/generator/dropck.rs
rename to tests/ui/coroutine/dropck.rs
diff --git a/tests/ui/generator/dropck.stderr b/tests/ui/coroutine/dropck.stderr
similarity index 100%
rename from tests/ui/generator/dropck.stderr
rename to tests/ui/coroutine/dropck.stderr
diff --git a/tests/ui/generator/issue-102645.rs b/tests/ui/coroutine/issue-102645.rs
similarity index 100%
rename from tests/ui/generator/issue-102645.rs
rename to tests/ui/coroutine/issue-102645.rs
diff --git a/tests/ui/generator/issue-102645.stderr b/tests/ui/coroutine/issue-102645.stderr
similarity index 100%
rename from tests/ui/generator/issue-102645.stderr
rename to tests/ui/coroutine/issue-102645.stderr
diff --git a/tests/ui/generator/issue-105084.rs b/tests/ui/coroutine/issue-105084.rs
similarity index 100%
rename from tests/ui/generator/issue-105084.rs
rename to tests/ui/coroutine/issue-105084.rs
diff --git a/tests/ui/generator/issue-105084.stderr b/tests/ui/coroutine/issue-105084.stderr
similarity index 100%
rename from tests/ui/generator/issue-105084.stderr
rename to tests/ui/coroutine/issue-105084.stderr
diff --git a/tests/ui/generator/issue-110929-coroutine-conflict-error-ice.rs b/tests/ui/coroutine/issue-110929-coroutine-conflict-error-ice.rs
similarity index 100%
rename from tests/ui/generator/issue-110929-coroutine-conflict-error-ice.rs
rename to tests/ui/coroutine/issue-110929-coroutine-conflict-error-ice.rs
diff --git a/tests/ui/generator/issue-110929-coroutine-conflict-error-ice.stderr b/tests/ui/coroutine/issue-110929-coroutine-conflict-error-ice.stderr
similarity index 100%
rename from tests/ui/generator/issue-110929-coroutine-conflict-error-ice.stderr
rename to tests/ui/coroutine/issue-110929-coroutine-conflict-error-ice.stderr
diff --git a/tests/ui/generator/issue-113279.rs b/tests/ui/coroutine/issue-113279.rs
similarity index 100%
rename from tests/ui/generator/issue-113279.rs
rename to tests/ui/coroutine/issue-113279.rs
diff --git a/tests/ui/generator/issue-113279.stderr b/tests/ui/coroutine/issue-113279.stderr
similarity index 100%
rename from tests/ui/generator/issue-113279.stderr
rename to tests/ui/coroutine/issue-113279.stderr
diff --git a/tests/ui/generator/issue-44197.rs b/tests/ui/coroutine/issue-44197.rs
similarity index 100%
rename from tests/ui/generator/issue-44197.rs
rename to tests/ui/coroutine/issue-44197.rs
diff --git a/tests/ui/generator/issue-45729-unsafe-in-coroutine.mir.stderr b/tests/ui/coroutine/issue-45729-unsafe-in-coroutine.mir.stderr
similarity index 100%
rename from tests/ui/generator/issue-45729-unsafe-in-coroutine.mir.stderr
rename to tests/ui/coroutine/issue-45729-unsafe-in-coroutine.mir.stderr
diff --git a/tests/ui/generator/issue-45729-unsafe-in-coroutine.rs b/tests/ui/coroutine/issue-45729-unsafe-in-coroutine.rs
similarity index 100%
rename from tests/ui/generator/issue-45729-unsafe-in-coroutine.rs
rename to tests/ui/coroutine/issue-45729-unsafe-in-coroutine.rs
diff --git a/tests/ui/generator/issue-45729-unsafe-in-coroutine.thir.stderr b/tests/ui/coroutine/issue-45729-unsafe-in-coroutine.thir.stderr
similarity index 100%
rename from tests/ui/generator/issue-45729-unsafe-in-coroutine.thir.stderr
rename to tests/ui/coroutine/issue-45729-unsafe-in-coroutine.thir.stderr
diff --git a/tests/ui/generator/issue-48048.rs b/tests/ui/coroutine/issue-48048.rs
similarity index 100%
rename from tests/ui/generator/issue-48048.rs
rename to tests/ui/coroutine/issue-48048.rs
diff --git a/tests/ui/generator/issue-48048.stderr b/tests/ui/coroutine/issue-48048.stderr
similarity index 100%
rename from tests/ui/generator/issue-48048.stderr
rename to tests/ui/coroutine/issue-48048.stderr
diff --git a/tests/ui/generator/issue-52304.rs b/tests/ui/coroutine/issue-52304.rs
similarity index 100%
rename from tests/ui/generator/issue-52304.rs
rename to tests/ui/coroutine/issue-52304.rs
diff --git a/tests/ui/generator/issue-52398.rs b/tests/ui/coroutine/issue-52398.rs
similarity index 100%
rename from tests/ui/generator/issue-52398.rs
rename to tests/ui/coroutine/issue-52398.rs
diff --git a/tests/ui/generator/issue-52398.stderr b/tests/ui/coroutine/issue-52398.stderr
similarity index 100%
rename from tests/ui/generator/issue-52398.stderr
rename to tests/ui/coroutine/issue-52398.stderr
diff --git a/tests/ui/generator/issue-53548-1.rs b/tests/ui/coroutine/issue-53548-1.rs
similarity index 100%
rename from tests/ui/generator/issue-53548-1.rs
rename to tests/ui/coroutine/issue-53548-1.rs
diff --git a/tests/ui/generator/issue-53548.rs b/tests/ui/coroutine/issue-53548.rs
similarity index 100%
rename from tests/ui/generator/issue-53548.rs
rename to tests/ui/coroutine/issue-53548.rs
diff --git a/tests/ui/generator/issue-57017.rs b/tests/ui/coroutine/issue-57017.rs
similarity index 100%
rename from tests/ui/generator/issue-57017.rs
rename to tests/ui/coroutine/issue-57017.rs
diff --git a/tests/ui/generator/issue-57084.rs b/tests/ui/coroutine/issue-57084.rs
similarity index 100%
rename from tests/ui/generator/issue-57084.rs
rename to tests/ui/coroutine/issue-57084.rs
diff --git a/tests/ui/generator/issue-57084.stderr b/tests/ui/coroutine/issue-57084.stderr
similarity index 100%
rename from tests/ui/generator/issue-57084.stderr
rename to tests/ui/coroutine/issue-57084.stderr
diff --git a/tests/ui/generator/issue-57478.rs b/tests/ui/coroutine/issue-57478.rs
similarity index 100%
rename from tests/ui/generator/issue-57478.rs
rename to tests/ui/coroutine/issue-57478.rs
diff --git a/tests/ui/generator/issue-58888.rs b/tests/ui/coroutine/issue-58888.rs
similarity index 100%
rename from tests/ui/generator/issue-58888.rs
rename to tests/ui/coroutine/issue-58888.rs
diff --git a/tests/ui/generator/issue-61442-stmt-expr-with-drop.rs b/tests/ui/coroutine/issue-61442-stmt-expr-with-drop.rs
similarity index 100%
rename from tests/ui/generator/issue-61442-stmt-expr-with-drop.rs
rename to tests/ui/coroutine/issue-61442-stmt-expr-with-drop.rs
diff --git a/tests/ui/generator/issue-62506-two_awaits.rs b/tests/ui/coroutine/issue-62506-two_awaits.rs
similarity index 100%
rename from tests/ui/generator/issue-62506-two_awaits.rs
rename to tests/ui/coroutine/issue-62506-two_awaits.rs
diff --git a/tests/ui/generator/issue-64620-yield-array-element.rs b/tests/ui/coroutine/issue-64620-yield-array-element.rs
similarity index 100%
rename from tests/ui/generator/issue-64620-yield-array-element.rs
rename to tests/ui/coroutine/issue-64620-yield-array-element.rs
diff --git a/tests/ui/generator/issue-64620-yield-array-element.stderr b/tests/ui/coroutine/issue-64620-yield-array-element.stderr
similarity index 100%
rename from tests/ui/generator/issue-64620-yield-array-element.stderr
rename to tests/ui/coroutine/issue-64620-yield-array-element.stderr
diff --git a/tests/ui/generator/issue-68112.rs b/tests/ui/coroutine/issue-68112.rs
similarity index 100%
rename from tests/ui/generator/issue-68112.rs
rename to tests/ui/coroutine/issue-68112.rs
diff --git a/tests/ui/generator/issue-68112.stderr b/tests/ui/coroutine/issue-68112.stderr
similarity index 100%
rename from tests/ui/generator/issue-68112.stderr
rename to tests/ui/coroutine/issue-68112.stderr
diff --git a/tests/ui/generator/issue-69017.rs b/tests/ui/coroutine/issue-69017.rs
similarity index 100%
rename from tests/ui/generator/issue-69017.rs
rename to tests/ui/coroutine/issue-69017.rs
diff --git a/tests/ui/generator/issue-69039.rs b/tests/ui/coroutine/issue-69039.rs
similarity index 100%
rename from tests/ui/generator/issue-69039.rs
rename to tests/ui/coroutine/issue-69039.rs
diff --git a/tests/ui/generator/issue-87142.rs b/tests/ui/coroutine/issue-87142.rs
similarity index 100%
rename from tests/ui/generator/issue-87142.rs
rename to tests/ui/coroutine/issue-87142.rs
diff --git a/tests/ui/generator/issue-88653.rs b/tests/ui/coroutine/issue-88653.rs
similarity index 100%
rename from tests/ui/generator/issue-88653.rs
rename to tests/ui/coroutine/issue-88653.rs
diff --git a/tests/ui/generator/issue-88653.stderr b/tests/ui/coroutine/issue-88653.stderr
similarity index 100%
rename from tests/ui/generator/issue-88653.stderr
rename to tests/ui/coroutine/issue-88653.stderr
diff --git a/tests/ui/generator/issue-91477.rs b/tests/ui/coroutine/issue-91477.rs
similarity index 100%
rename from tests/ui/generator/issue-91477.rs
rename to tests/ui/coroutine/issue-91477.rs
diff --git a/tests/ui/generator/issue-91477.stderr b/tests/ui/coroutine/issue-91477.stderr
similarity index 100%
rename from tests/ui/generator/issue-91477.stderr
rename to tests/ui/coroutine/issue-91477.stderr
diff --git a/tests/ui/generator/issue-93161.rs b/tests/ui/coroutine/issue-93161.rs
similarity index 100%
rename from tests/ui/generator/issue-93161.rs
rename to tests/ui/coroutine/issue-93161.rs
diff --git a/tests/ui/generator/iterator-count.rs b/tests/ui/coroutine/iterator-count.rs
similarity index 100%
rename from tests/ui/generator/iterator-count.rs
rename to tests/ui/coroutine/iterator-count.rs
diff --git a/tests/ui/generator/layout-error.rs b/tests/ui/coroutine/layout-error.rs
similarity index 100%
rename from tests/ui/generator/layout-error.rs
rename to tests/ui/coroutine/layout-error.rs
diff --git a/tests/ui/generator/layout-error.stderr b/tests/ui/coroutine/layout-error.stderr
similarity index 100%
rename from tests/ui/generator/layout-error.stderr
rename to tests/ui/coroutine/layout-error.stderr
diff --git a/tests/ui/generator/live-upvar-across-yield.rs b/tests/ui/coroutine/live-upvar-across-yield.rs
similarity index 100%
rename from tests/ui/generator/live-upvar-across-yield.rs
rename to tests/ui/coroutine/live-upvar-across-yield.rs
diff --git a/tests/ui/generator/match-bindings.rs b/tests/ui/coroutine/match-bindings.rs
similarity index 100%
rename from tests/ui/generator/match-bindings.rs
rename to tests/ui/coroutine/match-bindings.rs
diff --git a/tests/ui/generator/match-bindings.stderr b/tests/ui/coroutine/match-bindings.stderr
similarity index 100%
rename from tests/ui/generator/match-bindings.stderr
rename to tests/ui/coroutine/match-bindings.stderr
diff --git a/tests/ui/generator/metadata-sufficient-for-layout.rs b/tests/ui/coroutine/metadata-sufficient-for-layout.rs
similarity index 100%
rename from tests/ui/generator/metadata-sufficient-for-layout.rs
rename to tests/ui/coroutine/metadata-sufficient-for-layout.rs
diff --git a/tests/ui/generator/metadata-sufficient-for-layout.stderr b/tests/ui/coroutine/metadata-sufficient-for-layout.stderr
similarity index 100%
rename from tests/ui/generator/metadata-sufficient-for-layout.stderr
rename to tests/ui/coroutine/metadata-sufficient-for-layout.stderr
diff --git a/tests/ui/generator/nested_coroutine.rs b/tests/ui/coroutine/nested_coroutine.rs
similarity index 100%
rename from tests/ui/generator/nested_coroutine.rs
rename to tests/ui/coroutine/nested_coroutine.rs
diff --git a/tests/ui/generator/niche-in-coroutine.rs b/tests/ui/coroutine/niche-in-coroutine.rs
similarity index 100%
rename from tests/ui/generator/niche-in-coroutine.rs
rename to tests/ui/coroutine/niche-in-coroutine.rs
diff --git a/tests/ui/generator/non-static-is-unpin.rs b/tests/ui/coroutine/non-static-is-unpin.rs
similarity index 100%
rename from tests/ui/generator/non-static-is-unpin.rs
rename to tests/ui/coroutine/non-static-is-unpin.rs
diff --git a/tests/ui/generator/not-send-sync.rs b/tests/ui/coroutine/not-send-sync.rs
similarity index 100%
rename from tests/ui/generator/not-send-sync.rs
rename to tests/ui/coroutine/not-send-sync.rs
diff --git a/tests/ui/generator/not-send-sync.stderr b/tests/ui/coroutine/not-send-sync.stderr
similarity index 100%
rename from tests/ui/generator/not-send-sync.stderr
rename to tests/ui/coroutine/not-send-sync.stderr
diff --git a/tests/ui/generator/overlap-locals.rs b/tests/ui/coroutine/overlap-locals.rs
similarity index 100%
rename from tests/ui/generator/overlap-locals.rs
rename to tests/ui/coroutine/overlap-locals.rs
diff --git a/tests/ui/generator/panic-drops-resume.rs b/tests/ui/coroutine/panic-drops-resume.rs
similarity index 100%
rename from tests/ui/generator/panic-drops-resume.rs
rename to tests/ui/coroutine/panic-drops-resume.rs
diff --git a/tests/ui/generator/panic-drops.rs b/tests/ui/coroutine/panic-drops.rs
similarity index 100%
rename from tests/ui/generator/panic-drops.rs
rename to tests/ui/coroutine/panic-drops.rs
diff --git a/tests/ui/generator/panic-safe.rs b/tests/ui/coroutine/panic-safe.rs
similarity index 100%
rename from tests/ui/generator/panic-safe.rs
rename to tests/ui/coroutine/panic-safe.rs
diff --git a/tests/ui/generator/parent-expression.rs b/tests/ui/coroutine/parent-expression.rs
similarity index 100%
rename from tests/ui/generator/parent-expression.rs
rename to tests/ui/coroutine/parent-expression.rs
diff --git a/tests/ui/generator/parent-expression.stderr b/tests/ui/coroutine/parent-expression.stderr
similarity index 100%
rename from tests/ui/generator/parent-expression.stderr
rename to tests/ui/coroutine/parent-expression.stderr
diff --git a/tests/ui/generator/partial-drop.rs b/tests/ui/coroutine/partial-drop.rs
similarity index 100%
rename from tests/ui/generator/partial-drop.rs
rename to tests/ui/coroutine/partial-drop.rs
diff --git a/tests/ui/generator/partial-initialization-across-yield.rs b/tests/ui/coroutine/partial-initialization-across-yield.rs
similarity index 100%
rename from tests/ui/generator/partial-initialization-across-yield.rs
rename to tests/ui/coroutine/partial-initialization-across-yield.rs
diff --git a/tests/ui/generator/partial-initialization-across-yield.stderr b/tests/ui/coroutine/partial-initialization-across-yield.stderr
similarity index 100%
rename from tests/ui/generator/partial-initialization-across-yield.stderr
rename to tests/ui/coroutine/partial-initialization-across-yield.stderr
diff --git a/tests/ui/generator/pattern-borrow.rs b/tests/ui/coroutine/pattern-borrow.rs
similarity index 100%
rename from tests/ui/generator/pattern-borrow.rs
rename to tests/ui/coroutine/pattern-borrow.rs
diff --git a/tests/ui/generator/pattern-borrow.stderr b/tests/ui/coroutine/pattern-borrow.stderr
similarity index 100%
rename from tests/ui/generator/pattern-borrow.stderr
rename to tests/ui/coroutine/pattern-borrow.stderr
diff --git a/tests/ui/generator/pin-box-coroutine.rs b/tests/ui/coroutine/pin-box-coroutine.rs
similarity index 100%
rename from tests/ui/generator/pin-box-coroutine.rs
rename to tests/ui/coroutine/pin-box-coroutine.rs
diff --git a/tests/ui/generator/print/coroutine-print-verbose-1.rs b/tests/ui/coroutine/print/coroutine-print-verbose-1.rs
similarity index 100%
rename from tests/ui/generator/print/coroutine-print-verbose-1.rs
rename to tests/ui/coroutine/print/coroutine-print-verbose-1.rs
diff --git a/tests/ui/generator/print/coroutine-print-verbose-1.stderr b/tests/ui/coroutine/print/coroutine-print-verbose-1.stderr
similarity index 100%
rename from tests/ui/generator/print/coroutine-print-verbose-1.stderr
rename to tests/ui/coroutine/print/coroutine-print-verbose-1.stderr
diff --git a/tests/ui/generator/print/coroutine-print-verbose-2.rs b/tests/ui/coroutine/print/coroutine-print-verbose-2.rs
similarity index 100%
rename from tests/ui/generator/print/coroutine-print-verbose-2.rs
rename to tests/ui/coroutine/print/coroutine-print-verbose-2.rs
diff --git a/tests/ui/generator/print/coroutine-print-verbose-2.stderr b/tests/ui/coroutine/print/coroutine-print-verbose-2.stderr
similarity index 100%
rename from tests/ui/generator/print/coroutine-print-verbose-2.stderr
rename to tests/ui/coroutine/print/coroutine-print-verbose-2.stderr
diff --git a/tests/ui/generator/print/coroutine-print-verbose-3.rs b/tests/ui/coroutine/print/coroutine-print-verbose-3.rs
similarity index 100%
rename from tests/ui/generator/print/coroutine-print-verbose-3.rs
rename to tests/ui/coroutine/print/coroutine-print-verbose-3.rs
diff --git a/tests/ui/generator/print/coroutine-print-verbose-3.stderr b/tests/ui/coroutine/print/coroutine-print-verbose-3.stderr
similarity index 100%
rename from tests/ui/generator/print/coroutine-print-verbose-3.stderr
rename to tests/ui/coroutine/print/coroutine-print-verbose-3.stderr
diff --git a/tests/ui/generator/reborrow-mut-upvar.rs b/tests/ui/coroutine/reborrow-mut-upvar.rs
similarity index 100%
rename from tests/ui/generator/reborrow-mut-upvar.rs
rename to tests/ui/coroutine/reborrow-mut-upvar.rs
diff --git a/tests/ui/generator/reborrow-mut-upvar.stderr b/tests/ui/coroutine/reborrow-mut-upvar.stderr
similarity index 100%
rename from tests/ui/generator/reborrow-mut-upvar.stderr
rename to tests/ui/coroutine/reborrow-mut-upvar.stderr
diff --git a/tests/ui/generator/ref-escapes-but-not-over-yield.rs b/tests/ui/coroutine/ref-escapes-but-not-over-yield.rs
similarity index 100%
rename from tests/ui/generator/ref-escapes-but-not-over-yield.rs
rename to tests/ui/coroutine/ref-escapes-but-not-over-yield.rs
diff --git a/tests/ui/generator/ref-escapes-but-not-over-yield.stderr b/tests/ui/coroutine/ref-escapes-but-not-over-yield.stderr
similarity index 100%
rename from tests/ui/generator/ref-escapes-but-not-over-yield.stderr
rename to tests/ui/coroutine/ref-escapes-but-not-over-yield.stderr
diff --git a/tests/ui/generator/ref-upvar-not-send.rs b/tests/ui/coroutine/ref-upvar-not-send.rs
similarity index 100%
rename from tests/ui/generator/ref-upvar-not-send.rs
rename to tests/ui/coroutine/ref-upvar-not-send.rs
diff --git a/tests/ui/generator/ref-upvar-not-send.stderr b/tests/ui/coroutine/ref-upvar-not-send.stderr
similarity index 100%
rename from tests/ui/generator/ref-upvar-not-send.stderr
rename to tests/ui/coroutine/ref-upvar-not-send.stderr
diff --git a/tests/ui/generator/reinit-in-match-guard.rs b/tests/ui/coroutine/reinit-in-match-guard.rs
similarity index 100%
rename from tests/ui/generator/reinit-in-match-guard.rs
rename to tests/ui/coroutine/reinit-in-match-guard.rs
diff --git a/tests/ui/generator/resume-after-return.rs b/tests/ui/coroutine/resume-after-return.rs
similarity index 100%
rename from tests/ui/generator/resume-after-return.rs
rename to tests/ui/coroutine/resume-after-return.rs
diff --git a/tests/ui/generator/resume-arg-late-bound.rs b/tests/ui/coroutine/resume-arg-late-bound.rs
similarity index 100%
rename from tests/ui/generator/resume-arg-late-bound.rs
rename to tests/ui/coroutine/resume-arg-late-bound.rs
diff --git a/tests/ui/generator/resume-arg-late-bound.stderr b/tests/ui/coroutine/resume-arg-late-bound.stderr
similarity index 100%
rename from tests/ui/generator/resume-arg-late-bound.stderr
rename to tests/ui/coroutine/resume-arg-late-bound.stderr
diff --git a/tests/ui/generator/resume-arg-size.rs b/tests/ui/coroutine/resume-arg-size.rs
similarity index 100%
rename from tests/ui/generator/resume-arg-size.rs
rename to tests/ui/coroutine/resume-arg-size.rs
diff --git a/tests/ui/generator/resume-live-across-yield.rs b/tests/ui/coroutine/resume-live-across-yield.rs
similarity index 100%
rename from tests/ui/generator/resume-live-across-yield.rs
rename to tests/ui/coroutine/resume-live-across-yield.rs
diff --git a/tests/ui/generator/retain-resume-ref.rs b/tests/ui/coroutine/retain-resume-ref.rs
similarity index 100%
rename from tests/ui/generator/retain-resume-ref.rs
rename to tests/ui/coroutine/retain-resume-ref.rs
diff --git a/tests/ui/generator/retain-resume-ref.stderr b/tests/ui/coroutine/retain-resume-ref.stderr
similarity index 100%
rename from tests/ui/generator/retain-resume-ref.stderr
rename to tests/ui/coroutine/retain-resume-ref.stderr
diff --git a/tests/ui/generator/size-moved-locals.rs b/tests/ui/coroutine/size-moved-locals.rs
similarity index 100%
rename from tests/ui/generator/size-moved-locals.rs
rename to tests/ui/coroutine/size-moved-locals.rs
diff --git a/tests/ui/generator/sized-yield.rs b/tests/ui/coroutine/sized-yield.rs
similarity index 100%
rename from tests/ui/generator/sized-yield.rs
rename to tests/ui/coroutine/sized-yield.rs
diff --git a/tests/ui/generator/sized-yield.stderr b/tests/ui/coroutine/sized-yield.stderr
similarity index 100%
rename from tests/ui/generator/sized-yield.stderr
rename to tests/ui/coroutine/sized-yield.stderr
diff --git a/tests/ui/generator/smoke-resume-args.rs b/tests/ui/coroutine/smoke-resume-args.rs
similarity index 100%
rename from tests/ui/generator/smoke-resume-args.rs
rename to tests/ui/coroutine/smoke-resume-args.rs
diff --git a/tests/ui/generator/smoke.rs b/tests/ui/coroutine/smoke.rs
similarity index 100%
rename from tests/ui/generator/smoke.rs
rename to tests/ui/coroutine/smoke.rs
diff --git a/tests/ui/generator/static-coroutine.rs b/tests/ui/coroutine/static-coroutine.rs
similarity index 100%
rename from tests/ui/generator/static-coroutine.rs
rename to tests/ui/coroutine/static-coroutine.rs
diff --git a/tests/ui/generator/static-mut-reference-across-yield.rs b/tests/ui/coroutine/static-mut-reference-across-yield.rs
similarity index 100%
rename from tests/ui/generator/static-mut-reference-across-yield.rs
rename to tests/ui/coroutine/static-mut-reference-across-yield.rs
diff --git a/tests/ui/generator/static-not-unpin.current.stderr b/tests/ui/coroutine/static-not-unpin.current.stderr
similarity index 100%
rename from tests/ui/generator/static-not-unpin.current.stderr
rename to tests/ui/coroutine/static-not-unpin.current.stderr
diff --git a/tests/ui/generator/static-not-unpin.next.stderr b/tests/ui/coroutine/static-not-unpin.next.stderr
similarity index 100%
rename from tests/ui/generator/static-not-unpin.next.stderr
rename to tests/ui/coroutine/static-not-unpin.next.stderr
diff --git a/tests/ui/generator/static-not-unpin.rs b/tests/ui/coroutine/static-not-unpin.rs
similarity index 100%
rename from tests/ui/generator/static-not-unpin.rs
rename to tests/ui/coroutine/static-not-unpin.rs
diff --git a/tests/ui/generator/static-reference-across-yield.rs b/tests/ui/coroutine/static-reference-across-yield.rs
similarity index 100%
rename from tests/ui/generator/static-reference-across-yield.rs
rename to tests/ui/coroutine/static-reference-across-yield.rs
diff --git a/tests/ui/generator/too-live-local-in-immovable-gen.rs b/tests/ui/coroutine/too-live-local-in-immovable-gen.rs
similarity index 100%
rename from tests/ui/generator/too-live-local-in-immovable-gen.rs
rename to tests/ui/coroutine/too-live-local-in-immovable-gen.rs
diff --git a/tests/ui/generator/too-live-local-in-immovable-gen.stderr b/tests/ui/coroutine/too-live-local-in-immovable-gen.stderr
similarity index 100%
rename from tests/ui/generator/too-live-local-in-immovable-gen.stderr
rename to tests/ui/coroutine/too-live-local-in-immovable-gen.stderr
diff --git a/tests/ui/generator/too-many-parameters.rs b/tests/ui/coroutine/too-many-parameters.rs
similarity index 100%
rename from tests/ui/generator/too-many-parameters.rs
rename to tests/ui/coroutine/too-many-parameters.rs
diff --git a/tests/ui/generator/too-many-parameters.stderr b/tests/ui/coroutine/too-many-parameters.stderr
similarity index 100%
rename from tests/ui/generator/too-many-parameters.stderr
rename to tests/ui/coroutine/too-many-parameters.stderr
diff --git a/tests/ui/generator/type-mismatch-error.rs b/tests/ui/coroutine/type-mismatch-error.rs
similarity index 100%
rename from tests/ui/generator/type-mismatch-error.rs
rename to tests/ui/coroutine/type-mismatch-error.rs
diff --git a/tests/ui/generator/type-mismatch-error.stderr b/tests/ui/coroutine/type-mismatch-error.stderr
similarity index 100%
rename from tests/ui/generator/type-mismatch-error.stderr
rename to tests/ui/coroutine/type-mismatch-error.stderr
diff --git a/tests/ui/generator/type-mismatch-signature-deduction.rs b/tests/ui/coroutine/type-mismatch-signature-deduction.rs
similarity index 100%
rename from tests/ui/generator/type-mismatch-signature-deduction.rs
rename to tests/ui/coroutine/type-mismatch-signature-deduction.rs
diff --git a/tests/ui/generator/type-mismatch-signature-deduction.stderr b/tests/ui/coroutine/type-mismatch-signature-deduction.stderr
similarity index 100%
rename from tests/ui/generator/type-mismatch-signature-deduction.stderr
rename to tests/ui/coroutine/type-mismatch-signature-deduction.stderr
diff --git a/tests/ui/generator/unresolved-ct-var.rs b/tests/ui/coroutine/unresolved-ct-var.rs
similarity index 100%
rename from tests/ui/generator/unresolved-ct-var.rs
rename to tests/ui/coroutine/unresolved-ct-var.rs
diff --git a/tests/ui/generator/unresolved-ct-var.stderr b/tests/ui/coroutine/unresolved-ct-var.stderr
similarity index 100%
rename from tests/ui/generator/unresolved-ct-var.stderr
rename to tests/ui/coroutine/unresolved-ct-var.stderr
diff --git a/tests/ui/generator/unsized-capture-across-yield.rs b/tests/ui/coroutine/unsized-capture-across-yield.rs
similarity index 100%
rename from tests/ui/generator/unsized-capture-across-yield.rs
rename to tests/ui/coroutine/unsized-capture-across-yield.rs
diff --git a/tests/ui/generator/unsized-capture-across-yield.stderr b/tests/ui/coroutine/unsized-capture-across-yield.stderr
similarity index 100%
rename from tests/ui/generator/unsized-capture-across-yield.stderr
rename to tests/ui/coroutine/unsized-capture-across-yield.stderr
diff --git a/tests/ui/generator/unsized-local-across-yield.rs b/tests/ui/coroutine/unsized-local-across-yield.rs
similarity index 100%
rename from tests/ui/generator/unsized-local-across-yield.rs
rename to tests/ui/coroutine/unsized-local-across-yield.rs
diff --git a/tests/ui/generator/unsized-local-across-yield.stderr b/tests/ui/coroutine/unsized-local-across-yield.stderr
similarity index 100%
rename from tests/ui/generator/unsized-local-across-yield.stderr
rename to tests/ui/coroutine/unsized-local-across-yield.stderr
diff --git a/tests/ui/generator/xcrate-reachable.rs b/tests/ui/coroutine/xcrate-reachable.rs
similarity index 100%
rename from tests/ui/generator/xcrate-reachable.rs
rename to tests/ui/coroutine/xcrate-reachable.rs
diff --git a/tests/ui/generator/xcrate.rs b/tests/ui/coroutine/xcrate.rs
similarity index 100%
rename from tests/ui/generator/xcrate.rs
rename to tests/ui/coroutine/xcrate.rs
diff --git a/tests/ui/generator/yield-in-args-rev.rs b/tests/ui/coroutine/yield-in-args-rev.rs
similarity index 100%
rename from tests/ui/generator/yield-in-args-rev.rs
rename to tests/ui/coroutine/yield-in-args-rev.rs
diff --git a/tests/ui/generator/yield-in-args-rev.stderr b/tests/ui/coroutine/yield-in-args-rev.stderr
similarity index 100%
rename from tests/ui/generator/yield-in-args-rev.stderr
rename to tests/ui/coroutine/yield-in-args-rev.stderr
diff --git a/tests/ui/generator/yield-in-args.rs b/tests/ui/coroutine/yield-in-args.rs
similarity index 100%
rename from tests/ui/generator/yield-in-args.rs
rename to tests/ui/coroutine/yield-in-args.rs
diff --git a/tests/ui/generator/yield-in-args.stderr b/tests/ui/coroutine/yield-in-args.stderr
similarity index 100%
rename from tests/ui/generator/yield-in-args.stderr
rename to tests/ui/coroutine/yield-in-args.stderr
diff --git a/tests/ui/generator/yield-in-const.rs b/tests/ui/coroutine/yield-in-const.rs
similarity index 100%
rename from tests/ui/generator/yield-in-const.rs
rename to tests/ui/coroutine/yield-in-const.rs
diff --git a/tests/ui/generator/yield-in-const.stderr b/tests/ui/coroutine/yield-in-const.stderr
similarity index 100%
rename from tests/ui/generator/yield-in-const.stderr
rename to tests/ui/coroutine/yield-in-const.stderr
diff --git a/tests/ui/generator/yield-in-function.rs b/tests/ui/coroutine/yield-in-function.rs
similarity index 100%
rename from tests/ui/generator/yield-in-function.rs
rename to tests/ui/coroutine/yield-in-function.rs
diff --git a/tests/ui/generator/yield-in-function.stderr b/tests/ui/coroutine/yield-in-function.stderr
similarity index 100%
rename from tests/ui/generator/yield-in-function.stderr
rename to tests/ui/coroutine/yield-in-function.stderr
diff --git a/tests/ui/generator/yield-in-initializer.rs b/tests/ui/coroutine/yield-in-initializer.rs
similarity index 100%
rename from tests/ui/generator/yield-in-initializer.rs
rename to tests/ui/coroutine/yield-in-initializer.rs
diff --git a/tests/ui/generator/yield-in-initializer.stderr b/tests/ui/coroutine/yield-in-initializer.stderr
similarity index 100%
rename from tests/ui/generator/yield-in-initializer.stderr
rename to tests/ui/coroutine/yield-in-initializer.stderr
diff --git a/tests/ui/generator/yield-in-static.rs b/tests/ui/coroutine/yield-in-static.rs
similarity index 100%
rename from tests/ui/generator/yield-in-static.rs
rename to tests/ui/coroutine/yield-in-static.rs
diff --git a/tests/ui/generator/yield-in-static.stderr b/tests/ui/coroutine/yield-in-static.stderr
similarity index 100%
rename from tests/ui/generator/yield-in-static.stderr
rename to tests/ui/coroutine/yield-in-static.stderr
diff --git a/tests/ui/generator/yield-outside-coroutine-issue-78653.rs b/tests/ui/coroutine/yield-outside-coroutine-issue-78653.rs
similarity index 100%
rename from tests/ui/generator/yield-outside-coroutine-issue-78653.rs
rename to tests/ui/coroutine/yield-outside-coroutine-issue-78653.rs
diff --git a/tests/ui/generator/yield-outside-coroutine-issue-78653.stderr b/tests/ui/coroutine/yield-outside-coroutine-issue-78653.stderr
similarity index 100%
rename from tests/ui/generator/yield-outside-coroutine-issue-78653.stderr
rename to tests/ui/coroutine/yield-outside-coroutine-issue-78653.stderr
diff --git a/tests/ui/generator/yield-subtype.rs b/tests/ui/coroutine/yield-subtype.rs
similarity index 100%
rename from tests/ui/generator/yield-subtype.rs
rename to tests/ui/coroutine/yield-subtype.rs
diff --git a/tests/ui/generator/yield-subtype.stderr b/tests/ui/coroutine/yield-subtype.stderr
similarity index 100%
rename from tests/ui/generator/yield-subtype.stderr
rename to tests/ui/coroutine/yield-subtype.stderr
diff --git a/tests/ui/generator/yield-while-iterating.rs b/tests/ui/coroutine/yield-while-iterating.rs
similarity index 100%
rename from tests/ui/generator/yield-while-iterating.rs
rename to tests/ui/coroutine/yield-while-iterating.rs
diff --git a/tests/ui/generator/yield-while-iterating.stderr b/tests/ui/coroutine/yield-while-iterating.stderr
similarity index 100%
rename from tests/ui/generator/yield-while-iterating.stderr
rename to tests/ui/coroutine/yield-while-iterating.stderr
diff --git a/tests/ui/generator/yield-while-local-borrowed.rs b/tests/ui/coroutine/yield-while-local-borrowed.rs
similarity index 100%
rename from tests/ui/generator/yield-while-local-borrowed.rs
rename to tests/ui/coroutine/yield-while-local-borrowed.rs
diff --git a/tests/ui/generator/yield-while-local-borrowed.stderr b/tests/ui/coroutine/yield-while-local-borrowed.stderr
similarity index 100%
rename from tests/ui/generator/yield-while-local-borrowed.stderr
rename to tests/ui/coroutine/yield-while-local-borrowed.stderr
diff --git a/tests/ui/generator/yield-while-ref-reborrowed.rs b/tests/ui/coroutine/yield-while-ref-reborrowed.rs
similarity index 100%
rename from tests/ui/generator/yield-while-ref-reborrowed.rs
rename to tests/ui/coroutine/yield-while-ref-reborrowed.rs
diff --git a/tests/ui/generator/yield-while-ref-reborrowed.stderr b/tests/ui/coroutine/yield-while-ref-reborrowed.stderr
similarity index 100%
rename from tests/ui/generator/yield-while-ref-reborrowed.stderr
rename to tests/ui/coroutine/yield-while-ref-reborrowed.stderr
diff --git a/tests/ui/generator/yielding-in-match-guards.rs b/tests/ui/coroutine/yielding-in-match-guards.rs
similarity index 100%
rename from tests/ui/generator/yielding-in-match-guards.rs
rename to tests/ui/coroutine/yielding-in-match-guards.rs