diff --git a/Cargo.lock b/Cargo.lock index 1dc4b80dc133c..ffb8a36bbc7d7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1344,7 +1344,7 @@ dependencies = [ "serde_urlencoded", "thiserror", "tokio", - "tokio-util 0.7.1", + "tokio-util", "url", "webpki 0.22.0", "webpki-roots", @@ -1724,7 +1724,7 @@ dependencies = [ "snafu", "syslog_loose", "tokio", - "tokio-util 0.7.1", + "tokio-util", "tracing 0.1.34", "value", "vector-common", @@ -1778,7 +1778,7 @@ dependencies = [ "memchr", "pin-project-lite", "tokio", - "tokio-util 0.7.1", + "tokio-util", ] [[package]] @@ -3170,7 +3170,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.7.1", + "tokio-util", "tracing 0.1.34", ] @@ -4029,7 +4029,7 @@ dependencies = [ "thiserror", "tokio", "tokio-native-tls", - "tokio-util 0.7.1", + "tokio-util", "tower", "tower-http", "tracing 0.1.34", @@ -4072,7 +4072,7 @@ dependencies = [ "smallvec", "thiserror", "tokio", - "tokio-util 0.7.1", + "tokio-util", "tracing 0.1.34", ] @@ -4590,7 +4590,7 @@ dependencies = [ "serde", "serde_bytes", "serde_with 1.14.0", - "sha-1 0.10.0", + "sha-1", "sha2 0.10.6", "socket2", "stringprep", @@ -4599,7 +4599,7 @@ dependencies = [ "thiserror", "tokio", "tokio-rustls 0.23.3", - "tokio-util 0.7.1", + "tokio-util", "trust-dns-proto 0.21.2", "trust-dns-resolver", "typed-builder 0.10.0", @@ -6028,7 +6028,7 @@ dependencies = [ "serde_json", "tokio", "tokio-native-tls", - "tokio-util 0.7.1", + "tokio-util", "url", "uuid 1.1.2", ] @@ -6292,7 +6292,7 @@ dependencies = [ "ryu", "tokio", "tokio-native-tls", - "tokio-util 0.7.1", + "tokio-util", "url", ] @@ -6410,7 +6410,7 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-rustls 0.23.3", - "tokio-util 0.7.1", + "tokio-util", "tower-service", "url", "wasm-bindgen", @@ -7109,19 +7109,6 @@ dependencies = [ "unsafe-libyaml", ] -[[package]] -name = "sha-1" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "sha-1" version = "0.10.0" @@ -7849,7 +7836,7 @@ dependencies = [ "postgres-types", "socket2", "tokio", - "tokio-util 0.7.1", + "tokio-util", ] [[package]] @@ -7883,7 +7870,7 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util 0.7.1", + "tokio-util", ] [[package]] @@ -7899,19 +7886,6 @@ dependencies = [ "tokio-stream", ] -[[package]] -name = "tokio-tungstenite" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511de3f85caf1c98983545490c3d09685fa8eb634e57eec22bb4db271f46cbd8" -dependencies = [ - "futures-util", - "log", - "pin-project", - "tokio", - "tungstenite 0.14.0", -] - [[package]] name = "tokio-tungstenite" version = "0.17.2" @@ -7922,21 +7896,7 @@ dependencies = [ "log", "rustls 0.20.4", "tokio", - "tungstenite 0.17.3", -] - -[[package]] -name = "tokio-util" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" -dependencies = [ - "bytes 1.2.1", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "tokio", + "tungstenite", ] [[package]] @@ -7990,7 +7950,7 @@ dependencies = [ "tokio", "tokio-rustls 0.23.3", "tokio-stream", - "tokio-util 0.7.1", + "tokio-util", "tower", "tower-layer", "tower-service", @@ -8025,7 +7985,7 @@ dependencies = [ "rand 0.8.5", "slab", "tokio", - "tokio-util 0.7.1", + "tokio-util", "tower-layer", "tower-service", "tracing 0.1.34", @@ -8393,25 +8353,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "tungstenite" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0b2d8558abd2e276b0a8df5c05a2ec762609344191e5fd23e292c910e9165b5" -dependencies = [ - "base64", - "byteorder", - "bytes 1.2.1", - "http", - "httparse", - "log", - "rand 0.8.5", - "sha-1 0.9.8", - "thiserror", - "url", - "utf-8", -] - [[package]] name = "tungstenite" version = "0.17.3" @@ -8425,7 +8366,7 @@ dependencies = [ "httparse", "log", "rand 0.8.5", - "sha-1 0.10.0", + "sha-1", "thiserror", "url", "utf-8", @@ -8853,8 +8794,8 @@ dependencies = [ "tokio-postgres", "tokio-stream", "tokio-test", - "tokio-tungstenite 0.17.2", - "tokio-util 0.7.1", + "tokio-tungstenite", + "tokio-util", "toml", "tonic", "tonic-build", @@ -8904,7 +8845,7 @@ dependencies = [ "serde_json", "tokio", "tokio-stream", - "tokio-tungstenite 0.17.2", + "tokio-tungstenite", "url", "uuid 1.1.2", ] @@ -8946,7 +8887,7 @@ dependencies = [ "temp-dir", "tokio", "tokio-test", - "tokio-util 0.7.1", + "tokio-util", "tracing 0.1.34", "tracing-fluent-assertions", "tracing-subscriber 0.3.15", @@ -9090,7 +9031,7 @@ dependencies = [ "tokio-openssl", "tokio-stream", "tokio-test", - "tokio-util 0.7.1", + "tokio-util", "toml", "tonic", "tower", @@ -9266,7 +9207,7 @@ dependencies = [ "rust_decimal", "serde", "serde_json", - "sha-1 0.10.0", + "sha-1", "sha2 0.10.6", "sha3", "strip-ansi-escapes", @@ -9367,9 +9308,9 @@ dependencies = [ [[package]] name = "warp" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cef4e1e9114a4b7f1ac799f16ce71c14de5778500c5450ec6b7b920c55b587e" +checksum = "ed7b8be92646fc3d18b06147664ebc5f48d222686cb11a8755e561a735aacc6d" dependencies = [ "bytes 1.2.1", "futures-channel", @@ -9382,14 +9323,15 @@ dependencies = [ "mime_guess", "percent-encoding", "pin-project", + "rustls-pemfile 0.2.1", "scoped-tls", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-stream", - "tokio-tungstenite 0.15.0", - "tokio-util 0.6.9", + "tokio-tungstenite", + "tokio-util", "tower-service", "tracing 0.1.34", ] diff --git a/Cargo.toml b/Cargo.toml index 191c0e232edc7..573b5763efa7a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -306,7 +306,7 @@ trust-dns-proto = { version = "0.22.0", default-features = false, features = ["d typetag = { version = "0.2.3", default-features = false } url = { version = "2.3.1", default-features = false, features = ["serde"] } uuid = { version = "1", default-features = false, features = ["serde", "v4"] } -warp = { version = "0.3.1", default-features = false } +warp = { version = "0.3.3", default-features = false } # depending on fork for bumped nix dependency # https://github.com/heim-rs/heim/pull/360