Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

167 files changed, 194 insertions, 7 deletions

diff --git a/src/test/ui/generator/addassign-yield.rs b/tests/ui/generator/addassign-yield.rs
index 66f22bf31..66f22bf31 100644
--- a/src/test/ui/generator/addassign-yield.rs
+++ b/tests/ui/generator/addassign-yield.rs
diff --git a/src/test/ui/generator/async-generator-issue-67158.rs b/tests/ui/generator/async-generator-issue-67158.rs
index 8125a7a9b..8125a7a9b 100644
--- a/src/test/ui/generator/async-generator-issue-67158.rs
+++ b/tests/ui/generator/async-generator-issue-67158.rs
diff --git a/src/test/ui/generator/async-generator-issue-67158.stderr b/tests/ui/generator/async-generator-issue-67158.stderr
index 7270d188e..7270d188e 100644
--- a/src/test/ui/generator/async-generator-issue-67158.stderr
+++ b/tests/ui/generator/async-generator-issue-67158.stderr
diff --git a/src/test/ui/generator/auto-trait-regions.rs b/tests/ui/generator/auto-trait-regions.rs
index ea4b0d554..ea4b0d554 100644
--- a/src/test/ui/generator/auto-trait-regions.rs
+++ b/tests/ui/generator/auto-trait-regions.rs
diff --git a/src/test/ui/generator/auto-trait-regions.stderr b/tests/ui/generator/auto-trait-regions.stderr
index 0b1f34aeb..0b1f34aeb 100644
--- a/src/test/ui/generator/auto-trait-regions.stderr
+++ b/tests/ui/generator/auto-trait-regions.stderr
diff --git a/src/test/ui/generator/auxiliary/metadata-sufficient-for-layout.rs b/tests/ui/generator/auxiliary/metadata-sufficient-for-layout.rs
index 207c2735f..207c2735f 100644
--- a/src/test/ui/generator/auxiliary/metadata-sufficient-for-layout.rs
+++ b/tests/ui/generator/auxiliary/metadata-sufficient-for-layout.rs
diff --git a/src/test/ui/generator/auxiliary/xcrate-reachable.rs b/tests/ui/generator/auxiliary/xcrate-reachable.rs
index 2dd5ea675..2dd5ea675 100644
--- a/src/test/ui/generator/auxiliary/xcrate-reachable.rs
+++ b/tests/ui/generator/auxiliary/xcrate-reachable.rs
diff --git a/src/test/ui/generator/auxiliary/xcrate.rs b/tests/ui/generator/auxiliary/xcrate.rs
index d07abd091..d07abd091 100644
--- a/src/test/ui/generator/auxiliary/xcrate.rs
+++ b/tests/ui/generator/auxiliary/xcrate.rs
diff --git a/src/test/ui/generator/borrow-in-tail-expr.rs b/tests/ui/generator/borrow-in-tail-expr.rs
index 540f5e3e1..540f5e3e1 100644
--- a/src/test/ui/generator/borrow-in-tail-expr.rs
+++ b/tests/ui/generator/borrow-in-tail-expr.rs
diff --git a/src/test/ui/generator/borrowing.rs b/tests/ui/generator/borrowing.rs
index d36592583..d36592583 100644
--- a/src/test/ui/generator/borrowing.rs
+++ b/tests/ui/generator/borrowing.rs
diff --git a/src/test/ui/generator/borrowing.stderr b/tests/ui/generator/borrowing.stderr
index 38e1ace8c..38e1ace8c 100644
--- a/src/test/ui/generator/borrowing.stderr
+++ b/tests/ui/generator/borrowing.stderr
diff --git a/src/test/ui/generator/clone-impl-async.rs b/tests/ui/generator/clone-impl-async.rs
index 9e9b59d36..9e9b59d36 100644
--- a/src/test/ui/generator/clone-impl-async.rs
+++ b/tests/ui/generator/clone-impl-async.rs
diff --git a/src/test/ui/generator/clone-impl-async.stderr b/tests/ui/generator/clone-impl-async.stderr
index 985472887..985472887 100644
--- a/src/test/ui/generator/clone-impl-async.stderr
+++ b/tests/ui/generator/clone-impl-async.stderr
diff --git a/src/test/ui/generator/clone-impl-static.rs b/tests/ui/generator/clone-impl-static.rs
index 55ed0f281..55ed0f281 100644
--- a/src/test/ui/generator/clone-impl-static.rs
+++ b/tests/ui/generator/clone-impl-static.rs
diff --git a/src/test/ui/generator/clone-impl-static.stderr b/tests/ui/generator/clone-impl-static.stderr
index cbadf6f15..cbadf6f15 100644
--- a/src/test/ui/generator/clone-impl-static.stderr
+++ b/tests/ui/generator/clone-impl-static.stderr
diff --git a/src/test/ui/generator/clone-impl.rs b/tests/ui/generator/clone-impl.rs
index cbfd65a53..cbfd65a53 100644
--- a/src/test/ui/generator/clone-impl.rs
+++ b/tests/ui/generator/clone-impl.rs
diff --git a/src/test/ui/generator/clone-impl.stderr b/tests/ui/generator/clone-impl.stderr
index a92646b19..a92646b19 100644
--- a/src/test/ui/generator/clone-impl.stderr
+++ b/tests/ui/generator/clone-impl.stderr
diff --git a/src/test/ui/generator/conditional-drop.rs b/tests/ui/generator/conditional-drop.rs
index 0927df869..0927df869 100644
--- a/src/test/ui/generator/conditional-drop.rs
+++ b/tests/ui/generator/conditional-drop.rs
diff --git a/src/test/ui/generator/control-flow.rs b/tests/ui/generator/control-flow.rs
index 4f69c7855..4f69c7855 100644
--- a/src/test/ui/generator/control-flow.rs
+++ b/tests/ui/generator/control-flow.rs
diff --git a/src/test/ui/generator/derived-drop-parent-expr.rs b/tests/ui/generator/derived-drop-parent-expr.rs
index 4bd34346a..4bd34346a 100644
--- a/src/test/ui/generator/derived-drop-parent-expr.rs
+++ b/tests/ui/generator/derived-drop-parent-expr.rs
diff --git a/src/test/ui/generator/discriminant.rs b/tests/ui/generator/discriminant.rs
index 195e77022..195e77022 100644
--- a/src/test/ui/generator/discriminant.rs
+++ b/tests/ui/generator/discriminant.rs
diff --git a/src/test/ui/generator/drop-and-replace.rs b/tests/ui/generator/drop-and-replace.rs
index a9a50a122..a9a50a122 100644
--- a/src/test/ui/generator/drop-and-replace.rs
+++ b/tests/ui/generator/drop-and-replace.rs
diff --git a/src/test/ui/generator/drop-control-flow.rs b/tests/ui/generator/drop-control-flow.rs
index d38368000..c6efda954 100644
--- a/src/test/ui/generator/drop-control-flow.rs
+++ b/tests/ui/generator/drop-control-flow.rs
@@ -18,7 +18,7 @@ impl !Send for NonSend {}
 
 fn assert_send<T: Send>(_: T) {}
 
