Update owo-colors (updated) (#1708)

This PR is based on #1611 and uses @purplesyringa's work mostly
unmodified. In addition, I have updated the minimum set of crates to get
to a working and consistent state, esp. w.r.t. cargo-deny.

I didn't update *all* the dependencies, in order to do "one thing at a
time" and to avoid creating an undebuggable mess.

Author: Emilgardis

Cargo.lock

@@ -29,7 +29,7 @@ members = ["xtask"]
 [dependencies]
 is-terminal = "0.4.2"
 clap = { version = "4.1.4", features = ["derive"] }
-color-eyre = { version = "0.6.2", default-features = false, features = ["track-caller"] }
+color-eyre = { version = "0.6.5", default-features = false, features = ["track-caller"] }
 eyre = "0.6.8"
 thiserror = "1.0.38"
 home = "0.5.4"
@@ -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"
 

Cargo.toml

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

deny.toml

@@ -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/bin/commands/containers.rs

@@ -7,8 +7,9 @@ use super::shared::*;
 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 @@ pub(crate) fn run(
         ]);
     }
 
-    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");
     }
 

src/docker/local.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");
     }