Skip to content

Commit

Permalink
Require Rust 1.26 and bump minor versions
Browse files Browse the repository at this point in the history
  • Loading branch information
cuviper committed Apr 26, 2019
1 parent 047ea91 commit a116575
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 15 deletions.
10 changes: 2 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,13 @@ 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 stable+rayon_unstable for broad test
# with 1.26 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
- rust: 1.26.0
os: linux
#if: everything!
script: cargo build
before_script:
# lazy_static 1.1 requires Rust 1.21+, so downgrade it.
# (and docopt 1.1 requires lazy_static 1.3)
- cargo generate-lockfile
- cargo update -p docopt --precise 1.0.2
- cargo update -p lazy_static --precise 1.0.2

- rust: stable
os: linux
Expand Down
4 changes: 2 additions & 2 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.0.3"
version = "1.1.0"
authors = ["Niko Matsakis <[email protected]>",
"Josh Stone <[email protected]>"]
description = "Simple work-stealing parallelism for Rust"
Expand All @@ -19,7 +19,7 @@ members = ["rayon-demo", "rayon-core", "rayon-futures"]
exclude = ["ci"]

[dependencies]
rayon-core = { version = "1.4.1", path = "rayon-core" }
rayon-core = { version = "1.5.0", path = "rayon-core" }
crossbeam-deque = "0.2.0"

# This is a public dependency!
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ just add:
use rayon::prelude::*;
```

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

This comment has been minimized.

Copy link
@dragostis

dragostis May 20, 2019

Well, not yet. Is there anything keeping this release from being published on crates.io?

This comment has been minimized.

Copy link
@cuviper

cuviper May 20, 2019

Author Member

Hoping to finish #636 soon to include in the new release.


## Contribution

Expand Down
2 changes: 1 addition & 1 deletion rayon-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rayon-core"
version = "1.4.1" # reminder to update html_root_url attribute
version = "1.5.0" # reminder to update html_root_url attribute
authors = ["Niko Matsakis <[email protected]>",
"Josh Stone <[email protected]>"]
description = "Core APIs for Rayon"
Expand Down
2 changes: 1 addition & 1 deletion rayon-core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ Please see [Rayon Docs] for details about using Rayon.

[Rayon Docs]: https://docs.rs/rayon/

Rayon-core currently requires `rustc 1.13.0` or greater.
Rayon-core currently requires `rustc 1.26.0` or greater.
2 changes: 1 addition & 1 deletion rayon-core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
//! conflicting requirements will need to be resolved before the build will
//! succeed.

#![doc(html_root_url = "https://docs.rs/rayon-core/1.4")]
#![doc(html_root_url = "https://docs.rs/rayon-core/1.5")]
#![deny(missing_debug_implementations)]
#![deny(missing_docs)]

Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![doc(html_root_url = "https://docs.rs/rayon/1.0")]
#![doc(html_root_url = "https://docs.rs/rayon/1.1")]
#![deny(missing_debug_implementations)]
#![deny(missing_docs)]

Expand Down

0 comments on commit a116575

Please sign in to comment.