-// This test case is reduced from src/test/ui/drop/dynamic-drop-async.rs
+// This test case is reduced from tests/ui/drop/dynamic-drop-async.rs
 fn one_armed_if(arg: bool) {
     let _ = || {
         let arr = [Ptr];
diff --git a/src/test/ui/generator/drop-env.rs b/tests/ui/generator/drop-env.rs
index 66dfb8c2c..66dfb8c2c 100644
--- a/src/test/ui/generator/drop-env.rs
+++ b/tests/ui/generator/drop-env.rs
diff --git a/src/test/ui/generator/drop-track-addassign-yield.rs b/tests/ui/generator/drop-track-addassign-yield.rs
index 71cfb170b..71cfb170b 100644
--- a/src/test/ui/generator/drop-track-addassign-yield.rs
+++ b/tests/ui/generator/drop-track-addassign-yield.rs
diff --git a/src/test/ui/generator/drop-tracking-parent-expression.rs b/tests/ui/generator/drop-tracking-parent-expression.rs
index d40f1b8f6..d40f1b8f6 100644
--- a/src/test/ui/generator/drop-tracking-parent-expression.rs
+++ b/tests/ui/generator/drop-tracking-parent-expression.rs
diff --git a/src/test/ui/generator/drop-tracking-parent-expression.stderr b/tests/ui/generator/drop-tracking-parent-expression.stderr
index fbf5d6e07..fbf5d6e07 100644
--- a/src/test/ui/generator/drop-tracking-parent-expression.stderr
+++ b/tests/ui/generator/drop-tracking-parent-expression.stderr
diff --git a/src/test/ui/generator/drop-tracking-yielding-in-match-guards.rs b/tests/ui/generator/drop-tracking-yielding-in-match-guards.rs
index 646365e43..646365e43 100644
--- a/src/test/ui/generator/drop-tracking-yielding-in-match-guards.rs
+++ b/tests/ui/generator/drop-tracking-yielding-in-match-guards.rs
diff --git a/src/test/ui/generator/drop-yield-twice.rs b/tests/ui/generator/drop-yield-twice.rs
index f484cbb8d..f484cbb8d 100644
--- a/src/test/ui/generator/drop-yield-twice.rs
+++ b/tests/ui/generator/drop-yield-twice.rs
diff --git a/src/test/ui/generator/drop-yield-twice.stderr b/tests/ui/generator/drop-yield-twice.stderr
index 0808a2c85..0808a2c85 100644
--- a/src/test/ui/generator/drop-yield-twice.stderr
+++ b/tests/ui/generator/drop-yield-twice.stderr
diff --git a/src/test/ui/generator/dropck-resume.rs b/tests/ui/generator/dropck-resume.rs
index 4c18077f3..4c18077f3 100644
--- a/src/test/ui/generator/dropck-resume.rs
+++ b/tests/ui/generator/dropck-resume.rs
diff --git a/src/test/ui/generator/dropck-resume.stderr b/tests/ui/generator/dropck-resume.stderr
index b0756eb55..b0756eb55 100644
--- a/src/test/ui/generator/dropck-resume.stderr
+++ b/tests/ui/generator/dropck-resume.stderr
diff --git a/src/test/ui/generator/dropck.rs b/tests/ui/generator/dropck.rs
index f82111a76..f82111a76 100644
--- a/src/test/ui/generator/dropck.rs
+++ b/tests/ui/generator/dropck.rs
diff --git a/src/test/ui/generator/dropck.stderr b/tests/ui/generator/dropck.stderr
index 7bb188352..7bb188352 100644
--- a/src/test/ui/generator/dropck.stderr
+++ b/tests/ui/generator/dropck.stderr
diff --git a/src/test/ui/generator/generator-region-requirements.migrate.stderr b/tests/ui/generator/generator-region-requirements.migrate.stderr
index 8a96d187f..8a96d187f 100644
--- a/src/test/ui/generator/generator-region-requirements.migrate.stderr
+++ b/tests/ui/generator/generator-region-requirements.migrate.stderr
diff --git a/src/test/ui/generator/generator-region-requirements.rs b/tests/ui/generator/generator-region-requirements.rs
index 7269a79ca..7269a79ca 100644
--- a/src/test/ui/generator/generator-region-requirements.rs
+++ b/tests/ui/generator/generator-region-requirements.rs
diff --git a/src/test/ui/generator/generator-region-requirements.stderr b/tests/ui/generator/generator-region-requirements.stderr
index 87f604672..87f604672 100644
--- a/src/test/ui/generator/generator-region-requirements.stderr
+++ b/tests/ui/generator/generator-region-requirements.stderr
diff --git a/src/test/ui/generator/generator-resume-after-panic.rs b/tests/ui/generator/generator-resume-after-panic.rs
index f2e67f1f7..f2e67f1f7 100644
--- a/src/test/ui/generator/generator-resume-after-panic.rs
+++ b/tests/ui/generator/generator-resume-after-panic.rs
diff --git a/src/test/ui/generator/generator-with-nll.rs b/tests/ui/generator/generator-with-nll.rs
index cee3e6d22..cee3e6d22 100644
--- a/src/test/ui/generator/generator-with-nll.rs
+++ b/tests/ui/generator/generator-with-nll.rs
diff --git a/src/test/ui/generator/generator-with-nll.stderr b/tests/ui/generator/generator-with-nll.stderr
index 14199aeb9..14199aeb9 100644
--- a/src/test/ui/generator/generator-with-nll.stderr
+++ b/tests/ui/generator/generator-with-nll.stderr
diff --git a/src/test/ui/generator/generator-yielding-or-returning-itself.rs b/tests/ui/generator/generator-yielding-or-returning-itself.rs
index 30788e3c1..30788e3c1 100644
--- a/src/test/ui/generator/generator-yielding-or-returning-itself.rs
+++ b/tests/ui/generator/generator-yielding-or-returning-itself.rs
diff --git a/src/test/ui/generator/generator-yielding-or-returning-itself.stderr b/tests/ui/generator/generator-yielding-or-returning-itself.stderr
index 8f5d2429a..8f5d2429a 100644
--- a/src/test/ui/generator/generator-yielding-or-returning-itself.stderr
+++ b/tests/ui/generator/generator-yielding-or-returning-itself.stderr
diff --git a/src/test/ui/generator/issue-102645.rs b/tests/ui/generator/issue-102645.rs
index 0589c5a00..35acd5cd7 100644
--- a/src/test/ui/generator/issue-102645.rs
+++ b/tests/ui/generator/issue-102645.rs
@@ -14,7 +14,7 @@ fn main() {
         a = d;
     };
     Pin::new(&mut b).resume();
-    //~^ ERROR this function takes 1 argument but 0 arguments were supplied
+    //~^ ERROR this method takes 1 argument but 0 arguments were supplied
     // This type error is required to reproduce the ICE...
 }
 
diff --git a/tests/ui/generator/issue-102645.stderr b/tests/ui/generator/issue-102645.stderr
new file mode 100644
index 000000000..f6d244029
--- /dev/null
+++ b/tests/ui/generator/issue-102645.stderr
@@ -0,0 +1,16 @@
+error[E0061]: this method takes 1 argument but 0 arguments were supplied
+  --> $DIR/issue-102645.rs:16:22
+   |
+LL |     Pin::new(&mut b).resume();
+   |                      ^^^^^^-- an argument of type `()` is missing
+   |
+note: associated function defined here
+  --> $SRC_DIR/core/src/ops/generator.rs:LL:COL
+help: provide the argument
+   |
+LL |     Pin::new(&mut b).resume(());
+   |                            ~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0061`.
diff --git a/src/test/ui/generator/issue-44197.rs b/tests/ui/generator/issue-44197.rs
index 389b9d139..389b9d139 100644
--- a/src/test/ui/generator/issue-44197.rs
+++ b/tests/ui/generator/issue-44197.rs
diff --git a/src/test/ui/generator/issue-45729-unsafe-in-generator.mir.stderr b/tests/ui/generator/issue-45729-unsafe-in-generator.mir.stderr
index 3afbea079..3afbea079 100644
--- a/src/test/ui/generator/issue-45729-unsafe-in-generator.mir.stderr
+++ b/tests/ui/generator/issue-45729-unsafe-in-generator.mir.stderr
diff --git a/src/test/ui/generator/issue-45729-unsafe-in-generator.rs b/tests/ui/generator/issue-45729-unsafe-in-generator.rs
index 379c36d2c..379c36d2c 100644
--- a/src/test/ui/generator/issue-45729-unsafe-in-generator.rs
+++ b/tests/ui/generator/issue-45729-unsafe-in-generator.rs
diff --git a/src/test/ui/generator/issue-45729-unsafe-in-generator.thir.stderr b/tests/ui/generator/issue-45729-unsafe-in-generator.thir.stderr
index 10d768f19..10d768f19 100644
--- a/src/test/ui/generator/issue-45729-unsafe-in-generator.thir.stderr
+++ b/tests/ui/generator/issue-45729-unsafe-in-generator.thir.stderr
diff --git a/src/test/ui/generator/issue-48048.rs b/tests/ui/generator/issue-48048.rs
index 992bbc97a..992bbc97a 100644
--- a/src/test/ui/generator/issue-48048.rs
+++ b/tests/ui/generator/issue-48048.rs
diff --git a/src/test/ui/generator/issue-48048.stderr b/tests/ui/generator/issue-48048.stderr
index 234235839..234235839 100644
--- a/src/test/ui/generator/issue-48048.stderr
+++ b/tests/ui/generator/issue-48048.stderr
diff --git a/src/test/ui/generator/issue-52304.rs b/tests/ui/generator/issue-52304.rs
index 3e9de765b..3e9de765b 100644
--- a/src/test/ui/generator/issue-52304.rs
+++ b/tests/ui/generator/issue-52304.rs
diff --git a/src/test/ui/generator/issue-52398.rs b/tests/ui/generator/issue-52398.rs
index ada380d11..ada380d11 100644
--- a/src/test/ui/generator/issue-52398.rs
+++ b/tests/ui/generator/issue-52398.rs
diff --git a/src/test/ui/generator/issue-52398.stderr b/tests/ui/generator/issue-52398.stderr
index 539343275..539343275 100644
--- a/src/test/ui/generator/issue-52398.stderr
+++ b/tests/ui/generator/issue-52398.stderr
diff --git a/src/test/ui/generator/issue-53548-1.rs b/tests/ui/generator/issue-53548-1.rs
index 173ae3c6f..173ae3c6f 100644
--- a/src/test/ui/generator/issue-53548-1.rs
+++ b/tests/ui/generator/issue-53548-1.rs
diff --git a/src/test/ui/generator/issue-53548.rs b/tests/ui/generator/issue-53548.rs
index 3ebabb914..3ebabb914 100644
--- a/src/test/ui/generator/issue-53548.rs
+++ b/tests/ui/generator/issue-53548.rs
diff --git a/src/test/ui/generator/issue-57017.rs b/tests/ui/generator/issue-57017.rs
index c0bde3b44..c0bde3b44 100644
--- a/src/test/ui/generator/issue-57017.rs
+++ b/tests/ui/generator/issue-57017.rs
diff --git a/src/test/ui/generator/issue-57084.rs b/tests/ui/generator/issue-57084.rs
index 2a5c3dd05..2a5c3dd05 100644
--- a/src/test/ui/generator/issue-57084.rs
+++ b/tests/ui/generator/issue-57084.rs
diff --git a/src/test/ui/generator/issue-57084.stderr b/tests/ui/generator/issue-57084.stderr
index 8f1fc5e80..8f1fc5e80 100644
--- a/src/test/ui/generator/issue-57084.stderr
+++ b/tests/ui/generator/issue-57084.stderr
diff --git a/src/test/ui/generator/issue-57478.rs b/tests/ui/generator/issue-57478.rs
index 91407ea18..91407ea18 100644
--- a/src/test/ui/generator/issue-57478.rs
+++ b/tests/ui/generator/issue-57478.rs
diff --git a/src/test/ui/generator/issue-58888.rs b/tests/ui/generator/issue-58888.rs
index d42d09d40..d42d09d40 100644
--- a/src/test/ui/generator/issue-58888.rs
+++ b/tests/ui/generator/issue-58888.rs
diff --git a/src/test/ui/generator/issue-61442-stmt-expr-with-drop.rs b/tests/ui/generator/issue-61442-stmt-expr-with-drop.rs
index 187c37402..187c37402 100644
--- a/src/test/ui/generator/issue-61442-stmt-expr-with-drop.rs
+++ b/tests/ui/generator/issue-61442-stmt-expr-with-drop.rs
diff --git a/src/test/ui/generator/issue-62506-two_awaits.rs b/tests/ui/generator/issue-62506-two_awaits.rs
index 672e16b78..672e16b78 100644
--- a/src/test/ui/generator/issue-62506-two_awaits.rs
+++ b/tests/ui/generator/issue-62506-two_awaits.rs
diff --git a/src/test/ui/generator/issue-64620-yield-array-element.rs b/tests/ui/generator/issue-64620-yield-array-element.rs
index 2cbe8f516..2cbe8f516 100644
--- a/src/test/ui/generator/issue-64620-yield-array-element.rs
+++ b/tests/ui/generator/issue-64620-yield-array-element.rs
diff --git a/src/test/ui/generator/issue-64620-yield-array-element.stderr b/tests/ui/generator/issue-64620-yield-array-element.stderr
index 48383c2ed..48383c2ed 100644
--- a/src/test/ui/generator/issue-64620-yield-array-element.stderr
+++ b/tests/ui/generator/issue-64620-yield-array-element.stderr
diff --git a/src/test/ui/generator/issue-68112.rs b/tests/ui/generator/issue-68112.rs
index 21026f45c..21026f45c 100644
--- a/src/test/ui/generator/issue-68112.rs
+++ b/tests/ui/generator/issue-68112.rs
diff --git a/src/test/ui/generator/issue-68112.stderr b/tests/ui/generator/issue-68112.stderr
index eb99d42c9..eb99d42c9 100644
--- a/src/test/ui/generator/issue-68112.stderr
+++ b/tests/ui/generator/issue-68112.stderr
diff --git a/src/test/ui/generator/issue-69017.rs b/tests/ui/generator/issue-69017.rs
index 511deb60e..511deb60e 100644
--- a/src/test/ui/generator/issue-69017.rs
+++ b/tests/ui/generator/issue-69017.rs
diff --git a/src/test/ui/generator/issue-69039.rs b/tests/ui/generator/issue-69039.rs
index ccc141860..ccc141860 100644
--- a/src/test/ui/generator/issue-69039.rs
+++ b/tests/ui/generator/issue-69039.rs
diff --git a/src/test/ui/generator/issue-87142.rs b/tests/ui/generator/issue-87142.rs
index fc10d04d4..fc10d04d4 100644
--- a/src/test/ui/generator/issue-87142.rs
+++ b/tests/ui/generator/issue-87142.rs
diff --git a/src/test/ui/generator/issue-88653.rs b/tests/ui/generator/issue-88653.rs
index 1d9377bce..1d9377bce 100644
--- a/src/test/ui/generator/issue-88653.rs
+++ b/tests/ui/generator/issue-88653.rs
diff --git a/src/test/ui/generator/issue-88653.stderr b/tests/ui/generator/issue-88653.stderr
index b742c6e2f..b742c6e2f 100644
--- a/src/test/ui/generator/issue-88653.stderr
+++ b/tests/ui/generator/issue-88653.stderr
diff --git a/src/test/ui/generator/issue-91477.rs b/tests/ui/generator/issue-91477.rs
index 6c027feb4..6c027feb4 100644
--- a/src/test/ui/generator/issue-91477.rs
+++ b/tests/ui/generator/issue-91477.rs
diff --git a/src/test/ui/generator/issue-91477.stderr b/tests/ui/generator/issue-91477.stderr
index 4597dc1bc..4597dc1bc 100644
--- a/src/test/ui/generator/issue-91477.stderr
+++ b/tests/ui/generator/issue-91477.stderr
diff --git a/src/test/ui/generator/issue-93161.rs b/tests/ui/generator/issue-93161.rs
index 92305609c..92305609c 100644
--- a/src/test/ui/generator/issue-93161.rs
+++ b/tests/ui/generator/issue-93161.rs
diff --git a/src/test/ui/generator/iterator-count.rs b/tests/ui/generator/iterator-count.rs
index 90eefe02f..90eefe02f 100644
--- a/src/test/ui/generator/iterator-count.rs
+++ b/tests/ui/generator/iterator-count.rs
diff --git a/src/test/ui/generator/layout-error.rs b/tests/ui/generator/layout-error.rs
index 7c3d18740..7c3d18740 100644
--- a/src/test/ui/generator/layout-error.rs
+++ b/tests/ui/generator/layout-error.rs
diff --git a/src/test/ui/generator/layout-error.stderr b/tests/ui/generator/layout-error.stderr
index b1a258f4f..b1a258f4f 100644
--- a/src/test/ui/generator/layout-error.stderr
+++ b/tests/ui/generator/layout-error.stderr
diff --git a/src/test/ui/generator/live-upvar-across-yield.rs b/tests/ui/generator/live-upvar-across-yield.rs
index 6a2e42a55..6a2e42a55 100644
--- a/src/test/ui/generator/live-upvar-across-yield.rs
+++ b/tests/ui/generator/live-upvar-across-yield.rs
diff --git a/src/test/ui/generator/match-bindings.rs b/tests/ui/generator/match-bindings.rs
index 865904a57..865904a57 100644
--- a/src/test/ui/generator/match-bindings.rs
+++ b/tests/ui/generator/match-bindings.rs
diff --git a/src/test/ui/generator/match-bindings.stderr b/tests/ui/generator/match-bindings.stderr
index 3dd2d5954..3dd2d5954 100644
--- a/src/test/ui/generator/match-bindings.stderr
+++ b/tests/ui/generator/match-bindings.stderr
diff --git a/src/test/ui/generator/metadata-sufficient-for-layout.rs b/tests/ui/generator/metadata-sufficient-for-layout.rs
index d0e648ee7..d0e648ee7 100644
--- a/src/test/ui/generator/metadata-sufficient-for-layout.rs
+++ b/tests/ui/generator/metadata-sufficient-for-layout.rs
diff --git a/src/test/ui/generator/metadata-sufficient-for-layout.stderr b/tests/ui/generator/metadata-sufficient-for-layout.stderr
index 3488b04f2..3488b04f2 100644
--- a/src/test/ui/generator/metadata-sufficient-for-layout.stderr
+++ b/tests/ui/generator/metadata-sufficient-for-layout.stderr
diff --git a/src/test/ui/generator/nested_generators.rs b/tests/ui/generator/nested_generators.rs
index 45519150e..45519150e 100644
--- a/src/test/ui/generator/nested_generators.rs
+++ b/tests/ui/generator/nested_generators.rs
diff --git a/src/test/ui/generator/niche-in-generator.rs b/tests/ui/generator/niche-in-generator.rs
index 42bee81f5..42bee81f5 100644
--- a/src/test/ui/generator/niche-in-generator.rs
+++ b/tests/ui/generator/niche-in-generator.rs
diff --git a/src/test/ui/generator/non-static-is-unpin.rs b/tests/ui/generator/non-static-is-unpin.rs
index 96d0a8e28..96d0a8e28 100644
--- a/src/test/ui/generator/non-static-is-unpin.rs
+++ b/tests/ui/generator/non-static-is-unpin.rs
diff --git a/src/test/ui/generator/not-send-sync.rs b/tests/ui/generator/not-send-sync.rs
index 8ca5565fb..8ca5565fb 100644
--- a/src/test/ui/generator/not-send-sync.rs
+++ b/tests/ui/generator/not-send-sync.rs
diff --git a/src/test/ui/generator/not-send-sync.stderr b/tests/ui/generator/not-send-sync.stderr
index a821c57b9..a821c57b9 100644
--- a/src/test/ui/generator/not-send-sync.stderr
+++ b/tests/ui/generator/not-send-sync.stderr
diff --git a/src/test/ui/generator/overlap-locals.rs b/tests/ui/generator/overlap-locals.rs
index 101c8714f..101c8714f 100644
--- a/src/test/ui/generator/overlap-locals.rs
+++ b/tests/ui/generator/overlap-locals.rs
diff --git a/src/test/ui/generator/panic-drops-resume.rs b/tests/ui/generator/panic-drops-resume.rs
index 4c3caeb14..4c3caeb14 100644
--- a/src/test/ui/generator/panic-drops-resume.rs
+++ b/tests/ui/generator/panic-drops-resume.rs
diff --git a/src/test/ui/generator/panic-drops.rs b/tests/ui/generator/panic-drops.rs
index 65001fd87..65001fd87 100644
--- a/src/test/ui/generator/panic-drops.rs
+++ b/tests/ui/generator/panic-drops.rs
diff --git a/src/test/ui/generator/panic-safe.rs b/tests/ui/generator/panic-safe.rs
index 3db80bb58..3db80bb58 100644
--- a/src/test/ui/generator/panic-safe.rs
+++ b/tests/ui/generator/panic-safe.rs
diff --git a/src/test/ui/generator/partial-drop.rs b/tests/ui/generator/partial-drop.rs
index c872fb7f3..c872fb7f3 100644
--- a/src/test/ui/generator/partial-drop.rs
+++ b/tests/ui/generator/partial-drop.rs
diff --git a/src/test/ui/generator/partial-drop.stderr b/tests/ui/generator/partial-drop.stderr
index 9baafe54e..9baafe54e 100644
--- a/src/test/ui/generator/partial-drop.stderr
+++ b/tests/ui/generator/partial-drop.stderr
diff --git a/src/test/ui/generator/partial-initialization-across-yield.rs b/tests/ui/generator/partial-initialization-across-yield.rs
index 65d9e6d39..65d9e6d39 100644
--- a/src/test/ui/generator/partial-initialization-across-yield.rs
+++ b/tests/ui/generator/partial-initialization-across-yield.rs
diff --git a/src/test/ui/generator/partial-initialization-across-yield.stderr b/tests/ui/generator/partial-initialization-across-yield.stderr
index 3f9f1c046..3f9f1c046 100644
--- a/src/test/ui/generator/partial-initialization-across-yield.stderr
+++ b/tests/ui/generator/partial-initialization-across-yield.stderr
diff --git a/src/test/ui/generator/pattern-borrow.rs b/tests/ui/generator/pattern-borrow.rs
index d19363708..d19363708 100644
--- a/src/test/ui/generator/pattern-borrow.rs
+++ b/tests/ui/generator/pattern-borrow.rs
diff --git a/src/test/ui/generator/pattern-borrow.stderr b/tests/ui/generator/pattern-borrow.stderr
index d78da5104..d78da5104 100644
--- a/src/test/ui/generator/pattern-borrow.stderr
+++ b/tests/ui/generator/pattern-borrow.stderr
diff --git a/src/test/ui/generator/pin-box-generator.rs b/tests/ui/generator/pin-box-generator.rs
index c3136f5c0..c3136f5c0 100644
--- a/src/test/ui/generator/pin-box-generator.rs
+++ b/tests/ui/generator/pin-box-generator.rs
diff --git a/src/test/ui/generator/print/generator-print-verbose-1.rs b/tests/ui/generator/print/generator-print-verbose-1.rs
index fe0687722..89124ad72 100644
--- a/src/test/ui/generator/print/generator-print-verbose-1.rs
+++ b/tests/ui/generator/print/generator-print-verbose-1.rs
@@ -1,6 +1,6 @@
 // compile-flags: -Zverbose
 
-// Same as: src/test/ui/generator/issue-68112.stderr
+// Same as: tests/ui/generator/issue-68112.stderr
 
 #![feature(generators, generator_trait)]
 
diff --git a/src/test/ui/generator/print/generator-print-verbose-1.stderr b/tests/ui/generator/print/generator-print-verbose-1.stderr
index ed0628bbb..ebf35be58 100644
--- a/src/test/ui/generator/print/generator-print-verbose-1.stderr
+++ b/tests/ui/generator/print/generator-print-verbose-1.stderr
@@ -35,7 +35,7 @@ note: required because it's used within this generator
    |
 LL |     || {
    |     ^^
-note: required because it appears within the type `Opaque(DefId(0:35 ~ generator_print_verbose_1[749a]::make_gen2::{opaque#0}), [std::sync::Arc<std::cell::RefCell<i32>>])`
+note: required because it appears within the type `Opaque(DefId(0:35 ~ generator_print_verbose_1[749a]::make_gen2::{opaque#0}), [Arc<RefCell<i32>>])`
   --> $DIR/generator-print-verbose-1.rs:41:30
    |
 LL | pub fn make_gen2<T>(t: T) -> impl Generator<Return = T> {
diff --git a/src/test/ui/generator/print/generator-print-verbose-2.rs b/tests/ui/generator/print/generator-print-verbose-2.rs
index d914719cb..d914719cb 100644
--- a/src/test/ui/generator/print/generator-print-verbose-2.rs
+++ b/tests/ui/generator/print/generator-print-verbose-2.rs
diff --git a/src/test/ui/generator/print/generator-print-verbose-2.stderr b/tests/ui/generator/print/generator-print-verbose-2.stderr
index 909e49c38..909e49c38 100644
--- a/src/test/ui/generator/print/generator-print-verbose-2.stderr
+++ b/tests/ui/generator/print/generator-print-verbose-2.stderr
diff --git a/src/test/ui/generator/print/generator-print-verbose-3.rs b/tests/ui/generator/print/generator-print-verbose-3.rs
index 8689539ec..8689539ec 100644
--- a/src/test/ui/generator/print/generator-print-verbose-3.rs
+++ b/tests/ui/generator/print/generator-print-verbose-3.rs
diff --git a/src/test/ui/generator/print/generator-print-verbose-3.stderr b/tests/ui/generator/print/generator-print-verbose-3.stderr
index d15646259..d15646259 100644
--- a/src/test/ui/generator/print/generator-print-verbose-3.stderr
+++ b/tests/ui/generator/print/generator-print-verbose-3.stderr
diff --git a/src/test/ui/generator/reborrow-mut-upvar.rs b/tests/ui/generator/reborrow-mut-upvar.rs
index dbd9e24e2..dbd9e24e2 100644
--- a/src/test/ui/generator/reborrow-mut-upvar.rs
+++ b/tests/ui/generator/reborrow-mut-upvar.rs
diff --git a/src/test/ui/generator/reborrow-mut-upvar.stderr b/tests/ui/generator/reborrow-mut-upvar.stderr
index 2e1fec35e..2e1fec35e 100644
--- a/src/test/ui/generator/reborrow-mut-upvar.stderr
+++ b/tests/ui/generator/reborrow-mut-upvar.stderr
diff --git a/src/test/ui/generator/ref-escapes-but-not-over-yield.rs b/tests/ui/generator/ref-escapes-but-not-over-yield.rs
index 3856d8233..3856d8233 100644
--- a/src/test/ui/generator/ref-escapes-but-not-over-yield.rs
+++ b/tests/ui/generator/ref-escapes-but-not-over-yield.rs
diff --git a/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr b/tests/ui/generator/ref-escapes-but-not-over-yield.stderr
index 5fc810040..5fc810040 100644
--- a/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr
+++ b/tests/ui/generator/ref-escapes-but-not-over-yield.stderr
diff --git a/tests/ui/generator/ref-upvar-not-send.rs b/tests/ui/generator/ref-upvar-not-send.rs
new file mode 100644
index 000000000..eb9ef63ec
--- /dev/null
+++ b/tests/ui/generator/ref-upvar-not-send.rs
@@ -0,0 +1,31 @@
+// For `Send` generators, suggest a `T: Sync` requirement for `&T` upvars,
+// and suggest a `T: Send` requirement for `&mut T` upvars.
+
+#![feature(generators)]
+
+fn assert_send<T: Send>(_: T) {}
+//~^ NOTE required by a bound in `assert_send`
+//~| NOTE required by this bound in `assert_send`
+//~| NOTE required by a bound in `assert_send`
+//~| NOTE required by this bound in `assert_send`
+
+fn main() {
+    let x: &*mut () = &std::ptr::null_mut();
+    let y: &mut *mut () = &mut std::ptr::null_mut();
+    assert_send(move || {
+        //~^ ERROR generator cannot be sent between threads safely
+        //~| NOTE generator is not `Send`
+        yield;
+        let _x = x;
+    });
+    //~^^ NOTE captured value is not `Send` because `&` references cannot be sent unless their referent is `Sync`
+    //~| NOTE has type `&*mut ()` which is not `Send`, because `*mut ()` is not `Sync`
+    assert_send(move || {
+        //~^ ERROR generator cannot be sent between threads safely
+        //~| NOTE generator is not `Send`
+        yield;
+        let _y = y;
+    });
+    //~^^ NOTE captured value is not `Send` because `&mut` references cannot be sent unless their referent is `Send`
+    //~| NOTE has type `&mut *mut ()` which is not `Send`, because `*mut ()` is not `Send`
+}
diff --git a/tests/ui/generator/ref-upvar-not-send.stderr b/tests/ui/generator/ref-upvar-not-send.stderr
new file mode 100644
index 000000000..689ace67e
--- /dev/null
+++ b/tests/ui/generator/ref-upvar-not-send.stderr
@@ -0,0 +1,50 @@
+error: generator cannot be sent between threads safely
+  --> $DIR/ref-upvar-not-send.rs:15:17
+   |
+LL |       assert_send(move || {
+   |  _________________^
+LL | |
+LL | |
+LL | |         yield;
+LL | |         let _x = x;
+LL | |     });
+   | |_____^ generator is not `Send`
+   |
+   = help: the trait `Sync` is not implemented for `*mut ()`
+note: captured value is not `Send` because `&` references cannot be sent unless their referent is `Sync`
+  --> $DIR/ref-upvar-not-send.rs:19:18
+   |
+LL |         let _x = x;
+   |                  ^ has type `&*mut ()` which is not `Send`, because `*mut ()` is not `Sync`
+note: required by a bound in `assert_send`
+  --> $DIR/ref-upvar-not-send.rs:6:19
+   |
+LL | fn assert_send<T: Send>(_: T) {}
+   |                   ^^^^ required by this bound in `assert_send`
+
+error: generator cannot be sent between threads safely
+  --> $DIR/ref-upvar-not-send.rs:23:17
+   |
+LL |       assert_send(move || {
+   |  _________________^
+LL | |
+LL | |
+LL | |         yield;
+LL | |         let _y = y;
+LL | |     });
+   | |_____^ generator is not `Send`
+   |
+   = help: within `[generator@$DIR/ref-upvar-not-send.rs:23:17: 23:24]`, the trait `Send` is not implemented for `*mut ()`
+note: captured value is not `Send` because `&mut` references cannot be sent unless their referent is `Send`
+  --> $DIR/ref-upvar-not-send.rs:27:18
+   |
+LL |         let _y = y;
+   |                  ^ has type `&mut *mut ()` which is not `Send`, because `*mut ()` is not `Send`
+note: required by a bound in `assert_send`
+  --> $DIR/ref-upvar-not-send.rs:6:19
+   |
+LL | fn assert_send<T: Send>(_: T) {}
+   |                   ^^^^ required by this bound in `assert_send`
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/generator/reinit-in-match-guard.rs b/tests/ui/generator/reinit-in-match-guard.rs
index 260b341a5..260b341a5 100644
--- a/src/test/ui/generator/reinit-in-match-guard.rs
+++ b/tests/ui/generator/reinit-in-match-guard.rs
diff --git a/src/test/ui/generator/resume-after-return.rs b/tests/ui/generator/resume-after-return.rs
index 01a059a16..01a059a16 100644
--- a/src/test/ui/generator/resume-after-return.rs
+++ b/tests/ui/generator/resume-after-return.rs
diff --git a/src/test/ui/generator/resume-arg-late-bound.rs b/tests/ui/generator/resume-arg-late-bound.rs
index 1c35ba80d..1c35ba80d 100644
--- a/src/test/ui/generator/resume-arg-late-bound.rs
+++ b/tests/ui/generator/resume-arg-late-bound.rs
diff --git a/src/test/ui/generator/resume-arg-late-bound.stderr b/tests/ui/generator/resume-arg-late-bound.stderr
index 34ee4036c..34ee4036c 100644
--- a/src/test/ui/generator/resume-arg-late-bound.stderr
+++ b/tests/ui/generator/resume-arg-late-bound.stderr
diff --git a/src/test/ui/generator/resume-arg-size.rs b/tests/ui/generator/resume-arg-size.rs
index b93dc54f7..b93dc54f7 100644
--- a/src/test/ui/generator/resume-arg-size.rs
+++ b/tests/ui/generator/resume-arg-size.rs
diff --git a/src/test/ui/generator/resume-live-across-yield.rs b/tests/ui/generator/resume-live-across-yield.rs
index 4c4cf117a..4c4cf117a 100644
--- a/src/test/ui/generator/resume-live-across-yield.rs
+++ b/tests/ui/generator/resume-live-across-yield.rs
diff --git a/src/test/ui/generator/retain-resume-ref.rs b/tests/ui/generator/retain-resume-ref.rs
index 0606ea71c..0606ea71c 100644
--- a/src/test/ui/generator/retain-resume-ref.rs
+++ b/tests/ui/generator/retain-resume-ref.rs
diff --git a/src/test/ui/generator/retain-resume-ref.stderr b/tests/ui/generator/retain-resume-ref.stderr
index e33310d12..e33310d12 100644
--- a/src/test/ui/generator/retain-resume-ref.stderr
+++ b/tests/ui/generator/retain-resume-ref.stderr
diff --git a/src/test/ui/generator/size-moved-locals.rs b/tests/ui/generator/size-moved-locals.rs
index 601a31418..601a31418 100644
--- a/src/test/ui/generator/size-moved-locals.rs
+++ b/tests/ui/generator/size-moved-locals.rs
diff --git a/src/test/ui/generator/sized-yield.rs b/tests/ui/generator/sized-yield.rs
index c6dd738d6..c6dd738d6 100644
--- a/src/test/ui/generator/sized-yield.rs
+++ b/tests/ui/generator/sized-yield.rs
diff --git a/src/test/ui/generator/sized-yield.stderr b/tests/ui/generator/sized-yield.stderr
index ea2a48d13..fb34540d9 100644
--- a/src/test/ui/generator/sized-yield.stderr
+++ b/tests/ui/generator/sized-yield.stderr
@@ -20,9 +20,6 @@ LL |    Pin::new(&mut gen).resume(());
    = help: the trait `Sized` is not implemented for `str`
 note: required by a bound in `GeneratorState`
   --> $SRC_DIR/core/src/ops/generator.rs:LL:COL
-   |
-LL | pub enum GeneratorState<Y, R> {
-   |                         ^ required by this bound in `GeneratorState`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/generator/smoke-resume-args.rs b/tests/ui/generator/smoke-resume-args.rs
index fa9271c53..fa9271c53 100644
--- a/src/test/ui/generator/smoke-resume-args.rs
+++ b/tests/ui/generator/smoke-resume-args.rs
diff --git a/src/test/ui/generator/smoke.rs b/tests/ui/generator/smoke.rs
index 7a917a05d..7a917a05d 100644
--- a/src/test/ui/generator/smoke.rs
+++ b/tests/ui/generator/smoke.rs
diff --git a/src/test/ui/generator/static-generators.rs b/tests/ui/generator/static-generators.rs
index d098bf1e6..d098bf1e6 100644
--- a/src/test/ui/generator/static-generators.rs
+++ b/tests/ui/generator/static-generators.rs
diff --git a/src/test/ui/generator/static-mut-reference-across-yield.rs b/tests/ui/generator/static-mut-reference-across-yield.rs
index 0fa6d9cdc..0fa6d9cdc 100644
--- a/src/test/ui/generator/static-mut-reference-across-yield.rs
+++ b/tests/ui/generator/static-mut-reference-across-yield.rs
diff --git a/src/test/ui/generator/static-not-unpin.rs b/tests/ui/generator/static-not-unpin.rs
index cfcb94737..cfcb94737 100644
--- a/src/test/ui/generator/static-not-unpin.rs
+++ b/tests/ui/generator/static-not-unpin.rs
diff --git a/src/test/ui/generator/static-not-unpin.stderr b/tests/ui/generator/static-not-unpin.stderr
index e3859595f..e3859595f 100644
--- a/src/test/ui/generator/static-not-unpin.stderr
+++ b/tests/ui/generator/static-not-unpin.stderr
diff --git a/src/test/ui/generator/static-reference-across-yield.rs b/tests/ui/generator/static-reference-across-yield.rs
index 23b11593b..23b11593b 100644
--- a/src/test/ui/generator/static-reference-across-yield.rs
+++ b/tests/ui/generator/static-reference-across-yield.rs
diff --git a/src/test/ui/generator/too-live-local-in-immovable-gen.rs b/tests/ui/generator/too-live-local-in-immovable-gen.rs
index e0b856db7..e0b856db7 100644
--- a/src/test/ui/generator/too-live-local-in-immovable-gen.rs
+++ b/tests/ui/generator/too-live-local-in-immovable-gen.rs
diff --git a/src/test/ui/generator/too-live-local-in-immovable-gen.stderr b/tests/ui/generator/too-live-local-in-immovable-gen.stderr
index e262f213f..e262f213f 100644
--- a/src/test/ui/generator/too-live-local-in-immovable-gen.stderr
+++ b/tests/ui/generator/too-live-local-in-immovable-gen.stderr
diff --git a/src/test/ui/generator/too-many-parameters.rs b/tests/ui/generator/too-many-parameters.rs
index 7a353ea29..7a353ea29 100644
--- a/src/test/ui/generator/too-many-parameters.rs
+++ b/tests/ui/generator/too-many-parameters.rs
diff --git a/src/test/ui/generator/too-many-parameters.stderr b/tests/ui/generator/too-many-parameters.stderr
index 22d40db3f..22d40db3f 100644
--- a/src/test/ui/generator/too-many-parameters.stderr
+++ b/tests/ui/generator/too-many-parameters.stderr
diff --git a/src/test/ui/generator/type-mismatch-error.rs b/tests/ui/generator/type-mismatch-error.rs
index d39c788a8..d39c788a8 100644
--- a/src/test/ui/generator/type-mismatch-error.rs
+++ b/tests/ui/generator/type-mismatch-error.rs
diff --git a/src/test/ui/generator/type-mismatch-error.stderr b/tests/ui/generator/type-mismatch-error.stderr
index 8f5949533..8f5949533 100644
--- a/src/test/ui/generator/type-mismatch-error.stderr
+++ b/tests/ui/generator/type-mismatch-error.stderr
diff --git a/src/test/ui/generator/type-mismatch-signature-deduction.rs b/tests/ui/generator/type-mismatch-signature-deduction.rs
index 8d1ce6c7a..8d1ce6c7a 100644
--- a/src/test/ui/generator/type-mismatch-signature-deduction.rs
+++ b/tests/ui/generator/type-mismatch-signature-deduction.rs
diff --git a/src/test/ui/generator/type-mismatch-signature-deduction.stderr b/tests/ui/generator/type-mismatch-signature-deduction.stderr
index b98da1ed8..b98da1ed8 100644
--- a/src/test/ui/generator/type-mismatch-signature-deduction.stderr
+++ b/tests/ui/generator/type-mismatch-signature-deduction.stderr
diff --git a/tests/ui/generator/unresolved-ct-var-drop-tracking.rs b/tests/ui/generator/unresolved-ct-var-drop-tracking.rs
new file mode 100644
index 000000000..a6589348d
--- /dev/null
+++ b/tests/ui/generator/unresolved-ct-var-drop-tracking.rs
@@ -0,0 +1,15 @@
+// incremental
+// edition:2021
+// compile-flags: -Zdrop-tracking
+
+fn main() {
+    let _ = async {
+        let s = std::array::from_fn(|_| ()).await;
+        //~^ ERROR `[(); _]` is not a future
+        //~| ERROR type inside `async` block must be known in this context
+        //~| ERROR type inside `async` block must be known in this context
+        //~| ERROR type inside `async` block must be known in this context
+        //~| ERROR type inside `async` block must be known in this context
+        //~| ERROR type inside `async` block must be known in this context
+    };
+}
diff --git a/tests/ui/generator/unresolved-ct-var-drop-tracking.stderr b/tests/ui/generator/unresolved-ct-var-drop-tracking.stderr
new file mode 100644
index 000000000..9e1fed54c
--- /dev/null
+++ b/tests/ui/generator/unresolved-ct-var-drop-tracking.stderr
@@ -0,0 +1,78 @@
+error[E0277]: `[(); _]` is not a future
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:44
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                 ---------------------------^^^^^^
+   |                 |                          |
+   |                 |                          `[(); _]` is not a future
+   |                 |                          help: remove the `.await`
+   |                 this call returns `[(); _]`
+   |
+   = help: the trait `Future` is not implemented for `[(); _]`
+   = note: [(); _] must be a future or must implement `IntoFuture` to be awaited
+   = note: required for `[(); _]` to implement `IntoFuture`
+
+error[E0698]: type inside `async` block must be known in this context
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:17
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
+   |
+note: the type is part of the `async` block because of this `await`
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:44
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                                            ^^^^^^
+
+error[E0698]: type inside `async` block must be known in this context
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:17
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
+   |
+note: the type is part of the `async` block because of this `await`
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:44
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                                            ^^^^^^
+
+error[E0698]: type inside `async` block must be known in this context
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:17
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
+   |
+note: the type is part of the `async` block because of this `await`
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:44
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                                            ^^^^^^
+
+error[E0698]: type inside `async` block must be known in this context
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:17
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
+   |
+note: the type is part of the `async` block because of this `await`
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:44
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                                            ^^^^^^
+
+error[E0698]: type inside `async` block must be known in this context
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:17
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
+   |
+note: the type is part of the `async` block because of this `await`
+  --> $DIR/unresolved-ct-var-drop-tracking.rs:7:44
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                                            ^^^^^^
+
+error: aborting due to 6 previous errors
+
+Some errors have detailed explanations: E0277, E0698.
+For more information about an error, try `rustc --explain E0277`.
diff --git a/src/test/ui/generator/unresolved-ct-var.rs b/tests/ui/generator/unresolved-ct-var.rs
index 0a1570fc2..0a1570fc2 100644
--- a/src/test/ui/generator/unresolved-ct-var.rs
+++ b/tests/ui/generator/unresolved-ct-var.rs
diff --git a/src/test/ui/generator/unresolved-ct-var.stderr b/tests/ui/generator/unresolved-ct-var.stderr
index fdf00dfad..fdf00dfad 100644
--- a/src/test/ui/generator/unresolved-ct-var.stderr
+++ b/tests/ui/generator/unresolved-ct-var.stderr
diff --git a/src/test/ui/generator/xcrate-reachable.rs b/tests/ui/generator/xcrate-reachable.rs
index 1b1cff338..1b1cff338 100644
--- a/src/test/ui/generator/xcrate-reachable.rs
+++ b/tests/ui/generator/xcrate-reachable.rs
diff --git a/src/test/ui/generator/xcrate.rs b/tests/ui/generator/xcrate.rs
index 40986bbeb..40986bbeb 100644
--- a/src/test/ui/generator/xcrate.rs
+++ b/tests/ui/generator/xcrate.rs
diff --git a/src/test/ui/generator/yield-in-args-rev.rs b/tests/ui/generator/yield-in-args-rev.rs
index 4c99bb3ef..4c99bb3ef 100644
--- a/src/test/ui/generator/yield-in-args-rev.rs
+++ b/tests/ui/generator/yield-in-args-rev.rs
diff --git a/src/test/ui/generator/yield-in-args-rev.stderr b/tests/ui/generator/yield-in-args-rev.stderr
index a87248f66..a87248f66 100644
--- a/src/test/ui/generator/yield-in-args-rev.stderr
+++ b/tests/ui/generator/yield-in-args-rev.stderr
diff --git a/src/test/ui/generator/yield-in-args.rs b/tests/ui/generator/yield-in-args.rs
index 80110af55..80110af55 100644
--- a/src/test/ui/generator/yield-in-args.rs
+++ b/tests/ui/generator/yield-in-args.rs
diff --git a/src/test/ui/generator/yield-in-args.stderr b/tests/ui/generator/yield-in-args.stderr
index ee6d22c27..ee6d22c27 100644
--- a/src/test/ui/generator/yield-in-args.stderr
+++ b/tests/ui/generator/yield-in-args.stderr
diff --git a/src/test/ui/generator/yield-in-box.rs b/tests/ui/generator/yield-in-box.rs
index dd6fa7c15..dd6fa7c15 100644
--- a/src/test/ui/generator/yield-in-box.rs
+++ b/tests/ui/generator/yield-in-box.rs
diff --git a/src/test/ui/generator/yield-in-box.stderr b/tests/ui/generator/yield-in-box.stderr
index 9d03ee008..9d03ee008 100644
--- a/src/test/ui/generator/yield-in-box.stderr
+++ b/tests/ui/generator/yield-in-box.stderr
diff --git a/src/test/ui/generator/yield-in-const.rs b/tests/ui/generator/yield-in-const.rs
index fe5ca822c..fe5ca822c 100644
--- a/src/test/ui/generator/yield-in-const.rs
+++ b/tests/ui/generator/yield-in-const.rs
diff --git a/src/test/ui/generator/yield-in-const.stderr b/tests/ui/generator/yield-in-const.stderr
index dcf4fe63e..dcf4fe63e 100644
--- a/src/test/ui/generator/yield-in-const.stderr
+++ b/tests/ui/generator/yield-in-const.stderr
diff --git a/src/test/ui/generator/yield-in-function.rs b/tests/ui/generator/yield-in-function.rs
index 29b811621..29b811621 100644
--- a/src/test/ui/generator/yield-in-function.rs
+++ b/tests/ui/generator/yield-in-function.rs
diff --git a/src/test/ui/generator/yield-in-function.stderr b/tests/ui/generator/yield-in-function.stderr
index 51cce198c..51cce198c 100644
--- a/src/test/ui/generator/yield-in-function.stderr
+++ b/tests/ui/generator/yield-in-function.stderr
diff --git a/src/test/ui/generator/yield-in-initializer.rs b/tests/ui/generator/yield-in-initializer.rs
index 0cab36e5f..0cab36e5f 100644
--- a/src/test/ui/generator/yield-in-initializer.rs
+++ b/tests/ui/generator/yield-in-initializer.rs
diff --git a/src/test/ui/generator/yield-in-initializer.stderr b/tests/ui/generator/yield-in-initializer.stderr
index ed14a2e32..ed14a2e32 100644
--- a/src/test/ui/generator/yield-in-initializer.stderr
+++ b/tests/ui/generator/yield-in-initializer.stderr
diff --git a/src/test/ui/generator/yield-in-static.rs b/tests/ui/generator/yield-in-static.rs
index d27fbb33b..d27fbb33b 100644
--- a/src/test/ui/generator/yield-in-static.rs
+++ b/tests/ui/generator/yield-in-static.rs
diff --git a/src/test/ui/generator/yield-in-static.stderr b/tests/ui/generator/yield-in-static.stderr
index d867f3ad3..d867f3ad3 100644
--- a/src/test/ui/generator/yield-in-static.stderr
+++ b/tests/ui/generator/yield-in-static.stderr
diff --git a/src/test/ui/generator/yield-outside-generator-issue-78653.rs b/tests/ui/generator/yield-outside-generator-issue-78653.rs
index 4e8050c81..4e8050c81 100644
--- a/src/test/ui/generator/yield-outside-generator-issue-78653.rs
+++ b/tests/ui/generator/yield-outside-generator-issue-78653.rs
diff --git a/src/test/ui/generator/yield-outside-generator-issue-78653.stderr b/tests/ui/generator/yield-outside-generator-issue-78653.stderr
index dcfb21174..dcfb21174 100644
--- a/src/test/ui/generator/yield-outside-generator-issue-78653.stderr
+++ b/tests/ui/generator/yield-outside-generator-issue-78653.stderr
diff --git a/src/test/ui/generator/yield-subtype.rs b/tests/ui/generator/yield-subtype.rs
index cb3fc9091..cb3fc9091 100644
--- a/src/test/ui/generator/yield-subtype.rs
+++ b/tests/ui/generator/yield-subtype.rs
diff --git a/src/test/ui/generator/yield-subtype.stderr b/tests/ui/generator/yield-subtype.stderr
index 97862e91c..97862e91c 100644
--- a/src/test/ui/generator/yield-subtype.stderr
+++ b/tests/ui/generator/yield-subtype.stderr
diff --git a/src/test/ui/generator/yield-while-iterating.rs b/tests/ui/generator/yield-while-iterating.rs
index 985e5d8bd..985e5d8bd 100644
--- a/src/test/ui/generator/yield-while-iterating.rs
+++ b/tests/ui/generator/yield-while-iterating.rs
diff --git a/src/test/ui/generator/yield-while-iterating.stderr b/tests/ui/generator/yield-while-iterating.stderr
index b65634752..b65634752 100644
--- a/src/test/ui/generator/yield-while-iterating.stderr
+++ b/tests/ui/generator/yield-while-iterating.stderr
diff --git a/src/test/ui/generator/yield-while-local-borrowed.rs b/tests/ui/generator/yield-while-local-borrowed.rs
index 061a64dbc..061a64dbc 100644
--- a/src/test/ui/generator/yield-while-local-borrowed.rs
+++ b/tests/ui/generator/yield-while-local-borrowed.rs
diff --git a/src/test/ui/generator/yield-while-local-borrowed.stderr b/tests/ui/generator/yield-while-local-borrowed.stderr
index c1513ef9b..c1513ef9b 100644
--- a/src/test/ui/generator/yield-while-local-borrowed.stderr
+++ b/tests/ui/generator/yield-while-local-borrowed.stderr
diff --git a/src/test/ui/generator/yield-while-ref-reborrowed.rs b/tests/ui/generator/yield-while-ref-reborrowed.rs
index a03ef945d..a03ef945d 100644
--- a/src/test/ui/generator/yield-while-ref-reborrowed.rs
+++ b/tests/ui/generator/yield-while-ref-reborrowed.rs
diff --git a/src/test/ui/generator/yield-while-ref-reborrowed.stderr b/tests/ui/generator/yield-while-ref-reborrowed.stderr
index 47147f9c0..47147f9c0 100644
--- a/src/test/ui/generator/yield-while-ref-reborrowed.stderr
+++ b/tests/ui/generator/yield-while-ref-reborrowed.stderr
diff --git a/src/test/ui/generator/yielding-in-match-guards.rs b/tests/ui/generator/yielding-in-match-guards.rs
index 4e89fc975..4e89fc975 100644
--- a/src/test/ui/generator/yielding-in-match-guards.rs
+++ b/tests/ui/generator/yielding-in-match-guards.rs