Merge pull request #90 from lusingander/ratatui

Update ratatui to 0.30.0

Author: lusingander

Cargo.lock

@@ -10,12 +10,12 @@ license = "MIT"
 keywords = ["s3", "aws", "cli", "tui", "terminal"]
 categories = ["command-line-utilities"]
 edition = "2021"
-rust-version = "1.88.0"
+rust-version = "1.90.0"
 
 exclude = ["/.github", "/img", "/tool", "Makefile", "/docs"]
 
 [dependencies]
-ansi-to-tui = "7.0.0"
+ansi-to-tui = "8.0.0"
 anyhow = "1.0.100"
 arboard = { version = "3.6.1", features = ["wayland-data-control"] }
 aws-config = "1.8.11"
@@ -25,19 +25,22 @@ chardetng = "0.1.17"
 chrono = "0.4.42"
 clap = { version = "4.5.53", features = ["derive"] }
 console = "0.16.1"
-crossterm = { version = "0.28.1", features = ["event-stream"] }
+crossterm = { version = "0.29.0", features = ["event-stream"] }
 encoding_rs = "0.8.35"
 futures = "0.3.31"
 humansize = "2.1.3"
 image = "0.25.9"
 indexmap = { version = "2.12.1", features = ["serde"] }
 infer = "0.19.0"
 itsuki = "0.2.1"
-laurier = "0.2.0"
+laurier = "0.3.0"
 once_cell = "1.21.3"
 open = "5.3.3"
