diff options
| author | Wim Looman <wim@nemo157.com> | 2018-10-04 20:49:38 +0200 |
|---|---|---|
| committer | Wim Looman <wim@nemo157.com> | 2019-01-27 22:58:53 +0100 |
| commit | a3fdee9a7523a72a5ee72cdb4c1cf3c2cec444bc (patch) | |
| tree | 127e574840d4994b33fcfc41a1b452bf5976829c /src/libstd/future.rs | |
| parent | 8611577360e66f90470bd40c498cf8d194f67926 (diff) | |
| download | rust-a3fdee9a7523a72a5ee72cdb4c1cf3c2cec444bc.tar.gz rust-a3fdee9a7523a72a5ee72cdb4c1cf3c2cec444bc.zip | |
Change generator trait to use pinning
Diffstat (limited to 'src/libstd/future.rs')
| -rw-r--r-- | src/libstd/future.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libstd/future.rs b/src/libstd/future.rs index 22900c3067b..d1203be3cf0 100644 --- a/src/libstd/future.rs +++ b/src/libstd/future.rs @@ -33,7 +33,9 @@ impl<T: Generator<Yield = ()>> !Unpin for GenFuture<T> {} impl<T: Generator<Yield = ()>> Future for GenFuture<T> { type Output = T::Return; fn poll(self: Pin<&mut Self>, lw: &LocalWaker) -> Poll<Self::Output> { - set_task_waker(lw, || match unsafe { Pin::get_unchecked_mut(self).0.resume() } { + // Safe because we're !Unpin + !Drop mapping to a ?Unpin value + let gen = unsafe { Pin::map_unchecked_mut(self, |s| &mut s.0) }; + set_task_waker(lw, || match gen.resume() { GeneratorState::Yielded(()) => Poll::Pending, GeneratorState::Complete(x) => Poll::Ready(x), }) |