Skip to content

Commit 93d3af1

Browse files
committed
Build rayon-demo on stable too
1 parent 5635c37 commit 93d3af1

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

.travis.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,13 @@ matrix:
6666
- cargo build --target $TARGET
6767
if: NOT type = pull_request
6868

69-
# rayon-demo has huge dependencies, so just test it once
69+
# rayon-demo has huge dependencies, so limit its testing.
70+
# build on stable, test on nightly (because of #[bench])
71+
- rust: stable
72+
os: linux
73+
env: DEMO=1
74+
script: cargo build -p rayon-demo
75+
if: NOT type = pull_request
7076
- rust: nightly
7177
os: linux
7278
env: DEMO=1

README.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,19 +106,16 @@ parallel.
106106

107107
```
108108
> cd rayon-demo
109-
> cargo +nightly run --release -- nbody visualize
109+
> cargo run --release -- nbody visualize
110110
```
111111

112112
For more information on demos, try:
113113

114114
```
115115
> cd rayon-demo
116-
> cargo +nightly run --release -- --help
116+
> cargo run --release -- --help
117117
```
118118

119-
**Note:** While Rayon is usable as a library with the stable compiler, running
120-
its demos currently requires nightly Rust.
121-
122119
## Other questions?
123120

124121
See [the Rayon FAQ][faq].

rayon-demo/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#![cfg_attr(test, feature(test))]
2-
#![feature(conservative_impl_trait)]
32

43
use std::env;
54
use std::io;

0 commit comments

Comments
 (0)