Skip to content

Commit 10da30f

Browse files
committed
Merge all Destination variants
1 parent 826a8ef commit 10da30f

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

Diff for: compiler/rustc_errors/src/emitter.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -2604,7 +2604,6 @@ fn emit_to_destination(
26042604
}
26052605

26062606
pub enum Destination {
2607-
Terminal(StandardStream),
26082607
Raw(Box<(dyn WriteColor + Send)>),
26092608
}
26102609

@@ -2649,7 +2648,7 @@ impl Destination {
26492648
// On non-Windows we rely on the atomicity of `write` to ensure errors
26502649
// don't get all jumbled up.
26512650
if cfg!(windows) {
2652-
Terminal(StandardStream::stderr(choice))
2651+
Raw(Box::new(StandardStream::stderr(choice)))
26532652
} else {
26542653
let buffer_writer = BufferWriter::stderr(choice);
26552654
let buffer = buffer_writer.buffer();
@@ -2659,14 +2658,12 @@ impl Destination {
26592658

26602659
fn writable(&mut self) -> &mut dyn WriteColor {
26612660
match *self {
2662-
Destination::Terminal(ref mut t) => t,
26632661
Destination::Raw(ref mut t) => t,
26642662
}
26652663
}
26662664

26672665
fn supports_color(&self) -> bool {
26682666
match *self {
2669-
Self::Terminal(ref stream) => stream.supports_color(),
26702667
Self::Raw(ref writer) => writer.supports_color(),
26712668
}
26722669
}

0 commit comments

Comments
 (0)