Skip to content

Commit d2a6cbb

Browse files
committed
Cleanup imports
1 parent 9f225e5 commit d2a6cbb

File tree

4 files changed

+16
-22
lines changed

4 files changed

+16
-22
lines changed

src/array.rs

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@ use ndarray::*;
44
use num_traits::AsPrimitive;
55
use pyo3::{ffi, prelude::*, type_object, types::PyAny};
66
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};
129

1310
use crate::convert::{IntoPyArray, NpyIndex, ToNpyDims, ToPyArray};
1411
use crate::error::{ErrorKind, IntoPyResult};
@@ -113,7 +110,7 @@ pyobject_native_type_convert!(
113110

114111
pyobject_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

src/convert.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
use ndarray::{ArrayBase, Data, Dimension, IntoDimension, Ix1, OwnedRepr};
44
use pyo3::Python;
55

6-
use std::mem;
7-
use std::os::raw::c_int;
6+
use std::{mem, os::raw::c_int};
87

98
use super::*;
109
use crate::npyffi::npy_intp;

src/npyffi/array.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
use libc::FILE;
33
use pyo3::ffi::{self, PyObject, PyTypeObject};
44
use std::os::raw::*;
5-
use std::sync::Once;
6-
use std::{cell::Cell, ptr};
5+
use std::{cell::Cell, ptr, sync::Once};
76

87
use crate::npyffi::*;
98

src/npyffi/objects.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
use libc::FILE;
77
use pyo3::ffi::*;
8-
use std::option::Option;
98
use std::os::raw::*;
109

1110
use super::types::*;

0 commit comments

Comments
 (0)