Fix use of deprecated constructors in benchmarks

Author: adamreichold

benches/array.rs

@@ -6,48 +6,48 @@ use test::{black_box, Bencher};
 use std::ops::Range;
 
 use numpy::{PyArray1, PyArray2, PyArray3};
-use pyo3::{PyAny, Python, ToPyObject};
+use pyo3::{types::PyAnyMethods, Python, ToPyObject};
 
 #[bench]
 fn extract_success(bencher: &mut Bencher) {
     Python::with_gil(|py| {
-        let any: &PyAny = PyArray2::<f64>::zeros(py, (10, 10), false);
+        let any = PyArray2::<f64>::zeros_bound(py, (10, 10), false).into_any();
 
         bencher.iter(|| {
-            black_box(any).extract::<&PyArray2<f64>>().unwrap();
+            black_box(&any).extract::<&PyArray2<f64>>().unwrap();
         });
     });
 }
 
 #[bench]
 fn extract_failure(bencher: &mut Bencher) {
     Python::with_gil(|py| {
-        let any: &PyAny = PyArray2::<i32>::zeros(py, (10, 10), false);
+        let any = PyArray2::<f64>::zeros_bound(py, (10, 10), false).into_any();
 
         bencher.iter(|| {
-            black_box(any).extract::<&PyArray2<f64>>().unwrap_err();
+            black_box(&any).extract::<&PyArray2<f64>>().unwrap_err();
         });
     });
 }
 
 #[bench]
 fn downcast_success(bencher: &mut Bencher) {
     Python::with_gil(|py| {
-        let any: &PyAny = PyArray2::<f64>::zeros(py, (10, 10), false);
+        let any = PyArray2::<f64>::zeros_bound(py, (10, 10), false).into_any();
 
         bencher.iter(|| {
-            black_box(any).downcast::<PyArray2<f64>>().unwrap();
+            black_box(&any).downcast::<PyArray2<f64>>().unwrap();
         });
     });
 }
 
 #[bench]
 fn downcast_failure(bencher: &mut Bencher) {
     Python::with_gil(|py| {
-        let any: &PyAny = PyArray2::<i32>::zeros(py, (10, 10), false);
+        let any = PyArray2::<f64>::zeros_bound(py, (10, 10), false).into_any();
 
         bencher.iter(|| {
-            black_box(any).downcast::<PyArray2<f64>>().unwrap_err();
+            black_box(&any).downcast::<PyArray2<f64>>().unwrap_err();
         });
     });
 }

benches/borrow.rs

@@ -3,16 +3,16 @@
 extern crate test;
 use test::{black_box, Bencher};
 
-use numpy::PyArray;
+use numpy::{PyArray, PyArrayMethods};
 use pyo3::Python;
 
 #[bench]
 fn initial_shared_borrow(bencher: &mut Bencher) {
     Python::with_gil(|py| {
-        let array = PyArray::<f64, _>::zeros(py, (6, 5, 4, 3, 2, 1), false);
+        let array = PyArray::<f64, _>::zeros_bound(py, (6, 5, 4, 3, 2, 1), false);
 
         bencher.iter(|| {
-            let array = black_box(array);
+            let array = black_box(&array);
 
             let _shared = array.readonly();
         });
@@ -22,12 +22,12 @@ fn initial_shared_borrow(bencher: &mut Bencher) {
 #[bench]
 fn additional_shared_borrow(bencher: &mut Bencher) {
     Python::with_gil(|py| {
-        let array = PyArray::<f64, _>::zeros(py, (6, 5, 4, 3, 2, 1), false);
+        let array = PyArray::<f64, _>::zeros_bound(py, (6, 5, 4, 3, 2, 1), false);
 
         let _shared = (0..128).map(|_| array.readonly()).collect::<Vec<_>>();
 
         bencher.iter(|| {
-            let array = black_box(array);
+            let array = black_box(&array);
 
             let _shared = array.readonly();
         });
@@ -37,10 +37,10 @@ fn additional_shared_borrow(bencher: &mut Bencher) {
 #[bench]
 fn exclusive_borrow(bencher: &mut Bencher) {
     Python::with_gil(|py| {
-        let array = PyArray::<f64, _>::zeros(py, (6, 5, 4, 3, 2, 1), false);
+        let array = PyArray::<f64, _>::zeros_bound(py, (6, 5, 4, 3, 2, 1), false);
 
         bencher.iter(|| {
-            let array = black_box(array);
+            let array = black_box(&array);
 
             let _exclusive = array.readwrite();
         });