fix rand crate example and broken links

Author: yogesum

CONTRIBUTING.md

@@ -162,17 +162,17 @@ after the code sample.
 > By default, random numbers are generated with [uniform distribution].
 > To generate numbers with other distributions you instantiate a
 > distribution, then sample from that distribution using
-> [`IndependentSample::ind_sample`] with help of a random-number
+> [`Distribution::sample`] with help of a random-number
 > generator [`rand::Rng`].
 > 
 > The [distributions available are documented here][rand-distributions]. 
 > An example using the [`Normal`] distribution is shown below.
 
 [uniform distribution]: https://en.wikipedia.org/wiki/Uniform_distribution_(continuous)
-[`IndependentSample::ind_sample`]: https://doc.rust-lang.org/rand/rand/distributions/trait.IndependentSample.html#tymethod.ind_sample
-[`rand::Rng`]: https://doc.rust-lang.org/rand/rand/trait.Rng.html
-[rand-distributions]: https://doc.rust-lang.org/rand/rand/distributions/index.html
-[`Normal`]: https://doc.rust-lang.org/rand/rand/distributions/normal/struct.Normal.html
+[`Distribution::sample`]: https://docs.rs/rand/*/rand/distributions/trait.Distribution.html#tymethod.sample
+[`rand::Rng`]: https://docs.rs/rand/*/rand/trait.Rng.html
+[rand-distributions]: https://docs.rs/rand/*/rand/distributions/index.html
+[`Normal`]: https://docs.rs/rand/*/rand/distributions/struct.Normal.html
 
 #### Code
 
@@ -207,12 +207,12 @@ explanation in the description.
 > ```rust
 > extern crate rand;
 > 
-> use rand::distributions::{Normal, IndependentSample};
+> use rand::distributions::{Normal, Distribution};
 > 
 > fn main() {
 >    let mut rng = rand::thread_rng();
 >    let normal = Normal::new(2.0, 3.0);
->    let v = normal.ind_sample(&mut rng);
+>    let v = normal.sample(&mut rng);
 >    println!("{} is from a N(2, 9) distribution", v)
 > }
 > ```

Cargo.toml

@@ -31,7 +31,7 @@ mime = "0.3"
 num = "0.1"
 num_cpus = "1.8"
 petgraph = "0.4"
-rand = "0.4"
+rand = "0.5"
 rayon = "1.0"
 regex = "1.0"
 reqwest = "0.8"

src/basics.md

@@ -194,14 +194,14 @@ in the same range.
 ```rust
 extern crate rand;
 
-use rand::distributions::{Range, IndependentSample};
+use rand::distributions::{Range, Distribution};
 
 fn main() {
     let mut rng = rand::thread_rng();
     let die = Range::new(1, 7);
 
     loop {
-        let throw = die.ind_sample(&mut rng);
+        let throw = die.sample(&mut rng);
         println!("Roll the die: {}", throw);
         if throw == 6 {
             break;
@@ -221,7 +221,7 @@ fn main() {
 By default, random numbers are generated with [uniform distribution].
 To generate numbers with other distributions you instantiate a
 distribution, then sample from that distribution using
-[`IndependentSample::ind_sample`] with help of a random-number
+[`Distribution::sample`] with help of a random-number
 generator [`rand::Rng`].
 
 The [distributions available are documented here][rand-distributions]. An example using the
@@ -230,14 +230,14 @@ The [distributions available are documented here][rand-distributions]. An exampl
 ```rust
 extern crate rand;
 
-use rand::distributions::{Normal, IndependentSample};
+use rand::distributions::{Normal, Distribution};
 
 fn main() {
     let mut rng = rand::thread_rng();
 
     // mean 2, standard deviation 3:
     let normal = Normal::new(2.0, 3.0);
-    let v = normal.ind_sample(&mut rng);
+    let v = normal.sample(&mut rng);
     println!("{} is from a N(2, 9) distribution", v)
 }
 ```
@@ -249,21 +249,22 @@ fn main() {
 [![rand-badge]][rand] [![cat-science-badge]][cat-science]
 
 Randomly generates a tuple `(i32, bool, f64)` and variable of user defined type `Point`.
-Implements the [`rand::Rand`] trait for `Point` in order to allow random generation.
+Implements the [`Distribution`] trait on type `Point` for [`Standard`] in order to allow random generation.
 
 ```rust
 extern crate rand;
 
-use rand::{Rng, Rand};
+use rand::Rng;
+use rand::distributions::{Distribution, Standard};
 
 #[derive(Debug)]
 struct Point {
     x: i32,
     y: i32,
 }
 
