Use more maintained package

Signed-off-by: Andrew W. Harn <andrew.harn@broadcom.com>
zowe · Apr 25, 2023 · a6234ef · a6234ef
1 parent a6ef25a
commit a6234ef
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/zowex/Cargo.lock b/zowex/Cargo.lock
diff --git a/zowex/Cargo.toml b/zowex/Cargo.toml
@@ -20,8 +20,8 @@ simple-error = "0.2.3"
 supports-color = "2.0.0"
 sysinfo = "0.28.2"
 whoami = "1.4.0"
+yansi = "0.5.1"
 
 [target.'cfg(windows)'.dependencies]
 fslock = "0.2.1"
 named_pipe = "0.4.1"
-ansi_term = "0.12.1"
diff --git a/zowex/src/util.rs b/zowex/src/util.rs
@@ -24,8 +24,8 @@ use pathsearch::PathSearcher;
 extern crate supports_color;
 use supports_color::Stream;
 
-#[cfg(target_family = "windows")]
-extern crate ansi_term;
+extern crate yansi;
+use yansi::Paint;
 
 extern crate whoami;
 use whoami::username;
@@ -150,7 +150,6 @@ pub fn util_get_zowe_env() -> HashMap<String, String> {
     }
 
     // Make sure ansi is enabled for the response
-    #[cfg(target_family = "windows")]
     if !util_enable_ansi() {
         environment.insert(String::from("FORCE_COLOR"), String::from("0"));
     }
@@ -188,7 +187,6 @@ pub fn util_terminal_supports_color() -> i32 {
     return 0;
 }
 
-#[cfg(target_family = "windows")]
 pub fn util_enable_ansi() -> bool {
-    ansi_term::enable_ansi_support().is_ok()
+    Paint::enable_windows_ascii()
 }