@@ -4,11 +4,8 @@ use ndarray::*;
44use num_traits:: AsPrimitive ;
55use pyo3:: { ffi, prelude:: * , type_object, types:: PyAny } ;
66use 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} ;
129
1310use crate :: convert:: { IntoPyArray , NpyIndex , ToNpyDims , ToPyArray } ;
1411use crate :: error:: { ErrorKind , IntoPyResult } ;
@@ -113,7 +110,7 @@ pyobject_native_type_convert!(
113110
114111pyobject_native_type_named ! ( PyArray <T , D >, T , D ) ;
115112
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 {
117114 fn from ( ob : & ' a PyArray < T , D > ) -> Self {
118115 unsafe { & * ( ob as * const PyArray < T , D > as * const PyAny ) }
119116 }
@@ -261,7 +258,7 @@ impl<T, D> PyArray<T, D> {
261258 let ptr = self . as_array_ptr ( ) ;
262259 unsafe {
263260 let p = ( * ptr) . strides ;
264- :: std :: slice:: from_raw_parts ( p, n)
261+ slice:: from_raw_parts ( p, n)
265262 }
266263 }
267264
@@ -283,7 +280,7 @@ impl<T, D> PyArray<T, D> {
283280 let ptr = self . as_array_ptr ( ) ;
284281 unsafe {
285282 let p = ( * ptr) . dimensions as * mut usize ;
286- :: std :: slice:: from_raw_parts ( p, n)
283+ slice:: from_raw_parts ( p, n)
287284 }
288285 }
289286
@@ -314,7 +311,7 @@ impl<T, D> PyArray<T, D> {
314311 let ptr = self . as_array_ptr ( ) ;
315312 unsafe {
316313 let p = ( * ptr) . strides ;
317- :: std :: slice:: from_raw_parts ( p as * const _ , n)
314+ slice:: from_raw_parts ( p as * const _ , n)
318315 }
319316 }
320317}
@@ -371,11 +368,11 @@ impl<T: TypeNum, D: Dimension> PyArray<T, D> {
371368 dims. ndim_cint ( ) ,
372369 dims. as_dims_ptr ( ) ,
373370 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
379376 ) ;
380377 Self :: from_owned_ptr ( py, ptr)
381378 }
@@ -404,7 +401,7 @@ impl<T: TypeNum, D: Dimension> PyArray<T, D> {
404401 data_ptr as _ , // data
405402 mem:: size_of :: < T > ( ) as i32 , // itemsize
406403 0 , // flag
407- :: std :: ptr:: null_mut ( ) , //obj
404+ ptr:: null_mut ( ) , //obj
408405 ) ;
409406 PY_ARRAY_API . PyArray_SetBaseObject ( ptr as * mut npyffi:: PyArrayObject , cell as _ ) ;
410407 Self :: from_owned_ptr ( py, ptr)
@@ -469,7 +466,7 @@ impl<T: TypeNum, D: Dimension> PyArray<T, D> {
469466 if !self . is_contiguous ( ) {
470467 Err ( ErrorKind :: NotContiguous )
471468 } else {
472- Ok ( unsafe { :: std :: slice:: from_raw_parts ( self . data ( ) , self . len ( ) ) } )
469+ Ok ( unsafe { slice:: from_raw_parts ( self . data ( ) , self . len ( ) ) } )
473470 }
474471 }
475472
@@ -479,7 +476,7 @@ impl<T: TypeNum, D: Dimension> PyArray<T, D> {
479476 if !self . is_contiguous ( ) {
480477 Err ( ErrorKind :: NotContiguous )
481478 } 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 ( ) ) } )
483480 }
484481 }
485482
0 commit comments