diff --git a/src/core.rs b/src/core.rs index b1c858f..df73587 100644 --- a/src/core.rs +++ b/src/core.rs @@ -153,7 +153,6 @@ fn register_message(events: &mut meter::Meter, message: &game_protocol::Message) #[cfg(test)] mod tests { use super::*; - use fake_clock::FakeClock as Instant; use cpython::{PyClone, PyDict, PyFloat, PyUnicode}; diff --git a/src/meter/types.rs b/src/meter/types.rs index 1373b59..d93eb62 100644 --- a/src/meter/types.rs +++ b/src/meter/types.rs @@ -1,4 +1,6 @@ +use std::collections::HashSet; use std::collections::HashMap; +use std::iter::FromIterator; #[cfg(test)] use fake_clock::FakeClock as Instant; @@ -18,23 +20,23 @@ use super::traits::FameStats; #[derive(Debug, PartialEq, Clone)] pub struct Party { pub id: usize, - pub members: Vec + pub members: HashSet } impl Party { pub fn new(id: usize, members: &std::vec::Vec) -> Self { Self { id, - members: members.clone(), + members: HashSet::from_iter(members.iter().cloned()), } } pub fn add_member(&mut self, member_name: &str) { - self.members.push(member_name.to_string()); + self.members.insert(member_name.to_string()); } pub fn includes(&self, other: &str) -> bool { - return self.members.iter().find(|m| **m == other).is_some(); + return self.members.contains(other); } }