remove server_type field from GenericServer

Author: vikpe

src/game_server/server.rs

@@ -165,7 +165,6 @@ mod tests {
     #[test]
     fn test_from_genericserver() {
         let generic = GenericServer {
-            server_type: ServerType::GameServer,
             software_type: SoftwareType::Mvdsv,
             ip: "10.10.10.10".to_string(),
             port: 28501,

src/generic_server/server.rs

@@ -8,7 +8,6 @@ use serde::ser::SerializeStruct;
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Hash, Default)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize))]
 pub struct GenericServer {
-    pub(crate) server_type: ServerType,
     pub(crate) software_type: SoftwareType,
     pub(crate) ip: String,
     pub(crate) port: u16,
@@ -21,7 +20,7 @@ pub struct GenericServer {
 #[allow(dead_code)]
 impl GenericServer {
     pub fn server_type(&self) -> ServerType {
-        self.server_type.clone()
+        ServerType::GenericServer
     }
 
     pub fn software_type(&self) -> SoftwareType {
@@ -93,15 +92,14 @@ impl serde::Serialize for GenericServer {
 #[cfg_attr(coverage_nightly, coverage(off))]
 mod tests {
     use super::*;
-    use crate::{Coords, GenericClient, GeoInfo, ServerType, SoftwareType};
+    use crate::{Coords, GenericClient, GeoInfo, SoftwareType};
     use pretty_assertions::assert_eq;
     use quake_serverinfo::Settings;
 
     #[cfg(feature = "serde")]
     #[test]
     fn test_serialization() -> anyhow::Result<()> {
         let server = GenericServer {
-            server_type: ServerType::GenericServer,
             software_type: SoftwareType::Unknown,
             ip: "10.10.10.10".to_string(),
             port: 28501,

src/net/query.rs

@@ -76,7 +76,6 @@ fn compose_server(
     });
 
     let server = GenericServer {
-        server_type: ServerType::from_version(&version),
         software_type: SoftwareType::from_version(&version),
         ip,
         port: hostport.port(),

src/proxy_server/server.rs

@@ -98,7 +98,6 @@ mod tests {
     #[test]
     fn test_from_genericserver() {
         let generic = GenericServer {
-            server_type: ServerType::ProxyServer,
             software_type: SoftwareType::Qtv,
             ip: "10.10.10.10".to_string(),
             port: 28501,

src/qtv_server/server.rs

@@ -95,7 +95,6 @@ mod tests {
     #[test]
     fn test_from_genericserver() {
         let generic = GenericServer {
-            server_type: ServerType::QtvServer,
             software_type: SoftwareType::Qtv,
             ip: "10.10.10.10".to_string(),
             port: 28501,