Merge rayon-rs#536

536: Stabilize the rayon testsuite r=nikomatsakis a=cuviper



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

Author: bors[bot]

.travis.yml

@@ -9,20 +9,21 @@ matrix:
   fast_finish: true
   include:
     # NB: To help with CI delays, each `pull_request` is only tested on Linux,
-    # with 1.13 for compatibility and nightly+rayon_unstable for broad test
+    # with 1.13 for compatibility and stable+rayon_unstable for broad test
     # coverage.  The bors bot counts as a `push` type, which will run it all.
 
     - rust: 1.13.0
       os: linux
       #if: everything!
+      script: cargo build
 
     - rust: stable
       os: linux
       if: NOT type = pull_request
     - rust: stable
       os: linux
       env: RUSTFLAGS='--cfg rayon_unstable'
-      if: NOT type = pull_request
+      #if: everything!
 
     - rust: beta
       os: linux
@@ -38,7 +39,7 @@ matrix:
     - rust: nightly
       os: linux
       env: RUSTFLAGS='--cfg rayon_unstable'
-      #if: everything!
+      if: NOT type = pull_request
 
     - rust: stable
       os: osx
@@ -65,23 +66,29 @@ matrix:
         - cargo build --target $TARGET
       if: NOT type = pull_request
 
+    # rayon-demo has huge dependencies, so limit its testing.
+    # build on stable, test on nightly (because of #[bench])
+    - rust: stable
+      os: linux
+      env: DEMO=1
+      script: cargo build -p rayon-demo
+      if: NOT type = pull_request
+    - rust: nightly
+      os: linux
+      env: DEMO=1
+      script: cargo test -p rayon-demo
+      if: NOT type = pull_request
+
 
 script:
   - cargo build
-  - |
-    if [ $TRAVIS_RUST_VERSION == nightly ]; then
-      cargo test -p rayon &&
-      cargo test -p rayon-core &&
-      cargo test -p rayon-demo &&
-      ./ci/highlander.sh
-    fi
+  - cargo test -p rayon
+  - cargo test -p rayon-core
+  - ./ci/highlander.sh
   - |
     if [ -n "$RUSTFLAGS" ]; then
-      cargo clean &&
       cargo build -p rayon-futures &&
-      if [ $TRAVIS_RUST_VERSION == nightly ]; then
-        cargo test -p rayon-futures
-      fi
+      cargo test -p rayon-futures
     fi
 
 branches:

Cargo.toml

@@ -11,6 +11,7 @@ documentation = "https://docs.rs/rayon/"
 readme = "README.md"
 keywords = ["parallel", "thread", "concurrency", "join", "performance"]
 categories = ["concurrency"]
+build = "build.rs"
 
 [workspace]
 members = ["rayon-demo", "rayon-core", "rayon-futures"]
@@ -30,7 +31,3 @@ lazy_static = "1"
 rand = "0.4"
 serde = "1"
 serde_derive = "1"
-
-# mingw linking rustc crates is missing -ldbghelp, rust-lang/rust#47359
-[target.'cfg(not(all(windows, target_env = "gnu")))'.dev-dependencies]
-compiletest_rs = "0.3"

README.md

@@ -106,18 +106,16 @@ parallel.
 
 ```
 > cd rayon-demo
-> cargo +nightly run --release -- nbody visualize
+> cargo run --release -- nbody visualize
 ```
 
 For more information on demos, try:
 
 ```
 > cd rayon-demo
-> cargo +nightly run --release -- --help
+> cargo run --release -- --help
 ```
 
-**Note:** While Rayon is usable as a library with the stable compiler, running demos or executing tests requires nightly Rust.
-
 ## Other questions?
 
 See [the Rayon FAQ][faq].

appveyor.yml

@@ -52,17 +52,11 @@ build: false
 
 test_script:
   - cargo build
-  - if [%CHANNEL%]==[nightly] (
-      cargo test -p rayon &&
-      cargo test -p rayon-core &&
-      cargo test -p rayon-demo
-    )
+  - cargo test -p rayon
+  - cargo test -p rayon-core
   - if not "%RUSTFLAGS%"=="%^RUSTFLAGS%" (
-      cargo clean &&
       cargo build -p rayon-futures &&
-      if [%CHANNEL%]==[nightly] (
-        cargo test -p rayon-futures
-      )
+      cargo test -p rayon-futures
     )
 
 branches:

rayon-core/Cargo.toml

@@ -25,3 +25,26 @@ version = "0.2.0"
 
 [dev-dependencies]
 rand = "0.4"
