From 2a361d7f5e34ac53d6a149bb582f45e6fb6eb4ef Mon Sep 17 00:00:00 2001 From: Al Liu Date: Thu, 6 Jun 2024 15:05:34 +0800 Subject: [PATCH] bump versions (#1118) --- Cargo.lock | 44 +++++++++++++++++++---- apps/freenet-email-app/Cargo.lock | 9 +++-- apps/freenet-ping/Cargo.lock | 60 +++---------------------------- apps/freenet-ping/app/Cargo.toml | 2 +- crates/core/Cargo.toml | 2 +- crates/fdev/Cargo.toml | 2 +- stdlib | 2 +- 7 files changed, 49 insertions(+), 72 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0e142a8af..46210c70d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -384,7 +384,7 @@ dependencies = [ "sha1", "sync_wrapper 1.0.1", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.21.0", "tower", "tower-layer", "tower-service", @@ -1397,7 +1397,7 @@ dependencies = [ "tar", "thiserror", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.23.0", "toml 0.8.14", "tracing", "tracing-subscriber", @@ -1534,7 +1534,7 @@ dependencies = [ "thiserror", "time", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.23.0", "toml 0.8.14", "tower-http", "tracing", @@ -1579,7 +1579,7 @@ dependencies = [ "serde_with", "thiserror", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.23.0", "tracing", "tracing-subscriber", "wasm-bindgen", @@ -4548,7 +4548,19 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite", + "tungstenite 0.21.0", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "becd34a233e7e31a3dbf7c7241b38320f57393dcae8e7324b0167d21b8e320b0" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.23.0", ] [[package]] @@ -4833,6 +4845,24 @@ dependencies = [ "utf-8", ] +[[package]] +name = "tungstenite" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "utf-8", +] + [[package]] name = "typenum" version = "1.17.0" @@ -5377,9 +5407,9 @@ dependencies = [ [[package]] name = "wide" -version = "0.7.22" +version = "0.7.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c5cb32c74fe55350a3272ba792f050613e692253ae0d89ad5d83eb0dcea15e1" +checksum = "1134eff459f1063780b94cc78b704e2212cac12abd554e4268f5b8f9dfcc1883" dependencies = [ "bytemuck", "safe_arch", diff --git a/apps/freenet-email-app/Cargo.lock b/apps/freenet-email-app/Cargo.lock index 2363bd536..1e0991ac8 100644 --- a/apps/freenet-email-app/Cargo.lock +++ b/apps/freenet-email-app/Cargo.lock @@ -3648,9 +3648,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +checksum = "becd34a233e7e31a3dbf7c7241b38320f57393dcae8e7324b0167d21b8e320b0" dependencies = [ "futures-util", "log", @@ -3766,9 +3766,9 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" dependencies = [ "byteorder", "bytes", @@ -3779,7 +3779,6 @@ dependencies = [ "rand 0.8.5", "sha1", "thiserror", - "url", "utf-8", ] diff --git a/apps/freenet-ping/Cargo.lock b/apps/freenet-ping/Cargo.lock index 3b9b42638..029ae1989 100644 --- a/apps/freenet-ping/Cargo.lock +++ b/apps/freenet-ping/Cargo.lock @@ -388,15 +388,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - [[package]] name = "freenet-macros" version = "0.0.5" @@ -681,16 +672,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "indexmap" version = "1.9.3" @@ -885,12 +866,6 @@ dependencies = [ "windows-targets 0.52.5", ] -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - [[package]] name = "pin-project-lite" version = "0.2.14" @@ -1318,9 +1293,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +checksum = "becd34a233e7e31a3dbf7c7241b38320f57393dcae8e7324b0167d21b8e320b0" dependencies = [ "futures-util", "log", @@ -1392,9 +1367,9 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" dependencies = [ "byteorder", "bytes", @@ -1405,7 +1380,6 @@ dependencies = [ "rand", "sha1", "thiserror", - "url", "utf-8", ] @@ -1415,38 +1389,12 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - [[package]] name = "utf-8" version = "0.7.6" diff --git a/apps/freenet-ping/app/Cargo.toml b/apps/freenet-ping/app/Cargo.toml index d4860a9f0..3c73a2712 100644 --- a/apps/freenet-ping/app/Cargo.toml +++ b/apps/freenet-ping/app/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" clap = { version = "4", features = ["derive"] } futures = "0.3" tokio = { version = "1", features = ["full"] } -tokio-tungstenite = "0.21" +tokio-tungstenite = "0.23" tracing = { version = "0.1", features = ["log"] } tracing-subscriber = { version = "0.3", features = ["env-filter"] } freenet-stdlib = { workspace = true, features = ["net"] } diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 209919883..5b6398de8 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -56,7 +56,7 @@ tar = { version = "0.4" } time = "0.3" thiserror = "1" tokio = { features = ["fs", "macros", "rt-multi-thread", "sync", "process"], version = "1" } -tokio-tungstenite = "0.21" +tokio-tungstenite = "0.23" tower-http = { features = ["fs", "trace"], version = "0.5" } ulid = { features = ["serde"], version = "1.1" } unsigned-varint = { version = "0.8", features = ["codec", "asynchronous_codec"] } diff --git a/crates/fdev/Cargo.toml b/crates/fdev/Cargo.toml index f2d753bd5..c089b44eb 100644 --- a/crates/fdev/Cargo.toml +++ b/crates/fdev/Cargo.toml @@ -28,7 +28,7 @@ semver = { workspace = true } tar = "0.4" thiserror = "1" tokio = { version = "1", features = ["rt-multi-thread", "sync", "macros", "signal", "parking_lot", "process"] } -tokio-tungstenite = "0.21" +tokio-tungstenite = "0.23" toml = { version = "0.8", features = ["default", "preserve_order"] } tracing = { workspace = true } tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"] } diff --git a/stdlib b/stdlib index ecc7e14d3..90b319249 160000 --- a/stdlib +++ b/stdlib @@ -1 +1 @@ -Subproject commit ecc7e14d3f976a3e7ee6d9e1140bf1b791df60d8 +Subproject commit 90b319249f80ccd82827091f36ac8faae8999566