mb/rs48
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ran clippy

Browse source
This commit is contained in:
JOLIMAITRE Matthieu 2022-09-03 02:39:45 +02:00
parent 5c5e6357ad
commit 784a5d55a5
4 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rs48_lib/src/game.rs
View file

@ -110,7 +110,7 @@ impl Game {
}
let potential_count = potentials.len() as f32;
if potential_count == 0. {
return Err(GameError::GridIsFull.into());
return Err(GameError::GridIsFull);
}
let random = rand::random::<f32>() * potential_count;
let index = random.floor() as usize;
@ -160,7 +160,7 @@ impl Game {
direction: (isize, isize),
tile_pos: (usize, usize),
) -> usize {
if self.board.get(tile_pos.clone()).unwrap().is_empty() {
if self.board.get(tile_pos).unwrap().is_empty() {
0
} else {
let mut displacement = Displacement::new(&mut self.board, tile_pos, direction);
@ -202,7 +202,7 @@ impl<'g> Displacement<'g> {
}
fn move_once(&mut self) -> bool {
let current_pos = self.position.clone();
let current_pos = self.position;
let current_value = self.grid.get_val(current_pos).unwrap();
if let Some(next_pos) = self.get_next_pos() {
match self.grid.get_val(next_pos) {
@ -225,8 +225,8 @@ impl<'g> Displacement<'g> {
}
fn get_next_pos(&self) -> Option<(usize, usize)> {
let (current_x, current_y) = self.position.clone();
let (dx, dy) = self.direction.clone();
let (current_x, current_y) = self.position;
let (dx, dy) = self.direction;
if would_overflow(current_x, dx, self.grid.size() - 1)
|| would_overflow(current_y, dy, self.grid.size() - 1)
{