From 9aaa00a7882b93552fd360bceb6fe8e4470438f1 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Mon, 9 Nov 2026 23:58:12 +0100 Subject: [PATCH] deps: socket2 0.6 tokio and hyper-util already use socket2 0.6, so asking for 0.5 here linked a second copy. None of the calls this crate makes changed. --- .github/dependabot.yml | 6 +++--- Cargo.lock | 18 ++++-------------- Cargo.toml | 2 +- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index fc074c4..9c4a0a5 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -14,9 +14,9 @@ updates: allow: - dependency-type: all # Lock files only. A version that needs a Cargo.toml edit usually needs code - # too and is a decision for a person: rand 0.10 was done by hand, socket2 0.6 - # was declined, and the one such bump merged as offered, surge-ping 0.9, - # broke 32-bit targets. The cost is that new major versions go unannounced. + # too and is a decision for a person: rand 0.10 and socket2 0.6 were done by + # hand, and the one such bump merged as offered, surge-ping 0.9, broke 32-bit + # targets. The cost is that new major versions go unannounced. versioning-strategy: lockfile-only cooldown: default-days: 7 diff --git a/Cargo.lock b/Cargo.lock index 011816a..2f99144 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -531,7 +531,7 @@ dependencies = [ "hyper", "libc", "pin-project-lite", - "socket2 0.6.5", + "socket2", "tokio", "tower-service", "tracing", @@ -729,7 +729,7 @@ dependencies = [ "rustls-pki-types", "serde", "serde_json", - "socket2 0.5.10", + "socket2", "surge-ping", "tokio", "tokio-native-tls", @@ -1278,16 +1278,6 @@ version = "1.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8" -[[package]] -name = "socket2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "socket2" version = "0.6.5" @@ -1326,7 +1316,7 @@ dependencies = [ "parking_lot", "pnet_packet", "rand 0.9.5", - "socket2 0.6.5", + "socket2", "thiserror", "tokio", "tracing", @@ -1429,7 +1419,7 @@ dependencies = [ "mio", "pin-project-lite", "signal-hook-registry", - "socket2 0.6.5", + "socket2", "tokio-macros", "windows-sys 0.61.2", ] diff --git a/Cargo.toml b/Cargo.toml index b7261d7..0e44f6d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -82,7 +82,7 @@ rustls-pki-types = { version = "1", optional = true } serde = { version = "1", features = ["derive"] } tokio-native-tls = { version = "0.3", optional = true } serde_json = { version = "1", features = ["raw_value"] } -socket2 = { version = "0.5", features = ["all"] } +socket2 = { version = "0.6", features = ["all"] } surge-ping = "0.8" tokio = { version = "1", features = ["rt-multi-thread", "macros", "net", "time", "io-util", "sync", "fs", "signal"] } tower-service = "0.3"