Skip to content

chore: Update futures-preview to 0.3.0-alpha.17 #1267

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
carllerche merged 2 commits into from
Jul 4, 2019
Merged

chore: Update futures-preview to 0.3.0-alpha.17 #1267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ac8512
chore: Update futures-preview to 0.3.0-alpha.17
taiki-e Jul 4, 2019
3a61755
Fix import of *Ext traits from futures::prelude
taiki-e Jul 4, 2019
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
4 changes: 2 additions & 2 deletions tokio-codec/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ tokio-futures = { version = "0.2.0", path = "../tokio-futures" }
log = "0.4"

[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-test = { version = "0.2.0", path = "../tokio-test" }
tokio-test = { version = "0.2.0", path = "../tokio-test" }
3 changes: 2 additions & 1 deletion tokio-codec/tests/framed.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ use tokio_current_thread::block_on_all;
use tokio_io::AsyncRead;

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;

Expand Down
2 changes: 1 addition & 1 deletion tokio-futures/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ default = [
]

[dependencies]
futures-core-preview = "0.3.0-alpha.16"
futures-core-preview = "0.3.0-alpha.17"
4 changes: 2 additions & 2 deletions tokio-futures/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ pub mod future;
pub mod sink;
pub mod stream;

mod macros;

pub use crate::future::Future;
pub use crate::sink::Sink;
pub use crate::stream::Stream;

pub use futures_core::ready;
12 changes: 0 additions & 12 deletions tokio-futures/src/macros.rs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions tokio-signal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ travis-ci = { repository = "tokio-rs/tokio" }
appveyor = { repository = "carllerche/tokio", id = "s83yxhy9qeb58va7" }

[dependencies]
futures-core-preview = "0.3.0-alpha.16"
futures-util-preview = "0.3.0-alpha.16"
futures-core-preview = "0.3.0-alpha.17"
futures-util-preview = "0.3.0-alpha.17"
lazy_static = "1"
tokio-reactor = { version = "0.2.0", path = "../tokio-reactor" }
tokio-executor = { version = "0.2.0", path = "../tokio-executor" }
Expand Down
2 changes: 1 addition & 1 deletion tokio-sync/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ async-traits = ["async-sink", "futures-core-preview"]
async-util = { git = "https://github.com/tokio-rs/async" }
async-sink = { git = "https://github.com/tokio-rs/async", optional = true }
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]
env_logger = { version = "0.5", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion tokio-tcp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ mio = "0.6.14"
iovec = "0.1"

# 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]
#env_logger = { version = "0.5", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion tokio-timer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ crossbeam-utils = "0.6.0"
# Backs `DelayQueue`
slab = "0.4.1"
# 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]
rand = "0.6"
Expand Down