@@ -478,84 +478,81 @@ fn color_transform_delta(t: i8, c: i8) -> u32 {
478
478
#[ cfg( all( test, feature = "_benchmarks" ) ) ]
479
479
mod benches {
480
480
use rand:: Rng ;
481
- use test:: black_box;
481
+ use test:: { black_box, Bencher } ;
482
482
483
- fn measure_predictor (
484
- b : & mut test:: Bencher ,
485
- predictor : fn ( & mut [ u8 ] , std:: ops:: Range < usize > , usize ) ,
486
- ) {
483
+ fn measure_predictor ( b : & mut Bencher , predictor : fn ( & mut [ u8 ] , std:: ops:: Range < usize > , usize ) ) {
487
484
let width = 256 ;
488
485
let mut data = vec ! [ 0u8 ; width * 8 ] ;
489
486
rand:: thread_rng ( ) . fill ( & mut data[ ..] ) ;
490
487
b. bytes = 4 * width as u64 - 4 ;
491
488
b. iter ( || {
492
489
predictor (
493
- test :: black_box ( & mut data) ,
494
- test :: black_box ( width * 4 + 4 ..width * 8 ) ,
495
- test :: black_box ( width) ,
490
+ black_box ( & mut data) ,
491
+ black_box ( width * 4 + 4 ..width * 8 ) ,
492
+ black_box ( width) ,
496
493
)
497
494
} ) ;
498
495
}
499
496
500
497
#[ bench]
501
- fn predictor00 ( b : & mut test :: Bencher ) {
498
+ fn predictor00 ( b : & mut Bencher ) {
502
499
measure_predictor ( b, super :: apply_predictor_transform_0) ;
503
500
}
504
501
#[ bench]
505
- fn predictor01 ( b : & mut test :: Bencher ) {
502
+ fn predictor01 ( b : & mut Bencher ) {
506
503
measure_predictor ( b, super :: apply_predictor_transform_1) ;
507
504
}
508
505
#[ bench]
509
- fn predictor02 ( b : & mut test :: Bencher ) {
506
+ fn predictor02 ( b : & mut Bencher ) {
510
507
measure_predictor ( b, super :: apply_predictor_transform_2) ;
511
508
}
512
509
#[ bench]
513
- fn predictor03 ( b : & mut test :: Bencher ) {
510
+ fn predictor03 ( b : & mut Bencher ) {
514
511
measure_predictor ( b, super :: apply_predictor_transform_3) ;
515
512
}
516
513
#[ bench]
517
- fn predictor04 ( b : & mut test :: Bencher ) {
514
+ fn predictor04 ( b : & mut Bencher ) {
518
515
measure_predictor ( b, super :: apply_predictor_transform_4) ;
519
516
}
520
517
#[ bench]
521
- fn predictor05 ( b : & mut test :: Bencher ) {
518
+ fn predictor05 ( b : & mut Bencher ) {
522
519
measure_predictor ( b, super :: apply_predictor_transform_5) ;
523
520
}
524
521
#[ bench]
525
- fn predictor06 ( b : & mut test :: Bencher ) {
522
+ fn predictor06 ( b : & mut Bencher ) {
526
523
measure_predictor ( b, super :: apply_predictor_transform_6) ;
527
524
}
528
525
#[ bench]
529
- fn predictor07 ( b : & mut test :: Bencher ) {
526
+ fn predictor07 ( b : & mut Bencher ) {
530
527
measure_predictor ( b, super :: apply_predictor_transform_7) ;
531
528
}
532
529
#[ bench]
533
- fn predictor08 ( b : & mut test :: Bencher ) {
530
+ fn predictor08 ( b : & mut Bencher ) {
534
531
measure_predictor ( b, super :: apply_predictor_transform_8) ;
535
532
}
536
533
#[ bench]
537
- fn predictor09 ( b : & mut test :: Bencher ) {
534
+ fn predictor09 ( b : & mut Bencher ) {
538
535
measure_predictor ( b, super :: apply_predictor_transform_9) ;
539
536
}
540
537
#[ bench]
541
- fn predictor10 ( b : & mut test :: Bencher ) {
538
+ fn predictor10 ( b : & mut Bencher ) {
542
539
measure_predictor ( b, super :: apply_predictor_transform_10) ;
543
540
}
544
541
#[ bench]
545
- fn predictor11 ( b : & mut test :: Bencher ) {
542
+ fn predictor11 ( b : & mut Bencher ) {
546
543
measure_predictor ( b, super :: apply_predictor_transform_11) ;
547
544
}
548
545
#[ bench]
549
- fn predictor12 ( b : & mut test :: Bencher ) {
546
+ fn predictor12 ( b : & mut Bencher ) {
550
547
measure_predictor ( b, super :: apply_predictor_transform_12) ;
551
548
}
552
549
#[ bench]
553
- fn predictor13 ( b : & mut test :: Bencher ) {
550
+ fn predictor13 ( b : & mut Bencher ) {
554
551
measure_predictor ( b, super :: apply_predictor_transform_13) ;
555
552
}
556
553
557
554
#[ bench]
558
- fn color_transform ( b : & mut test :: Bencher ) {
555
+ fn color_transform ( b : & mut Bencher ) {
559
556
let width = 256 ;
560
557
let height = 256 ;
561
558
let size_bits = 3 ;
@@ -575,7 +572,7 @@ mod benches {
575
572
}
576
573
577
574
#[ bench]
578
- fn subtract_green ( b : & mut test :: Bencher ) {
575
+ fn subtract_green ( b : & mut Bencher ) {
579
576
let mut data = vec ! [ 0u8 ; 1024 * 4 ] ;
580
577
rand:: thread_rng ( ) . fill ( & mut data[ ..] ) ;
581
578
b. bytes = data. len ( ) as u64 ;
0 commit comments