Update ratatui to 0.30.0, and relevant dependencies.

Author: nullstalgia

Cargo.lock

@@ -34,8 +34,8 @@ yap-full = ["yap-lite", "espflash", "defmt-watch"]
 yap-lite = ["logging", "macros"]
 
 [dependencies]
-ansi-to-tui = { git = "https://github.com/nullstalgia/ansi-to-tui", branch = "lossy_and_line_endings" }
-# ansi-to-tui = { path = "../ansi-to-tui" }
+# ansi-to-tui = { git = "https://github.com/nullstalgia/ansi-to-tui", branch = "lossy_and_line_endings" }
+ansi-to-tui = { path = "../ansi-to-tui" }
 # ansi-to-tui = "7.0.0"
 arboard = { version = "3.6.0", features = ["wayland-data-control"] }
 arc-swap = "1.7.1"
@@ -48,9 +48,9 @@ color-eyre = "0.6.3"
 # color-eyre = { path = "/home/tony/git/eyre/color-eyre/" }
 compact_str = { version = "0.9.0", features = ["serde"] }
 # crokey = { path = "../crokey", features = ["serde"] }
-crokey = { version = "=1.1.2", features = ["serde"] }
+crokey = { version = "=1.4.0", features = ["serde"] }
 crossbeam = "0.8.4"
-crossterm = "=0.28.1"
+crossterm = "0.29"
 # defmt-decoder = { version = "1.0.0", optional = true }
 # these are slightly more updated than the versions on crates.io
 defmt-decoder = { git = "https://github.com/knurling-rs/defmt", package = "defmt-decoder", optional = true, rev = "d52b9908c175497d46fc527f4f8dfd6278744f09" }
