diff options
| author | bors <bors@rust-lang.org> | 2020-04-16 09:13:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-16 09:13:07 +0000 |
| commit | 4e4d49d60fd696c4036d438292673a2d7fd34519 (patch) | |
| tree | 2c98f15cf059ad04e929920f0a4a0c72cc23fe9d /src/test | |
| parent | 534a41a32952d36ec73656357777ebbea707aeb4 (diff) | |
| parent | 3ba3bd5dc91560e42f62b6a8ea0d42fe2ee473d0 (diff) | |
| download | rust-4e4d49d60fd696c4036d438292673a2d7fd34519.tar.gz rust-4e4d49d60fd696c4036d438292673a2d7fd34519.zip | |
Auto merge of #70831 - sfackler:shrink-future-stack, r=matthewjasper
Remove a stack frame from .await calls
The stack frames when `.await`ing one async fn from another currently look like this:
```
12: foo::b::{{closure}}
at src/main.rs:2
13: <core::future::from_generator::GenFuture<T> as core::future::future::Future>::poll
at /home/sfackler/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/src/libcore/future/mod.rs:66
14: core::future::poll_with_context
at /home/sfackler/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/src/libcore/future/mod.rs:84
15: foo::a::{{closure}}
at src/main.rs:6
```
Since the move away from using TLS to pass the Context around, it's now easy to remove frame 14 by removing poll_with_context in favor of calling Future::poll directly. This still leaves the `GenFuture` frame, but that seems significantly harder to deal with.
It also improves diagnostics a bit since they no longer talk about the private poll_with_context function.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/ui/async-await/issue-70594.stderr | 5 | ||||
| -rw-r--r-- | src/test/ui/async-await/issues/issue-62009-1.stderr | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/test/ui/async-await/issue-70594.stderr b/src/test/ui/async-await/issue-70594.stderr index d2fa7e58f6a..496ca506c60 100644 --- a/src/test/ui/async-await/issue-70594.stderr +++ b/src/test/ui/async-await/issue-70594.stderr @@ -32,11 +32,8 @@ error[E0277]: the trait bound `(): std::future::Future` is not satisfied | LL | [1; ().await]; | ^^^^^^^^ the trait `std::future::Future` is not implemented for `()` - | - ::: $SRC_DIR/libcore/future/mod.rs:LL:COL | -LL | F: Future, - | ------ required by this bound in `std::future::poll_with_context` + = note: required by `std::future::Future::poll` error: aborting due to 5 previous errors diff --git a/src/test/ui/async-await/issues/issue-62009-1.stderr b/src/test/ui/async-await/issues/issue-62009-1.stderr index 2417b592c7d..ec4e9e397a8 100644 --- a/src/test/ui/async-await/issues/issue-62009-1.stderr +++ b/src/test/ui/async-await/issues/issue-62009-1.stderr @@ -32,11 +32,8 @@ error[E0277]: the trait bound `[closure@$DIR/issue-62009-1.rs:12:5: 12:15]: std: | LL | (|_| 2333).await; | ^^^^^^^^^^^^^^^^ the trait `std::future::Future` is not implemented for `[closure@$DIR/issue-62009-1.rs:12:5: 12:15]` - | - ::: $SRC_DIR/libcore/future/mod.rs:LL:COL | -LL | F: Future, - | ------ required by this bound in `std::future::poll_with_context` + = note: required by `std::future::Future::poll` error: aborting due to 4 previous errors |