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