Skip to content

Commit 5716f32

Browse files
borsbors
authored
Auto merge of #2804 - skeleten:master, r=alexcrichton
Add color support for Windows consoles Unfortunately, the `term` API makes this PR rather inelegant, any hints/pointers to make it better are highly appreciated! Fixes #2803
2 parents 7e34d2c + 6edf535 commit 5716f32

File tree

3 files changed

+51
-23
lines changed

3 files changed

+51
-23
lines changed

‎src/cargo/core/shell.rs

+44-14
Original file line numberDiff line numberDiff line change
@@ -147,27 +147,57 @@ impl MultiShell {
147147
}
148148

149149
impl Shell {
150-
pub fn create(out: Box<Write + Send>, config: ShellConfig) -> Shell {
150+
pub fn create<T: FnMut() -> Box<Write + Send>>(mut out_fn: T, config: ShellConfig) -> Shell {
151+
let term = match Shell::get_term(out_fn()) {
152+
Ok(t) => t,
153+
Err(_) => NoColor(out_fn())
154+
};
155+
156+
Shell {
157+
terminal: term,
158+
config: config,
159+
}
160+
}
161+
162+
#[cfg(any(windows))]
163+
fn get_term(out: Box<Write + Send>) -> CargoResult<AdequateTerminal> {
164+
// Check if the creation of a console will succeed
165+
if ::term::WinConsole::new(vec![0u8; 0]).is_ok() {
166+
let t = try!(::term::WinConsole::new(out));
167+
if !t.supports_color() {
168+
Ok(NoColor(Box::new(t)))
169+
} else {
170+
Ok(Colored(Box::new(t)))
171+
}
172+
} else {
173+
// If we fail to get a windows console, we try to get a `TermInfo` one
174+
Ok(Shell::get_terminfo_term(out))
175+
}
176+
}
177+
178+
#[cfg(any(unix))]
179+
fn get_term(out: Box<Write + Send>) -> CargoResult<AdequateTerminal> {
180+
Ok(Shell::get_terminfo_term(out))
181+
}
182+
183+
fn get_terminfo_term(out: Box<Write + Send>) -> AdequateTerminal {
151184
// Use `TermInfo::from_env()` and `TerminfoTerminal::supports_color()`
152185
// to determine if creation of a TerminfoTerminal is possible regardless
153186
// of the tty status. --color options are parsed after Shell creation so
154187
// always try to create a terminal that supports color output. Fall back
155188
// to a no-color terminal regardless of whether or not a tty is present
156189
// and if color output is not possible.
157-
Shell {
158-
terminal: match ::term::terminfo::TermInfo::from_env() {
159-
Ok(ti) => {
160-
let term = TerminfoTerminal::new_with_terminfo(out, ti);
161-
if !term.supports_color() {
162-
NoColor(term.into_inner())
163-
} else {
164-
// Color output is possible.
165-
Colored(Box::new(term))
166-
}
167-
},
168-
Err(_) => NoColor(out),
190+
match ::term::terminfo::TermInfo::from_env() {
191+
Ok(ti) => {
192+
let term = TerminfoTerminal::new_with_terminfo(out, ti);
193+
if !term.supports_color() {
194+
NoColor(term.into_inner())
195+
} else {
196+
// Color output is possible.
197+
Colored(Box::new(term))
198+
}
169199
},
170-
config: config,
200+
Err(_) => NoColor(out),
171201
}
172202
}
173203

‎src/cargo/lib.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ use core::shell::Verbosity::{Verbose};
3636
use core::shell::ColorConfig::{Auto};
3737
use term::color::{BLACK};
3838

39-
pub use util::{CargoError, CliError, CliResult, human, Config, ChainError};
39+
pub use util::{CargoError, CargoResult, CliError, CliResult, human, Config, ChainError};
4040

4141
macro_rules! bail {
4242
($($fmt:tt)*) => (
@@ -137,16 +137,14 @@ pub fn shell(verbosity: Verbosity, color_config: ColorConfig) -> MultiShell {
137137
}
138138

139139
let tty = isatty(Output::Stderr);
140-
let stderr = Box::new(io::stderr());
141140

142141
let config = ShellConfig { color_config: color_config, tty: tty };
143-
let err = Shell::create(stderr, config);
142+
let err = Shell::create(|| Box::new(io::stderr()), config);
144143

145144
let tty = isatty(Output::Stdout);
146-
let stdout = Box::new(io::stdout());
147145

148146
let config = ShellConfig { color_config: color_config, tty: tty };
149-
let out = Shell::create(stdout, config);
147+
let out = Shell::create(|| Box::new(io::stdout()), config);
150148

151149
return MultiShell::new(out, err, verbosity);
152150

‎tests/shell.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ fn non_tty() {
2828
let config = ShellConfig { color_config: Auto, tty: false };
2929
let a = Arc::new(Mutex::new(Vec::new()));
3030

31-
Shell::create(Box::new(Sink(a.clone())), config).tap(|shell| {
31+
Shell::create(|| Box::new(Sink(a.clone())), config).tap(|shell| {
3232
shell.say("Hey Alex", color::RED).unwrap();
3333
});
3434
let buf = a.lock().unwrap().clone();
@@ -43,7 +43,7 @@ fn color_explicitly_disabled() {
4343
let config = ShellConfig { color_config: Never, tty: true };
4444
let a = Arc::new(Mutex::new(Vec::new()));
4545

46-
Shell::create(Box::new(Sink(a.clone())), config).tap(|shell| {
46+
Shell::create(|| Box::new(Sink(a.clone())), config).tap(|shell| {
4747
shell.say("Hey Alex", color::RED).unwrap();
4848
});
4949
let buf = a.lock().unwrap().clone();
@@ -58,7 +58,7 @@ fn colored_shell() {
5858
let config = ShellConfig { color_config: Auto, tty: true };
5959
let a = Arc::new(Mutex::new(Vec::new()));
6060

61-
Shell::create(Box::new(Sink(a.clone())), config).tap(|shell| {
61+
Shell::create(|| Box::new(Sink(a.clone())), config).tap(|shell| {
6262
shell.say("Hey Alex", color::RED).unwrap();
6363
});
6464
let buf = a.lock().unwrap().clone();
@@ -75,7 +75,7 @@ fn color_explicitly_enabled() {
7575
let config = ShellConfig { color_config: Always, tty: false };
7676
let a = Arc::new(Mutex::new(Vec::new()));
7777

78-
Shell::create(Box::new(Sink(a.clone())), config).tap(|shell| {
78+
Shell::create(|| Box::new(Sink(a.clone())), config).tap(|shell| {
7979
shell.say("Hey Alex", color::RED).unwrap();
8080
});
8181
let buf = a.lock().unwrap().clone();

0 commit comments

Comments
 (0)