Upgrade pyo3 to 0.15

PyO3 · Oct 25, 2021 · 5640877 · 5640877
1 parent 0ffe035
commit 5640877
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,10 +18,10 @@ libc = "0.2"
 num-complex = ">= 0.2, <= 0.4"
 num-traits = "0.2"
 ndarray = ">= 0.13, < 0.16"
-pyo3 = { version = "0.14", default-features = false }
+pyo3 = { git = "https://github.com/PyO3/pyo3.git", branch = "release-0.15", default-features = false }
 
 [dev-dependencies]
-pyo3 = { version = "0.14", features = ["auto-initialize"] }
+pyo3 = { git = "https://github.com/PyO3/pyo3.git", branch = "release-0.15", features = ["auto-initialize"] }
 
 [features]
 # In default setting, python version is automatically detected

diff --git a/src/array.rs b/src/array.rs
@@ -856,7 +856,7 @@ impl<T: Element> PyArray<T, Ix1> {
             )
         };
         if res.is_null() {
-            Err(PyErr::fetch(self.py()))
+            Err(PyErr::fetch(self.py()).expect("error return without exception set"))
         } else {
             Ok(())
         }
@@ -959,7 +959,7 @@ impl<T: Element, D> PyArray<T, D> {
         let other_ptr = other.as_array_ptr();
         let result = unsafe { PY_ARRAY_API.PyArray_CopyInto(other_ptr, self_ptr) };
         if result == -1 {
-            Err(PyErr::fetch(self.py()))
+            Err(PyErr::fetch(self.py()).expect("error return without exception set"))
         } else {
             Ok(())
         }
@@ -986,7 +986,7 @@ impl<T: Element, D> PyArray<T, D> {
             )
         };
         if ptr.is_null() {
-            Err(PyErr::fetch(self.py()))
+            Err(PyErr::fetch(self.py()).expect("error return without exception set"))
         } else {
             Ok(unsafe { PyArray::<U, D>::from_owned_ptr(self.py(), ptr) })
         }
@@ -1039,7 +1039,7 @@ impl<T: Element, D> PyArray<T, D> {
             )
         };
         if ptr.is_null() {
-            Err(PyErr::fetch(self.py()))
+            Err(PyErr::fetch(self.py()).expect("error return without exception set"))
         } else {
             Ok(unsafe { PyArray::<T, D2>::from_owned_ptr(self.py(), ptr) })
         }

diff --git a/src/npyiter.rs b/src/npyiter.rs
@@ -279,22 +279,22 @@ impl<'py, T, I> NpySingleIter<'py, T, I> {
         let mut iterator = match ptr::NonNull::new(iterator) {
             Some(iter) => iter,
             None => {
-                return Err(PyErr::fetch(py));
+                return Err(PyErr::fetch(py).expect("error return without exception set"));
             }
         };
 
         let iternext =
             match unsafe { PY_ARRAY_API.NpyIter_GetIterNext(iterator.as_mut(), ptr::null_mut()) } {
                 Some(ptr) => ptr,
                 None => {
-                    return Err(PyErr::fetch(py));
+                    return Err(PyErr::fetch(py).expect("error return without exception set"));
                 }
             };
         let dataptr = unsafe { PY_ARRAY_API.NpyIter_GetDataPtrArray(iterator.as_mut()) };
 
         if dataptr.is_null() {
             unsafe { PY_ARRAY_API.NpyIter_Deallocate(iterator.as_mut()) };
-            return Err(PyErr::fetch(py));
+            return Err(PyErr::fetch(py).expect("error return without exception set"));
         }
 
         let iter_size = unsafe { PY_ARRAY_API.NpyIter_GetIterSize(iterator.as_mut()) };
@@ -512,22 +512,22 @@ impl<'py, T, S: MultiIterModeWithManyArrays> NpyMultiIter<'py, T, S> {
         let mut iterator = match ptr::NonNull::new(iterator) {
             Some(ptr) => ptr,
             None => {
-                return Err(PyErr::fetch(py));
+                return Err(PyErr::fetch(py).expect("error return without exception set"));
             }
         };
 
         let iternext =
             match unsafe { PY_ARRAY_API.NpyIter_GetIterNext(iterator.as_mut(), ptr::null_mut()) } {
                 Some(ptr) => ptr,
                 None => {
-                    return Err(PyErr::fetch(py));
+                    return Err(PyErr::fetch(py).expect("error return without exception set"));
                 }
             };
         let dataptr = unsafe { PY_ARRAY_API.NpyIter_GetDataPtrArray(iterator.as_mut()) };
 
         if dataptr.is_null() {
             unsafe { PY_ARRAY_API.NpyIter_Deallocate(iterator.as_mut()) };
-            return Err(PyErr::fetch(py));
+            return Err(PyErr::fetch(py).expect("error return without exception set"));
         }
 
         let iter_size = unsafe { PY_ARRAY_API.NpyIter_GetIterSize(iterator.as_mut()) };