Merge branch 'master' into fix-axis-iter

Author: jturner314

.travis.yml

@@ -4,16 +4,19 @@ sudo: required
 dist: trusty
 matrix:
   include:
-    - rust: 1.31.0
+    - rust: 1.32.0
       env:
        - FEATURES='test docs'
+       - RUSTFLAGS='-D warnings'
     - rust: stable
       env:
        - FEATURES='test docs'
+       - RUSTFLAGS='-D warnings'
     - rust: beta
       env:
        - FEATURES='test docs'
        - CHANNEL='beta'
+       - RUSTFLAGS='-D warnings'
     - rust: nightly
       env:
        - FEATURES='test docs'
@@ -27,9 +30,5 @@ addons:
     packages:
       - libopenblas-dev
       - gfortran
-before_script:
-  - rustup component add rustfmt
 script:
-  - |
-    cargo fmt --all -- --check &&
-    ./scripts/all-tests.sh "$FEATURES" "$CHANNEL"
+  - ./scripts/all-tests.sh "$FEATURES" "$CHANNEL"

benches/bench1.rs

@@ -7,7 +7,6 @@
     clippy::many_single_char_names
 )]
 
-extern crate ndarray;
 extern crate test;
 
 use ndarray::ShapeBuilder;

benches/chunks.rs

@@ -3,7 +3,6 @@
 extern crate test;
 use test::Bencher;
 
-extern crate ndarray;
 use ndarray::prelude::*;
 use ndarray::NdProducer;
 

benches/construct.rs

@@ -8,7 +8,6 @@
 extern crate test;
 use test::Bencher;
 
-extern crate ndarray;
 use ndarray::prelude::*;
 
 #[bench]

benches/gemv.rs

@@ -9,7 +9,6 @@
 extern crate test;
 use test::Bencher;
 
-extern crate ndarray;
 use ndarray::prelude::*;
 
 use ndarray::linalg::general_mat_vec_mul;

benches/higher-order.rs

@@ -10,7 +10,6 @@ use std::iter::FromIterator;
 use test::black_box;
 use test::Bencher;
 
-extern crate ndarray;
 use ndarray::prelude::*;
 
 const N: usize = 1024;
@@ -23,7 +22,7 @@ fn map_regular(bench: &mut Bencher) {
     bench.iter(|| a.map(|&x| 2. * x));
 }
 
-pub fn double_array(mut a: ArrayViewMut2<f64>) {
+pub fn double_array(mut a: ArrayViewMut2<'_, f64>) {
     a *= 2.0;
 }
 

benches/iter.rs

@@ -6,13 +6,11 @@
     clippy::many_single_char_names
 )]
 
-extern crate rawpointer;
 extern crate test;
 use rawpointer::PointerExt;
 use test::black_box;
 use test::Bencher;
 
-extern crate ndarray;
 use ndarray::prelude::*;
 use ndarray::Slice;
 use ndarray::{FoldWhile, Zip};

benches/numeric.rs

@@ -3,7 +3,6 @@
 extern crate test;
 use test::Bencher;
 
-extern crate ndarray;
 use ndarray::prelude::*;
 
 const N: usize = 1024;

benches/par_rayon.rs

@@ -1,11 +1,6 @@
 #![cfg(feature = "rayon")]
 #![feature(test)]
 
-extern crate rayon;
-
-extern crate itertools;
-extern crate ndarray;
-
 use ndarray::parallel::prelude::*;
 use ndarray::prelude::*;
 
@@ -17,8 +12,6 @@ use ndarray::Zip;
 const EXP_N: usize = 256;
 const ADDN: usize = 512;
 
-use std::cmp::max;
-
 fn set_threads() {
     // Consider setting a fixed number of threads here, for example to avoid
     // oversubscribing on hyperthreaded cores.

examples/axis_ops.rs

@@ -4,7 +4,6 @@
     clippy::unreadable_literal,
     clippy::many_single_char_names
 )]
-extern crate ndarray;
 
 use ndarray::prelude::*;