diff --git a/src/array.rs b/src/array.rs index f9a88d4e9..d11aac3b8 100644 --- a/src/array.rs +++ b/src/array.rs @@ -3,10 +3,9 @@ //! [ndarray]: https://numpy.org/doc/stable/reference/arrays.ndarray.html use std::{ + ffi::{c_int, c_void}, marker::PhantomData, - mem, - os::raw::{c_int, c_void}, - ptr, slice, + mem, ptr, slice, }; use ndarray::{ diff --git a/src/borrow/shared.rs b/src/borrow/shared.rs index f7cbd946b..c890a09c1 100644 --- a/src/borrow/shared.rs +++ b/src/borrow/shared.rs @@ -1,7 +1,6 @@ use std::collections::hash_map::Entry; -use std::ffi::{c_void, CString}; +use std::ffi::{c_char, c_int, c_void, CString}; use std::mem::forget; -use std::os::raw::{c_char, c_int}; use std::ptr::NonNull; use std::slice::from_raw_parts; use std::sync::Mutex; diff --git a/src/convert.rs b/src/convert.rs index dfb59d396..ef7a8fd1b 100644 --- a/src/convert.rs +++ b/src/convert.rs @@ -1,6 +1,6 @@ //! Defines conversion traits between Rust types and NumPy data types. -use std::{mem, os::raw::c_int, ptr}; +use std::{ffi::c_int, mem, ptr}; use ndarray::{ArrayBase, Data, Dim, Dimension, IntoDimension, Ix1, OwnedRepr}; use pyo3::{Bound, Python}; diff --git a/src/dtype.rs b/src/dtype.rs index 88e112ead..e4bee2ca2 100644 --- a/src/dtype.rs +++ b/src/dtype.rs @@ -1,5 +1,5 @@ +use std::ffi::{c_int, c_long, c_longlong, c_short, c_uint, c_ulong, c_ulonglong, c_ushort}; use std::mem::size_of; -use std::os::raw::{c_int, c_long, c_longlong, c_short, c_uint, c_ulong, c_ulonglong, c_ushort}; use std::ptr; #[cfg(feature = "half")] diff --git a/src/strings.rs b/src/strings.rs index 3204b2df8..caa3d0d68 100644 --- a/src/strings.rs +++ b/src/strings.rs @@ -4,9 +4,9 @@ //! [ucs4]: https://numpy.org/doc/stable/reference/c-api/dtype.html#c.NPY_UNICODE use std::collections::hash_map::Entry; +use std::ffi::c_char; use std::fmt; use std::mem::size_of; -use std::os::raw::c_char; use std::str; use std::sync::Mutex;