]> git.lizzy.rs Git - rust.git/commitdiff
rustc: Request ansi colors if stderr isn't a tty
authorAlex Crichton <alex@alexcrichton.com>
Thu, 8 Nov 2018 15:49:28 +0000 (07:49 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Thu, 8 Nov 2018 15:53:03 +0000 (07:53 -0800)
Currently Cargo will always capture the output of rustc meaning that
rustc is never hooked up to a tty. To retain colors Cargo uses the
`fwdansi` crate to ensure that ansi color codes are translated to
windows terminal methods (and ansi codes otherwise just go their natural
route on Unix).

Cargo passes `--color always` to rustc to ensure that using a pipe
doesn't trick it into not emitting colors at all. It turns out, however,
that `--color always` ends up still accidentally using the native shell
api on native windows shells.

The fix here is to instead pass `AlwaysAnsi` to `termcolor` instead of
`Always`, ensuring that when `--color always` is passed to rustc and its
output isn't a terminal, we're always generating ansi colors regardless
of the platform.

Closes #55769

src/librustc_errors/emitter.rs

index 720e8def5ab1c2a7d30abec1e97e67649736e39e..7e69e98071d4b1fa29ad1453d8f9733f8e1e1424 100644 (file)
@@ -108,7 +108,13 @@ pub enum ColorConfig {
 impl ColorConfig {
     fn to_color_choice(&self) -> ColorChoice {
         match *self {
-            ColorConfig::Always => ColorChoice::Always,
+            ColorConfig::Always => {
+                if atty::is(atty::Stream::Stderr) {
+                    ColorChoice::Always
+                } else {
+                    ColorChoice::AlwaysAnsi
+                }
+            }
             ColorConfig::Never => ColorChoice::Never,
             ColorConfig::Auto if atty::is(atty::Stream::Stderr) => {
                 ColorChoice::Auto