@@ -1064,7 +1064,7 @@ quickcheck! {
10641064
10651065 let tup1 = |( _, b) | b;
10661066 for & ( ord, consume_now) in & order {
1067- let iter = & mut [ & mut chunks1, & mut chunks2] [ ord as usize ] ;
1067+ let iter = & mut [ & mut chunks1, & mut chunks2] [ usize :: from ( ord ) ] ;
10681068 match iter. next( ) {
10691069 Some ( ( _, gr) ) => if consume_now {
10701070 for og in old_chunks. drain( ..) {
@@ -1422,9 +1422,9 @@ quickcheck! {
14221422 }
14231423
14241424 fn correct_grouping_map_by_aggregate_modulo_key( a: Vec <u8 >, modulo: u8 ) -> ( ) {
1425- let modulo = if modulo < 2 { 2 } else { modulo } as u64 ; // Avoid `% 0`
1425+ let modulo = u64 :: from ( if modulo < 2 { 2 } else { modulo } ) ; // Avoid `% 0`
14261426 let lookup = a. iter( )
1427- . map( |& b| b as u64 ) // Avoid overflows
1427+ . map( |& b| u64 :: from ( b ) ) // Avoid overflows
14281428 . into_grouping_map_by( |i| i % modulo)
14291429 . aggregate( |acc, & key, val| {
14301430 assert!( val % modulo == key) ;
@@ -1436,7 +1436,7 @@ quickcheck! {
14361436 } ) ;
14371437
14381438 let group_map_lookup = a. iter( )
1439- . map( |& b| b as u64 )
1439+ . map( |& b| u64 :: from ( b ) )
14401440 . map( |i| ( i % modulo, i) )
14411441 . into_group_map( )
14421442 . into_iter( )
@@ -1456,7 +1456,7 @@ quickcheck! {
14561456 assert_eq!(
14571457 lookup. get( & m) . copied( ) ,
14581458 a. iter( )
1459- . map( |& b| b as u64 )
1459+ . map( |& b| u64 :: from ( b ) )
14601460 . filter( |& val| val % modulo == m)
14611461 . fold( None , |acc, val| {
14621462 if val % ( modulo - 1 ) == 0 {
@@ -1475,8 +1475,8 @@ quickcheck! {
14751475 acc: u64 ,
14761476 }
14771477
1478- let modulo = if modulo == 0 { 1 } else { modulo } as u64 ; // Avoid `% 0`
1479- let lookup = a. iter( ) . map( |& b| b as u64 ) // Avoid overflows
1478+ let modulo = u64 :: from ( if modulo == 0 { 1 } else { modulo } ) ; // Avoid `% 0`
1479+ let lookup = a. iter( ) . map( |& b| u64 :: from ( b ) ) // Avoid overflows
14801480 . into_grouping_map_by( |i| i % modulo)
14811481 . fold_with( |_key, _val| Default :: default ( ) , |Accumulator { acc } , & key, val| {
14821482 assert!( val % modulo == key) ;
@@ -1485,7 +1485,7 @@ quickcheck! {
14851485 } ) ;
14861486
14871487 let group_map_lookup = a. iter( )
1488- . map( |& b| b as u64 )
1488+ . map( |& b| u64 :: from ( b ) )
14891489 . map( |i| ( i % modulo, i) )
14901490 . into_group_map( )
14911491 . into_iter( )
@@ -1494,21 +1494,21 @@ quickcheck! {
14941494 assert_eq!( lookup, group_map_lookup) ;
14951495
14961496 for ( & key, & Accumulator { acc: sum } ) in lookup. iter( ) {
1497- assert_eq!( sum, a. iter( ) . map( |& b| b as u64 ) . filter( |& val| val % modulo == key) . sum:: <u64 >( ) ) ;
1497+ assert_eq!( sum, a. iter( ) . map( |& b| u64 :: from ( b ) ) . filter( |& val| val % modulo == key) . sum:: <u64 >( ) ) ;
14981498 }
14991499 }
15001500
15011501 fn correct_grouping_map_by_fold_modulo_key( a: Vec <u8 >, modulo: u8 ) -> ( ) {
1502- let modulo = if modulo == 0 { 1 } else { modulo } as u64 ; // Avoid `% 0`
1503- let lookup = a. iter( ) . map( |& b| b as u64 ) // Avoid overflows
1502+ let modulo = u64 :: from ( if modulo == 0 { 1 } else { modulo } ) ; // Avoid `% 0`
1503+ let lookup = a. iter( ) . map( |& b| u64 :: from ( b ) ) // Avoid overflows
15041504 . into_grouping_map_by( |i| i % modulo)
15051505 . fold( 0u64 , |acc, & key, val| {
15061506 assert!( val % modulo == key) ;
15071507 acc + val
15081508 } ) ;
15091509
15101510 let group_map_lookup = a. iter( )
1511- . map( |& b| b as u64 )
1511+ . map( |& b| u64 :: from ( b ) )
15121512 . map( |i| ( i % modulo, i) )
15131513 . into_group_map( )
15141514 . into_iter( )
@@ -1517,21 +1517,21 @@ quickcheck! {
15171517 assert_eq!( lookup, group_map_lookup) ;
15181518
15191519 for ( & key, & sum) in lookup. iter( ) {
1520- assert_eq!( sum, a. iter( ) . map( |& b| b as u64 ) . filter( |& val| val % modulo == key) . sum:: <u64 >( ) ) ;
1520+ assert_eq!( sum, a. iter( ) . map( |& b| u64 :: from ( b ) ) . filter( |& val| val % modulo == key) . sum:: <u64 >( ) ) ;
15211521 }
15221522 }
15231523
15241524 fn correct_grouping_map_by_reduce_modulo_key( a: Vec <u8 >, modulo: u8 ) -> ( ) {
1525- let modulo = if modulo == 0 { 1 } else { modulo } as u64 ; // Avoid `% 0`
1526- let lookup = a. iter( ) . map( |& b| b as u64 ) // Avoid overflows
1525+ let modulo = u64 :: from ( if modulo == 0 { 1 } else { modulo } ) ; // Avoid `% 0`
1526+ let lookup = a. iter( ) . map( |& b| u64 :: from ( b ) ) // Avoid overflows
15271527 . into_grouping_map_by( |i| i % modulo)
15281528 . reduce( |acc, & key, val| {
15291529 assert!( val % modulo == key) ;
15301530 acc + val
15311531 } ) ;
15321532
15331533 let group_map_lookup = a. iter( )
1534- . map( |& b| b as u64 )
1534+ . map( |& b| u64 :: from ( b ) )
15351535 . map( |i| ( i % modulo, i) )
15361536 . into_group_map( )
15371537 . into_iter( )
@@ -1540,7 +1540,7 @@ quickcheck! {
15401540 assert_eq!( lookup, group_map_lookup) ;
15411541
15421542 for ( & key, & sum) in lookup. iter( ) {
1543- assert_eq!( sum, a. iter( ) . map( |& b| b as u64 ) . filter( |& val| val % modulo == key) . sum:: <u64 >( ) ) ;
1543+ assert_eq!( sum, a. iter( ) . map( |& b| u64 :: from ( b ) ) . filter( |& val| val % modulo == key) . sum:: <u64 >( ) ) ;
15441544 }
15451545 }
15461546
@@ -1706,12 +1706,12 @@ quickcheck! {
17061706 }
17071707
17081708 fn correct_grouping_map_by_sum_modulo_key( a: Vec <u8 >, modulo: u8 ) -> ( ) {
1709- let modulo = if modulo == 0 { 1 } else { modulo } as u64 ; // Avoid `% 0`
1710- let lookup = a. iter( ) . map( |& b| b as u64 ) // Avoid overflows
1709+ let modulo = u64 :: from ( if modulo == 0 { 1 } else { modulo } ) ; // Avoid `% 0`
1710+ let lookup = a. iter( ) . map( |& b| u64 :: from ( b ) ) // Avoid overflows
17111711 . into_grouping_map_by( |i| i % modulo)
17121712 . sum( ) ;
17131713
1714- let group_map_lookup = a. iter( ) . map( |& b| b as u64 )
1714+ let group_map_lookup = a. iter( ) . map( |& b| u64 :: from ( b ) )
17151715 . map( |i| ( i % modulo, i) )
17161716 . into_group_map( )
17171717 . into_iter( )
@@ -1720,17 +1720,17 @@ quickcheck! {
17201720 assert_eq!( lookup, group_map_lookup) ;
17211721
17221722 for ( & key, & sum) in lookup. iter( ) {
1723- assert_eq!( sum, a. iter( ) . map( |& b| b as u64 ) . filter( |& val| val % modulo == key) . sum:: <u64 >( ) ) ;
1723+ assert_eq!( sum, a. iter( ) . map( |& b| u64 :: from ( b ) ) . filter( |& val| val % modulo == key) . sum:: <u64 >( ) ) ;
17241724 }
17251725 }
17261726
17271727 fn correct_grouping_map_by_product_modulo_key( a: Vec <u8 >, modulo: u8 ) -> ( ) {
1728- let modulo = Wrapping ( if modulo == 0 { 1 } else { modulo } as u64 ) ; // Avoid `% 0`
1729- let lookup = a. iter( ) . map( |& b| Wrapping ( b as u64 ) ) // Avoid overflows
1728+ let modulo = Wrapping ( u64 :: from ( if modulo == 0 { 1 } else { modulo } ) ) ; // Avoid `% 0`
1729+ let lookup = a. iter( ) . map( |& b| Wrapping ( u64 :: from ( b ) ) ) // Avoid overflows
17301730 . into_grouping_map_by( |i| i % modulo)
17311731 . product( ) ;
17321732
1733- let group_map_lookup = a. iter( ) . map( |& b| Wrapping ( b as u64 ) )
1733+ let group_map_lookup = a. iter( ) . map( |& b| Wrapping ( u64 :: from ( b ) ) )
17341734 . map( |i| ( i % modulo, i) )
17351735 . into_group_map( )
17361736 . into_iter( )
@@ -1742,7 +1742,7 @@ quickcheck! {
17421742 assert_eq!(
17431743 prod,
17441744 a. iter( )
1745- . map( |& b| Wrapping ( b as u64 ) )
1745+ . map( |& b| Wrapping ( u64 :: from ( b ) ) )
17461746 . filter( |& val| val % modulo == key)
17471747 . product:: <Wrapping <u64 >>( )
17481748 ) ;
0 commit comments