From ab797e7f30e5e8913faf73516346129b9a620550 Mon Sep 17 00:00:00 2001 From: tom barrett Date: Wed, 11 Apr 2018 09:00:27 -0500 Subject: -moved over to hashmap --- src/mining.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/mining.rs') diff --git a/src/mining.rs b/src/mining.rs index ecc83c5..df425e0 100644 --- a/src/mining.rs +++ b/src/mining.rs @@ -1,4 +1,5 @@ use std::io::{BufReader, BufRead}; +use std::collections::HashMap; use std::net::TcpStream; use std::io::{stdout, Read, Write}; use termion::raw::IntoRawMode; @@ -59,12 +60,13 @@ pub fn client_mining(mut stream : TcpStream, mut buff_r : BufReader) } impl Connection { - pub fn server_mining(&mut self, masses : &mut Vec>) -> bool { - let m = masses.to_vec(); - let mass = masses.into_iter().find(|ship| ship.name() == &self.name).unwrap(); + pub fn server_mining(&mut self, masses : &mut HashMap>) -> bool { + let masses_clone = masses.clone(); + let mass = masses.get_mut(&self.name).unwrap(); let ship = mass.downcast_mut::().unwrap(); + let target = match ship.recv_target() { - Some(name) => m.iter().find(|target| target.name() == &name), + Some(name) => masses_clone.get(&name), None => None, }; -- cgit v1.2.3