diff --git a/src/apr.rs b/src/apr.rs index bf86394..ae711ff 100644 --- a/src/apr.rs +++ b/src/apr.rs @@ -54,7 +54,7 @@ impl Apr { // Load/create resources such as images here. let mut board = board::make_board(xlen, ylen); let mut actors: Vec = Vec::new(); - let mut behaviours: Vec = vec![behaviour::Behaviour { + let behaviours: Vec = vec![behaviour::Behaviour { moves: vec![ behaviour::MovePattern { movement: (1, 0), diff --git a/src/behaviour.rs b/src/behaviour.rs index 0152104..29e93dd 100644 --- a/src/behaviour.rs +++ b/src/behaviour.rs @@ -23,9 +23,8 @@ pub struct MovePatIt<'a> { impl Iterator for MovePatIt<'_> { type Item = MovePattern; fn next(&mut self) -> Option { - match self.cache.pop() { - Some(x) => return Some(x), - None => (), + if let Some(x) = self.cache.pop() { + return Some(x); } let k = self.iter.next()?; @@ -59,7 +58,7 @@ impl Iterator for MovePatIt<'_> { }); } - return Some(*k); + Some(*k) } } //if naive sucks diff --git a/src/main.rs b/src/main.rs index b24ee91..c8ac199 100644 --- a/src/main.rs +++ b/src/main.rs @@ -32,3 +32,4 @@ fn main() -> GameResult<()> { // Run! event::run(ctx, event_loop, apr); } +