Skip to content

async-await: update to new futures_api #1049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidbarsky merged 1 commit into from
Apr 16, 2019
Merged

async-await: update to new futures_api #1049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tokio-async-await/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`:

Expand Down
4 changes: 2 additions & 2 deletions tokio-async-await/src/compat/backward.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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);