rand: Update to use ndarray 0.6

bluss · bluss · commit 04bedd1cc99d · 2016-06-06T14:37:48.000+02:00
diff --git a/ndarray-rand/Cargo.toml b/ndarray-rand/Cargo.toml
@@ -13,4 +13,4 @@ keywords = ["multidimensional", "matrix", "rand", "ndarray"]
 
 [dependencies]
 rand = "0.3"
-ndarray = { version = ">= 0.4.9, < 0.6", path = ".." }
+ndarray = { version = "0.6", path = ".." }
diff --git a/ndarray-rand/src/lib.rs b/ndarray-rand/src/lib.rs
@@ -75,13 +75,12 @@ impl<S, D> RandomExt<S, D> for ArrayBase<S, D>
         Self::random_using(dim, dist, &mut rand::weak_rng())
     }
 
-    #[allow(deprecated)] // from_vec_dim
     fn random_using<IdS, R>(dim: D, dist: IdS, rng: &mut R) -> ArrayBase<S, D>
         where IdS: IndependentSample<S::Elem>,
               R: Rng
     {
         let elements = Vec::from_iter((0..dim.size()).map(move |_| dist.ind_sample(rng)));
-        Self::from_vec_dim(dim, elements).unwrap()
+        Self::from_shape_vec(dim, elements).unwrap()
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -75,13 +75,12 @@ impl<S, D> RandomExt<S, D> for ArrayBase<S, D>`
`75`	`75`	`Self::random_using(dim, dist, &mut rand::weak_rng())`
`76`	`76`	`}`
`77`	`77`
`78`		`- #[allow(deprecated)] // from_vec_dim`
`79`	`78`	`fn random_using<IdS, R>(dim: D, dist: IdS, rng: &mut R) -> ArrayBase<S, D>`
`80`	`79`	`where IdS: IndependentSample<S::Elem>,`
`81`	`80`	`R: Rng`
`82`	`81`	`{`
`83`	`82`	`let elements = Vec::from_iter((0..dim.size()).map(move \|_\| dist.ind_sample(rng)));`
`84`		`- Self::from_vec_dim(dim, elements).unwrap()`
	`83`	`+ Self::from_shape_vec(dim, elements).unwrap()`
`85`	`84`	`}`
`86`	`85`	`}`
`87`	`86`