Skip to content

Commit

Permalink
Use the is-terminal crate instead of atty
Browse files Browse the repository at this point in the history
The crate is already used by `clap` and a similar trait is about to be
stabilized in `std`.
  • Loading branch information
nickelc committed Apr 5, 2023
1 parent 1b2c69a commit 57cc0d8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ application = [
# Mainly for developers that want to iterate quickly
# Be aware that the included features might change in the future
minimal-application = [
"atty",
"is-terminal",
"clap",
"dirs",
"paging",
Expand All @@ -41,7 +41,7 @@ regex-onig = ["syntect/regex-onig"] # Use the "oniguruma" regex engine
regex-fancy = ["syntect/regex-fancy"] # Use the rust-only "fancy-regex" engine

[dependencies]
atty = { version = "0.2.14", optional = true }
is-terminal = { version = "0.4.4", optional = true }
nu-ansi-term = "0.47.0"
ansi_colours = "^1.2"
bincode = "1.0"
Expand Down
6 changes: 3 additions & 3 deletions src/bin/bat/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::collections::HashSet;
use std::env;
use std::path::{Path, PathBuf};

use atty::{self, Stream};
use is_terminal::IsTerminal;

use crate::{
clap_app,
Expand Down Expand Up @@ -40,7 +40,7 @@ impl App {
#[cfg(windows)]
let _ = nu_ansi_term::enable_ansi_support();

let interactive_output = atty::is(Stream::Stdout);
let interactive_output = std::io::stdout().is_terminal();

Ok(App {
matches: Self::matches(interactive_output)?,
Expand Down Expand Up @@ -104,7 +104,7 @@ impl App {
// If we are reading from stdin, only enable paging if we write to an
// interactive terminal and if we do not *read* from an interactive
// terminal.
if self.interactive_output && !atty::is(Stream::Stdin) {
if self.interactive_output && std::io::stdin().is_terminal() {
PagingMode::QuitIfOneScreen
} else {
PagingMode::Never
Expand Down

0 comments on commit 57cc0d8

Please sign in to comment.