chore: use standard IsTerminal (#5432)

foundry-rs · Jul 18, 2023 · 058182d · 058182d
1 parent e41318d
commit 058182d
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -35,7 +35,6 @@ tracing-error = "0.2"
 tracing-subscriber = { version = "0.3", features = ["registry", "env-filter", "fmt"] }
 tracing = "0.1"
 watchexec = "2"
-is-terminal = "0.4"
 comfy-table = "6"
 reqwest = { version = "0.11", default-features = false, features = [
   "json",

diff --git a/cli/src/cmd/forge/install.rs b/cli/src/cmd/forge/install.rs
@@ -13,6 +13,7 @@ use once_cell::sync::Lazy;
 use regex::Regex;
 use semver::Version;
 use std::{
+    io::IsTerminal,
     path::{Path, PathBuf},
     str,
 };
@@ -316,7 +317,7 @@ impl Installer<'_> {
 
         let mut is_branch = false;
         // only try to match tag if current terminal is a tty
-        if is_terminal::is_terminal(std::io::stdout()) {
+        if std::io::stdout().is_terminal() {
             if tag.is_empty() {
                 tag = self.match_tag(&tag, path)?;
             } else if let Some(branch) = self.match_branch(&tag, path)? {

diff --git a/cli/test-utils/Cargo.toml b/cli/test-utils/Cargo.toml
@@ -14,7 +14,6 @@ ethers = { workspace = true }
 ethers-solc = { workspace = true, features = ["project-util"] }
 
 eyre = "0.6"
-is-terminal = "0.4"
 once_cell = "1"
 parking_lot = "0.12"
 pretty_assertions = "1"

diff --git a/cli/test-utils/src/util.rs b/cli/test-utils/src/util.rs
@@ -14,7 +14,7 @@ use std::{
     fmt::Display,
     fs,
     fs::File,
-    io::{BufWriter, Write},
+    io::{BufWriter, IsTerminal, Write},
     path::{Path, PathBuf},
     process::{self, Command, Stdio},
     sync::{
@@ -33,7 +33,7 @@ static CURRENT_DIR_LOCK: Lazy<Mutex<()>> = Lazy::new(|| Mutex::new(()));
 static PRE_INSTALL_SOLC_LOCK: Lazy<Mutex<bool>> = Lazy::new(|| Mutex::new(false));
 
 // This stores `true` if the current terminal is a tty
-pub static IS_TTY: Lazy<bool> = Lazy::new(|| is_terminal::is_terminal(std::io::stdout()));
+pub static IS_TTY: Lazy<bool> = Lazy::new(|| std::io::stdout().is_terminal());
 
 /// Contains a `forge init` initialized project
 pub static FORGE_INITIALIZED: Lazy<TestProject> = Lazy::new(|| {

diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -26,7 +26,6 @@ reqwest = { version = "0.11", default-features = false }
 clap = { version = "4", features = ["derive", "env", "unicode", "wrap_help"] }
 comfy-table = "6"
 tracing = "0.1"
-is-terminal = "0.4"
 yansi = "0.5"
 tempfile = "3"
 

diff --git a/common/src/term.rs b/common/src/term.rs
@@ -8,7 +8,7 @@ use once_cell::sync::Lazy;
 use semver::Version;
 use std::{
     io,
-    io::prelude::*,
+    io::{prelude::*, IsTerminal},
     path::{Path, PathBuf},
     sync::{
         mpsc::{self, TryRecvError},
@@ -36,13 +36,9 @@ pub struct TermSettings {
 }
 
 impl TermSettings {
-    #[allow(missing_docs)]
+    /// Returns a new [`TermSettings`], configured from the current environment.
     pub fn from_env() -> TermSettings {
-        if is_terminal::is_terminal(std::io::stdout()) {
-            TermSettings { indicate_progress: true }
-        } else {
-            TermSettings { indicate_progress: false }
-        }
+        TermSettings { indicate_progress: std::io::stdout().is_terminal() }
     }
 }