Upgraded dependencies

Author: fritzrehde

Cargo.lock

@@ -10,23 +10,23 @@ repository = "https://github.com/fritzrehde/watchbind"
 description = "A CLI menu for periodically watching a program's output and executing commands on its lines through keybindings"
 
 [dependencies]
-clap = { version = "4.4.7", default-features = false, features = ["std", "help", "cargo", "derive", "error-context", "string", "color"] }
+clap = { version = "4.4.8", default-features = false, features = ["std", "help", "cargo", "derive", "error-context", "string", "color"] }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
-toml = { version = "0.7.8", default-features = false, features = ["parse"] }
-ratatui = "0.22.0"
+toml = { version = "0.8.8", default-features = false, features = ["parse"] }
+ratatui = "0.24.0"
 crossterm = { version = "0.27", features = ["events", "event-stream"] }
 itertools = "0.11.0"
 anyhow = "1.0.75"
 indoc = "2.0.4"
 derive_more = { version = "0.99.17", default-features = false, features = ["from", "into", "into_iterator", "as_ref"] }
 tabwriter = "1.3.0"
 parse-display = "0.8.2"
-derive-new = "0.5.9"
+derive-new = "0.6.0"
 simplelog = "0.12.1"
 log = "0.4.20"
 ranges = "0.3.3"
 # TODO: maybe we don't need all tokio and futures features, try to reduce
-tokio = { version = "1.33.0", features = ["full"] }
+tokio = { version = "1.34.0", features = ["full"] }
 futures = "0.3.29"
 ansi-to-tui = "3.1.0"
 once_cell = "1.18.0"

Cargo.toml

@@ -194,10 +194,7 @@ where
     T::iter()
         // TODO: replace with strum's get_bool once available
         // Hide variants configured to be hidden.
-        .filter(|variant| match variant.get_str("Hidden") {
-            Some("true") => false,
-            _ => true,
-        })
+        .filter(|variant| !matches!(variant.get_str("Hidden"), Some("true")))
         // Use strum's `message` if available, otherwise use `to_string`.
         .map(|variant| {
             variant

src/config/keybindings/key.rs

@@ -1,6 +1,6 @@
 use super::EnvVariables;
 use ratatui::{
-    prelude::{Alignment, Backend, Constraint, Direction, Layout, Margin, Rect},
+    prelude::{Alignment, Constraint, Direction, Layout, Margin, Rect},
     text::Text,
     widgets::{Block, Borders, Paragraph, Scrollbar, ScrollbarOrientation, ScrollbarState, Wrap},
     Frame,
@@ -32,7 +32,7 @@ impl HelpMenu {
         }
     }
 
-    pub fn render<B: Backend>(&mut self, frame: &mut Frame<B>) {
+    pub fn render(&mut self, frame: &mut Frame) {
         // TODO: maybe in the future, when we add more features for manipulating ENV variable state, we have to fetch the new
         let area = centered_rect(50, 50, frame.size());
 
@@ -70,7 +70,7 @@ impl HelpMenu {
 
     fn update_vertical_scroll_index(&mut self, index: usize) {
         self.vertical_scroll_index = index;
-        self.vertical_scroll_state = self.vertical_scroll_state.position(index as u16);
+        self.vertical_scroll_state = self.vertical_scroll_state.position(index);
     }
 
     // Moving

src/ui/state/help_menu.rs

@@ -8,7 +8,7 @@ use anyhow::Result;
 use derive_more::{From, Into};
 use itertools::{izip, Itertools};
 use ratatui::{
-    prelude::{Backend, Constraint},
+    prelude::Constraint,
     style::Style,
     widgets::{Row, Table, TableState},
     Frame,
@@ -56,7 +56,7 @@ impl Lines {
     }
 
     /// Render to frame.
-    pub fn render<B: Backend>(&mut self, frame: &mut Frame<B>) {
+    pub fn render(&mut self, frame: &mut Frame) {
         // TODO: do as much as possible in update_lines to improve performance
         let rows: Vec<Row> = izip!(self.lines.iter(), self.line_selections.iter())
             .map(|(line, selected)| Row::new(vec![selected.draw(), line.draw()]))

src/ui/state/lines/mod.rs

@@ -9,7 +9,7 @@ use self::{
 use crate::config::{Fields, Operation, Operations, OperationsParsed, Styles};
 use anyhow::{bail, Result};
 use once_cell::sync::Lazy;
-use ratatui::{backend::Backend, Frame};
+use ratatui::{Frame};
 use std::sync::Arc;
 use tokio::sync::Mutex;
 
@@ -46,7 +46,7 @@ impl State {
         }
     }
 
-    pub fn draw<B: Backend>(&mut self, frame: &mut Frame<B>) {
+    pub fn draw(&mut self, frame: &mut Frame) {
         self.lines.render(frame);
         if let Mode::HelpMenu = self.mode {
             self.help_menu.render(frame);

src/ui/state/mod.rs

@@ -33,7 +33,7 @@ impl Tui {
     /// Draw provided frame to TUI.
     pub fn draw<F>(&mut self, f: F) -> Result<()>
     where
-        F: FnOnce(&mut Frame<Backend>),
+        F: FnOnce(&mut Frame),
     {
         self.terminal.draw(f)?;
         Ok(())