@@ -303,7 +303,7 @@ mod tests {
303
303
let mut lut_3: [ u8 ; 256 ] = [ 0 ; 256 ] ;
304
304
for input in 0 ..=255 {
305
305
//for input in 4..=4 {
306
- let mut state: u8 = ( input as u8 & 0b11000000 ) >> 4 ;
306
+ let mut state: u8 = ( input & 0b11000000 ) >> 4 ;
307
307
let mut result: u8 = 0 ;
308
308
let mut x_mask: u8 = 0b00100000 ;
309
309
let mut y_mask: u8 = 0b00000100 ;
@@ -329,7 +329,7 @@ mod tests {
329
329
let mut lut_3: [ u8 ; 256 ] = [ 0 ; 256 ] ;
330
330
for input in 0 ..=255 {
331
331
//for input in 4..=4 {
332
- let mut state: u8 = ( input as u8 & 0b11000000 ) >> 6 ;
332
+ let mut state: u8 = ( input & 0b11000000 ) >> 6 ;
333
333
let mut result: u8 = 0 ;
334
334
let mut h_mask: u8 = 0b00110000 ;
335
335
for i in 0 ..3 {
@@ -402,7 +402,7 @@ mod tests {
402
402
let h2xy = h2xy :: < u32 > ;
403
403
for h in 0 ..8 {
404
404
let ( rx, ry) = h2xy ( h as u64 , 2 ) ;
405
- let h_cmp = xy2h ( rx as u32 , ry as u32 , 2 ) ;
405
+ let h_cmp = xy2h ( rx, ry, 2 ) ;
406
406
assert_eq ! ( h, h_cmp as usize ) ;
407
407
}
408
408
}
@@ -423,7 +423,7 @@ mod tests {
423
423
for & bits in & [ 1 , 2 , 3 , 5 , 8 , 13 , 16 ] {
424
424
let bits = ( bits + 1 ) & !1 ;
425
425
let numbers = 2usize . pow ( bits) ;
426
- for d in ( 0 ..( numbers * numbers) ) . step_by ( numbers as usize ) {
426
+ for d in ( 0 ..( numbers * numbers) ) . step_by ( numbers) {
427
427
let ( x, y) = hilbert_curve:: convert_1d_to_2d ( d, numbers) ;
428
428
assert_eq ! ( xy2h( x as u32 , y as u32 , bits as u8 ) , d as u64 ) ;
429
429
}
@@ -454,25 +454,25 @@ mod tests {
454
454
continue ;
455
455
}
456
456
while prev. 0 < * x {
457
- let pixel = imgbuf. get_pixel_mut ( prev. 0 as u32 , prev. 1 as u32 ) ;
457
+ let pixel = imgbuf. get_pixel_mut ( prev. 0 , prev. 1 ) ;
458
458
* pixel = white;
459
459
prev. 0 += 1 ;
460
460
continue ;
461
461
}
462
462
while prev. 0 > * x {
463
- let pixel = imgbuf. get_pixel_mut ( prev. 0 as u32 , prev. 1 as u32 ) ;
463
+ let pixel = imgbuf. get_pixel_mut ( prev. 0 , prev. 1 ) ;
464
464
* pixel = white;
465
465
prev. 0 -= 1 ;
466
466
continue ;
467
467
}
468
468
while prev. 1 < * y {
469
- let pixel = imgbuf. get_pixel_mut ( prev. 0 as u32 , prev. 1 as u32 ) ;
469
+ let pixel = imgbuf. get_pixel_mut ( prev. 0 , prev. 1 ) ;
470
470
* pixel = white;
471
471
prev. 1 += 1 ;
472
472
continue ;
473
473
}
474
474
while prev. 1 > * y {
475
- let pixel = imgbuf. get_pixel_mut ( prev. 0 as u32 , prev. 1 as u32 ) ;
475
+ let pixel = imgbuf. get_pixel_mut ( prev. 0 , prev. 1 ) ;
476
476
* pixel = white;
477
477
prev. 1 -= 1 ;
478
478
continue ;
0 commit comments