From 03b7fdb00f863719d2890224c242273a9d55c102 Mon Sep 17 00:00:00 2001 From: Andrew Shu Date: Sun, 30 Jun 2024 23:37:37 -0700 Subject: [PATCH 1/2] Update socket2 Rust dependency to fix Windows build --- priv/Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/priv/Cargo.toml b/priv/Cargo.toml index e69d0db..dcd9cde 100644 --- a/priv/Cargo.toml +++ b/priv/Cargo.toml @@ -7,3 +7,4 @@ edition = "2018" [dependencies] tokio = { version = "0.2", features = ["io-std", "io-util", "macros", "process", "rt-core"] } futures = "0.3.5" +socket2 = "0.3.19" From 1b459163b9f3d76d088d0705326caa8f24ef8a2a Mon Sep 17 00:00:00 2001 From: Andrew Shu Date: Sun, 11 Aug 2024 15:13:35 -0700 Subject: [PATCH 2/2] Update socket2 version in Cargo.lock and remove explicit dependency --- priv/Cargo.lock | 27 ++++++++++++++------------- priv/Cargo.toml | 1 - 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/priv/Cargo.lock b/priv/Cargo.lock index c53bb94..0c4cd57 100644 --- a/priv/Cargo.lock +++ b/priv/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "arc-swap" version = "0.4.4" @@ -24,6 +26,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "fuchsia-zircon" version = "0.3.3" @@ -172,7 +180,7 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -187,7 +195,7 @@ version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "fuchsia-zircon", "fuchsia-zircon-sys", "iovec", @@ -251,7 +259,7 @@ version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "winapi 0.3.8", ] @@ -337,12 +345,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "redox_syscall" -version = "0.1.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" - [[package]] name = "signal-hook-registry" version = "1.2.0" @@ -361,13 +363,12 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" [[package]] name = "socket2" -version = "0.3.11" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" +checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", - "redox_syscall", "winapi 0.3.8", ] diff --git a/priv/Cargo.toml b/priv/Cargo.toml index dcd9cde..e69d0db 100644 --- a/priv/Cargo.toml +++ b/priv/Cargo.toml @@ -7,4 +7,3 @@ edition = "2018" [dependencies] tokio = { version = "0.2", features = ["io-std", "io-util", "macros", "process", "rt-core"] } futures = "0.3.5" -socket2 = "0.3.19"