Merge pull request #109 from lzutao/edition

build: Transit package to 2018 edition

Author: kngwyu

Cargo.toml

@@ -4,6 +4,7 @@ version = "0.6.0"
 authors = ["Toshiki Teramura <[email protected]>", "Yuji Kanagawa <[email protected]>"]
 description = "Rust binding of NumPy C-API"
 documentation = "https://rust-numpy.github.io/rust-numpy/numpy"
+edition = "2018"
 repository = "https://github.com/rust-numpy/rust-numpy"
 keywords = ["numpy", "python", "binding"]
 license-file = "LICENSE"

README.md

@@ -42,7 +42,7 @@ features = ["python2"]
 ```
 .
 
-You can also automatically specify python version in [setup.py](examples/simple-extension/setup.py), 
+You can also automatically specify python version in [setup.py](examples/simple-extension/setup.py),
 using [setuptools-rust](https://github.com/PyO3/setuptools-rust).
 
 
@@ -60,9 +60,7 @@ pyo3 = "0.7"
 numpy = "0.6.0"
 ```
 
-``` rust
-extern crate numpy;
-extern crate pyo3;
+```rust
 use numpy::{PyArray1, get_array_module};
 use pyo3::prelude::{ObjectProtocol, PyResult, Python};
 use pyo3::types::PyDict;
@@ -109,10 +107,6 @@ features = ["extension-module"]
 ```
 
 ```rust
-extern crate ndarray;
-extern crate numpy;
-extern crate pyo3;
-
 use ndarray::{ArrayD, ArrayViewD, ArrayViewMutD};
 use numpy::{IntoPyArray, PyArrayDyn};
 use pyo3::prelude::{pymodule, Py, PyModule, PyResult, Python};

appveyor.yml

@@ -23,5 +23,4 @@ build_script:
 
 test_script:
   - cargo test --verbose --features %FEATURES% -- --test-threads=1
-  - rustdoc --test README.md -L native="%PYTHON%\\libs" -L target/debug/deps/
   - cd examples/simple-extension && python setup.py install && python setup.py test

ci/travis/test.sh

@@ -4,7 +4,6 @@ set -ex
 
 cargo build --verbose --features $FEATURES
 cargo test --verbose --features $FEATURES -- --test-threads=1
-rustdoc -L target/debug/deps/ --test README.md
 
 for example in examples/*; do
     if [ $example != 'examples/linalg' ]; then

examples/linalg/src/lib.rs

@@ -1,3 +1,4 @@
+#![deny(rust_2018_idioms)]
 use ndarray_linalg::solve::Inverse;
 use numpy::{IntoPyArray, PyArray2};
 use pyo3::exceptions::RuntimeError;
@@ -9,9 +10,9 @@ fn make_error<E: Display + Sized>(e: E) -> PyErr {
 }
 
 #[pymodule]
-fn rust_linalg(_py: Python, m: &PyModule) -> PyResult<()> {
+fn rust_linalg(_py: Python<'_>, m: &PyModule) -> PyResult<()> {
     #[pyfn(m, "inv")]
-    fn inv(py: Python, x: &PyArray2<f64>) -> PyResult<Py<PyArray2<f64>>> {
+    fn inv(py: Python<'_>, x: &PyArray2<f64>) -> PyResult<Py<PyArray2<f64>>> {
         let x = x.as_array().inv().map_err(make_error)?;
         Ok(x.into_pyarray(py).to_owned())
     }

examples/simple-extension/Cargo.toml

@@ -2,6 +2,7 @@
 name = "numpy-example"
 version = "0.1.0"
 authors = ["Toshiki Teramura <[email protected]>"]
+edition = "2018"
 
 [lib]
 name = "rust_ext"
@@ -13,4 +14,4 @@ ndarray = "0.12"
 
 [dependencies.pyo3]
 version = "0.7"
-features = ["extension-module"]
+features = ["extension-module"]

examples/simple-extension/src/lib.rs

@@ -1,27 +1,24 @@
-extern crate ndarray;
-extern crate numpy;
-extern crate pyo3;
-
+#![deny(rust_2018_idioms)]
 use ndarray::{ArrayD, ArrayViewD, ArrayViewMutD};
 use numpy::{IntoPyArray, PyArrayDyn};
 use pyo3::prelude::{pymodule, Py, PyModule, PyResult, Python};
 
 #[pymodule]
-fn rust_ext(_py: Python, m: &PyModule) -> PyResult<()> {
+fn rust_ext(_py: Python<'_>, m: &PyModule) -> PyResult<()> {
     // immutable example
-    fn axpy(a: f64, x: ArrayViewD<f64>, y: ArrayViewD<f64>) -> ArrayD<f64> {
+    fn axpy(a: f64, x: ArrayViewD<'_, f64>, y: ArrayViewD<'_, f64>) -> ArrayD<f64> {
         a * &x + &y
     }
 
     // mutable example (no return)
-    fn mult(a: f64, mut x: ArrayViewMutD<f64>) {
+    fn mult(a: f64, mut x: ArrayViewMutD<'_, f64>) {
         x *= a;
     }
 
     // wrapper of `axpy`
     #[pyfn(m, "axpy")]
     fn axpy_py(
-        py: Python,
+        py: Python<'_>,
         a: f64,
         x: &PyArrayDyn<f64>,
         y: &PyArrayDyn<f64>,
@@ -33,7 +30,7 @@ fn rust_ext(_py: Python, m: &PyModule) -> PyResult<()> {
 
     // wrapper of `mult`
     #[pyfn(m, "mult")]
-    fn mult_py(_py: Python, a: f64, x: &PyArrayDyn<f64>) -> PyResult<()> {
+    fn mult_py(_py: Python<'_>, a: f64, x: &PyArrayDyn<f64>) -> PyResult<()> {
         let x = x.as_array_mut();
         mult(a, x);
         Ok(())