From d851a0b42725b1018593dded1f0c6b6ba9a77d59 Mon Sep 17 00:00:00 2001 From: Dmitry Patsura Date: Fri, 20 Jan 2023 21:37:57 +0300 Subject: [PATCH] feat(cubestore): Upgrade warp to 0.3.3 (use crates.io) --- rust/cubestore/Cargo.lock | 122 ++++++++++++++++++++++------ rust/cubestore/cubestore/Cargo.toml | 2 +- 2 files changed, 98 insertions(+), 26 deletions(-) diff --git a/rust/cubestore/Cargo.lock b/rust/cubestore/Cargo.lock index 23d05929a014e..764a16d4eb85a 100644 --- a/rust/cubestore/Cargo.lock +++ b/rust/cubestore/Cargo.lock @@ -567,6 +567,15 @@ dependencies = [ "generic-array 0.14.4", ] +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "block-padding" version = "0.1.5" @@ -916,6 +925,15 @@ dependencies = [ "libc", ] +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + [[package]] name = "crc32fast" version = "1.2.1" @@ -1085,6 +1103,15 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "crypto-common" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4600d695eb3f6ce1cd44e6e291adceb2cc3ab12f20a33777ecd0bf6eba34e06" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "crypto-mac" version = "0.9.1" @@ -1368,6 +1395,16 @@ dependencies = [ "generic-array 0.14.4", ] +[[package]] +name = "digest" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cb780dce4f9a8f5c087362b3a4595936b2019e7c8b30f2c3e9a7e94e6ae9837" +dependencies = [ + "block-buffer 0.10.3", + "crypto-common", +] + [[package]] name = "dirs" version = "1.0.5" @@ -1932,7 +1969,7 @@ dependencies = [ "headers-core", "http", "mime", - "sha-1", + "sha-1 0.9.7", "time 0.1.43", ] @@ -3951,7 +3988,7 @@ dependencies = [ "percent-encoding", "pin-project-lite 0.2.7", "rustls", - "rustls-pemfile", + "rustls-pemfile 0.3.0", "serde", "serde_json", "serde_urlencoded", @@ -4088,6 +4125,15 @@ dependencies = [ "webpki", ] +[[package]] +name = "rustls-pemfile" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +dependencies = [ + "base64 0.13.0", +] + [[package]] name = "rustls-pemfile" version = "0.3.0" @@ -4297,11 +4343,22 @@ checksum = "1a0c8611594e2ab4ebbf06ec7cbbf0a99450b8570e96cbf5188b5d5f6ef18d81" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures", + "cpufeatures 0.1.5", "digest 0.9.0", "opaque-debug 0.3.0", ] +[[package]] +name = "sha-1" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures 0.2.5", + "digest 0.10.2", +] + [[package]] name = "sha1" version = "0.6.0" @@ -4328,7 +4385,7 @@ checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures", + "cpufeatures 0.1.5", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -4957,29 +5014,28 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511de3f85caf1c98983545490c3d09685fa8eb634e57eec22bb4db271f46cbd8" +checksum = "e057364a4dd37870b33bf8dc1885d29187d90770f488d599d3ee8d9e4916fbd3" dependencies = [ "futures-util", "log", - "pin-project", + "native-tls", "tokio 1.18.1", - "tungstenite 0.14.0", + "tokio-native-tls", + "tungstenite 0.16.0", ] [[package]] name = "tokio-tungstenite" -version = "0.16.0" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e057364a4dd37870b33bf8dc1885d29187d90770f488d599d3ee8d9e4916fbd3" +checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" dependencies = [ "futures-util", "log", - "native-tls", "tokio 1.18.1", - "tokio-native-tls", - "tungstenite 0.16.0", + "tungstenite 0.17.3", ] [[package]] @@ -5044,6 +5100,19 @@ dependencies = [ "tokio 1.18.1", ] +[[package]] +name = "tokio-util" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c" +dependencies = [ + "bytes 1.0.1", + "futures-core", + "futures-sink", + "pin-project-lite 0.2.7", + "tokio 1.18.1", +] + [[package]] name = "toml" version = "0.5.8" @@ -5194,9 +5263,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "tungstenite" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0b2d8558abd2e276b0a8df5c05a2ec762609344191e5fd23e292c910e9165b5" +checksum = "6ad3713a14ae247f22a728a0456a545df14acf3867f905adff84be99e23b3ad1" dependencies = [ "base64 0.13.0", "byteorder", @@ -5204,8 +5273,9 @@ dependencies = [ "http", "httparse", "log", + "native-tls", "rand 0.8.4", - "sha-1", + "sha-1 0.9.7", "thiserror", "url", "utf-8", @@ -5213,9 +5283,9 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.16.0" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ad3713a14ae247f22a728a0456a545df14acf3867f905adff84be99e23b3ad1" +checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" dependencies = [ "base64 0.13.0", "byteorder", @@ -5223,9 +5293,8 @@ dependencies = [ "http", "httparse", "log", - "native-tls", "rand 0.8.4", - "sha-1", + "sha-1 0.10.0", "thiserror", "url", "utf-8", @@ -5389,11 +5458,13 @@ dependencies = [ [[package]] name = "warp" -version = "0.3.1" -source = "git+https://github.com/seanmonstar/warp#ffe49abb5626934fbcc807dbeb7824d437a53cd4" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed7b8be92646fc3d18b06147664ebc5f48d222686cb11a8755e561a735aacc6d" dependencies = [ "bytes 1.0.1", - "futures 0.3.16", + "futures-channel", + "futures-util", "headers", "http", "hyper 0.14.11", @@ -5403,14 +5474,15 @@ dependencies = [ "multipart", "percent-encoding", "pin-project", + "rustls-pemfile 0.2.1", "scoped-tls", "serde", "serde_json", "serde_urlencoded", "tokio 1.18.1", "tokio-stream", - "tokio-tungstenite 0.15.0", - "tokio-util 0.6.7", + "tokio-tungstenite 0.17.2", + "tokio-util 0.7.2", "tower-service", "tracing", ] diff --git a/rust/cubestore/cubestore/Cargo.toml b/rust/cubestore/cubestore/Cargo.toml index ec007df43ece0..d6e06b4f2eb4a 100644 --- a/rust/cubestore/cubestore/Cargo.toml +++ b/rust/cubestore/cubestore/Cargo.toml @@ -17,7 +17,7 @@ libc = { version = "0.2.97", optional = true } base64 = "0.13.0" bumpalo = "3.6.1" tokio = { version = "1.0", features = ["full", "rt"] } -warp = { git = 'https://github.com/seanmonstar/warp', version = "0.3.0" } +warp = { version = "0.3.3" } sqlparser = { git = 'https://github.com/cube-js/sqlparser-rs.git', rev = "a65390c81ffcc34eac2bd35c837c5683d44ec1e0" } serde_derive = "1.0.115" serde = "1.0.115"