@@ -301,7 +301,6 @@ fn to_ansi_color(digit: u16) -> Option<anstyle::AnsiColor> {
301
301
#[ cfg( test) ]
302
302
mod test {
303
303
use super :: * ;
304
- use owo_colors:: OwoColorize as _;
305
304
use proptest:: prelude:: * ;
306
305
307
306
#[ track_caller]
@@ -317,54 +316,46 @@ mod test {
317
316
318
317
#[ test]
319
318
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!" ) ;
321
321
let expected = vec ! [
322
- (
323
- anstyle:: AnsiColor :: Green . on( anstyle:: AnsiColor :: Red ) ,
324
- "Hello" ,
325
- ) ,
322
+ ( green_on_red, "Hello" ) ,
326
323
( anstyle:: Style :: default ( ) , " world!" ) ,
327
324
] ;
328
325
verify ( & input, expected) ;
329
326
}
330
327
331
328
#[ test]
332
329
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:#}!" ) ;
334
332
let expected = vec ! [
335
333
( anstyle:: Style :: default ( ) , "Hello " ) ,
336
- (
337
- anstyle:: AnsiColor :: Green . on( anstyle:: AnsiColor :: Red ) ,
338
- "world" ,
339
- ) ,
334
+ ( green_on_red, "world" ) ,
340
335
( anstyle:: Style :: default ( ) , "!" ) ,
341
336
] ;
342
337
verify ( & input, expected) ;
343
338
}
344
339
345
340
#[ test]
346
341
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:#}" ) ;
348
344
let expected = vec ! [
349
345
( anstyle:: Style :: default ( ) , "Hello " ) ,
350
- (
351
- anstyle:: AnsiColor :: Green . on( anstyle:: AnsiColor :: Red ) ,
352
- "world!" ,
353
- ) ,
346
+ ( green_on_red, "world!" ) ,
354
347
] ;
355
348
verify ( & input, expected) ;
356
349
}
357
350
358
351
#[ test]
359
352
fn ansi256_colors ( ) {
353
+ let ansi_11 = anstyle:: Ansi256Color ( 11 ) . on_default ( ) ;
360
354
// 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:#}!" ) ;
365
356
let expected = vec ! [
366
357
( anstyle:: Style :: default ( ) , "Hello " ) ,
367
- ( anstyle :: Ansi256Color ( 11 ) . on_default ( ) , "world" ) ,
358
+ ( ansi_11 , "world" ) ,
368
359
( anstyle:: Style :: default ( ) , "!" ) ,
369
360
] ;
370
361
verify ( & input, expected) ;
0 commit comments