From 894c361a27187ad9755557bd56bce7cd2aed8362 Mon Sep 17 00:00:00 2001 From: Hanabishi <13597663+HanabishiRecca@users.noreply.github.com> Date: Thu, 1 Jun 2023 22:45:38 +0000 Subject: [PATCH] Use `std::io::IsTerminal` stabilized in Rust 1.70 --- Cargo.lock | 1 - Cargo.toml | 2 +- src/print.rs | 8 ++------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9594190..8062aae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -27,7 +27,6 @@ version = "1.0.3" dependencies = [ "alpm", "curl", - "libc", "serde", "serde_json", ] diff --git a/Cargo.toml b/Cargo.toml index 4ff04e4..b3c9071 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,7 @@ name = "aur-check-updates" version = "1.0.3" edition = "2021" +rust-version = "1.70" [profile.release] panic = "abort" @@ -9,6 +10,5 @@ panic = "abort" [dependencies] alpm = "2.2" curl = "0.4" -libc = "0.2" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/print.rs b/src/print.rs index 7313dda..c0613b0 100644 --- a/src/print.rs +++ b/src/print.rs @@ -1,5 +1,6 @@ use std::{ fmt::Display, + io::{stdout, IsTerminal}, sync::atomic::{AtomicBool, Ordering::Relaxed}, }; @@ -12,16 +13,11 @@ pub enum ColorMode { Never, } -fn isatty() -> bool { - // SAFETY: This call should not have side effects. - unsafe { libc::isatty(libc::STDOUT_FILENO) == 1 } -} - pub fn set_color_mode(mode: ColorMode) { use ColorMode::*; COLOR.store( match mode { - Auto => isatty(), + Auto => stdout().is_terminal(), Always => true, Never => false, },