From 81743146982eece2123744dfe6d5111596254215 Mon Sep 17 00:00:00 2001
From: Andrew Silver <andrew.silver0@protonmail.com>
Date: Fri, 5 Apr 2024 08:30:45 +1100
Subject: [PATCH] Moved from unicode-width to unicode-display-width for visual
 grapheme width estimation

---
 Cargo.toml        | 10 +++++-----
 examples/cargo.rs |  2 +-
 src/style.rs      |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a0c0c696..6d05386f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "indicatif"
-version = "0.17.8"
+version = "0.17.9"
 edition = "2021"
 rust-version = "1.63"
 description = "A progress bar and cli reporting library for Rust"
@@ -13,14 +13,14 @@ readme = "README.md"
 exclude = ["screenshots/*"]
 
 [dependencies]
-console = { version = "0.15", default-features = false, features = ["ansi-parsing"] }
+console = { version = "0.16", default-features = false, features = ["ansi-parsing"] }
 futures-core = { version = "0.3", default-features = false, optional = true }
 number_prefix = "0.4"
 portable-atomic = "1.0.0"
 rayon = { version = "1.1", optional = true }
 tokio = { version = "1", optional = true, features = ["io-util"] }
+unicode-display-width = { version = "0.3", optional = true }
 unicode-segmentation = { version = "1", optional = true }
-unicode-width = { version = "0.1", optional = true }
 vt100 = { version = "0.15.1", optional = true }
 
 [dev-dependencies]
@@ -35,8 +35,8 @@ pretty_assertions = "1.4.0"
 instant = "0.1"
 
 [features]
-default = ["unicode-width", "console/unicode-width"]
-improved_unicode = ["unicode-segmentation", "unicode-width", "console/unicode-width"]
+default = ["unicode-display-width", "console/unicode-display-width"]
+improved_unicode = ["unicode-segmentation", "unicode-display-width", "console/unicode-display-width"]
 in_memory = ["vt100"]
 futures = ["dep:futures-core"]
 
diff --git a/examples/cargo.rs b/examples/cargo.rs
index 1e2ff2e9..5ab3a75d 100644
--- a/examples/cargo.rs
+++ b/examples/cargo.rs
@@ -14,7 +14,7 @@ static CRATES: &[(&str, &str)] = &[
     ("regex-syntax", "v0.6.23"),
     ("terminal_size", "v0.1.16"),
     ("libc", "v0.2.93"),
-    ("unicode-width", "v0.1.8"),
+    ("unicode-display-width", "v0.3.0"),
     ("lazy_static", "v1.4.0"),
     ("number_prefix", "v0.4.0"),
     ("regex", "v1.4.6"),
diff --git a/src/style.rs b/src/style.rs
index a4e1cb33..7651ee61 100644
--- a/src/style.rs
+++ b/src/style.rs
@@ -39,12 +39,12 @@ fn segment(s: &str) -> Vec<Box<str>> {
     s.chars().map(|x| x.to_string().into()).collect()
 }
 
-#[cfg(feature = "unicode-width")]
+#[cfg(feature = "unicode-display-width")]
 fn measure(s: &str) -> usize {
-    unicode_width::UnicodeWidthStr::width(s)
+    unicode_display_width::width(s) as usize
 }
 
-#[cfg(not(feature = "unicode-width"))]
+#[cfg(not(feature = "unicode-display-width"))]
 fn measure(s: &str) -> usize {
     s.chars().count()
 }