Merge branch 'master' of https://github.com/bluss/ndarray into order-statistics

Author: LukeMathWalker

.travis.yml

@@ -4,7 +4,7 @@ sudo: required
 dist: trusty
 matrix:
   include:
-    - rust: 1.26.0
+    - rust: 1.27.0
       env:
        - FEATURES='test docs'
     - rust: stable

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "ndarray"
-version = "0.11.2"
+version = "0.12.0"
 authors = ["bluss"]
 license = "MIT/Apache-2.0"
 readme = "README-crates.io.md"

README.rst

@@ -88,13 +88,17 @@ provider::
 Recent Changes (ndarray)
 ------------------------
 
-- 0.12.0 (not yet released)
+- 0.12.0
 
   - Add ``var_axis`` method for computing variance by @LukeMathWalker.
+  - Add ``map_mut`` and ``map_axis_mut`` methods (mutable variants of ``map`` and ``map_axis``) by @LukeMathWalker.
   - Add support for 128-bit integer scalars (``i128`` and ``u128``).
+  - Add support for slicing with inclusive ranges (``start..=end`` and ``..=end``).
+  - Relax constraint on closure from ``Fn`` to ``FnMut`` for ``mapv``, ``mapv_into``, ``map_inplace`` and ``mapv_inplace``.
+  - Implement ``TrustedIterator`` for ``IterMut``.
   - Bump ``num-traits`` and ``num-complex`` to version ``0.2``.
   - Bump ``blas-src`` to version ``0.2``.
-  - Bump minimum required Rust version to 1.26.
+  - Bump minimum required Rust version to 1.27.
   - Additional contributors to this release: @ExpHP, @jturner314, @alexbool, @messense, @danmack, @nbro
 
 - 0.11.2

ndarray-rand/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ndarray-rand"
-version = "0.7.0"
+version = "0.8.0"
 authors = ["bluss"]
 license = "MIT/Apache-2.0"
 
@@ -13,7 +13,7 @@ keywords = ["multidimensional", "matrix", "rand", "ndarray"]
 
 [dependencies]
 rand = "0.5.0"
-ndarray = { version = "0.11.0", path = ".." }
+ndarray = { version = "0.12.0", path = ".." }
 
 [package.metadata.release]
 no-dev-version = true

ndarray-rand/README.rst

@@ -4,8 +4,9 @@ ndarray-rand
 Recent Changes
 --------------
 
-- 0.8.0 (not yet released)
+- 0.8.0
 
+  - Require ndarray 0.12
   - Require rand 0.5
 
 - 0.7.0

parallel/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ndarray-parallel"
-version = "0.8.0"
+version = "0.9.0"
 authors = ["bluss"]
 license = "MIT/Apache-2.0"
 
@@ -14,7 +14,7 @@ categories = ["data-structures", "science", "concurrency"]
 
 [dependencies]
 rayon = { version = "1.0" }
-ndarray = { version = "0.11.0", path = "../" }
+ndarray = { version = "0.12.0", path = "../" }
 
 [dev-dependencies]
 num_cpus = "1.2"

parallel/README.rst

@@ -49,6 +49,10 @@ How to use with cargo::
 Recent Changes (ndarray-parallel)
 ---------------------------------
 
+- 0.9.0
+
+  - Upgrade for ndarray 0.12.0
+
 - 0.8.0
 
   - Upgrade for rayon 1.0!

parallel/src/lib.rs

@@ -92,7 +92,7 @@
 //!         });
 //! }
 //! ```
-#![doc(html_root_url = "http://docs.rs/ndarray-parallel/0.7/")]
+#![doc(html_root_url = "http://docs.rs/ndarray-parallel/0.9/")]
 
 
 pub extern crate ndarray;

src/impl_methods.rs

@@ -1739,8 +1739,8 @@ impl<A, S, D> ArrayBase<S, D> where S: Data<Elem=A>, D: Dimension
     ///                                [1., 2.]])
     /// );
     /// ```
-    pub fn mapv<B, F>(&self, f: F) -> Array<B, D>
-        where F: Fn(A) -> B,
+    pub fn mapv<B, F>(&self, mut f: F) -> Array<B, D>
+        where F: FnMut(A) -> B,
               A: Clone,
     {
         self.map(move |x| f(x.clone()))
@@ -1752,7 +1752,7 @@ impl<A, S, D> ArrayBase<S, D> where S: Data<Elem=A>, D: Dimension
     /// Elements are visited in arbitrary order.
     pub fn mapv_into<F>(mut self, f: F) -> Self
         where S: DataMut,
-              F: Fn(A) -> A,
+              F: FnMut(A) -> A,
               A: Clone,
     {
         self.mapv_inplace(f);
@@ -1764,7 +1764,7 @@ impl<A, S, D> ArrayBase<S, D> where S: Data<Elem=A>, D: Dimension
     /// Elements are visited in arbitrary order.
     pub fn map_inplace<F>(&mut self, f: F)
         where S: DataMut,
-              F: Fn(&mut A),
+              F: FnMut(&mut A),
     {
         self.unordered_foreach_mut(f);
     }
@@ -1785,9 +1785,9 @@ impl<A, S, D> ArrayBase<S, D> where S: Data<Elem=A>, D: Dimension
     ///                         [0.36788, 7.38906]]), 1e-5)
     /// );
     /// ```
-    pub fn mapv_inplace<F>(&mut self, f: F)
+    pub fn mapv_inplace<F>(&mut self, mut f: F)
         where S: DataMut,
-              F: Fn(A) -> A,
+              F: FnMut(A) -> A,
               A: Clone,
     {
         self.unordered_foreach_mut(move |x| *x = f(x.clone()));

src/lib.rs

@@ -53,7 +53,7 @@
 //!   + Efficient floating point matrix multiplication even for very large
 //!     matrices; can optionally use BLAS to improve it further.
 //!   + See also the [`ndarray-parallel`] crate for integration with rayon.
-//! - **Requires Rust 1.26**
+//! - **Requires Rust 1.27**
 //!
 //! [`ndarray-parallel`]: https://docs.rs/ndarray-parallel
 //!