chore: update rand and resolve clippy warnings
This commit is contained in:
Generated
+1
-1
@@ -6191,7 +6191,7 @@ dependencies = [
|
|||||||
"log",
|
"log",
|
||||||
"mime_guess",
|
"mime_guess",
|
||||||
"parking_lot 0.12.5",
|
"parking_lot 0.12.5",
|
||||||
"rand 0.9.2",
|
"rand 0.10.2",
|
||||||
"route_manager",
|
"route_manager",
|
||||||
"rust-embed",
|
"rust-embed",
|
||||||
"serde",
|
"serde",
|
||||||
|
|||||||
@@ -524,8 +524,8 @@ impl ServerInfoCollection {
|
|||||||
server_node.client_map.extend(map);
|
server_node.client_map.extend(map);
|
||||||
}
|
}
|
||||||
let mut client_simple_map = HashMap::<Ipv4Addr, ClientSimpleInfo>::new();
|
let mut client_simple_map = HashMap::<Ipv4Addr, ClientSimpleInfo>::new();
|
||||||
for (_, server_node) in guard.iter() {
|
for server_node in guard.values() {
|
||||||
for (_, x) in server_node.client_map.iter() {
|
for x in server_node.client_map.values() {
|
||||||
if let Some(v) = client_simple_map.get_mut(&x.ip) {
|
if let Some(v) = client_simple_map.get_mut(&x.ip) {
|
||||||
if x.online {
|
if x.online {
|
||||||
v.online = true;
|
v.online = true;
|
||||||
@@ -555,7 +555,7 @@ impl ServerInfoCollection {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
for (_, server_node) in guard.iter() {
|
for server_node in guard.values() {
|
||||||
if server_node.connected {
|
if server_node.connected {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -597,7 +597,7 @@ impl ServerInfoCollection {
|
|||||||
}
|
}
|
||||||
pub fn get_server_rtt(&self, ip: &Ipv4Addr) -> Option<u32> {
|
pub fn get_server_rtt(&self, ip: &Ipv4Addr) -> Option<u32> {
|
||||||
let server_node_map_guard = self.server_node_map.read();
|
let server_node_map_guard = self.server_node_map.read();
|
||||||
for (_, server_node) in server_node_map_guard.iter() {
|
for server_node in server_node_map_guard.values() {
|
||||||
if !server_node.connected {
|
if !server_node.connected {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -23,4 +23,4 @@ mime_guess = "2.0"
|
|||||||
parking_lot.workspace = true
|
parking_lot.workspace = true
|
||||||
time = { workspace = true, features = ["local-offset", "formatting", "macros"] }
|
time = { workspace = true, features = ["local-offset", "formatting", "macros"] }
|
||||||
tokio-util.workspace = true
|
tokio-util.workspace = true
|
||||||
rand = "0.9"
|
rand = "0.10"
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ use axum::{
|
|||||||
use ipnet::Ipv4Net;
|
use ipnet::Ipv4Net;
|
||||||
use mime_guess::from_path;
|
use mime_guess::from_path;
|
||||||
use parking_lot::Mutex;
|
use parking_lot::Mutex;
|
||||||
use rand::Rng;
|
use rand::RngExt;
|
||||||
use rust_embed::RustEmbed;
|
use rust_embed::RustEmbed;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
@@ -849,7 +849,6 @@ async fn start_vnt_internal(
|
|||||||
|
|
||||||
let start_config = cfg.clone();
|
let start_config = cfg.clone();
|
||||||
let core_config = convert_config(cfg)?;
|
let core_config = convert_config(cfg)?;
|
||||||
let sub_input = core_config.input.clone();
|
|
||||||
|
|
||||||
state.record_log(&file_name, "创建异步任务组");
|
state.record_log(&file_name, "创建异步任务组");
|
||||||
let task_group_manager = state
|
let task_group_manager = state
|
||||||
@@ -870,7 +869,6 @@ async fn start_vnt_internal(
|
|||||||
config_display_name,
|
config_display_name,
|
||||||
start_config,
|
start_config,
|
||||||
core_config,
|
core_config,
|
||||||
sub_input,
|
|
||||||
task_group,
|
task_group,
|
||||||
task_group_guard,
|
task_group_guard,
|
||||||
)
|
)
|
||||||
@@ -894,10 +892,10 @@ async fn start_vnt_network(
|
|||||||
config_display_name: String,
|
config_display_name: String,
|
||||||
start_config: StartConfig,
|
start_config: StartConfig,
|
||||||
core_config: CoreConfig,
|
core_config: CoreConfig,
|
||||||
sub_input: Vec<NetInput>,
|
|
||||||
task_group: vnt_core::utils::task_control::TaskGroup,
|
task_group: vnt_core::utils::task_control::TaskGroup,
|
||||||
task_group_guard: vnt_core::utils::task_control::TaskGroupGuard,
|
task_group_guard: vnt_core::utils::task_control::TaskGroupGuard,
|
||||||
) -> anyhow::Result<()> {
|
) -> anyhow::Result<()> {
|
||||||
|
let sub_input = core_config.input.clone();
|
||||||
let mut network_manager =
|
let mut network_manager =
|
||||||
NetworkManager::create_network(Box::new(core_config), task_group.clone())
|
NetworkManager::create_network(Box::new(core_config), task_group.clone())
|
||||||
.await
|
.await
|
||||||
|
|||||||
Reference in New Issue
Block a user