[Games] Use port.unwrap_or instead of matching it

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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") {

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<u16>) -> GDResult<game::Response> {
-    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))
 }

src/games/bf1942.rs

@@ -3,8 +3,5 @@ use crate::protocols::gamespy;
 use crate::protocols::gamespy::Response;
 
 pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
-    gamespy::one::query(address, match port {
-        None => 23000,
-        Some(port) => port
-    }, None)
+    gamespy::one::query(address, port.unwrap_or(23000), None)
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

src/games/mc.rs

@@ -40,15 +40,9 @@ pub fn query_bedrock(address: &str, port: Option<u16>) -> GDResult<BedrockRespon
 }
 
 fn port_or_java_default(port: Option<u16>) -> u16 {
-    match port {
-        None => 25565,
-        Some(port) => port
-    }
+    port.unwrap_or(25565)
 }
 
 fn port_or_bedrock_default(port: Option<u16>) -> u16 {
-    match port {
-        None => 19132,
-        Some(port) => port
-    }
+    port.unwrap_or(19132)
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

src/games/ts.rs

@@ -82,10 +82,7 @@ impl Response {
 }
 
 pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
-    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))
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }

src/games/ut.rs

@@ -3,8 +3,5 @@ use crate::protocols::gamespy;
 use crate::protocols::gamespy::Response;
 
 pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
-    gamespy::one::query(address, match port {
-        None => 7778,
-        Some(port) => port
-    }, None)
+    gamespy::one::query(address, port.unwrap_or(7778), None)
 }

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<u16>) -> GDResult<game::Response> {
-    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))
 }