Skip to content

Commit

Permalink
Merge #716
Browse files Browse the repository at this point in the history
716: Release rayon 1.3.0 / rayon-core 1.7.0 r=cuviper a=cuviper

This also removes `rayon-futures` and `cfg(rayon_unstable)` -- see #715 for their deprecation.

Co-authored-by: Josh Stone <cuviper@gmail.com>
  • Loading branch information
bors[bot] and cuviper authored Dec 21, 2019
2 parents ab4d244 + 163003e commit 7ffaf34
Show file tree
Hide file tree
Showing 72 changed files with 200 additions and 2,185 deletions.
29 changes: 2 additions & 27 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ matrix:
fast_finish: true
include:
# NB: To help with CI delays, each `pull_request` is only tested on Linux,
# with 1.31 for compatibility and stable+rayon_unstable for broad test
# coverage. The bors bot counts as a `push` type, which will run it all.
# with 1.31 for compatibility and stable for broad test coverage. The bors
# bot counts as a `push` type, which will run it all.

- rust: 1.31.0
os: linux
Expand All @@ -20,43 +20,23 @@ matrix:

- rust: stable
os: linux
if: NOT type = pull_request
- rust: stable
os: linux
env: RUSTFLAGS='--cfg rayon_unstable'
#if: everything!

- rust: beta
os: linux
if: NOT type = pull_request
- rust: beta
os: linux
env: RUSTFLAGS='--cfg rayon_unstable'
if: NOT type = pull_request

- rust: nightly
os: linux
if: NOT type = pull_request
- rust: nightly
os: linux
env: RUSTFLAGS='--cfg rayon_unstable'
if: NOT type = pull_request

- rust: stable
os: osx
if: NOT type = pull_request
- rust: stable
os: osx
env: RUSTFLAGS='--cfg rayon_unstable'
if: NOT type = pull_request

- rust: nightly
os: osx
if: NOT type = pull_request
- rust: nightly
os: osx
env: RUSTFLAGS='--cfg rayon_unstable'
if: NOT type = pull_request

# wasm won't actually work without threading, but it builds
- rust: nightly
Expand Down Expand Up @@ -86,11 +66,6 @@ script:
- cargo test -p rayon
- cargo test -p rayon-core
- ./ci/highlander.sh
- |
if [ -n "$RUSTFLAGS" ]; then
cargo build -p rayon-futures &&
cargo test -p rayon-futures
fi

branches:
only:
Expand Down
12 changes: 7 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "rayon"
# Reminder to update html_rool_url in lib.rs when updating version
version = "1.2.1"
version = "1.3.0"
authors = ["Niko Matsakis <niko@alum.mit.edu>",
"Josh Stone <cuviper@gmail.com>"]
description = "Simple work-stealing parallelism for Rust"
Expand All @@ -15,11 +15,11 @@ categories = ["concurrency"]
exclude = ["/ci/*", "/scripts/*", "/.travis.yml", "/appveyor.yml", "/bors.toml"]

[workspace]
members = ["rayon-demo", "rayon-core", "rayon-futures"]
members = ["rayon-demo", "rayon-core"]
exclude = ["ci"]

[dependencies]
rayon-core = { version = "1.6.1", path = "rayon-core" }
rayon-core = { version = "1.7.0", path = "rayon-core" }
crossbeam-deque = "0.7.2"

# This is a public dependency!
Expand All @@ -32,6 +32,8 @@ docopt = "1"
lazy_static = "1"
rand = "0.7"
rand_xorshift = "0.2"
serde = "1"
serde_derive = "1"
doc-comment = "0.3"

[dev-dependencies.serde]
version = "1.0.85"
features = ["derive"]
6 changes: 0 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,6 @@ as:
rayon = "1.1"
```

and then add the following to your `lib.rs`:

```rust
extern crate rayon;
```

To use the Parallel Iterator APIs, a number of traits have to be in
scope. The easiest way to bring those things into scope is to use the
[Rayon prelude](https://docs.rs/rayon/*/rayon/prelude/index.html). In
Expand Down
37 changes: 37 additions & 0 deletions RELEASES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,40 @@
# Release rayon 1.3.0 / rayon-core 1.7.0 (2019-12-21)

- Tuples up to length 12 now implement `IntoParallelIterator`, creating a
`MultiZip` iterator that produces items as similarly-shaped tuples.
- The `--cfg=rayon_unstable` supporting code for `rayon-futures` is removed.
- The minimum supported `rustc` is now 1.31.

## Contributors

Thanks to all of the contributors for this release!

- @cuviper
- @c410-f3r
- @silwol


# Release rayon-futures 0.1.1 (2019-12-21)

- `Send` bounds have been added for the `Item` and `Error` associated types on
all generic `F: Future` interfaces. While technically a breaking change, this
is a soundness fix, so we are not increasing the semantic version for this.
- This crate is now deprecated, and the `--cfg=rayon_unstable` supporting code
will be removed in `rayon-core 1.7.0`. This only supported the now-obsolete
`Future` from `futures 0.1`, while support for `std::future::Future` is
expected to come directly in `rayon-core` -- although that is not ready yet.

## Contributors

Thanks to all of the contributors for this release!

- @cuviper
- @kornelski
- @jClaireCodesStuff
- @jwass
- @seanchen1991


# Release rayon 1.2.1 / rayon-core 1.6.1 (2019-11-20)

- Update crossbeam dependencies.
Expand Down
11 changes: 0 additions & 11 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,8 @@ environment:
matrix:
- TARGET: x86_64-pc-windows-gnu
CHANNEL: stable
- TARGET: x86_64-pc-windows-gnu
CHANNEL: stable
RUSTFLAGS: --cfg rayon_unstable

- TARGET: x86_64-pc-windows-msvc
CHANNEL: stable
- TARGET: x86_64-pc-windows-msvc
CHANNEL: stable
RUSTFLAGS: --cfg rayon_unstable

install:
- curl -sSf -o rustup-init.exe https://win.rustup.rs
Expand All @@ -29,10 +22,6 @@ test_script:
- cargo build
- cargo test -p rayon
- cargo test -p rayon-core
- if not "%RUSTFLAGS%"=="%^RUSTFLAGS%" (
cargo build -p rayon-futures &&
cargo test -p rayon-futures
)

branches:
only:
Expand Down
Loading

0 comments on commit 7ffaf34

Please sign in to comment.