about summary refs log tree commit diff
path: root/src/libcore/task/mod.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-04-07 09:48:12 +0000
committerbors <bors@rust-lang.org>2019-04-07 09:48:12 +0000
commit4fb888bf04d2f1913e78e9eae51ac5695df1dc01 (patch)
tree514cc7638f219d6113118c4df39fda52e08f5c44 /src/libcore/task/mod.rs
parentdec0a98c4b392b5fd153ba8b944c496218717813 (diff)
parent1691e06db661a19a5e25276c18cd165386f027bb (diff)
Auto merge of #59119 - cramertj:cx-back, r=withoutboats
Future-proof the Futures API

cc https://github.com/rust-lang/rust/issues/59113, @carllerche, @rust-lang/libs

r? @withoutboats
Diffstat (limited to 'src/libcore/task/mod.rs')
-rw-r--r--src/libcore/task/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/task/mod.rs b/src/libcore/task/mod.rs
index 9b8f5981162..29bae69ea83 100644
--- a/src/libcore/task/mod.rs
+++ b/src/libcore/task/mod.rs
@@ -8,4 +8,4 @@ mod poll;
 pub use self::poll::Poll;
 
 mod wake;
-pub use self::wake::{Waker, RawWaker, RawWakerVTable};
+pub use self::wake::{Context, Waker, RawWaker, RawWakerVTable};