Restore impl Future<Output = Type> to async blocks

compiler-errors · compiler-errors · commit 7b2eaa3d8fb7 · 2022-03-30T19:26:35.000-07:00
diff --git a/compiler/rustc_middle/src/ty/print/pretty.rs b/compiler/rustc_middle/src/ty/print/pretty.rs
@@ -912,12 +912,25 @@ pub trait PrettyPrinter<'tcx>:
                 }
 
                 for (assoc_item_def_id, term) in assoc_items {
-                    // Skip printing `<[generator@] as Generator<_>>::Return` from async blocks
-                    if let Some(ty) = term.skip_binder().ty() &&
-                       let ty::Projection(ty::ProjectionTy { item_def_id, .. }) = ty.kind() &&
-                       Some(*item_def_id) == self.tcx().lang_items().generator_return() {
-                        continue;
-                    }
+                    // Skip printing `<[generator@] as Generator<_>>::Return` from async blocks,
+                    // unless we can find out what generator return type it comes from.
+                    let term = if let Some(ty) = term.skip_binder().ty()
+                        && let ty::Projection(ty::ProjectionTy { item_def_id, substs }) = ty.kind()
+                        && Some(*item_def_id) == self.tcx().lang_items().generator_return()
+                    {
+                        if let ty::Generator(_, substs, _) = substs.type_at(0).kind() {
+                            let return_ty = substs.as_generator().return_ty();
+                            if !return_ty.is_ty_infer() {
+                                return_ty.into()
+                            } else {
+                                continue;
+                            }
+                        } else {
+                            continue;
+                        }
+                    } else {
+                        term.skip_binder()
+                    };
 
                     if first {
                         p!("<");
@@ -928,7 +941,7 @@ pub trait PrettyPrinter<'tcx>:
 
                     p!(write("{} = ", self.tcx().associated_item(assoc_item_def_id).name));
 
-                    match term.skip_binder() {
+                    match term {
                         Term::Ty(ty) => {
                             p!(print(ty))
                         }
diff --git a/src/test/ui/async-await/async-block-control-flow-static-semantics.rs b/src/test/ui/async-await/async-block-control-flow-static-semantics.rs
@@ -24,7 +24,7 @@ async fn return_targets_async_block_not_async_fn() -> u8 {
         return 0u8;
     };
     let _: &dyn Future<Output = ()> = &block;
-    //~^ ERROR type mismatch resolving `<impl Future as Future>::Output == ()`
+    //~^ ERROR type mismatch resolving `<impl Future<Output = u8> as Future>::Output == ()`
 }
 
 fn no_break_in_async_block() {
diff --git a/src/test/ui/async-await/async-block-control-flow-static-semantics.stderr b/src/test/ui/async-await/async-block-control-flow-static-semantics.stderr
@@ -31,7 +31,7 @@ LL | |
 LL | | }
    | |_^ expected `u8`, found `()`
 
-error[E0271]: type mismatch resolving `<impl Future as Future>::Output == ()`
+error[E0271]: type mismatch resolving `<impl Future<Output = u8> as Future>::Output == ()`
   --> $DIR/async-block-control-flow-static-semantics.rs:26:39
    |
 LL |     let _: &dyn Future<Output = ()> = &block;
@@ -47,7 +47,7 @@ LL | fn return_targets_async_block_not_fn() -> u8 {
    |    |
    |    implicitly returns `()` as its body has no tail or `return` expression
 
-error[E0271]: type mismatch resolving `<impl Future as Future>::Output == ()`
+error[E0271]: type mismatch resolving `<impl Future<Output = u8> as Future>::Output == ()`
   --> $DIR/async-block-control-flow-static-semantics.rs:17:39
    |
 LL |     let _: &dyn Future<Output = ()> = &block;
diff --git a/src/test/ui/async-await/generator-desc.stderr b/src/test/ui/async-await/generator-desc.stderr
@@ -46,8 +46,8 @@ LL | pub const fn from_generator<T>(gen: T) -> impl Future<Output = T::Return>
    |                                           the expected opaque type
    |                                           the found opaque type
    |
-   = note: expected opaque type `impl Future` (`async` closure body)
-              found opaque type `impl Future` (`async` closure body)
+   = note: expected opaque type `impl Future<Output = ()>` (`async` closure body)
+              found opaque type `impl Future<Output = ()>` (`async` closure body)
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/async-await/issue-67252-unnamed-future.stderr b/src/test/ui/async-await/issue-67252-unnamed-future.stderr
@@ -4,7 +4,7 @@ error: future cannot be sent between threads safely
 LL |     spawn(async {
    |     ^^^^^ future created by async block is not `Send`
    |
-   = help: within `impl Future`, the trait `Send` is not implemented for `*mut ()`
+   = help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `*mut ()`
 note: future is not `Send` as this value is used across an await
   --> $DIR/issue-67252-unnamed-future.rs:20:16
    |
diff --git a/src/test/ui/async-await/issue-68112.stderr b/src/test/ui/async-await/issue-68112.stderr
@@ -44,13 +44,13 @@ LL |     require_send(send_fut);
    = note: required because of the requirements on the impl of `Send` for `Arc<RefCell<i32>>`
    = note: required because it appears within the type `[static generator@$DIR/issue-68112.rs:47:31: 47:36]`
    = note: required because it appears within the type `from_generator::GenFuture<[static generator@$DIR/issue-68112.rs:47:31: 47:36]>`
-   = note: required because it appears within the type `impl Future`
+   = note: required because it appears within the type `impl Future<Output = Arc<RefCell<i32>>>`
    = note: required because it appears within the type `impl Future<Output = Arc<RefCell<i32>>>`
    = note: required because it appears within the type `impl Future<Output = Arc<RefCell<i32>>>`
    = note: required because it appears within the type `{ResumeTy, impl Future<Output = Arc<RefCell<i32>>>, (), i32, Ready<i32>}`
    = note: required because it appears within the type `[static generator@$DIR/issue-68112.rs:55:26: 59:6]`
    = note: required because it appears within the type `from_generator::GenFuture<[static generator@$DIR/issue-68112.rs:55:26: 59:6]>`
-   = note: required because it appears within the type `impl Future`
+   = note: required because it appears within the type `impl Future<Output = ()>`
 note: required by a bound in `require_send`
   --> $DIR/issue-68112.rs:11:25
    |
diff --git a/src/test/ui/async-await/issues/issue-65436-raw-ptr-not-send.stderr b/src/test/ui/async-await/issues/issue-65436-raw-ptr-not-send.stderr
@@ -4,7 +4,7 @@ error: future cannot be sent between threads safely
 LL |     assert_send(async {
    |     ^^^^^^^^^^^ future created by async block is not `Send`
    |
-   = help: within `impl Future`, the trait `Send` is not implemented for `*const u8`
+   = help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `*const u8`
 note: future is not `Send` as this value is used across an await
   --> $DIR/issue-65436-raw-ptr-not-send.rs:14:35
    |
diff --git a/src/test/ui/async-await/partial-drop-partial-reinit.stderr b/src/test/ui/async-await/partial-drop-partial-reinit.stderr
@@ -14,7 +14,7 @@ LL | async fn foo() {
    = note: required because it appears within the type `{ResumeTy, (NotSend,), impl Future<Output = ()>, ()}`
    = note: required because it appears within the type `[static generator@$DIR/partial-drop-partial-reinit.rs:22:16: 27:2]`
    = note: required because it appears within the type `from_generator::GenFuture<[static generator@$DIR/partial-drop-partial-reinit.rs:22:16: 27:2]>`
-   = note: required because it appears within the type `impl Future`
+   = note: required because it appears within the type `impl Future<Output = ()>`
    = note: required because it appears within the type `impl Future<Output = ()>`
 note: required by a bound in `gimme_send`
   --> $DIR/partial-drop-partial-reinit.rs:10:18
diff --git a/src/test/ui/chalkify/bugs/async.stderr b/src/test/ui/chalkify/bugs/async.stderr
@@ -28,7 +28,7 @@ note: required by a bound in `from_generator`
 LL |     T: Generator<ResumeTy, Yield = ()>,
    |                            ^^^^^^^^^^ required by this bound in `from_generator`
 
-error[E0280]: the requirement `<impl Future as Future>::Output == u32` is not satisfied
+error[E0280]: the requirement `<impl Future<Output = u32> as Future>::Output == u32` is not satisfied
   --> $DIR/async.rs:7:29
    |
 LL |   async fn foo(x: u32) -> u32 {
diff --git a/src/test/ui/impl-trait/issue-55872-3.rs b/src/test/ui/impl-trait/issue-55872-3.rs
@@ -13,7 +13,7 @@ impl<S> Bar for S {
     type E = impl std::marker::Copy;
     fn foo<T>() -> Self::E {
         async {}
-        //~^ ERROR the trait bound `impl Future: Copy` is not satisfied [E0277]
+        //~^ ERROR the trait bound `impl Future<Output = ()>: Copy` is not satisfied [E0277]
     }
 }
 
diff --git a/src/test/ui/impl-trait/issue-55872-3.stderr b/src/test/ui/impl-trait/issue-55872-3.stderr
@@ -1,8 +1,8 @@
-error[E0277]: the trait bound `impl Future: Copy` is not satisfied
+error[E0277]: the trait bound `impl Future<Output = ()>: Copy` is not satisfied
   --> $DIR/issue-55872-3.rs:15:9
    |
 LL |         async {}
-   |         ^^^^^^^^ the trait `Copy` is not implemented for `impl Future`
+   |         ^^^^^^^^ the trait `Copy` is not implemented for `impl Future<Output = ()>`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/impl-trait/issues/issue-78722.stderr b/src/test/ui/impl-trait/issues/issue-78722.stderr
@@ -16,7 +16,7 @@ LL |         let f: F = async { 1 };
 LL |     }],
    |     - value is dropped here
 
-error[E0271]: type mismatch resolving `<impl Future as Future>::Output == u8`
+error[E0271]: type mismatch resolving `<impl Future<Output = ()> as Future>::Output == u8`
   --> $DIR/issue-78722.rs:10:13
    |
 LL |             async {}
diff --git a/src/test/ui/pattern/non-structural-match-types.stderr b/src/test/ui/pattern/non-structural-match-types.stderr
@@ -4,7 +4,7 @@ error: `[closure@$DIR/non-structural-match-types.rs:9:17: 9:22]` cannot be used
 LL |         const { || {} } => {},
    |         ^^^^^^^^^^^^^^^
 
-error: `impl Future` cannot be used in patterns
+error: `impl Future<Output = ()>` cannot be used in patterns
   --> $DIR/non-structural-match-types.rs:12:9
    |
 LL |         const { async {} } => {},

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ async fn return_targets_async_block_not_async_fn() -> u8 {`
`24`	`24`	`return 0u8;`
`25`	`25`	`};`
`26`	`26`	`let _: &dyn Future<Output = ()> = &block;`
`27`		- //~^ ERROR type mismatch resolving `<impl Future as Future>::Output == ()`
	`27`	+ //~^ ERROR type mismatch resolving `<impl Future<Output = u8> as Future>::Output == ()`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`fn no_break_in_async_block() {`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@ LL \| pub const fn from_generator<T>(gen: T) -> impl Future<Output = T::Return>`
`46`	`46`	`\| the expected opaque type`
`47`	`47`	`\| the found opaque type`
`48`	`48`	`\|`
`49`		- = note: expected opaque type `impl Future` (`async` closure body)
`50`		- found opaque type `impl Future` (`async` closure body)
	`49`	+ = note: expected opaque type `impl Future<Output = ()>` (`async` closure body)
	`50`	+ found opaque type `impl Future<Output = ()>` (`async` closure body)
`51`	`51`
`52`	`52`	`error: aborting due to 3 previous errors`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ error: future cannot be sent between threads safely`
`4`	`4`	`LL \| spawn(async {`
`5`	`5`	\| ^^^^^ future created by async block is not `Send`
`6`	`6`	`\|`
`7`		- = help: within `impl Future`, the trait `Send` is not implemented for `*mut ()`
	`7`	+ = help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `*mut ()`
`8`	`8`	note: future is not `Send` as this value is used across an await
`9`	`9`	`--> $DIR/issue-67252-unnamed-future.rs:20:16`
`10`	`10`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ error: future cannot be sent between threads safely`
`4`	`4`	`LL \| assert_send(async {`
`5`	`5`	\| ^^^^^^^^^^^ future created by async block is not `Send`
`6`	`6`	`\|`
`7`		- = help: within `impl Future`, the trait `Send` is not implemented for `*const u8`
	`7`	+ = help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `*const u8`
`8`	`8`	note: future is not `Send` as this value is used across an await
`9`	`9`	`--> $DIR/issue-65436-raw-ptr-not-send.rs:14:35`
`10`	`10`	`\|`
Original file line number	Diff line number	Diff line change
@@ -28,7 +28,7 @@ note: required by a bound in `from_generator`
`28`	`28`	`LL \| T: Generator<ResumeTy, Yield = ()>,`
`29`	`29`	\| ^^^^^^^^^^ required by this bound in `from_generator`
`30`	`30`
`31`		-error[E0280]: the requirement `<impl Future as Future>::Output == u32` is not satisfied
	`31`	+error[E0280]: the requirement `<impl Future<Output = u32> as Future>::Output == u32` is not satisfied
`32`	`32`	`--> $DIR/async.rs:7:29`
`33`	`33`	`\|`
`34`	`34`	`LL \| async fn foo(x: u32) -> u32 {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ impl<S> Bar for S {`
`13`	`13`	`type E = impl std::marker::Copy;`
`14`	`14`	`fn foo<T>() -> Self::E {`
`15`	`15`	`async {}`
`16`		- //~^ ERROR the trait bound `impl Future: Copy` is not satisfied [E0277]
	`16`	+ //~^ ERROR the trait bound `impl Future<Output = ()>: Copy` is not satisfied [E0277]
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		-error[E0277]: the trait bound `impl Future: Copy` is not satisfied
	`1`	+error[E0277]: the trait bound `impl Future<Output = ()>: Copy` is not satisfied
`2`	`2`	`--> $DIR/issue-55872-3.rs:15:9`
`3`	`3`	`\|`
`4`	`4`	`LL \| async {}`
`5`		- \| ^^^^^^^^ the trait `Copy` is not implemented for `impl Future`
	`5`	+ \| ^^^^^^^^ the trait `Copy` is not implemented for `impl Future<Output = ()>`
`6`	`6`
`7`	`7`	`error: aborting due to previous error`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ LL \| let f: F = async { 1 };`
`16`	`16`	`LL \| }],`
`17`	`17`	`\| - value is dropped here`
`18`	`18`
`19`		-error[E0271]: type mismatch resolving `<impl Future as Future>::Output == u8`
	`19`	+error[E0271]: type mismatch resolving `<impl Future<Output = ()> as Future>::Output == u8`
`20`	`20`	`--> $DIR/issue-78722.rs:10:13`
`21`	`21`	`\|`
`22`	`22`	`LL \| async {}`
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error: `[closure@$DIR/non-structural-match-types.rs:9:17: 9:22]` cannot be used
`4`	`4`	`LL \| const { \|\| {} } => {},`
`5`	`5`	`\| ^^^^^^^^^^^^^^^`
`6`	`6`
`7`		-error: `impl Future` cannot be used in patterns
	`7`	+error: `impl Future<Output = ()>` cannot be used in patterns
`8`	`8`	`--> $DIR/non-structural-match-types.rs:12:9`
`9`	`9`	`\|`
`10`	`10`	`LL \| const { async {} } => {},`