Mark the read-write variants of the NumPy iterators unsafe for the same reason that PyArray::as_array is unsafe.

Author: adamreichold

src/array.rs

@@ -20,9 +20,10 @@ use pyo3::{
 };
 
 use crate::convert::{ArrayExt, IntoPyArray, NpyIndex, ToNpyDims, ToPyArray};
-use crate::dtype::Element;
+use crate::dtype::{Element, PyArrayDescr};
 use crate::error::{DimensionalityError, FromVecError, NotContiguousError, TypeError};
 use crate::npyffi::{self, npy_intp, NPY_ORDER, PY_ARRAY_API};
+use crate::npyiter::{NpySingleIter, NpySingleIterBuilder, ReadWrite};
 use crate::readonly::PyReadonlyArray;
 use crate::slice_container::PySliceContainer;
 
@@ -186,7 +187,7 @@ impl<T, D> PyArray<T, D> {
     ///    assert!(dtype.is_equiv_to(numpy::dtype::<i32>(py)));
     /// });
     /// ```
-    pub fn dtype(&self) -> &crate::PyArrayDescr {
+    pub fn dtype(&self) -> &PyArrayDescr {
         let descr_ptr = unsafe { (*self.as_array_ptr()).descr };
         unsafe { pyo3::FromPyPointer::from_borrowed_ptr(self.py(), descr_ptr as _) }
     }
@@ -1073,10 +1074,13 @@ impl<T: Element> PyArray<T, Ix1> {
 
     /// Iterates all elements of this array.
     /// See [NpySingleIter](../npyiter/struct.NpySingleIter.html) for more.
-    pub fn iter<'py>(
-        &'py self,
-    ) -> PyResult<crate::NpySingleIter<'py, T, crate::npyiter::ReadWrite>> {
-        crate::NpySingleIterBuilder::readwrite(self).build()
+    ///
+    /// # Safety
+    ///
+    /// The iterator will produce mutable references into the array which must not be
+    /// aliased by other references for the life time of the iterator.
+    pub unsafe fn iter<'py>(&'py self) -> PyResult<NpySingleIter<'py, T, ReadWrite>> {
+        NpySingleIterBuilder::readwrite(self).build()
     }
 
     fn resize_<D: IntoDimension>(

src/npyiter.rs

@@ -174,7 +174,12 @@ impl<'py, T: Element> NpySingleIterBuilder<'py, T, Readonly> {
 
 impl<'py, T: Element> NpySingleIterBuilder<'py, T, ReadWrite> {
     /// Makes a new builder for a writable iterator.
-    pub fn readwrite<D: ndarray::Dimension>(array: &'py PyArray<T, D>) -> Self {
+    ///
+    /// # Safety
+    ///
+    /// The iterator will produce mutable references into the array which must not be
+    /// aliased by other references for the life time of the iterator.
+    pub unsafe fn readwrite<D: ndarray::Dimension>(array: &'py PyArray<T, D>) -> Self {
         Self {
             flags: NPY_ITER_READWRITE,
             array: array.to_dyn(),
@@ -230,7 +235,7 @@ impl<'py, T: Element, I: IterMode> NpySingleIterBuilder<'py, T, I> {
 /// use numpy::NpySingleIterBuilder;
 /// pyo3::Python::with_gil(|py| {
 ///     let array = numpy::PyArray::arange(py, 0, 10, 1);
-///     let iter = NpySingleIterBuilder::readwrite(array).build().unwrap();
+///     let iter = unsafe { NpySingleIterBuilder::readwrite(array).build().unwrap() };
 ///     for (i, elem) in iter.enumerate() {
 ///         assert_eq!(*elem, i as i64);
 ///         *elem = *elem * 2;  // elements are mutable
@@ -242,8 +247,7 @@ impl<'py, T: Element, I: IterMode> NpySingleIterBuilder<'py, T, I> {
 /// # use numpy::NpySingleIterBuilder;
 /// # pyo3::Python::with_gil(|py| {
 /// #   let array = numpy::PyArray::arange(py, 0, 10, 1);
-/// #   let iter = NpySingleIterBuilder::readwrite(array).build().unwrap();
-///     for (i, elem) in array.iter().unwrap().enumerate() {
+///     for (i, elem) in unsafe { array.iter().unwrap().enumerate() } {
 ///         assert_eq!(*elem, i as i64);
 ///         *elem = *elem * 2;  // elements are mutable
 ///     }
@@ -416,7 +420,12 @@ impl<'py, T: Element, S: MultiIterMode> NpyMultiIterBuilder<'py, T, S> {
     }
 
     /// Adds a writable array to the resulting iterator.
-    pub fn add_readwrite<D: ndarray::Dimension>(
+    ///
+    /// # Safety
+    ///
+    /// The iterator will produce mutable references into the array which must not be
+    /// aliased by other references for the life time of the iterator.
+    pub unsafe fn add_readwrite<D: ndarray::Dimension>(
         mut self,
         array: &'py PyArray<T, D>,
     ) -> NpyMultiIterBuilder<'py, T, RW<S>> {
@@ -483,12 +492,14 @@ impl<'py, T: Element, S: MultiIterModeWithManyArrays> NpyMultiIterBuilder<'py, T
 ///     let array1 = numpy::PyArray::arange(py, 0, 10, 1);
 ///     let array2 = numpy::PyArray::arange(py, 10, 20, 1);
 ///     let array3 = numpy::PyArray::arange(py, 10, 30, 2);
-///     let iter = NpyMultiIterBuilder::new()
-///         .add_readonly(array1.readonly())
-///         .add_readwrite(array2)
-///         .add_readonly(array3.readonly())
-///         .build()
-///          .unwrap();
+///     let iter = unsafe {
+///         NpyMultiIterBuilder::new()
+///             .add_readonly(array1.readonly())
+///             .add_readwrite(array2)
+///             .add_readonly(array3.readonly())
+///             .build()
+///             .unwrap()
+///     };
 ///     for (i, j, k) in iter {
 ///         assert_eq!(*i + *j, *k);
 ///         *j += *i + *k;  // The third element is only mutable.

tests/iter.rs

@@ -28,7 +28,7 @@ fn mutable_iter() -> PyResult<()> {
     let data = array![[0.0, 1.0], [2.0, 3.0], [4.0, 5.0]];
     pyo3::Python::with_gil(|py| {
         let arr = PyArray::from_array(py, &data);
-        let iter = NpySingleIterBuilder::readwrite(arr).build()?;
+        let iter = unsafe { NpySingleIterBuilder::readwrite(arr).build()? };
         for elem in iter {
             *elem *= 2.0;
         }
@@ -71,10 +71,12 @@ fn multiiter_rw() -> PyResult<()> {
     pyo3::Python::with_gil(|py| {
         let arr1 = PyArray::from_array(py, &data1);
         let arr2 = PyArray::from_array(py, &data2);
-        let iter = NpyMultiIterBuilder::new()
-            .add_readonly(arr1.readonly())
-            .add_readwrite(arr2)
-            .build()?;
+        let iter = unsafe {
+            NpyMultiIterBuilder::new()
+                .add_readonly(arr1.readonly())
+                .add_readwrite(arr2)
+                .build()?
+        };
 
         for (x, y) in iter {
             *y = *x * 2.0;