Merge rayon-rs#583

583: Release rayon 1.0.2 and rayon-core 1.4.1 r=nikomatsakis a=cuviper

This updates the test and demo dependencies, then it's about time for
new rayon and rayon-core releases!

Co-authored-by: Josh Stone <[email protected]>

Author: bors[bot]

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "rayon"
 # Reminder to update html_rool_url in lib.rs when updating version
-version = "1.0.1"
+version = "1.0.2"
 authors = ["Niko Matsakis <[email protected]>",
            "Josh Stone <[email protected]>"]
 description = "Simple work-stealing parallelism for Rust"
@@ -29,6 +29,6 @@ default-features = false
 [dev-dependencies]
 docopt = "1"
 lazy_static = "1"
-rand = "0.4"
+rand = "0.5"
 serde = "1"
 serde_derive = "1"

RELEASES.md

@@ -1,3 +1,39 @@
+# Release rayon 1.0.2 / rayon-core 1.4.1
+
+- The `ParallelBridge` trait with method `par_bridge()` makes it possible to
+  use any `Send`able `Iterator` in parallel!
+  - This trait has been added to `rayon::prelude`.
+  - It automatically implements internal synchronization and queueing to
+    spread the `Item`s across the thread pool.  Iteration order is not
+    preserved by this adaptor.
+  - "Native" Rayon iterators like `par_iter()` should still be preferred when
+    possible for better efficiency.
+- `ParallelString` now has additional methods for parity with `std` string
+  iterators: `par_char_indices()`, `par_bytes()`, `par_encode_utf16()`,
+  `par_matches()`, and `par_match_indices()`.
+- `ParallelIterator` now has fallible methods `try_fold()`, `try_reduce()`,
+  and `try_for_each`, plus `*_with()` variants of each, for automatically
+  short-circuiting iterators on `None` or `Err` values.  These are inspired by
+  `Iterator::try_fold()` and `try_for_each()` that were stabilized in Rust 1.27.
+- `Range<i128>` and `Range<u128>` are now supported with Rust 1.26 and later.
+- Small improvements have been made to the documentation.
+- `rayon-core` now only depends on `rand` for testing.
+- Rayon tests now work on stable Rust.
+
+## Contributors
+
+Thanks to all of the contributors for this release!
+
+- @AndyGauge
+- @cuviper
+- @ignatenkobrain
+- @LukasKalbertodt
+- @MajorBreakfast
+- @nikomatsakis
+- @paulkernfeld
+- @QuietMisdreavus
+
+
 # Release rayon 1.0.1
 
 - Added more documentation for `rayon::iter::split()`.

rayon-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rayon-core"
-version = "1.4.0" # reminder to update html_root_url attribute
+version = "1.4.1" # reminder to update html_root_url attribute
 authors = ["Niko Matsakis <[email protected]>",
            "Josh Stone <[email protected]>"]
 description = "Core APIs for Rayon"
@@ -24,7 +24,7 @@ lazy_static = "1"
 version = "0.2.0"
 
 [dev-dependencies]
-rand = "0.4"
+rand = "0.5"
 
 [[test]]
 name = "stack_overflow_crash"

rayon-core/src/join/test.rs

@@ -3,6 +3,7 @@
 use ThreadPoolBuilder;
 use join::*;
 use rand::{Rng, SeedableRng, XorShiftRng};
