From e5d17b6a7da5f90c6f7eb096144486b4d6bc17ec Mon Sep 17 00:00:00 2001 From: Guilleag01 Date: Wed, 9 Aug 2023 14:19:22 +0200 Subject: [PATCH] some code quality fixes --- src/app.rs | 6 ++---- src/components/button.rs | 14 +++++++------- src/minesweeper/board.rs | 30 +++++++++++++++--------------- src/minesweeper/cell.rs | 16 ++++++++-------- src/minesweeper/mod.rs | 5 +++-- 5 files changed, 35 insertions(+), 36 deletions(-) diff --git a/src/app.rs b/src/app.rs index c65d949..e2c2daf 100644 --- a/src/app.rs +++ b/src/app.rs @@ -1,5 +1,3 @@ -#[warn(unused_assignments)] - // use serde_wasm_bindgen::to_value; use wasm_bindgen::prelude::*; use web_sys::HtmlInputElement; @@ -49,7 +47,7 @@ impl Component for App { fn create(ctx: &Context) -> Self { let height = 10; let width = 10; - let num_mines =(height * width / 10) as usize; + let num_mines = height * width / 10; let mut game = Game::new(height, width, 5); game.start_board(); @@ -142,7 +140,7 @@ impl Component for App { if re.is_match(&text) { value = text.parse().unwrap(); } - return value; + value }; match msg { diff --git a/src/components/button.rs b/src/components/button.rs index 31af1ae..bf0ee55 100644 --- a/src/components/button.rs +++ b/src/components/button.rs @@ -1,4 +1,4 @@ -use std::fmt::format; +// use std::fmt::format; use yew::{prelude::*, html::Scope}; use crate::minesweeper::cell::Cell; @@ -36,11 +36,11 @@ impl Component for Button { fn create(ctx: &Context) -> Self { Self { link: ctx.link().clone(), - cell: ctx.props().cell.clone(), + cell: ctx.props().cell.to_owned(), onsignal: ctx.props().onsignal.clone(), flagsignal: ctx.props().flagsignal.clone(), - width: ctx.props().width.clone(), - height: ctx.props().height.clone() + width: ctx.props().width.to_owned(), + height: ctx.props().height.to_owned() } } @@ -93,11 +93,11 @@ impl Component for Button { } fn changed(&mut self, ctx: &Context, _old_props: &Self::Properties) -> bool { - self.cell = ctx.props().cell.clone(); + self.cell = ctx.props().cell.to_owned(); self.onsignal = ctx.props().onsignal.clone(); self.flagsignal = ctx.props().flagsignal.clone(); - self.width = ctx.props().width.clone(); - self.height = ctx.props().height.clone(); + self.width = ctx.props().width.to_owned(); + self.height = ctx.props().height.to_owned(); true } } \ No newline at end of file diff --git a/src/minesweeper/board.rs b/src/minesweeper/board.rs index 2457553..ade1fc7 100644 --- a/src/minesweeper/board.rs +++ b/src/minesweeper/board.rs @@ -19,12 +19,12 @@ impl Board { } } - return Self { + Self { board: t, height, width, num_mines - }; + } } pub fn calculate_value(&self, pos: (usize, usize)) -> usize { @@ -37,11 +37,11 @@ impl Board { } } } - return value; + value } pub fn get_board(&self) -> &Vec> { - return &self.board; + &self.board } pub fn set_mine(&mut self, pos: (usize, usize), value: bool) { @@ -49,31 +49,31 @@ impl Board { } pub fn get_height(&self) -> usize { - return self.height; + self.height } pub fn get_width(&self) -> usize { - return self.width; + self.width } pub fn get_num_mines(&self) -> usize { - return self.num_mines; + self.num_mines } pub fn is_mine(&self, pos: (usize, usize)) -> bool { - return self.board[pos.0][pos.1].is_mine(); + self.board[pos.0][pos.1].is_mine() } pub fn get_value(&self, pos: (usize, usize)) -> usize { - return self.board[pos.0][pos.1].get_value(); + self.board[pos.0][pos.1].get_value() } pub fn get_cell(&self, pos: (usize, usize)) -> Cell { - return self.board[pos.0][pos.1]; + self.board[pos.0][pos.1] } pub fn set_value(&mut self, pos: (usize, usize), new_value: usize) { - return self.board[pos.0][pos.1].set_value(new_value) + self.board[pos.0][pos.1].set_value(new_value) } pub fn show_cell(&mut self, pos: (usize, usize)) { @@ -97,18 +97,18 @@ impl ToString for Board { // result.push_str(" "); result.push_str(i.to_string().as_str()); } - result.push_str("\n"); + result.push('\n'); for i in 0..self.height { result.push_str(i.to_string().as_str()); - result.push_str(" "); + result.push(' '); for j in 0..self.width { result.push_str(self.get_cell((i, j)).to_string().as_str()); } - result.push_str("\n"); + result.push(' '); } - return result; + result } } \ No newline at end of file diff --git a/src/minesweeper/cell.rs b/src/minesweeper/cell.rs index 7186b4c..9ce00dd 100644 --- a/src/minesweeper/cell.rs +++ b/src/minesweeper/cell.rs @@ -10,22 +10,22 @@ pub struct Cell { impl Cell { pub fn new(pos: (usize, usize)) -> Self { - return Self { + Self { pos, mine: false, value: 0, hidden: true, flagged: false, delay: 0.0 - }; + } } pub fn get_pos(&self) -> (usize, usize) { - return self.pos; + self.pos } pub fn is_mine(&self) -> bool { - return self.mine; + self.mine } pub fn set_mine(&mut self, new_mine: bool) { @@ -33,7 +33,7 @@ impl Cell { } pub fn get_value(&self) -> usize { - return self.value; + self.value } pub fn set_value(&mut self, new_value: usize) { @@ -46,11 +46,11 @@ impl Cell { } pub fn is_hidden(&self) -> bool { - return self.hidden; + self.hidden } pub fn is_flagged(&self) -> bool { - return self.flagged; + self.flagged } pub fn set_flag(&mut self, new_flag: bool) { @@ -83,6 +83,6 @@ impl ToString for Cell { return " ".to_string(); } - return self.value.to_string(); + self.value.to_string() } } \ No newline at end of file diff --git a/src/minesweeper/mod.rs b/src/minesweeper/mod.rs index a969af9..ac8389d 100644 --- a/src/minesweeper/mod.rs +++ b/src/minesweeper/mod.rs @@ -47,9 +47,10 @@ impl Game { return; } - let mut cells_to_show = Vec::<(usize, usize)>::new(); + // let mut cells_to_show = Vec::<(usize, usize)>::new(); + let mut cells_to_show = Vec::<(usize, usize)>::from([init_pos]); - cells_to_show.push(init_pos); + // cells_to_show.push(init_pos); self.board.get_cell(init_pos).set_delay(0.0);