Update dev and demo dependencies

- `cgmath 0.17`
- `glium 0.23`
- `rand 0.6`

Author: cuviper

Cargo.toml

@@ -30,6 +30,7 @@ default-features = false
 [dev-dependencies]
 docopt = "1"
 lazy_static = "1"
-rand = "0.5"
+rand = "0.6"
+rand_xorshift = "0.1"
 serde = "1"
 serde_derive = "1"

rayon-core/Cargo.toml

@@ -28,7 +28,8 @@ version = "0.2.0"
 version = "0.3.0"
 
 [dev-dependencies]
-rand = "0.5"
+rand = "0.6"
+rand_xorshift = "0.1"
 
 [[test]]
 name = "stack_overflow_crash"

rayon-core/src/join/test.rs

@@ -2,7 +2,8 @@
 
 use join::*;
 use rand::distributions::Standard;
-use rand::{Rng, SeedableRng, XorShiftRng};
+use rand::{Rng, SeedableRng};
+use rand_xorshift::XorShiftRng;
 use unwind;
 use ThreadPoolBuilder;
 

rayon-core/src/lib.rs

@@ -40,6 +40,8 @@ extern crate num_cpus;
 
 #[cfg(test)]
 extern crate rand;
+#[cfg(test)]
+extern crate rand_xorshift;
 
 #[macro_use]
 mod log;

rayon-core/src/scope/test.rs

@@ -1,4 +1,5 @@
-use rand::{Rng, SeedableRng, XorShiftRng};
+use rand::{Rng, SeedableRng};
+use rand_xorshift::XorShiftRng;
 use std::cmp;
 use std::iter::once;
 use std::sync::atomic::{AtomicUsize, Ordering};

rayon-demo/Cargo.toml

@@ -6,13 +6,14 @@ publish = false
 
 [dependencies]
 rayon = { path = "../" }
-cgmath = "0.16"
+cgmath = "0.17"
 docopt = "1"
 fixedbitset = "0.1.5"
-glium = "0.21"
+glium = "0.23"
 lazy_static = "1"
 odds = "0.3"
-rand = "0.5"
+rand = "0.6"
+rand_xorshift = "0.1"
 regex = "1"
 serde = "1"
 serde_derive = "1"

rayon-demo/src/main.rs

@@ -48,6 +48,7 @@ extern crate libc; // life
 extern crate num;
 extern crate odds; // sieve
 extern crate rand; // nbody
+extern crate rand_xorshift; // nbody
 extern crate time; // nbody, sieve // factorial
 #[macro_use]
 extern crate lazy_static; // find
@@ -109,8 +110,9 @@ fn main() {
     }
 }
 
-fn seeded_rng() -> rand::XorShiftRng {
-    use rand::{SeedableRng, XorShiftRng};
+fn seeded_rng() -> rand_xorshift::XorShiftRng {
+    use rand::SeedableRng;
+    use rand_xorshift::XorShiftRng;
     let mut seed = <XorShiftRng as SeedableRng>::Seed::default();
     (0..).zip(seed.as_mut()).for_each(|(i, x)| *x = i);
     XorShiftRng::from_seed(seed)

rayon-demo/src/nbody/visualize.rs

@@ -80,7 +80,7 @@ implement_vertex!(Instance, color, world_position);
 pub fn visualize_benchmarks(num_bodies: usize, mut mode: ExecutionMode) {
     let mut events_loop = EventsLoop::new();
     let window = WindowBuilder::new()
-        .with_dimensions(800, 600)
+        .with_dimensions((800, 600).into())
         .with_title("nbody demo".to_string());
     let context = ContextBuilder::new().with_depth_buffer(24);
     let display = Display::new(window, context, &events_loop).unwrap();
@@ -191,7 +191,7 @@ pub fn visualize_benchmarks(num_bodies: usize, mut mode: ExecutionMode) {
         events_loop.poll_events(|event| {
             if let Event::WindowEvent { event, .. } = event {
                 match event {
-                    WindowEvent::Closed => done = true,
+                    WindowEvent::CloseRequested => done = true,
                     WindowEvent::KeyboardInput { input, .. } => {
                         if let ElementState::Pressed = input.state {
                             match input.virtual_keycode {

rayon-demo/src/str_split.rs

@@ -1,14 +1,14 @@
 //! Some microbenchmarks for splitting strings
 
-use rand::Rng;
+use rand::seq::SliceRandom;
 use rayon::prelude::*;
 use test::Bencher;
 
 lazy_static! {
     static ref HAYSTACK: String = {
         let mut rng = ::seeded_rng();
         let mut bytes: Vec<u8> = "abcdefg ".bytes().cycle().take(1_000_000).collect();
-        rng.shuffle(&mut bytes);
+        bytes.shuffle(&mut rng);
         String::from_utf8(bytes).unwrap()
     };
     static ref COUNT: usize = { HAYSTACK.split(' ').count() };

src/iter/test.rs

@@ -5,7 +5,8 @@ use prelude::*;
 use rayon_core::*;
 
 use rand::distributions::Standard;
-use rand::{Rng, SeedableRng, XorShiftRng};
+use rand::{Rng, SeedableRng};
+use rand_xorshift::XorShiftRng;
 use std::collections::LinkedList;
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::collections::{BinaryHeap, VecDeque};