From 59994bc0865a1e1c92da2677d792c6cb84e9db33 Mon Sep 17 00:00:00 2001 From: CosminPerRam Date: Fri, 3 Mar 2023 18:02:54 +0200 Subject: [PATCH] [Games] Use port.unwrap_or instead of matching it --- src/games/aliens.rs | 5 +---- src/games/aoc.rs | 5 +---- src/games/arma2oa.rs | 5 +---- src/games/ase.rs | 5 +---- src/games/asrd.rs | 5 +---- src/games/avorion.rs | 5 +---- src/games/bat1944.rs | 5 +---- src/games/bb2.rs | 5 +---- src/games/bf1942.rs | 5 +---- src/games/bm.rs | 5 +---- src/games/bo.rs | 5 +---- src/games/ccure.rs | 5 +---- src/games/cosu.rs | 5 +---- src/games/cs.rs | 5 +---- src/games/cscz.rs | 5 +---- src/games/csgo.rs | 5 +---- src/games/css.rs | 5 +---- src/games/dod.rs | 5 +---- src/games/dods.rs | 5 +---- src/games/doi.rs | 5 +---- src/games/dst.rs | 5 +---- src/games/gm.rs | 5 +---- src/games/hl2dm.rs | 5 +---- src/games/hldms.rs | 5 +---- src/games/ins.rs | 5 +---- src/games/insmic.rs | 5 +---- src/games/inss.rs | 5 +---- src/games/l4d.rs | 5 +---- src/games/l4d2.rs | 5 +---- src/games/mc.rs | 10 ++-------- src/games/ohd.rs | 5 +---- src/games/onset.rs | 5 +---- src/games/pz.rs | 5 +---- src/games/ror2.rs | 5 +---- src/games/rust.rs | 5 +---- src/games/sc.rs | 5 +---- src/games/sdtd.rs | 5 +---- src/games/tf.rs | 5 +---- src/games/tf2.rs | 5 +---- src/games/tfc.rs | 5 +---- src/games/ts.rs | 5 +---- src/games/unturned.rs | 5 +---- src/games/ut.rs | 5 +---- src/games/vr.rs | 5 +---- 44 files changed, 45 insertions(+), 180 deletions(-) diff --git a/src/games/aliens.rs b/src/games/aliens.rs index 07f55f2..dafc7b9 100644 --- a/src/games/aliens.rs +++ b/src/games/aliens.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::ALIENS.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::ALIENS.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/aoc.rs b/src/games/aoc.rs index ff7e421..29d913b 100644 --- a/src/games/aoc.rs +++ b/src/games/aoc.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::AOC.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::AOC.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/arma2oa.rs b/src/games/arma2oa.rs index c5b88ff..f54123c 100644 --- a/src/games/arma2oa.rs +++ b/src/games/arma2oa.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 2304, - Some(port) => port - }, SteamApp::ARMA2OA.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(2304), SteamApp::ARMA2OA.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/ase.rs b/src/games/ase.rs index e863186..09ff37f 100644 --- a/src/games/ase.rs +++ b/src/games/ase.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::ASE.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::ASE.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/asrd.rs b/src/games/asrd.rs index 5caf1f4..8f2808e 100644 --- a/src/games/asrd.rs +++ b/src/games/asrd.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::ASRD.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::ASRD.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/avorion.rs b/src/games/avorion.rs index 51f9fa1..804389a 100644 --- a/src/games/avorion.rs +++ b/src/games/avorion.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27020, - Some(port) => port - }, SteamApp::AVORION.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27020), SteamApp::AVORION.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/bat1944.rs b/src/games/bat1944.rs index c564b8d..a401819 100644 --- a/src/games/bat1944.rs +++ b/src/games/bat1944.rs @@ -4,10 +4,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let mut valve_response = valve::query(address, match port { - None => 7780, - Some(port) => port - }, SteamApp::BAT1944.as_engine(), None, None)?; + let mut valve_response = valve::query(address, port.unwrap_or(7780), SteamApp::BAT1944.as_engine(), None, None)?; if let Some(rules) = &mut valve_response.rules { if let Some(bat_max_players) = rules.get("bat_max_players_i") { diff --git a/src/games/bb2.rs b/src/games/bb2.rs index add46de..97bec4b 100644 --- a/src/games/bb2.rs +++ b/src/games/bb2.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::BB2.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::BB2.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/bf1942.rs b/src/games/bf1942.rs index f61a9d9..12d530b 100644 --- a/src/games/bf1942.rs +++ b/src/games/bf1942.rs @@ -3,8 +3,5 @@ use crate::protocols::gamespy; use crate::protocols::gamespy::Response; pub fn query(address: &str, port: Option) -> GDResult { - gamespy::one::query(address, match port { - None => 23000, - Some(port) => port - }, None) + gamespy::one::query(address, port.unwrap_or(23000), None) } diff --git a/src/games/bm.rs b/src/games/bm.rs index 4904fb0..3423c40 100644 --- a/src/games/bm.rs +++ b/src/games/bm.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::BM.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::BM.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/bo.rs b/src/games/bo.rs index 8a8441a..88dcfc4 100644 --- a/src/games/bo.rs +++ b/src/games/bo.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27016, - Some(port) => port - }, SteamApp::BO.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27016), SteamApp::BO.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/ccure.rs b/src/games/ccure.rs index ef1de45..357f5e3 100644 --- a/src/games/ccure.rs +++ b/src/games/ccure.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::CCURE.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::CCURE.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/cosu.rs b/src/games/cosu.rs index bb033fe..48e1595 100644 --- a/src/games/cosu.rs +++ b/src/games/cosu.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27004, - Some(port) => port - }, SteamApp::COSU.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27004), SteamApp::COSU.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/cs.rs b/src/games/cs.rs index d117d06..81a18a0 100644 --- a/src/games/cs.rs +++ b/src/games/cs.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::CS.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::CS.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/cscz.rs b/src/games/cscz.rs index 6cb4a3d..ac8b199 100644 --- a/src/games/cscz.rs +++ b/src/games/cscz.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::CSCZ.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::CSCZ.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/csgo.rs b/src/games/csgo.rs index 4502694..f65944a 100644 --- a/src/games/csgo.rs +++ b/src/games/csgo.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::CSGO.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::CSGO.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/css.rs b/src/games/css.rs index c054ceb..01a0ae3 100644 --- a/src/games/css.rs +++ b/src/games/css.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::CSS.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::CSS.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/dod.rs b/src/games/dod.rs index 99ad0b0..56687bf 100644 --- a/src/games/dod.rs +++ b/src/games/dod.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::DOD.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::DOD.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/dods.rs b/src/games/dods.rs index 7d05166..96be872 100644 --- a/src/games/dods.rs +++ b/src/games/dods.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::DODS.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::DODS.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/doi.rs b/src/games/doi.rs index 53ccc0d..bfee0f3 100644 --- a/src/games/doi.rs +++ b/src/games/doi.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::DOI.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::DOI.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/dst.rs b/src/games/dst.rs index be27ba4..256a1b7 100644 --- a/src/games/dst.rs +++ b/src/games/dst.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27016, - Some(port) => port - }, SteamApp::DST.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27016), SteamApp::DST.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/gm.rs b/src/games/gm.rs index ca15b7b..6fec055 100644 --- a/src/games/gm.rs +++ b/src/games/gm.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::GM.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27016), SteamApp::GM.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/hl2dm.rs b/src/games/hl2dm.rs index 187eb21..c885128 100644 --- a/src/games/hl2dm.rs +++ b/src/games/hl2dm.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::HL2DM.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::HL2DM.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/hldms.rs b/src/games/hldms.rs index 8049140..325fd95 100644 --- a/src/games/hldms.rs +++ b/src/games/hldms.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::HLDMS.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::HLDMS.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/ins.rs b/src/games/ins.rs index 819ee26..61f7759 100644 --- a/src/games/ins.rs +++ b/src/games/ins.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::INS.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::INS.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/insmic.rs b/src/games/insmic.rs index 9678a06..82ac53a 100644 --- a/src/games/insmic.rs +++ b/src/games/insmic.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::INSMIC.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::INSMIC.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/inss.rs b/src/games/inss.rs index 2f009f4..ee53a45 100644 --- a/src/games/inss.rs +++ b/src/games/inss.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27131, - Some(port) => port - }, SteamApp::INSS.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27131), SteamApp::INSS.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/l4d.rs b/src/games/l4d.rs index 0bb98c6..168f678 100644 --- a/src/games/l4d.rs +++ b/src/games/l4d.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::L4D.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::L4D.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/l4d2.rs b/src/games/l4d2.rs index 3fb161f..09120cf 100644 --- a/src/games/l4d2.rs +++ b/src/games/l4d2.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::L4D2.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::L4D2.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/mc.rs b/src/games/mc.rs index 6b03328..6172220 100644 --- a/src/games/mc.rs +++ b/src/games/mc.rs @@ -40,15 +40,9 @@ pub fn query_bedrock(address: &str, port: Option) -> GDResult) -> u16 { - match port { - None => 25565, - Some(port) => port - } + port.unwrap_or(25565) } fn port_or_bedrock_default(port: Option) -> u16 { - match port { - None => 19132, - Some(port) => port - } + port.unwrap_or(19132) } diff --git a/src/games/ohd.rs b/src/games/ohd.rs index 245a05f..b024917 100644 --- a/src/games/ohd.rs +++ b/src/games/ohd.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27005, - Some(port) => port - }, SteamApp::OHD.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27005), SteamApp::OHD.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/onset.rs b/src/games/onset.rs index c5b40bd..ce58ba9 100644 --- a/src/games/onset.rs +++ b/src/games/onset.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 7776, - Some(port) => port - }, SteamApp::ONSET.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(7776), SteamApp::ONSET.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/pz.rs b/src/games/pz.rs index 2a02a0a..8fda807 100644 --- a/src/games/pz.rs +++ b/src/games/pz.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 16261, - Some(port) => port - }, SteamApp::PZ.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(16261), SteamApp::PZ.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/ror2.rs b/src/games/ror2.rs index 625cf0a..019010a 100644 --- a/src/games/ror2.rs +++ b/src/games/ror2.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27016, - Some(port) => port - }, SteamApp::ROR2.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27016), SteamApp::ROR2.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/rust.rs b/src/games/rust.rs index 32845e6..cdd1c02 100644 --- a/src/games/rust.rs +++ b/src/games/rust.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::RUST.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::RUST.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/sc.rs b/src/games/sc.rs index 27d1ae0..ea8b029 100644 --- a/src/games/sc.rs +++ b/src/games/sc.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::SC.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::SC.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/sdtd.rs b/src/games/sdtd.rs index 3d3db26..c618034 100644 --- a/src/games/sdtd.rs +++ b/src/games/sdtd.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 26900, - Some(port) => port - }, SteamApp::SDTD.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(26900), SteamApp::SDTD.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/tf.rs b/src/games/tf.rs index 6e3fb5d..5605c5f 100644 --- a/src/games/tf.rs +++ b/src/games/tf.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27016, - Some(port) => port - }, SteamApp::TF.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27016), SteamApp::TF.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/tf2.rs b/src/games/tf2.rs index 79d9379..ca83dc4 100644 --- a/src/games/tf2.rs +++ b/src/games/tf2.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::TF2.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::TF2.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/tfc.rs b/src/games/tfc.rs index 125f7e9..69229cd 100644 --- a/src/games/tfc.rs +++ b/src/games/tfc.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::TFC.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::TFC.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/ts.rs b/src/games/ts.rs index 78d0143..3d72811 100644 --- a/src/games/ts.rs +++ b/src/games/ts.rs @@ -82,10 +82,7 @@ impl Response { } pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::TS.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::TS.as_engine(), None, None)?; Ok(Response::new_from_valve_response(valve_response)) } diff --git a/src/games/unturned.rs b/src/games/unturned.rs index 2871101..b971dbf 100644 --- a/src/games/unturned.rs +++ b/src/games/unturned.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27015, - Some(port) => port - }, SteamApp::UNTURNED.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27015), SteamApp::UNTURNED.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) } diff --git a/src/games/ut.rs b/src/games/ut.rs index 486b590..a22fd79 100644 --- a/src/games/ut.rs +++ b/src/games/ut.rs @@ -3,8 +3,5 @@ use crate::protocols::gamespy; use crate::protocols::gamespy::Response; pub fn query(address: &str, port: Option) -> GDResult { - gamespy::one::query(address, match port { - None => 7778, - Some(port) => port - }, None) + gamespy::one::query(address, port.unwrap_or(7778), None) } diff --git a/src/games/vr.rs b/src/games/vr.rs index acba3a5..91d2105 100644 --- a/src/games/vr.rs +++ b/src/games/vr.rs @@ -3,10 +3,7 @@ use crate::protocols::valve; use crate::protocols::valve::{game, SteamApp}; pub fn query(address: &str, port: Option) -> GDResult { - let valve_response = valve::query(address, match port { - None => 27016, - Some(port) => port - }, SteamApp::VR.as_engine(), None, None)?; + let valve_response = valve::query(address, port.unwrap_or(27016), SteamApp::VR.as_engine(), None, None)?; Ok(game::Response::new_from_valve_response(valve_response)) }