Skip to content

Commit 98ef02e

Browse files
committed
test(anstream): Use anstyle for wincon adapter tests
1 parent 182053a commit 98ef02e

File tree

1 file changed

+12
-21
lines changed

1 file changed

+12
-21
lines changed

crates/anstream/src/adapter/wincon.rs

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ fn to_ansi_color(digit: u16) -> Option<anstyle::AnsiColor> {
301301
#[cfg(test)]
302302
mod test {
303303
use super::*;
304-
use owo_colors::OwoColorize as _;
305304
use proptest::prelude::*;
306305

307306
#[track_caller]
@@ -317,54 +316,46 @@ mod test {
317316

318317
#[test]
319318
fn start() {
320-
let input = format!("{} world!", "Hello".green().on_red());
319+
let green_on_red = anstyle::AnsiColor::Green.on(anstyle::AnsiColor::Red);
320+
let input = format!("{green_on_red}Hello{green_on_red:#} world!");
321321
let expected = vec![
322-
(
323-
anstyle::AnsiColor::Green.on(anstyle::AnsiColor::Red),
324-
"Hello",
325-
),
322+
(green_on_red, "Hello"),
326323
(anstyle::Style::default(), " world!"),
327324
];
328325
verify(&input, expected);
329326
}
330327

331328
#[test]
332329
fn middle() {
333-
let input = format!("Hello {}!", "world".green().on_red());
330+
let green_on_red = anstyle::AnsiColor::Green.on(anstyle::AnsiColor::Red);
331+
let input = format!("Hello {green_on_red}world{green_on_red:#}!");
334332
let expected = vec![
335333
(anstyle::Style::default(), "Hello "),
336-
(
337-
anstyle::AnsiColor::Green.on(anstyle::AnsiColor::Red),
338-
"world",
339-
),
334+
(green_on_red, "world"),
340335
(anstyle::Style::default(), "!"),
341336
];
342337
verify(&input, expected);
343338
}
344339

345340
#[test]
346341
fn end() {
347-
let input = format!("Hello {}", "world!".green().on_red());
342+
let green_on_red = anstyle::AnsiColor::Green.on(anstyle::AnsiColor::Red);
343+
let input = format!("Hello {green_on_red}world!{green_on_red:#}");
348344
let expected = vec![
349345
(anstyle::Style::default(), "Hello "),
350-
(
351-
anstyle::AnsiColor::Green.on(anstyle::AnsiColor::Red),
352-
"world!",
353-
),
346+
(green_on_red, "world!"),
354347
];
355348
verify(&input, expected);
356349
}
357350

358351
#[test]
359352
fn ansi256_colors() {
353+
let ansi_11 = anstyle::Ansi256Color(11).on_default();
360354
// termcolor only supports "brights" via these
361-
let input = format!(
362-
"Hello {}!",
363-
"world".color(owo_colors::XtermColors::UserBrightYellow)
364-
);
355+
let input = format!("Hello {ansi_11}world{ansi_11:#}!");
365356
let expected = vec![
366357
(anstyle::Style::default(), "Hello "),
367-
(anstyle::Ansi256Color(11).on_default(), "world"),
358+
(ansi_11, "world"),
368359
(anstyle::Style::default(), "!"),
369360
];
370361
verify(&input, expected);

0 commit comments

Comments
 (0)