@@ -581,12 +581,9 @@ mod tests {
581581 assert_eq ! ( pv. get( 2 ) , None ) ;
582582 assert_eq ! ( pv. iter( ) . collect:: <Vec <u16 >>( ) , vec![ 0 , 0 ] ) ;
583583
584- let pv = PackedVec :: new ( vec ! [ u16 :: max_value ( ) , u16 :: max_value ( ) ] ) ;
584+ let pv = PackedVec :: new ( vec ! [ u16 :: MAX , u16 :: MAX ] ) ;
585585 assert_eq ! ( pv. bits. len( ) , 0 ) ;
586- assert_eq ! (
587- pv. iter( ) . collect:: <Vec <u16 >>( ) ,
588- vec![ u16 :: max_value( ) , u16 :: max_value( ) ]
589- ) ;
586+ assert_eq ! ( pv. iter( ) . collect:: <Vec <u16 >>( ) , vec![ u16 :: MAX , u16 :: MAX ] ) ;
590587 }
591588
592589 #[ test]
@@ -608,24 +605,21 @@ mod tests {
608605 // The trickiness here almost entirely relates to negative maximum values for signed
609606 // integer types
610607 assert_eq ! ( delta:: <u8 , u8 >( 0 , 2 ) , 2 ) ;
611- assert_eq ! ( delta:: <u8 , u8 >( 0 , u8 :: max_value ( ) ) , u8 :: max_value ( ) ) ;
608+ assert_eq ! ( delta:: <u8 , u8 >( 0 , u8 :: MAX ) , u8 :: MAX ) ;
612609 assert_eq ! ( delta:: <i8 , u8 >( -2 , 0 ) , 2 ) ;
613610 assert_eq ! ( delta:: <i8 , u8 >( -2 , 2 ) , 4 ) ;
614611 assert_eq ! ( delta:: <i8 , u8 >( -2 , -1 ) , 1 ) ;
615- assert_eq ! ( delta:: <i8 , u8 >( i8 :: min_value( ) , 0 ) , 128 ) ;
616- assert_eq ! ( delta:: <i8 , u8 >( 0 , i8 :: max_value( ) ) , 127 ) ;
617- assert_eq ! (
618- delta:: <i8 , u8 >( i8 :: min_value( ) , i8 :: max_value( ) ) ,
619- u8 :: max_value( )
620- ) ;
621- assert_eq ! ( delta:: <i8 , u8 >( i8 :: min_value( ) , i8 :: min_value( ) ) , 0 ) ;
612+ assert_eq ! ( delta:: <i8 , u8 >( i8 :: MIN , 0 ) , 128 ) ;
613+ assert_eq ! ( delta:: <i8 , u8 >( 0 , i8 :: MAX ) , 127 ) ;
614+ assert_eq ! ( delta:: <i8 , u8 >( i8 :: MIN , i8 :: MAX ) , u8 :: MAX ) ;
615+ assert_eq ! ( delta:: <i8 , u8 >( i8 :: MIN , i8 :: MIN ) , 0 ) ;
622616 assert_eq ! (
623- delta:: <i32 , u32 >( i32 :: min_value ( ) , i32 :: max_value ( ) ) ,
624- ( i32 :: max_value ( ) as u32 ) * 2 + 1
617+ delta:: <i32 , u32 >( i32 :: MIN , i32 :: MAX ) ,
618+ ( i32 :: MAX as u32 ) * 2 + 1
625619 ) ;
626620 assert_eq ! (
627- delta:: <i32 , usize >( i32 :: min_value ( ) , i32 :: max_value ( ) ) ,
628- ( i32 :: max_value ( ) as usize ) * 2 + 1
621+ delta:: <i32 , usize >( i32 :: MIN , i32 :: MAX ) ,
622+ ( i32 :: MAX as usize ) * 2 + 1
629623 ) ;
630624 }
631625
@@ -634,27 +628,21 @@ mod tests {
634628 // These tests are, in essence, those from delta with the last two values swapped (i.e.
635629 // assert_eq!(delta(x, y), z) becomes assert_eq!(inv_delta(x, z), y).
636630 assert_eq ! ( inv_delta:: <u8 , u8 >( 0 , 2 ) , 2 ) ;
637- assert_eq ! ( inv_delta:: <u8 , u8 >( 0 , u8 :: max_value ( ) ) , u8 :: max_value ( ) ) ;
631+ assert_eq ! ( inv_delta:: <u8 , u8 >( 0 , u8 :: MAX ) , u8 :: MAX ) ;
638632 assert_eq ! ( inv_delta:: <i8 , u8 >( -2 , 2 ) , 0 ) ;
639633 assert_eq ! ( inv_delta:: <i8 , u8 >( -2 , 4 ) , 2 ) ;
640634 assert_eq ! ( inv_delta:: <i8 , u8 >( -2 , 1 ) , -1 ) ;
641- assert_eq ! ( inv_delta:: <i8 , u8 >( i8 :: min_value( ) , 128 ) , 0 ) ;
642- assert_eq ! ( inv_delta:: <i8 , u8 >( 0 , 127 ) , i8 :: max_value( ) ) ;
635+ assert_eq ! ( inv_delta:: <i8 , u8 >( i8 :: MIN , 128 ) , 0 ) ;
636+ assert_eq ! ( inv_delta:: <i8 , u8 >( 0 , 127 ) , i8 :: MAX ) ;
637+ assert_eq ! ( inv_delta:: <i8 , u8 >( i8 :: MIN , u8 :: MAX ) , i8 :: MAX ) ;
638+ assert_eq ! ( inv_delta:: <i8 , u8 >( i8 :: MIN , 0 ) , i8 :: MIN ) ;
643639 assert_eq ! (
644- inv_delta:: <i8 , u8 > ( i8 :: min_value ( ) , u8 :: max_value ( ) ) ,
645- i8 :: max_value ( )
640+ inv_delta:: <i32 , u32 > ( i32 :: MIN , ( ( i32 :: MAX as u32 ) * 2 + 1 ) . as_ ( ) ) ,
641+ i32 :: MAX
646642 ) ;
647- assert_eq ! ( inv_delta:: <i8 , u8 >( i8 :: min_value( ) , 0 ) , i8 :: min_value( ) ) ;
648643 assert_eq ! (
649- inv_delta:: <i32 , u32 >( i32 :: min_value( ) , ( ( i32 :: max_value( ) as u32 ) * 2 + 1 ) . as_( ) ) ,
650- i32 :: max_value( )
651- ) ;
652- assert_eq ! (
653- inv_delta:: <i32 , usize >(
654- i32 :: min_value( ) ,
655- ( ( i32 :: max_value( ) as usize ) * 2 + 1 ) . as_( )
656- ) ,
657- i32 :: max_value( )
644+ inv_delta:: <i32 , usize >( i32 :: MIN , ( ( i32 :: MAX as usize ) * 2 + 1 ) . as_( ) ) ,
645+ i32 :: MAX
658646 ) ;
659647 }
660648
@@ -670,14 +658,11 @@ mod tests {
670658 let pv = PackedVec :: new ( vec ! [ -1 , 1 ] ) ;
671659 assert_eq ! ( pv. iter( ) . collect:: <Vec <_>>( ) , vec![ -1 , 1 ] ) ;
672660
673- let pv = PackedVec :: new ( vec ! [ i32 :: min_value ( ) , 1 ] ) ;
674- assert_eq ! ( pv. iter( ) . collect:: <Vec <_>>( ) , vec![ i32 :: min_value ( ) , 1 ] ) ;
661+ let pv = PackedVec :: new ( vec ! [ i32 :: MIN , 1 ] ) ;
662+ assert_eq ! ( pv. iter( ) . collect:: <Vec <_>>( ) , vec![ i32 :: MIN , 1 ] ) ;
675663
676- let pv = PackedVec :: < i32 , u32 > :: new_with_storaget ( vec ! [ i32 :: min_value( ) , i32 :: max_value( ) ] ) ;
677- assert_eq ! (
678- pv. iter( ) . collect:: <Vec <_>>( ) ,
679- vec![ i32 :: min_value( ) , i32 :: max_value( ) ]
680- ) ;
664+ let pv = PackedVec :: < i32 , u32 > :: new_with_storaget ( vec ! [ i32 :: MIN , i32 :: MAX ] ) ;
665+ assert_eq ! ( pv. iter( ) . collect:: <Vec <_>>( ) , vec![ i32 :: MIN , i32 :: MAX ] ) ;
681666
682667 let pv = PackedVec :: new ( vec ! [ -2 , -1 , 0 ] ) ;
683668 assert_eq ! ( pv. iter( ) . collect:: <Vec <_>>( ) , vec![ -2 , -1 , 0 ] ) ;
@@ -689,8 +674,8 @@ mod tests {
689674 assert_eq ! ( PackedVec :: new( vec![ 0 ] ) , PackedVec :: new( vec![ 0 ] ) ) ;
690675 assert_eq ! ( PackedVec :: new( vec![ 4 , 10 ] ) , PackedVec :: new( vec![ 4 , 10 ] ) ) ;
691676 assert_eq ! (
692- PackedVec :: new( vec![ u32 :: max_value ( ) , u32 :: min_value ( ) ] ) ,
693- PackedVec :: new( vec![ u32 :: max_value ( ) , u32 :: min_value ( ) ] )
677+ PackedVec :: new( vec![ u32 :: MAX , u32 :: MIN ] ) ,
678+ PackedVec :: new( vec![ u32 :: MAX , u32 :: MIN ] )
694679 ) ;
695680 assert_ne ! ( PackedVec :: new( vec![ 1 , 4 ] ) , PackedVec :: new( vec![ 0 , 3 ] ) ) ;
696681 }
0 commit comments