@@ -234,7 +234,7 @@ mod tests {
234
234
235
235
use super :: * ;
236
236
use quickcheck_macros:: quickcheck;
237
- use std:: { prelude:: v1:: * , vec } ;
237
+ use std:: prelude:: v1:: * ;
238
238
239
239
/// The naïve implementation of `WrappingTrait`.
240
240
#[ derive( Debug , Copy , Clone ) ]
@@ -273,7 +273,7 @@ mod tests {
273
273
274
274
const MAX : u128 = $max;
275
275
276
- fn do_test_add_assign64( values: impl IntoIterator <Item = u64 >) {
276
+ fn do_test_add_assign64( values: & mut dyn Iterator <Item = u64 >) {
277
277
let mut counter_got: Wrapping <{ MAX as u64 } > = Init :: INIT ;
278
278
let mut counter_expected: NaiveWrapping <{ MAX as u64 } > = Init :: INIT ;
279
279
log:: trace!( "do_test_add_assign64 (MAX = {})" , MAX ) ;
@@ -293,28 +293,29 @@ mod tests {
293
293
294
294
#[ test]
295
295
fn add_assign64_zero( ) {
296
- do_test_add_assign64( vec! [ 0 , 0 , 0 , 0 , 0 ] ) ;
296
+ do_test_add_assign64( & mut [ 0 , 0 , 0 , 0 , 0 ] . into_iter ( ) ) ;
297
297
}
298
298
299
299
#[ test]
300
300
fn add_assign64_mixed( ) {
301
301
let max = MAX as u64 ;
302
- do_test_add_assign64( vec![ 0 , 1u64 . min( max) , max, max / 2 , max / 10 , 0 , 4u64 . min( max) ] ) ;
302
+ do_test_add_assign64(
303
+ & mut [ 0 , 1u64 . min( max) , max, max / 2 , max / 10 , 0 , 4u64 . min( max) ] . into_iter( ) ) ;
303
304
}
304
305
305
306
#[ test]
306
307
fn add_assign64_max( ) {
307
- do_test_add_assign64( vec! [ MAX as u64 ; 5 ] ) ;
308
+ do_test_add_assign64( & mut [ MAX as u64 ; 5 ] . into_iter ( ) ) ;
308
309
}
309
310
310
311
#[ test]
311
312
fn add_assign64_half( ) {
312
- do_test_add_assign64( vec! [ MAX as u64 / 2 ; 5 ] ) ;
313
+ do_test_add_assign64( & mut [ MAX as u64 / 2 ; 5 ] . into_iter ( ) ) ;
313
314
}
314
315
315
316
#[ quickcheck]
316
317
fn add_assign64_quickcheck( cmds: Vec <u32 >) {
317
- do_test_add_assign64( cmds. iter( ) . map( |& cmd| {
318
+ do_test_add_assign64( & mut cmds. iter( ) . map( |& cmd| {
318
319
let max = MAX as u64 ;
319
320
match cmd % 4 {
320
321
0 => max / 2 ,
@@ -326,7 +327,7 @@ mod tests {
326
327
} ) ) ;
327
328
}
328
329
329
- fn do_test_add_assign128_multi32( values: impl IntoIterator <Item = u128 >) {
330
+ fn do_test_add_assign128_multi32( values: & mut dyn Iterator <Item = u128 >) {
330
331
let mut counter_got: Wrapping <{ MAX as u64 } > = Init :: INIT ;
331
332
let mut counter_expected: NaiveWrapping <{ MAX as u64 } > = Init :: INIT ;
332
333
log:: trace!( "do_test_add_assign128_multi32 (MAX = {})" , MAX ) ;
@@ -346,44 +347,45 @@ mod tests {
346
347
347
348
#[ test]
348
349
fn add_assign128_multi32_zero( ) {
349
- do_test_add_assign128_multi32( vec! [ 0 ; 5 ] ) ;
350
+ do_test_add_assign128_multi32( & mut [ 0 ; 5 ] . into_iter ( ) ) ;
350
351
}
351
352
352
353
#[ test]
353
354
fn add_assign128_multi32_mixed( ) {
354
- do_test_add_assign128_multi32( vec![ 0 , 1u128 . min( MAX ) , MAX , MAX / 2 , MAX / 10 , 0 , 4u128 . min( MAX ) ] ) ;
355
+ do_test_add_assign128_multi32(
356
+ & mut [ 0 , 1u128 . min( MAX ) , MAX , MAX / 2 , MAX / 10 , 0 , 4u128 . min( MAX ) ] . into_iter( ) ) ;
355
357
}
356
358
357
359
#[ test]
358
360
fn add_assign128_multi32_max( ) {
359
- do_test_add_assign128_multi32( vec! [ MAX ; 5 ] ) ;
361
+ do_test_add_assign128_multi32( & mut [ MAX ; 5 ] . into_iter ( ) ) ;
360
362
}
361
363
362
364
#[ test]
363
365
fn add_assign128_multi32_max_p1( ) {
364
- do_test_add_assign128_multi32( vec! [ MAX + 1 ; 5 ] ) ;
366
+ do_test_add_assign128_multi32( & mut [ MAX + 1 ; 5 ] . into_iter ( ) ) ;
365
367
}
366
368
367
369
#[ test]
368
370
fn add_assign128_multi32_half( ) {
369
- do_test_add_assign128_multi32( vec! [ MAX / 2 ; 5 ] ) ;
371
+ do_test_add_assign128_multi32( & mut [ MAX / 2 ; 5 ] . into_iter ( ) ) ;
370
372
}
371
373
372
374
#[ test]
373
375
fn add_assign128_multi32_extreme( ) {
374
- do_test_add_assign128_multi32( vec! [ MAX , ( MAX + 1 ) * 0xffff_ffff ] ) ;
376
+ do_test_add_assign128_multi32( & mut [ MAX , ( MAX + 1 ) * 0xffff_ffff ] . into_iter ( ) ) ;
375
377
}
376
378
377
379
#[ test]
378
380
#[ should_panic]
379
381
fn add_assign128_multi32_result_overflow( ) {
380
382
// `NaiveWrapping` is guaranteed to panic on overflow
381
- do_test_add_assign128_multi32( vec! [ MAX , ( MAX + 1 ) * 0xffff_ffff + 1 ] ) ;
383
+ do_test_add_assign128_multi32( & mut [ MAX , ( MAX + 1 ) * 0xffff_ffff + 1 ] . into_iter ( ) ) ;
382
384
}
383
385
384
386
#[ quickcheck]
385
387
fn add_assign128_multi32_quickcheck( cmds: Vec <u32 >) {
386
- do_test_add_assign128_multi32( cmds. iter( ) . map( |& cmd| {
388
+ do_test_add_assign128_multi32( & mut cmds. iter( ) . map( |& cmd| {
387
389
match cmd % 8 {
388
390
0 => MAX / 2 ,
389
391
1 => MAX / 2 + 1 ,
0 commit comments