Merge branch 'main' into feat/dns-policy

# Conflicts:
#	easytier/Cargo.toml

easytier/Cargo.toml

@@ -166,8 +166,7 @@ network-interface = "2.0"
 
 # for ospf route
 petgraph = "0.8.1"
-hashbrown = "0.15.3"
-ordered_hash_map = "0.5.0"# TODO: REPLACE THIS
+ordered_hash_map = "0.5.0"
 indexmap = "2.13.1"
 
 moka = { version = "0.12.13", features = ["future"] }

easytier/src/peers/graph_algo.rs

@@ -1,12 +1,10 @@
 use core::cmp::Ordering;
-use hashbrown::hash_map::{
-    Entry::{Occupied, Vacant},
-    HashMap,
-};
 use petgraph::{
     algo::Measure,
-    visit::{EdgeRef as _, IntoEdges, VisitMap as _, Visitable},
+    visit::{EdgeRef, IntoEdges, VisitMap, Visitable},
 };
+use std::collections::HashMap;
+use std::collections::hash_map::Entry::{Occupied, Vacant};
 use std::{collections::BinaryHeap, hash::Hash};
 
 /// `MinScored<K, T>` holds a score `K` and a scored object `T` in