Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Raise the min version requirement because of the ? operator #412

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: rust
rust:
- 1.12.0
- 1.13.0
- stable
- nightly
os:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ default-features = false
[dev-dependencies]
compiletest_rs = "0.2.1"
docopt = "0.7"
futures = "0.1.7"
futures = "=0.1.14"
rand = "0.3"
rustc-serialize = "0.3"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ part, adding calls to Rayon should not change how your programs works
at all, in fact. However, if you operate on mutexes or atomic
integers, please see the [notes on atomicity](#atomicity).

Rayon currently requires `rustc 1.12.0` or greater.
Rayon currently requires `rustc 1.13.0` or greater.

### Using Rayon

Expand Down
4 changes: 4 additions & 0 deletions RELEASES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Release rayon 0.8.3

- `?` operator requires rust 1.13 or greater

# Release rayon 0.8.2

- `ParallelSliceMut` now has six parallel sorting methods with the same
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ environment:
RUST_MIN_STACK: 16777216
matrix:
- TARGET: x86_64-pc-windows-gnu
CHANNEL: 1.12.0
CHANNEL: 1.13.0

- TARGET: x86_64-pc-windows-gnu
CHANNEL: stable
Expand All @@ -24,7 +24,7 @@ environment:


- TARGET: x86_64-pc-windows-msvc
CHANNEL: 1.12.0
CHANNEL: 1.13.0

- TARGET: x86_64-pc-windows-msvc
CHANNEL: stable
Expand Down
2 changes: 1 addition & 1 deletion rayon-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ libc = "0.2.16"
lazy_static = "0.2.2"

# only if #[cfg(rayon_unstable)], will be removed eventually
futures = "0.1.7"
futures = "=0.1.14"

[dev-dependencies]