Merge branch 'main' into optimization

jeevithakannan2 · Nov 17, 2024 · fbbc295 · fbbc295
2 parents a0752ae + fa69885
commit fbbc295
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,9 +8,6 @@ members = ["tui", "core", "xtask"]
 default-members = ["tui", "core"]
 resolver = "2"
 
-[patch.crates-io]
-vt100 = { git = "https://github.com/ChrisTitusTech/vt100-rust" }
-
 [profile.release]
 opt-level = "z"
 debug = false

diff --git a/tui/Cargo.toml b/tui/Cargo.toml
@@ -18,14 +18,15 @@ clap = { version = "4.5.20", features = ["derive", "std"], default-features = fa
 oneshot = { version = "0.1.8", features = ["std"], default-features = false }
 portable-pty = "0.8.1"
 ratatui = { version = "0.29.0", features = ["crossterm"], default-features = false }
-tui-term = "0.2.0"
+tui-term = { version = "0.2.0", default-features = false }
 time = { version = "0.3.36", features = ["formatting", "local-offset", "macros"], default-features = false }
 unicode-width = { version = "0.2.0", default-features = false }
 rand = { version = "0.8.5", optional = true }
 linutil_core = { version = "24.10.31", path = "../core" }
 tree-sitter-highlight = "0.24.4"
 tree-sitter-bash = "0.23.3"
 nix = { version = "0.29.0", features = [ "user" ] }
+vt100-ctt = { git = "https://github.com/ChrisTitusTech/vt100-rust", rev = "b660c85faaa32323892c3154835c2bc901d7bf57" }
 
 [[bin]]
 name = "linutil"

diff --git a/tui/src/running_command.rs b/tui/src/running_command.rs
@@ -17,10 +17,8 @@ use std::{
     thread::JoinHandle,
 };
 use time::{macros::format_description, OffsetDateTime};
-use tui_term::{
-    vt100::{Parser, Screen},
-    widget::PseudoTerminal,
-};
+use tui_term::widget::PseudoTerminal;
+use vt100_ctt::{Parser, Screen};
 
 pub struct RunningCommand {
     /// A buffer to save all the command output (accumulates, until the command exits)