Merge pull request #334 from orhun/chore/remove_vendor

Replace vendored dependencies
Macchina-CLI · Nov 3, 2024 · fa7a9a9 · fa7a9a9
2 parents a4b50a4 + daa817a
commit fa7a9a9
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 23 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,13 +20,12 @@ colored = "2.0.4"
 rand = "0.8.5"
 unicode-width = "0.1.11"
 lazy_static = "1.4.0"
-ansi-to-tui = { path = "vendor/ansi-to-tui" }
-color-to-tui = { path = "vendor/color-to-tui" }
+ansi-to-tui = "7.0.0"
 dirs = "5.0.1"
 toml = { version = "0.8.8", features = ["parse"] }
 serde_json = "1.0.107"
 thiserror = "1.0.49"
-ratatui = { version = "0.29", default-features = false, features = ["crossterm"] }
+ratatui = { version = "0.29", default-features = false, features = ["crossterm", "serde"] }
 serde = { version = "1.0.188", features = ["derive"] }
 
 [build-dependencies.vergen]

diff --git a/src/theme/base.rs b/src/theme/base.rs
@@ -25,9 +25,7 @@ pub struct Theme {
     hide_ascii: bool,
     prefer_small_ascii: bool,
     keys: Keys,
-    #[serde(with = "color_to_tui")]
     key_color: Color,
-    #[serde(with = "color_to_tui")]
     separator_color: Color,
     #[serde(skip_serializing, skip_deserializing)]
     name: String,

diff --git a/src/theme/components.rs b/src/theme/components.rs
@@ -118,7 +118,6 @@ pub struct ASCII {
     path: Option<PathBuf>,
 
     #[serde(default)]
-    #[serde(with = "color_to_tui::optional")]
     color: Option<Color>,
 }
 

diff --git a/vendor/ansi-to-tui b/vendor/ansi-to-tui
diff --git a/vendor/color-to-tui b/vendor/color-to-tui