Update owo-colors

Cargo.toml

@@ -46,7 +46,7 @@ signal-hook = { version = "0.3.15" }
 directories = "4.0.1"
 walkdir = { version = "2.3.2", optional = true }
 tempfile = "3.3.0"
-owo-colors = { version = "3.5.0", features = ["supports-colors"] }
+owo-colors = { version = "4.0", features = ["supports-colors"] }
 semver = "1.0.16"
 is_ci = "1.1.1"
 

deny.toml

@@ -9,11 +9,6 @@ targets = [
 
 [advisories]
 version = 2
-# FIXME: remove this if/when clap changes to is-terminal, atty is
-# patched, or we migrated to an MSRV of 1.66.0.
-ignore = [
-    "RUSTSEC-2021-0145",
-]
 
 [bans]
 multiple-versions = "deny"

src/bin/commands/containers.rs

@@ -3,8 +3,9 @@ use std::io;
 use clap::{Args, Subcommand};
 use cross::docker::ImagePlatform;
 use cross::rustc::{QualifiedToolchain, Toolchain};
-use cross::shell::{MessageInfo, Stream};
+use cross::shell::MessageInfo;
 use cross::{docker, CommandExt, TargetTriple};
+use is_terminal::IsTerminal;
 
 #[derive(Args, Debug)]
 pub struct ListVolumes {
@@ -327,7 +328,8 @@ pub fn create_persistent_volume(
     docker.arg("--rm");
     docker.args(["-v", &format!("{}:{}", volume_id, mount_prefix)]);
     docker.arg("-d");
-    let is_tty = io::Stdin::is_atty() && io::Stdout::is_atty() && io::Stderr::is_atty();
+    let is_tty =
+        io::stdin().is_terminal() && io::stdout().is_terminal() && io::stderr().is_terminal();
     if is_tty {
         docker.arg("-t");
     }

src/docker/local.rs

@@ -7,8 +7,9 @@
 use crate::errors::Result;
 use crate::extensions::CommandExt;
 use crate::file::{PathExt, ToUtf8};
-use crate::shell::{MessageInfo, Stream};
+use crate::shell::MessageInfo;
 use eyre::Context;
+use is_terminal::IsTerminal;
 
 // NOTE: host path must be absolute
 fn mount(
@@ -136,7 +137,7 @@
         ]);
     }
 
-    if io::Stdin::is_atty() && io::Stdout::is_atty() && io::Stderr::is_atty() {
+    if io::stdin().is_terminal() && io::stdout().is_terminal() && io::stderr().is_terminal() {
         docker.arg("-t");
     }
 
@@ -165,7 +166,7 @@
     // terminate or it may be a known interrupt return status (130, 137, 143).
     // simpler: just test if the program termination handler was called.
     // SAFETY: an atomic load.
     let is_terminated = unsafe { crate::errors::TERMINATED.load(Ordering::SeqCst) };
     if !is_terminated {
         ChildContainer::exit_static();
     }

src/docker/remote.rs

@@ -5,6 +5,7 @@ use std::process::{Command, ExitStatus};
 use std::{env, fs, time};
 
 use eyre::Context;
+use is_terminal::IsTerminal;
 
 use super::engine::Engine;
 use super::shared::*;
@@ -13,7 +14,7 @@ use crate::errors::Result;
 use crate::extensions::CommandExt;
 use crate::file::{self, PathExt, ToUtf8};
 use crate::rustc::{self, QualifiedToolchain, VersionMetaExt};
-use crate::shell::{MessageInfo, Stream};
+use crate::shell::MessageInfo;
 use crate::temp;
 use crate::TargetTriple;
 
@@ -774,7 +775,8 @@ pub(crate) fn run(
     }
 
     docker.arg("-d");
-    let is_tty = io::Stdin::is_atty() && io::Stdout::is_atty() && io::Stderr::is_atty();
+    let is_tty =
+        io::stdin().is_terminal() && io::stdout().is_terminal() && io::stderr().is_terminal();
     if is_tty {
         docker.arg("-t");
     }

src/shell.rs

@@ -8,7 +8,6 @@ use std::str::FromStr;
 
 use crate::config::bool_from_envvar;
 use crate::errors::Result;
-use is_terminal::IsTerminal;
 use owo_colors::{self, OwoColorize};
 
 // get the prefix for stderr messages
@@ -201,7 +200,7 @@ impl MessageInfo {
         self.as_verbosity(call, Verbosity::Verbose(2))
     }
 
-    fn erase_line<S: Stream + Write>(&mut self, stream: &mut S) -> Result<()> {
+    fn erase_line<S: OwoStream + Write>(&mut self, stream: &mut S) -> Result<()> {
         // this is the Erase in Line sequence
         stream.write_all(b"\x1B[K").map_err(Into::into)
     }
@@ -449,42 +448,19 @@ fn get_verbosity(
     })
 }
 
-pub trait Stream {
-    type TTY: IsTerminal;
-    const OWO: owo_colors::Stream;
-
-    #[must_use]
-    fn is_atty() -> bool;
-
-    fn owo(&self) -> owo_colors::Stream {
-        Self::OWO
-    }
+trait OwoStream {
+    fn owo(&self) -> owo_colors::Stream;
 }
 
-impl Stream for io::Stdin {
-    type TTY = io::Stdin;
-    const OWO: owo_colors::Stream = owo_colors::Stream::Stdin;
-
-    fn is_atty() -> bool {
-        io::stdin().is_terminal()
-    }
-}
-
-impl Stream for io::Stdout {
-    type TTY = io::Stdout;
-    const OWO: owo_colors::Stream = owo_colors::Stream::Stdout;
-
-    fn is_atty() -> bool {
-        io::stdout().is_terminal()
+impl OwoStream for io::Stdout {
+    fn owo(&self) -> owo_colors::Stream {
+        owo_colors::Stream::Stdout
     }
 }
 
-impl Stream for io::Stderr {
-    type TTY = io::Stderr;
-    const OWO: owo_colors::Stream = owo_colors::Stream::Stderr;
-
-    fn is_atty() -> bool {
-        io::stderr().is_terminal()
+impl OwoStream for io::Stderr {
+    fn owo(&self) -> owo_colors::Stream {
+        owo_colors::Stream::Stderr
     }
 }