Skip to content
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

chore: Drop futures01 #7343

Merged
merged 1 commit into from
May 6, 2021
Merged

chore: Drop futures01 #7343

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
37 changes: 0 additions & 37 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ vrl-cli = { path = "lib/vrl/cli", optional = true }
# Tokio / Futures
async-trait = "0.1.50"
futures = { version = "0.3.14", default-features = false, features = ["compat", "io-compat"], package = "futures" }
futures01 = { version = "0.1.25", package = "futures", default-features = false }
tokio = { version = "1.5.0", default-features = false, features = ["full"] }
tokio-openssl = { version = "0.6.1", default-features = false }
tokio-stream = { version = "0.1.5", default-features = false, features = ["net", "sync"] }
Expand All @@ -112,7 +111,7 @@ tokio-util = { version = "0.6.6", default-features = false, features = ["codec",
# Tracing
tracing = { version = "0.1.25", default-features = false }
tracing-core = { version = "0.1.18", default-features = false }
tracing-futures = { version = "0.2.5", default-features = false, features = ["futures-01", "futures-03"] }
tracing-futures = { version = "0.2.5", default-features = false, features = ["futures-03"] }
tracing-log = { version = "0.1.2", default-features = false }
tracing-subscriber = { version = "0.2.18", default-features = false }
tracing-tower = { git = "https://github.com/tokio-rs/tracing", default-features = false, rev = "f470db1b0354b368f62f9ee4d763595d16373231" }
Expand Down Expand Up @@ -233,7 +232,7 @@ regex = { version = "1.4.6", default-features = false, features = ["std", "perf"
rlua = { version = "0.17.0", default-features = true, optional = true }
seahash = { version = "4.1.0", default-features = false, optional = true }
semver = { version = "0.11.0", default-features = false, features = ["serde"], optional = true }
snafu = { version = "0.6.10", default-features = false, features = ["futures", "futures-01"] }
snafu = { version = "0.6.10", default-features = false, features = ["futures"] }
snap = { version = "1.0.5", default-features = false, optional = true }
socket2 = { version = "0.4.0", default-features = false }
stream-cancel = { version = "0.8.0", default-features = false }
Expand Down Expand Up @@ -286,7 +285,6 @@ reqwest = { version = "0.11.3", features = ["json"] }
tempfile = "3.2.0"
tokio = { version = "1.5.0", features = ["test-util"] }
tokio-test = "0.4.1"
tokio01-test = "0.1.1"
tower-test = "0.4.0"
walkdir = "2.3.2"
quickcheck = "1.0.3"
Expand Down
25 changes: 0 additions & 25 deletions benches/isolated_buffer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use futures::{
stream::{self, BoxStream},
Sink, SinkExt, Stream, StreamExt,
};
use futures01::Stream as Stream01;
use tempfile::tempdir;
use tokio_stream::wrappers::ReceiverStream;
use vector::{
Expand Down Expand Up @@ -44,30 +43,6 @@ fn benchmark_buffers(c: &mut Criterion) {
group.throughput(Throughput::Bytes((num_lines * line_size) as u64));
group.sampling_mode(SamplingMode::Flat);

group.bench_function("channels/futures01", |b| {
b.iter_batched(
|| {
let rt = runtime();

let (writer, reader) = futures01::sync::mpsc::channel(100);
let writer = writer.sink_compat().sink_map_err(|e| panic!("{}", e));

let read_loop = reader.for_each(move |_| Ok(()));

(rt, writer, read_loop)
},
|(rt, writer, read_loop)| {
let write_handle = rt.spawn(send_random(line_size, num_lines, writer));

let read_handle = rt.spawn(read_loop.compat());

rt.block_on(write_handle).unwrap();
rt.block_on(read_handle).unwrap().unwrap();
},
BatchSize::SmallInput,
);
});

group.bench_function("channels/futures", |b| {
b.iter_batched(
|| {
Expand Down
4 changes: 2 additions & 2 deletions lib/vector-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ serde = { version = "1.0.125", default-features = false, features = ["derive"] }
serde_json = { version = "1.0.64", default-features = false, features = ["alloc", "raw_value"] }
serde_yaml = { version = "0.8.17", default-features = false, optional = true }
shared = { path = "../shared" }
snafu = { version = "0.6.10", default-features = false, features = ["futures", "futures-01"] }
snafu = { version = "0.6.10", default-features = false, features = ["futures"] }
toml = { version = "0.5.8", default-features = false }
tracing = { version = "0.1.25", default-features = false }
tracing-core = { version = "0.1.17", default-features = false }
tracing-futures = { version = "0.2.5", default-features = false, features = ["futures-01", "futures-03"], optional = true }
tracing-futures = { version = "0.2.5", default-features = false, features = ["futures-03"], optional = true }
tracing-log = { version = "0.1.2", default-features = false }
tracing-subscriber = { version = "0.2.17", default-features = false }
tracing-tower = { git = "https://github.com/tokio-rs/tracing", default-features = false, rev = "f470db1b0354b368f62f9ee4d763595d16373231", optional = true }
Expand Down