remove unmaintained term_size dep

Author: kaikalii

Cargo.lock

@@ -32,7 +32,7 @@ regex = "1.10.3"
 serde = {version = "1", features = ["derive"]}
 serde_json = "1"
 serde_tuple = "0.5.0"
-term_size = "=1.0.0-beta.2"
+terminal_size = "0.3.0"
 thread_local = "1"
 time = "0.3.36"
 tinyvec = {version = "1", features = ["alloc", "serde"]}

Cargo.toml

@@ -10,6 +10,7 @@ use crate::{
     algorithm::map::{EMPTY_NAN, TOMBSTONE_NAN},
     array::{Array, ArrayValue},
     boxed::Boxed,
+    terminal_size,
     value::Value,
     Complex, Primitive, WILDCARD_CHAR, WILDCARD_NAN,
 };
@@ -419,7 +420,7 @@ impl<T: GridFmt + ArrayValue> GridFmt for Array<T> {
 
         // Handle really big grid
         if self.rank() > 1 {
-            let max_width = term_size::dimensions().map_or(1000, |(w, _)| w);
+            let max_width = terminal_size().map_or(1000, |(w, _)| w);
             for row in grid.iter_mut() {
                 if row.len() > max_width {
                     let diff = row.len() - max_width;
@@ -542,11 +543,7 @@ fn fmt_array<T: GridFmt + ArrayValue>(
     let row_shape = &shape[1..];
     let cell_size = data.len() / cell_count;
     let row_height: usize = row_shape.iter().rev().skip(1).product();
-    let max_height = if term_size::dimensions().is_some() {
-        100
-    } else {
-        300
-    };
+    let max_height = if terminal_size().is_some() { 100 } else { 300 };
     for (i, cell) in data.chunks(cell_size).enumerate() {
         if i > 0 && rank > 2 {
             for _ in 0..rank - 2 {

src/grid_fmt.rs

@@ -730,7 +730,7 @@ fn clear_watching() {
 fn clear_watching_with(s: &str, end: &str) {
     print!(
         "\r{}{}",
-        s.repeat(term_size::dimensions().map_or(10, |(w, _)| w)),
+        s.repeat(terminal_size::terminal_size().map_or(10, |(w, _)| w.0 as usize)),
         end,
     );
 }

src/main.rs

@@ -2481,3 +2481,7 @@ pub fn now() -> f64 {
         }
     }
 }
+
+pub(crate) fn terminal_size() -> Option<(usize, usize)> {
+    terminal_size::terminal_size().map(|(w, h)| (w.0 as usize, h.0 as usize))
+}

src/sys.rs

@@ -15,7 +15,7 @@ use std::{
     time::Duration,
 };
 
-use crate::{GitTarget, Handle, SysBackend};
+use crate::{terminal_size, GitTarget, Handle, SysBackend};
 use dashmap::DashMap;
 use once_cell::sync::Lazy;
 
@@ -369,7 +369,7 @@ impl SysBackend for NativeSys {
         NATIVE_SYS.colored_errors.insert(message, colored);
     }
     fn term_size(&self) -> Result<(usize, usize), String> {
-        let (w, h) = term_size::dimensions().ok_or("Failed to get terminal size")?;
+        let (w, h) = terminal_size().ok_or("Failed to get terminal size")?;
         Ok((w, h.saturating_sub(1)))
     }
     fn exit(&self, code: i32) -> Result<(), String> {
@@ -563,8 +563,8 @@ impl SysBackend for NativeSys {
     }
     #[cfg(all(feature = "terminal_image", feature = "image"))]
     fn show_image(&self, image: image::DynamicImage) -> Result<(), String> {
-        let (width, height) = if let Some((w, h)) = term_size::dimensions() {
-            let (tw, th) = (w as u32, h.saturating_sub(1) as u32);
+        let (width, height) = if let Some((w, h)) = terminal_size::terminal_size() {
+            let (tw, th) = (w.0 as u32, h.0.saturating_sub(1) as u32);
             let (iw, ih) = (image.width(), image.height() / 2);
             let scaled_to_height = (iw * th / ih.max(1), th);
             let scaled_to_width = (tw, ih * tw / iw.max(1));