diff --git a/client/src/game.rs b/client/src/game.rs index 9bfca13..f2f8346 100644 --- a/client/src/game.rs +++ b/client/src/game.rs @@ -1,7 +1,7 @@ use ratatui::{ buffer::Buffer, layout::{Constraint, Layout, Rect}, - style::{Modifier, Style, palette::tailwind::*}, + style::{Modifier, Style, palette::tailwind::NEUTRAL}, symbols, text::Line, widgets::{Block, Borders, Widget}, diff --git a/client/src/main.rs b/client/src/main.rs index e38e7a3..0daa3db 100644 --- a/client/src/main.rs +++ b/client/src/main.rs @@ -1,3 +1,6 @@ +#![warn(clippy::pedantic)] +#![allow(clippy::wildcard_imports)] + use color_eyre::Result; mod game; diff --git a/client/src/menu.rs b/client/src/menu.rs index 2559a3e..eb962c1 100644 --- a/client/src/menu.rs +++ b/client/src/menu.rs @@ -3,7 +3,10 @@ use ratatui::{ buffer::Buffer, crossterm::event::{self, KeyCode, KeyEvent}, layout::{Constraint, Layout, Rect}, - style::{Modifier, Style, Stylize, palette::tailwind::*}, + style::{ + Modifier, Style, Stylize, + palette::tailwind::*, + }, text::{Line, Span}, widgets::{ Block, Borders, HighlightSpacing, List, ListState, Padding, Paragraph, StatefulWidget, diff --git a/client/src/tui.rs b/client/src/tui.rs index 87a73d7..f2d9976 100644 --- a/client/src/tui.rs +++ b/client/src/tui.rs @@ -9,7 +9,7 @@ use ratatui::{ use crate::game; use crate::menu; -use crate::util::*; +use crate::util::center; #[derive(Clone)] pub enum Mode { @@ -32,15 +32,13 @@ impl Default for Mode { impl Mode { pub fn run(mut self, mut terminal: DefaultTerminal) -> Result<()> { loop { - match self { - Mode::Exit => break, - _ => { - terminal.draw(|frame| frame.render_widget(&mut self, frame.area()))?; - if let Event::Key(key) = event::read()? { - self = self.handle_key(key); - }; - } + if let Mode::Exit = self { + break; } + terminal.draw(|frame| frame.render_widget(&mut self, frame.area()))?; + if let Event::Key(key) = event::read()? { + self = self.handle_key(key); + }; } Ok(()) }