@@ -4,11 +4,8 @@ use ndarray::*;
4
4
use num_traits:: AsPrimitive ;
5
5
use pyo3:: { ffi, prelude:: * , type_object, types:: PyAny } ;
6
6
use pyo3:: { AsPyPointer , PyDowncastError , PyNativeType } ;
7
- use std:: iter:: ExactSizeIterator ;
8
- use std:: marker:: PhantomData ;
9
- use std:: mem;
10
- use std:: os:: raw:: c_int;
11
- use std:: ptr;
7
+ use std:: { iter:: ExactSizeIterator , marker:: PhantomData } ;
8
+ use std:: { mem, os:: raw:: c_int, ptr, slice} ;
12
9
13
10
use crate :: convert:: { IntoPyArray , NpyIndex , ToNpyDims , ToPyArray } ;
14
11
use crate :: error:: { ErrorKind , IntoPyResult } ;
@@ -113,7 +110,7 @@ pyobject_native_type_convert!(
113
110
114
111
pyobject_native_type_named ! ( PyArray <T , D >, T , D ) ;
115
112
116
- impl < ' a , T , D > :: std:: convert:: From < & ' a PyArray < T , D > > for & ' a PyAny {
113
+ impl < ' a , T , D > std:: convert:: From < & ' a PyArray < T , D > > for & ' a PyAny {
117
114
fn from ( ob : & ' a PyArray < T , D > ) -> Self {
118
115
unsafe { & * ( ob as * const PyArray < T , D > as * const PyAny ) }
119
116
}
@@ -261,7 +258,7 @@ impl<T, D> PyArray<T, D> {
261
258
let ptr = self . as_array_ptr ( ) ;
262
259
unsafe {
263
260
let p = ( * ptr) . strides ;
264
- :: std :: slice:: from_raw_parts ( p, n)
261
+ slice:: from_raw_parts ( p, n)
265
262
}
266
263
}
267
264
@@ -283,7 +280,7 @@ impl<T, D> PyArray<T, D> {
283
280
let ptr = self . as_array_ptr ( ) ;
284
281
unsafe {
285
282
let p = ( * ptr) . dimensions as * mut usize ;
286
- :: std :: slice:: from_raw_parts ( p, n)
283
+ slice:: from_raw_parts ( p, n)
287
284
}
288
285
}
289
286
@@ -314,7 +311,7 @@ impl<T, D> PyArray<T, D> {
314
311
let ptr = self . as_array_ptr ( ) ;
315
312
unsafe {
316
313
let p = ( * ptr) . strides ;
317
- :: std :: slice:: from_raw_parts ( p as * const _ , n)
314
+ slice:: from_raw_parts ( p as * const _ , n)
318
315
}
319
316
}
320
317
}
@@ -371,11 +368,11 @@ impl<T: TypeNum, D: Dimension> PyArray<T, D> {
371
368
dims. ndim_cint ( ) ,
372
369
dims. as_dims_ptr ( ) ,
373
370
T :: typenum_default ( ) ,
374
- strides as * mut _ , // strides
375
- ptr:: null_mut ( ) , // data
376
- 0 , // itemsize
377
- flag, // flag
378
- :: std :: ptr:: null_mut ( ) , //obj
371
+ strides as * mut _ , // strides
372
+ ptr:: null_mut ( ) , // data
373
+ 0 , // itemsize
374
+ flag, // flag
375
+ ptr:: null_mut ( ) , //obj
379
376
) ;
380
377
Self :: from_owned_ptr ( py, ptr)
381
378
}
@@ -404,7 +401,7 @@ impl<T: TypeNum, D: Dimension> PyArray<T, D> {
404
401
data_ptr as _ , // data
405
402
mem:: size_of :: < T > ( ) as i32 , // itemsize
406
403
0 , // flag
407
- :: std :: ptr:: null_mut ( ) , //obj
404
+ ptr:: null_mut ( ) , //obj
408
405
) ;
409
406
PY_ARRAY_API . PyArray_SetBaseObject ( ptr as * mut npyffi:: PyArrayObject , cell as _ ) ;
410
407
Self :: from_owned_ptr ( py, ptr)
@@ -469,7 +466,7 @@ impl<T: TypeNum, D: Dimension> PyArray<T, D> {
469
466
if !self . is_contiguous ( ) {
470
467
Err ( ErrorKind :: NotContiguous )
471
468
} else {
472
- Ok ( unsafe { :: std :: slice:: from_raw_parts ( self . data ( ) , self . len ( ) ) } )
469
+ Ok ( unsafe { slice:: from_raw_parts ( self . data ( ) , self . len ( ) ) } )
473
470
}
474
471
}
475
472
@@ -479,7 +476,7 @@ impl<T: TypeNum, D: Dimension> PyArray<T, D> {
479
476
if !self . is_contiguous ( ) {
480
477
Err ( ErrorKind :: NotContiguous )
481
478
} else {
482
- Ok ( unsafe { :: std :: slice:: from_raw_parts_mut ( self . data ( ) , self . len ( ) ) } )
479
+ Ok ( unsafe { slice:: from_raw_parts_mut ( self . data ( ) , self . len ( ) ) } )
483
480
}
484
481
}
485
482
0 commit comments