development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-09-19 07:41:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #10024 - dswij:9960, r=ehuss

Browse source 
`future-incompat-report` checks both stdout and stderr for color support

Closes #9960
This commit is contained in:
bors 2021-11-15 14:32:52 +00:00
parent 3a3a071cc8 622b43aaec
commit d2cc298079
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cargo/core/compiler/future_incompat.rs
View file

@ -218,7 +218,9 @@ impl OnDiskReports {
};
to_display += &package_report;
let to_display = if config.shell().err_supports_color() {
let shell = config.shell();
let to_display = if shell.err_supports_color() && shell.out_supports_color() {
to_display
} else {
strip_ansi_escapes::strip(&to_display)

26
src/cargo/core/shell.rs
View file

@ -96,11 +96,15 @@ impl Shell {
/// Creates a new shell (color choice and verbosity), defaulting to 'auto' color and verbose
/// output.
pub fn new() -> Shell {
let auto = ColorChoice::CargoAuto.to_termcolor_color_choice();
let auto_clr = ColorChoice::CargoAuto;
Shell {
output: ShellOut::Stream {
stdout: StandardStream::stdout(auto),
stderr: StandardStream::stderr(auto),
stdout: StandardStream::stdout(
auto_clr.to_termcolor_color_choice(atty::Stream::Stdout),
),
stderr: StandardStream::stderr(
auto_clr.to_termcolor_color_choice(atty::Stream::Stderr),
),
color_choice: ColorChoice::CargoAuto,
stderr_tty: atty::is(atty::Stream::Stderr),
},
@ -297,9 +301,8 @@ impl Shell {
),
};
*color_choice = cfg;
let choice = cfg.to_termcolor_color_choice();
*stdout = StandardStream::stdout(choice);
*stderr = StandardStream::stderr(choice);
*stdout = StandardStream::stdout(cfg.to_termcolor_color_choice(atty::Stream::Stdout));
*stderr = StandardStream::stderr(cfg.to_termcolor_color_choice(atty::Stream::Stderr));
}
Ok(())
}
@ -323,6 +326,13 @@ impl Shell {
}
}
pub fn out_supports_color(&self) -> bool {
match &self.output {
ShellOut::Write(_) => false,
ShellOut::Stream { stdout, .. } => stdout.supports_color(),
}
}
/// Prints a message to stderr and translates ANSI escape code into console colors.
pub fn print_ansi_stderr(&mut self, message: &[u8]) -> CargoResult<()> {
if self.needs_clear {
@ -432,12 +442,12 @@ impl ShellOut {
impl ColorChoice {
/// Converts our color choice to termcolor's version.
fn to_termcolor_color_choice(self) -> termcolor::ColorChoice {
fn to_termcolor_color_choice(self, stream: atty::Stream) -> termcolor::ColorChoice {
match self {
ColorChoice::Always => termcolor::ColorChoice::Always,
ColorChoice::Never => termcolor::ColorChoice::Never,
ColorChoice::CargoAuto => {
if atty::is(atty::Stream::Stderr) {
if atty::is(stream) {
termcolor::ColorChoice::Auto
} else {
termcolor::ColorChoice::Never