+use rand::distributions::Standard;
 use unwind;
 
 fn quick_sort<T: PartialOrd + Send>(v: &mut [T]) {
@@ -28,10 +29,16 @@ fn partition<T: PartialOrd + Send>(v: &mut [T]) -> usize {
     i
 }
 
+fn seeded_rng() -> XorShiftRng {
+    let mut seed = <XorShiftRng as SeedableRng>::Seed::default();
+    (0..).zip(seed.as_mut()).for_each(|(i, x)| *x = i);
+    XorShiftRng::from_seed(seed)
+}
+
 #[test]
 fn sort() {
-    let mut rng = XorShiftRng::from_seed([0, 1, 2, 3]);
-    let mut data: Vec<_> = (0..6 * 1024).map(|_| rng.next_u32()).collect();
+    let mut rng = seeded_rng();
+    let mut data: Vec<u32> = rng.sample_iter(&Standard).take(6 * 1024).collect();
     let mut sorted_data = data.clone();
     sorted_data.sort();
     quick_sort(&mut data);
@@ -40,8 +47,8 @@ fn sort() {
 
 #[test]
 fn sort_in_pool() {
-    let mut rng = XorShiftRng::from_seed([0, 1, 2, 3]);
-    let mut data: Vec<_> = (0..12 * 1024).map(|_| rng.next_u32()).collect();
+    let mut rng = seeded_rng();
+    let mut data: Vec<u32> = rng.sample_iter(&Standard).take(12 * 1024).collect();
 
     let pool = ThreadPoolBuilder::new().build().unwrap();
     let mut sorted_data = data.clone();

rayon-core/src/scope/test.rs

@@ -105,21 +105,23 @@ impl<T: Send> Tree<T> {
 
 fn random_tree(depth: usize) -> Tree<u32> {
     assert!(depth > 0);
-    let mut rng = XorShiftRng::from_seed([0, 1, 2, 3]);
+    let mut seed = <XorShiftRng as SeedableRng>::Seed::default();
+    (0..).zip(seed.as_mut()).for_each(|(i, x)| *x = i);
+    let mut rng = XorShiftRng::from_seed(seed);
     random_tree1(depth, &mut rng)
 }
 
 fn random_tree1(depth: usize, rng: &mut XorShiftRng) -> Tree<u32> {
     let children = if depth == 0 {
         vec![]
     } else {
-        (0..(rng.next_u32() % 3)) // somewhere between 0 and 3 children at each level
+        (0..rng.gen_range(0, 4)) // somewhere between 0 and 3 children at each level
             .map(|_| random_tree1(depth - 1, rng))
             .collect()
     };
 
     Tree {
-        value: rng.next_u32() % 1_000_000,
+        value: rng.gen_range(0, 1_000_000),
         children: children,
     }
 }

rayon-demo/Cargo.toml

@@ -7,16 +7,16 @@ publish = false
 [dependencies]
 rayon = { path = "../" }
 cgmath = "0.16"
-docopt = "0.8"
+docopt = "1"
 fixedbitset = "0.1.5"
-glium = "0.20"
+glium = "0.21"
 lazy_static = "1"
 odds = "0.3"
-rand = "0.4"
-regex = "0.2"
+rand = "0.5"
+regex = "1"
 serde = "1"
 serde_derive = "1"
 time = "0.1"
 
 [dev-dependencies]
-num = "0.1.30"
+num = "0.2"

rayon-demo/src/find/mod.rs

@@ -5,16 +5,17 @@ macro_rules! make_tests {
         mod $m {
             use rayon::prelude::*;
             use test::Bencher;
-            use rand::{Rng, SeedableRng, XorShiftRng};
+            use rand::Rng;
+            use rand::distributions::Standard;
 
             lazy_static! {
                 static ref HAYSTACK: Vec<[u32; $n]> = {
-                    let mut rng = XorShiftRng::from_seed([0, 1, 2, 3]);
-                    (0..10_000_000).map(|_| {
+                    let mut rng = ::seeded_rng();
+                    rng.sample_iter(&Standard).map(|x| {
                         let mut result: [u32; $n] = [0; $n];
-                        result[0] = rng.next_u32();
+                        result[0] = x;
                         result
-                    }).collect()
+                    }).take(10_000_000).collect()
                 };
             }
 

rayon-demo/src/life/mod.rs

@@ -13,6 +13,7 @@ Options:
 
 
 use rand::{thread_rng, Rng};
+use rand::distributions::Standard;
 use std::iter::repeat;
 use std::num::Wrapping;
 use std::sync::Arc;
@@ -74,7 +75,7 @@ impl Board {
     }
 
     pub fn random(&self) -> Board {
-        let new_brd = thread_rng().gen_iter().take(self.len()).collect();
+        let new_brd = thread_rng().sample_iter(&Standard).take(self.len()).collect();
 
         self.next_board(new_brd)
     }

rayon-demo/src/main.rs

@@ -95,3 +95,10 @@ fn main() {
         _ => usage()
     }
 }
+
+fn seeded_rng() -> rand::XorShiftRng {
+    use rand::{SeedableRng, 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/mergesort/mod.rs

@@ -1,4 +1,5 @@
-use rand::{Rng, SeedableRng, XorShiftRng};
+use rand::Rng;
+use rand::distributions::Standard;
 
 const USAGE: &'static str = "
 Usage: mergesort bench [--size N]
@@ -220,8 +221,8 @@ pub fn is_sorted<T: Send + Ord>(v: &mut [T]) -> bool {
 }
 
 fn default_vec(n: usize) -> Vec<u32> {
-    let mut rng = XorShiftRng::from_seed([0, 1, 2, 3]);
-    (0..n).map(|_| rng.next_u32()).collect()
+    let mut rng = ::seeded_rng();
+    rng.sample_iter(&Standard).take(n).collect()
 }
 
 fn timed_sort<F: FnOnce(&mut [u32])>(n: usize, f: F, name: &str) -> u64 {