diff --git a/Cargo.lock b/Cargo.lock index aba2ad5..ca594ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -539,7 +539,6 @@ dependencies = [ "pest_derive", "postgres", "ratatui", - "ratatui-textarea", "rayon", "regex-lite", "ron", @@ -548,6 +547,7 @@ dependencies = [ "simd-json", "sorbus", "thiserror", + "tui-textarea", ] [[package]] @@ -1470,16 +1470,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "ratatui-textarea" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d1b2612ef92d22d219e3f12dd6fef2c936b90150652f5ff7eaaa35ec3a5c77" -dependencies = [ - "crossterm", - "ratatui", -] - [[package]] name = "rayon" version = "1.8.0" @@ -2024,6 +2014,17 @@ dependencies = [ "syn 2.0.39", ] +[[package]] +name = "tui-textarea" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e38ced1f941a9cfc923fbf2fe6858443c42cc5220bfd35bdd3648371e7bd8e" +dependencies = [ + "crossterm", + "ratatui", + "unicode-width", +] + [[package]] name = "typenum" version = "1.17.0" diff --git a/Cargo.toml b/Cargo.toml index 9f6caf3..4b83806 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,7 +50,7 @@ serde = { version = "1", features = ["derive"] } serde_json = { version = "1", features = ["arbitrary_precision"] } sorbus = "0.9" thiserror = "1.0.38" -ratatui-textarea = { version = "0.4", optional = true } +tui-textarea = { version = "0.4", optional = true } ellipse = "0.2.0" ark-ff = "0.4.2" memmap2 = "0.9.0" @@ -63,7 +63,7 @@ cli = ["dep:clap-verbosity-flag", "dep:clap"] conflater = [] default = ["interactive", "cli", "exporters", "parser", "inspector"] exporters = ["dep:handlebars"] -inspector = ["dep:ratatui", "dep:ratatui-textarea", "cli", "parser"] +inspector = ["dep:ratatui", "dep:tui-textarea", "cli", "parser"] interactive = ["dep:indicatif"] parser = ["dep:pest", "dep:pest_derive"] postgres = ["dep:postgres"] diff --git a/src/import.rs b/src/import.rs index 1b6c373..ec0e099 100644 --- a/src/import.rs +++ b/src/import.rs @@ -12,7 +12,6 @@ use serde_json::Value; #[cfg(all(target_arch = "x86_64", target_feature = "avx"))] use simd_json::BorrowedValue as Value; #[cfg(all(target_arch = "x86_64", target_feature = "avx"))] -use std::io::Read; use std::{ fs::File, io::{BufReader, Read, Seek}, diff --git a/src/inspect/widgets/number.rs b/src/inspect/widgets/number.rs index a523e36..4d7c96e 100644 --- a/src/inspect/widgets/number.rs +++ b/src/inspect/widgets/number.rs @@ -3,7 +3,7 @@ use ratatui::{ style::{Color, Style}, widgets::{Block, Borders}, }; -use ratatui_textarea::{Input, Key, TextArea}; +use tui_textarea::{Input, Key, TextArea}; use crate::inspect::StdTerminal; diff --git a/src/inspect/widgets/regexp.rs b/src/inspect/widgets/regexp.rs index 91b4936..ecf1c3e 100644 --- a/src/inspect/widgets/regexp.rs +++ b/src/inspect/widgets/regexp.rs @@ -3,8 +3,8 @@ use ratatui::{ style::{Color, Style}, widgets::{Block, Borders}, }; -use ratatui_textarea::{Input, Key, TextArea}; use regex_lite::Regex; +use tui_textarea::{CursorMove, Input, Key, TextArea}; use crate::inspect::StdTerminal; @@ -18,7 +18,7 @@ impl RegexpInput<'_> { title: title.to_owned(), input: TextArea::from([content]), }; - r.input.move_cursor(ratatui_textarea::CursorMove::End); + r.input.move_cursor(CursorMove::End); r } diff --git a/src/inspect/widgets/scan.rs b/src/inspect/widgets/scan.rs index e1f056c..7b7e95e 100644 --- a/src/inspect/widgets/scan.rs +++ b/src/inspect/widgets/scan.rs @@ -11,8 +11,8 @@ use ratatui::{ style::{Color, Style}, widgets::{Block, Borders}, }; -use ratatui_textarea::{Input, Key, TextArea}; use std::collections::HashMap; +use tui_textarea::{CursorMove, Input, Key, TextArea}; pub struct ScanInput<'a> { module: String, @@ -26,7 +26,7 @@ impl<'a> ScanInput<'a> { columns, input: TextArea::from([content]), }; - r.input.move_cursor(ratatui_textarea::CursorMove::End); + r.input.move_cursor(CursorMove::End); r }