nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-10-30 05:51:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge all Destination variants

Browse Source
This commit is contained in:
Oli Scherer 2023-07-26 18:26:24 +00:00
parent 826a8ef52e
commit 10da30f540
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/rustc_errors/src/emitter.rs
View File

@ -2604,7 +2604,6 @@ fn emit_to_destination(
}
pub enum Destination {
Terminal(StandardStream),
Raw(Box<(dyn WriteColor + Send)>),
}
@ -2649,7 +2648,7 @@ impl Destination {
// On non-Windows we rely on the atomicity of `write` to ensure errors
// don't get all jumbled up.
if cfg!(windows) {
Terminal(StandardStream::stderr(choice))
Raw(Box::new(StandardStream::stderr(choice)))
} else {
let buffer_writer = BufferWriter::stderr(choice);
let buffer = buffer_writer.buffer();
@ -2659,14 +2658,12 @@ impl Destination {
fn writable(&mut self) -> &mut dyn WriteColor {
match *self {
Destination::Terminal(ref mut t) => t,
Destination::Raw(ref mut t) => t,
}
}
fn supports_color(&self) -> bool {
match *self {
Self::Terminal(ref stream) => stream.supports_color(),
Self::Raw(ref writer) => writer.supports_color(),
}
}