From ac873d385ef50f98d4e516e1ca3b6839f82bef9f Mon Sep 17 00:00:00 2001 From: 132nd-Professor <132nd-Professor> Date: Fri, 12 Aug 2022 22:06:01 +0200 Subject: [PATCH] replace purple with violet --- src/main.rs | 2 +- src/tacview.rs | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main.rs b/src/main.rs index 223fef4..f736710 100644 --- a/src/main.rs +++ b/src/main.rs @@ -29,7 +29,7 @@ fn main_inner() -> Result<(), Box> { let body = Arc::new(body); let input_filename = Arc::new(input_filename); - let coalitions = vec![Coalition::Blue, Coalition::Red, Coalition::Purple]; + let coalitions = vec![Coalition::Blue, Coalition::Red, Coalition::Violet]; // clippy wants us to combine both ierators into one. this is not what we want, because then // we would spawn a thread, join it, and only then spawn a new one. diff --git a/src/tacview.rs b/src/tacview.rs index 2441d3d..d4ae706 100644 --- a/src/tacview.rs +++ b/src/tacview.rs @@ -5,7 +5,7 @@ use std::fmt::Display; pub enum Coalition { Blue, Red, - Purple, + Violet, All, Unknown, } @@ -17,8 +17,8 @@ impl Coalition { Self::Blue } else if line.contains("Color=Red") { Self::Red - } else if line.contains("Color=Purple") { - Self::Purple + } else if line.contains("Color=Violet") { + Self::Violet } else { Self::Unknown } @@ -37,7 +37,7 @@ impl Display for Coalition { match self { Self::Blue => "blue".to_string(), Self::Red => "red".to_string(), - Self::Purple => "purple".to_string(), + Self::Violet => "violet".to_string(), Self::All => "all".to_string(), Self::Unknown => "unknown".to_string(), } @@ -48,20 +48,20 @@ impl Display for Coalition { pub struct CoalitionIDs<'a> { pub blue: HashSet<&'a str>, pub red: HashSet<&'a str>, - pub purple: HashSet<&'a str>, + pub violet: HashSet<&'a str>, } impl<'a> CoalitionIDs<'a> { pub fn new() -> Self { - let (blue, red, purple) = (HashSet::new(), HashSet::new(), HashSet::new()); - Self { blue, red, purple } + let (blue, red, violet) = (HashSet::new(), HashSet::new(), HashSet::new()); + Self { blue, red, violet } } pub fn insert(&mut self, id: &'a str, coalition: &Coalition) { match coalition { Coalition::Blue => self.blue.insert(id), Coalition::Red => self.red.insert(id), - Coalition::Purple => self.purple.insert(id), + Coalition::Violet => self.violet.insert(id), Coalition::All | Coalition::Unknown => false, }; } @@ -71,8 +71,8 @@ impl<'a> CoalitionIDs<'a> { Some(Coalition::Blue) } else if self.red.contains(id) { Some(Coalition::Red) - } else if self.purple.contains(id) { - Some(Coalition::Purple) + } else if self.violet.contains(id) { + Some(Coalition::Violet) } else { None }