From 5efbc8587f79ddc6b8890e86062cc45799830df9 Mon Sep 17 00:00:00 2001 From: Luna Yao <40349250+ZnqbuZ@users.noreply.github.com> Date: Thu, 18 Jun 2026 17:45:28 +0200 Subject: [PATCH] upgrade guarden to 0.2.0 (#2365) --- Cargo.lock | 69 ++++++++++++++++--- easytier/Cargo.toml | 2 +- easytier/src/peers/foreign_network_manager.rs | 2 +- easytier/src/peers/peer_conn.rs | 7 +- 4 files changed, 63 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8bbd5862..2f669f9b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -915,7 +915,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfcfdc083699101d5a7965e49925975f2f55060f94f9a05e7187be95d530ca59" dependencies = [ "once_cell", - "proc-macro-crate 3.2.0", + "proc-macro-crate 3.5.0", "proc-macro2", "quote", "syn 2.0.117", @@ -2272,7 +2272,7 @@ dependencies = [ "gethostname 0.5.0", "git-version", "globwalk", - "guarden", + "guarden 0.2.0", "hickory-client", "hickory-proto", "hickory-resolver", @@ -2458,7 +2458,7 @@ dependencies = [ "dashmap", "easytier", "futures", - "guarden", + "guarden 0.1.2", "jsonwebtoken", "mimalloc", "mockall", @@ -3594,7 +3594,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca87812d87fa82896df1adfb5c111cdeaae3edb6da028f5df002dcbd7df71454" dependencies = [ "futures", - "guarden-macros", + "guarden-macros 0.1.2", + "tokio", +] + +[[package]] +name = "guarden" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8408903291a7d0cc74169d5de4dd1919a9a402a2f67fcd7df3303ed045fae73" +dependencies = [ + "futures-core", + "guarden-macros 0.2.0", "tokio", ] @@ -3609,6 +3620,18 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "guarden-macros" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e0ef28f1077c259f9e7e238e234a78ce18cedbf0251fd2135f5fc23c40e79fe" +dependencies = [ + "proc-macro-crate 3.5.0", + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "h2" version = "0.4.7" @@ -5579,7 +5602,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 2.0.117", @@ -6711,11 +6734,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.2.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ - "toml_edit 0.22.20", + "toml_edit 0.25.12+spec-1.1.0", ] [[package]] @@ -7597,7 +7620,7 @@ checksum = "1f168d99749d307be9de54d23fd226628d99768225ef08f6ffb52e0182a27746" dependencies = [ "cfg-if", "glob", - "proc-macro-crate 3.2.0", + "proc-macro-crate 3.5.0", "proc-macro2", "quote", "regex", @@ -9997,6 +10020,15 @@ dependencies = [ "serde_core", ] +[[package]] +name = "toml_datetime" +version = "1.1.1+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7" +dependencies = [ + "serde_core", +] + [[package]] name = "toml_edit" version = "0.19.15" @@ -10034,6 +10066,18 @@ dependencies = [ "winnow 0.6.18", ] +[[package]] +name = "toml_edit" +version = "0.25.12+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7" +dependencies = [ + "indexmap 2.14.0", + "toml_datetime 1.1.1+spec-1.1.0", + "toml_parser", + "winnow 1.0.1", +] + [[package]] name = "toml_parser" version = "1.1.2+spec-1.1.0" @@ -11881,6 +11925,9 @@ name = "winnow" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5" +dependencies = [ + "memchr", +] [[package]] name = "winreg" @@ -12262,7 +12309,7 @@ version = "5.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897e79616e84aac4b2c46e9132a4f63b93105d54fe8c0e8f6bffc21fa8d49222" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate 3.5.0", "proc-macro2", "quote", "syn 2.0.117", @@ -12499,7 +12546,7 @@ version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b59b012ebe9c46656f9cc08d8da8b4c726510aef12559da3e5f1bf72780752c" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate 3.5.0", "proc-macro2", "quote", "syn 2.0.117", diff --git a/easytier/Cargo.toml b/easytier/Cargo.toml index 2df2744b..60f22fcc 100644 --- a/easytier/Cargo.toml +++ b/easytier/Cargo.toml @@ -51,7 +51,7 @@ time = "0.3" toml = "0.8.12" chrono = { version = "0.4.37", features = ["serde"] } -guarden = "0.1" +guarden = "0.2" delegate = "0.13.5" diff --git a/easytier/src/peers/foreign_network_manager.rs b/easytier/src/peers/foreign_network_manager.rs index c34240cc..9a9fb641 100644 --- a/easytier/src/peers/foreign_network_manager.rs +++ b/easytier/src/peers/foreign_network_manager.rs @@ -14,7 +14,7 @@ use std::{ }; use dashmap::{DashMap, DashSet}; -use guarden::defer; +use guarden::{Guard, defer}; use tokio::{ sync::{ Mutex, diff --git a/easytier/src/peers/peer_conn.rs b/easytier/src/peers/peer_conn.rs index d7fdbde8..90374286 100644 --- a/easytier/src/peers/peer_conn.rs +++ b/easytier/src/peers/peer_conn.rs @@ -33,7 +33,6 @@ use super::{ peer_session::{PeerSession, PeerSessionAction}, traffic_metrics::AggregateTrafficMetrics, }; -use crate::utils::BoxExt; use crate::{ common::{ PeerId, @@ -380,9 +379,9 @@ impl PeerConn { session_filter, noise_handshake_result: None, - tunnel: Arc::new(Mutex::new( - guard!([mut mpsc_tunnel] mpsc_tunnel.close()).boxed(), - )), + tunnel: Arc::new(Mutex::new(Box::new( + guard!([mut mpsc_tunnel] mpsc_tunnel.close()), + ))), sink, recv: Mutex::new(Some(recv)), tunnel_info,