YGGverse/xash3d-master
1
0
Fork 0
mirror of https://git.mentality.rip/numas13/xash3d-master.git synced 2025-01-22 12:54:24 +00:00
Code Issues Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Denis Drakhnia 2024-08-25 15:29:18 +03:00
parent ce759fed3d
commit 0d1b06b207
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
master/src/master_server.rs
View File

@ -9,6 +9,7 @@ use std::{
io, io,
net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs, UdpSocket}, net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs, UdpSocket},
ops::Deref, ops::Deref,
str::FromStr,
sync::atomic::{AtomicBool, Ordering}, sync::atomic::{AtomicBool, Ordering},
time::{Duration, Instant}, time::{Duration, Instant},
}; };
@ -35,7 +36,7 @@ use crate::{
}; };
pub trait AddrExt: Sized + Eq + Hash + Display + Copy + ToSocketAddrs + ServerAddress { pub trait AddrExt: Sized + Eq + Hash + Display + Copy + ToSocketAddrs + ServerAddress {
type Ip; type Ip: Eq + Hash + Display + Copy + FromStr;
fn extract(addr: SocketAddr) -> Result<Self, SocketAddr>; fn extract(addr: SocketAddr) -> Result<Self, SocketAddr>;
fn ip(&self) -> &Self::Ip; fn ip(&self) -> &Self::Ip;
@ -261,11 +262,7 @@ impl Master {
} }
} }
impl<Addr> MasterServer<Addr> impl<Addr: AddrExt> MasterServer<Addr> {
where
Addr: AddrExt,
Addr::Ip: Eq + Hash + Display + Copy + std::str::FromStr,
{
pub fn new(cfg: Config, addr: Addr) -> Result<Self, Error> { pub fn new(cfg: Config, addr: Addr) -> Result<Self, Error> {
info!("Listen address: {}", addr); info!("Listen address: {}", addr);
@ -694,7 +691,6 @@ where
fn helper<Addr, F>(args: &[&str], mut op: F) fn helper<Addr, F>(args: &[&str], mut op: F)
where where
Addr: AddrExt, Addr: AddrExt,
Addr::Ip: std::str::FromStr,
F: FnMut(&str, Addr::Ip), F: FnMut(&str, Addr::Ip),
{ {
let iter = args.iter().map(|i| (i, i.parse::<Addr::Ip>())); let iter = args.iter().map(|i| (i, i.parse::<Addr::Ip>()));