From 828f0d83dcb258a8e5efd55a7775592c6e5f77bc Mon Sep 17 00:00:00 2001 From: tom barrett Date: Thu, 28 Jun 2018 04:00:48 -0500 Subject: -moved over it if let from bad matches --- src/modules/navigation.rs | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) (limited to 'src/modules/navigation.rs') diff --git a/src/modules/navigation.rs b/src/modules/navigation.rs index c4b3224..84f315c 100644 --- a/src/modules/navigation.rs +++ b/src/modules/navigation.rs @@ -32,19 +32,11 @@ impl Navigation { } pub fn process(&mut self) { - match self.start.clone() { - Some(timer) => { - if timer.elapsed().unwrap().as_secs() > self.time { - self.status = NavigationStatus::Targeted; - self.start = None; - } + if let Some(timer) = self.start.clone() { + if timer.elapsed().unwrap().as_secs() > self.time { + self.status = NavigationStatus::Targeted; + self.start = None; } - _ => (), - } - - match self.target_name { - None => self.status = NavigationStatus::None, - _ => (), } } @@ -55,15 +47,12 @@ impl Navigation { } pub fn verify_target(&mut self, ship_position : (f64, f64, f64), masses : &HashMap) { - match self.target_name.clone() { - Some(name) => { - let target = masses.get(&name).unwrap(); - if distance(target.position, ship_position) > self.range { - self.target_name = None; - self.status = NavigationStatus::None; - } + if let Some(name) = self.target_name.clone() { + let target = masses.get(&name).unwrap(); + if distance(target.position, ship_position) > self.range { + self.target_name = None; + self.status = NavigationStatus::None; } - _ => (), } } } -- cgit v1.2.3