From c13d1f37bfd8eb828559cb8224266de539f8de7b Mon Sep 17 00:00:00 2001 From: "(on company time)" <_@_> Date: Fri, 16 Dec 2022 13:29:57 -0600 Subject: [PATCH] :arrow_up: update ptth_quic deps --- Cargo.lock | 125 +++++++++++++++++++++++++++--------- crates/ptth_quic/Cargo.toml | 29 ++++----- 2 files changed, 108 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 99920b6..bfc5688 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -91,6 +91,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" + [[package]] name = "bitflags" version = "1.3.2" @@ -170,7 +176,7 @@ dependencies = [ "num-integer", "num-traits", "serde", - "time", + "time 0.1.45", "wasm-bindgen", "winapi", ] @@ -347,7 +353,7 @@ dependencies = [ "tokio", "tokio-stream", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.2.25", ] [[package]] @@ -992,6 +998,16 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -1078,6 +1094,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "parking_lot" version = "0.12.1" @@ -1113,7 +1135,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] @@ -1248,7 +1270,7 @@ name = "ptth" version = "1.1.0" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "blake3", "chrono", "debug_proxy", @@ -1257,7 +1279,7 @@ dependencies = [ "reqwest", "tokio", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.2.25", ] [[package]] @@ -1265,7 +1287,7 @@ name = "ptth_core" version = "2.0.0" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "ctrlc", "futures", "hyper", @@ -1300,7 +1322,7 @@ dependencies = [ "tokio", "tokio-stream", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.2.25", "uom", ] @@ -1309,7 +1331,7 @@ name = "ptth_kv" version = "0.1.0" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "hyper", "thiserror", "tokio", @@ -1333,7 +1355,7 @@ dependencies = [ "sha2 0.9.9", "tokio", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.2.25", ] [[package]] @@ -1341,7 +1363,7 @@ name = "ptth_quic" version = "0.1.0" dependencies = [ "anyhow", - "base64", + "base64 0.20.0", "ctrlc", "futures-util", "hyper", @@ -1349,12 +1371,12 @@ dependencies = [ "rand", "rcgen", "reqwest", - "rmp-serde", + "rmp-serde 1.1.1", "rustls", "structopt", "tokio", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.3.16", "udp_over_tcp", ] @@ -1370,12 +1392,12 @@ dependencies = [ "rand", "rand_chacha", "reqwest", - "rmp-serde", + "rmp-serde 0.15.5", "serde", "structopt", "tokio", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.2.25", ] [[package]] @@ -1383,7 +1405,7 @@ name = "ptth_relay" version = "2.0.0" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "blake3", "chrono", "clap", @@ -1397,7 +1419,7 @@ dependencies = [ "ptth_core", "rand", "reqwest", - "rmp-serde", + "rmp-serde 0.15.5", "rusty_ulid 1.0.0", "serde", "serde_json", @@ -1408,7 +1430,7 @@ dependencies = [ "toml", "tracing", "tracing-futures", - "tracing-subscriber", + "tracing-subscriber 0.2.25", ] [[package]] @@ -1419,7 +1441,7 @@ dependencies = [ "always_equal", "anyhow", "arc-swap", - "base64", + "base64 0.13.1", "blake3", "chrono", "futures", @@ -1433,7 +1455,7 @@ dependencies = [ "rand", "regex", "reqwest", - "rmp-serde", + "rmp-serde 0.15.5", "rust-embed", "rusty_ulid 0.10.1", "serde", @@ -1445,7 +1467,7 @@ dependencies = [ "toml", "tracing", "tracing-futures", - "tracing-subscriber", + "tracing-subscriber 0.2.25", ] [[package]] @@ -1459,7 +1481,7 @@ dependencies = [ "serde", "tokio", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.2.25", ] [[package]] @@ -1471,7 +1493,7 @@ dependencies = [ "reqwest", "tokio", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.2.25", ] [[package]] @@ -1586,13 +1608,13 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.8.14" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5911d1403f4143c9d56a702069d593e8d0f3fab880a85e103604d0893ea31ba7" +checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ - "chrono", "pem", "ring", + "time 0.3.17", "yasna", ] @@ -1646,7 +1668,7 @@ version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "encoding_rs", "futures-core", @@ -1720,6 +1742,17 @@ dependencies = [ "serde", ] +[[package]] +name = "rmp-serde" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + [[package]] name = "rust-embed" version = "6.4.2" @@ -1784,7 +1817,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] @@ -1793,7 +1826,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] @@ -2142,6 +2175,22 @@ dependencies = [ "winapi", ] +[[package]] +name = "time" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +dependencies = [ + "serde", + "time-core", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + [[package]] name = "tinyvec" version = "1.6.0" @@ -2335,6 +2384,20 @@ dependencies = [ "tracing-serde", ] +[[package]] +name = "tracing-subscriber" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", +] + [[package]] name = "try-lock" version = "0.2.3" @@ -2730,9 +2793,9 @@ dependencies = [ [[package]] name = "yasna" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e262a29d0e61ccf2b6190d7050d4b237535fc76ce4c1210d9caa316f71dffa75" +checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" dependencies = [ - "chrono", + "time 0.3.17", ] diff --git a/crates/ptth_quic/Cargo.toml b/crates/ptth_quic/Cargo.toml index dab944c..fa27582 100644 --- a/crates/ptth_quic/Cargo.toml +++ b/crates/ptth_quic/Cargo.toml @@ -8,24 +8,23 @@ license = "AGPL-3.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.38" -base64 = "0.13.0" -ctrlc = "3.2.1" -# fltk = "1.1.1" -futures-util = "0.3.9" -hyper = { version = "0.14.4", features = ["http1", "server", "stream", "tcp"] } +anyhow = "1.0.66" +base64 = "0.20.0" +ctrlc = "3.2.4" +futures-util = "0.3.25" +hyper = { version = "0.14.23", features = ["http1", "server", "stream", "tcp"] } quinn = "0.8.5" -rand = "0.8.4" -rcgen = "0.8.11" -rmp-serde = "0.15.5" -rustls = "0.20.4" -structopt = "0.3.20" -tokio = { version = "1.8.1", features = ["full"] } -tracing-subscriber = "0.2.16" -tracing = "0.1.25" +rand = "0.8.5" +rcgen = "0.10.0" +rmp-serde = "1.1.1" +rustls = "0.20.7" +structopt = "0.3.26" +tokio = { version = "1.23.0", features = ["full"] } +tracing-subscriber = "0.3.16" +tracing = "0.1.37" udp_over_tcp = { path = "../udp_over_tcp" } [dependencies.reqwest] -version = "0.11.10" +version = "0.11.13" default-features = false features = ["stream", "rustls-tls", "hyper-rustls"]