Skip to content
This repository has been archived by the owner on Mar 3, 2020. It is now read-only.

Use updated futures 0.2 from git #73

Merged
merged 1 commit into from
Mar 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@ members = ["testcrate"]
[dependencies]
futures-await-async-macro = { path = "futures-await-async-macro", version = "0.2.0-alpha" }
futures-await-await-macro = { path = "futures-await-await-macro", version = "0.2.0-alpha" }
futures = "0.2.0-alpha"
futures-stable = "0.2.0-alpha"
futures = { git = "https://github.com/rust-lang-nursery/futures-rs.git", features = ["nightly"] }
pin-api = "0.1.1"
2 changes: 1 addition & 1 deletion src/__rt/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub use self::pinned_future::*;
pub use self::pinned_stream::*;

pub use futures::prelude::{Async, Future, Stream};
pub use stable::{StableFuture, StableStream};
pub use futures::stable::{StableFuture, StableStream};

pub extern crate std;
pub extern crate pin_api;
Expand Down
2 changes: 1 addition & 1 deletion src/__rt/pinned_future.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use __rt::pin_api::{PinMut, Unpin};
use super::{IsResult, Reset, CTX};

use futures::Never;
use stable::StableFuture;
use futures::stable::StableFuture;
use task;
use prelude::{Poll, Async};

Expand Down
2 changes: 1 addition & 1 deletion src/__rt/pinned_stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::marker::PhantomData;
use __rt::pin_api::{PinMut, Unpin};
use futures::task;
use futures::prelude::{Poll, Async};
use stable::StableStream;
use futures::stable::StableStream;

use super::{CTX, Reset, IsResult};

Expand Down
1 change: 0 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
extern crate futures_await_async_macro as async_macro;
extern crate futures_await_await_macro as await_macro;
extern crate futures;
pub extern crate futures_stable as stable;

pub use futures::*;

Expand Down