From 911df092b749aff933b1abdb56cecefbb4bb2513 Mon Sep 17 00:00:00 2001
From: David Lutterkort <lutter@watzmann.net>
Date: Tue, 2 Apr 2024 16:30:03 -0700
Subject: [PATCH] graph, node: Switch from deprecated isatty to atty

---
 Cargo.lock                | 44 ++++++++++++++++++++-------------------
 graph/Cargo.toml          |  2 +-
 graph/src/lib.rs          |  2 +-
 graph/src/log/mod.rs      |  4 ++--
 node/src/manager/color.rs |  4 ++--
 5 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d0b2bbe17e3..283fd4916eb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -333,6 +333,17 @@ version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c"
 
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi 0.1.19",
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.3.0"
@@ -1862,6 +1873,7 @@ dependencies = [
  "async-stream",
  "async-trait",
  "atomic_refcell",
+ "atty",
  "base64 0.21.7",
  "bigdecimal 0.1.2",
  "bs58 0.5.1",
@@ -1888,7 +1900,6 @@ dependencies = [
  "humantime",
  "hyper 1.6.0",
  "hyper-util",
- "isatty",
  "itertools 0.13.0",
  "lazy_static",
  "lru_time_cache",
@@ -2447,6 +2458,15 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "hermit-abi"
 version = "0.3.9"
@@ -2943,7 +2963,7 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.9",
  "libc",
  "windows-sys 0.52.0",
 ]
@@ -2954,18 +2974,6 @@ version = "1.70.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
 
-[[package]]
-name = "isatty"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e31a8281fc93ec9693494da65fbf28c0c2aa60a2eaec25dc58e2f31952e95edc"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "redox_syscall 0.1.57",
- "winapi",
-]
-
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -3456,7 +3464,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.9",
  "libc",
 ]
 
@@ -4207,12 +4215,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.1.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
-
 [[package]]
 name = "redox_syscall"
 version = "0.4.1"
diff --git a/graph/Cargo.toml b/graph/Cargo.toml
index d2d46265f74..452ede55ddc 100644
--- a/graph/Cargo.toml
+++ b/graph/Cargo.toml
@@ -25,7 +25,7 @@ diesel_derives = { workspace = true }
 chrono = "0.4.41"
 envconfig = "0.11.0"
 Inflector = "0.11.3"
-isatty = "0.1.9"
+atty = "0.2"
 reqwest = { version = "0.12.15", features = ["json", "stream", "multipart"] }
 ethabi = "17.2"
 hex = "0.4.3"
diff --git a/graph/src/lib.rs b/graph/src/lib.rs
index 7d1536929bd..ee288c5729a 100644
--- a/graph/src/lib.rs
+++ b/graph/src/lib.rs
@@ -78,12 +78,12 @@ pub mod prelude {
     pub use ::anyhow;
     pub use anyhow::{anyhow, Context as _, Error};
     pub use async_trait::async_trait;
+    pub use atty;
     pub use chrono;
     pub use diesel;
     pub use envconfig;
     pub use ethabi;
     pub use hex;
-    pub use isatty;
     pub use lazy_static::lazy_static;
     pub use prost;
     pub use rand;
diff --git a/graph/src/log/mod.rs b/graph/src/log/mod.rs
index 717c0260aa3..dfe8ab35379 100644
--- a/graph/src/log/mod.rs
+++ b/graph/src/log/mod.rs
@@ -17,7 +17,7 @@ macro_rules! impl_slog_value {
     };
 }
 
-use isatty;
+use atty;
 use slog::*;
 use slog_async;
 use slog_envlogger;
@@ -36,7 +36,7 @@ pub fn logger(show_debug: bool) -> Logger {
 }
 
 pub fn logger_with_levels(show_debug: bool, levels: Option<&str>) -> Logger {
-    let use_color = isatty::stdout_isatty();
+    let use_color = atty::is(atty::Stream::Stdout);
     let decorator = slog_term::TermDecorator::new().build();
     let drain = CustomFormat::new(decorator, use_color).fuse();
     let drain = slog_envlogger::LogBuilder::new(drain)
diff --git a/node/src/manager/color.rs b/node/src/manager/color.rs
index 54d65e88ac0..cf10d2e22d4 100644
--- a/node/src/manager/color.rs
+++ b/node/src/manager/color.rs
@@ -1,7 +1,7 @@
 use std::{io, sync::Mutex};
 use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, WriteColor};
 
-use graph::prelude::{isatty, lazy_static};
+use graph::prelude::{atty, lazy_static};
 
 use super::CmdResult;
 
@@ -21,7 +21,7 @@ impl Terminal {
             "always" => ColorChoice::Always,
             "ansi" => ColorChoice::AlwaysAnsi,
             "auto" => {
-                if isatty::stdout_isatty() {
+                if atty::is(atty::Stream::Stdout) {
                     ColorChoice::Auto
                 } else {
                     ColorChoice::Never