diff options
| author | Nathan Reiner <nathan@nathanreiner.xyz> | 2024-08-02 14:09:40 +0200 |
|---|---|---|
| committer | Nathan Reiner <nathan@nathanreiner.xyz> | 2024-08-02 14:09:40 +0200 |
| commit | c920f258f6c9b0623a841b7c27561fa1d09cef72 (patch) | |
| tree | a61474510657cefea020c694bb249ae16baf9a75 | |
| parent | 555a45a9f2b68a48b098099804ce795e3d5a350b (diff) | |
do some clippy cleanups
| -rw-r--r-- | src/sheet/map.rs | 8 | ||||
| -rw-r--r-- | src/state/view/mod.rs | 4 | ||||
| -rw-r--r-- | src/widgets/sheetview/mod.rs | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/sheet/map.rs b/src/sheet/map.rs index 09209a3..b2cdbf2 100644 --- a/src/sheet/map.rs +++ b/src/sheet/map.rs @@ -5,17 +5,17 @@ use mlua::prelude::*; use super::{cell::Cell, Sheet}; pub trait LuaMap { - fn lua_map<'lua>( + fn lua_map( &self, - func: LuaFunction<'lua>, + func: LuaFunction<'_>, range: Vec<(usize, usize)>, ) -> Result<(), LuaError>; } impl LuaMap for Arc<RwLock<Sheet>> { - fn lua_map<'lua>( + fn lua_map( &self, - func: LuaFunction<'lua>, + func: LuaFunction<'_>, range: Vec<(usize, usize)>, ) -> Result<(), LuaError> { let mut this = self.write().unwrap(); diff --git a/src/state/view/mod.rs b/src/state/view/mod.rs index 73f02ab..543644c 100644 --- a/src/state/view/mod.rs +++ b/src/state/view/mod.rs @@ -64,13 +64,13 @@ impl SheetViewState { fn selection_range(&self) -> Option<((usize, usize), (usize, usize))> { if let Some(selection) = self.selection_anchor { - let row = if selection.0 as usize > self.cursor.y() { + let row = if selection.0 > self.cursor.y() { (self.cursor.y(), selection.0) } else { (selection.0, self.cursor.y()) }; - let column = if selection.1 as usize > self.cursor.x() { + let column = if selection.1 > self.cursor.x() { (self.cursor.x(), selection.1) } else { (selection.1, self.cursor.x()) diff --git a/src/widgets/sheetview/mod.rs b/src/widgets/sheetview/mod.rs index 2239a0b..96c4234 100644 --- a/src/widgets/sheetview/mod.rs +++ b/src/widgets/sheetview/mod.rs @@ -103,7 +103,7 @@ end)"#, .selection_or_cursor() .into_iter() .for_each(|(r, c)| { - sheet.set_cell(r as usize, c as usize, { + sheet.set_cell(r, c, { let s = self.bar.input().unwrap(); match s.parse() { Ok(n) => Cell::Number(n), @@ -182,7 +182,7 @@ impl Widget for &mut SheetView { self.scroll.0 = cursor.y(); } - if cursor.x() >= viewport_columns + self.scroll.1 as usize { + if cursor.x() >= viewport_columns + self.scroll.1 { self.scroll.1 = (cursor.x() - viewport_columns) + 1; } else if cursor.x() < self.scroll.1 { self.scroll.1 = cursor.x(); @@ -199,7 +199,7 @@ impl Widget for &mut SheetView { for column in 0..(viewport_columns + 1) { let (cell_pos_y, cell_pos_x) = (row + self.scroll.0, column + self.scroll.1); - if let Some(cell_ref) = sheet.get_ref(cell_pos_y as usize, cell_pos_x as usize) { + if let Some(cell_ref) = sheet.get_ref(cell_pos_y, cell_pos_x) { let cell = cell_ref.value().to_string() + " "; let line = if (cell_pos_y, cell_pos_x) == (cursor.y(), cursor.x()) { |