summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaiki Endo <te316e89@gmail.com>2019-04-17 03:07:03 +0900
committerDavid Barsky <me@davidbarsky.com>2019-04-16 14:07:03 -0400
commit5029e80a897edabef99a90989a8aea12c91fdd4d (patch)
treed3869f3f98136a9185704ca28d7a8fc7794201af
parent847fb59b17d8e9786abfdac474ad59e120a94254 (diff)
async-await: update to new futures_api (#1049)
-rw-r--r--azure-pipelines.yml2
-rw-r--r--tokio-async-await/README.md2
-rw-r--r--tokio-async-await/src/compat/backward.rs4
3 files changed, 4 insertions, 4 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 54dc78f3..32b50250 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -74,7 +74,7 @@ jobs:
parameters:
name: async_await
displayName: Async / Await
- rust: nightly-2019-04-08
+ rust: nightly-2019-04-13
noDefaultFeatures: ''
benches: true
crates:
diff --git a/tokio-async-await/README.md b/tokio-async-await/README.md
index f61ede85..a8c7c2a0 100644
--- a/tokio-async-await/README.md
+++ b/tokio-async-await/README.md
@@ -9,7 +9,7 @@ guarantees. You are living on the edge here.**
## Usage
To use this crate, you need to start with a Rust 2018 edition crate, with rustc
-1.34.0-nightly or later.
+1.35.0-nightly or later.
Add this to your `Cargo.toml`:
diff --git a/tokio-async-await/src/compat/backward.rs b/tokio-async-await/src/compat/backward.rs
index 9529afc3..6274832f 100644
--- a/tokio-async-await/src/compat/backward.rs
+++ b/tokio-async-await/src/compat/backward.rs
@@ -64,7 +64,7 @@ fn noop_raw_waker() -> RawWaker {
}
fn noop_waker() -> Waker {
- unsafe { Waker::new_unchecked(noop_raw_waker()) }
+ unsafe { Waker::from_raw(noop_raw_waker()) }
}
unsafe fn clone_raw(_data: *const ()) -> RawWaker {
@@ -77,4 +77,4 @@ unsafe fn wake(_data: *const ()) {
unimplemented!("async-await-preview currently only supports futures 0.1. Use the compatibility layer of futures 0.3 instead, if you want to use futures 0.3.");
}
-const NOOP_WAKER_VTABLE: RawWakerVTable = RawWakerVTable::new(clone_raw, wake, drop_raw);
+const NOOP_WAKER_VTABLE: RawWakerVTable = RawWakerVTable::new(clone_raw, wake, wake, drop_raw);