deps: use terminal_size instead of termsize

uutils · Aug 22, 2022 · c9a81f5 · c9a81f5
1 parent 212953e
commit c9a81f5
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 96 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/uu/ls/Cargo.toml b/src/uu/ls/Cargo.toml
@@ -20,7 +20,7 @@ clap = { version = "3.2", features = ["wrap_help", "cargo", "env"] }
 unicode-width = "0.1.8"
 number_prefix = "0.4"
 term_grid = "0.1.5"
-termsize = "0.1.6"
+terminal_size = "0.1"
 glob = "0.3.0"
 lscolors = { version = "0.12.0", features = ["ansi_term"] }
 uucore = { version=">=0.0.15", package="uucore", path="../../uucore", features = ["entries", "fs"] }

diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs
@@ -588,8 +588,8 @@ impl Config {
                     }
                 }
             }
-            None => match termsize::get() {
-                Some(size) => size.cols,
+            None => match terminal_size::terminal_size() {
+                Some((width, _)) => width.0,
                 None => match std::env::var_os("COLUMNS") {
                     Some(columns) => match columns.to_str().and_then(|s| s.parse().ok()) {
                         Some(columns) => columns,