From f2404e79e1a50e1d312ba3003b7e9defa8a7fb0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=A3rebe=20-=20Romain=20GERARD?= Date: Mon, 24 Jun 2024 20:06:38 +0200 Subject: [PATCH] bump deps --- Cargo.lock | 47 ++++++++++++++++++++++++++++------------------- Cargo.toml | 12 ++++++------ Dockerfile | 2 +- src/dns.rs | 2 +- src/main.rs | 2 +- src/udp.rs | 3 ++- 6 files changed, 39 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ee414ba..9dd39c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -161,9 +161,12 @@ dependencies = [ [[package]] name = "atomic" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", +] [[package]] name = "autocfg" @@ -338,6 +341,12 @@ version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +[[package]] +name = "bytemuck" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" + [[package]] name = "bytes" version = "1.6.0" @@ -402,9 +411,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.6" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9689a29b593160de5bc4aacab7b5d54fb52231de70122626c178e6a368994c7" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" dependencies = [ "clap_builder", "clap_derive", @@ -412,9 +421,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.6" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5387378c84f6faa26890ebf9f0a92989f8873d4d380467bcd0d8d8620424df" +checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" dependencies = [ "anstream", "anstyle", @@ -656,9 +665,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "enum-as-inner" @@ -704,9 +713,9 @@ dependencies = [ [[package]] name = "fastwebsockets" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93da8b19e29f202ef35ddd20ddea8c86166850fce5ba2a3c3f3e3174cdbb0620" +checksum = "26da0c7b5cef45c521a6f9cdfffdfeb6c9f5804fbac332deb5ae254634c7a6be" dependencies = [ "base64 0.21.7", "bytes", @@ -1071,12 +1080,12 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http 1.1.0", "http-body", "pin-project-lite", @@ -1861,9 +1870,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -2739,9 +2748,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna 0.5.0", @@ -2769,9 +2778,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "3ea73390fe27785838dcbf75b91b1d84799e28f1ce71e6f372a5dc2200c80de5" dependencies = [ "atomic", "getrandom", diff --git a/Cargo.toml b/Cargo.toml index db02fc9..28d780a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,22 +14,22 @@ scopeguard = "1.2.0" bb8 = { version = "0.8", features = [] } bytes = { version = "1.6.0", features = [] } -clap = { version = "4.5.6", features = ["derive", "env"] } +clap = { version = "4.5.7", features = ["derive", "env"] } fast-socks5 = { version = "0.9.6", features = [] } -fastwebsockets = { version = "0.7.2", features = ["upgrade", "simd", "unstable-split"] } +fastwebsockets = { version = "0.8.0", features = ["upgrade", "simd", "unstable-split"] } futures-util = { version = "0.3.30" } hickory-resolver = { version = "0.24.1", features = ["tokio", "dns-over-https-rustls", "dns-over-rustls", "native-certs"] } ppp = { version = "2.2.0", features = [] } # For config file parsing -regex = { version = "1.10.4", default-features = false, features = ["std", "perf"] } +regex = { version = "1.10.5", default-features = false, features = ["std", "perf"] } serde_regex = "1.1.0" serde_yaml = { version = "0.9.34", features = [] } ipnet = { version = "2.9.0", features = ["serde"] } hyper = { version = "1.3.1", features = ["client", "http1", "http2"] } hyper-util = { version = "0.1.5", features = ["tokio", "server", "server-auto"] } -http-body-util = { version = "0.1.1" } +http-body-util = { version = "0.1.2" } jsonwebtoken = { version = "9.3.0", default-features = false } log = "0.4.21" nix = { version = "0.29.0", features = ["socket", "net", "uio"] } @@ -53,9 +53,9 @@ tokio-rustls = { version = "0.26.0", default-features = false, features = ["logg tracing = { version = "0.1.40", features = ["log"] } tracing-subscriber = { version = "0.3.18", features = ["env-filter", "fmt", "local-time"] } -url = "2.5.0" +url = "2.5.2" urlencoding = "2.1.3" -uuid = { version = "1.8.0", features = ["v7", "serde"] } +uuid = { version = "1.9.0", features = ["v7", "serde"] } [target.'cfg(not(target_family = "unix"))'.dependencies] crossterm = { version = "0.27.0" } diff --git a/Dockerfile b/Dockerfile index 0bcea3d..c87d1aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BUILDER_IMAGE=builder_cache ############################################################ # Cache image with all the deps -FROM rust:1.78-bookworm AS builder_cache +FROM rust:1.79-bookworm AS builder_cache RUN rustup component add rustfmt clippy diff --git a/src/dns.rs b/src/dns.rs index 62866eb..f394bbc 100644 --- a/src/dns.rs +++ b/src/dns.rs @@ -191,4 +191,4 @@ impl RuntimeProvider for TokioRuntimeProviderWithSoMark { Box::pin(socket) } -} \ No newline at end of file +} diff --git a/src/main.rs b/src/main.rs index 443014f..ce2ec63 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1316,4 +1316,4 @@ async fn main() { } tokio::signal::ctrl_c().await.unwrap(); -} \ No newline at end of file +} diff --git a/src/udp.rs b/src/udp.rs index dd52812..082c4f9 100644 --- a/src/udp.rs +++ b/src/udp.rs @@ -152,7 +152,8 @@ impl UdpStream { keys_to_delete, }; - let pending_notification = unsafe { std::mem::transmute(s.io.has_data_to_read.notified()) }; + let pending_notification = + unsafe { std::mem::transmute::, Notified<'static>>(s.io.has_data_to_read.notified()) }; s.pending_notification = Some(pending_notification); (s, io)