diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2020-03-17 03:05:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-17 03:05:17 +0100 |
| commit | f907598ba475a5003b9584ef19cf2b761ff53de2 (patch) | |
| tree | 256f82449baea23e52d5d0f1d4c850c7e254c0a2 /src/libstd | |
| parent | 3d25622537a6c79303fb86d76ad7cbca2702fc1f (diff) | |
| parent | f53f9a88f16dc3d1b94ed2e7f0f201e1456d8cfc (diff) | |
| download | rust-f907598ba475a5003b9584ef19cf2b761ff53de2.tar.gz rust-f907598ba475a5003b9584ef19cf2b761ff53de2.zip | |
Rollup merge of #70029 - jonas-schievink:bootstrap, r=Centril
Bump the bootstrap compiler
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/future.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libstd/future.rs b/src/libstd/future.rs index 7b1beb1ecda..c1ca6771326 100644 --- a/src/libstd/future.rs +++ b/src/libstd/future.rs @@ -41,10 +41,7 @@ impl<T: Generator<Yield = ()>> Future for GenFuture<T> { // Safe because we're !Unpin + !Drop mapping to a ?Unpin value let gen = unsafe { Pin::map_unchecked_mut(self, |s| &mut s.0) }; let _guard = unsafe { set_task_context(cx) }; - match gen.resume( - #[cfg(not(bootstrap))] - (), - ) { + match gen.resume(()) { GeneratorState::Yielded(()) => Poll::Pending, GeneratorState::Complete(x) => Poll::Ready(x), } |