diff options
| author | bors <bors@rust-lang.org> | 2020-02-07 00:06:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-02-07 00:06:35 +0000 |
| commit | f8fd4624474a68bd26694eff3536b9f3a127b2d3 (patch) | |
| tree | 87251dcf146a39eb1bf7936a6b46453827a17170 /src/libstd/future.rs | |
| parent | 442ae7f04026c215a03b155eaaf9cde8bb5cf02a (diff) | |
| parent | 7ef5b8951f9c4e2da8e8a918cd05d1784cbf895b (diff) | |
| download | rust-f8fd4624474a68bd26694eff3536b9f3a127b2d3.tar.gz rust-f8fd4624474a68bd26694eff3536b9f3a127b2d3.zip | |
Auto merge of #68907 - Dylan-DPC:rollup-osm5e8o, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #67359 (Rename -Zexternal-macro-backtrace to -Zmacro-backtrace and clean up implementation.) - #68524 (Generator Resume Arguments) - #68791 (implement proper linkchecker hardening) - #68886 (Mark fn map_or() as eagerly evaluated.) - #68888 (error code examples: replace some more ignore with compile_fail) - #68894 (Update E0565 examples) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/future.rs')
| -rw-r--r-- | src/libstd/future.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libstd/future.rs b/src/libstd/future.rs index 9c7422c2b20..f74c84e6dfd 100644 --- a/src/libstd/future.rs +++ b/src/libstd/future.rs @@ -40,7 +40,10 @@ 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() { + match gen.resume( + #[cfg(not(bootstrap))] + (), + ) { GeneratorState::Yielded(()) => Poll::Pending, GeneratorState::Complete(x) => Poll::Ready(x), } |