+
+[[test]]
+name = "stack_overflow_crash"
+path = "tests/stack_overflow_crash.rs"
+harness = false
+
+# NB: having one [[test]] manually defined means we need to declare them all
+
+[[test]]
+name = "double_init_fail"
+path = "tests/double_init_fail.rs"
+
+[[test]]
+name = "init_zero_threads"
+path = "tests/init_zero_threads.rs"
+
+[[test]]
+name = "scope_join"
+path = "tests/scope_join.rs"
+
+[[test]]
+name = "simple_panic"
+path = "tests/simple_panic.rs"

rayon-core/src/compile_fail/mod.rs

@@ -0,0 +1,8 @@
+
+// These modules contain `compile_fail` doc tests.
+mod quicksort_race1;
+mod quicksort_race2;
+mod quicksort_race3;
+mod rc_return;
+mod rc_upvar;
+mod scope_join_bad;

tests/compile-fail/quicksort_race1.rs renamed to rayon-core/src/compile_fail/quicksort_race1.rs

@@ -1,4 +1,4 @@
-extern crate rayon;
+/*! ```compile_fail,E0524
 
 fn quick_sort<T:PartialOrd+Send>(v: &mut [T]) {
     if v.len() <= 1 {
@@ -7,7 +7,7 @@ fn quick_sort<T:PartialOrd+Send>(v: &mut [T]) {
 
     let mid = partition(v);
     let (lo, _hi) = v.split_at_mut(mid);
-    rayon::join(|| quick_sort(lo), || quick_sort(lo)); //~ ERROR E0524
+    rayon_core::join(|| quick_sort(lo), || quick_sort(lo)); //~ ERROR
 }
 
 fn partition<T:PartialOrd+Send>(v: &mut [T]) -> usize {
@@ -24,3 +24,5 @@ fn partition<T:PartialOrd+Send>(v: &mut [T]) -> usize {
 }
 
 fn main() { }
+
+``` */

tests/compile-fail/quicksort_race2.rs renamed to rayon-core/src/compile_fail/quicksort_race2.rs

@@ -1,4 +1,4 @@
-extern crate rayon;
+/*! ```compile_fail,E0500
 
 fn quick_sort<T:PartialOrd+Send>(v: &mut [T]) {
     if v.len() <= 1 {
@@ -7,7 +7,7 @@ fn quick_sort<T:PartialOrd+Send>(v: &mut [T]) {
 
     let mid = partition(v);
     let (lo, _hi) = v.split_at_mut(mid);
-    rayon::join(|| quick_sort(lo), || quick_sort(v)); //~ ERROR E0500
+    rayon_core::join(|| quick_sort(lo), || quick_sort(v)); //~ ERROR
 }
 
 fn partition<T:PartialOrd+Send>(v: &mut [T]) -> usize {
@@ -24,3 +24,5 @@ fn partition<T:PartialOrd+Send>(v: &mut [T]) -> usize {
 }
 
 fn main() { }
+
+``` */

tests/compile-fail/quicksort_race3.rs renamed to rayon-core/src/compile_fail/quicksort_race3.rs

@@ -1,4 +1,4 @@
-extern crate rayon;
+/*! ```compile_fail,E0524
 
 fn quick_sort<T:PartialOrd+Send>(v: &mut [T]) {
     if v.len() <= 1 {
@@ -7,7 +7,7 @@ fn quick_sort<T:PartialOrd+Send>(v: &mut [T]) {
 
     let mid = partition(v);
     let (_lo, hi) = v.split_at_mut(mid);
-    rayon::join(|| quick_sort(hi), || quick_sort(hi)); //~ ERROR E0524
+    rayon_core::join(|| quick_sort(hi), || quick_sort(hi)); //~ ERROR
 }
 
 fn partition<T:PartialOrd+Send>(v: &mut [T]) -> usize {
@@ -24,3 +24,5 @@ fn partition<T:PartialOrd+Send>(v: &mut [T]) -> usize {
 }
 
 fn main() { }
+
+``` */

rayon-core/src/compile_fail/rc_return.rs

@@ -0,0 +1,21 @@
+/** ```compile_fail,E0277
+
+use std::rc::Rc;
+
+fn main() {
+    rayon_core::join(|| Rc::new(22), || ()); //~ ERROR
+}
+
+``` */
+mod left {}
+
+/** ```compile_fail,E0277
+
+use std::rc::Rc;
+
+fn main() {
+    rayon_core::join(|| (), || Rc::new(23)); //~ ERROR
+}
+
+``` */
+mod right {}