-ratatui = "0.29.0"
-ratatui-image = "8.0.1"
+ratatui = "0.30.0"
+ratatui-image = { version = "10.0.2", default-features = false, features = [
+    "crossterm",
+    "image-defaults",
+] }
 serde = { version = "1.0.219", features = ["derive"] }
 smart-default = "0.7.1"
 syntect = { version = "5.2.0", default-features = false, features = [
@@ -49,7 +52,7 @@ toml = "0.9.8"
 tracing = "0.1.41"
 tracing-log = "0.2.0"
 tracing-subscriber = { version = "0.3.20", features = ["chrono"] }
-tui-input = "0.14.0"
+tui-input = "0.15.0"
 umbra = "0.4.0"
 
 [dev-dependencies]

Cargo.toml

@@ -27,6 +27,7 @@ fn build_image_picker(image_preview_enabled: bool, fix_dynamic_values: bool) ->
         // - font size cannot be obtained with xterm.js
         // - want to fix the protocol to iterm2
         // so changed the settings if fix_dynamic_values is true
+        #[allow(deprecated)]
         let mut picker = ratatui_image::picker::Picker::from_fontsize((10, 20));
         picker.set_protocol_type(ratatui_image::picker::ProtocolType::Iterm2);
         return ImagePicker::Ok(picker);

src/environment.rs

@@ -764,7 +764,7 @@ mod tests {
     };
 
     #[tokio::test]
-    async fn test_render_without_scroll() -> std::io::Result<()> {
+    async fn test_render_without_scroll() -> Result<(), core::convert::Infallible> {
         let ctx = Rc::default();
         let tx = sender();
         let mut terminal = setup_terminal()?;
@@ -802,7 +802,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_render_with_scroll() -> std::io::Result<()> {
+    async fn test_render_with_scroll() -> Result<(), core::convert::Infallible> {
         let ctx = Rc::default();
         let tx = sender();
         let mut terminal = setup_terminal()?;
@@ -840,7 +840,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_render_filter_items() -> std::io::Result<()> {
+    async fn test_render_filter_items() -> Result<(), core::convert::Infallible> {
         let ctx = Rc::default();
         let tx = sender();
         let mut terminal = setup_terminal()?;
@@ -923,7 +923,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_render_sort_items() -> std::io::Result<()> {
+    async fn test_render_sort_items() -> Result<(), core::convert::Infallible> {
         let ctx = Rc::default();
         let tx = sender();
         let mut terminal = setup_terminal()?;
@@ -1146,7 +1146,7 @@ mod tests {
         assert_eq!(page.view_indices, vec![0, 4]);
     }
 
-    fn setup_terminal() -> std::io::Result<Terminal<TestBackend>> {
+    fn setup_terminal() -> Result<Terminal<TestBackend>, core::convert::Infallible> {
         let backend = TestBackend::new(30, 10);
         let mut terminal = Terminal::new(backend)?;
         terminal.clear()?;

src/pages/bucket_list.rs

@@ -186,7 +186,7 @@ mod tests {
     use ratatui::{backend::TestBackend, buffer::Buffer, text::Span, Terminal};
 
     #[tokio::test]
-    async fn test_render() -> std::io::Result<()> {
+    async fn test_render() -> Result<(), core::convert::Infallible> {
         let ctx = Rc::default();
         let tx = sender();
         let mut terminal = setup_terminal()?;
@@ -241,7 +241,7 @@ mod tests {
         Ok(())
     }
 
-    fn setup_terminal() -> std::io::Result<Terminal<TestBackend>> {
+    fn setup_terminal() -> Result<Terminal<TestBackend>, core::convert::Infallible> {
         let backend = TestBackend::new(70, 20);
         let mut terminal = Terminal::new(backend)?;
         terminal.clear()?;

src/pages/help.rs

@@ -46,7 +46,7 @@ mod tests {
     use ratatui::{backend::TestBackend, buffer::Buffer, Terminal};
 
     #[tokio::test]
-    async fn test_render() -> std::io::Result<()> {
+    async fn test_render() -> Result<(), core::convert::Infallible> {
         let ctx = Rc::default();
         let tx = sender();
         let mut terminal = setup_terminal()?;
@@ -76,7 +76,7 @@ mod tests {
         Ok(())
     }
 
-    fn setup_terminal() -> std::io::Result<Terminal<TestBackend>> {
+    fn setup_terminal() -> Result<Terminal<TestBackend>, core::convert::Infallible> {
         let backend = TestBackend::new(30, 10);
         let mut terminal = Terminal::new(backend)?;
         terminal.clear()?;

src/pages/initializing.rs

@@ -829,7 +829,7 @@ mod tests {
     use ratatui::{backend::TestBackend, buffer::Buffer, crossterm::event::KeyCode, Terminal};
 
     #[tokio::test]
-    async fn test_render_detail_tab() -> std::io::Result<()> {
+    async fn test_render_detail_tab() -> Result<(), core::convert::Infallible> {
         let ctx = Rc::default();
         let tx = sender();
         let mut terminal = setup_terminal()?;
@@ -895,7 +895,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_render_detail_tab_with_config() -> std::io::Result<()> {
+    async fn test_render_detail_tab_with_config() -> Result<(), core::convert::Infallible> {
         let tx = sender();
         let mut terminal = setup_terminal()?;
 
@@ -962,7 +962,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_render_version_tab() -> std::io::Result<()> {
+    async fn test_render_version_tab() -> Result<(), core::convert::Infallible> {
         let ctx = Rc::default();
         let tx = sender();
         let mut terminal = setup_terminal()?;
@@ -1030,7 +1030,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_render_version_tab_with_config() -> std::io::Result<()> {
+    async fn test_render_version_tab_with_config() -> Result<(), core::convert::Infallible> {
         let tx = sender();
         let mut terminal = setup_terminal()?;
 
@@ -1099,7 +1099,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_render_save_dialog_detail_tab() -> std::io::Result<()> {
+    async fn test_render_save_dialog_detail_tab() -> Result<(), core::convert::Infallible> {
         let ctx = Rc::default();
         let tx = sender();
         let mut terminal = setup_terminal()?;
@@ -1164,7 +1164,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_render_copy_detail_dialog_detail_tab() -> std::io::Result<()> {
+    async fn test_render_copy_detail_dialog_detail_tab() -> Result<(), core::convert::Infallible> {
         let ctx = Rc::default();
         let tx = sender();
         let mut terminal = setup_terminal()?;
@@ -1235,7 +1235,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_render_copy_detail_dialog_version_tab() -> std::io::Result<()> {
+    async fn test_render_copy_detail_dialog_version_tab() -> Result<(), core::convert::Infallible> {
         let ctx = Rc::default();
         let tx = sender();
         let mut terminal = setup_terminal()?;
@@ -1319,7 +1319,7 @@ mod tests {
         Ok(())
     }
 
-    fn setup_terminal() -> std::io::Result<Terminal<TestBackend>> {
+    fn setup_terminal() -> Result<Terminal<TestBackend>, core::convert::Infallible> {
         let backend = TestBackend::new(60, 20);
         let mut terminal = Terminal::new(backend)?;
         terminal.clear()?;

src/pages/object_detail.rs

@@ -961,7 +961,7 @@ mod tests {
     };
 
     #[tokio::test]
-    async fn test_render_without_scroll() -> std::io::Result<()> {
+    async fn test_render_without_scroll() -> Result<(), core::convert::Infallible> {
         let ctx = Rc::default();
         let tx = sender();
         let mut terminal = setup_terminal()?;
@@ -1008,7 +1008,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_render_with_scroll() -> std::io::Result<()> {
+    async fn test_render_with_scroll() -> Result<(), core::convert::Infallible> {
         let ctx = Rc::default();
         let tx = sender();
         let mut terminal = setup_terminal()?;
@@ -1050,7 +1050,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_render_with_config() -> std::io::Result<()> {
+    async fn test_render_with_config() -> Result<(), core::convert::Infallible> {
         let tx = sender();
         let mut terminal = setup_terminal()?;
 
@@ -1167,7 +1167,7 @@ mod tests {
         assert_eq!(page.view_indices, vec![3, 1, 4, 0, 2]);
     }
 
-    fn setup_terminal() -> std::io::Result<Terminal<TestBackend>> {
+    fn setup_terminal() -> Result<Terminal<TestBackend>, core::convert::Infallible> {
         let backend = TestBackend::new(60, 10);
         let mut terminal = Terminal::new(backend)?;
         terminal.clear()?;

src/pages/object_list.rs

@@ -435,7 +435,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_render_without_scroll() -> std::io::Result<()> {
+    async fn test_render_without_scroll() -> Result<(), core::convert::Infallible> {
         let ctx = Rc::default();
         let tx = sender();
         let mut terminal = setup_terminal()?;
@@ -477,7 +477,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_render_with_scroll() -> std::io::Result<()> {
+    async fn test_render_with_scroll() -> Result<(), core::convert::Infallible> {
         let ctx = Rc::default();
         let tx = sender();
         let mut terminal = setup_terminal()?;
@@ -514,7 +514,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_render_save_dialog_without_scroll() -> std::io::Result<()> {
+    async fn test_render_save_dialog_without_scroll() -> Result<(), core::convert::Infallible> {
         let ctx = Rc::default();
         let tx = sender();
         let mut terminal = setup_terminal()?;
@@ -563,7 +563,7 @@ mod tests {
             .unwrap()
     }
 
-    fn setup_terminal() -> std::io::Result<Terminal<TestBackend>> {
+    fn setup_terminal() -> Result<Terminal<TestBackend>, core::convert::Infallible> {
         let backend = TestBackend::new(30, 10);
         let mut terminal = Terminal::new(backend)?;
         terminal.clear()?;

src/pages/object_preview.rs

@@ -8,7 +8,7 @@ use crate::{
     pages::page::Page,
 };
 
-pub async fn run<B: Backend>(
+pub async fn run<B: Backend<Error = std::io::Error>>(
     app: &mut App,
     terminal: &mut Terminal<B>,
     mut rx: Receiver,