style: Using clippy lints

This commit is contained in:
Lukas Wölfer
2026-01-24 09:05:22 +01:00
parent 0081e79492
commit d9eaeb1848
3 changed files with 26 additions and 35 deletions

View File

@@ -6,3 +6,12 @@ edition = "2024"
[dependencies] [dependencies]
crossterm = "0.29" crossterm = "0.29"
ratatui = { version = "0.30", features = ["crossterm"] } ratatui = { version = "0.30", features = ["crossterm"] }
[lints.clippy]
pedantic = "warn"
nursery = "warn"
restriction = "warn"
unused_trait_names = "warn"
missing_docs_in_private_items = "warn"
empty_structs_with_brackets = "warn"
let_underscore_must_use = "warn"

View File

@@ -1,6 +1,3 @@
use std::io::{self, Read};
use std::time::Duration;
use crossterm::event::{self, Event, KeyCode}; use crossterm::event::{self, Event, KeyCode};
use crossterm::execute; use crossterm::execute;
use crossterm::terminal::{EnterAlternateScreen, enable_raw_mode}; use crossterm::terminal::{EnterAlternateScreen, enable_raw_mode};
@@ -9,7 +6,8 @@ use ratatui::backend::CrosstermBackend;
use ratatui::layout::{Constraint, Direction, Layout}; use ratatui::layout::{Constraint, Direction, Layout};
use ratatui::style::Style; use ratatui::style::Style;
use ratatui::widgets::{Block, Borders, List, ListItem, ListState}; use ratatui::widgets::{Block, Borders, List, ListItem, ListState};
use std::io::{self, Read as _};
use core::time::Duration;
mod terminal_guard; mod terminal_guard;
use terminal_guard::TerminalModeGuard; use terminal_guard::TerminalModeGuard;
@@ -29,7 +27,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
let mut stdout = std::io::stdout(); let mut stdout = std::io::stdout();
execute!(stdout, EnterAlternateScreen)?; execute!(stdout, EnterAlternateScreen)?;
let mut _mode_guard = TerminalModeGuard::new(); let mut _mode_guard = TerminalModeGuard::default();
let backend = CrosstermBackend::new(stdout); let backend = CrosstermBackend::new(stdout);
let mut terminal = Terminal::new(backend)?; let mut terminal = Terminal::new(backend)?;
@@ -72,23 +70,17 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Event::Key(key) => match key.code { Event::Key(key) => match key.code {
KeyCode::Char('q') => break, KeyCode::Char('q') => break,
KeyCode::Up => { KeyCode::Up => {
if let Some(i) = state.selected() if let Some(i) = state.selected() {
&& i > 0 state.select(Some(i.saturating_sub(1)));
{
state.select(Some(i - 1));
} }
} }
KeyCode::Down => { KeyCode::Down => {
if let Some(i) = state.selected() if let Some(i) = state.selected() {
&& i + 1 < lines.len() state.select(Some((i + 1).min(lines.len() - 1)));
{
state.select(Some(i + 1));
} }
} }
KeyCode::Char(' ') => { KeyCode::Char(' ') => {
if let Some(i) = state.selected() if let Some(i) = state.selected() {
&& i < marked.len()
{
assert!(i < marked.len()); assert!(i < marked.len());
if !marked[i] { if !marked[i] {
let next = lines.len().min(i + 1); let next = lines.len().min(i + 1);
@@ -118,7 +110,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
} }
} }
_mode_guard.cleanup(); drop(_mode_guard);
terminal.show_cursor()?; terminal.show_cursor()?;
Ok(()) Ok(())

View File

@@ -2,28 +2,18 @@ use crossterm::cursor::Show;
use crossterm::execute; use crossterm::execute;
use crossterm::terminal::{LeaveAlternateScreen, disable_raw_mode}; use crossterm::terminal::{LeaveAlternateScreen, disable_raw_mode};
pub struct TerminalModeGuard { /// A guard that ensures the terminal is restored to its original state
active: bool, /// when dropped.
} #[derive(Default, Debug)]
pub struct TerminalModeGuard;
impl TerminalModeGuard { impl TerminalModeGuard {}
pub fn new() -> Self {
Self { active: true }
}
pub fn cleanup(&mut self) { impl Drop for TerminalModeGuard {
if !self.active { #[allow(clippy::let_underscore_must_use, reason = "We want to ignore errors during cleanup.")]
return; fn drop(&mut self) {
}
let _ = disable_raw_mode(); let _ = disable_raw_mode();
let mut stdout = std::io::stdout(); let mut stdout = std::io::stdout();
let _ = execute!(stdout, LeaveAlternateScreen, Show); let _ = execute!(stdout, LeaveAlternateScreen, Show);
self.active = false;
}
}
impl Drop for TerminalModeGuard {
fn drop(&mut self) {
self.cleanup();
} }
} }