Skip to content

Commit 782016f

Browse files
epagedjc
authored andcommitted
test(process): Ensure non-locked writes are stripped of ANSI escape codes
I had originally removed `impl Write for ColorableTerminal` in #4520 and missed this when I added it back in.
1 parent 3dab87e commit 782016f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/process/terminal_source.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ impl ColorableTerminal {
5959
StreamSelector::Stdout => TerminalInner::Stdout(AutoStream::new(io::stdout(), choice)),
6060
StreamSelector::Stderr => TerminalInner::Stderr(AutoStream::new(io::stderr(), choice)),
6161
#[cfg(feature = "test")]
62-
StreamSelector::TestWriter(w) => TerminalInner::TestWriter(w),
62+
StreamSelector::TestWriter(w) => TerminalInner::TestWriter(StripStream::new(w)),
6363
};
6464
let width = process
6565
.var("RUSTUP_TERM_WIDTH")
@@ -84,9 +84,9 @@ impl ColorableTerminal {
8484
self.color_choice,
8585
)),
8686
#[cfg(feature = "test")]
87-
TerminalInner::TestWriter(w) => {
88-
ColorableTerminalLocked::TestWriter(StripStream::new(Box::new(w.clone())))
89-
}
87+
TerminalInner::TestWriter(w) => ColorableTerminalLocked::TestWriter(StripStream::new(
88+
Box::new(w.as_inner().clone()),
89+
)),
9090
}
9191
}
9292

@@ -230,7 +230,7 @@ enum TerminalInner {
230230
Stdout(AutoStream<io::Stdout>),
231231
Stderr(AutoStream<io::Stderr>),
232232
#[cfg(feature = "test")]
233-
TestWriter(TestWriter),
233+
TestWriter(StripStream<TestWriter>),
234234
}
235235

236236
/// Select what stream to make a terminal on

0 commit comments

Comments
 (0)