@@ -193,7 +193,7 @@ impl<T> AlignedBox<[T]> {
193
193
unsafe fn new_slice (
194
194
alignment : usize ,
195
195
nelems : usize ,
196
- initializer : impl Fn ( * mut T ) -> ( ) ,
196
+ initializer : impl Fn ( * mut T ) ,
197
197
) -> std:: result:: Result < AlignedBox < [ T ] > , std:: boxed:: Box < dyn std:: error:: Error > > {
198
198
// Make sure the requested amount of Ts will fit into a slice.
199
199
let maxelems = ( isize:: MAX as usize ) / std:: mem:: size_of :: < T > ( ) ;
@@ -206,7 +206,7 @@ impl<T> AlignedBox<[T]> {
206
206
// Initialize values. The caller must ensure that initializer does not expect valid
207
207
// values behind ptr.
208
208
for i in 0 ..nelems {
209
- initializer ( ptr. offset ( i as isize ) ) ;
209
+ initializer ( ptr. add ( i ) ) ;
210
210
}
211
211
212
212
// SAFETY:
@@ -236,7 +236,7 @@ impl<T> AlignedBox<[T]> {
236
236
unsafe fn realloc (
237
237
& mut self ,
238
238
nelems : usize ,
239
- initializer : impl Fn ( * mut T ) -> ( ) ,
239
+ initializer : impl Fn ( * mut T ) ,
240
240
) -> std:: result:: Result < ( ) , std:: boxed:: Box < dyn std:: error:: Error > > {
241
241
// Make sure the requested amount of Ts will fit into a slice.
242
242
let maxelems = ( isize:: MAX as usize ) / std:: mem:: size_of :: < T > ( ) ;
@@ -294,7 +294,7 @@ impl<T> AlignedBox<[T]> {
294
294
// Initialize newly allocated values. The caller must ensure that
295
295
// initializer does not expect valid values behind ptr.
296
296
for i in old_nelems..nelems {
297
- initializer ( new_ptr. offset ( i as isize ) ) ;
297
+ initializer ( new_ptr. add ( i ) ) ;
298
298
}
299
299
300
300
// Create a new slice, a new Box and update layout.
@@ -572,9 +572,9 @@ mod tests {
572
572
fn read_write ( ) {
573
573
let _m = SEQ_TEST_MUTEX . read ( ) . unwrap ( ) ;
574
574
575
- let mut b = AlignedBox :: < [ f32 ] > :: slice_from_value ( 128 , 1024 , 3.1415 ) . unwrap ( ) ;
575
+ let mut b = AlignedBox :: < [ f32 ] > :: slice_from_value ( 128 , 1024 , std :: f32 :: consts :: PI ) . unwrap ( ) ;
576
576
for i in b. iter ( ) {
577
- assert_eq ! ( * i, 3.1415 ) ;
577
+ assert_eq ! ( * i, std :: f32 :: consts :: PI ) ;
578
578
}
579
579
let mut ctr: f32 = 0.0 ;
580
580
for i in b. iter_mut ( ) {
@@ -609,10 +609,8 @@ mod tests {
609
609
610
610
let b = AlignedBox :: < [ SomeVaryingDefault ] > :: slice_from_default ( 128 , 1024 ) . unwrap ( ) ;
611
611
assert_eq ! ( SomeVaryingDefault :: default ( ) . i, 1024 ) ;
612
- let mut ctr = 0 ;
613
- for i in b. iter ( ) {
614
- assert_eq ! ( i. i, ctr) ;
615
- ctr += 1 ;
612
+ for ( ctr, i) in b. iter ( ) . enumerate ( ) {
613
+ assert_eq ! ( i. i, ctr as i32 ) ;
616
614
}
617
615
}
618
616
0 commit comments