[Crate] Enforce formatting in CI (#46)

* [CI] Check formatting

* Format all files
This commit is contained in:
Tom 2023-06-10 15:15:12 +00:00 committed by GitHub
parent a6279177bb
commit b95b2abe0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
76 changed files with 251 additions and 170 deletions

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,9 +1,9 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDError::TypeParse,
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let mut valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,7 +1,7 @@
use std::net::{IpAddr, SocketAddr};
use crate::protocols::gamespy;
use crate::protocols::gamespy::one::Response;
use crate::GDResult;
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<Response> {
gamespy::one::query(&SocketAddr::new(*address, port.unwrap_or(23000)), None)

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,7 +1,7 @@
use std::net::{IpAddr, SocketAddr};
use crate::protocols::gamespy;
use crate::protocols::gamespy::three::Response;
use crate::GDResult;
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<Response> {
gamespy::three::query(&SocketAddr::new(*address, port.unwrap_or(64100)), None)

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,9 +1,9 @@
use std::net::{IpAddr, SocketAddr};
use crate::protocols::types::TimeoutSettings;
use crate::protocols::valve::{Engine, Environment, Server, ValveProtocol};
use crate::GDResult;
#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
use std::net::{IpAddr, SocketAddr};
/// The query response.
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
@ -47,8 +47,15 @@ pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<Response> {
query_with_timeout(address, port, TimeoutSettings::default())
}
pub fn query_with_timeout(address: &IpAddr, port: Option<u16>, timeout_settings: TimeoutSettings) -> GDResult<Response> {
let mut client = ValveProtocol::new(&SocketAddr::new(*address, port.unwrap_or(5478)), Some(timeout_settings))?;
pub fn query_with_timeout(
address: &IpAddr,
port: Option<u16>,
timeout_settings: TimeoutSettings,
) -> GDResult<Response> {
let mut client = ValveProtocol::new(
&SocketAddr::new(*address, port.unwrap_or(5478)),
Some(timeout_settings),
)?;
let mut buffer = client.get_request_data(
&Engine::GoldSrc(true),
0,

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,9 +1,9 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::minecraft::{self, BedrockResponse, JavaResponse, LegacyGroup},
GDError,
GDResult,
};
use std::net::{IpAddr, SocketAddr};
/// Query with all the protocol variants one by one (Java -> Bedrock -> Legacy
/// (1.6 -> 1.4 -> Beta 1.8)).
@ -35,12 +35,19 @@ pub fn query_legacy(address: &IpAddr, port: Option<u16>) -> GDResult<JavaRespons
/// Query a specific (Java) Legacy Server.
pub fn query_legacy_specific(group: LegacyGroup, address: &IpAddr, port: Option<u16>) -> GDResult<JavaResponse> {
minecraft::query_legacy_specific(group, &SocketAddr::new(*address, port_or_java_default(port)), None)
minecraft::query_legacy_specific(
group,
&SocketAddr::new(*address, port_or_java_default(port)),
None,
)
}
/// Query a Bedrock Server.
pub fn query_bedrock(address: &IpAddr, port: Option<u16>) -> GDResult<BedrockResponse> {
minecraft::query_bedrock(&SocketAddr::new(*address, port_or_bedrock_default(port)), None)
minecraft::query_bedrock(
&SocketAddr::new(*address, port_or_bedrock_default(port)),
None,
)
}
fn port_or_java_default(port: Option<u16>) -> u16 { port.unwrap_or(25565) }

View file

@ -34,6 +34,8 @@ pub mod cscz;
pub mod csgo;
/// Counter-Strike: Source
pub mod css;
/// Crysis Wars
pub mod cw;
/// Day of Defeat
pub mod dod;
/// Day of Defeat: Source
@ -50,6 +52,8 @@ pub mod gm;
pub mod hl2dm;
/// Half-Life Deathmatch: Source
pub mod hldms;
/// Hell Let Loose
pub mod hll;
/// Insurgency
pub mod ins;
/// Insurgency: Modern Infantry Combat
@ -68,6 +72,12 @@ pub mod ohd;
pub mod onset;
/// Project Zomboid
pub mod pz;
/// Quake 1
pub mod quake1;
/// Quake 2
pub mod quake2;
/// Quake 3: Arena
pub mod quake3a;
/// Risk of Rain 2
pub mod ror2;
/// Rust
@ -76,6 +86,8 @@ pub mod rust;
pub mod sc;
/// 7 Days To Die
pub mod sdtd;
/// Soldier of Fortune 2
pub mod sof2;
/// Serious Sam
pub mod ss;
/// The Forest
@ -92,15 +104,3 @@ pub mod unturned;
pub mod ut;
/// V Rising
pub mod vr;
/// Crysis Wars
pub mod cw;
/// Quake 2
pub mod quake2;
/// Quake 1
pub mod quake1;
/// Quake 3: Arena
pub mod quake3a;
/// Hell Let Loose
pub mod hll;
/// Soldier of Fortune 2
pub mod sof2;

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::GDResult;
use crate::protocols::quake;
use crate::protocols::quake::Response;
use crate::protocols::quake::one::Player;
use crate::protocols::quake::Response;
use crate::GDResult;
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<Response<Player>> {
quake::one::query(&SocketAddr::new(*address, port.unwrap_or(27500)), None)

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::GDResult;
use crate::protocols::quake;
use crate::protocols::quake::Response;
use crate::protocols::quake::two::Player;
use crate::protocols::quake::Response;
use crate::GDResult;
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<Response<Player>> {
quake::two::query(&SocketAddr::new(*address, port.unwrap_or(27910)), None)

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::GDResult;
use crate::protocols::quake;
use crate::protocols::quake::Response;
use crate::protocols::quake::two::Player;
use crate::protocols::quake::Response;
use crate::GDResult;
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<Response<Player>> {
quake::three::query(&SocketAddr::new(*address, port.unwrap_or(27960)), None)

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::GDResult;
use crate::protocols::quake;
use crate::protocols::quake::Response;
use crate::protocols::quake::two::Player;
use crate::protocols::quake::Response;
use crate::GDResult;
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<Response<Player>> {
quake::three::query(&SocketAddr::new(*address, port.unwrap_or(20100)), None)

View file

@ -1,7 +1,7 @@
use std::net::{IpAddr, SocketAddr};
use crate::protocols::gamespy;
use crate::protocols::gamespy::one::Response;
use crate::GDResult;
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<Response> {
gamespy::one::query(&SocketAddr::new(*address, port.unwrap_or(25601)), None)

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, get_optional_extracted_data, Server, ServerPlayer, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
use std::collections::HashMap;

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(

View file

@ -1,7 +1,7 @@
use std::net::{IpAddr, SocketAddr};
use crate::protocols::gamespy;
use crate::protocols::gamespy::one::Response;
use crate::GDResult;
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<Response> {
gamespy::one::query(&SocketAddr::new(*address, port.unwrap_or(7778)), None)

View file

@ -1,8 +1,8 @@
use std::net::{IpAddr, SocketAddr};
use crate::{
protocols::valve::{self, game, SteamApp},
GDResult,
};
use std::net::{IpAddr, SocketAddr};
pub fn query(address: &IpAddr, port: Option<u16>) -> GDResult<game::Response> {
let valve_response = valve::query(