Moved from unicode-width to unicode-display-width for visual grapheme width estimation

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "console"
 description = "A terminal and console abstraction for Rust"
-version = "0.15.8"
+version = "0.16.0"
 keywords = ["cli", "terminal", "colors", "console", "ansi"]
 authors = ["Armin Ronacher <armin.ronacher@active-4.com>"]
 license = "MIT"
@@ -13,13 +13,13 @@ readme = "README.md"
 rust-version = "1.56.0"
 
 [features]
-default = ["unicode-width", "ansi-parsing"]
+default = ["unicode-display-width", "ansi-parsing"]
 windows-console-colors = ["ansi-parsing"]
 ansi-parsing = []
 
 [dependencies]
 libc = "0.2.99"
-unicode-width = { version = "0.1", optional = true }
+unicode-display-width = { version = "0.3", optional = true }
 lazy_static = "1.4.0"
 
 [target.'cfg(windows)'.dependencies]

README.md

@@ -69,8 +69,8 @@ are useful for more complex formatting.
 
 ## Unicode Width Support
 
-By default this crate depends on the `unicode-width` crate to calculate
+By default this crate depends on the `unicode-display-width` crate to calculate
 the width of terminal characters.  If you do not need this you can disable
-the `unicode-width` feature which will cut down on dependencies.
+the `unicode-display-width` feature which will cut down on dependencies.
 
 License: MIT

src/lib.rs

@@ -63,15 +63,15 @@
 //!
 //! # Unicode Width Support
 //!
-//! By default this crate depends on the `unicode-width` crate to calculate
+//! By default this crate depends on the `unicode-display-width` crate to calculate
 //! the width of terminal characters.  If you do not need this you can disable
-//! the `unicode-width` feature which will cut down on dependencies.
+//! the `unicode-display-width` feature which will cut down on dependencies.
 //!
 //! # Features
 //!
 //! By default all features are enabled.  The following features exist:
 //!
-//! * `unicode-width`: adds support for unicode width calculations
+//! * `unicode-display-width`: adds support for unicode width calculations
 //! * `ansi-parsing`: adds support for parsing ansi codes (this adds support
 //!   for stripping and taking ansi escape codes into account for length
 //!   calculations).

src/utils.rs

@@ -707,25 +707,42 @@ impl<'a, 'b> fmt::Display for Emoji<'a, 'b> {
 }
 
 fn str_width(s: &str) -> usize {
-    #[cfg(feature = "unicode-width")]
+    #[cfg(feature = "unicode-display-width")]
     {
-        use unicode_width::UnicodeWidthStr;
-        s.width()
+        unicode_display_width::width(s) as usize
     }
-    #[cfg(not(feature = "unicode-width"))]
+    #[cfg(not(feature = "unicode-display-width"))]
     {
         s.chars().count()
     }
 }
 
 #[cfg(feature = "ansi-parsing")]
 fn char_width(c: char) -> usize {
-    #[cfg(feature = "unicode-width")]
-    {
-        use unicode_width::UnicodeWidthChar;
-        c.width().unwrap_or(0)
+    #[cfg(feature = "unicode-display-width")]
+    if c < '\u{7F}' {
+        if c >= '\u{20}' {
+            // U+0020 to U+007F (exclusive) are single-width ASCII codepoints
+            1
+        } else if c == '\0' {
+            // U+0000 *is* a control code, but it's special-cased
+            0
+        } else {
+            // U+0001 to U+0020 (exclusive) are control codes
+            0
+        }
+    } else if c >= '\u{A0}' {
+        // No characters >= U+00A0 are control codes, so we can consult the lookup tables
+        if unicode_display_width::is_double_width(c) {
+            2
+        } else {
+            1
+        }
+    } else {
+        // U+007F to U+00A0 (exclusive) are control codes
+        0
     }
-    #[cfg(not(feature = "unicode-width"))]
+    #[cfg(not(feature = "unicode-display-width"))]
     {
         let _c = c;
         1
@@ -873,7 +890,7 @@ fn test_text_width() {
         measure_text_width(&s),
         if cfg!(feature = "ansi-parsing") {
             3
-        } else if cfg!(feature = "unicode-width") {
+        } else if cfg!(feature = "unicode-display-width") {
             17
         } else {
             21
@@ -882,7 +899,7 @@ fn test_text_width() {
 }
 
 #[test]
-#[cfg(all(feature = "unicode-width", feature = "ansi-parsing"))]
+#[cfg(all(feature = "unicode-display-width", feature = "ansi-parsing"))]
 fn test_truncate_str() {
     let s = format!("foo {}", style("bar").red().force_styling(true));
     assert_eq!(