refactor: inline is_a_dumb_terminal in is_dumb

Author: ugur-eren

src/term.rs

@@ -1,5 +1,6 @@
 use alloc::sync::Arc;
 use core::fmt::{Debug, Display};
+use std::env;
 use std::io::{self, Read, Write};
 #[cfg(any(unix, all(target_os = "wasi", target_env = "p1")))]
 use std::os::fd::{AsRawFd, RawFd};
@@ -576,7 +577,16 @@ impl Term {
 /// Native windows terminals typically do not set the `TERM` environment variable.
 #[inline]
 pub fn is_dumb() -> bool {
-    is_a_dumb_terminal()
+    #[cfg(unix)]
+    let default = true;
+
+    #[cfg(not(unix))]
+    let default = false;
+
+    match env::var("TERM") {
+        Ok(term) => term == "dumb",
+        Err(_) => default,
+    }
 }
 
 /// A fast way to check if the application has a user attended for stdout.

src/unix_term.rs

@@ -9,6 +9,7 @@ use std::os::fd::{AsRawFd, RawFd};
 #[cfg(not(target_os = "macos"))]
 use std::sync::OnceLock;
 
+use crate::is_dumb;
 use crate::kb::Key;
 use crate::term::Term;
 
@@ -21,13 +22,6 @@ pub(crate) fn is_a_terminal(out: &impl AsRawFd) -> bool {
     unsafe { libc::isatty(out.as_raw_fd()) != 0 }
 }
 
-pub(crate) fn is_a_dumb_terminal() -> bool {
-    match env::var("TERM") {
-        Ok(term) => term == "dumb",
-        Err(_) => true,
-    }
-}
-
 pub(crate) fn is_a_color_terminal(out: &Term) -> bool {
     if !is_a_terminal(out) {
         return false;
@@ -37,7 +31,7 @@ pub(crate) fn is_a_color_terminal(out: &Term) -> bool {
         return false;
     }
 
-    !is_a_dumb_terminal()
+    !is_dumb()
 }
 
 pub(crate) fn is_a_true_color_terminal(out: &Term) -> bool {

src/wasm_term.rs

@@ -21,11 +21,6 @@ pub(crate) fn is_a_terminal(_out: &Term) -> bool {
     }
 }
 
-#[inline]
-pub(crate) fn is_a_dumb_terminal() -> bool {
-    false
-}
-
 #[inline]
 pub(crate) fn is_a_color_terminal(_out: &Term) -> bool {
     // We currently never report color terminals.  For discussion see

src/windows_term/mod.rs

@@ -24,9 +24,9 @@ use windows_sys::Win32::System::Console::{
 };
 use windows_sys::Win32::UI::Input::KeyboardAndMouse::VIRTUAL_KEY;
 
-use crate::common_term;
 use crate::kb::Key;
 use crate::term::{Term, TermTarget};
+use crate::{common_term, is_dumb};
 
 #[cfg(feature = "windows-console-colors")]
 mod colors;
@@ -59,16 +59,6 @@ pub(crate) fn is_a_terminal(out: &Term) -> bool {
     msys_tty_on(out)
 }
 
-pub(crate) fn is_a_dumb_terminal() -> bool {
-    // Native windows terminals typically do not set the TERM.
-    // We can only assume that if it is explicitly set to `dumb` then it is a dumb terminal.
-    // Otherwise, we assume it is not.
-    match env::var("TERM") {
-        Ok(term) => term == "dumb",
-        Err(_) => false,
-    }
-}
-
 pub(crate) fn is_a_color_terminal(out: &Term) -> bool {
     if !is_a_terminal(out) {
         return false;
@@ -77,7 +67,7 @@ pub(crate) fn is_a_color_terminal(out: &Term) -> bool {
         return false;
     }
     if msys_tty_on(out) {
-        return !is_a_dumb_terminal();
+        return !is_dumb();
     }
     enable_ansi_on(out)
 }