-impl Rand for Point {
-    fn rand<R: Rng>(rng: &mut R) -> Point {
+impl Distribution<Point> for Standard {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Point {
         let (rand_x, rand_y) = rng.gen();
         Point {
             x: rand_x,
@@ -287,15 +288,20 @@ fn main() {
 
 [![rand-badge]][rand] [![cat-os-badge]][cat-os]
 
-Randomly generates a string of given length ASCII characters in the range `A-Z, a-z, 0-9`, with [`gen_ascii_chars`].
+Randomly generates a string of given length ASCII characters in the range `A-Z, a-z, 0-9`, with [`Alphanumeric`] sample.
 
 ```rust
 extern crate rand;
 
 use rand::{thread_rng, Rng};
+use rand::distributions::Alphanumeric;
 
 fn main() {
-    let rand_string: String = thread_rng().gen_ascii_chars().take(30).collect();
+    let rand_string: String = thread_rng()
+        .sample_iter(&Alphanumeric)
+        .take(30)
+        .collect();
+
     println!("{}", rand_string);
 }
 ```
@@ -1806,10 +1812,10 @@ fn run() -> Result<()> {
 [`foreign_links`]: https://docs.rs/error-chain/*/error_chain/#foreign-links
 [`fs::Metadata`]: https://doc.rust-lang.org/std/fs/struct.Metadata.html
 [`fs::read_dir`]: https://doc.rust-lang.org/std/fs/fn.read_dir.html
-[`gen_ascii_chars`]: https://docs.rs/rand/*/rand/trait.Rng.html#method.gen_ascii_chars
+[`Alphanumeric`]: https://docs.rs/rand/*/rand/distributions/struct.Alphanumeric.html#struct.Alphanumaric
 [`HashMap`]: https://doc.rust-lang.org/std/collections/struct.HashMap.html
 [`hmac::Signature`]: https://briansmith.org/rustdoc/ring/hmac/struct.Signature.html
-[`IndependentSample::ind_sample`]: https://docs.rs/rand/*/rand/distributions/trait.IndependentSample.html#tymethod.ind_sample
+[`Distribution::sample`]: https://docs.rs/rand/*/rand/distributions/trait.Distribution.html#tymethod.sample
 [`Lines`]: https://doc.rust-lang.org/std/io/struct.Lines.html
 [`Metadata::is_file`]: https://doc.rust-lang.org/std/fs/struct.Metadata.html#method.is_file
 [`Metadata::modified`]: https://doc.rust-lang.org/std/fs/struct.Metadata.html#method.modified
@@ -1831,11 +1837,11 @@ fn run() -> Result<()> {
 [`pbkdf2::derive`]: https://briansmith.org/rustdoc/ring/pbkdf2/fn.derive.html
 [`pbkdf2::verify`]: https://briansmith.org/rustdoc/ring/pbkdf2/fn.verify.html
 [`process::Stdio`]: https://doc.rust-lang.org/std/process/struct.Stdio.html
-[`rand::Rand`]: https://docs.rs/rand/*/rand/trait.Rand.html
-[`rand::Rand`]: https://docs.rs/rand/*/rand/trait.Rand.html
 [`rand::Rng`]: https://docs.rs/rand/*/rand/trait.Rng.html
 [`rand::thread_rng`]: https://docs.rs/rand/*/rand/fn.thread_rng.html
-[`Range`]: https://docs.rs/rand/*/rand/distributions/range/struct.Range.html
+[`Range`]: https://docs.rs/rand/*/rand/distributions/#reexports
+[`Standard`]: https://docs.rs/rand/*/rand/distributions/struct.Standard.html
+[`Distribution`]: https://docs.rs/rand/*/rand/distributions/trait.Distribution.html
 [`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html
 [`Regex::captures_iter`]: https://doc.rust-lang.org/regex/*/regex/struct.Regex.html#method.captures_iter
 [`regex::RegexSet`]: https://doc.rust-lang.org/regex/*/regex/struct.RegexSet.html

src/concurrency.md

@@ -87,7 +87,8 @@ because it is usually faster than [`stable sorting`] algorithms which `rayon` al
 extern crate rand;
 extern crate rayon;
 
-use rand::Rng;
+use rand::{Rng, thread_rng};
+use rand::distributions::Alphanumeric;
 use rayon::prelude::*;
 
 fn main() {
@@ -97,7 +98,8 @@ fn main() {
     // [2]
     vec.par_iter_mut().for_each(|p| {
         // [3]
-        *p = rand::weak_rng().gen_ascii_chars().take(5).collect()
+        let mut rng = thread_rng();
+        *p = (0..5).map(|_| rng.sample(&Alphanumeric)).collect()
     });
 
     // [4]