From c73334f45d3e4acf4b91c35c19a548d67c97d568 Mon Sep 17 00:00:00 2001 From: CosminPerRam Date: Tue, 6 Jun 2023 22:58:24 +0300 Subject: [PATCH] [Crate] Fix msrv and change it to 1.60 --- Cargo.toml | 2 +- src/services/valve_master_server/service.rs | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6e54706..4affa63 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ documentation = "https://docs.rs/gamedig/latest/gamedig/" repository = "https://github.com/gamedig/rust-gamedig" readme = "README.md" keywords = ["server", "query", "game", "check", "status"] -rust-version = "1.56.1" +rust-version = "1.60.0" [features] default = [] diff --git a/src/services/valve_master_server/service.rs b/src/services/valve_master_server/service.rs index 4cf1918..c3e2e80 100644 --- a/src/services/valve_master_server/service.rs +++ b/src/services/valve_master_server/service.rs @@ -5,8 +5,9 @@ use crate::{GDError, GDResult}; use std::net::{IpAddr, Ipv4Addr, SocketAddr}; /// The default master ip, which is the one for Source. -pub const DEFAULT_MASTER_ADDRESS: SocketAddr - = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(208, 64, 201, 194)), 27011); // hl2master.steampowered.com +pub fn default_master_address() -> SocketAddr { + SocketAddr::new(IpAddr::V4(Ipv4Addr::new(208, 64, 201, 194)), 27011) // hl2master.steampowered.com +} fn construct_payload(region: Region, filters: &Option, last_ip: &str, last_port: u16) -> Vec { let filters_bytes: Vec = match filters { @@ -122,7 +123,7 @@ impl ValveMasterServer { /// faster as it results in less packets being sent, received and processed but /// yields less ips. pub fn query_singular(region: Region, search_filters: Option) -> GDResult> { - let mut master_server = ValveMasterServer::new(&DEFAULT_MASTER_ADDRESS)?; + let mut master_server = ValveMasterServer::new(&default_master_address())?; let mut ips = master_server.query_specific(region, &search_filters, "0.0.0.0", 0)?; @@ -137,7 +138,7 @@ pub fn query_singular(region: Region, search_filters: Option) -> /// Make a complete query. pub fn query(region: Region, search_filters: Option) -> GDResult> { - let mut master_server = ValveMasterServer::new(&DEFAULT_MASTER_ADDRESS)?; + let mut master_server = ValveMasterServer::new(&default_master_address())?; master_server.query(region, search_filters) }