From 2f1f5fd5438a0f5a01deafa3cd46db689670b0eb Mon Sep 17 00:00:00 2001
From: Jeevitha Kannan K S <ksjeevithakannan123@gmail.com>
Date: Mon, 11 Nov 2024 22:23:28 +0530
Subject: [PATCH] Fix conflicts

---
 Cargo.lock      | 28 ----------------------------
 tui/Cargo.toml  |  4 ----
 tui/src/root.rs |  2 +-
 3 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 60f37ffd..e87e2df9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -29,18 +29,6 @@ version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
-[[package]]
-name = "ansi-to-tui"
-version = "7.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67555e1f1ece39d737e28c8a017721287753af3f93225e4a445b29ccb0f5912c"
-dependencies = [
- "nom",
- "ratatui",
- "smallvec",
- "thiserror",
-]
-
 [[package]]
 name = "anstyle"
 version = "1.0.8"
@@ -495,16 +483,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
 [[package]]
 name = "num-conv"
 version = "0.1.0"
@@ -930,12 +908,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "textwrap"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
-
 [[package]]
 name = "thiserror"
 version = "1.0.64"
diff --git a/tui/Cargo.toml b/tui/Cargo.toml
index 5094b815..105a3b56 100644
--- a/tui/Cargo.toml
+++ b/tui/Cargo.toml
@@ -26,10 +26,6 @@ rand = { version = "0.8.5", optional = true }
 linutil_core = { version = "24.9.28", path = "../core" }
 tree-sitter-highlight = "0.24.3"
 tree-sitter-bash = "0.23.1"
-textwrap = { version = "0.16.1", default-features = false }
-anstyle = { version = "1.0.8", default-features = false }
-ansi-to-tui = { version = "7.0.0", default-features = false }
-zips = "0.1.7"
 nix = { version = "0.29.0", features = [ "user" ] }
 
 [[bin]]
diff --git a/tui/src/root.rs b/tui/src/root.rs
index 1b02b938..46432d06 100644
--- a/tui/src/root.rs
+++ b/tui/src/root.rs
@@ -8,7 +8,7 @@ This means you have full system access and commands can potentially damage your
 Please proceed with caution and make sure you understand what each script does before executing it.";
 
 #[cfg(unix)]
-pub fn check_root_status() -> Option<FloatingText> {
+pub fn check_root_status<'a>() -> Option<FloatingText<'a>> {
     (Uid::effective().is_root()).then_some(FloatingText::new(
         ROOT_WARNING.into(),
         "Root User Warning",