From a116575410ce3e2e003f10c64c565e85ac5b3893 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 25 Apr 2019 15:34:51 -0700 Subject: [PATCH] Require Rust 1.26 and bump minor versions --- .travis.yml | 10 ++-------- Cargo.toml | 4 ++-- README.md | 2 +- rayon-core/Cargo.toml | 2 +- rayon-core/README.md | 2 +- rayon-core/src/lib.rs | 2 +- src/lib.rs | 2 +- 7 files changed, 9 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index ba5581751..214284f96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/Cargo.toml b/Cargo.toml index 46ae5c104..f27172451 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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 ", "Josh Stone "] description = "Simple work-stealing parallelism for Rust" @@ -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! diff --git a/README.md b/README.md index 9d820d914..18f030c2b 100644 --- a/README.md +++ b/README.md @@ -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. ## Contribution diff --git a/rayon-core/Cargo.toml b/rayon-core/Cargo.toml index d474bcb8c..66db4b0f8 100644 --- a/rayon-core/Cargo.toml +++ b/rayon-core/Cargo.toml @@ -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 ", "Josh Stone "] description = "Core APIs for Rayon" diff --git a/rayon-core/README.md b/rayon-core/README.md index 8267d954a..a3b0268d4 100644 --- a/rayon-core/README.md +++ b/rayon-core/README.md @@ -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. diff --git a/rayon-core/src/lib.rs b/rayon-core/src/lib.rs index c822eebaa..9d5b949a5 100644 --- a/rayon-core/src/lib.rs +++ b/rayon-core/src/lib.rs @@ -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)] diff --git a/src/lib.rs b/src/lib.rs index 999828ba7..8773689a5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -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)]