summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2023-06-09 14:46:35 +0200
committerLaurenz <laurmaedje@gmail.com>2023-06-09 14:46:35 +0200
commit58ca0e8db5f20848927e0dcb629fc478919081b6 (patch)
treeb1dd713c8dcb3be907ddb0f02a867da792f24c74
parent635ef03273792a07e6f227a17b30d3f93c6a1216 (diff)
Replace atty with std
-rw-r--r--Cargo.lock1
-rw-r--r--cli/Cargo.toml1
-rw-r--r--cli/src/main.rs7
3 files changed, 3 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock
index ba62d6b7..e0193a88 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2398,7 +2398,6 @@ dependencies = [
name = "typst-cli"
version = "0.4.0"
dependencies = [
- "atty",
"chrono",
"clap 4.2.7",
"clap_complete",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 0a1eb7d1..5b29253f 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -22,7 +22,6 @@ doc = false
[dependencies]
typst = { path = ".." }
typst-library = { path = "../library" }
-atty = "0.2"
chrono = { version = "0.4.24", default-features = false, features = ["clock", "std"] }
clap = { version = "4.2.4", features = ["derive", "env"] }
codespan-reporting = "0.11"
diff --git a/cli/src/main.rs b/cli/src/main.rs
index 17817655..d4fdfcf0 100644
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
@@ -5,11 +5,10 @@ use std::cell::{Cell, RefCell, RefMut};
use std::collections::HashMap;
use std::fs::{self, File};
use std::hash::Hash;
-use std::io::{self, Write};
+use std::io::{self, IsTerminal, Write};
use std::path::{Path, PathBuf};
use std::process::ExitCode;
-use atty::Stream;
use chrono::Datelike;
use clap::Parser;
use codespan_reporting::diagnostic::{Diagnostic, Label};
@@ -368,7 +367,7 @@ fn status(command: &CompileSettings, status: Status) -> io::Result<()> {
let color = status.color();
let mut w = color_stream();
- if atty::is(Stream::Stderr) {
+ if std::io::stderr().is_terminal() {
// Clear the terminal.
write!(w, "{esc}c{esc}[1;1H")?;
}
@@ -392,7 +391,7 @@ fn status(command: &CompileSettings, status: Status) -> io::Result<()> {
/// Get stderr with color support if desirable.
fn color_stream() -> termcolor::StandardStream {
- termcolor::StandardStream::stderr(if atty::is(Stream::Stderr) {
+ termcolor::StandardStream::stderr(if std::io::stderr().is_terminal() {
ColorChoice::Auto
} else {
ColorChoice::Never