tribufu/rust-gamedig
1
0
Fork 0
mirror of https://github.com/tribufu/rust-gamedig synced 2026-06-01 09:42:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "[Service] Add merge methods on SearchFilters"

Browse source 
This reverts commit a17f5ad4d2.
This commit is contained in:
CosminPerRam 2023-05-08 14:59:55 +03:00
parent a17f5ad4d2
commit a8e2b51dbb
2 changed files with 0 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -6,9 +6,6 @@ Protocols:
- Valve: - Valve:
1. Added standard and serde derives to `GatheringSettings`. 1. Added standard and serde derives to `GatheringSettings`.
Services:
1. Added methods to merge two search filters together.
### Breaking: ### Breaking:
Nothing, yet... Nothing, yet...

73
src/services/valve_master_server/types.rs
View file

@ -154,28 +154,6 @@ impl<'a> SearchFilters<'a> {
} }
} }
pub fn merge_all(self, others: SearchFilters<'a>) -> Self {
let mut updated = self.merge_normals(&others);
updated = updated.merge_nors(&others);
updated = updated.merge_nands(&others);
updated
}
pub fn merge_normals(self, others: &SearchFilters<'a>) -> Self {
let mut updated_fitler = self.filters;
for (filter_key, filter_value) in &others.filters {
updated_fitler.insert(*filter_key, *filter_value);
}
Self {
filters: updated_fitler,
nand_filters: self.nand_filters,
nor_filters: self.nor_filters,
}
}
pub fn insert(self, filter: Filter<'a>) -> Self { pub fn insert(self, filter: Filter<'a>) -> Self {
let mut updated_fitler = self.filters; let mut updated_fitler = self.filters;
updated_fitler.insert(std::mem::discriminant(&filter), filter); updated_fitler.insert(std::mem::discriminant(&filter), filter);
@ -187,20 +165,6 @@ impl<'a> SearchFilters<'a> {
} }
} }
pub fn merge_nands(self, others: &SearchFilters<'a>) -> Self {
let mut updated_fitler = self.nand_filters;
for (filter_key, filter_value) in &others.nand_filters {
updated_fitler.insert(*filter_key, *filter_value);
}
Self {
filters: self.filters,
nand_filters: updated_fitler,
nor_filters: self.nor_filters,
}
}
pub fn insert_nand(self, filter: Filter<'a>) -> Self { pub fn insert_nand(self, filter: Filter<'a>) -> Self {
let mut updated_fitler = self.nor_filters; let mut updated_fitler = self.nor_filters;
updated_fitler.insert(std::mem::discriminant(&filter), filter); updated_fitler.insert(std::mem::discriminant(&filter), filter);
@ -212,20 +176,6 @@ impl<'a> SearchFilters<'a> {
} }
} }
pub fn merge_nors(self, others: &SearchFilters<'a>) -> Self {
let mut updated_fitler = self.nor_filters;
for (filter_key, filter_value) in &others.nor_filters {
updated_fitler.insert(*filter_key, *filter_value);
}
Self {
filters: self.filters,
nand_filters: self.nand_filters,
nor_filters: updated_fitler,
}
}
pub fn insert_nor(self, filter: Filter<'a>) -> Self { pub fn insert_nor(self, filter: Filter<'a>) -> Self {
let mut updated_fitler = self.nand_filters; let mut updated_fitler = self.nand_filters;
updated_fitler.insert(std::mem::discriminant(&filter), filter); updated_fitler.insert(std::mem::discriminant(&filter), filter);
@ -280,26 +230,3 @@ pub enum Region {
Africa = 0x07, Africa = 0x07,
Others = 0xFF, Others = 0xFF,
} }
#[cfg(test)]
mod tests {
use crate::valve_master_server::{Filter, SearchFilters};
#[test]
fn merge_normals_test() {
let filters_a = SearchFilters::new()
.insert(Filter::IsSecured(true));
let filters_b = SearchFilters::new()
.insert(Filter::CanBeFull(true))
.insert(Filter::IsSecured(false));
let combined = filters_a.merge_all(filters_b);
let composed = SearchFilters::new()
.insert(Filter::IsSecured(false))
.insert(Filter::CanBeFull(true));
assert_eq!(combined, composed)
}
}