@@ -65,7 +65,7 @@ espflash = { version = "=4.3.0", optional = true, default-features = false, feat
 # espflash = { path = "../espflash/espflash", optional = true, features = ["serialport"], default-features = false }
 fs-err = "3.1.0"
 hex = "0.4.3"
-http = "1.3.1"
+http = "1.3.1" # TODO make optional
 human-panic = "2.0.2"
 indexmap = { version = "2.9.0", features = ["serde"] }
 # int-enum = { git = "https://github.com/nullstalgia/int-enum-rs", branch = "feat/colors-and-discriminators" }
@@ -84,11 +84,12 @@ num-integer = "0.1.46"
 opener = "0.8.2"
 # log = "0.4.25"
 # num_enum = "0.7.3"
-ratatui = { version = "0.29.0", features = ["unstable-rendered-line-info"] }
-ratatui-explorer = { version = "0.2.1", optional = true }
-ratatui-macros = "0.6.0"
+ratatui = { version = "0.30.0", features = ["unstable-rendered-line-info"] }
+ratatui-explorer = { version = "0.3.0", optional = true }
+ratatui-macros = "0.7.0"
+ratatui-widgets = "0.3.0"
 regex = "1.11.1"
-reqwest = "0.12.22"
+reqwest = "0.12.22" # TODO make optional
 # regex-lite = "0.1.6"
 rolling-file = "0.2.0"
 self-replace = { version = "1.5.0", optional = true }
@@ -104,17 +105,18 @@ strum = { version = "0.27", features = ["derive"] }
 takeable = "0.2.2"
 # TODO update once ratatui's exposed crossterm updates
 # but these work for now.
-terminput = "0.4.2"
-terminput-crossterm = "0.1.2"
+terminput = "0.5"
+terminput-crossterm = "0.4"
 textwrap = "0.16.2"
 thiserror = "2.0.12"
 tinyvec = { version = "1.9.0", features = ["std"] }
 toml = "0.8.21"
 tracing = { version = "0.1.41", features = ["log"] }
 tracing-appender = "0.2.3"
 tracing-subscriber = { version = "0.3.19", features = ["chrono", "env-filter"] }
-tui-big-text = "0.7.1"
-tui-input = "0.14"
+tui-big-text = "0.8"
+# tui-input = "0.15"
+tui-input = { path = "../tui-input" }
 # unescaper = "0.1.5"
 unicode-width = "0.2.0"
 virtual-serialport = "0.1.3"

Cargo.toml

@@ -585,7 +585,12 @@ impl App {
         self.state == RunningState::Running
     }
     // All prep has been complete, begin main loop.
-    pub fn run(&mut self, mut terminal: Terminal<impl Backend>) -> Result<()> {
+    pub fn run<B>(&mut self, mut terminal: Terminal<B>) -> Result<()>
+    where
+        B: Backend,
+        <B as ratatui::backend::Backend>::Error: Sync + Send + 'static,
+        std::io::Error: From<<B as ratatui::backend::Backend>::Error>,
+    {
         if self.allow_first_time_setup {
             self.first_time_setup();
         }
@@ -695,7 +700,12 @@ impl App {
         }
         final_app_result
     }
-    fn handle_event(&mut self, event: Event, terminal: &mut Terminal<impl Backend>) -> Result<()> {
+    fn handle_event<B>(&mut self, event: Event, terminal: &mut Terminal<B>) -> Result<()>
+    where
+        B: Backend,
+        <B as ratatui::backend::Backend>::Error: Sync + Send + 'static,
+        std::io::Error: From<<B as ratatui::backend::Backend>::Error>,
+    {
         match event {
             Event::Quit => self.shutdown(),
 
@@ -3158,7 +3168,11 @@ impl App {
 
         self.popup_menu_scroll = self.current_popup_selectable_item_count().saturating_sub(1);
     }
-    pub fn draw(&mut self, terminal: &mut Terminal<impl Backend>) -> Result<()> {
+    pub fn draw<B>(&mut self, terminal: &mut Terminal<B>) -> Result<()>
+    where
+        B: Backend,
+        <B as ratatui::backend::Backend>::Error: Sync + Send + 'static,
+    {
         // let start = Instant::now();
         terminal.draw(|frame| self.render_app(frame))?;
         // debug!("A4: {:?}", start.elapsed());
@@ -3325,7 +3339,7 @@ impl App {
             }
             Popup::SerialConnectionFailed(error) => {
                 let title = "Error connecting to port!";
-                let title_line = Line::styled(title, Style::new().reset());
+                let title_line = Line::styled(title, Style::reset());
                 let block = Block::bordered()
                     .border_style(Style::new().red())
                     .title_top(title_line)
@@ -3592,7 +3606,7 @@ impl App {
             bottom_sep_line_area,
         );
 
-        let scrollbar_style = Style::new().reset();
+        let scrollbar_style = Style::reset();
 
         let scrollbar = Scrollbar::new(ScrollbarOrientation::VerticalRight)
             .style(scrollbar_style)
@@ -4916,7 +4930,7 @@ impl App {
             frame.render_widget(Line::from(more_options_button).centered(), more_options);
         }
 
-        let scrollbar_style = Style::new().reset();
+        let scrollbar_style = Style::reset();
 
         let scrollbar = Scrollbar::new(ScrollbarOrientation::VerticalRight)
             .style(scrollbar_style)

src/app.rs

@@ -3,7 +3,7 @@ use std::{borrow::Cow, ops::Range};
 use chrono::{DateTime, Local};
 use compact_str::{CompactString, format_compact};
 use ratatui::{
-    style::{Style, Stylize},
+    style::Style,
     text::{Line, Span},
     widgets::{Paragraph, Wrap},
 };

src/buffer/buf_line.rs

@@ -334,10 +334,15 @@ impl Buffer {
         self.styled_lines.rx.len()
     }
 
-    pub fn update_terminal_size(
+    pub fn update_terminal_size<B>(
         &mut self,
-        terminal: &mut ratatui::Terminal<impl ratatui::prelude::Backend>,
-    ) -> std::io::Result<()> {
+        terminal: &mut ratatui::Terminal<B>,
+    ) -> std::io::Result<()>
+    where
+        B: Backend,
+        <B as ratatui::backend::Backend>::Error: Sync + Send + 'static,
+        std::io::Error: From<<B as ratatui::backend::Backend>::Error>,
+    {
         self.last_terminal_size = {
             let mut terminal_size = terminal.size()?;
             // `2` is the lines from the repeating_pattern_widget and the input buffer.
@@ -561,7 +566,7 @@ impl Buffer {
         if self.combined_height() > hex_area.height as usize {
             let vert_block = Block::new()
                 .borders(Borders::LEFT)
-                .border_style(Style::new().reset());
+                .border_style(Style::reset());
 
             vert_block.render(
                 Rect {

src/buffer/tui.rs

@@ -5,7 +5,7 @@ use std::{borrow::Cow, collections::BTreeMap, ops::Range};
 use crate::buffer::{HEX_UPPER, LineEnding};
 use itertools::Itertools;
 use ratatui::{
-    style::{Style, Stylize},
+    style::Style,
     text::{Line, Span},
 };
 

src/traits.rs

@@ -4,7 +4,7 @@ use crokey::crossterm::event::KeyCode;
 use ratatui::{
     Frame,
     layout::{Alignment, Constraint, Rect},
-    style::{Color, Style, Stylize},
+    style::{Color, Style},
     widgets::{Block, Borders, Clear, Row, Table, TableState},
 };
 use ratatui_macros::{row, span};
@@ -204,7 +204,7 @@ pub trait PromptTable: VariantNames + VariantArray + EnumProperty + Into<u8> + T
             .borders(Borders::ALL)
             .title_alignment(Alignment::Center)
             .border_style(border_style)
-            .title_style(Style::new().reset());
+            .title_style(Style::reset());
         let block = if let Some(text) = top {
             block.title_top(text)
         } else {

src/tui/prompts.rs

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-ratatui = "0.29.0"
+ratatui = "0.30.0"
 strum = "0.27.1"
 struct-table-derive = { path = "struct-table-derive" }