From cfc71d30b82f076f9391903a71488deb18f132c6 Mon Sep 17 00:00:00 2001 From: "Brian L. Troutwine" Date: Wed, 12 Jan 2022 10:39:42 -0800 Subject: [PATCH 1/2] Try out tokio-rs/tokio #4383 Signed-off-by: Brian L. Troutwine --- Cargo.lock | 218 ++++++++++++++++++----------- Cargo.toml | 10 +- lib/k8s-e2e-tests/Cargo.toml | 2 +- lib/k8s-test-framework/Cargo.toml | 2 +- lib/vector-api-client/Cargo.toml | 4 +- lib/vector-core/Cargo.toml | 6 +- lib/vector-core/buffers/Cargo.toml | 6 +- 7 files changed, 150 insertions(+), 98 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 49fe62bdfdee8..0478a9a0ac169 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -220,7 +220,7 @@ dependencies = [ "futures-core", "memchr", "pin-project-lite", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "zstd", "zstd-safe", ] @@ -560,7 +560,7 @@ dependencies = [ "aws-types", "bytes 1.1.0", "http", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tower", "tracing 0.1.29", ] @@ -675,7 +675,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "907295d2d53d55ae31228647e3382be0f2f4706d6c43a7e8b23f5cfdbe224fb2" dependencies = [ "pin-project-lite", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -697,7 +697,7 @@ dependencies = [ "lazy_static", "pin-project 1.0.10", "pin-project-lite", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tower", "tracing 0.1.29", ] @@ -717,8 +717,8 @@ dependencies = [ "hyper", "percent-encoding", "pin-project 1.0.10", - "tokio", - "tokio-util", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.6.9", "tracing 0.1.29", ] @@ -1040,8 +1040,8 @@ dependencies = [ "serde_json", "serde_urlencoded 0.7.0", "thiserror", - "tokio", - "tokio-util", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.6.9", "url", "webpki-roots 0.21.1", "winapi 0.3.9", @@ -1126,10 +1126,10 @@ dependencies = [ "snafu", "temp-dir", "tempdir", - "tokio", - "tokio-stream", + "tokio 1.15.0 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", + "tokio-stream 0.1.8 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", "tokio-test", - "tokio-util", + "tokio-util 0.7.0", "tracing 0.1.29", "tracing-fluent-assertions", "tracing-subscriber", @@ -1424,8 +1424,8 @@ dependencies = [ "futures-core", "memchr", "pin-project-lite", - "tokio", - "tokio-util", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.6.9", ] [[package]] @@ -1474,8 +1474,8 @@ dependencies = [ "serde", "serde_json", "thread_local", - "tokio", - "tokio-stream", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-stream 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "tonic", "tracing 0.1.29", "tracing-core 0.1.21", @@ -1582,7 +1582,7 @@ dependencies = [ "serde_derive", "serde_json", "tinytemplate", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir", ] @@ -1912,7 +1912,7 @@ dependencies = [ "crossbeam-queue", "num_cpus", "serde", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2385,7 +2385,7 @@ dependencies = [ "serde", "serde_json", "tempfile", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tracing 0.1.29", "winapi 0.3.9", ] @@ -2743,7 +2743,7 @@ dependencies = [ "simpl", "smpl_jwt", "time 0.2.27", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2858,8 +2858,8 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", - "tokio-util", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.6.9", "tracing 0.1.29", ] @@ -3183,7 +3183,7 @@ dependencies = [ "itoa 0.4.8", "pin-project-lite", "socket2 0.4.2", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tower-service", "tracing 0.1.29", "want", @@ -3202,7 +3202,7 @@ dependencies = [ "openssl", "openssl-sys", "parking_lot", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-openssl", "tower-layer", ] @@ -3219,7 +3219,7 @@ dependencies = [ "http", "hyper", "openssl", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-openssl", "tower-service", ] @@ -3236,7 +3236,7 @@ dependencies = [ "log", "rustls 0.19.1", "rustls-native-certs", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-rustls 0.22.0", "webpki 0.21.4", ] @@ -3250,7 +3250,7 @@ dependencies = [ "http", "hyper", "rustls 0.20.2", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-rustls 0.23.1", ] @@ -3262,7 +3262,7 @@ checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ "hyper", "pin-project-lite", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io-timeout", ] @@ -3275,7 +3275,7 @@ dependencies = [ "bytes 1.1.0", "hyper", "native-tls", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-native-tls", ] @@ -3289,7 +3289,7 @@ dependencies = [ "hex", "hyper", "pin-project 1.0.10", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3521,7 +3521,7 @@ dependencies = [ "regex", "reqwest", "serde_json", - "tokio", + "tokio 1.15.0 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", "tracing 0.1.29", ] @@ -3551,7 +3551,7 @@ dependencies = [ "once_cell", "serde_json", "tempfile", - "tokio", + "tokio 1.15.0 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", ] [[package]] @@ -3969,7 +3969,7 @@ dependencies = [ "parking_lot", "quanta", "thiserror", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4180,9 +4180,9 @@ dependencies = [ "strsim 0.10.0", "take_mut", "thiserror", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-rustls 0.22.0", - "tokio-util", + "tokio-util 0.6.9", "trust-dns-proto", "trust-dns-resolver", "typed-builder 0.9.1", @@ -5070,7 +5070,7 @@ checksum = "1de0ea6504e07ca78355a6fb88ad0f36cafe9e696cbc6717f16a207f3a60be72" dependencies = [ "futures 0.3.19", "openssl", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-openssl", "tokio-postgres", ] @@ -5431,9 +5431,9 @@ dependencies = [ "prost-derive 0.8.0", "rand 0.8.4", "regex", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-native-tls", - "tokio-util", + "tokio-util 0.6.9", "url", ] @@ -5686,7 +5686,7 @@ dependencies = [ "serde_derive", "serde_json", "slab", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5731,9 +5731,9 @@ dependencies = [ "native-tls", "percent-encoding", "pin-project-lite", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-native-tls", - "tokio-util", + "tokio-util 0.6.9", "url", ] @@ -5847,10 +5847,10 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.7.0", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-native-tls", "tokio-rustls 0.23.1", - "tokio-util", + "tokio-util 0.6.9", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -6010,7 +6010,7 @@ dependencies = [ "rustc_version 0.4.0", "serde", "serde_json", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "xml-rs", ] @@ -6028,7 +6028,7 @@ dependencies = [ "serde", "serde_json", "shlex 1.1.0", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "zeroize", ] @@ -6125,7 +6125,7 @@ dependencies = [ "rustc_version 0.4.0", "serde", "sha2 0.9.8", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6941,7 +6941,7 @@ dependencies = [ "serde_json", "serde_yaml", "snafu", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tracing 0.1.29", "tracing-subscriber", "uuid", @@ -7058,7 +7058,7 @@ checksum = "7b0a9eb2715209fb8cc0d942fcdff45674bfc9f0090a0d897e85a22955ad159b" dependencies = [ "futures-core", "pin-project 1.0.10", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7489,7 +7489,26 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "tokio-macros", + "tokio-macros 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing 0.1.29", + "winapi 0.3.9", +] + +[[package]] +name = "tokio" +version = "1.15.0" +source = "git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5#49192be3de9fbac56b3db026a438640f0b27f0e5" +dependencies = [ + "bytes 1.1.0", + "libc", + "memchr", + "mio 0.7.14", + "num_cpus", + "once_cell", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "tokio-macros 1.7.0 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", "tracing 0.1.29", "winapi 0.3.9", ] @@ -7512,7 +7531,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90c49f106be240de154571dd31fbe48acb10ba6c6dd6f6517ad603abffa42de9" dependencies = [ "pin-project-lite", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7526,6 +7545,16 @@ dependencies = [ "syn 1.0.84", ] +[[package]] +name = "tokio-macros" +version = "1.7.0" +source = "git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5#49192be3de9fbac56b3db026a438640f0b27f0e5" +dependencies = [ + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.84", +] + [[package]] name = "tokio-native-tls" version = "0.3.0" @@ -7533,7 +7562,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" dependencies = [ "native-tls", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7545,7 +7574,7 @@ dependencies = [ "futures-util", "openssl", "openssl-sys", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7567,8 +7596,8 @@ dependencies = [ "postgres-protocol", "postgres-types", "socket2 0.4.2", - "tokio", - "tokio-util", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.6.9", ] [[package]] @@ -7578,7 +7607,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ "rustls 0.19.1", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "webpki 0.21.4", ] @@ -7589,7 +7618,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4baa378e417d780beff82bf54ceb0d195193ea6a00c14e22359e7f39456b5689" dependencies = [ "rustls 0.20.2", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "webpki 0.22.0", ] @@ -7601,8 +7630,18 @@ checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" dependencies = [ "futures-core", "pin-project-lite", - "tokio", - "tokio-util", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "tokio-stream" +version = "0.1.8" +source = "git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5#49192be3de9fbac56b3db026a438640f0b27f0e5" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio 1.15.0 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", + "tokio-util 0.7.0", ] [[package]] @@ -7614,8 +7653,8 @@ dependencies = [ "async-stream", "bytes 1.1.0", "futures-core", - "tokio", - "tokio-stream", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-stream 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7628,7 +7667,7 @@ dependencies = [ "log", "native-tls", "pin-project 1.0.10", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-native-tls", "tungstenite 0.12.0", ] @@ -7642,7 +7681,7 @@ dependencies = [ "futures-util", "log", "pin-project 1.0.10", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tungstenite 0.14.0", ] @@ -7651,6 +7690,19 @@ name = "tokio-util" version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" +dependencies = [ + "bytes 1.1.0", + "futures-core", + "futures-sink", + "log", + "pin-project-lite", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "tokio-util" +version = "0.7.0" +source = "git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5#49192be3de9fbac56b3db026a438640f0b27f0e5" dependencies = [ "bytes 1.1.0", "futures-core", @@ -7658,7 +7710,7 @@ dependencies = [ "log", "pin-project-lite", "slab", - "tokio", + "tokio 1.15.0 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", ] [[package]] @@ -7691,10 +7743,10 @@ dependencies = [ "pin-project 1.0.10", "prost 0.9.0", "prost-derive 0.9.0", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-rustls 0.22.0", - "tokio-stream", - "tokio-util", + "tokio-stream 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.6.9", "tower", "tower-layer", "tower-service", @@ -7727,9 +7779,9 @@ dependencies = [ "pin-project-lite", "rand 0.8.4", "slab", - "tokio", - "tokio-stream", - "tokio-util", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-stream 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.6.9", "tower-layer", "tower-service", "tracing 0.1.29", @@ -7755,7 +7807,7 @@ checksum = "a4546773ffeab9e4ea02b8872faa49bb616a80a7da66afc2f32688943f97efa7" dependencies = [ "futures-util", "pin-project 1.0.10", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-test", "tower-layer", "tower-service", @@ -7940,7 +7992,7 @@ dependencies = [ "smallvec", "thiserror", "tinyvec", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "url", ] @@ -7960,7 +8012,7 @@ dependencies = [ "resolv-conf", "smallvec", "thiserror", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "trust-dns-proto", ] @@ -8419,12 +8471,12 @@ dependencies = [ "syslog_loose", "tempfile", "tikv-jemallocator", - "tokio", + "tokio 1.15.0 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", "tokio-openssl", "tokio-postgres", - "tokio-stream", + "tokio-stream 0.1.8 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", "tokio-test", - "tokio-util", + "tokio-util 0.7.0", "toml", "tonic", "tonic-build", @@ -8472,8 +8524,8 @@ dependencies = [ "reqwest", "serde", "serde_json", - "tokio", - "tokio-stream", + "tokio 1.15.0 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", + "tokio-stream 0.1.8 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", "tokio-tungstenite 0.13.0", "url", "uuid", @@ -8551,10 +8603,10 @@ dependencies = [ "shared", "snafu", "substring", - "tokio", - "tokio-stream", + "tokio 1.15.0 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", + "tokio-stream 0.1.8 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", "tokio-test", - "tokio-util", + "tokio-util 0.7.0", "toml", "tower", "tracing 0.1.29", @@ -8803,10 +8855,10 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.7.0", - "tokio", - "tokio-stream", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-stream 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-tungstenite 0.15.0", - "tokio-util", + "tokio-util 0.6.9", "tower-service", "tracing 0.1.29", ] @@ -9138,7 +9190,7 @@ dependencies = [ "regex", "serde", "serde_json", - "tokio", + "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 2da881467fe67..1910c86cc10ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -117,10 +117,10 @@ vector-vrl-functions = { path = "lib/vector-vrl-functions" } async-stream = "0.3.2" async-trait = "0.1.52" futures = { version = "0.3.19", default-features = false, features = ["compat", "io-compat"], package = "futures" } -tokio = { version = "1.15.0", default-features = false, features = ["full"] } -tokio-openssl = { version = "0.6.3", default-features = false } -tokio-stream = { version = "0.1.8", default-features = false, features = ["net", "sync", "time"] } -tokio-util = { version = "0.6", default-features = false, features = ["time"] } +tokio = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", default-features = true, features = ["full"] } +tokio-openssl = { version = "0.6.3", default-features = true } +tokio-stream = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", default-features = true, features = ["net", "sync", "time"] } +tokio-util = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", default-features = true, features = ["time", "codec"] } console-subscriber = { version = "0.1.0", optional = true } # Tracing @@ -328,7 +328,7 @@ pretty_assertions = "1.0.0" reqwest = { version = "0.11.9", features = ["json"] } proptest = "1.0" tempfile = "3.2.0" -tokio = { version = "1.15.0", features = ["test-util"] } +tokio = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", features = ["test-util"] } tokio-test = "0.4.2" tower-test = "0.4.0" vector_core = { path = "lib/vector-core", default-features = false, features = ["vrl", "test"] } diff --git a/lib/k8s-e2e-tests/Cargo.toml b/lib/k8s-e2e-tests/Cargo.toml index a38abe78580bf..38e18fa73f993 100644 --- a/lib/k8s-e2e-tests/Cargo.toml +++ b/lib/k8s-e2e-tests/Cargo.toml @@ -14,7 +14,7 @@ k8s-test-framework = { version = "0.1", path = "../k8s-test-framework" } regex = "1" reqwest = { version = "0.11.9", features = ["json"] } serde_json = "1" -tokio = { version = "1.15.0", features = ["full"] } +tokio = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", features = ["full"] } indoc = "1.0.3" env_logger = "0.9" tracing = { version = "0.1", features = ["log"] } diff --git a/lib/k8s-test-framework/Cargo.toml b/lib/k8s-test-framework/Cargo.toml index 0a2807b10fbc5..e8541c38660ea 100644 --- a/lib/k8s-test-framework/Cargo.toml +++ b/lib/k8s-test-framework/Cargo.toml @@ -12,5 +12,5 @@ k8s-openapi = { version = "0.13.1", default-features = false, features = ["v1_16 once_cell = "1" serde_json = "1" tempfile = "3" -tokio = { version = "1.15.0", features = ["full"] } +tokio = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", features = ["full"] } log = "0.4" diff --git a/lib/vector-api-client/Cargo.toml b/lib/vector-api-client/Cargo.toml index 86154f1ce2dc6..c1bf17b8102e0 100644 --- a/lib/vector-api-client/Cargo.toml +++ b/lib/vector-api-client/Cargo.toml @@ -19,8 +19,8 @@ anyhow = "1.0.52" async-stream = "0.3.2" async-trait = "0.1" futures = { version = "0.3", default-features = false, features = ["compat", "io-compat"] } -tokio = { version = "1.15.0", features = ["full"] } -tokio-stream = { version = "0.1.8", features = ["sync"] } +tokio = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", features = ["full"] } +tokio-stream = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", features = ["sync"] } # GraphQL graphql_client = "0.10.0" diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml index c15d6352f5a51..7a92bc94a3059 100644 --- a/lib/vector-core/Cargo.toml +++ b/lib/vector-core/Cargo.toml @@ -44,9 +44,9 @@ serde_json = { version = "1.0.74", default-features = false } shared = { path = "../shared" } snafu = { version = "0.7.0", default-features = false } substring = { version = "1.4", default-features = false } -tokio = { version = "1.15.0", default-features = false } -tokio-stream = { version = "0.1", default-features = false, optional = true } -tokio-util = { version = "0.6", default-features = false, features = ["time"] } +tokio = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", default-features = false } +tokio-stream = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", default-features = false, optional = true } +tokio-util = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", default-features = false, features = ["time"] } toml = { version = "0.5.8", default-features = false } tower = { version = "0.4", default-features = false, features = ["util"] } tracing = { version = "0.1.29", default-features = false } diff --git a/lib/vector-core/buffers/Cargo.toml b/lib/vector-core/buffers/Cargo.toml index 3a3a9d80ec5e5..08adcf9c555b1 100644 --- a/lib/vector-core/buffers/Cargo.toml +++ b/lib/vector-core/buffers/Cargo.toml @@ -24,9 +24,9 @@ pin-project = { version = "1.0.10", default-features = false } rkyv = { version = "0.7.29", default-features = false, features = ["size_32", "std", "strict", "validation"] } serde = { version = "1.0.133", default-features = false, features = ["derive"] } snafu = { version = "0.7.0", default-features = false, features = ["std"] } -tokio = { version = "1.15.0", default-features = false, features = ["rt", "macros", "rt-multi-thread", "sync", "fs", "io-util", "time"] } -tokio-stream = { version = "0.1", default-features = false, features = ["sync"] } -tokio-util = { version = "0.6", default-features = false } +tokio = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", features = ["rt", "macros", "rt-multi-thread", "sync", "fs", "io-util", "time"] } +tokio-stream = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", default-features = false, features = ["sync"] } +tokio-util = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5", default-features = false } tracing = { version = "0.1.29", default-features = false } [dev-dependencies] From 0d1eb7bea99ceb1bef8ba99a5e7d928808400d90 Mon Sep 17 00:00:00 2001 From: "Brian L. Troutwine" Date: Wed, 12 Jan 2022 10:53:54 -0800 Subject: [PATCH 2/2] patch tokio version Signed-off-by: Brian L. Troutwine --- Cargo.lock | 151 +++++++++++++++++++++-------------------------------- Cargo.toml | 1 + 2 files changed, 61 insertions(+), 91 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0478a9a0ac169..4ab375c3e4eb3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -220,7 +220,7 @@ dependencies = [ "futures-core", "memchr", "pin-project-lite", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "zstd", "zstd-safe", ] @@ -560,7 +560,7 @@ dependencies = [ "aws-types", "bytes 1.1.0", "http", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tower", "tracing 0.1.29", ] @@ -675,7 +675,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "907295d2d53d55ae31228647e3382be0f2f4706d6c43a7e8b23f5cfdbe224fb2" dependencies = [ "pin-project-lite", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", ] [[package]] @@ -697,7 +697,7 @@ dependencies = [ "lazy_static", "pin-project 1.0.10", "pin-project-lite", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tower", "tracing 0.1.29", ] @@ -717,7 +717,7 @@ dependencies = [ "hyper", "percent-encoding", "pin-project 1.0.10", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-util 0.6.9", "tracing 0.1.29", ] @@ -1040,7 +1040,7 @@ dependencies = [ "serde_json", "serde_urlencoded 0.7.0", "thiserror", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-util 0.6.9", "url", "webpki-roots 0.21.1", @@ -1126,7 +1126,7 @@ dependencies = [ "snafu", "temp-dir", "tempdir", - "tokio 1.15.0 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", + "tokio", "tokio-stream 0.1.8 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", "tokio-test", "tokio-util 0.7.0", @@ -1424,7 +1424,7 @@ dependencies = [ "futures-core", "memchr", "pin-project-lite", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-util 0.6.9", ] @@ -1474,7 +1474,7 @@ dependencies = [ "serde", "serde_json", "thread_local", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-stream 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "tonic", "tracing 0.1.29", @@ -1582,7 +1582,7 @@ dependencies = [ "serde_derive", "serde_json", "tinytemplate", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "walkdir", ] @@ -1912,7 +1912,7 @@ dependencies = [ "crossbeam-queue", "num_cpus", "serde", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", ] [[package]] @@ -2385,7 +2385,7 @@ dependencies = [ "serde", "serde_json", "tempfile", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tracing 0.1.29", "winapi 0.3.9", ] @@ -2743,7 +2743,7 @@ dependencies = [ "simpl", "smpl_jwt", "time 0.2.27", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", ] [[package]] @@ -2858,7 +2858,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-util 0.6.9", "tracing 0.1.29", ] @@ -3183,7 +3183,7 @@ dependencies = [ "itoa 0.4.8", "pin-project-lite", "socket2 0.4.2", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tower-service", "tracing 0.1.29", "want", @@ -3202,7 +3202,7 @@ dependencies = [ "openssl", "openssl-sys", "parking_lot", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-openssl", "tower-layer", ] @@ -3219,7 +3219,7 @@ dependencies = [ "http", "hyper", "openssl", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-openssl", "tower-service", ] @@ -3236,7 +3236,7 @@ dependencies = [ "log", "rustls 0.19.1", "rustls-native-certs", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-rustls 0.22.0", "webpki 0.21.4", ] @@ -3250,7 +3250,7 @@ dependencies = [ "http", "hyper", "rustls 0.20.2", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-rustls 0.23.1", ] @@ -3262,7 +3262,7 @@ checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ "hyper", "pin-project-lite", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-io-timeout", ] @@ -3275,7 +3275,7 @@ dependencies = [ "bytes 1.1.0", "hyper", "native-tls", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-native-tls", ] @@ -3289,7 +3289,7 @@ dependencies = [ "hex", "hyper", "pin-project 1.0.10", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", ] [[package]] @@ -3521,7 +3521,7 @@ dependencies = [ "regex", "reqwest", "serde_json", - "tokio 1.15.0 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", + "tokio", "tracing 0.1.29", ] @@ -3551,7 +3551,7 @@ dependencies = [ "once_cell", "serde_json", "tempfile", - "tokio 1.15.0 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", + "tokio", ] [[package]] @@ -3969,7 +3969,7 @@ dependencies = [ "parking_lot", "quanta", "thiserror", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", ] [[package]] @@ -4180,7 +4180,7 @@ dependencies = [ "strsim 0.10.0", "take_mut", "thiserror", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-rustls 0.22.0", "tokio-util 0.6.9", "trust-dns-proto", @@ -5070,7 +5070,7 @@ checksum = "1de0ea6504e07ca78355a6fb88ad0f36cafe9e696cbc6717f16a207f3a60be72" dependencies = [ "futures 0.3.19", "openssl", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-openssl", "tokio-postgres", ] @@ -5431,7 +5431,7 @@ dependencies = [ "prost-derive 0.8.0", "rand 0.8.4", "regex", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-native-tls", "tokio-util 0.6.9", "url", @@ -5686,7 +5686,7 @@ dependencies = [ "serde_derive", "serde_json", "slab", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", ] [[package]] @@ -5731,7 +5731,7 @@ dependencies = [ "native-tls", "percent-encoding", "pin-project-lite", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-native-tls", "tokio-util 0.6.9", "url", @@ -5847,7 +5847,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.7.0", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-native-tls", "tokio-rustls 0.23.1", "tokio-util 0.6.9", @@ -6010,7 +6010,7 @@ dependencies = [ "rustc_version 0.4.0", "serde", "serde_json", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "xml-rs", ] @@ -6028,7 +6028,7 @@ dependencies = [ "serde", "serde_json", "shlex 1.1.0", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "zeroize", ] @@ -6125,7 +6125,7 @@ dependencies = [ "rustc_version 0.4.0", "serde", "sha2 0.9.8", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", ] [[package]] @@ -6941,7 +6941,7 @@ dependencies = [ "serde_json", "serde_yaml", "snafu", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tracing 0.1.29", "tracing-subscriber", "uuid", @@ -7058,7 +7058,7 @@ checksum = "7b0a9eb2715209fb8cc0d942fcdff45674bfc9f0090a0d897e85a22955ad159b" dependencies = [ "futures-core", "pin-project 1.0.10", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", ] [[package]] @@ -7474,26 +7474,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" -[[package]] -name = "tokio" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838" -dependencies = [ - "bytes 1.1.0", - "libc", - "memchr", - "mio 0.7.14", - "num_cpus", - "once_cell", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "tokio-macros 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing 0.1.29", - "winapi 0.3.9", -] - [[package]] name = "tokio" version = "1.15.0" @@ -7508,7 +7488,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "tokio-macros 1.7.0 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", + "tokio-macros", "tracing 0.1.29", "winapi 0.3.9", ] @@ -7531,18 +7511,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90c49f106be240de154571dd31fbe48acb10ba6c6dd6f6517ad603abffa42de9" dependencies = [ "pin-project-lite", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "tokio-macros" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" -dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.84", + "tokio", ] [[package]] @@ -7562,7 +7531,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" dependencies = [ "native-tls", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", ] [[package]] @@ -7574,7 +7543,7 @@ dependencies = [ "futures-util", "openssl", "openssl-sys", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", ] [[package]] @@ -7596,7 +7565,7 @@ dependencies = [ "postgres-protocol", "postgres-types", "socket2 0.4.2", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-util 0.6.9", ] @@ -7607,7 +7576,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ "rustls 0.19.1", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "webpki 0.21.4", ] @@ -7618,7 +7587,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4baa378e417d780beff82bf54ceb0d195193ea6a00c14e22359e7f39456b5689" dependencies = [ "rustls 0.20.2", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "webpki 0.22.0", ] @@ -7630,7 +7599,7 @@ checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" dependencies = [ "futures-core", "pin-project-lite", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", ] [[package]] @@ -7640,7 +7609,7 @@ source = "git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026 dependencies = [ "futures-core", "pin-project-lite", - "tokio 1.15.0 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", + "tokio", "tokio-util 0.7.0", ] @@ -7653,7 +7622,7 @@ dependencies = [ "async-stream", "bytes 1.1.0", "futures-core", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-stream 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -7667,7 +7636,7 @@ dependencies = [ "log", "native-tls", "pin-project 1.0.10", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-native-tls", "tungstenite 0.12.0", ] @@ -7681,7 +7650,7 @@ dependencies = [ "futures-util", "log", "pin-project 1.0.10", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tungstenite 0.14.0", ] @@ -7696,7 +7665,7 @@ dependencies = [ "futures-sink", "log", "pin-project-lite", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", ] [[package]] @@ -7710,7 +7679,7 @@ dependencies = [ "log", "pin-project-lite", "slab", - "tokio 1.15.0 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", + "tokio", ] [[package]] @@ -7743,7 +7712,7 @@ dependencies = [ "pin-project 1.0.10", "prost 0.9.0", "prost-derive 0.9.0", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-rustls 0.22.0", "tokio-stream 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-util 0.6.9", @@ -7779,7 +7748,7 @@ dependencies = [ "pin-project-lite", "rand 0.8.4", "slab", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-stream 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-util 0.6.9", "tower-layer", @@ -7807,7 +7776,7 @@ checksum = "a4546773ffeab9e4ea02b8872faa49bb616a80a7da66afc2f32688943f97efa7" dependencies = [ "futures-util", "pin-project 1.0.10", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-test", "tower-layer", "tower-service", @@ -7992,7 +7961,7 @@ dependencies = [ "smallvec", "thiserror", "tinyvec", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "url", ] @@ -8012,7 +7981,7 @@ dependencies = [ "resolv-conf", "smallvec", "thiserror", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "trust-dns-proto", ] @@ -8471,7 +8440,7 @@ dependencies = [ "syslog_loose", "tempfile", "tikv-jemallocator", - "tokio 1.15.0 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", + "tokio", "tokio-openssl", "tokio-postgres", "tokio-stream 0.1.8 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", @@ -8524,7 +8493,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "tokio 1.15.0 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", + "tokio", "tokio-stream 0.1.8 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", "tokio-tungstenite 0.13.0", "url", @@ -8603,7 +8572,7 @@ dependencies = [ "shared", "snafu", "substring", - "tokio 1.15.0 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", + "tokio", "tokio-stream 0.1.8 (git+https://github.com/tokio-rs/tokio.git?rev=49192be3de9fbac56b3db026a438640f0b27f0e5)", "tokio-test", "tokio-util 0.7.0", @@ -8855,7 +8824,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.7.0", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", "tokio-stream 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-tungstenite 0.15.0", "tokio-util 0.6.9", @@ -9190,7 +9159,7 @@ dependencies = [ "regex", "serde", "serde_json", - "tokio 1.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 1910c86cc10ef..aca8c0db82f19 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -346,6 +346,7 @@ leveldb-sys = { git = "https://github.com/vectordotdev/leveldb-sys.git", branch # Removes dependency on `time` v0.1 # https://github.com/chronotope/chrono/pull/578 chrono = { git = "https://github.com/vectordotdev/chrono.git", branch = "no-default-time" } +tokio = { git = "https://github.com/tokio-rs/tokio.git", rev = "49192be3de9fbac56b3db026a438640f0b27f0e5" } [features] # Default features for *-unknown-linux-gnu and *-apple-darwin