Use pyobject_native_type macro exposed in PyO3/pyo3#155

PyO3 · May 13, 2018 · 2e1b069 · 2e1b069
1 parent 1958ae1
commit 2e1b069
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,4 +13,8 @@ license-file = "LICENSE"
 libc = "0.2"
 num-complex = "0.1"
 ndarray = "0.10"
-pyo3 = "0.2"
+
+[dependencies.pyo3]
+git = "http://github.com/termoshtt/pyo3"
+branch = "pyobject_macros"
+version = "0.2"
diff --git a/src/array.rs b/src/array.rs
@@ -14,11 +14,7 @@ use super::*;
 /// Untyped safe interface for NumPy ndarray.
 pub struct PyArray(PyObject);
 
-impl ToPyPointer for PyArray {
-    fn as_ptr(&self) -> *mut ffi::PyObject {
-        self.0.as_ptr()
-    }
-}
+pyobject_native_type!(PyArray, npyffi::PyArray_Type, npyffi::PyArray_Check);
 
 impl PyArray {
     pub fn as_array_ptr(&self) -> *mut npyffi::PyArrayObject {

diff --git a/src/lib.rs b/src/lib.rs
@@ -1,6 +1,9 @@
+#![feature(specialization)]
+
 extern crate libc;
 extern crate ndarray;
 extern crate num_complex;
+#[macro_use]
 extern crate pyo3;
 
 pub mod array;