mirror of
https://github.com/tokio-rs/tokio.git
synced 2025-10-01 12:20:39 +00:00
chore: Update futures-preview to 0.3.0-alpha.17 (#1267)
This commit is contained in:
parent
0651f09427
commit
7b86acb71d
@ -28,6 +28,6 @@ tokio-futures = { version = "0.2.0", path = "../tokio-futures" }
|
|||||||
log = "0.4"
|
log = "0.4"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
futures-preview = "0.3.0-alpha.16"
|
futures-preview = "0.3.0-alpha.17"
|
||||||
tokio-current-thread = { version = "0.2.0", path = "../tokio-current-thread" }
|
tokio-current-thread = { version = "0.2.0", path = "../tokio-current-thread" }
|
||||||
tokio-test = { version = "0.2.0", path = "../tokio-test" }
|
tokio-test = { version = "0.2.0", path = "../tokio-test" }
|
||||||
|
@ -9,7 +9,8 @@ use tokio_current_thread::block_on_all;
|
|||||||
use tokio_io::AsyncRead;
|
use tokio_io::AsyncRead;
|
||||||
|
|
||||||
use bytes::{Buf, BufMut, BytesMut, IntoBuf};
|
use bytes::{Buf, BufMut, BytesMut, IntoBuf};
|
||||||
use futures::prelude::{FutureExt, StreamExt};
|
use futures::future::FutureExt;
|
||||||
|
use futures::stream::StreamExt;
|
||||||
|
|
||||||
const INITIAL_CAPACITY: usize = 8 * 1024;
|
const INITIAL_CAPACITY: usize = 8 * 1024;
|
||||||
|
|
||||||
|
@ -23,4 +23,4 @@ default = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
futures-core-preview = "0.3.0-alpha.16"
|
futures-core-preview = "0.3.0-alpha.17"
|
||||||
|
@ -9,8 +9,8 @@ pub mod future;
|
|||||||
pub mod sink;
|
pub mod sink;
|
||||||
pub mod stream;
|
pub mod stream;
|
||||||
|
|
||||||
mod macros;
|
|
||||||
|
|
||||||
pub use crate::future::Future;
|
pub use crate::future::Future;
|
||||||
pub use crate::sink::Sink;
|
pub use crate::sink::Sink;
|
||||||
pub use crate::stream::Stream;
|
pub use crate::stream::Stream;
|
||||||
|
|
||||||
|
pub use futures_core::ready;
|
||||||
|
@ -1,12 +0,0 @@
|
|||||||
/// Unwrap a ready value or propagate `Async::Pending`.
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! ready {
|
|
||||||
($e:expr) => {{
|
|
||||||
use std::task::Poll::{Pending, Ready};
|
|
||||||
|
|
||||||
match $e {
|
|
||||||
Ready(v) => v,
|
|
||||||
Pending => return Pending,
|
|
||||||
}
|
|
||||||
}};
|
|
||||||
}
|
|
@ -26,8 +26,8 @@ travis-ci = { repository = "tokio-rs/tokio" }
|
|||||||
appveyor = { repository = "carllerche/tokio", id = "s83yxhy9qeb58va7" }
|
appveyor = { repository = "carllerche/tokio", id = "s83yxhy9qeb58va7" }
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
futures-core-preview = "0.3.0-alpha.16"
|
futures-core-preview = "0.3.0-alpha.17"
|
||||||
futures-util-preview = "0.3.0-alpha.16"
|
futures-util-preview = "0.3.0-alpha.17"
|
||||||
lazy_static = "1"
|
lazy_static = "1"
|
||||||
tokio-reactor = { version = "0.2.0", path = "../tokio-reactor" }
|
tokio-reactor = { version = "0.2.0", path = "../tokio-reactor" }
|
||||||
tokio-executor = { version = "0.2.0", path = "../tokio-executor" }
|
tokio-executor = { version = "0.2.0", path = "../tokio-executor" }
|
||||||
|
@ -28,7 +28,7 @@ async-traits = ["async-sink", "futures-core-preview"]
|
|||||||
async-util = { git = "https://github.com/tokio-rs/async" }
|
async-util = { git = "https://github.com/tokio-rs/async" }
|
||||||
async-sink = { git = "https://github.com/tokio-rs/async", optional = true }
|
async-sink = { git = "https://github.com/tokio-rs/async", optional = true }
|
||||||
fnv = "1.0.6"
|
fnv = "1.0.6"
|
||||||
futures-core-preview = { version = "0.3.0-alpha.16", optional = true }
|
futures-core-preview = { version = "0.3.0-alpha.17", optional = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
env_logger = { version = "0.5", default-features = false }
|
env_logger = { version = "0.5", default-features = false }
|
||||||
|
@ -33,7 +33,7 @@ mio = "0.6.14"
|
|||||||
iovec = "0.1"
|
iovec = "0.1"
|
||||||
|
|
||||||
# optionals
|
# optionals
|
||||||
futures-core-preview = { version = "0.3.0-alpha.16", optional = true }
|
futures-core-preview = { version = "0.3.0-alpha.17", optional = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
#env_logger = { version = "0.5", default-features = false }
|
#env_logger = { version = "0.5", default-features = false }
|
||||||
|
@ -33,7 +33,7 @@ crossbeam-utils = "0.6.0"
|
|||||||
# Backs `DelayQueue`
|
# Backs `DelayQueue`
|
||||||
slab = "0.4.1"
|
slab = "0.4.1"
|
||||||
# optionals
|
# optionals
|
||||||
futures-core-preview = { version = "0.3.0-alpha.16", optional = true }
|
futures-core-preview = { version = "0.3.0-alpha.17", optional = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
rand = "0.6"
|
rand = "0.6"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user