diff options
| author | bors <bors@rust-lang.org> | 2018-09-23 10:09:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-23 10:09:22 +0000 |
| commit | 2287a7a6e293cfcb3bbbdaf3ce2dca5dd2d3184a (patch) | |
| tree | 34343382fd1ed94d646423f0c2106df0ce33d0ab /src/libstd/macros.rs | |
| parent | 317ae05a7e4ee5324cc006eda877eb8f2eb57898 (diff) | |
| parent | 1b00f0b9fa92daa489510b8718ce56130420795f (diff) | |
Auto merge of #54339 - cramertj:no-cx, r=aturon
Remove spawning from task::Context r? @aturon cc https://github.com/rust-lang-nursery/wg-net/issues/56
Diffstat (limited to 'src/libstd/macros.rs')
| -rw-r--r-- | src/libstd/macros.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index e60ef46e738..06056d6ed20 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -229,7 +229,7 @@ macro_rules! await { let mut pinned = $e; loop { if let $crate::task::Poll::Ready(x) = - $crate::future::poll_in_task_cx(unsafe { + $crate::future::poll_with_tls_waker(unsafe { $crate::pin::Pin::new_unchecked(&mut pinned) }) { |